Garrow and Rover shotgun updates

cmss13-devs · Jun 29, 2024 · 8112dc3 · 8112dc3
1 parent 7c1c7ce
commit 8112dc3
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/code/datums/ammo/bullet/shotgun.dm b/code/datums/ammo/bullet/shotgun.dm
@@ -156,6 +156,7 @@
 			living_mob.apply_effect(2, SLOW)
 			to_chat(living_mob, SPAN_HIGHDANGER("The impact knocks you off-balance!"))
 		living_mob.apply_stamina_damage(fired_projectile.ammo.damage, fired_projectile.def_zone, ARMOR_BULLET)
+
 /datum/ammo/bullet/shotgun/buckshot/incendiary
 	name = "incendiary buckshot shell"
 	handful_state = "incen_buckshot"

diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm
@@ -541,7 +541,6 @@
 	},
 /obj/item/defenses/handheld/sentry,
 /obj/structure/largecrate/supply/explosives/grenades/less{
-	icon_state = "case";
 	layer = 3.1;
 	pixel_x = 20;
 	pixel_y = 10
@@ -2281,7 +2280,6 @@
 "iF" = (
 /obj/structure/largecrate/supply/motiondetectors,
 /obj/structure/largecrate/supply/explosives/grenades/less{
-	icon_state = "case";
 	pixel_y = 10
 	},
 /obj/item/ammo_box/magazine/mk1{
@@ -3909,14 +3907,14 @@
 /turf/open/floor/plating,
 /area/golden_arrow/hangar)
 "oK" = (
-/obj/item/storage/box/guncase/pumpshotgun/special{
-	pixel_y = 4
-	},
 /obj/item/storage/box/guncase/flamer/special{
 	layer = 3.1;
 	pixel_y = 10
 	},
 /obj/structure/surface/rack,
+/obj/item/storage/box/guncase/pumpshotgun,
+/obj/item/ammo_magazine/shotgun/slugs,
+/obj/item/attachable/stock,
 /turf/open/floor/almayer,
 /area/golden_arrow/platoonarmory)
 "oM" = (
@@ -9785,6 +9783,16 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
+"LP" = (
+/obj/item/storage/box/guncase/flamer/special{
+	layer = 3.1;
+	pixel_y = 10
+	},
+/obj/structure/surface/rack,
+/obj/item/storage/box/guncase/pumpshotgun,
+/obj/item/ammo_magazine/shotgun/slugs,
+/turf/open/floor/almayer,
+/area/golden_arrow/platoonarmory)
 "LQ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/pipes/standard/simple/hidden/supply,
@@ -25138,7 +25146,7 @@ EG
 EG
 EG
 HZ
-oK
+LP
 pd
 Jx
 Ot

diff --git a/maps/map_files/rover/rover.dmm b/maps/map_files/rover/rover.dmm
@@ -485,13 +485,13 @@
 /area/golden_arrow/hangar)
 "en" = (
 /obj/structure/surface/rack,
-/obj/item/weapon/gun/shotgun/pump/special{
-	pixel_y = 10
-	},
 /obj/structure/machinery/light{
 	dir = 8
 	},
-/obj/item/ammo_magazine/shotgun/buckshot/special,
+/obj/item/weapon/gun/shotgun/pump,
+/obj/item/ammo_magazine/shotgun/buckshot,
+/obj/item/ammo_magazine/shotgun/slugs,
+/obj/item/attachable/stock,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},