Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265

2020-01-04 13:35:05 +01:00
parent d88f50ac15 1cc30833b2
commit 686a76dd1d
489 changed files with 24949 additions and 14497 deletions
@@ -504,3 +504,5 @@ GLOBAL_LIST_INIT(pda_reskins, list(PDA_SKIN_CLASSIC = 'icons/obj/pda.dmi', PDA_S
 #define FOURSPACES "&nbsp;&nbsp;&nbsp;&nbsp;"

 #define CRYOMOBS 'icons/obj/cryo_mobs.dmi'
+
+#define CANT_REENTER_ROUND -1