guncases arent stupid anymore

shiptest-ss13 · Oct 10, 2024 · b8f51d5 · b8f51d5
1 parent 184325e
commit b8f51d5
Show file tree

Hide file tree

Showing 18 changed files with 170 additions and 218 deletions.
diff --git a/_maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm b/_maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm
@@ -2002,7 +2002,7 @@
 	},
 /obj/item/ammo_box/magazine/m9mm_rattlesnake,
 /obj/item/ammo_box/magazine/m9mm_rattlesnake,
-/obj/item/storage/pistolcase/ringneck,
+/obj/item/storage/guncase/pistol/ringneck,
 /turf/open/floor/plasteel/mono/dark,
 /area/ruin/rockplanet/shippingdocksecure)
 "rK" = (

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm b/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm
@@ -243,7 +243,7 @@
 /obj/item/gps,
 /obj/item/ammo_box/magazine/co9mm,
 /obj/item/storage/belt/security/webbing,
-/obj/item/storage/pistolcase/commander,
+/obj/item/storage/guncase/pistol/commander,
 /obj/item/clothing/glasses/hud/security/sunglasses,
 /obj/structure/window/reinforced/tinted{
 	dir = 4
@@ -4187,7 +4187,7 @@
 	pixel_x = 7;
 	pixel_y = -20
 	},
-/obj/item/storage/pistolcase/egun,
+/obj/item/storage/guncase/energy/egun,
 /obj/item/megaphone/command,
 /obj/structure/closet/secure_closet/lp/lieutenant,
 /obj/effect/turf_decal/techfloor{
@@ -6250,14 +6250,14 @@
 	name = "Armory";
 	req_ship_access = 1
 	},
-/obj/item/storage/pistolcase/commander,
+/obj/item/storage/guncase/pistol/commander,
 /obj/item/ammo_box/magazine/co9mm,
 /obj/item/clothing/suit/armor/nanotrasen/slim,
 /obj/item/clothing/suit/armor/nanotrasen/slim,
 /obj/item/ammo_box/magazine/smgm9mm,
 /obj/item/ammo_box/magazine/smgm9mm,
 /obj/item/ammo_box/magazine/smgm9mm,
-/obj/item/storage/pistolcase,
+/obj/item/storage/guncase/pistol,
 /obj/effect/turf_decal/steeldecal/steel_decals10{
 	dir = 5
 	},

diff --git a/_maps/shuttles/roumain/srm_elder.dmm b/_maps/shuttles/roumain/srm_elder.dmm
@@ -2026,7 +2026,7 @@
 	},
 /obj/item/storage/backpack/satchel/leather,
 /obj/item/ammo_box/a44roum,
-/obj/item/storage/pistolcase/montagne,
+/obj/item/storage/guncase/pistol/montagne,
 /obj/item/clothing/accessory/waistcoat/roumain,
 /turf/open/floor/wood/mahogany,
 /area/ship/bridge)

diff --git a/_maps/shuttles/solgov/solgov_chronicle.dmm b/_maps/shuttles/solgov/solgov_chronicle.dmm
@@ -272,7 +272,7 @@
 /obj/item/clothing/suit/armor/solgov_trenchcoat,
 /obj/item/spacecash/bundle/loadsamoney,
 /obj/item/clothing/neck/cloak/solgovcap,
-/obj/item/storage/pistolcase/modelh,
+/obj/item/storage/guncase/pistol/modelh,
 /obj/item/ammo_box/ferroslugbox,
 /turf/open/floor/carpet/royalblue,
 /area/ship/crew/office)

diff --git a/_maps/shuttles/solgov/solgov_inkwell.dmm b/_maps/shuttles/solgov/solgov_inkwell.dmm
@@ -5933,7 +5933,7 @@
 /obj/item/fish_feed,
 /obj/item/pen/fountain/solgov,
 /obj/item/clothing/neck/cloak/solgovcap,
-/obj/item/storage/pistolcase/modelh,
+/obj/item/storage/guncase/pistol/modelh,
 /obj/item/ammo_box/ferroslugbox,
 /turf/open/floor/wood/maple,
 /area/ship/crew/dorm/dormtwo)

diff --git a/_maps/shuttles/solgov/solgov_paracelsus.dmm b/_maps/shuttles/solgov/solgov_paracelsus.dmm
@@ -3581,7 +3581,7 @@
 /obj/item/fish_feed,
 /obj/item/pen/fountain/solgov,
 /obj/item/clothing/neck/cloak/solgovcap,
-/obj/item/storage/pistolcase/modelh,
+/obj/item/storage/guncase/pistol/modelh,
 /obj/item/ammo_box/ferroslugbox,
 /turf/open/floor/carpet/royalblue,
 /area/ship/crew)

diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm
@@ -64,7 +64,7 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/item/ammo_box/a357/match,
 /obj/item/pen/edagger,
-/obj/item/storage/pistolcase/a357,
+/obj/item/storage/guncase/pistol/a357,
 /obj/item/ammo_box/a357_box,
 /turf/open/floor/carpet/black,
 /area/ship/bridge)
@@ -2501,7 +2501,7 @@
 /obj/item/clothing/suit/ngr,
 /obj/item/clothing/head/hardhat/ngr/foreman,
 /obj/item/tank/jetpack/suit,
-/obj/item/storage/pistolcase/ringneck,
+/obj/item/storage/guncase/pistol/ringneck,
 /turf/open/floor/carpet/red,
 /area/ship/cargo/office)
 "QW" = (

diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm
@@ -1809,7 +1809,7 @@
 /obj/item/codespeak_manual{
 	charges = 2
 	},
-/obj/item/storage/pistolcase/a357,
+/obj/item/storage/guncase/pistol/a357,
 /obj/item/megaphone/sec{
 	name = "syndicate megaphone"
 	},
@@ -7375,7 +7375,7 @@
 	keyslot = null
 	},
 /obj/item/storage/belt/sabre/solgov,
-/obj/item/storage/pistolcase/modelh,
+/obj/item/storage/guncase/pistol/modelh,
 /obj/item/ammo_box/ferroslugbox,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/bridge)
@@ -8865,7 +8865,7 @@
 /obj/item/megaphone/sec{
 	name = "syndicate megaphone"
 	},
-/obj/item/storage/pistolcase/ringneck,
+/obj/item/storage/guncase/pistol/ringneck,
 /obj/item/clothing/head/HoS/beret/syndicate,
 /obj/item/radio/headset/syndicate/alt/leader,
 /obj/item/clothing/gloves/krav_maga/combatglovesplus,