mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-24 21:57:53 +01:00
[MIRROR] next globs (#12552)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
co-authored by
Kashargul
parent
73faa45a34
commit
5567a1a245
@@ -13,7 +13,7 @@
|
||||
We hope you enjoy the lights.", "Nanotrasen Meteorology Division") //VOREStation Edit //CHOMPedit: removes announcement .ogg
|
||||
|
||||
/datum/event/aurora_caelus/start()
|
||||
affecting_z -= global.using_map.sealed_levels // Space levels only please!
|
||||
affecting_z -= using_map.sealed_levels // Space levels only please!
|
||||
for(var/mob/M in GLOB.player_list)
|
||||
if(M.z in affecting_z)
|
||||
M.playsound_local(null, 'sound/ambience/space/aurora_caelus.ogg', 100, FALSE, pressure_affected = FALSE)
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
carp_cap = 2 + 3 ** severity // No more than this many at once regardless of waves. (5, 11, 29)
|
||||
|
||||
/datum/event/carp_migration/start()
|
||||
affecting_z -= global.using_map.sealed_levels // Space levels only please!
|
||||
affecting_z -= using_map.sealed_levels // Space levels only please!
|
||||
..()
|
||||
|
||||
/datum/event/carp_migration/announce()
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
endWhen = 30
|
||||
|
||||
/datum/event/dust/start()
|
||||
affecting_z -= global.using_map.sealed_levels // Space levels only please!
|
||||
affecting_z -= using_map.sealed_levels // Space levels only please!
|
||||
..()
|
||||
|
||||
/datum/event/dust/announce()
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
return can_fire
|
||||
|
||||
/datum/event_meta/no_overmap/get_weight() //these events have overmap equivalents, and shouldn't fire randomly if overmap is used
|
||||
return global.using_map.use_overmap ? 0 : ..()
|
||||
return using_map.use_overmap ? 0 : ..()
|
||||
|
||||
// Event datums define and execute the actual events themselves.
|
||||
/datum/event //NOTE: Times are measured in master controller ticks!
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
gnat_cap = 8 + 4 ** severity // No more than this many at once regardless of waves. (12, 16, ??)
|
||||
|
||||
/datum/event/gnat_migration/start()
|
||||
affecting_z -= global.using_map.sealed_levels // Space levels only please!
|
||||
affecting_z -= using_map.sealed_levels // Space levels only please!
|
||||
..()
|
||||
|
||||
/datum/event/gnat_migration/announce()
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
jellyfish_cap = 2 + 3 ** severity // No more than this many at once regardless of waves. (5, 11, 29)
|
||||
|
||||
/datum/event/jellyfish_migration/start()
|
||||
affecting_z -= global.using_map.sealed_levels // Space levels only please!
|
||||
affecting_z -= using_map.sealed_levels // Space levels only please!
|
||||
..()
|
||||
|
||||
/datum/event/jellyfish_migration/announce()
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
endWhen = worst_case_end()
|
||||
|
||||
/datum/event/meteor_wave/start()
|
||||
affecting_z -= global.using_map.sealed_levels // Space levels only please!
|
||||
affecting_z -= using_map.sealed_levels // Space levels only please!
|
||||
//CHOMPAdd Start, fills gaps
|
||||
for(var/obj/machinery/shield_gen/gen in GLOB.machines)
|
||||
gen.fill_diffused()
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
// /obj/machinery/message_server/proc/send_pda_message(var/recipient = "",var/sender = "",var/message = "")
|
||||
var/obj/item/pda/P
|
||||
var/list/viables = list()
|
||||
for(var/obj/item/pda/check_pda in sort_names(PDAs))
|
||||
for(var/obj/item/pda/check_pda in GLOB.PDAs)
|
||||
if (!check_pda.owner || check_pda == src || check_pda.hidden)
|
||||
continue
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
ray_cap = 1 + 1 ** severity // No more than this many at once regardless of waves. (2, 3, ?)
|
||||
|
||||
/datum/event/ray_migration/start()
|
||||
affecting_z -= global.using_map.sealed_levels // Space levels only please!
|
||||
affecting_z -= using_map.sealed_levels // Space levels only please!
|
||||
..()
|
||||
|
||||
/datum/event/ray_migration/announce()
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
shark_cap = 1 + 1 ** severity // No more than this many at once regardless of waves. (2, 3, ?)
|
||||
|
||||
/datum/event/shark_migration/start()
|
||||
affecting_z -= global.using_map.sealed_levels // Space levels only please!
|
||||
affecting_z -= using_map.sealed_levels // Space levels only please!
|
||||
..()
|
||||
|
||||
/datum/event/shark_migration/announce()
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
fish_cap = fish_base_cap + fish_cap_mult ** severity // No more than this many at once regardless of waves. (5, 11, 29)
|
||||
|
||||
/datum/event/spacefish_migration/start()
|
||||
affecting_z -= global.using_map.sealed_levels // Space levels only please!
|
||||
affecting_z -= using_map.sealed_levels // Space levels only please!
|
||||
..()
|
||||
|
||||
/datum/event/spacefish_migration/announce()
|
||||
|
||||
Reference in New Issue
Block a user