Merge branch 'master' of https://github.com/tgstation/-tg-station into TrueAuto

2026-08-30 00:29:02 +01:00 · 2015-06-04 08:21:08 +03:00
parent fea00718a0 5679d7fa52
commit a4bbc865ac
148 changed files with 2140 additions and 2073 deletions
@@ -22,7 +22,7 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
 )


-datum/preferences
+/datum/preferences
 	//doohickeys for savefiles
 	var/path
 	var/default_slot = 1				//Holder so it doesn't default to slot 1, rather the last one used