Skip to content

Commit

Permalink
Removes the radiation storm from the Radioactive Nebula station trait (
Browse files Browse the repository at this point in the history
…#854)

* Removes the Radioactive Nebula station trait from the station traits pool

* Updates the station trait so that it simply never runs the radiation storm

* Tweaks this slightly

* Lets admins toggle the storms on/off

* Revert "Lets admins toggle the storms on/off"

This reverts commit c4a56e2701ee8ad44e0cd922ac731c239a01f1e1.

* Let's try this again

* Update negative_traits.dm

* Update negative_traits.dm

* Update negative_traits.dm

* Update negative_traits.dm

---------

Co-authored-by: GoldenAlpharex <[email protected]>
Co-authored-by: Bloop <[email protected]>
  • Loading branch information
3 people authored Nov 29, 2023
1 parent 0ff2917 commit b63805f
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 0 deletions.
12 changes: 12 additions & 0 deletions code/datums/station_traits/negative_traits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,11 @@
var/list/shielding = list()

/datum/station_trait/nebula/hostile/process(seconds_per_tick)
// SKYRAT EDIT ADDITION START
if(!storms_enabled)
get_shielding_level() // So shields still produce tritium
return
// SKYRAT EDIT ADDITION END
calculate_nebula_strength()

apply_nebula_effect(nebula_intensity - get_shielding_level())
Expand Down Expand Up @@ -624,6 +629,7 @@
new /obj/effect/pod_landingzone (get_safe_random_station_turf(), new /obj/structure/closet/supplypod/centcompod (), new /obj/machinery/nebula_shielding/emergency/radiation ())

/datum/station_trait/nebula/hostile/radiation/send_instructions()
/* SKYRAT EDIT REMOVAL START - No more radiation storms on station
var/obj/machinery/nebula_shielding/shielder = /obj/machinery/nebula_shielding/radiation
var/obj/machinery/gravity_generator/main/innate_shielding = /obj/machinery/gravity_generator/main
//How long do we have untill the first shielding unit needs to be up?
Expand All @@ -642,6 +648,12 @@
You have [deadline] before the nebula enters the station. \
Every shielding unit will provide an additional [shielder_time] of protection, fully protecting the station with [max_shielders] shielding units.
"}
SKYRAT EDIT REMOVAL END */
// SKYRAT EDIT CHANGE START - ORIGINAL: See above
var/announcement = {"Your station has been constructed inside a radioactive nebula. \
Standard spacesuits will not protect against the nebula and using them is strongly discouraged.
"}
// SKYRAT EDIT CHANGE END

priority_announce(announcement, sound = 'sound/misc/notice1.ogg')

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/datum/station_trait/nebula/hostile/
/// Radiation storms are disabled by default
var/storms_enabled

/// Allows an admin to turn on/off the radiation storms.
/datum/station_trait/nebula/hostile/proc/toggle_storms()
storms_enabled = !storms_enabled
message_admins("Radiation storms have been [storms_enabled ? "enabled" : "disabled"]!")
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -6129,6 +6129,7 @@
#include "modular_skyrat\master_files\code\datums\quirks\negative.dm"
#include "modular_skyrat\master_files\code\datums\quirks\neutral.dm"
#include "modular_skyrat\master_files\code\datums\records\record.dm"
#include "modular_skyrat\master_files\code\datums\station_traits\negative_traits.dm"
#include "modular_skyrat\master_files\code\datums\storage\storage.dm"
#include "modular_skyrat\master_files\code\datums\storage\subtypes\pockets.dm"
#include "modular_skyrat\master_files\code\datums\traits\good.dm"
Expand Down

0 comments on commit b63805f

Please sign in to comment.