Merge pull request #36409 from Cruix/disease_shuttle

Fixed cameras holding up the arrival shuttle
This commit is contained in:
oranges
2018-03-17 11:20:51 +13:00
committed by CitadelStationBot
parent 13709a7d34
commit 11d1119d6f
2 changed files with 10 additions and 6 deletions
@@ -6,8 +6,8 @@ the new instance inside the host to be updated to the template's stats.
*/
/mob/camera/disease
name = ""
real_name = ""
name = "Sentient Disease"
real_name = "Sentient Disease"
desc = ""
icon = 'icons/mob/blob.dmi'
icon_state = "marker"
+8 -4
View File
@@ -108,10 +108,14 @@
return FALSE
/obj/docking_port/mobile/arrivals/proc/PersonCheck()
for(var/M in (GLOB.alive_mob_list & GLOB.player_list))
var/mob/living/L = M
if((get_area(M) in areas) && L.stat != DEAD)
return TRUE
for(var/V in GLOB.player_list)
var/mob/M = V
if((get_area(M) in areas) && M.stat != DEAD)
if(!iscameramob(M))
return TRUE
var/mob/camera/C = M
if(C.move_on_shuttle)
return TRUE
return FALSE
/obj/docking_port/mobile/arrivals/proc/NukeDiskCheck()