mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 03:27:05 +01:00
Cleans up a lot of globals a few other vars (#23246)
* i hate globals i hate globals * more fucking of these * sirryan review
This commit is contained in:
@@ -418,7 +418,6 @@ GLOBAL_LIST_EMPTY(bad_blocks)
|
||||
SE_original = SE.Copy()
|
||||
|
||||
unique_enzymes = md5(character.real_name)
|
||||
GLOB.reg_dna[unique_enzymes] = character.real_name
|
||||
|
||||
// Hmm, I wonder how to go about this without a huge convention break
|
||||
/datum/dna/serialize()
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
#define LING_FAKEDEATH_TIME 50 SECONDS
|
||||
#define LING_ABSORB_RECENT_SPEECH 8 //The amount of recent spoken lines to gain on absorbing a mob
|
||||
|
||||
// This list is basically a copy of GLOB.greek_letters, but it also removes letters when a changeling spawns in with that ID
|
||||
GLOBAL_LIST_INIT(possible_changeling_IDs, list("Alpha","Beta","Gamma","Delta","Epsilon","Zeta","Eta","Theta","Iota","Kappa","Lambda","Mu","Nu","Xi","Omicron","Pi","Rho","Sigma","Tau","Upsilon","Phi","Chi","Psi","Omega"))
|
||||
|
||||
/datum/game_mode
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
GLOBAL_LIST_EMPTY(all_cults)
|
||||
|
||||
/datum/game_mode
|
||||
/// A list of all minds currently in the cult
|
||||
var/list/datum/mind/cult = list()
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
GLOBAL_LIST_EMPTY(sacrificed) // A mixed list of minds and mobs
|
||||
GLOBAL_LIST_EMPTY(wall_runes) // A list of all cult shield walls
|
||||
GLOBAL_LIST_EMPTY(teleport_runes) // I'll give you two guesses
|
||||
|
||||
/*
|
||||
@@ -716,12 +715,10 @@ structure_check() searches for nearby cultist structures required for the invoca
|
||||
|
||||
/obj/effect/rune/wall/Initialize(mapload)
|
||||
. = ..()
|
||||
GLOB.wall_runes += src
|
||||
B = new /obj/machinery/shield/cult/barrier(loc)
|
||||
B.parent_rune = src
|
||||
|
||||
/obj/effect/rune/wall/Destroy()
|
||||
GLOB.wall_runes -= src
|
||||
if(B && !QDELETED(B))
|
||||
QDEL_NULL(B)
|
||||
return ..()
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
|
||||
/datum/game_mode/abduction/proc/make_abductor_team(team_number,preset_agent=null,preset_scientist=null)
|
||||
//Team Name
|
||||
team_names[team_number] = "Mothership [pick(GLOB.possible_changeling_IDs)]" //TODO Ensure unique and actual alieny names
|
||||
team_names[team_number] = "Mothership [pick(GLOB.greek_letters)]" //TODO Ensure unique and actual alieny names
|
||||
//Team Objective
|
||||
var/datum/objective/experiment/team_objective = new
|
||||
team_objective.abductor_team_number = team_number
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
#define DRYING_TIME 5 * 60 * 10 //for 1 unit of depth in puddle (amount var)
|
||||
#define ALWAYS_IN_GRAVITY 2
|
||||
|
||||
GLOBAL_LIST_EMPTY(splatter_cache)
|
||||
|
||||
/obj/effect/decal/cleanable/blood
|
||||
name = "blood"
|
||||
var/dryname = "dried blood"
|
||||
|
||||
@@ -24,17 +24,6 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/newplayer_start) //Without this you sp
|
||||
/obj/effect/landmark/lightsout
|
||||
name = "Electrical Storm Epicentre"
|
||||
|
||||
/obj/effect/landmark/awaystart
|
||||
name = "awaystart"
|
||||
icon = 'icons/effects/spawner_icons.dmi'
|
||||
icon_state = "Assistant"
|
||||
|
||||
INITIALIZE_IMMEDIATE(/obj/effect/landmark/awaystart) //Without this away missions break
|
||||
|
||||
/obj/effect/landmark/awaystart/Initialize(mapload)
|
||||
GLOB.awaydestinations.Add(src)
|
||||
return ..()
|
||||
|
||||
/obj/effect/landmark/spawner
|
||||
icon = 'icons/effects/spawner_icons.dmi'
|
||||
icon_state = "questionmark"
|
||||
|
||||
@@ -13,8 +13,6 @@ GLOBAL_LIST_INIT(meteors_catastrophic, list(/obj/effect/meteor/medium = 3, /obj/
|
||||
|
||||
GLOBAL_LIST_INIT(meteors_gore, list(/obj/effect/meteor/meaty = 5, /obj/effect/meteor/meaty/xeno = 1)) //for meaty ore event
|
||||
|
||||
GLOBAL_LIST_INIT(meteors_dust, list(/obj/effect/meteor/dust)) //for space dust event
|
||||
|
||||
GLOBAL_LIST_INIT(meteors_ops, list(/obj/effect/meteor/goreops)) //Meaty Ops
|
||||
|
||||
|
||||
@@ -364,8 +362,6 @@ GLOBAL_LIST_INIT(meteors_ops, list(/obj/effect/meteor/goreops)) //Meaty Ops
|
||||
//Spookoween meteors
|
||||
/////////////////////////
|
||||
|
||||
GLOBAL_LIST_INIT(meteorsSPOOKY, list(/obj/effect/meteor/pumpkin))
|
||||
|
||||
/obj/effect/meteor/pumpkin
|
||||
name = "PUMPKING"
|
||||
desc = "THE PUMPKING'S COMING!"
|
||||
|
||||
Reference in New Issue
Block a user