mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-22 04:24:20 +01:00
Adds Shadow demons (#19732)
* reshuffle * shared base type * moves this to the base type * the monster * event * FUCK * better sprites * refactors bloodcrawl, more nice sprites * review stuff * Apply suggestions from code review Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com> * heart of darkness * pre TM tweaks * ARGH * hopefully fixes double hits * tweaks * derp * tweaks * TEMP RUNTIME REMOVE LATER * fixes * runtime fixes * cig runtime fix * review + another runtime fix * re adds sprite * removes runtime * oop I forgor * DRUNK CODING * SPRITES Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
This commit is contained in:
@@ -189,6 +189,11 @@ LIGHTERS ARE IN LIGHTERS.DM
|
||||
smoke()
|
||||
|
||||
|
||||
/obj/item/clothing/mask/cigarette/extinguish_light(force)
|
||||
if(!force)
|
||||
return
|
||||
die()
|
||||
|
||||
/obj/item/clothing/mask/cigarette/attack_self(mob/user)
|
||||
if(lit)
|
||||
user.visible_message("<span class='notice'>[user] calmly drops and treads on [src], putting it out instantly.</span>")
|
||||
@@ -362,6 +367,9 @@ LIGHTERS ARE IN LIGHTERS.DM
|
||||
chem_volume = 200
|
||||
list_reagents = list("nicotine" = 200)
|
||||
|
||||
/obj/item/clothing/mask/cigarette/pipe/die()
|
||||
return
|
||||
|
||||
/obj/item/clothing/mask/cigarette/pipe/light(flavor_text = null)
|
||||
if(!lit)
|
||||
lit = TRUE
|
||||
|
||||
@@ -69,10 +69,16 @@
|
||||
force = 0
|
||||
attack_verb = null //human_defense.dm takes care of it
|
||||
|
||||
show_off_message(user)
|
||||
if(user)
|
||||
show_off_message(user)
|
||||
set_light(0)
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
|
||||
/obj/item/lighter/extinguish_light(force)
|
||||
if(!force)
|
||||
return
|
||||
turn_off_lighter()
|
||||
|
||||
/obj/item/lighter/proc/show_off_message(mob/living/user)
|
||||
to_chat(user, "<span class='notice'>You shut off [src].")
|
||||
|
||||
@@ -124,6 +130,9 @@
|
||||
|
||||
/obj/item/lighter/zippo/turn_off_lighter(mob/living/user)
|
||||
. = ..()
|
||||
if(!user)
|
||||
return
|
||||
|
||||
if(world.time > next_off_message)
|
||||
user.visible_message("<span class='rose'>You hear a quiet click, as [user] shuts off [src] without even looking at what [user.p_theyre()] doing. Wow.")
|
||||
playsound(src.loc, 'sound/items/zippoclose.ogg', 25, 1)
|
||||
@@ -201,6 +210,11 @@
|
||||
..()
|
||||
matchignite()
|
||||
|
||||
/obj/item/match/extinguish_light(force)
|
||||
if(!force)
|
||||
return
|
||||
matchburnout()
|
||||
|
||||
/obj/item/match/proc/matchignite()
|
||||
if(!lit && !burnt)
|
||||
lit = TRUE
|
||||
|
||||
Reference in New Issue
Block a user