cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove announcements from overmap events

Browse Source
This commit is contained in:
Aronai Sieyes
2020-03-21 19:11:48 -04:00
parent 8a0cca641b
commit d8d7ebf99a
6 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/events/carp_migration.dm
View File

@@ -100,8 +100,6 @@
qdel(SM) qdel(SM)
CHECK_TICK CHECK_TICK
// // Overmap version
// Overmap version of the event! /datum/event/carp_migration/overmap/announce()
// return
/datum/event/carp_migration/overmap
announceWhen = 1 // Announce much faster!

4
code/modules/events/dust.dm
View File

@@ -28,3 +28,7 @@
if(EVENT_LEVEL_MAJOR) if(EVENT_LEVEL_MAJOR)
return "super" return "super"
return "weak" return "weak"
// Overmap version
/datum/event/dust/overmap/announce()
return

4
code/modules/events/electrical_storm.dm
View File

@@ -59,3 +59,7 @@
if(prob(0.2 * severity)) if(prob(0.2 * severity))
T.emagged = 1 T.emagged = 1
T.update_icon() T.update_icon()
// Overmap version
/datum/event/electrical_storm/overmap/announce()
return

4
code/modules/events/ion_storm.dm
View File

@@ -72,6 +72,10 @@
spawn(rand(5000,8000)) spawn(rand(5000,8000))
command_announcement.Announce("It has come to our attention that \the [location_name()] passed through an ion storm. Please monitor all electronic equipment for malfunctions.", "Anomaly Alert") command_announcement.Announce("It has come to our attention that \the [location_name()] passed through an ion storm. Please monitor all electronic equipment for malfunctions.", "Anomaly Alert")
// Overmap version
/datum/event/ionstorm/overmap/announce()
return
/* /*
/proc/IonStorm(botEmagChance = 10) /proc/IonStorm(botEmagChance = 10)

5
code/modules/events/meteors.dm
View File

@@ -64,12 +64,15 @@
else else
return meteors_normal return meteors_normal
// Overmap version
/datum/event/meteor_wave/overmap /datum/event/meteor_wave/overmap
next_meteor_lower = 5 next_meteor_lower = 5
next_meteor_upper = 10 next_meteor_upper = 10
next_meteor = 0 next_meteor = 0
/datum/event/meteor_wave/overmap/announce()
return
/datum/event/meteor_wave/overmap/tick() /datum/event/meteor_wave/overmap/tick()
if(victim && !victim.is_still()) // Meteors mostly fly in your face if(victim && !victim.is_still()) // Meteors mostly fly in your face
start_side = prob(90) ? victim.fore_dir : pick(GLOB.cardinal) start_side = prob(90) ? victim.fore_dir : pick(GLOB.cardinal)

6
code/modules/overmap/events/overmap_event.dm
View File

@@ -52,7 +52,7 @@
/obj/effect/overmap/event/electric /obj/effect/overmap/event/electric
name = "electrical storm" name = "electrical storm"
events = list(/datum/event/electrical_storm) events = list(/datum/event/electrical_storm/overmap)
opacity = 0 opacity = 0
event_icon_states = list("electrical1", "electrical2", "electrical3", "electrical4") event_icon_states = list("electrical1", "electrical2", "electrical3", "electrical4")
difficulty = EVENT_LEVEL_MAJOR difficulty = EVENT_LEVEL_MAJOR
@@ -60,13 +60,13 @@
/obj/effect/overmap/event/dust /obj/effect/overmap/event/dust
name = "dust cloud" name = "dust cloud"
events = list(/datum/event/dust) events = list(/datum/event/dust/overmap)
event_icon_states = list("dust1", "dust2", "dust3", "dust4") event_icon_states = list("dust1", "dust2", "dust3", "dust4")
weaknesses = OVERMAP_WEAKNESS_MINING | OVERMAP_WEAKNESS_EXPLOSIVE | OVERMAP_WEAKNESS_FIRE weaknesses = OVERMAP_WEAKNESS_MINING | OVERMAP_WEAKNESS_EXPLOSIVE | OVERMAP_WEAKNESS_FIRE
/obj/effect/overmap/event/ion /obj/effect/overmap/event/ion
name = "ion cloud" name = "ion cloud"
events = list(/datum/event/ionstorm) events = list(/datum/event/ionstorm/overmap)
opacity = 0 opacity = 0
event_icon_states = list("ion1", "ion2", "ion3", "ion4") event_icon_states = list("ion1", "ion2", "ion3", "ion4")
difficulty = EVENT_LEVEL_MAJOR difficulty = EVENT_LEVEL_MAJOR