From 9ea4bd45c2cd65f6eeb2bdc750e9a231782b125d Mon Sep 17 00:00:00 2001 From: oranges Date: Sat, 17 Mar 2018 11:18:41 +1300 Subject: [PATCH 1/2] Merge pull request #36432 from ShizCalev/braindamageeventruntime Fixes brain damage json runtime --- code/__DEFINES/misc.dm | 3 +++ code/__HELPERS/names.dm | 2 -- code/datums/mood_events/generic_negative_events.dm | 2 +- code/game/objects/structures/ghost_role_spawners.dm | 3 --- code/modules/events/ion_storm.dm | 1 - 5 files changed, 4 insertions(+), 7 deletions(-) diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 199535a04e..277becec04 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -425,6 +425,9 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE //text files #define BRAIN_DAMAGE_FILE "traumas.json" +#define ION_FILE "ion_laws.json" +#define PIRATE_NAMES_FILE "pirates.json" + //Fullscreen overlay resolution in tiles. #define FULLSCREEN_OVERLAY_RESOLUTION_X 15 diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm index 8fbb5d805b..a1791a55db 100644 --- a/code/__HELPERS/names.dm +++ b/code/__HELPERS/names.dm @@ -1,5 +1,3 @@ -#define ION_FILE "ion_laws.json" - /proc/lizard_name(gender) if(gender == MALE) return "[pick(GLOB.lizard_names_male)]-[pick(GLOB.lizard_names_male)]" diff --git a/code/datums/mood_events/generic_negative_events.dm b/code/datums/mood_events/generic_negative_events.dm index 786131b7fc..c2db1e8a37 100644 --- a/code/datums/mood_events/generic_negative_events.dm +++ b/code/datums/mood_events/generic_negative_events.dm @@ -84,7 +84,7 @@ mood_change = -3 /datum/mood_event/brain_damage/add_effects() - var/damage_message = pick_list_replacements("brain_damage_lines.json", "brain_damage") + var/damage_message = pick_list_replacements(BRAIN_DAMAGE_FILE, "brain_damage") description = "Hurr durr... [damage_message]\n" /datum/mood_event/hulk //Entire duration of having the hulk mutation diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index fbfc36cd97..3806c2411b 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -534,9 +534,6 @@ new/obj/structure/showcase/machinery/oldpod/used(drop_location()) return ..() - -#define PIRATE_NAMES_FILE "pirates.json" - /obj/effect/mob_spawn/human/pirate name = "space pirate sleeper" desc = "A cryo sleeper smelling faintly of rum." diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm index b145dac9f6..5b9a8c8af3 100644 --- a/code/modules/events/ion_storm.dm +++ b/code/modules/events/ion_storm.dm @@ -1,6 +1,5 @@ #define ION_RANDOM 0 #define ION_ANNOUNCE 1 -#define ION_FILE "ion_laws.json" /datum/round_event_control/ion_storm name = "Ion Storm" typepath = /datum/round_event/ion_storm