shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'citadel/master' into sword_point

Browse Source
This commit is contained in:
kevinz000
2020-02-28 13:39:56 -07:00
parent 8ef68fa36b 8414f58b89
commit 93d91b1808
410 changed files with 1898 additions and 2307 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/melee/misc.dm
+2 -4
View File
@@ -454,12 +454,10 @@
held_sausage = null
update_icon()
/obj/item/melee/roastingstick/update_icon()
/obj/item/melee/roastingstick/update_overlays()
. = ..()
cut_overlays()
if (held_sausage)
var/mutable_appearance/sausage = mutable_appearance(icon, "roastingstick_sausage")
add_overlay(sausage)
. += mutable_appearance(icon, "roastingstick_sausage")
/obj/item/melee/roastingstick/proc/extend(user)
to_chat(user, "<span class ='warning'>You extend [src].</span>")