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

Fix #3259 in an annoying way

Browse Source
This commit is contained in:
Tigercat2000
2016-01-21 20:06:20 -08:00
parent e7ce3bc19e
commit bfcc172edc
3 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/cult/cult.dm
+3
View File
@@ -276,6 +276,9 @@
var/area/A = get_area(cult_mind.current )
if ( is_type_in_list(A, centcom_areas))
acolytes_survived++
else if(A == shuttle_master.emergency.areaInstance && shuttle_master.emergency.mode >= SHUTTLE_ESCAPE) //snowflaked into objectives because shitty bay shuttles had areas to auto-determine this
acolytes_survived++
if(acolytes_survived>=acolytes_needed)
return 0
else
code/game/gamemodes/nuclear/nuclear.dm
+2
View File
@@ -300,6 +300,8 @@ proc/issyndicate(mob/living/M as mob)
for(var/obj/item/weapon/disk/nuclear/D in world)
var/disk_area = get_area(D)
if(!is_type_in_list(disk_area, centcom_areas))
if(disk_area == shuttle_master.emergency.areaInstance && shuttle_master.emergency.mode >= SHUTTLE_ESCAPE) //snowflaked into objectives because shitty bay shuttles had areas to auto-determine this
break
disk_rescued = 0
break
var/crew_evacuated = (shuttle_master.emergency.mode >= SHUTTLE_ESCAPE)