cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tgstation/master'

Browse Source 
Not sure if this worked. Used a wonky special snowflake strat to merge.
This commit is contained in:
AsV9
2018-03-24 08:57:13 +01:00
parent 389f4ccac0
commit d338cac150
921 changed files with 8789 additions and 5779 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/game/objects/structures/fluff.dm
View File

@@ -104,7 +104,8 @@
icon_state = "driverseat"
/obj/structure/fluff/bus/passable/seat/driver/attack_hand(mob/user)
playsound(src.loc, 'sound/items/carhorn.ogg', 50, 1)
playsound(src, 'sound/items/carhorn.ogg', 50, 1)
. = ..()
/obj/structure/fluff/paper
name = "dense lining of papers"