diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm
index 7398518bb03..ac7271278b0 100644
--- a/code/__HELPERS/global_lists.dm
+++ b/code/__HELPERS/global_lists.dm
@@ -47,6 +47,9 @@
whitelisted_species += S.name
init_subtypes(/datum/crafting_recipe, crafting_recipes)
+
+ all_cults = typesof(/datum/cult_info)
+
return 1
/* // Uncomment to debug chemical reaction list.
diff --git a/code/__HELPERS/global_lists2.dm b/code/__HELPERS/global_lists2.dm
deleted file mode 100644
index f499e6e60eb..00000000000
--- a/code/__HELPERS/global_lists2.dm
+++ /dev/null
@@ -1,94 +0,0 @@
-
-//////////////////////////
-/////Initial Building/////
-//////////////////////////
-
-/proc/makeDatumRefLists()
- //markings
- init_sprite_accessory_subtypes(/datum/sprite_accessory/body_markings, marking_styles_list)
- //head accessory
- init_sprite_accessory_subtypes(/datum/sprite_accessory/head_accessory, head_accessory_styles_list)
- //hair
- init_sprite_accessory_subtypes(/datum/sprite_accessory/hair, hair_styles_list, hair_styles_male_list, hair_styles_female_list)
- //facial hair
- init_sprite_accessory_subtypes(/datum/sprite_accessory/facial_hair, facial_hair_styles_list, facial_hair_styles_male_list, facial_hair_styles_female_list)
- //underwear
- init_sprite_accessory_subtypes(/datum/sprite_accessory/underwear, underwear_list, underwear_m, underwear_f)
- //undershirt
- init_sprite_accessory_subtypes(/datum/sprite_accessory/undershirt, undershirt_list, undershirt_m, undershirt_f)
- //socks
- init_sprite_accessory_subtypes(/datum/sprite_accessory/socks, socks_list, socks_m, socks_f)
-
- init_subtypes(/datum/surgery_step, surgery_steps)
-
- for(var/path in (subtypesof(/datum/surgery)))
- surgeries_list += new path()
-
- init_datum_subtypes(/datum/job, joblist, list(/datum/job/ai, /datum/job/cyborg), "title")
- init_datum_subtypes(/datum/superheroes, all_superheroes, null, "name")
- init_datum_subtypes(/datum/nations, all_nations, null, "default_name")
- init_datum_subtypes(/datum/language, all_languages, null, "name")
-
- for (var/language_name in all_languages)
- var/datum/language/L = all_languages[language_name]
- if(!(L.flags & NONGLOBAL))
- language_keys[":[lowertext(L.key)]"] = L
- language_keys[".[lowertext(L.key)]"] = L
- language_keys["#[lowertext(L.key)]"] = L
-
- var/list/paths = subtypesof(/datum/species)
- var/rkey = 0
- for(var/T in paths)
- var/datum/species/S = new T
- S.race_key = ++rkey //Used in mob icon caching.
- all_species[S.name] = S
-
- if(S.flags & IS_WHITELISTED)
- whitelisted_species += S.name
-
- paths = subtypesof(/datum/emote)
- for(var/T in paths)
- var/datum/emote/E = new T
- if(istype(T, /datum/emote/custom))
- continue
- emotes += E
-
-
- init_subtypes(/datum/table_recipe, table_recipes)
-
- all_cults = typesof(/datum/cult_info)
-
- return 1
-
-/* // Uncomment to debug chemical reaction list.
-/client/verb/debug_chemical_list()
-
- for (var/reaction in chemical_reactions_list)
- . += "chemical_reactions_list\[\"[reaction]\"\] = \"[chemical_reactions_list[reaction]]\"\n"
- if(islist(chemical_reactions_list[reaction]))
- var/list/L = chemical_reactions_list[reaction]
- for(var/t in L)
- . += " has: [t]\n"
- to_chat(world, .)
-*/
-
-
-//creates every subtype of prototype (excluding prototype) and adds it to list L.
-//if no list/L is provided, one is created.
-/proc/init_subtypes(prototype, list/L)
- if(!istype(L)) L = list()
- for(var/path in subtypesof(prototype))
- L += new path()
- return L
-
-/proc/init_datum_subtypes(prototype, list/L, list/pexempt, assocvar)
- if(!istype(L)) L = list()
- for(var/path in subtypesof(prototype) - pexempt)
- var/datum/D = new path()
- if(istype(D))
- var/assoc
- if(D.vars["[assocvar]"]) //has the var
- assoc = D.vars["[assocvar]"] //access value of var
- if(assoc) //value gotten
- L["[assoc]"] = D //put in association
- return L
diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm
index 091c13371c3..fdfda2da716 100644
--- a/code/game/gamemodes/cult/cult.dm
+++ b/code/game/gamemodes/cult/cult.dm
@@ -152,8 +152,8 @@ var/global/list/all_cults = list()
if(!istype(mob))
return
- if (mob.mind)
- if (mob.mind.assigned_role == "Clown")
+ if(mob.mind)
+ if(mob.mind.assigned_role == "Clown")
to_chat(mob, "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself.")
mob.mutations.Remove(CLUMSY)
@@ -166,7 +166,7 @@ var/global/list/all_cults = list()
"right hand" = slot_r_hand,
)
var/where = mob.equip_in_one_of_slots(T, slots)
- if (!where)
+ if(!where)
to_chat(mob, "Unfortunately, you weren't able to get a talisman. This is very bad and you should adminhelp immediately.")
else
to_chat(mob, "You have a talisman in your [where], one that will help you start the cult on this station. Use it well and remember - there are others.")
@@ -175,7 +175,7 @@ var/global/list/all_cults = list()
/datum/game_mode/proc/add_cultist(datum/mind/cult_mind) //BASE
- if (!istype(cult_mind))
+ if(!istype(cult_mind))
return 0
if(!(cult_mind in cult) && is_convertable_to_cult(cult_mind))
cult += cult_mind
@@ -190,7 +190,7 @@ var/global/list/all_cults = list()
/datum/game_mode/cult/add_cultist(datum/mind/cult_mind) //INHERIT
- if (!..(cult_mind))
+ if(!..(cult_mind))
return
memorize_cult_objectives(cult_mind)
@@ -256,9 +256,9 @@ var/global/list/all_cults = list()
/datum/game_mode/cult/proc/check_survive()
acolytes_survived = 0
for(var/datum/mind/cult_mind in cult)
- if (cult_mind.current && cult_mind.current.stat!=2)
+ if(cult_mind.current && cult_mind.current.stat!=2)
var/area/A = get_area(cult_mind.current )
- if ( is_type_in_list(A, centcom_areas))
+ if( is_type_in_list(A, centcom_areas))
acolytes_survived++
else if(A == shuttle_master.emergency.areaInstance && shuttle_master.emergency.mode >= SHUTTLE_ESCAPE) //snowflaked into objectives because shitty bay shuttles had areas to auto-determine this
acolytes_survived++
diff --git a/code/game/gamemodes/cult/cult_objectives.dm b/code/game/gamemodes/cult/cult_objectives.dm
index a28ab491779..129cdebd69c 100644
--- a/code/game/gamemodes/cult/cult_objectives.dm
+++ b/code/game/gamemodes/cult/cult_objectives.dm
@@ -189,10 +189,10 @@
var/total = living_crew + living_cultists
if((living_cultists * 2) < total)
- if (total < 15)
+ if(total < 15)
message_admins("There are [total] players, too little for the mass convert objective!")
log_admin("There are [total] players, too little for the mass convert objective!")
- else if (total > 50)
+ else if(total > 50)
message_admins("There are [total] players, too many for the mass convert objective!")
log_admin("There are [total] players, too many for the mass convert objective!")
else
diff --git a/code/game/turfs/simulated/walls_misc.dm b/code/game/turfs/simulated/walls_misc.dm
index 2f6205eff20..f3487854ace 100644
--- a/code/game/turfs/simulated/walls_misc.dm
+++ b/code/game/turfs/simulated/walls_misc.dm
@@ -9,6 +9,8 @@
/turf/simulated/wall/cult/New()
new /obj/effect/overlay/temp/cult/turf(src)
..()
+ //if(ticker.mode.cultdat.theme != "blood")//THE ONLY REASON THIS IS COMMENTED OUT IF CUASE I NEED TO FIGURE OUT THIS SHIT WITH WALL SMOOTHING
+ // icon = 'icons/turf/walls/cult_[ticker.mode.cultdat.theme]_wall.dmi'//CALM YOUR TITS
icon_state = ticker.mode.cultdat.cult_wall_icon_state
/turf/simulated/wall/cult/artificer
diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm
index 6d22ce83b5c..9b82458c7b1 100644
--- a/code/modules/mob/living/simple_animal/constructs.dm
+++ b/code/modules/mob/living/simple_animal/constructs.dm
@@ -42,9 +42,9 @@
..(user)
var/msg = ""
- if (src.health < src.maxHealth)
+ if(src.health < src.maxHealth)
msg += ""
- if (src.health >= src.maxHealth/2)
+ if(src.health >= src.maxHealth/2)
msg += "It looks slightly dented.\n"
else
msg += "It looks severely dented!\n"