From 695ee00d8427a92bf6f45cdd677514cf604b42c8 Mon Sep 17 00:00:00 2001 From: oranges Date: Sat, 17 Mar 2018 11:20:51 +1300 Subject: [PATCH 1/2] Merge pull request #36409 from Cruix/disease_shuttle Fixed cameras holding up the arrival shuttle --- code/modules/antagonists/disease/disease_mob.dm | 4 ++-- code/modules/shuttle/arrivals.dm | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/code/modules/antagonists/disease/disease_mob.dm b/code/modules/antagonists/disease/disease_mob.dm index 79b218686bb3..07542dca029d 100644 --- a/code/modules/antagonists/disease/disease_mob.dm +++ b/code/modules/antagonists/disease/disease_mob.dm @@ -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" diff --git a/code/modules/shuttle/arrivals.dm b/code/modules/shuttle/arrivals.dm index 398d3505772d..5090800ff46e 100644 --- a/code/modules/shuttle/arrivals.dm +++ b/code/modules/shuttle/arrivals.dm @@ -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() From e4ee37275729930273c7ef7b019cb0f86825a24c Mon Sep 17 00:00:00 2001 From: yogstation13-bot Date: Fri, 16 Mar 2018 23:21:28 +0100 Subject: [PATCH 2/2] Fixed cameras holding up the arrival shuttle