Merge branch 'master' into shoelaces

This commit is contained in:
silicons
2020-07-16 17:31:41 -07:00
committed by GitHub
1023 changed files with 35835 additions and 42060 deletions
+2
View File
@@ -539,3 +539,5 @@ GLOBAL_LIST_INIT(pda_reskins, list(PDA_SKIN_CLASSIC = 'icons/obj/pda.dmi', PDA_S
#define SHOES_UNTIED 0
#define SHOES_TIED 1
#define SHOES_KNOTTED 2
#define WANTED_FILE "wanted_message.json"