cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #36432 from ShizCalev/braindamageeventruntime

Browse Source 
Fixes brain damage json runtime
This commit is contained in:
oranges
2018-03-17 11:18:41 +13:00
committed by yogstation13-bot
parent 4ff5ad30ce
commit 99fbfab242
5 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/__DEFINES/misc.dm
View File

@@ -420,6 +420,9 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE
//text files //text files
#define BRAIN_DAMAGE_FILE "traumas.json" #define BRAIN_DAMAGE_FILE "traumas.json"
#define ION_FILE "ion_laws.json"
#define PIRATE_NAMES_FILE "pirates.json"
//Fullscreen overlay resolution in tiles. //Fullscreen overlay resolution in tiles.
#define FULLSCREEN_OVERLAY_RESOLUTION_X 15 #define FULLSCREEN_OVERLAY_RESOLUTION_X 15

2
code/__HELPERS/names.dm
View File

@@ -1,5 +1,3 @@
#define ION_FILE "ion_laws.json"
/proc/lizard_name(gender) /proc/lizard_name(gender)
if(gender == MALE) if(gender == MALE)
return "[pick(GLOB.lizard_names_male)]-[pick(GLOB.lizard_names_male)]" return "[pick(GLOB.lizard_names_male)]-[pick(GLOB.lizard_names_male)]"

2
code/datums/mood_events/generic_negative_events.dm
View File

@@ -84,7 +84,7 @@
mood_change = -3 mood_change = -3
/datum/mood_event/brain_damage/add_effects() /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 = "<span class='warning'>Hurr durr... [damage_message]</span>\n" description = "<span class='warning'>Hurr durr... [damage_message]</span>\n"
/datum/mood_event/hulk //Entire duration of having the hulk mutation /datum/mood_event/hulk //Entire duration of having the hulk mutation

3
code/game/objects/structures/ghost_role_spawners.dm
View File

@@ -534,9 +534,6 @@
new/obj/structure/showcase/machinery/oldpod/used(drop_location()) new/obj/structure/showcase/machinery/oldpod/used(drop_location())
return ..() return ..()
#define PIRATE_NAMES_FILE "pirates.json"
/obj/effect/mob_spawn/human/pirate /obj/effect/mob_spawn/human/pirate
name = "space pirate sleeper" name = "space pirate sleeper"
desc = "A cryo sleeper smelling faintly of rum." desc = "A cryo sleeper smelling faintly of rum."

1
code/modules/events/ion_storm.dm
View File

@@ -1,6 +1,5 @@
#define ION_RANDOM 0 #define ION_RANDOM 0
#define ION_ANNOUNCE 1 #define ION_ANNOUNCE 1
#define ION_FILE "ion_laws.json"
/datum/round_event_control/ion_storm /datum/round_event_control/ion_storm
name = "Ion Storm" name = "Ion Storm"
typepath = /datum/round_event/ion_storm typepath = /datum/round_event/ion_storm