From c42ba4d9e37659d77d8b080b3de2a7708a5954de Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Mon, 17 Jul 2023 15:53:22 -0700 Subject: [PATCH 1/3] fixes guest pass consoles being climbable (#5729) --- code/game/machinery/computer/guestpass.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/computer/guestpass.dm b/code/game/machinery/computer/guestpass.dm index 2d7851711b0e..ded499f7c774 100755 --- a/code/game/machinery/computer/guestpass.dm +++ b/code/game/machinery/computer/guestpass.dm @@ -84,7 +84,9 @@ layer = ABOVE_TURF_LAYER icon_keyboard = null icon_screen = "pass" - density = 0 + depth_projected = FALSE + climb_allowed = FALSE + density = FALSE circuit = /obj/item/circuitboard/guestpass var/obj/item/card/id/giver From be8f82cf7e9b968636f728b09f9ef73133326fa0 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Mon, 17 Jul 2023 15:54:07 -0700 Subject: [PATCH 2/3] fixes smartfridges not updating icon on load (#5723) --- code/modules/food/kitchen/smartfridge.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/food/kitchen/smartfridge.dm b/code/modules/food/kitchen/smartfridge.dm index a3f79d0cf965..0a531eeaf693 100644 --- a/code/modules/food/kitchen/smartfridge.dm +++ b/code/modules/food/kitchen/smartfridge.dm @@ -37,6 +37,7 @@ wires = new/datum/wires/smartfridge/secure(src) else wires = new/datum/wires/smartfridge(src) + update_icon() /obj/machinery/smartfridge/Destroy() AIR_UPDATE_ON_DESTROY_AUTO From a3b68fd5482594c3a0919fb642d6d80bc039e662 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Mon, 17 Jul 2023 15:54:30 -0700 Subject: [PATCH 3/3] fxies triumph spawnpoints (#5724) Co-authored-by: silicons --- maps/triumph/levels/deck3.dmm | 14 +++++++++++--- maps/triumph/levels/deck4.dmm | 6 +++++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/maps/triumph/levels/deck3.dmm b/maps/triumph/levels/deck3.dmm index 8a96fef650f3..7dbe9b1170a9 100644 --- a/maps/triumph/levels/deck3.dmm +++ b/maps/triumph/levels/deck3.dmm @@ -4550,6 +4550,10 @@ }, /turf/simulated/floor/bluegrid, /area/rnd/xenobiology) +"dWe" = ( +/obj/landmark/spawnpoint/latejoin/station/cyborg, +/turf/simulated/floor/tiled/old_cargo/gray, +/area/assembly/robotics) "dWq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black, /obj/structure/cable/green{ @@ -26959,6 +26963,10 @@ }, /turf/simulated/floor/tiled/white, /area/medical/psych_ward) +"whU" = ( +/obj/landmark/spawnpoint/job/cyborg, +/turf/simulated/floor/tiled/techfloor, +/area/assembly/chargebay) "whY" = ( /obj/machinery/light{ dir = 1 @@ -34688,7 +34696,7 @@ ixf vGq wLK vGq -vGq +dWe wgM wor fUO @@ -36105,7 +36113,7 @@ biL jgu wQJ dXc -jEz +whU rLt sGT oYT @@ -36247,7 +36255,7 @@ fJP afy sGT mrJ -jEz +whU rLt sGT vQV diff --git a/maps/triumph/levels/deck4.dmm b/maps/triumph/levels/deck4.dmm index ffde4d85dd17..1a011b4e0694 100644 --- a/maps/triumph/levels/deck4.dmm +++ b/maps/triumph/levels/deck4.dmm @@ -29274,6 +29274,10 @@ /obj/structure/reagent_dispensers/beerkeg, /turf/simulated/floor/plating, /area/maintenance/central) +"vbT" = ( +/obj/landmark/spawnpoint/overflow/station, +/turf/simulated/floor/tiled/dark, +/area/hallway/primary/aft) "vbU" = ( /obj/machinery/power/smes/buildable{ charge = 5000; @@ -40410,7 +40414,7 @@ mSI psD psD psD -psD +vbT opV psD byi