mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-07-18 19:53:35 +01:00
[MIRROR] oups shuttles move (#10563)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
4d7193d478
commit
46fc30e83e
@@ -1033,7 +1033,7 @@ var/datum/announcement/minor/admin_min_announcer = new
|
||||
set name = "Unprison"
|
||||
if (M.z == 2)
|
||||
if (CONFIG_GET(flag/allow_admin_jump))
|
||||
M.loc = pick(latejoin)
|
||||
M.loc = get_turf(pick(latejoin))
|
||||
message_admins("[key_name_admin(usr)] has unprisoned [key_name_admin(M)]", 1)
|
||||
log_admin("[key_name(usr)] has unprisoned [key_name(M)]")
|
||||
else
|
||||
|
||||
@@ -486,7 +486,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
|
||||
|
||||
if("Arrivals") //Spawn them at a latejoin spawnpoint
|
||||
if(LAZYLEN(latejoin))
|
||||
spawnloc = pick(latejoin)
|
||||
spawnloc = get_turf(pick(latejoin))
|
||||
else if(LAZYLEN(latejoin_tram))
|
||||
spawnloc = pick(latejoin_tram)
|
||||
else
|
||||
|
||||
@@ -132,7 +132,7 @@
|
||||
default_pixel_x = body.default_pixel_x
|
||||
default_pixel_y = body.default_pixel_y
|
||||
if(!T && length(latejoin))
|
||||
T = pick(latejoin) //Safety in case we cannot find the body's position
|
||||
T = get_turf(pick(latejoin)) //Safety in case we cannot find the body's position
|
||||
if(T)
|
||||
forceMove(T, just_spawned = TRUE)
|
||||
else
|
||||
|
||||
@@ -1213,7 +1213,7 @@
|
||||
else
|
||||
log_debug("[src] (\ref[src]) doesn't have an owner, and dropped someone at a latespawn point!")
|
||||
var/fallback = pick(latejoin)
|
||||
return fallback
|
||||
return get_turf(fallback)
|
||||
|
||||
//Yes, it's ""safe"" to drop items here
|
||||
/obj/belly/AllowDrop()
|
||||
|
||||
Reference in New Issue
Block a user