Skip to content
This repository has been archived by the owner on May 14, 2024. It is now read-only.

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
RigglePrime committed Sep 20, 2023
1 parent 5345eee commit a24fb71
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 32 deletions.
2 changes: 1 addition & 1 deletion config/dynamic.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"Dynamic": {
"max_threat_level": 0
"max_threat_level": 1
}
}
6 changes: 1 addition & 5 deletions modular_event/base/event_aheal_recall_spells/code/action.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
15 changes: 0 additions & 15 deletions modular_event/base/event_area.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions modular_event/base/force_static_atmos.dm

This file was deleted.

2 changes: 1 addition & 1 deletion modular_event/base/no_destruction.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
flags_1 |= NODECONSTRUCT_1

/turf
explosion_block = 50
explosive_resistance = 50

/turf/rust_heretic_act()
return
Expand Down
15 changes: 7 additions & 8 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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

0 comments on commit a24fb71

Please sign in to comment.