Merge branch 'master' into stop-doing-that

code/game/objects/effects/step_triggers.dm

@@ -216,3 +216,28 @@
 		to_chat(A, SPAN_DANGER("You get lost into the depths of space, never to be seen again."))
 		qdel(A)
 
+/obj/effect/step_trigger/teleporter_vector/damage //you take damage and are stunned when you step on it, think falling down elevatorshaft or second story of a building
+	var/damage = 30
+	var/penetration = 50
+	var/target_limbs = list(
+		"l_leg",
+		"l_foot",
+		"r_leg",
+		"r_foot"
+	)
+
+/obj/effect/step_trigger/teleporter_vector/damage/Trigger(atom/movable/atom)
+	. = ..()
+
+	var/mob/living/carbon/victim = atom
+	if(!istype(victim))
+		return
+
+	if(victim.pain.feels_pain)
+		victim.pain.apply_pain(PAIN_BONE_BREAK / 2) // like a bone break but not as bad
+		victim.emote("pain")
+
+	victim.apply_armoured_damage(damage, penetration = penetration, def_zone = pick(target_limbs))
+	victim.KnockDown(15)
+	victim.Stun(15)
+

code/game/objects/structures/ladders.dm

@@ -275,3 +275,12 @@
 	unslashable = TRUE
 	unacidable = TRUE
 	layer = LADDER_LAYER
+
+/obj/structure/ladder/rope
+	name = "rope"
+	desc = "A sturdy rope."
+	icon = 'icons/obj/structures/props/almayer_props.dmi'
+	icon_state = "rope"
+
+/obj/structure/ladder/rope/update_icon()
+	return

code/game/objects/structures/props.dm

@@ -1206,3 +1206,13 @@
 	name = "Working Joe"
 	desc = "A Seegson-brand Working Joe, stored in the synthetic maintenance station to be called upon whenever you need. If only you had the keys."
 	icon_state = "joe"
+
+/obj/structure/prop/invuln/darkness //I cant take credit for this, whoever made LV671 this was all you
+	name = "Darkness"
+	icon = 'icons/turf/areas.dmi'
+	icon_state = "dark128"
+	alpha = 200
+	opacity = 0
+	mouse_opacity = 0
+	layer = 6
+	density = 0

html/changelogs/archive/2025-01.yml

@@ -45,3 +45,14 @@
 2025-01-05:
   SpartanBobby:
   - maptweak: Adds security console to Golden Arrow shared office
+2025-01-06:
+  AmoryBlaine:
+  - rscadd: M20A racks, unloaded variant of M20A
+  SpartanBobby:
+  - maptweak: Adds two APC storage containers to the UD4 Midway
+2025-01-09:
+  SpartanBobby:
+  - maptweak: Fixes Rover layering issue
+  SpartanBobby and idk how made LV617 but his darkness overlay tile is cool as fuck:
+  - rscadd: Adds a ladder that looks like a rope, A teleport vector that hurts you
+      to simulate falling and the "darkness" overlay tile from LV617

maps/map_files/rover/rover.dmm

@@ -3426,7 +3426,8 @@
 /area/golden_arrow/hangar)
 "OP" = (
 /obj/structure/cargo_container/lockmart/left{
-	pixel_y = 5
+	pixel_y = 5;
+	layer = 5.2
 	},
 /turf/open/floor/almayer/plate,
 /area/golden_arrow/hangar)
@@ -3771,7 +3772,8 @@
 /area/golden_arrow/prep_hallway)
 "TJ" = (
 /obj/structure/cargo_container/lockmart/mid{
-	pixel_y = 5
+	pixel_y = 5;
+	layer = 5.2
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)