Merge remote-tracking branch 'upstream/master' into deployment

shiptest-ss13 · Sep 25, 2024 · 74fcf23 · 74fcf23
2 parents ae3e8d8 + d0171aa
commit 74fcf23
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 6 deletions.
diff --git a/_maps/shuttles/independent/independent_mudskipper.dmm b/_maps/shuttles/independent/independent_mudskipper.dmm
@@ -1096,6 +1096,9 @@
 	dir = 4;
 	id = "mudskipper_engine"
 	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "zR" = (
@@ -1670,6 +1673,9 @@
 	dir = 4;
 	id = "mudskipper_engine"
 	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "MK" = (

diff --git a/_maps/shuttles/independent/independent_shetland.dmm b/_maps/shuttles/independent/independent_shetland.dmm
@@ -1492,7 +1492,7 @@
 	},
 /obj/machinery/button/door{
 	dir = 1;
-	id = "amogusthrusters";
+	id = "shetportthrusters";
 	name = "Thruster Lockdown";
 	pixel_y = -21
 	},
@@ -2297,7 +2297,7 @@
 	pixel_y = 5
 	},
 /obj/machinery/button/door{
-	id = "amogusthrusters";
+	id = "shetstarboardengine";
 	name = "Thruster Lockdown";
 	pixel_y = 24
 	},
@@ -2748,11 +2748,14 @@
 	},
 /obj/machinery/door/poddoor{
 	dir = 4;
-	id = "amogusthrusters"
+	id = "shetstarboardengine"
 	},
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
 "wU" = (
@@ -4423,11 +4426,14 @@
 	},
 /obj/machinery/door/poddoor{
 	dir = 4;
-	id = "amogusthrusters"
+	id = "shetportthrusters"
 	},
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "Lx" = (
@@ -4989,11 +4995,14 @@
 	},
 /obj/machinery/door/poddoor{
 	dir = 4;
-	id = "amogusthrusters"
+	id = "shetportthrusters"
 	},
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "PR" = (
@@ -5157,11 +5166,14 @@
 	},
 /obj/machinery/door/poddoor{
 	dir = 4;
-	id = "amogusthrusters"
+	id = "shetstarboardengine"
 	},
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
 "Ri" = (

diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm
@@ -127,6 +127,8 @@
 	sawn_off = TRUE
 	weapon_weight = WEAPON_MEDIUM
 	w_class = WEIGHT_CLASS_NORMAL
+	spread = 24
+	spread_unwielded = 30
 	slot_flags = ITEM_SLOT_BELT
 
 /obj/item/gun/ballistic/rifle/solgov

diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -432,6 +432,14 @@ EMPTY_GUN_HELPER(shotgun/automatic/bulldog/inteq)
 	sawn_off = TRUE
 	slot_flags = ITEM_SLOT_BELT
 
+	wield_slowdown = 0.25
+	wield_delay = 0.3 SECONDS //OP? maybe
+
+	spread = 8
+	spread_unwielded = 15
+	recoil = 3 //or not
+	recoil_unwielded = 5
+
 /obj/item/gun/ballistic/shotgun/automatic/combat/compact/compact
 	name = "compact compact combat shotgun"
 	desc = "A compact version of the compact version of the semi automatic combat shotgun. For when you want a gun the same size as your brain."

diff --git a/html/changelogs/archive/2024-09.yml b/html/changelogs/archive/2024-09.yml
@@ -163,3 +163,10 @@
   - bugfix: miso soup spelling error
   zimon9:
   - rscadd: Adds a bit more contrast to the output of health analyzers
+2024-09-25:
+  Jedi-Toothpaste:
+  - bugfix: Added windows to the mudskipper and shetland's engines.
+  - bugfix: Adjusted the blast doors which open on the Shetland's engines.
+  SomeguyManperson:
+  - bugfix: sawn off illestren/improvised shotgun stats are now consistent if they
+      are spawned in