Handcuff teamwork (#12481)

This commit is contained in:
nerocavalier
2021-09-13 11:31:08 +02:00
committed by GitHub
parent 10bc4f7b42
commit 641e934032
2 changed files with 45 additions and 3 deletions
+3 -3
View File
@@ -41,7 +41,7 @@
can_place = TRUE
else
for (var/obj/item/grab/G in C.grabbed_by)
if (G.loc == user && G.state >= GRAB_AGGRESSIVE)
if (G.state >= GRAB_AGGRESSIVE)
can_place = TRUE
break
@@ -102,7 +102,7 @@
user.drop_from_inventory(cuffs,target)
else
cuffs.forceMove(target)
if(!legcuff)
target.handcuffed = cuffs
target.update_inv_handcuffed()
@@ -250,4 +250,4 @@
icon_state = "legcuff"
legcuff = TRUE
breakouttime = 30 SECONDS
cuff_type = "legcuffs"
cuff_type = "legcuffs"
+42
View File
@@ -0,0 +1,42 @@
################################
# 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
# admin
# backend
# security
# refactor
#################################
# Your name.
author: NeroCavalier
# 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: "You are now able to handcuff people being aggressively grabbed by other players."