cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-26 13:36:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

Browse Source
This commit is contained in:
PsiOmegaDelta
2015-08-20 14:09:07 +02:00
parent 5fbe0819b7 c8b6813426
commit a0a09c04e4
315 changed files with 12177 additions and 11406 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/pen.dm
+1 -1
View File
@@ -157,7 +157,7 @@
if("Yellow")
colour = COLOR_YELLOW
if("Green")
colour = COLOR_GREEN
colour = COLOR_LIME
if("Pink")
colour = COLOR_PINK
if("Blue")