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

Merge pull request #5346 from KasparoVy/locker_z_level_voodoo_fix

Browse Source 
Fixes Accidental Greentext for Maroon and Redtext for Assassination Objectives, Resolves #5306
This commit is contained in:
Fox McCloud
2016-08-07 20:01:29 -04:00
committed by GitHub
parent 94be87f6a4 6edee2b55a
commit ce773d22a2
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/objective.dm
+4 -13
View File
@@ -78,7 +78,7 @@ var/list/potential_theft_objectives=subtypesof(/datum/theft_objective) \
check_completion()
if(target && target.current)
// TODO: Tie into space manager
if(target.current.stat == DEAD || issilicon(target.current) || isbrain(target.current) || target.current.z > ZLEVEL_DERELICT || !target.current.ckey) //Borgs/brains/AIs count as dead for traitor objectives. --NeoFite
if(target.current.stat == DEAD || issilicon(target.current) || isbrain(target.current) || !target.current.ckey) //Borgs/brains/AIs count as dead for traitor objectives. --NeoFite
return 1
return 0
return 1
@@ -174,10 +174,11 @@ var/list/potential_theft_objectives=subtypesof(/datum/theft_objective) \
check_completion()
if(target && target.current)
// TODO: Tie into space manager
if(target.current.stat == DEAD || issilicon(target.current) || isbrain(target.current) || target.current.z > ZLEVEL_DERELICT || !target.current.ckey) //Borgs/brains/AIs count as dead for traitor objectives. --NeoFite
if(target.current.stat == DEAD || issilicon(target.current) || isbrain(target.current) || !target.current.ckey) //Borgs/brains/AIs count as dead for traitor objectives. --NeoFite
return 1
// TODO: Tie into space manager
if((target.current.z in config.admin_levels))
var/turf/target_location = get_turf(target.current)
if(target_location.z in config.admin_levels) //No hiding in lockers and cheezing greentext.
return 0
return 1
@@ -342,16 +343,6 @@ var/list/potential_theft_objectives=subtypesof(/datum/theft_objective) \
/datum/objective/escape
explanation_text = "Escape on the shuttle or an escape pod alive and free."
var/escape_areas = list(/area/shuttle/escape,
/area/shuttle/escape_pod1/centcom,
/area/shuttle/escape_pod1/transit,
/area/shuttle/escape_pod2/centcom,
/area/shuttle/escape_pod2/transit,
/area/shuttle/escape_pod3/centcom,
/area/shuttle/escape_pod3/transit,
/area/shuttle/escape_pod5/centcom,
/area/shuttle/escape_pod5/transit,
/area/centcom/evac)
check_completion()
if(issilicon(owner.current))