mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-07-16 18:36:43 +01:00
Merge branch 'master' into development
This commit is contained in:
@@ -319,6 +319,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
|
||||
icon_on = "pipeon" //Note - these are in masks.dmi
|
||||
icon_off = "pipeoff"
|
||||
smoketime = 0
|
||||
w_class = 1
|
||||
chem_volume = 50
|
||||
matchmes = "<span class='notice'>USER lights their NAME with their FLAME.</span>"
|
||||
lightermes = "<span class='notice'>USER manages to light their NAME with FLAME.</span>"
|
||||
|
||||
@@ -88,6 +88,7 @@ var/last_chew = 0
|
||||
if (!H.handcuffed) return
|
||||
if (H.a_intent != I_HURT) return
|
||||
if (H.zone_sel.selecting != "mouth") return
|
||||
if (!H.check_has_mouth()) return
|
||||
if (H.wear_mask) return
|
||||
if (istype(H.wear_suit, /obj/item/clothing/suit/straight_jacket)) return
|
||||
|
||||
@@ -167,4 +168,4 @@ var/last_chew = 0
|
||||
icon = 'icons/obj/items.dmi'
|
||||
icon_state = "ziptie"
|
||||
breakouttime = 600
|
||||
cuff_sound = 'sound/weapons/cablecuff.ogg'
|
||||
cuff_sound = 'sound/weapons/cablecuff.ogg'
|
||||
|
||||
Reference in New Issue
Block a user