Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Being on the Emergency Shuttle now counts as "escaping" #9882

Merged
merged 5 commits into from
Sep 27, 2023
Merged

Being on the Emergency Shuttle now counts as "escaping" #9882

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
341534a
uhhh
mystery3525 Sep 23, 2023
537f890
vine boom
mystery3525 Sep 23, 2023
f7c96f9
le move
mystery3525 Sep 23, 2023
0bc0035
changes
mystery3525 Sep 23, 2023
f290830
I just deleted it
mystery3525 Sep 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions code/game/atoms.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,21 +362,29 @@
if(T in shuttle_area)
return TRUE

if(!is_centcom_level(T.z))//if not, don't bother
return FALSE

//Check for centcom itself
if(istype(T.loc, /area/centcom))
return TRUE

//Check for centcom shuttles
return onCentComShuttle()

/**
* Is this atom currently on a centcom roundend escape shuttle?
*/
/atom/proc/onCentComShuttle()
var/turf/T = get_turf(src)
if(!T)
return FALSE

var/area/shuttle/loc_area = get_area(T)
if(isnull(loc_area))
return FALSE

for(var/A in SSshuttle.mobile)
var/obj/docking_port/mobile/M = A
if(M.launch_status == ENDGAME_LAUNCHED)
for(var/place in M.shuttle_areas)
var/area/shuttle/shuttle_area = place
if(T in shuttle_area)
return TRUE
if(loc_area in M.shuttle_areas)
return TRUE

/**
* Is the atom in any of the centcom syndicate areas
Expand Down