Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Removes the radiation storm from the Radioactive Nebula station trait #854

Merged
merged 1 commit into from
Nov 29, 2023
Merged

[MIRROR] Removes the radiation storm from the Radioactive Nebula station trait #854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions code/datums/station_traits/negative_traits.dm
View file
Open in desktop
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
8 changes: 8 additions & 0 deletions modular_skyrat/master_files/code/datums/station_traits/negative_traits.dm
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6127,6 +6127,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
Loading