Merge branch, update to current

2026-07-14 17:37:04 +01:00 · 2021-01-08 07:26:35 -03:00
parent 9e37d3be62 99bf504191
commit 78da9a5a12
155 changed files with 19439 additions and 18617 deletions
@@ -111,3 +111,6 @@
 /datum/client_colour/monochrome
 	colour = list(rgb(77,77,77), rgb(150,150,150), rgb(28,28,28), rgb(0,0,0))
 	priority = INFINITY //we can't see colors anyway!
+
+/datum/client_colour/monochrome/trance
+	priority = 1