cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into rcs-update

Browse Source
This commit is contained in:
Fox-McCloud
2015-09-21 00:30:00 -04:00
parent 4e9befc310 937bb6be85
commit 36ec45253e
98 changed files with 13713 additions and 16504 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/displaycase.dm
+2
View File
@@ -309,3 +309,5 @@ var/global/list/captain_display_cases = list()
"You gently run your hands over \the [src] in appreciation of its contents.", \
"You hear someone streaking glass with their greasy hands.")
#undef DISPLAYCASE_FRAME_CIRCUIT
#undef DISPLAYCASE_FRAME_SCREWDRIVER