cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes missing assessment check.

Browse Source
This commit is contained in:
PsiOmegaDelta
2015-06-30 15:03:51 +02:00
parent beaaaa9f8a
commit 001d4839f1
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/machinery/portable_turret.dm
View File

@@ -503,7 +503,7 @@ var/list/turret_icons
if(emagged) if(emagged)
return 10 return 10
return H.assess_perp(src, check_weapons, check_records, check_arrest) return H.assess_perp(src, check_access, check_weapons, check_records, check_arrest)
/obj/machinery/porta_turret/proc/tryToShootAt(var/list/mob/living/targets) /obj/machinery/porta_turret/proc/tryToShootAt(var/list/mob/living/targets)
if(targets.len && last_target && (last_target in targets) && target(last_target)) if(targets.len && last_target && (last_target in targets) && target(last_target))

2
code/modules/mob/living/bot/secbot.dm
View File

@@ -342,7 +342,7 @@
if(emagged) if(emagged)
return 10 return 10
return M.assess_perp(access_scanner, idcheck, check_records, check_arrest) return M.assess_perp(access_scanner, 0, idcheck, check_records, check_arrest)
/mob/living/bot/secbot/proc/patrol_step() /mob/living/bot/secbot/proc/patrol_step()
if(loc == patrol_target) if(loc == patrol_target)

9
code/modules/mob/mob_helpers.dm
View File

@@ -622,13 +622,13 @@ proc/is_blind(A)
return client && client.inactivity < active MINUTES return client && client.inactivity < active MINUTES
#define SAFE_PERP -50 #define SAFE_PERP -50
/mob/living/proc/assess_perp(var/auth_weapons, var/check_records, var/check_arrest) /mob/living/proc/assess_perp(var/obj/access_obj, var/check_access, var/auth_weapons, var/check_records, var/check_arrest)
if(stat == DEAD) if(stat == DEAD)
return SAFE_PERP return SAFE_PERP
return 0 return 0
/mob/living/carbon/human/assess_perp(var/obj/access_obj, var/auth_weapons, var/check_records, var/check_arrest) /mob/living/carbon/human/assess_perp(var/obj/access_obj, var/check_access, var/auth_weapons, var/check_records, var/check_arrest)
var/threatcount = ..() var/threatcount = ..()
if(. == SAFE_PERP) if(. == SAFE_PERP)
return SAFE_PERP return SAFE_PERP
@@ -640,6 +640,9 @@ proc/is_blind(A)
// A proper CentCom id is hard currency. // A proper CentCom id is hard currency.
else if(id && istype(id, /obj/item/weapon/card/id/centcom)) else if(id && istype(id, /obj/item/weapon/card/id/centcom))
return SAFE_PERP return SAFE_PERP
if(check_access && !access_obj.allowed(src))
threatcount += 4
if(auth_weapons && !access_obj.allowed(src)) if(auth_weapons && !access_obj.allowed(src))
if(istype(l_hand, /obj/item/weapon/gun) || istype(l_hand, /obj/item/weapon/melee)) if(istype(l_hand, /obj/item/weapon/gun) || istype(l_hand, /obj/item/weapon/melee))
@@ -668,7 +671,7 @@ proc/is_blind(A)
return threatcount return threatcount
/mob/living/simple_animal/hostile/assess_perp(var/obj/access_obj, var/auth_weapons, var/check_records, var/check_arrest) /mob/living/simple_animal/hostile/assess_perp(var/obj/access_obj, var/check_access, var/auth_weapons, var/check_records, var/check_arrest)
var/threatcount = ..() var/threatcount = ..()
if(. == SAFE_PERP) if(. == SAFE_PERP)
return SAFE_PERP return SAFE_PERP