Made Straightjackets Escapable (#4303)

Straightjackets can now be escaped from, if you have sufficient time alone, and new sprites have been given to make them more jackety.
This commit is contained in:
Kaedwuff
2018-02-23 20:36:48 +01:00
committed by Werner
parent 54c5a91a36
commit e52bae09d7
5 changed files with 75 additions and 2 deletions
+2 -2
View File
@@ -171,8 +171,8 @@
desc = "A suit that completely restrains the wearer."
icon_state = "straight_jacket"
item_state = "straight_jacket"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|HANDS
flags_inv = HIDEGLOVES|HIDEJUMPSUIT
/obj/item/clothing/suit/straight_jacket/equipped(var/mob/user, var/slot)
if (slot == slot_wear_suit)
+36
View File
@@ -26,6 +26,41 @@
else if(legcuffed)
spawn() escape_legcuffs()
/mob/living/carbon/human/process_resist()
if (istype(wear_suit, /obj/item/clothing/suit/straight_jacket))
spawn
escape_jacket()
return
..()
/mob/living/carbon/human/proc/escape_jacket()
visible_message(
"<span class='danger'>\The [src] attempts to escape [wear_suit]!</span>",
"<span class='warning'>You attempt to escape [wear_suit]. (This will take around 6 minutes and you need to stand still)</span>"
)
if (!do_after(src, 1.5 MINUTES, act_target = wear_suit))
return
visible_message(
"<span class='danger'>\The [src] is shifting in their [wear_suit]!</span>",
"<span class='warning'>You start to loosen the [wear_suit].</span>"
)
if (!do_after(src, 1.5 MINUTES, act_target = wear_suit))
return
visible_message(
"<span class='danger'>\The [src] is moving in their [wear_suit]!</span>",
"<span class='warning'>You slip one of your arms out of the [wear_suit].</span>"
)
if (!do_after(src, 1.5 MINUTES, act_target = wear_suit))
return
visible_message(
"<span class='danger'>\The [src] is moving around in their [wear_suit] - it looks like they are about to break out!</span>",
"<span class='warning'>You start to pull loose the straps on the straightjacket[wear_suit].</span>"
)
if (do_after(src, 1.5 MINUTES, act_target = wear_suit))
var/obj/ex_suit = wear_suit
remove_from_mob(wear_suit)
ex_suit.forceMove(get_turf(src))
/mob/living/carbon/proc/escape_handcuffs()
//if(!(last_special <= world.time)) return
@@ -182,3 +217,4 @@
visible_message("<span class='danger'>[usr] manages to unbuckle themself!</span>",
"<span class='notice'>You successfully unbuckle yourself.</span>")
buckled.user_unbuckle_mob(src)
@@ -0,0 +1,37 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
#################################
# Your name.
author: Kaedwuff
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Straightjackets can now be escaped from, if you have sufficient time alone, and new sprites have been given to make them more jackety."
Binary file not shown.

Before

Width:  |  Height:  |  Size: 327 KiB

After

Width:  |  Height:  |  Size: 327 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 120 KiB

After

Width:  |  Height:  |  Size: 120 KiB