shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ports "Resisting out of bucklecuffs takes an amount of time dependent on cuffs used", also toy handcuffs no longer demoralize the wearer.

Browse Source
This commit is contained in:
Ghommie
2019-09-20 22:57:06 +02:00
parent 2c70bd097c
commit 1f2c19c1da
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/handcuffs.dm
+2
View File
@@ -39,6 +39,7 @@
breakouttime = 600 //Deciseconds = 60s = 1 minute breakouttime = 600 //Deciseconds = 60s = 1 minute
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
var/cuffsound = 'sound/weapons/handcuffs.ogg' var/cuffsound = 'sound/weapons/handcuffs.ogg'
var/demoralize_criminals = TRUE // checked on carbon/carbon.dm to decide wheter to apply the handcuffed negative moodlet or not.
var/trashtype = null //for disposable cuffs var/trashtype = null //for disposable cuffs
/obj/item/restraints/handcuffs/attack(mob/living/carbon/C, mob/living/user) /obj/item/restraints/handcuffs/attack(mob/living/carbon/C, mob/living/user)
@@ -220,6 +221,7 @@
name = "fake handcuffs" name = "fake handcuffs"
desc = "Fake handcuffs meant for gag purposes." desc = "Fake handcuffs meant for gag purposes."
breakouttime = 10 //Deciseconds = 1s breakouttime = 10 //Deciseconds = 1s
demoralize_criminals = FALSE
/obj/item/restraints/handcuffs/fake/kinky /obj/item/restraints/handcuffs/fake/kinky
name = "kinky handcuffs" name = "kinky handcuffs"
code/modules/mob/living/carbon/carbon.dm
+8 -3
View File
@@ -271,9 +271,13 @@
if(restrained()) if(restrained())
changeNext_move(CLICK_CD_BREAKOUT) changeNext_move(CLICK_CD_BREAKOUT)
last_special = world.time + CLICK_CD_BREAKOUT last_special = world.time + CLICK_CD_BREAKOUT
var/buckle_cd = 600
if(handcuffed)
var/obj/item/restraints/O = src.get_item_by_slot(SLOT_HANDCUFFED)
buckle_cd = O.breakouttime
visible_message("<span class='warning'>[src] attempts to unbuckle [p_them()]self!</span>", \ visible_message("<span class='warning'>[src] attempts to unbuckle [p_them()]self!</span>", \
"<span class='notice'>You attempt to unbuckle yourself... (This will take around one minute and you need to stay still.)</span>") "<span class='notice'>You attempt to unbuckle yourself... (This will take around [round(buckle_cd/600,1)] minute\s, and you need to stay still.)</span>")
if(do_after(src, 600, 0, target = src)) if(do_after(src, buckle_cd, 0, target = src))
if(!buckled) if(!buckled)
return return
buckled.user_unbuckle_mob(src,src) buckled.user_unbuckle_mob(src,src)
@@ -801,7 +805,8 @@
drop_all_held_items() drop_all_held_items()
stop_pulling() stop_pulling()
throw_alert("handcuffed", /obj/screen/alert/restrained/handcuffed, new_master = src.handcuffed) throw_alert("handcuffed", /obj/screen/alert/restrained/handcuffed, new_master = src.handcuffed)
SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "handcuffed", /datum/mood_event/handcuffed) if(handcuffed.demoralize_criminals)
SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "handcuffed", /datum/mood_event/handcuffed)
else else
clear_alert("handcuffed") clear_alert("handcuffed")
SEND_SIGNAL(src, COMSIG_CLEAR_MOOD_EVENT, "handcuffed") SEND_SIGNAL(src, COMSIG_CLEAR_MOOD_EVENT, "handcuffed")