Addressing requested changes.

NebulaSS13 · Dec 8, 2023 · 58c3553 · 58c3553
1 parent 2367e66
commit 58c3553
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 15 deletions.
diff --git a/code/datums/extensions/cell/cell.dm b/code/datums/extensions/cell/cell.dm
@@ -133,12 +133,15 @@
 		return TRUE // technically a valid interaction.
 
 	// Unload the cell.
-	user.visible_message(SPAN_NOTICE("\The [user] removes \the [existing_cell] from \the [holder]."))
+	user.visible_message(
+		SPAN_NOTICE("\The [user] removes \the [existing_cell] from \the [holder]."),
+		SPAN_NOTICE("You remove \the [existing_cell] from \the [holder].")
+	)
 	existing_cell.dropInto(get_turf(holder))
 	user.put_in_active_hand(existing_cell)
 	holder_item.update_icon()
 	if(unload_sound)
-		playsound(user.loc, pick(unload_sound), 25, 1)
+		playsound(user.loc, pick(unload_sound), 25, TRUE)
 	return TRUE
 
 /datum/extension/loaded_cell/proc/get_examine_text(var/obj/item/cell/current_cell)

diff --git a/code/game/objects/items/devices/inducer.dm b/code/game/objects/items/devices/inducer.dm
@@ -21,7 +21,7 @@
 	update_icon()
 
 /obj/item/inducer/setup_power_supply(loaded_cell_type, accepted_cell_type, power_supply_extension_type, charge_value)
-	return ..(/obj/item/cell, /obj/item/cell, /datum/extension/loaded_cell/panel)
+	return ..(/obj/item/cell, /obj/item/cell, /datum/extension/loaded_cell/panel, charge_value)
 
 /obj/item/inducer/proc/induce(obj/item/cell/target)
 	var/obj/item/cell/MyC = get_cell()

diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
@@ -65,7 +65,7 @@
 	var/datum/radio_frequency/analog_radio_connection
 
 /obj/item/radio/setup_power_supply(loaded_cell_type, accepted_cell_type, power_supply_extension_type, charge_value)
-	return ..(/obj/item/cell/device, /obj/item/cell/device, /datum/extension/loaded_cell)
+	return ..(/obj/item/cell/device, /obj/item/cell/device, /datum/extension/loaded_cell, charge_value)
 
 /obj/item/radio/get_radio(var/message_mode)
 	return src

diff --git a/code/game/objects/items/weapons/ecigs.dm b/code/game/objects/items/weapons/ecigs.dm
@@ -23,7 +23,9 @@
 	. = ..()
 
 /obj/item/clothing/mask/smokable/ecig/setup_power_supply(loaded_cell_type, accepted_cell_type, power_supply_extension_type, charge_value)
-	return ..(loaded_cell_type || /obj/item/cell/device/standard, accepted_cell_type || /obj/item/cell/device, power_supply_extension_type)
+	loaded_cell_type   = loaded_cell_type   || /obj/item/cell/device/standard
+	accepted_cell_type = accepted_cell_type || /obj/item/cell/device
+	return ..(loaded_cell_type, accepted_cell_type, power_supply_extension_type, charge_value)
 
 /obj/item/clothing/mask/smokable/ecig/simple
 	name = "cheap electronic cigarette"
@@ -42,7 +44,8 @@
 	desc = "A popular utilitarian model electronic cigarette, the ONI-55. Comes in a variety of colors."
 
 /obj/item/clothing/mask/smokable/ecig/util/setup_power_supply(loaded_cell_type, accepted_cell_type, power_supply_extension_type, charge_value)
-	return ..(loaded_cell_type = /obj/item/cell/device/high) //enough for four cartridges
+	loaded_cell_type = loaded_cell_type || /obj/item/cell/device/high
+	return ..(loaded_cell_type, accepted_cell_type, power_supply_extension_type, charge_value) //enough for four cartridges
 
 /obj/item/clothing/mask/smokable/ecig/util/Initialize()
 	. = ..()
@@ -61,7 +64,8 @@
 	icon = 'icons/clothing/mask/smokables/cigarette_electronic_deluxe.dmi'
 
 /obj/item/clothing/mask/smokable/ecig/deluxe/setup_power_supply(loaded_cell_type, accepted_cell_type, power_supply_extension_type, charge_value)
-	return ..(loaded_cell_type = /obj/item/cell/device/high) //enough for four cartridges
+	loaded_cell_type = loaded_cell_type || /obj/item/cell/device/high
+	return ..(loaded_cell_type, accepted_cell_type, power_supply_extension_type, charge_value) //enough for four cartridges
 
 /obj/item/clothing/mask/smokable/ecig/deluxe/examine(mob/user)
 	. = ..()

diff --git a/code/game/objects/items/weapons/electric_welder.dm b/code/game/objects/items/weapons/electric_welder.dm
@@ -15,7 +15,8 @@
 	. = ..()
 
 /obj/item/weldingtool/electric/setup_power_supply(loaded_cell_type, accepted_cell_type, power_supply_extension_type, charge_value)
-	return ..(loaded_cell_type || /obj/item/cell/high, /obj/item/cell, /datum/extension/loaded_cell)
+	loaded_cell_type = loaded_cell_type || /obj/item/cell/high
+	return ..(loaded_cell_type, /obj/item/cell, /datum/extension/loaded_cell, charge_value)
 
 /obj/item/weldingtool/electric/examine(mob/user, distance)
 	. = ..()

diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
@@ -30,7 +30,7 @@
 	setup_power_supply(loaded_cell_type)
 
 /obj/item/baton/setup_power_supply(loaded_cell_type, accepted_cell_type, power_supply_extension_type, charge_value)
-	. = ..(loaded_cell_type, /obj/item/cell/device, /datum/extension/loaded_cell/secured)
+	. = ..(loaded_cell_type, /obj/item/cell/device, /datum/extension/loaded_cell/secured, charge_value)
 	update_icon()
 
 /obj/item/baton/loaded/Initialize(var/ml, var/material_key, var/loaded_cell_type)

diff --git a/code/modules/modular_computers/hardware/battery_module.dm b/code/modules/modular_computers/hardware/battery_module.dm
@@ -21,7 +21,8 @@
 		. += "Internal battery charge: [battery.charge]/[battery.maxcharge] CU"
 
 /obj/item/stock_parts/computer/battery_module/setup_power_supply(loaded_cell_type, accepted_cell_type, power_supply_extension_type, charge_value)
-	. = ..(loaded_cell_type || /obj/item/cell, /obj/item/cell, /datum/extension/loaded_cell/unremovable)
+	loaded_cell_type = loaded_cell_type || /obj/item/cell
+	. = ..(loaded_cell_type, /obj/item/cell, /datum/extension/loaded_cell/unremovable, charge_value)
 	var/obj/item/cell/battery = get_cell()
 	if(battery)
 		battery.maxcharge = battery_rating
@@ -85,4 +86,4 @@
 	battery_rating = 3000
 
 /obj/item/stock_parts/computer/battery_module/lambda/setup_power_supply(loaded_cell_type, accepted_cell_type, power_supply_extension_type, charge_value)
-	return ..(/obj/item/cell/infinite, accepted_cell_type, power_supply_extension_type)
+	return ..(/obj/item/cell/infinite, accepted_cell_type, power_supply_extension_type, charge_value)
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
@@ -24,8 +24,10 @@ var/global/list/registered_cyborg_weapons = list()
 	var/projectile_type = /obj/item/projectile/beam/practice
 
 /obj/item/gun/energy/setup_power_supply(loaded_cell_type, accepted_cell_type, power_supply_extension_type, charge_value)
-	accepted_cell_type = accepted_cell_type || loaded_cell_type || /obj/item/cell/device/variable
-	return ..((loaded_cell_type || accepted_cell_type), accepted_cell_type, (power_supply_extension_type || /datum/extension/loaded_cell/unremovable), max_shots*charge_cost)
+	accepted_cell_type          = accepted_cell_type          || loaded_cell_type || /obj/item/cell/device/variable
+	loaded_cell_type            = loaded_cell_type            || accepted_cell_type
+	power_supply_extension_type = power_supply_extension_type || /datum/extension/loaded_cell/unremovable
+	return ..(loaded_cell_type, accepted_cell_type, power_supply_extension_type, max_shots*charge_cost)
 
 /obj/item/gun/energy/switch_firemodes()
 	. = ..()

diff --git a/code/modules/projectiles/guns/energy/capacitor.dm b/code/modules/projectiles/guns/energy/capacitor.dm
@@ -70,7 +70,10 @@ var/global/list/laser_wavelengths
 	var/decl/laser_wavelength/selected_wavelength
 
 /obj/item/gun/energy/capacitor/setup_power_supply(loaded_cell_type, accepted_cell_type, power_supply_extension_type, charge_value)
-	return ..((loaded_cell_type || /obj/item/cell/high), (accepted_cell_type || /obj/item/cell), (power_supply_extension_type || /datum/extension/loaded_cell/secured))
+	loaded_cell_type            = loaded_cell_type            || /obj/item/cell/high
+	accepted_cell_type          = accepted_cell_type          || /obj/item/cell
+	power_supply_extension_type = power_supply_extension_type || /datum/extension/loaded_cell/secured
+	return ..(loaded_cell_type, accepted_cell_type, power_supply_extension_type, charge_value)
 
 /obj/item/gun/energy/capacitor/examine(mob/user, distance)
 	. = ..()
@@ -264,7 +267,8 @@ var/global/list/laser_wavelengths
 	w_class = ITEM_SIZE_HUGE
 
 /obj/item/gun/energy/capacitor/rifle/setup_power_supply(loaded_cell_type, accepted_cell_type, power_supply_extension_type, charge_value)
-	return ..(loaded_cell_type || /obj/item/cell/super, accepted_cell_type, power_supply_extension_type, charge_value)
+	loaded_cell_type = loaded_cell_type || /obj/item/cell/super
+	return ..(loaded_cell_type, accepted_cell_type, power_supply_extension_type, charge_value)
 
 /obj/item/gun/energy/capacitor/rifle/linear_fusion
 	name = "linear fusion rifle"