mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-26 21:48:21 +01:00
Makes cling tentacle more reliable / less shit (#19855)
* Cling tentacle love, part 1/2 * legcuff sprite * S34N's changes * Apply suggestions from code review Co-authored-by: Farie82 <farie82@users.noreply.github.com> * attack logs. * BOY I LOVE ICON CONFLICTS 1/3 * BOY I LOVE ICON CONFLICTS (3/3) * EYE FOR AN ICON * description update * Final changes, whoops * [H] * swap the order Co-authored-by: Farie82 <farie82@users.noreply.github.com>
This commit is contained in:
@@ -1,3 +1,8 @@
|
||||
/obj/item/restraints
|
||||
name = "bugged restraints" //This item existed before this pr, but had no name or such. Better warn people if it exists
|
||||
desc = "Should not exist. Report me to a(n) coder/admin!"
|
||||
var/cuffed_state = "handcuff"
|
||||
|
||||
/obj/item/restraints/handcuffs
|
||||
name = "handcuffs"
|
||||
desc = "Use this to keep prisoners in line."
|
||||
@@ -17,7 +22,6 @@
|
||||
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'
|
||||
// Icon state for cuffed overlay on a mob
|
||||
var/cuffed_state = "handcuff"
|
||||
var/trashtype = null //For disposable cuffs
|
||||
var/ignoresClumsy = FALSE
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
gender = PLURAL
|
||||
icon = 'icons/obj/items.dmi'
|
||||
icon_state = "handcuff"
|
||||
cuffed_state = "legcuff"
|
||||
flags = CONDUCT
|
||||
throwforce = 0
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
@@ -20,6 +21,8 @@
|
||||
origin_tech = "engineering=4"
|
||||
var/armed = FALSE
|
||||
var/trap_damage = 20
|
||||
///Do we want the beartrap not to make a visable message on arm? Use when a beartrap is applied by something else.
|
||||
var/silent_arming = FALSE
|
||||
var/obj/item/grenade/iedcasing/IED = null
|
||||
var/obj/item/assembly/signaler/sig = null
|
||||
|
||||
@@ -97,8 +100,9 @@
|
||||
armed = FALSE
|
||||
update_icon()
|
||||
playsound(src.loc, 'sound/effects/snap.ogg', 50, 1)
|
||||
L.visible_message("<span class='danger'>[L] triggers \the [src].</span>", \
|
||||
"<span class='userdanger'>You trigger \the [src]!</span>")
|
||||
if(!silent_arming)
|
||||
L.visible_message("<span class='danger'>[L] triggers \the [src].</span>", \
|
||||
"<span class='userdanger'>You trigger \the [src]!</span>")
|
||||
|
||||
if(IED && isturf(src.loc))
|
||||
IED.active = TRUE
|
||||
|
||||
Reference in New Issue
Block a user