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

Partial fix for #8068.

Browse Source
This commit is contained in:
Zuhayr
2015-02-28 17:29:26 +10:30
parent 273a9e2480
commit 0beb6259f6
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/game/machinery/bots/secbot.dm
View File

@@ -350,7 +350,12 @@ Auto Patrol: []"},
if(istype(src.target,/mob/living/carbon)) if(istype(src.target,/mob/living/carbon))
var/mob/living/carbon/C = target var/mob/living/carbon/C = target
if(!C.handcuffed && !src.arrest_type) var/wearing_hardsuit
if(istype(C,/mob/living/carbon/human))
var/mob/living/carbon/human/H = C
if(istype(H.back, /obj/item/weapon/rig) && istype(H.gloves,/obj/item/clothing/gloves/rig))
wearing_hardsuit = 1
if(!wearing_hardsuit && !C.handcuffed && !src.arrest_type)
playsound(src.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -2) playsound(src.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -2)
mode = SECBOT_ARREST mode = SECBOT_ARREST
visible_message("\red <B>[src] is trying to put handcuffs on [src.target]!</B>") visible_message("\red <B>[src] is trying to put handcuffs on [src.target]!</B>")

6
code/game/objects/items/weapons/handcuffs.dm
View File

@@ -43,7 +43,11 @@
var/mob/living/carbon/human/H = target var/mob/living/carbon/human/H = target
if (!H.has_organ_for_slot(slot_handcuffed)) if (!H.has_organ_for_slot(slot_handcuffed))
user << "\red \The [H] needs at least two wrists before you can cuff them together!" user << "<span class='danger'>\The [H] needs at least two wrists before you can cuff them together!</span>"
return
if(istype(H.gloves,/obj/item/clothing/gloves/rig)) // Can't cuff someone who's in a deployed hardsuit.
user << "<span class='danger'>The cuffs won't fit around \the [H.gloves]!</span>"
return return
H.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been handcuffed (attempt) by [user.name] ([user.ckey])</font>") H.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been handcuffed (attempt) by [user.name] ([user.ckey])</font>")