-Securitrons will declare the threatlevel of the perp when making an arrest/detention

-emagging will turn declarations off
-People with criminal status "Incarcerated" or "Parolled" will increase threatlevel

Conflicts:
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/bots/secbot.dm
This commit is contained in:
ikarrus
2014-06-25 09:32:44 -04:00
committed by ZomgPonies
parent 50bf910867
commit 73cc0fca34
3 changed files with 24 additions and 18 deletions
+2 -1
View File
@@ -237,6 +237,7 @@ Auto Patrol: []"},
if(user) src.oldtarget_name = user.name
src.last_found = world.time
src.anchored = 0
src.declare_arrests = 0
src.emagged = 2
src.on = 1
src.icon_state = "[lasercolor]ed209[src.on]"
@@ -1006,4 +1007,4 @@ Auto Patrol: []"},
var/area/location = get_area(src)
for(var/mob/living/carbon/human/human in world)
if((human.z == src.z) && istype(human.glasses, /obj/item/clothing/glasses/hud/security) && !human.blinded)
human << "<span class='info'>\icon[human.glasses] [src.name] requesting assistance [arrest_type ? "detaining" : "arresting"] scumbag <b>[target]</b> in <b>[location]</b></span>"
human << "<span class='info'>\icon[human.glasses] [src.name] is [arrest_type ? "detaining" : "arresting"] level [threatlevel] <b>[target]</b> in <b>[location]</b></span>"
+2 -1
View File
@@ -222,6 +222,7 @@ Auto Patrol: []"},
if(user) src.oldtarget_name = user.name
src.last_found = world.time
src.anchored = 0
src.declare_arrests = 0
src.emagged = 2
src.on = 1
src.icon_state = "secbot[src.on]"
@@ -788,4 +789,4 @@ Auto Patrol: []"},
var/area/location = get_area(src)
for(var/mob/living/carbon/human/human in world)
if((human.z == src.z) && istype(human.glasses, /obj/item/clothing/glasses/hud/security) && !human.blinded)
human << "<span class='info'>\icon[human.glasses] [src.name] requesting assistance [arrest_type ? "detaining" : "arresting"] scumbag <b>[target]</b> in <b>[location]</b></span>"
human << "<span class='info'>\icon[human.glasses] [src.name] is [arrest_type ? "detaining" : "arresting"] level [threatlevel] <b>[target]</b> in <b>[location]</b></span>"