Merge pull request #1029 from molnizz/cringe24

Fix: g36 on shuttles
CeladonSS13 · Oct 5, 2024 · 4b7dd30 · 4b7dd30
2 parents a8a03e4 + 4aec145
commit 4b7dd30
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_iron_maiden.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_iron_maiden.dmm
@@ -788,10 +788,10 @@
 /obj/item/ammo_box/magazine/smgm10mm,
 /obj/item/ammo_box/magazine/smgm10mm,
 /obj/item/ammo_box/magazine/smgm10mm,
-/obj/item/ammo_box/magazine/p16/g36,
-/obj/item/ammo_box/magazine/p16/g36,
-/obj/item/ammo_box/magazine/p16/g36,
-/obj/item/ammo_box/magazine/p16/g36,
+/obj/item/ammo_box/magazine/g36,
+/obj/item/ammo_box/magazine/g36,
+/obj/item/ammo_box/magazine/g36,
+/obj/item/ammo_box/magazine/g36,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/cargo)
 "EH" = (
@@ -1325,8 +1325,8 @@
 	},
 /obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq,
 /obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq,
-/obj/item/gun/ballistic/automatic/assault/p16/g36/inteq,
-/obj/item/gun/ballistic/automatic/assault/p16/g36/inteq,
+/obj/item/gun/ballistic/automatic/assault/g36/inteq,
+/obj/item/gun/ballistic/automatic/assault/g36/inteq,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/cargo)
 "UC" = (

diff --git a/_maps/_mod_celadon/shuttles/solfed/solfed_lightning_bolt.dmm b/_maps/_mod_celadon/shuttles/solfed/solfed_lightning_bolt.dmm
@@ -1379,11 +1379,11 @@
 	icon_state = "sec";
 	name = "Assault locker"
 	},
-/obj/item/gun/ballistic/automatic/assault/p16/g36sh,
-/obj/item/ammo_box/magazine/p16/g36drum,
-/obj/item/ammo_box/magazine/p16/g36drum,
-/obj/item/ammo_box/magazine/p16/g36drum,
-/obj/item/ammo_box/magazine/p16/g36drum,
+/obj/item/gun/ballistic/automatic/assault/g36sh,
+/obj/item/ammo_box/magazine/g36/drum,
+/obj/item/ammo_box/magazine/g36/drum,
+/obj/item/ammo_box/magazine/g36/drum,
+/obj/item/ammo_box/magazine/g36/drum,
 /turf/open/floor/plasteel/white,
 /area/ship/security/prison)
 "qq" = (