From e74d787bf128b260bbfaafc295ea5bd835541b56 Mon Sep 17 00:00:00 2001 From: Elizabeth Lavenza Date: Tue, 16 Apr 2024 00:48:04 -0400 Subject: [PATCH] Fix string cell types --- code/modules/projectiles/guns/energy/megabuster.dm | 2 +- code/modules/projectiles/guns/energy/plasma_cit.dm | 6 +++--- code/modules/projectiles/guns/energy/pulse.dm | 10 +++++----- code/modules/projectiles/guns/energy/special.dm | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/code/modules/projectiles/guns/energy/megabuster.dm b/code/modules/projectiles/guns/energy/megabuster.dm index dddfd749de..2c4c8b0b56 100644 --- a/code/modules/projectiles/guns/energy/megabuster.dm +++ b/code/modules/projectiles/guns/energy/megabuster.dm @@ -8,7 +8,7 @@ clumsy_check = FALSE item_flags = NEEDS_PERMIT selfcharge = EGUN_SELFCHARGE - cell_type = "/obj/item/stock_parts/cell/pulse" + cell_type = /obj/item/stock_parts/cell/pulse icon = 'modular_citadel/icons/obj/guns/VGguns.dmi' /obj/item/gun/energy/megabuster/proto diff --git a/code/modules/projectiles/guns/energy/plasma_cit.dm b/code/modules/projectiles/guns/energy/plasma_cit.dm index 9f9340a725..677cc3af31 100644 --- a/code/modules/projectiles/guns/energy/plasma_cit.dm +++ b/code/modules/projectiles/guns/energy/plasma_cit.dm @@ -4,7 +4,7 @@ icon_state = "xray" w_class = WEIGHT_CLASS_NORMAL ammo_type = list(/obj/item/ammo_casing/energy/plasmagun) - cell_type = "/obj/item/stock_parts/cell/pulse/carbine" + cell_type = /obj/item/stock_parts/cell/pulse/carbine ammo_x_offset = 2 shaded_charge = 1 lefthand_file = 'modular_citadel/icons/mob/citadel/guns_lefthand.dmi' @@ -50,7 +50,7 @@ icon_state = "xcomlasergun" item_state = null icon = 'modular_citadel/icons/obj/guns/VGguns.dmi' - cell_type = "/obj/item/stock_parts/cell/pulse/carbine" + cell_type = /obj/item/stock_parts/cell/pulse/carbine ammo_type = list(/obj/item/ammo_casing/energy/lasergun) ammo_x_offset = 4 lefthand_file = 'modular_citadel/icons/mob/citadel/guns_lefthand.dmi' @@ -62,7 +62,7 @@ icon_state = "LaserAK" item_state = null icon = 'modular_citadel/icons/obj/guns/VGguns.dmi' - cell_type = "/obj/item/stock_parts/cell/pulse/carbine" + cell_type = /obj/item/stock_parts/cell/pulse/carbine ammo_type = list(/obj/item/ammo_casing/energy/laser) ammo_x_offset = 4 lefthand_file = 'modular_citadel/icons/mob/citadel/guns_lefthand.dmi' diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm index d5dc39695b..a34a551cc2 100644 --- a/code/modules/projectiles/guns/energy/pulse.dm +++ b/code/modules/projectiles/guns/energy/pulse.dm @@ -9,7 +9,7 @@ flags_1 = CONDUCT_1 slot_flags = ITEM_SLOT_BACK ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse, /obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser) - cell_type = "/obj/item/stock_parts/cell/pulse" + cell_type = /obj/item/stock_parts/cell/pulse /obj/item/gun/energy/pulse/emp_act(severity) return @@ -42,7 +42,7 @@ slot_flags = ITEM_SLOT_BELT icon_state = "pulse_carbine" item_state = null - cell_type = "/obj/item/stock_parts/cell/pulse/carbine" + cell_type = /obj/item/stock_parts/cell/pulse/carbine can_flashlight = 1 flight_x_offset = 18 flight_y_offset = 12 @@ -57,7 +57,7 @@ slot_flags = ITEM_SLOT_BELT icon_state = "pulse_pistol" item_state = "gun" - cell_type = "/obj/item/stock_parts/cell/pulse/pistol" + cell_type = /obj/item/stock_parts/cell/pulse/pistol /obj/item/gun/energy/pulse/pistol/loyalpin pin = /obj/item/firing_pin/implant/mindshield @@ -65,7 +65,7 @@ /obj/item/gun/energy/pulse/destroyer name = "pulse destroyer" desc = "A heavy-duty energy rifle built for pure destruction." - cell_type = "/obj/item/stock_parts/cell/infinite" + cell_type = /obj/item/stock_parts/cell/infinite ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse) /obj/item/gun/energy/pulse/destroyer/attack_self(mob/living/user) @@ -76,4 +76,4 @@ desc = "A compact pulse core in a classic handgun frame for Nanotrasen officers. It's not the size of the gun, it's the size of the hole it puts through people." icon_state = "m1911" item_state = "gun" - cell_type = "/obj/item/stock_parts/cell/infinite" + cell_type = /obj/item/stock_parts/cell/infinite diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 79bf9dc8f6..f7ed89ddf4 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -57,7 +57,7 @@ item_state = "c20r" w_class = WEIGHT_CLASS_BULKY ammo_type = list(/obj/item/ammo_casing/energy/meteor) - cell_type = "/obj/item/stock_parts/cell/potato" + cell_type = /obj/item/stock_parts/cell/potato clumsy_check = 0 //Admin spawn only, might as well let clowns use it. selfcharge = EGUN_SELFCHARGE @@ -302,7 +302,7 @@ desc = "A LMG that fires 3D-printed flechettes. They are slowly resupplied using the cyborg's internal power source." icon_state = "l6closed0" icon = 'icons/obj/guns/projectile.dmi' - cell_type = "/obj/item/stock_parts/cell/secborg" + cell_type = /obj/item/stock_parts/cell/secborg ammo_type = list(/obj/item/ammo_casing/energy/c3dbullet) can_charge = 0 use_cyborg_cell = 1