apogee suggestions some missed things

shiptest-ss13 · Jan 12, 2024 · 346c95f · 346c95f
1 parent 2ab9129
commit 346c95f
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 21 deletions.
diff --git a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
@@ -1760,13 +1760,12 @@
 	pixel_x = -3;
 	pixel_y = -5
 	},
-/obj/item/ammo_box/a357,
-/obj/item/ammo_box/a357,
+/obj/item/ammo_casing/a4570,
 /obj/item/ammo_box/magazine/aks74u,
 /obj/item/ammo_box/magazine/aks74u,
 /obj/item/ammo_box/magazine/aks74u,
-/obj/item/ammo_box/a357,
-/obj/item/ammo_box/a357,
+/obj/item/ammo_box/magazine/illestren_a850r,
+/obj/item/ammo_box/magazine/illestren_a850r,
 /turf/open/floor/plasteel/tech,
 /area/ruin/jungle/cavecrew/security)
 "vr" = (

diff --git a/_maps/RandomRuins/JungleRuins/jungle_pirate.dmm b/_maps/RandomRuins/JungleRuins/jungle_pirate.dmm
@@ -265,7 +265,7 @@
 /turf/open/floor/wood,
 /area/ruin/unpowered)
 "LD" = (
-/obj/item/ammo_box/a357,
+/obj/item/ammo_box/c45_speedloader,
 /obj/structure/table/wood/poker,
 /turf/open/floor/wood,
 /area/ruin/unpowered)

diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm
@@ -99,7 +99,7 @@
 /area/ruin/powered)
 "fq" = (
 /obj/structure/table,
-/obj/item/ammo_box/a357,
+/obj/item/ammo_box/c45_speedloader,
 /turf/open/floor/plasteel/mono/white,
 /area/ruin/powered)
 "fJ" = (

diff --git a/_maps/shuttles/minutemen/minutemen_asclepius.dmm b/_maps/shuttles/minutemen/minutemen_asclepius.dmm
@@ -4436,13 +4436,13 @@
 /obj/item/clothing/gloves/color/latex/nitrile,
 /obj/item/healthanalyzer/advanced,
 /obj/item/clothing/neck/cloak/cmo,
-/obj/item/gun/ballistic/revolver,
-/obj/item/ammo_box/a357,
-/obj/item/ammo_box/a357,
+/obj/item/gun/ballistic/revolver/shadow,
+/obj/item/ammo_box/c45_speedloader,
+/obj/item/ammo_box/c45_speedloader,
 /obj/item/clothing/suit/armor/vest/capcarapace/minutemen,
 /obj/item/reagent_containers/hypospray/CMO,
-/obj/item/ammo_box/a357,
-/obj/item/ammo_box/a357,
+/obj/item/ammo_box/c45_speedloader,
+/obj/item/ammo_box/c45_speedloader,
 /turf/open/floor/carpet/royalblue,
 /area/ship/bridge)
 "NY" = (

diff --git a/_maps/shuttles/minutemen/minutemen_cepheus.dmm b/_maps/shuttles/minutemen/minutemen_cepheus.dmm
@@ -431,8 +431,8 @@
 /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch,
 /obj/item/clothing/shoes/cowboy/white,
 /obj/item/storage/belt/sabre,
-/obj/item/gun/ballistic/revolver,
-/obj/item/ammo_box/a357,
+/obj/item/gun/ballistic/revolver/candor,
+/obj/item/ammo_box/c45_speedloader,
 /obj/item/clothing/suit/armor/vest/capcarapace/minutemen,
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/bridge)

diff --git a/_maps/shuttles/pirate/pirate_ember.dmm b/_maps/shuttles/pirate/pirate_ember.dmm
@@ -5596,11 +5596,11 @@
 /area/ship/engineering/incinerator)
 "Bx" = (
 /obj/structure/table/reinforced,
-/obj/item/gun/ballistic/revolver{
+/obj/item/gun/ballistic/revolver/shadow{
 	pixel_y = 6
 	},
-/obj/item/gun/ballistic/revolver,
-/obj/item/gun/ballistic/revolver{
+/obj/item/gun/ballistic/revolver/shadow,
+/obj/item/gun/ballistic/revolver/shadow{
 	pixel_y = -5
 	},
 /obj/effect/turf_decal/techfloor{
@@ -8985,10 +8985,10 @@
 /obj/effect/turf_decal/techfloor/hole{
 	dir = 8
 	},
-/obj/item/ammo_box/a357{
+/obj/item/ammo_box/c45_speedloader{
 	pixel_y = -3
 	},
-/obj/item/ammo_box/a357{
+/obj/item/ammo_box/c45_speedloader{
 	pixel_y = -1;
 	pixel_x = 1
 	},
@@ -9003,10 +9003,10 @@
 	pixel_y = -4
 	},
 /obj/item/ammo_box/magazine/uzim9mm,
-/obj/item/ammo_box/a357{
+/obj/item/ammo_box/c45_speedloader{
 	pixel_y = -3
 	},
-/obj/item/ammo_box/a357{
+/obj/item/ammo_box/c45_speedloader{
 	pixel_y = -5;
 	pixel_x = -1
 	},

diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -612,7 +612,7 @@
 		spread = 4
 		spread_unwielded = 12
 		recoil = 1
-		recoil_unwielded = 3
+		recoil_unwielded = 2
 
 /obj/item/gun/ballistic/shotgun/flamingarrow/update_icon_state()
 	. = ..()
@@ -628,12 +628,22 @@
 	base_icon_state = "flamingarrow_factory"
 	item_state = "flamingarrow_factory"
 
+/obj/item/gun/ballistic/shotgun/flamingarrow/factory/sawoff(mob/user)
+	. = ..()
+	if(.)
+		item_state = "flamingarrow_factory_sawn"
+
 /obj/item/gun/ballistic/shotgun/flamingarrow/bolt
 	name = "HP Flaming Bolt"
 	desc = "A sturdy, excellently-made lever-action rifle. This one appears to be a genuine antique, kept in incredibly good condition despite its advanced age. Chambered in .38."
 	icon_state = "flamingbolt"
 	item_state = "flamingbolt"
 
+/obj/item/gun/ballistic/shotgun/flamingarrow/bolt/sawoff(mob/user)
+	. = ..()
+	if(.)
+		item_state = "flamingbolt_sawn"
+
 //Elephant Gun
 /obj/item/gun/ballistic/shotgun/doublebarrel/twobore
 	name = "HP Huntsman"