Merge branch 'master' into triumph-central-command-floor-fix

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

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

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

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