some more globals (#19098)

* some more globals

* .
This commit is contained in:
Kashargul
2026-01-29 09:21:58 -08:00
committed by GitHub
parent 24e68536bc
commit fdfb49012b
50 changed files with 164 additions and 176 deletions
+2 -2
View File
@@ -68,7 +68,7 @@ GLOBAL_LIST_EMPTY(event_last_fired)
possibleEvents[/datum/event/electrical_storm] = 15 * active_with_role[JOB_JANITOR] + 5 * active_with_role[DEPARTMENT_ENGINEERING]
possibleEvents[/datum/event/wallrot] = 30 * active_with_role[DEPARTMENT_ENGINEERING] + 50 * active_with_role[JOB_ALT_GARDENER]
if(!spacevines_spawned)
if(!GLOB.spacevines_spawned)
possibleEvents[/datum/event/spacevine] = 10 + 5 * active_with_role[DEPARTMENT_ENGINEERING]
if(minutes_passed >= 30) // Give engineers time to set up engine
possibleEvents[/datum/event/meteor_wave] = 10 * active_with_role[DEPARTMENT_ENGINEERING]
@@ -80,7 +80,7 @@ GLOBAL_LIST_EMPTY(event_last_fired)
possibleEvents[/datum/event/prison_break] = active_with_role[DEPARTMENT_SECURITY] * 50
if(active_with_role[DEPARTMENT_SECURITY] > 0)
if(!sent_spiders_to_station)
if(!GLOB.sent_spiders_to_station)
possibleEvents[/datum/event/spider_infestation] = max(active_with_role[DEPARTMENT_SECURITY], 5) + 5
possibleEvents[/datum/event/random_antag] = max(active_with_role[DEPARTMENT_SECURITY], 5) + 2.5
+9 -9
View File
@@ -70,13 +70,13 @@
/datum/event/meteor_wave/proc/get_meteors()
switch(severity)
if(EVENT_LEVEL_MAJOR)
return meteors_major
return GLOB.meteors_major
if(EVENT_LEVEL_MODERATE)
return meteors_moderate
return GLOB.meteors_moderate
else
return meteors_minor
return GLOB.meteors_minor
/var/list/meteors_minor = list(
GLOBAL_LIST_INIT(meteors_minor, list(
/obj/effect/meteor/medium = 80,
/obj/effect/meteor/dust = 30,
/obj/effect/meteor/irradiated = 30,
@@ -84,9 +84,9 @@
/obj/effect/meteor/flaming = 10,
///obj/effect/meteor/golden = 10,
///obj/effect/meteor/silver = 10,
)
))
/var/list/meteors_moderate = list(
GLOBAL_LIST_INIT(meteors_moderate, list(
/obj/effect/meteor/medium = 80,
/obj/effect/meteor/big = 30,
/obj/effect/meteor/dust = 30,
@@ -95,9 +95,9 @@
///obj/effect/meteor/golden = 10,
///obj/effect/meteor/silver = 10,
/obj/effect/meteor/emp = 10,
)
))
/var/list/meteors_major = list(
GLOBAL_LIST_INIT(meteors_major, list(
/obj/effect/meteor/medium = 80,
/obj/effect/meteor/big = 30,
/obj/effect/meteor/dust = 30,
@@ -107,7 +107,7 @@
///obj/effect/meteor/golden = 10,
///obj/effect/meteor/silver = 10,
/obj/effect/meteor/tunguska = 1,
)
))
// Overmap version
/datum/event/meteor_wave/overmap
-2
View File
@@ -1,5 +1,3 @@
//var/global/account_hack_attempted = 0
GLOBAL_VAR_INIT(account_hack_attempted, 0)
/datum/event/money_hacker
+2 -2
View File
@@ -1,11 +1,11 @@
/var/global/spacevines_spawned = 0
GLOBAL_VAR_INIT(spacevines_spawned, 0)
/datum/event/spacevine
announceWhen = 60
/datum/event/spacevine/start()
spacevine_infestation()
spacevines_spawned = 1
GLOB.spacevines_spawned = 1
/datum/event/spacevine/announce()
level_seven_announcement()
+2 -2
View File
@@ -1,4 +1,4 @@
/var/global/sent_spiders_to_station = 0
GLOBAL_VAR_INIT(sent_spiders_to_station, 0)
/datum/event/spider_infestation
announceWhen = 90
@@ -8,7 +8,7 @@
/datum/event/spider_infestation/setup()
announceWhen = rand(announceWhen, announceWhen + 60)
spawncount = rand(4 * severity, 6 * severity) //spiderlings only have a 50% chance to grow big and strong
sent_spiders_to_station = 0
GLOB.sent_spiders_to_station = 0
/datum/event/spider_infestation/announce()
command_announcement.Announce("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert", new_sound = 'sound/AI/aliens.ogg')