cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-28 02:52:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source 
# Conflicts:
#	code/modules/reagents/reagent_containers/inhaler.dm
This commit is contained in:
skull132
2018-08-05 20:29:03 +03:00
parent f1dd7d562d 1635533d57
commit b6e8ae4d53
43 changed files with 207 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/client/client_color.dm
View File

@@ -68,8 +68,4 @@
/datum/client_color/tritanopia
client_color = list(0.95,0.07,0, 0,0.44,0.52, 0.05,0.49,0.48)
priority = 100
/datum/client_color/vaurca
client_color = list(0.3,0,0, 0,0.5,0, 0.5,0,1.5)
priority = 101
priority = 100