cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 14:39:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

The sun's wrath is bound to it's designated intensity, minimal ejections will no longer change strength of their own will (CME strength fix) (#5987)

Browse Source 
* make minimal minimal

* Update cme.dm

* Update _cme_defines.dm

* "
This commit is contained in:
FlamingLily
2021-06-03 18:14:49 +12:00
committed by GitHub
parent 3be9058f2b
commit 17e3bb0061
2 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_skyrat/modules/cme/code/_cme_defines.dm
+1 -1
View File
@@ -12,7 +12,7 @@ GLOBAL_LIST_INIT(cme_loot_list, list(
/obj/item/strange
#define CME_RANDOM "random"
#define CME_UNKNOWN "unknown"
#define CME_MINIMAL "minimal"
#define CME_MODERATE "moderate"
#define CME_EXTREME "extreme"
modular_skyrat/modules/cme/code/cme.dm
+19 -10
View File
@@ -13,7 +13,7 @@ Armageddon is truly going to fuck the station, use it sparingly.
*/
/datum/round_event_control/cme
name = "Coronal Mass Ejection: Minimal"
name = "Coronal Mass Ejection: Random"
typepath = /datum/round_event/cme
weight = 10
min_players = 30
@@ -29,14 +29,23 @@ Armageddon is truly going to fuck the station, use it sparingly.
var/cme_frequency_upper
var/list/cme_start_locs = list()
/datum/round_event_control/cme/random
name = "Coronal Mass Ejection: Random"
typepath = /datum/round_event/cme/random
/datum/round_event_control/cme/unknown
name = "Coronal Mass Ejection: Unknown"
typepath = /datum/round_event/cme/unknown
weight = 0
max_occurrences = 0
/datum/round_event/cme/random
cme_intensity = CME_RANDOM
/datum/round_event/cme/unknown
cme_intensity = CME_UNKNOWN
/datum/round_event_control/cme/minimal
name = "Coronal Mass Ejection: Minimal"
typepath = /datum/round_event/cme/minimal
weight = 0
max_occurrences = 0
/datum/round_event/cme/minimal
cme_intensity = CME_MINIMAL
/datum/round_event_control/cme/moderate
name = "Coronal Mass Ejection: Moderate"
@@ -67,9 +76,9 @@ Armageddon is truly going to fuck the station, use it sparingly.
/datum/round_event/cme/setup()
if(!cme_intensity)
cme_intensity = pick(CME_MINIMAL, CME_RANDOM, CME_MODERATE, CME_EXTREME)
cme_intensity = pick(CME_MINIMAL, CME_UNKNOWN, CME_MODERATE, CME_EXTREME)
switch(cme_intensity)
if(CME_RANDOM)
if(CME_UNKNOWN)
cme_frequency_lower = CME_MODERATE_FREQUENCY_LOWER
cme_frequency_upper = CME_MODERATE_FREQUENCY_UPPER
startWhen = rand(CME_MODERATE_START_LOWER, CME_MODERATE_START_UPPER)
@@ -110,7 +119,7 @@ Armageddon is truly going to fuck the station, use it sparingly.
Ensure all sensitive equipment is shielded.", "Solar Event", sound('modular_skyrat/modules/cme/sound/cme_warning.ogg'))
else
switch(cme_intensity)
if(CME_RANDOM)
if(CME_UNKNOWN)
priority_announce("Coronal mass ejection detected! Expected intensity: UNKNOWN. Impact in: [round((startWhen * SSevents.wait) * 0.1, 0.1)] seconds. \
All synthetic and non-organic lifeforms should seek shelter immediately! \
Neutralize magnetic field bubbles at all costs.", "Solar Event", sound('modular_skyrat/modules/cme/sound/cme_warning.ogg'))
@@ -138,7 +147,7 @@ Armageddon is truly going to fuck the station, use it sparingly.
spawn_cme(spawnpoint, cme_intensity)
/datum/round_event/cme/proc/spawn_cme(var/turf/spawnpoint, intensity)
if(intensity == CME_RANDOM)
if(intensity == CME_UNKNOWN)
intensity = pick(CME_MINIMAL, CME_MODERATE, CME_EXTREME)
var/area/loc_area_name = get_area(spawnpoint)
minor_announce("WARNING! [uppertext(intensity)] PULSE EXPECTED IN: [loc_area_name.name]", "Solar Flare Log:")