cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 22:47:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10745 from Kyep/stop_murdering_admins

Browse Source 
Fixes #10729 - objectives targeting admin centcom characters
This commit is contained in:
variableundefined
2019-01-27 09:40:57 +08:00
committed by GitHub
parent da6ff88ea4 ede5217093
commit bda47bd994
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/gamemode.dm
+1
View File
@@ -3,6 +3,7 @@
#define TARGET_INVALID_NOT_HUMAN 2
#define TARGET_INVALID_DEAD 3
#define TARGET_INVALID_NOCKEY 4
#define TARGET_INVALID_UNREACHABLE 5
//gamemode istype helpers
#define GAMEMODE_IS_BLOB (ticker && istype(ticker.mode, /datum/game_mode/blob))
code/game/gamemodes/objective.dm
+4
View File
@@ -31,6 +31,10 @@ var/list/potential_theft_objectives = subtypesof(/datum/theft_objective) - /datu
return TARGET_INVALID_DEAD
if(!possible_target.key)
return TARGET_INVALID_NOCKEY
if(possible_target.current)
var/turf/current_location = get_turf(possible_target.current)
if(current_location && !is_level_reachable(current_location.z))
return TARGET_INVALID_UNREACHABLE
/datum/objective/proc/find_target()
var/list/possible_targets = list()