Overmap Announcements Overhaul (#16460)

* Overmap Announcements

* overdoing it a little

* update cl

* whoops
This commit is contained in:
Geeves
2024-01-09 16:41:57 +00:00
committed by GitHub
parent d1603bf574
commit 73a95ed5df
36 changed files with 271 additions and 161 deletions
+15 -15
View File
@@ -71,12 +71,7 @@
if(is_event_active(ship,event_type, hazard.difficulty))//event's already active, don't bother
continue
var/datum/event_meta/EM = new(hazard.difficulty, "Overmap event - [hazard.name]", event_type, add_to_queue = FALSE, is_one_shot = TRUE)
var/datum/event/E = new event_type(EM)
E.startWhen = 0
E.endWhen = INFINITY
E.affecting_z = ship.map_z
if("victim" in E.vars)//for meteors and other overmap events that uses ships//might need a better solution
E.vars["victim"] = ship
var/datum/event/E = new event_type(EM, FALSE, ship, hazard)
LAZYADD(ship_events[ship], E)
/singleton/overmap_event_handler/proc/stop_hazard(var/obj/effect/overmap/visitable/ship/ship, var/obj/effect/overmap/event/hazard)
@@ -297,10 +292,12 @@
opacity = 1
difficulty = EVENT_LEVEL_MAJOR
/obj/effect/overmap/event/gravity
name = "dark matter influx"
events = list(/datum/event/gravity)
can_be_destroyed = FALSE
// see comment at code/modules/events/gravity.dm
// tl;dr gravity is handled globally, meaning if the horizon loses gravity, everyone does
// /obj/effect/overmap/event/gravity
// name = "dark matter influx"
// events = list(/datum/event/gravity)
// can_be_destroyed = FALSE
//These now are basically only used to spawn hazards. Will be useful when we need to spawn group of moving hazards
/datum/overmap_event
@@ -352,8 +349,11 @@
opacity = 1
hazards = /obj/effect/overmap/event/carp/major
/datum/overmap_event/gravity
name = "dark matter influx"
count = 12
radius = 4
hazards = /obj/effect/overmap/event/gravity
// see comment at code/modules/events/gravity.dm
// tl;dr gravity is handled globally, meaning if the horizon loses gravity, everyone does
// this needs to be fixed before we can uncomment this
// /datum/overmap_event/gravity
// name = "dark matter influx"
// count = 12
// radius = 4
// hazards = /obj/effect/overmap/event/gravity
@@ -80,6 +80,11 @@
else if(sound_token)
QDEL_NULL(sound_token)
/obj/machinery/computer/ship/sensors/proc/display_message(var/message)
if(OPERABLE(src))
playsound(src, 'sound/machines/triplebeep.ogg', 50)
visible_message(SPAN_NOTICE("\The [src] beeps, [SPAN_ITALIC("\"" + message + "\"")]"))
/obj/machinery/computer/ship/sensors/ui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)