Merge branch 'master' into placeholder

This commit is contained in:
Ferner
2021-01-19 00:32:46 +01:00
17 changed files with 89 additions and 26 deletions
+4
View File
@@ -37,6 +37,10 @@
latejoin_cryo += loc
delete_me = 1
return
if("JoinLateCryoCommand")
latejoin_cryo_command += loc
delete_me = 1
return
if("JoinLateCyborg")
latejoin_cyborg += loc
delete_me = 1