Removes some unnecessary global variables (#16353)

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
This commit is contained in:
SabreML
2021-11-28 09:50:27 +01:00
committed by GitHub
co-authored by AffectedArc07
parent fa275ffe74
commit 5397d28c4f
31 changed files with 51 additions and 219 deletions
-2
View File
@@ -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()
+13 -11
View File
@@ -211,16 +211,6 @@
return TRUE
return ..()
GLOBAL_LIST_INIT(blacklisted_pylon_turfs, typecacheof(list(
/turf/simulated/floor/engine/cult,
/turf/space,
/turf/simulated/wall/indestructible,
/turf/simulated/floor/plating/lava,
/turf/simulated/floor/chasm,
/turf/simulated/wall/cult,
/turf/simulated/wall/cult/artificer
)))
/obj/structure/cult/functional/pylon
name = "pylon"
desc = "A floating crystal that slowly heals those faithful to a cult."
@@ -236,10 +226,22 @@ GLOBAL_LIST_INIT(blacklisted_pylon_turfs, typecacheof(list(
var/corrupt_delay = 50
var/last_corrupt = 0
var/static/list/blacklisted_turfs
/obj/structure/cult/functional/pylon/Initialize(mapload)
. = ..()
START_PROCESSING(SSobj, src)
icon_state = SSticker.cultdat?.pylon_icon_state
if(!blacklisted_turfs)
blacklisted_turfs = typecacheof(list(
/turf/simulated/floor/engine/cult,
/turf/space,
/turf/simulated/wall/indestructible,
/turf/simulated/floor/plating/lava,
/turf/simulated/floor/chasm,
/turf/simulated/wall/cult,
/turf/simulated/wall/cult/artificer
))
/obj/structure/cult/functional/pylon/attack_hand(mob/living/user)//override as it should not create anything
return
@@ -285,7 +287,7 @@ GLOBAL_LIST_INIT(blacklisted_pylon_turfs, typecacheof(list(
if(istype(T, /turf/simulated/floor/engine/cult))
cultturfs |= T
continue
if(is_type_in_typecache(T, GLOB.blacklisted_pylon_turfs))
if(is_type_in_typecache(T, blacklisted_turfs))
continue
else
validturfs |= T
-14
View File
@@ -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
/*
@@ -222,14 +221,6 @@ structure_check() searches for nearby cultist structures required for the invoca
animate(src, color = rune_blood_color, time = 5)
/obj/effect/rune/proc/check_icon()
if(!SSticker.mode)//work around for maps with runes and cultdat is not loaded all the way
var/bits = make_bit_triplet()
icon = get_rune(bits)
else
icon = get_rune_cult(invocation)
//Malformed Rune: This forms if a rune is not drawn correctly. Invoking it does nothing but hurt the user.
/obj/effect/rune/malformed
cultist_name = "Malformed"
@@ -660,12 +651,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 ..()
@@ -993,9 +982,6 @@ structure_check() searches for nearby cultist structures required for the invoca
cultist_name = "Summon [SSticker.cultdat ? SSticker.cultdat.entity_name : "your god"]"
cultist_desc = "tears apart dimensional barriers, calling forth [SSticker.cultdat ? SSticker.cultdat.entity_title3 : "your god"]."
/obj/effect/rune/narsie/check_icon()
return
/obj/effect/rune/narsie/cult_conceal() //can't hide this, and you wouldn't want to
return
-7
View File
@@ -15,13 +15,6 @@
return assigned
/proc/setupgenetics()
if(prob(50))
GLOB.blockadd = rand(-300,300)
if(prob(75))
GLOB.diffmut = rand(0,20)
//Thanks to nexis for the fancy code
// BITCH I AIN'T DONE YET