cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-21 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1781 from CHOMPStationBot/upstream-merge-10121

Browse Source 
[MIRROR] [MIRROR] Fixes worn or held teshari not counting as successfully transferred
This commit is contained in:
Nadyr
2021-04-11 06:30:11 -04:00
committed by GitHub
parent 8e224e1410 24eacca663
commit dfe6c73e93
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/game_mode.dm
+13 -12
View File
@@ -316,36 +316,37 @@ 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++
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)
if(M_area_type == /area/shuttle/escape_pod5/centcom)
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++