Fix #3259 in an annoying way

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
+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
+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)
@@ -0,0 +1,14 @@
# Your name. Remove the quotation mark and put in your name when copy+pasting the example changelog.
author: Tigerbat2000
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
changes:
- bugfix: "The nuclear disk escaping on the shuttle no longer counts as a syndicate minor victory."
- bugfix: "Cultists can once again actually greentext the escape objective."