cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-13 08:03:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

makes paper stack burning more consistent (#22849)

Browse Source 
* makes paper stack burning more consistent

* Update code/modules/paperwork/paper_bundle.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/modules/paperwork/paper_bundle.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/modules/paperwork/paper_bundle.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/modules/paperwork/paper_bundle.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* reviews

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
This commit is contained in:
GDN
2023-11-20 13:26:45 -06:00
committed by GitHub
parent 38f765d4dc
commit 4789f00090
1 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/paper_bundle.dm
+13 -19
View File
@@ -53,7 +53,7 @@
to_chat(user, "<span class='notice'>You add [(W.name == "photo") ? "the photo" : W.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].</span>")
user.unEquip(W)
W.loc = src
else if(istype(W, /obj/item/lighter))
else if(is_hot(W))
burnpaper(W, user)
else if(istype(W, /obj/item/paper_bundle))
user.unEquip(W)
@@ -77,29 +77,23 @@
add_fingerprint(usr)
return
/obj/item/paper_bundle/proc/burnpaper(obj/item/lighter/P, mob/user)
var/class = "<span class='warning'>"
/obj/item/paper_bundle/proc/burnpaper(obj/item/heating_object, mob/user)
var/class = "warning"
if(P.lit && !user.restrained())
if(istype(P, /obj/item/lighter/zippo))
class = "<span class='rose'>"
if(istype(heating_object, /obj/item/lighter/zippo))
class = "rose"
user.visible_message("[class][user] holds [P] up to [src], it looks like [user.p_theyre()] trying to burn it!</span>", \
"[class]You hold [P] up to [src], burning it slowly.</span>")
user.visible_message("<span class='[class]'>[user] holds [heating_object] up to [src], it looks like [user.p_theyre()] trying to burn it!</span>", "<span class='[class]'>You hold [heating_object] up to [src], burning it slowly.</span>")
spawn(20)
if(get_dist(src, user) < 2 && user.get_active_hand() == P && P.lit)
user.visible_message("[class][user] burns right through \the [src], turning it to ash. It flutters through the air before settling on the floor in a heap.</span>", \
"[class]You burn right through \the [src], turning it to ash. It flutters through the air before settling on the floor in a heap.</span>")
if(!do_after(user, 2 SECONDS, target = src) || !is_hot(heating_object))
return
user.visible_message("<span class='[class]'>[user] burns right through [src], turning it to ash. It flutters through the air before settling on the floor in a heap.</span>", \
"<span class='[class]'>You burn right through [src], turning it to ash. It flutters through the air before settling on the floor in a heap.</span>")
if(user.is_in_inactive_hand(src))
user.unEquip(src)
user.unEquip(src)
new /obj/effect/decal/cleanable/ash(get_turf(src))
qdel(src)
else
to_chat(user, "<span class='warning'>You must hold \the [P] steady to burn \the [src].</span>")
new /obj/effect/decal/cleanable/ash(get_turf(src))
qdel(src)
/obj/item/paper_bundle/examine(mob/user)
. = ..()