Merge remote-tracking branch 'cmss13-devs/master' into forest/paperwork

cmss13-devs · Sep 14, 2024 · 0a29a5d · 0a29a5d
2 parents 9b4cf0c + 55afe61
commit 0a29a5d
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 7 deletions.
diff --git a/code/game/machinery/doors/poddoor/shutters/shutters.dm b/code/game/machinery/doors/poddoor/shutters/shutters.dm
@@ -152,7 +152,7 @@
 		return
 
 /obj/structure/machinery/door/poddoor/shutters/almayer/uniform_vendors/attackby(obj/item/attacking_item, mob/user)
-	if(HAS_TRAIT(attacking_item, TRAIT_TOOL_CROWBAR))
+	if(HAS_TRAIT(attacking_item, TRAIT_TOOL_CROWBAR) || attacking_item.pry_capable)
 		return
 	..()
 

diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm
@@ -49,6 +49,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_tl, list(
 
 		list("ENGINEERING SUPPLIES", 0, null, null, null),
 		list("Plastic Explosive", 10, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR),
+		list("Signal Flare Pack", 5, /obj/item/storage/box/m94/signal, null, VENDOR_ITEM_REGULAR),
 		list("Breaching Charge", 10, /obj/item/explosive/plastic/breaching_charge, null, VENDOR_ITEM_REGULAR),
 		list("ES-11 Mobile Fuel Canister", 5, /obj/item/tool/weldpack/minitank, null, VENDOR_ITEM_REGULAR),
 		list("ME3 Hand Welder", 5, /obj/item/tool/weldingtool/simple, null, VENDOR_ITEM_REGULAR),

diff --git a/code/game/objects/effects/landmarks/survivor_spawner.dm b/code/game/objects/effects/landmarks/survivor_spawner.dm
@@ -169,7 +169,7 @@
 	spawn_priority = SPAWN_PRIORITY_VERY_HIGH
 
 /obj/effect/landmark/survivor_spawner/shivas_panic_room_doc
-	equipment = /datum/equipment_preset/survivor/doctor
+	equipment = /datum/equipment_preset/survivor/doctor/shiva
 	synth_equipment = /datum/equipment_preset/synth/survivor/emt_synth
 	intro_text = list("<h2>You are a Medical Doctor on the Colony!</h2>",\
 	"<span class='notice'>You are aware of the xenomorph threat.</span>",\
@@ -179,7 +179,7 @@
 	spawn_priority = SPAWN_PRIORITY_HIGH
 
 /obj/effect/landmark/survivor_spawner/shivas_panic_room_sci
-	equipment = /datum/equipment_preset/survivor/scientist
+	equipment = /datum/equipment_preset/survivor/scientist/shiva
 	synth_equipment = /datum/equipment_preset/synth/survivor/scientist_synth
 	intro_text = list("<h2>You are a Weyland-Yutani Scientist on the Colony!</h2>",\
 	"<span class='notice'>You are aware of the xenomorph threat.</span>",\

diff --git a/html/changelogs/AutoChangeLog-pr-7118.yml b/html/changelogs/AutoChangeLog-pr-7118.yml
@@ -0,0 +1,4 @@
+author: "tallfission"
+delete-after: True
+changes:
+  - rscadd: "FTL vendors get signal flare packs for 5 points."
diff --git a/html/changelogs/AutoChangeLog-pr-7144.yml b/html/changelogs/AutoChangeLog-pr-7144.yml
diff --git a/html/changelogs/AutoChangeLog-pr-7145.yml b/html/changelogs/AutoChangeLog-pr-7145.yml
@@ -0,0 +1,4 @@
+author: "realforest2001"
+delete-after: True
+changes:
+  - bugfix: "Fixes uniform vendor shutters being openable without access."
diff --git a/html/changelogs/AutoChangeLog-pr-7152.yml b/html/changelogs/AutoChangeLog-pr-7152.yml
@@ -0,0 +1,4 @@
+author: "realforest2001"
+delete-after: True
+changes:
+  - bugfix: "Scientists and Doctors from the Shiva panic room nightmare insert now spawn with snow gear as intended."
diff --git a/html/changelogs/archive/2024-09.yml b/html/changelogs/archive/2024-09.yml
@@ -64,3 +64,6 @@
   - balance: Removed far-sight from SG sights
   - balance: Increased smartgun bullet falloff to 4 from 1
   - balance: Increased smartgun bullet effective range to 7 from 0
+2024-09-14:
+  MistChristmas:
+  - balance: Buffs MW Fireman skill in line with the rest of MPs