cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-20 03:26:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev

Browse Source 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/game/objects/effects/spawners/bombspawner.dm
This commit is contained in:
Mloc-Hibernia
2014-05-11 13:19:09 +00:00
parent 70ac5726dd 29a8059f53
commit e3a8d5eb43
30 changed files with 1576 additions and 1471 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/WorkInProgress/Chinsky/ashtray.dm
+1
View File
@@ -32,6 +32,7 @@
var/obj/item/butt = new cig.type_butt(src)
cig.transfer_fingerprints_to(butt)
del(cig)
W = butt
else if (cig.lit == 0)
user << "You place [cig] in [src] without even smoking it. Why would you do that?"