cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 07:38:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changed the switch to an istype check. Also modified the clone hijack objective for consistency.

Browse Source
This commit is contained in:
palpatine213
2015-09-08 17:09:54 -07:00
parent 01a4e6653d
commit 6b1e20ea19
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/objective.dm
+6 -9
View File
@@ -224,9 +224,8 @@
for(var/mob/living/player in player_list)
if(player.mind && player.mind != owner)
if(player.stat != DEAD)
switch(player.type)
if(/mob/living/silicon) //Borgs are technically dead anyways
continue
if(istype(player, /mob/living/silicon)) //Borgs are technically dead anyways
continue
if(get_area(player) == A)
if(!player.mind.special_role && !istype(get_turf(player.mind.current), /turf/simulated/floor/plasteel/shuttle/red))
return 0
@@ -248,9 +247,8 @@
for(var/mob/living/player in player_list) //Make sure nobody else is onboard
if(player.mind && player.mind != owner)
if(player.stat != DEAD)
switch(player.type)
if(/mob/living/silicon/ai, /mob/living/silicon/pai)
continue
if(istype(player, /mob/living/silicon))
continue
if(get_area(player) == A)
if(player.real_name != owner.current.real_name && !istype(get_turf(player.mind.current), /turf/simulated/floor/plasteel/shuttle/red))
return 0
@@ -258,9 +256,8 @@
for(var/mob/living/player in player_list) //Make sure at least one of you is onboard
if(player.mind && player.mind != owner)
if(player.stat != DEAD)
switch(player.type)
if(/mob/living/silicon/ai, /mob/living/silicon/pai)
continue
if(istype(player, /mob/living/silicon))
continue
if(get_area(player) == A)
if(player.real_name == owner.current.real_name && !istype(get_turf(player.mind.current), /turf/simulated/floor/plasteel/shuttle/red))
return 1