Fixing batteries and adding a medium category

shiptest-ss13 · Aug 5, 2024 · 5529155 · 5529155
1 parent 5f921a9
commit 5529155
Show file tree

Hide file tree

Showing 28 changed files with 80 additions and 77 deletions.
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm
@@ -75,7 +75,7 @@
 /obj/item/spacecash/bundle/c1000,
 /obj/item/spacecash/bundle/c1000,
 /obj/item/spacecash/bundle/c1000,
-/obj/item/stock_parts/cell/gun/upgraded,
+/obj/item/stock_parts/cell/gun/medium/upgraded,
 /obj/structure/safe,
 /turf/open/floor/carpet/blue,
 /area/ruin/lavaland/factory/manager_office)
@@ -580,7 +580,7 @@
 /obj/effect/turf_decal/ntlogo{
 	dir = 4
 	},
-/obj/item/stock_parts/cell/gun/empty,
+/obj/item/stock_parts/cell/gun/medium/empty,
 /turf/open/floor/plasteel/white,
 /area/ruin/lavaland/factory/lobby)
 "fs" = (
@@ -2044,8 +2044,8 @@
 	dir = 9
 	},
 /obj/structure/closet/secure_closet/security,
-/obj/item/stock_parts/cell/gun,
-/obj/item/stock_parts/cell/gun,
+/obj/item/stock_parts/cell/gun/medium,
+/obj/item/stock_parts/cell/gun/medium,
 /obj/item/clothing/suit/armor/vest,
 /obj/item/clothing/head/helmet/sec,
 /obj/item/clothing/glasses/hud/security/sunglasses,

diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm
@@ -100,7 +100,7 @@
 /area/ruin/powered)
 "fJ" = (
 /obj/structure/rack,
-/obj/item/stock_parts/cell/gun/empty,
+/obj/item/stock_parts/cell/gun/medium/empty,
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/structure/sign/poster/official/random{
 	pixel_y = 32
@@ -192,7 +192,7 @@
 	pixel_y = 32
 	},
 /obj/structure/rack,
-/obj/item/stock_parts/cell/gun/empty,
+/obj/item/stock_parts/cell/gun/medium/empty,
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel,
@@ -317,7 +317,7 @@
 /area/ruin/powered)
 "pf" = (
 /obj/structure/rack,
-/obj/item/stock_parts/cell/gun/empty,
+/obj/item/stock_parts/cell/gun/medium/empty,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating/rust,
 /area/ruin/powered)
@@ -382,7 +382,7 @@
 /area/ruin/powered)
 "sv" = (
 /obj/structure/rack,
-/obj/item/stock_parts/cell/gun/empty,
+/obj/item/stock_parts/cell/gun/medium/empty,
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel,
@@ -524,7 +524,7 @@
 /area/ruin/powered)
 "xz" = (
 /obj/structure/rack,
-/obj/item/stock_parts/cell/gun/upgraded/empty,
+/obj/item/stock_parts/cell/gun/medium/upgraded/empty,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating/rust,
 /area/ruin/powered)

diff --git a/_maps/shuttles/independent/independent_mudskipper.dmm b/_maps/shuttles/independent/independent_mudskipper.dmm
@@ -624,7 +624,7 @@
 	locked = 1
 	},
 /obj/item/gun/energy/laser/scatter,
-/obj/item/stock_parts/cell/gun/upgraded,
+/obj/item/stock_parts/cell/gun/medium/upgraded,
 /obj/machinery/holopad/emergency/command,
 /obj/item/storage/backpack/duffelbag,
 /obj/item/clothing/glasses/sunglasses,
@@ -634,8 +634,8 @@
 /obj/item/gun/energy/laser,
 /obj/item/gun/energy/laser/e10,
 /obj/item/gun/energy/laser/e10,
-/obj/item/stock_parts/cell/gun,
-/obj/item/stock_parts/cell/gun,
+/obj/item/stock_parts/cell/gun/medium,
+/obj/item/stock_parts/cell/gun/medium,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "ot" = (

diff --git a/_maps/shuttles/independent/independent_shetland.dmm b/_maps/shuttles/independent/independent_shetland.dmm
@@ -3182,7 +3182,7 @@
 /obj/item/storage/backpack/captain,
 /obj/item/clothing/gloves/color/white,
 /obj/item/clothing/shoes/sneakers/brown,
-/obj/item/stock_parts/cell/gun,
+/obj/item/stock_parts/cell/gun/medium,
 /obj/item/gun/energy/laser/e10,
 /obj/item/clothing/suit/jacket/leather/duster/command,
 /obj/item/clothing/glasses/cheapsuns,
@@ -5910,7 +5910,7 @@
 /obj/item/clothing/shoes/sneakers/brown,
 /obj/item/storage/box/ids,
 /obj/item/storage/briefcase,
-/obj/item/stock_parts/cell/gun,
+/obj/item/stock_parts/cell/gun/medium,
 /obj/item/gun/energy/laser/e10,
 /obj/item/clothing/suit/jacket/leather/duster/command,
 /obj/item/clothing/glasses/cheapsuns,

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_delta.dmm b/_maps/shuttles/nanotrasen/nanotrasen_delta.dmm
@@ -1160,7 +1160,7 @@
 /obj/item/clothing/under/nanotrasen/supply/qm,
 /obj/item/clothing/shoes/sneakers/brown,
 /obj/item/clothing/head/nanotrasen/cap/supply,
-/obj/item/stock_parts/cell/gun,
+/obj/item/stock_parts/cell/gun/medium,
 /obj/item/gun/energy/laser,
 /obj/item/megaphone/cargo,
 /obj/machinery/light/small/directional/east,

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm b/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm
@@ -3384,7 +3384,7 @@
 	name = "\proper captain's locker";
 	req_access_txt = "20"
 	},
-/obj/item/stock_parts/cell/gun,
+/obj/item/stock_parts/cell/gun/medium,
 /obj/item/gun/energy/laser,
 /obj/item/clothing/under/nanotrasen/captain/skirt,
 /obj/item/clothing/under/nanotrasen/captain,

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm
@@ -6583,7 +6583,7 @@
 /obj/item/clothing/under/rank/centcom/centcom_skirt,
 /obj/item/clothing/suit/hooded/wintercoat/centcom,
 /obj/item/clothing/head/beret/centcom_formal,
-/obj/item/stock_parts/cell/gun/upgraded,
+/obj/item/stock_parts/cell/gun/medium/upgraded,
 /obj/item/clothing/head/centcom_cap,
 /obj/item/clothing/gloves/combat,
 /turf/open/floor/carpet/green,
@@ -13087,15 +13087,15 @@
 	pixel_y = 17;
 	pixel_x = 4
 	},
-/obj/item/stock_parts/cell/gun{
+/obj/item/stock_parts/cell/gun/medium{
 	pixel_x = -3;
 	pixel_y = -5
 	},
-/obj/item/stock_parts/cell/gun{
+/obj/item/stock_parts/cell/gun/medium{
 	pixel_x = 1;
 	pixel_y = -5
 	},
-/obj/item/stock_parts/cell/gun{
+/obj/item/stock_parts/cell/gun/medium{
 	pixel_x = 5;
 	pixel_y = -5
 	},

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm b/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm
@@ -20,7 +20,7 @@
 /obj/item/clothing/suit/armor/vest,
 /obj/item/storage/box/handcuffs,
 /obj/item/storage/box/deputy,
-/obj/item/stock_parts/cell/gun,
+/obj/item/stock_parts/cell/gun/medium,
 /obj/item/stock_parts/cell/gun/mini,
 /obj/item/stock_parts/cell/gun/mini,
 /obj/item/ammo_box/magazine/co9mm,

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm b/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm
@@ -3114,7 +3114,7 @@
 /area/ship/engineering)
 "Ha" = (
 /obj/structure/closet/secure_closet/lp/lieutenant,
-/obj/item/stock_parts/cell/gun,
+/obj/item/stock_parts/cell/gun/medium,
 /obj/item/melee/classic_baton/telescopic,
 /obj/item/kitchen/knife/combat/survival,
 /obj/item/gps,

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm b/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm
@@ -5576,7 +5576,7 @@
 /obj/item/melee/baton/loaded,
 /obj/item/restraints/handcuffs,
 /obj/item/restraints/handcuffs,
-/obj/item/stock_parts/cell/gun,
+/obj/item/stock_parts/cell/gun/medium,
 /obj/item/stock_parts/cell/gun/mini,
 /obj/item/stock_parts/cell/gun/mini,
 /obj/item/ammo_box/magazine/co9mm,

diff --git a/_maps/shuttles/pgf/pgf_crying_sun.dmm b/_maps/shuttles/pgf/pgf_crying_sun.dmm
@@ -4103,27 +4103,27 @@
 /area/ship/crew/office)
 "GW" = (
 /obj/structure/rack,
-/obj/item/stock_parts/cell/gun/pgf{
+/obj/item/stock_parts/cell/gun/medium/pgf{
 	pixel_y = 12;
 	pixel_x = -3
 	},
-/obj/item/stock_parts/cell/gun/pgf{
+/obj/item/stock_parts/cell/gun/medium/pgf{
 	pixel_y = 10;
 	pixel_x = 2
 	},
-/obj/item/stock_parts/cell/gun/pgf{
+/obj/item/stock_parts/cell/gun/medium/pgf{
 	pixel_y = 8;
 	pixel_x = 8
 	},
-/obj/item/stock_parts/cell/gun/pgf{
+/obj/item/stock_parts/cell/gun/medium/pgf{
 	pixel_y = 6;
 	pixel_x = -9
 	},
-/obj/item/stock_parts/cell/gun/pgf{
+/obj/item/stock_parts/cell/gun/medium/pgf{
 	pixel_y = 4;
 	pixel_x = -3
 	},
-/obj/item/stock_parts/cell/gun/pgf{
+/obj/item/stock_parts/cell/gun/medium/pgf{
 	pixel_y = 2;
 	pixel_x = 3
 	},

diff --git a/_maps/shuttles/pirate/pirate_noderider.dmm b/_maps/shuttles/pirate/pirate_noderider.dmm
@@ -1026,14 +1026,14 @@
 	name = "weapons locker"
 	},
 /obj/item/gun/energy/e_gun/smg,
-/obj/item/stock_parts/cell/gun,
-/obj/item/stock_parts/cell/gun,
-/obj/item/stock_parts/cell/gun,
-/obj/item/stock_parts/cell/gun,
-/obj/item/stock_parts/cell/gun,
-/obj/item/stock_parts/cell/gun,
-/obj/item/stock_parts/cell/gun,
-/obj/item/stock_parts/cell/gun,
+/obj/item/stock_parts/cell/gun/medium,
+/obj/item/stock_parts/cell/gun/medium,
+/obj/item/stock_parts/cell/gun/medium,
+/obj/item/stock_parts/cell/gun/medium,
+/obj/item/stock_parts/cell/gun/medium,
+/obj/item/stock_parts/cell/gun/medium,
+/obj/item/stock_parts/cell/gun/medium,
+/obj/item/stock_parts/cell/gun/medium,
 /obj/item/gun/energy/laser/iot,
 /obj/item/gun/energy/laser/iot,
 /obj/item/gun/energy/e_gun/smg,

diff --git a/_maps/shuttles/syndicate/syndicate_panacea.dmm b/_maps/shuttles/syndicate/syndicate_panacea.dmm
@@ -6533,11 +6533,11 @@
 	pixel_x = -7;
 	pixel_y = -9
 	},
-/obj/item/stock_parts/cell/gun/solgov{
+/obj/item/stock_parts/cell/gun/medium/solgov{
 	pixel_x = 4;
 	pixel_y = 7
 	},
-/obj/item/stock_parts/cell/gun/solgov{
+/obj/item/stock_parts/cell/gun/medium/solgov{
 	pixel_x = 8;
 	pixel_y = 7
 	},

diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
@@ -297,7 +297,7 @@
 		/obj/item/clothing/gloves,
 		/obj/item/restraints/legcuffs/bola,
 		/obj/item/holosign_creator/security,
-		/obj/item/stock_parts/cell/gun   //WS edit Gun cells fit where they should and not where they dont
+		/obj/item/stock_parts/cell/gun/medium   //WS edit Gun cells fit where they should and not where they dont
 		))
 
 /obj/item/storage/belt/security/full/PopulateContents()

diff --git a/code/game/objects/items/storage/guncases.dm b/code/game/objects/items/storage/guncases.dm
@@ -23,7 +23,7 @@
 	STR.set_holdable(list(
 		/obj/item/gun,
 		/obj/item/ammo_box,
-		/obj/item/stock_parts/cell/gun
+		/obj/item/stock_parts/cell/gun/medium
 		))
 
 /obj/item/storage/guncase/winchester
@@ -105,7 +105,7 @@
 	STR.set_holdable(list(
 		/obj/item/gun,
 		/obj/item/ammo_box/,
-		/obj/item/stock_parts/cell/gun
+		/obj/item/stock_parts/cell/gun/medium
 		))
 
 /obj/item/storage/pistolcase/modelh
@@ -170,22 +170,22 @@
 /obj/item/storage/pistolcase/laser
 /obj/item/storage/pistolcase/laser/PopulateContents()
 	new /obj/item/gun/energy/laser/empty_cell(src)
-	new /obj/item/stock_parts/cell/gun(src)
+	new /obj/item/stock_parts/cell/gun/medium(src)
 
 /obj/item/storage/pistolcase/egun
 /obj/item/storage/pistolcase/egun/PopulateContents()
 	new /obj/item/gun/energy/e_gun/empty_cell(src)
-	new /obj/item/stock_parts/cell/gun(src)
+	new /obj/item/stock_parts/cell/gun/medium(src)
 
 /obj/item/storage/pistolcase/kalixpistol
 /obj/item/storage/pistolcase/kalixpistol/PopulateContents()
 	new /obj/item/gun/energy/kalix/pistol/empty_cell(src)
-	new /obj/item/stock_parts/cell/gun/kalix(src)
+	new /obj/item/stock_parts/cell/gun/medium/kalix(src)
 
 /obj/item/storage/guncase/kalixrifle
 /obj/item/storage/guncase/kalixrifle/PopulateContents()
 	new /obj/item/gun/energy/kalix/empty_cell(src)
-	new /obj/item/stock_parts/cell/gun/kalix(src)
+	new /obj/item/stock_parts/cell/gun/medium/kalix(src)
 
 /obj/item/storage/pistolcase/miniegun
 /obj/item/storage/pistolcase/miniegun/PopulateContents()
@@ -195,4 +195,4 @@
 /obj/item/storage/pistolcase/iongun
 /obj/item/storage/pistolcase/iongun/PopulateContents()
 	new /obj/item/gun/energy/ionrifle/empty_cell(src)
-	new /obj/item/stock_parts/cell/gun(src)
+	new /obj/item/stock_parts/cell/gun/medium(src)
diff --git a/code/game/objects/structures/salvaging.dm b/code/game/objects/structures/salvaging.dm
@@ -583,7 +583,7 @@
 		)
 /obj/effect/spawner/lootdrop/random_ammo_protolathe_lootdrop
 	loot = list(
-			/obj/item/stock_parts/cell/gun/upgraded = 5,
+			/obj/item/stock_parts/cell/gun/medium/upgraded = 5,
 			/obj/item/ammo_box/magazine/smgm9mm = 7,
 		)
 

diff --git a/code/modules/cargo/packs/ammo.dm b/code/modules/cargo/packs/ammo.dm
@@ -296,13 +296,13 @@
 /datum/supply_pack/ammo/guncell
 	name = "Weapon Cell Crate"
 	desc = "Contains a weapon cell, compatible with laser guns."
-	contains = list(/obj/item/stock_parts/cell/gun)
+	contains = list(/obj/item/stock_parts/cell/gun/medium)
 	cost = 500
 
 /datum/supply_pack/ammo/guncell/kalix
 	name = "Etherbor Cell Crate"
 	desc = "Contains an Etherbor weapon cell, compatible with Etherbor armaments with a slightly higher capacity."
-	contains = list(/obj/item/stock_parts/cell/gun/kalix)
+	contains = list(/obj/item/stock_parts/cell/gun/medium/kalix)
 	cost = 600
 
 /datum/supply_pack/ammo/c46x30mm_boxcrate

diff --git a/code/modules/clothing/outfits/ert/nanotrasen_ert.dm b/code/modules/clothing/outfits/ert/nanotrasen_ert.dm
@@ -401,7 +401,7 @@
 	l_pocket = /obj/item/restraints/handcuffs
 	r_pocket = /obj/item/kitchen/knife/combat
 
-	backpack_contents = list(/obj/item/radio=1, /obj/item/stock_parts/cell/gun/upgraded=2, /obj/item/screwdriver=1)
+	backpack_contents = list(/obj/item/radio=1, /obj/item/stock_parts/cell/gun/medium/upgraded=2, /obj/item/screwdriver=1)
 
 
 /datum/outfit/job/nanotrasen/security/ert/lp/medic

diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -878,7 +878,7 @@
 	slot_flags = ITEM_SLOT_BELT
 	fire_delay = 0.1 SECONDS
 	recoil = 1
-	cell_type = /obj/item/stock_parts/cell/gun
+	cell_type = /obj/item/stock_parts/cell/gun/medium
 	ammo_type = list(/obj/item/ammo_casing/energy/spur)
 	supports_variations = VOX_VARIATION
 	var/chargesound

diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm
@@ -465,7 +465,7 @@
 			/obj/item/flashlight/seclite = 4,
 			/obj/item/ammo_box/c9mm/rubbershot = 3,
 			/obj/item/ammo_box/c9mm = 1,
-			/obj/item/stock_parts/cell/gun = 3,
+			/obj/item/stock_parts/cell/gun/medium = 3,
 			/obj/item/coin/antagtoken = 1,
 			/obj/item/grenade/stingbang = 1
 			)