cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-22 04:24:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

SALTSALTSALTSALTSALTSALTSALTSALTSALT

Browse Source 
REEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
This commit is contained in:
Aurorablade
2016-07-24 17:12:03 -04:00
parent 53e5e598ea
commit 2d69f019ca
6 changed files with 16 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__HELPERS/global_lists.dm
+3
View File
@@ -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.
code/__HELPERS/global_lists2.dm
-94
View File
@@ -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
code/game/gamemodes/cult/cult.dm
+7 -7
View File
@@ -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, "<span class='danger'>Unfortunately, you weren't able to get a talisman. This is very bad and you should adminhelp immediately.</span>")
else
to_chat(mob, "<span class='cult'>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.</span>")
@@ -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++
code/game/gamemodes/cult/cult_objectives.dm
+2 -2
View File
@@ -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
code/game/turfs/simulated/walls_misc.dm
+2
View File
@@ -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
code/modules/mob/living/simple_animal/constructs.dm
+2 -2
View File
@@ -42,9 +42,9 @@
..(user)
var/msg = ""
if (src.health < src.maxHealth)
if(src.health < src.maxHealth)
msg += "<span class='warning'>"
if (src.health >= src.maxHealth/2)
if(src.health >= src.maxHealth/2)
msg += "It looks slightly dented.\n"
else
msg += "<B>It looks severely dented!</B>\n"