mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-22 12:29:46 +01:00
BayMerge DLC Pack (#1355)
Ports totally; https://github.com/Baystation12/Baystation12/pull/12389/files Baystation12#14599 Ports partially; Baystation12#14216 (only blob-related functions) All the failure messages have been replaced with failure events in industrial drills, that range from probably lethal to certainly lethal and in one case just moderately annoying.
This commit is contained in:
@@ -69,6 +69,9 @@
|
||||
var/dummy = 0
|
||||
//If 1, this event is a dummy instance used for retrieving values, it should not run or add/remove itself from any lists
|
||||
|
||||
var/two_part = 0
|
||||
//used for events that run secondary announcements, like releasing maint access.
|
||||
|
||||
/datum/event/nothing
|
||||
no_fake = 1
|
||||
|
||||
|
||||
@@ -8,10 +8,13 @@
|
||||
endWhen = 90
|
||||
var/datum/event_meta/EM
|
||||
var/eventname
|
||||
var/datum/event/E = null
|
||||
|
||||
|
||||
/datum/event/false_alarm/end()
|
||||
command_announcement.Announce("Error, It appears our previous announcement about [eventname] was a sensor glitch. There is no cause for alarm, please return to your stations.", "False Alarm")
|
||||
if(two_part)
|
||||
E.end()
|
||||
if (EM)
|
||||
qdel(EM)
|
||||
EM = null
|
||||
@@ -25,7 +28,6 @@
|
||||
|
||||
//Don't pick events that are excluded from faking.
|
||||
EM = pick(EC.available_events)
|
||||
var/datum/event/E = null
|
||||
var/fake_allowed = 0
|
||||
while (!fake_allowed)
|
||||
if (E)
|
||||
@@ -40,6 +42,9 @@
|
||||
eventname = E.ic_name
|
||||
else
|
||||
eventname = EM.name
|
||||
if(E.two_part)
|
||||
two_part = 1
|
||||
E.start()
|
||||
|
||||
E.kill()
|
||||
E.announce()
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
announceWhen = 1
|
||||
endWhen = revokeAccess
|
||||
var/postStartTicks = 0
|
||||
two_part = 1
|
||||
ic_name = "radiation"
|
||||
|
||||
/datum/event/radiation_storm/announce()
|
||||
|
||||
Reference in New Issue
Block a user