Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-sync

This commit is contained in:
xPokee
2025-10-04 05:28:09 -04:00
67 changed files with 1444 additions and 796 deletions
+5 -11
View File
@@ -566,20 +566,14 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
return
/obj/effect/landmark/start/hangover/JoinPlayerHere(mob/joining_mob, buckle)
. = ..()
make_hungover(joining_mob)
/obj/effect/landmark/start/hangover/closet
name = "hangover spawn closet"
icon_state = "hangover_spawn_closet"
/obj/effect/landmark/start/hangover/closet/JoinPlayerHere(mob/joining_mob, buckle)
. = ..()
var/mob/created_joining_mob = ..()
make_hungover(created_joining_mob)
for(var/obj/structure/closet/closet in get_turf(src))
if(closet.opened)
continue
joining_mob.forceMove(closet)
return
created_joining_mob.forceMove(closet)
return created_joining_mob
return created_joining_mob
//Landmark that creates destinations for the navigate verb to path to
/obj/effect/landmark/navigate_destination