Merge remote-tracking branch 'cmss13-devs/master' into project/fax_re…

…sponders
cmss13-devs · Sep 14, 2024 · cbe904e · cbe904e
2 parents 4a9cf67 + 55afe61
commit cbe904e
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 9 deletions.
diff --git a/code/datums/ammo/bullet/special_ammo.dm b/code/datums/ammo/bullet/special_ammo.dm
@@ -9,10 +9,12 @@
 	icon_state = "redbullet"
 	flags_ammo_behavior = AMMO_BALLISTIC
 
+	damage_falloff = DAMAGE_FALLOFF_TIER_7
 	max_range = 12
 	accuracy = HIT_ACCURACY_TIER_4
 	damage = 30
 	penetration = 0
+	effective_range_max = 7
 
 /datum/ammo/bullet/smartgun/armor_piercing
 	name = "armor-piercing smartgun bullet"
@@ -31,6 +33,7 @@
 	shrapnel_chance = SHRAPNEL_CHANCE_TIER_7
 	accurate_range = 32
 	accuracy = HIT_ACCURACY_TIER_3
+	damage_falloff = DAMAGE_FALLOFF_TIER_10
 	damage = 40
 	penetration = 0
 

diff --git a/code/datums/skills/uscm.dm b/code/datums/skills/uscm.dm
@@ -174,7 +174,7 @@ MILITARY NONCOMBATANT
 	skills = list(
 		SKILL_CQC = SKILL_CQC_SKILLED,
 		SKILL_POLICE = SKILL_POLICE_SKILLED,
-		SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
+		SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
 		SKILL_LEADERSHIP = SKILL_LEAD_TRAINED,
 		SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,

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/code/modules/clothing/glasses/night.dm b/code/modules/clothing/glasses/night.dm
@@ -94,7 +94,7 @@
 	icon_state = "m56_goggles"
 	deactive_state = "m56_goggles_0"
 	toggleable = TRUE
-	actions_types = list(/datum/action/item_action/toggle, /datum/action/item_action/m56_goggles/far_sight)
+	actions_types = list(/datum/action/item_action/toggle)
 	vision_flags = SEE_TURFS
 	fullscreen_vision = null
 	req_skill = SKILL_SPEC_WEAPONS
@@ -203,6 +203,7 @@
 	name = "\improper M56T head mounted sight"
 	desc = "A headset and goggles system for the M56T 'Terminator' Smartgun. Has a low-light vision processor as well as a system allowing detection of thermal signatures though solid surfaces."
 	vision_flags = SEE_TURFS|SEE_MOBS
+	actions_types = list(/datum/action/item_action/toggle, /datum/action/item_action/m56_goggles/far_sight)
 
 /obj/item/clothing/glasses/night/yautja
 	name = "bio-mask nightvision"

diff --git a/html/changelogs/AutoChangeLog-pr-7059.yml b/html/changelogs/AutoChangeLog-pr-7059.yml
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-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
@@ -55,3 +55,15 @@
       active.'
   realforest2001:
   - bugfix: You can build on tiles with fire doors again.
+2024-09-11:
+  rythenx:
+  - bugfix: drop pouch's switch storage drawing method now works correctly instead
+      of doing nothing
+2024-09-13:
+  Git-Nivrak:
+  - 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