diff --git a/config/dynamic.json b/config/dynamic.json index bf37f758362..6184fd50adf 100644 --- a/config/dynamic.json +++ b/config/dynamic.json @@ -1,5 +1,5 @@ { "Dynamic": { - "max_threat_level": 0 + "max_threat_level": 1 } } diff --git a/modular_event/base/event_aheal_recall_spells/code/action.dm b/modular_event/base/event_aheal_recall_spells/code/action.dm index dcfe45adf8d..c1897a05eae 100644 --- a/modular_event/base/event_aheal_recall_spells/code/action.dm +++ b/modular_event/base/event_aheal_recall_spells/code/action.dm @@ -4,14 +4,10 @@ */ /datum/action/cooldown/aheal name = "Fully Heal Self" - icon_icon = 'modular_event/base/event_aheal_recall_spells/icons/button.dmi' + button_icon = 'modular_event/base/event_aheal_recall_spells/icons/button.dmi' button_icon_state = "arena_heal" cooldown_time = 30 SECONDS -/datum/action/cooldown/aheal/UpdateButton(status_only, force) - button_icon_state = IsAvailable() ? initial(button_icon_state) : "arena_heal_used" - return ..() - /datum/action/cooldown/aheal/Activate(atom/target) var/mob/living/user = usr var/area/user_area = get_area(user) diff --git a/modular_event/base/event_area.dm b/modular_event/base/event_area.dm index 53127382c65..5216d0688d2 100644 --- a/modular_event/base/event_area.dm +++ b/modular_event/base/event_area.dm @@ -7,21 +7,6 @@ static_lighting = FALSE base_lighting_alpha = 255 -/area/event/oceanarium - name = "Oceanarium" - static_lighting = TRUE - base_lighting_alpha = 0 - -/area/event/cavern - name = "Cavern" - static_lighting = TRUE - base_lighting_alpha = 0 - -/area/event/nightclub - name = "Club" - static_lighting = TRUE - base_lighting_alpha = 0 - // Make arrivals area fullbright, since this is where latejoins go /area/shuttle/arrival requires_power = FALSE diff --git a/modular_event/base/force_static_atmos.dm b/modular_event/base/force_static_atmos.dm deleted file mode 100644 index aef54f714be..00000000000 --- a/modular_event/base/force_static_atmos.dm +++ /dev/null @@ -1,2 +0,0 @@ -/turf/open - planetary_atmos = TRUE diff --git a/modular_event/base/no_destruction.dm b/modular_event/base/no_destruction.dm index 4dd97c2b34b..b35cba16013 100644 --- a/modular_event/base/no_destruction.dm +++ b/modular_event/base/no_destruction.dm @@ -14,7 +14,7 @@ flags_1 |= NODECONSTRUCT_1 /turf - explosion_block = 50 + explosive_resistance = 50 /turf/rust_heretic_act() return diff --git a/tgstation.dme b/tgstation.dme index 62d5f18bba8..0594aec795b 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5702,6 +5702,12 @@ #include "interface\menu.dm" #include "interface\stylesheet.dm" #include "interface\skin.dmf" +#include "interface\fonts\fonts_datum.dm" +#include "interface\fonts\grand_9k.dm" +#include "interface\fonts\pixellari.dm" +#include "interface\fonts\spess_font.dm" +#include "interface\fonts\tiny_unicode.dm" +#include "interface\fonts\vcr_osd_mono.dm" #include "modular_event\base\disable_atmos.dm" #include "modular_event\base\disable_dynamic.dm" #include "modular_event\base\disable_economy.dm" @@ -5710,20 +5716,13 @@ #include "modular_event\base\disable_musician.dm" #include "modular_event\base\event_area.dm" #include "modular_event\base\force_lag_switch.dm" -#include "modular_event\base\force_static_atmos.dm" #include "modular_event\base\free_chameleon_kits.dm" #include "modular_event\base\limit_jobs.dm" #include "modular_event\base\limit_pointing.dm" #include "modular_event\base\no_destruction.dm" #include "modular_event\base\no_diseases.dm" #include "modular_event\base\station_traits.dm" +#include "modular_event\base\vending_safety.dm" #include "modular_event\base\event_aheal_recall_spells\code\action.dm" #include "modular_event\base\event_aheal_recall_spells\code\living.dm" -#include "modular_event\base\vending_safety.dm" -#include "interface\fonts\fonts_datum.dm" -#include "interface\fonts\grand_9k.dm" -#include "interface\fonts\pixellari.dm" -#include "interface\fonts\spess_font.dm" -#include "interface\fonts\tiny_unicode.dm" -#include "interface\fonts\vcr_osd_mono.dm" // END_INCLUDE