From 9783e982a4626523d3ef2ff8c1d62b189b051ccb Mon Sep 17 00:00:00 2001 From: Chompstation Bot Date: Sat, 10 Apr 2021 12:35:39 +0000 Subject: [PATCH 1/2] [MIRROR] Fixes worn or held teshari not counting as successfully transferred --- code/game/gamemodes/game_mode.dm | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 0fc08f66c1..9aacba2b6d 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -316,28 +316,35 @@ var/global/list/additional_antag_types = list() for(var/mob/M in player_list) if(M.client) clients++ + var/M_area_type = (get_turf(M))?.loc?.type if(ishuman(M)) if(M.stat != DEAD) surviving_humans++ - if(M.loc && M.loc.loc && M.loc.loc.type in escape_locations) + if(M_area_type in escape_locations) escaped_humans++ if(M.stat != DEAD) surviving_total++ - if(M.loc && M.loc.loc && M.loc.loc.type in escape_locations) + if(M_area_type in escape_locations) escaped_total++ - if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/escape/centcom) + if(M_area_type == /area/shuttle/escape/centcom) escaped_on_shuttle++ - if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/escape_pod1/centcom) + if(M_area_type == /area/shuttle/escape_pod1/centcom) escaped_on_pod_1++ - if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/escape_pod2/centcom) + if(M_area_type == /area/shuttle/escape_pod2/centcom) escaped_on_pod_2++ - if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/escape_pod3/centcom) + if(M_area_type == /area/shuttle/escape_pod3/centcom) escaped_on_pod_3++ +<<<<<<< HEAD if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/escape_pod4/centcom) //CHOMP Add escaped_on_pod_4++ if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/escape_pod5/centcom) +||||||| parent of 96804f69c8... Merge pull request #10121 from VOREStation/upstream-merge-8025 + if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/escape_pod5/centcom) +======= + if(M_area_type == /area/shuttle/escape_pod5/centcom) +>>>>>>> 96804f69c8... Merge pull request #10121 from VOREStation/upstream-merge-8025 escaped_on_pod_5++ if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/escape_pod6/centcom) //CHOMP Add escaped_on_pod_6++ From 24eacca663a0c3c7c08d31da7bdc36a4b8642320 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Sun, 11 Apr 2021 06:20:42 -0400 Subject: [PATCH 2/2] Update game_mode.dm --- code/game/gamemodes/game_mode.dm | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 9aacba2b6d..5a6d420837 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -336,23 +336,17 @@ var/global/list/additional_antag_types = list() escaped_on_pod_2++ if(M_area_type == /area/shuttle/escape_pod3/centcom) escaped_on_pod_3++ -<<<<<<< HEAD - if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/escape_pod4/centcom) //CHOMP Add + if(M_area_type == /area/shuttle/escape_pod4/centcom) //CHOMP Add escaped_on_pod_4++ - if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/escape_pod5/centcom) -||||||| parent of 96804f69c8... Merge pull request #10121 from VOREStation/upstream-merge-8025 - if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/escape_pod5/centcom) -======= if(M_area_type == /area/shuttle/escape_pod5/centcom) ->>>>>>> 96804f69c8... Merge pull request #10121 from VOREStation/upstream-merge-8025 escaped_on_pod_5++ - if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/escape_pod6/centcom) //CHOMP Add + if(M_area_type == /area/shuttle/escape_pod6/centcom) //CHOMP Add escaped_on_pod_6++ - if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/large_escape_pod1/centcom) //CHOMP Add + if(M_area_type == /area/shuttle/large_escape_pod1/centcom) //CHOMP Add escaped_on_pod_large_1++ - if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/large_escape_pod2/centcom) //CHOMP Add + if(M_area_type == /area/shuttle/large_escape_pod2/centcom) //CHOMP Add escaped_on_pod_large_2++ - if(M.loc && M.loc.loc && M.loc.loc.type == /area/shuttle/cryo/centcom) //CHOMP Add + if(M_area_type == /area/shuttle/cryo/centcom) //CHOMP Add escaped_on_cryopod++