Merge remote-tracking branch 'venus/master' into content-stuff

This commit is contained in:
Mosley
2024-10-11 03:47:54 -05:00
60 changed files with 1070 additions and 363 deletions
+2 -1
View File
@@ -39,7 +39,8 @@ SUBSYSTEM_DEF(traumas)
"mimes" = strings(PHOBIA_FILE, "mimes"),
"cats" = strings(PHOBIA_FILE, "cats"),
"syndicate"= strings(PHOBIA_FILE, "syndicate"),
"eye" = strings(PHOBIA_FILE, "eye")
"eye" = strings(PHOBIA_FILE, "eye"),
"ocky icky" = strings(PHOBIA_FILE, "ocky icky")
)
phobia_mobs = list("spiders" = typecacheof(list(/mob/living/simple_animal/hostile/poison/giant_spider)),