cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-25 21:19:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge resolution, using dev-freeze map due to unreconcilable conflicts.

Browse Source
This commit is contained in:
Zuhayr
2014-09-13 16:54:48 +09:30
parent 912f5b031b 87f65f5cfa
commit 1eb759447e
40 changed files with 292 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/WorkInProgress/Chinsky/ashtray.dm
+1 -1
View File
@@ -17,7 +17,7 @@
/obj/item/ashtray/attackby(obj/item/weapon/W as obj, mob/user as mob)
if (health < 1)
return
if (istype(W,/obj/item/weapon/cigbutt) || istype(W,/obj/item/clothing/mask/cigarette) || istype(W, /obj/item/weapon/match))
if (istype(W,/obj/item/weapon/cigbutt) || istype(W,/obj/item/clothing/mask/cigarette) || istype(W, /obj/item/weapon/flame/match))
if (contents.len >= max_butts)
user << "This ashtray is full."
return