cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 02:16:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small bugfix to ashtrays and cig butts

Browse Source 
Now can throw out ashtray shards. 'ciguarete butt butt' should not appear anymore.
Also glass ashtray now shatters with sound
This commit is contained in:
comma
2012-03-04 06:45:14 +02:00
parent ef6473b964
commit 5ad05105f4
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/WorkInProgress/Chinsky/ashtray.dm
View File

@@ -130,4 +130,5 @@
..() ..()
name = "shards of glass" name = "shards of glass"
desc = "Shards of glass with ash on them." desc = "Shards of glass with ash on them."
playsound(src, "shatter", 30, 1)
return return

2
code/game/objects/items/weapons/cigs_lighters.dm
View File

@@ -146,6 +146,8 @@ ZIPPO
processing_objects.Add(src) processing_objects.Add(src)
put_out() put_out()
if (src.lit == -1)
return
src.lit = -1 src.lit = -1
src.damtype = "brute" src.damtype = "brute"
src.icon_state = icon_butt + "[rand(0,butt_count)]" src.icon_state = icon_butt + "[rand(0,butt_count)]"

4
code/modules/recycling/disposal.dm
View File

@@ -61,8 +61,8 @@
update() update()
return return
if(istype(I, /obj/item/ashtray)) if(istype(I, /obj/item/ashtray) && (I.health > 0))
user << "\blue You empty the ashtray." user << "\blue You empty the ashtray into [src]."
for(var/obj/item/O in I.contents) for(var/obj/item/O in I.contents)
O.loc = src O.loc = src
I.contents -= O I.contents -= O