['(' [arguments] ')']
/datum/SDQL_parser/proc/call_function(i, list/node, list/arguments)
if(length(tokenl(i)))
var/procname = ""
- if(token(i) == "global" && token(i+1) == ".")
+ if(tokenl(i) == "global" && token(i + 1) == ".") // Global proc.
i += 2
procname = "global."
node += procname + token(i++)
if(token(i) != "(")
parse_error("Expected ( but found '[token(i)]'")
+
else if(token(i + 1) != ")")
- var/list/expression_list_temp = list()
+ var/list/temp_expression_list = list()
do
- i = expression(i + 1, expression_list_temp)
+ i = expression(i + 1, temp_expression_list)
if(token(i) == ",")
- arguments[++arguments.len] = expression_list_temp
- expression_list_temp = list()
+ arguments[++arguments.len] = temp_expression_list
+ temp_expression_list = list()
continue
+
while(token(i) && token(i) != ")")
- arguments[++arguments.len] = expression_list_temp
+
+ arguments[++arguments.len] = temp_expression_list // The code this is copy pasted from won't be executed when it's the last param, this fixes that.
else
i++
else
parse_error("Expected a function but found nothing")
return i + 1
-//select_function: count_function
-/datum/SDQL_parser/proc/select_function(i, list/node)
- parse_error("Sorry, function calls aren't available yet")
- return i
//expression: ( unary_expression | '(' expression ')' | value ) [binary_operator expression]
/datum/SDQL_parser/proc/expression(i, list/node)
+
if(token(i) in unary_operators)
i = unary_expression(i, node)
+
else if(token(i) == "(")
var/list/expr = list()
+
i = expression(i + 1, expr)
+
if(token(i) != ")")
parse_error("Missing ) at end of expression.")
+
else
i++
+
node[++node.len] = expr
+
else
i = value(i, node)
+
if(token(i) in binary_operators)
i = binary_operator(i, node)
i = expression(i, node)
+
else if(token(i) in comparitors)
i = binary_operator(i, node)
+
var/list/rhs = list()
i = expression(i, rhs)
+
node[++node.len] = rhs
+
+
return i
+
//unary_expression: unary_operator ( unary_expression | value | '(' expression ')' )
/datum/SDQL_parser/proc/unary_expression(i, list/node)
+
if(token(i) in unary_operators)
var/list/unary_exp = list()
+
unary_exp += token(i)
i++
+
if(token(i) in unary_operators)
i = unary_expression(i, unary_exp)
+
else if(token(i) == "(")
var/list/expr = list()
+
i = expression(i + 1, expr)
+
if(token(i) != ")")
parse_error("Missing ) at end of expression.")
+
else
i++
+
unary_exp[++unary_exp.len] = expr
+
else
i = value(i, unary_exp)
+
node[++node.len] = unary_exp
+
+
else
parse_error("Expected unary operator but found '[token(i)]'")
+
return i
-//binary_operator: comparitor | '+' | '-' | '/' | '*' | '&' | '|' | '^'
+
+//binary_operator: comparitor | '+' | '-' | '/' | '*' | '&' | '|' | '^' | '%'
/datum/SDQL_parser/proc/binary_operator(i, list/node)
+
if(token(i) in (binary_operators + comparitors))
node += token(i)
+
else
parse_error("Unknown binary operator [token(i)]")
+
return i + 1
-//value: variable | string | number | 'null'
+
+//value: variable | string | number | 'null' | object_type
/datum/SDQL_parser/proc/value(i, list/node)
if(token(i) == "null")
node += "null"
i++
- else if(lowertext(copytext(token(i),1,3)) == "0x" && isnum(hex2num(copytext(token(i),3))))
- node += hex2num(copytext(token(i),3))
+
+ else if(lowertext(copytext(token(i), 1, 3)) == "0x" && isnum(hex2num(copytext(token(i), 3))))
+ node += hex2num(copytext(token(i), 3))
i++
+
else if(isnum(text2num(token(i))))
node += text2num(token(i))
i++
+
else if(copytext(token(i), 1, 2) in list("'", "\""))
i = string(i, node)
+
else if(copytext(token(i), 1, 2) == "\[") // Start a list.
i = array(i, node)
+ else if(copytext(token(i), 1, 2) == "/")
+ i = object_type(i, node)
else
i = variable(i, node)
- return i
-/*EXPLAIN SELECT * WHERE 42 = 6 * 9 OR val = - 5 == 7*/
+ return i
diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm
index 56faa1f6c4..3056b459d8 100644
--- a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm
+++ b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm
@@ -48,6 +48,12 @@
/proc/_image(icon, loc, icon_state, layer, dir)
return image(icon, loc, icon_state, layer, dir)
+/proc/_istype(object, type)
+ return istype(object, type)
+
+/proc/_ispath(path, type)
+ return ispath(path, type)
+
/proc/_length(E)
return length(E)
@@ -178,6 +184,9 @@
/proc/_list_swap(list/L, Index1, Index2)
L.Swap(Index1, Index2)
+/proc/_list_get(list/L, index)
+ return L[index]
+
/proc/_walk(ref, dir, lag)
walk(ref, dir, lag)
@@ -208,4 +217,3 @@
/proc/_step_away(ref, trg, max)
step_away(ref, trg, max)
-
diff --git a/code/modules/admin/verbs/panicbunker.dm b/code/modules/admin/verbs/panicbunker.dm
index fc0cab66c9..ab3aeb4ba5 100644
--- a/code/modules/admin/verbs/panicbunker.dm
+++ b/code/modules/admin/verbs/panicbunker.dm
@@ -13,3 +13,28 @@
if (new_pb && !SSdbcore.Connect())
message_admins("The Database is not connected! Panic bunker will not work until the connection is reestablished.")
SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle Panic Bunker", "[new_pb ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/proc/addbunkerbypass(ckeytobypass as text)
+ set category = "Special Verbs"
+ set name = "Add PB Bypass"
+ set desc = "Allows a given ckey to connect despite the panic bunker for a given round."
+ if(!CONFIG_GET(flag/sql_enabled))
+ to_chat(usr, "The Database is not enabled!")
+ return
+
+ GLOB.bunker_passthrough |= ckey(ckeytobypass)
+ log_admin("[key_name(usr)] has added [ckeytobypass] to the current round's bunker bypass list.")
+ message_admins("[key_name(usr)] has added [ckeytobypass] to the current round's bunker bypass list.")
+
+/client/proc/revokebunkerbypass(ckeytobypass as text)
+ set category = "Special Verbs"
+ set name = "Revoke PB Bypass"
+ set desc = "Revoke's a ckey's permission to bypass the panic bunker for a given round."
+ if(!CONFIG_GET(flag/sql_enabled))
+ to_chat(usr, "The Database is not enabled!")
+ return
+
+ GLOB.bunker_passthrough -= ckey(ckeytobypass)
+ log_admin("[key_name(usr)] has removed [ckeytobypass] from the current round's bunker bypass list.")
+ message_admins("[key_name(usr)] has removed [ckeytobypass] from the current round's bunker bypass list.")
+
diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm
index 97cc991523..72da825e0c 100644
--- a/code/modules/admin/verbs/playsound.dm
+++ b/code/modules/admin/verbs/playsound.dm
@@ -4,10 +4,12 @@
if(!check_rights(R_SOUNDS))
return
- var/freq = 1
var/vol = input(usr, "What volume would you like the sound to play at?",, 100) as null|num
if(!vol)
return
+ var/freq = input(usr, "What frequency would you like the sound to play at?",, 1) as null|num
+ if(!freq)
+ freq = 1
vol = CLAMP(vol, 1, 100)
var/sound/admin_sound = new()
@@ -96,13 +98,17 @@
if (data["webpage_url"])
webpage_url = "[title]"
+ var/freq = input(usr, "What frequency would you like the sound to play at?",, 1) as null|num
+ if(!freq)
+ freq = 1
+ pitch = freq
+
var/res = alert(usr, "Show the title of and link to this song to the players?\n[title]",, "No", "Yes", "Cancel")
switch(res)
if("Yes")
to_chat(world, "An admin played: [webpage_url]")
if("Cancel")
return
-
SSblackbox.record_feedback("nested tally", "played_url", 1, list("[ckey]", "[web_sound_input]"))
log_admin("[key_name(src)] played web sound: [web_sound_input]")
message_admins("[key_name(src)] played web sound: [web_sound_input]")
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index b227e6cce1..808c48e002 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -845,7 +845,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
if(!check_rights(R_ADMIN))
return
- var/level = input("Select security level to change to","Set Security Level") as null|anything in list("green","blue","red","delta")
+ var/level = input("Select security level to change to","Set Security Level") as null|anything in list("green","blue","amber","red","delta")
if(level)
set_security_level(level)
diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm
index cc3b3a3057..7e0ae3c08c 100644
--- a/code/modules/antagonists/changeling/changeling.dm
+++ b/code/modules/antagonists/changeling/changeling.dm
@@ -34,6 +34,8 @@
var/mimicing = ""
var/canrespec = 0
var/changeling_speak = 0
+ var/loudfactor = 0 //Used for blood tests. At 4, blood tests will succeed. At 10, blood tests will result in an explosion.
+ var/bloodtestwarnings = 0 //Used to track if the ling has been notified that they will pass blood tests.
var/datum/dna/chosen_dna
var/obj/effect/proc_holder/changeling/sting/chosen_sting
var/datum/cellular_emporium/cellular_emporium
@@ -71,8 +73,6 @@
reset_powers()
create_initial_profile()
if(give_objectives)
- if(team_mode)
- forge_team_objectives()
forge_objectives()
remove_clownmut()
. = ..()
@@ -123,6 +123,8 @@
/datum/antagonist/changeling/proc/reset_powers()
if(purchasedpowers)
remove_changeling_powers()
+ loudfactor = 0
+ bloodtestwarnings = 0
//Repurchase free powers.
for(var/path in all_powers)
var/obj/effect/proc_holder/changeling/S = new path()
@@ -174,6 +176,13 @@
geneticpoints -= thepower.dna_cost
purchasedpowers += thepower
thepower.on_purchase(owner.current)
+ loudfactor += thepower.loudness
+ if(loudfactor >= 4 && !bloodtestwarnings)
+ to_chat(owner.current, "Our blood is growing flammable. Our blood will react violently to heat.")
+ bloodtestwarnings = 1
+ if(loudfactor >= 10 && bloodtestwarnings < 2)
+ to_chat(owner.current, "Our blood has grown extremely flammable. Our blood will react explosively to heat.")
+ bloodtestwarnings = 2
/datum/antagonist/changeling/proc/readapt()
if(!ishuman(owner.current))
@@ -182,6 +191,7 @@
if(canrespec)
to_chat(owner.current, "We have removed our evolutions from this form, and are now ready to readapt.")
reset_powers()
+ playsound(get_turf(owner.current), 'sound/effects/lingreadapt.ogg', 75, TRUE, 5, soundenvwet = 0)
canrespec = 0
SSblackbox.record_feedback("tally", "changeling_power_purchase", 1, "Readapt")
return 1
diff --git a/code/modules/antagonists/changeling/changeling_power.dm b/code/modules/antagonists/changeling/changeling_power.dm
index ae255a04f8..c89dc50cec 100644
--- a/code/modules/antagonists/changeling/changeling_power.dm
+++ b/code/modules/antagonists/changeling/changeling_power.dm
@@ -16,6 +16,7 @@
var/req_stat = CONSCIOUS // CONSCIOUS, UNCONSCIOUS or DEAD
var/always_keep = 0 // important for abilities like revive that screw you if you lose them.
var/ignores_fakedeath = FALSE // usable with the FAKEDEATH flag
+ var/loudness = 0 //Determines how much having this ability will affect changeling blood tests. At 4, the blood will react violently and turn to ash, creating a unique message in the process. At 10, the blood will explode when heated.
/obj/effect/proc_holder/changeling/proc/on_purchase(mob/user, is_respec)
diff --git a/code/modules/antagonists/changeling/powers/biodegrade.dm b/code/modules/antagonists/changeling/powers/biodegrade.dm
index 1e8eaed383..d1a2cc3891 100644
--- a/code/modules/antagonists/changeling/powers/biodegrade.dm
+++ b/code/modules/antagonists/changeling/powers/biodegrade.dm
@@ -1,8 +1,9 @@
/obj/effect/proc_holder/changeling/biodegrade
name = "Biodegrade"
desc = "Dissolves restraints or other objects preventing free movement."
- helptext = "This is obvious to nearby people, and can destroy standard restraints and closets."
+ helptext = "This is obvious to nearby people, and can destroy standard restraints and closets. This ability is somewhat loud, and carries a small risk of our blood gaining violent sensitivity to heat."
chemical_cost = 30 //High cost to prevent spam
+ loudness = 1
dna_cost = 2
req_human = 1
diff --git a/code/modules/antagonists/changeling/powers/digitalcamo.dm b/code/modules/antagonists/changeling/powers/digitalcamo.dm
index 68a1fa4add..e8bad0e215 100644
--- a/code/modules/antagonists/changeling/powers/digitalcamo.dm
+++ b/code/modules/antagonists/changeling/powers/digitalcamo.dm
@@ -1,8 +1,9 @@
/obj/effect/proc_holder/changeling/digitalcamo
name = "Digital Camouflage"
desc = "By evolving the ability to distort our form and proportions, we defeat common algorithms used to detect lifeforms on cameras."
- helptext = "We cannot be tracked by camera or seen by AI units while using this skill. However, humans looking at us will find us... uncanny."
+ helptext = "We cannot be tracked by camera or seen by AI units while using this skill. However, humans looking at us will find us... uncanny. This ability is somewhat loud, and carries a small risk of our blood gaining violent sensitivity to heat."
dna_cost = 1
+ loudness = 1
//Prevents AIs tracking you but makes you easily detectable to the human-eye.
/obj/effect/proc_holder/changeling/digitalcamo/sting_action(mob/user)
diff --git a/code/modules/antagonists/changeling/powers/headcrab.dm b/code/modules/antagonists/changeling/powers/headcrab.dm
index 70edf1e788..8a932dbd62 100644
--- a/code/modules/antagonists/changeling/powers/headcrab.dm
+++ b/code/modules/antagonists/changeling/powers/headcrab.dm
@@ -1,9 +1,10 @@
/obj/effect/proc_holder/changeling/headcrab
name = "Last Resort"
desc = "We sacrifice our current body in a moment of need, placing us in control of a vessel."
- helptext = "We will be placed in control of a small, fragile creature. We may attack a corpse like this to plant an egg which will slowly mature into a new form for us."
+ helptext = "We will be placed in control of a small, fragile creature. We may attack a corpse like this to plant an egg which will slowly mature into a new form for us. This ability is loud, and might cause our blood to react violently to heat."
chemical_cost = 20
dna_cost = 1
+ loudness = 2
req_human = 1
/obj/effect/proc_holder/changeling/headcrab/sting_action(mob/user)
diff --git a/code/modules/antagonists/changeling/powers/hivemind.dm b/code/modules/antagonists/changeling/powers/hivemind.dm
index c84adc6e8f..86926f51a9 100644
--- a/code/modules/antagonists/changeling/powers/hivemind.dm
+++ b/code/modules/antagonists/changeling/powers/hivemind.dm
@@ -3,7 +3,7 @@
name = "Hivemind Communication"
desc = "We tune our senses to the airwaves to allow us to discreetly communicate and exchange DNA with other changelings."
helptext = "We will be able to talk with other changelings with :g. Exchanged DNA do not count towards absorb objectives."
- dna_cost = 0
+ dna_cost = 1
chemical_cost = -1
/obj/effect/proc_holder/changeling/hivemind_comms/on_purchase(mob/user, is_respec)
@@ -17,6 +17,9 @@
var/obj/effect/proc_holder/changeling/hivemind_download/S2 = new
if(!changeling.has_sting(S2))
changeling.purchasedpowers+=S2
+ var/obj/effect/proc_holder/changeling/linglink/S3 = new
+ if(!changeling.has_sting(S3))
+ changeling.purchasedpowers+=S3
// HIVE MIND UPLOAD/DOWNLOAD DNA
GLOBAL_LIST_EMPTY(hivemind_bank)
diff --git a/code/modules/antagonists/changeling/powers/lesserform.dm b/code/modules/antagonists/changeling/powers/lesserform.dm
index 06824f9bed..24403b406c 100644
--- a/code/modules/antagonists/changeling/powers/lesserform.dm
+++ b/code/modules/antagonists/changeling/powers/lesserform.dm
@@ -1,8 +1,9 @@
/obj/effect/proc_holder/changeling/lesserform
name = "Lesser Form"
- desc = "We debase ourselves and become lesser. We become a monkey."
+ desc = "We debase ourselves and become lesser. We become a monkey. This ability is loud, and might cause our blood to react violently to heat."
chemical_cost = 5
dna_cost = 1
+ loudness = 2
req_human = 1
//Transform into a monkey.
diff --git a/code/modules/antagonists/changeling/powers/linglink.dm b/code/modules/antagonists/changeling/powers/linglink.dm
index cd7c944137..baa02ea7c8 100644
--- a/code/modules/antagonists/changeling/powers/linglink.dm
+++ b/code/modules/antagonists/changeling/powers/linglink.dm
@@ -2,7 +2,7 @@
name = "Hivemind Link"
desc = "Link your victim's mind into the hivemind for personal interrogation."
chemical_cost = 0
- dna_cost = 0
+ dna_cost = -1
req_human = 1
/obj/effect/proc_holder/changeling/linglink/can_sting(mob/living/carbon/user)
diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm
index 6a952d09f8..9e353a1855 100644
--- a/code/modules/antagonists/changeling/powers/mutations.dm
+++ b/code/modules/antagonists/changeling/powers/mutations.dm
@@ -134,9 +134,10 @@
/obj/effect/proc_holder/changeling/weapon/arm_blade
name = "Arm Blade"
desc = "We reform one of our arms into a deadly blade."
- helptext = "We may retract our armblade in the same manner as we form it. Cannot be used while in lesser form."
+ helptext = "We may retract our armblade in the same manner as we form it. Cannot be used while in lesser form. This ability is loud, and might cause our blood to react violently to heat."
chemical_cost = 20
dna_cost = 2
+ loudness = 2
req_human = 1
weapon_type = /obj/item/melee/arm_blade
weapon_name_simple = "blade"
@@ -215,9 +216,11 @@
desc = "We ready a tentacle to grab items or victims with."
helptext = "We can use it once to retrieve a distant item. If used on living creatures, the effect depends on the intent: \
Help will simply drag them closer, Disarm will grab whatever they're holding instead of them, Grab will put the victim in our hold after catching it, \
- and Harm will stun it, and stab it if we're also holding a sharp weapon. Cannot be used while in lesser form."
+ and Harm will stun it, and stab it if we're also holding a sharp weapon. Cannot be used while in lesser form.\
+ This ability is loud, and might cause our blood to react violently to heat."
chemical_cost = 10
dna_cost = 2
+ loudness = 2
req_human = 1
weapon_type = /obj/item/gun/magic/tentacle
weapon_name_simple = "tentacle"
@@ -393,9 +396,10 @@
/obj/effect/proc_holder/changeling/weapon/shield
name = "Organic Shield"
desc = "We reform one of our arms into a hard shield."
- helptext = "Organic tissue cannot resist damage forever; the shield will break after it is hit too much. The more genomes we absorb, the stronger it is. Cannot be used while in lesser form."
+ helptext = "Organic tissue cannot resist damage forever; the shield will break after it is hit too much. The more genomes we absorb, the stronger it is. Cannot be used while in lesser form. This ability is somewhat loud, and carries a small risk of our blood gaining violent sensitivity to heat."
chemical_cost = 20
dna_cost = 1
+ loudness = 1
req_human = 1
weapon_type = /obj/item/shield/changeling
@@ -445,9 +449,10 @@
/obj/effect/proc_holder/changeling/suit/organic_space_suit
name = "Organic Space Suit"
desc = "We grow an organic suit to protect ourselves from space exposure."
- helptext = "We must constantly repair our form to make it space-proof, reducing chemical production while we are protected. Cannot be used in lesser form."
+ helptext = "We must constantly repair our form to make it space-proof, reducing chemical production while we are protected. Cannot be used in lesser form. This ability is somewhat loud, and carries a small risk of our blood gaining violent sensitivity to heat."
chemical_cost = 20
dna_cost = 2
+ loudness = 1
req_human = 1
suit_type = /obj/item/clothing/suit/space/changeling
@@ -492,9 +497,10 @@
/obj/effect/proc_holder/changeling/suit/armor
name = "Chitinous Armor"
desc = "We turn our skin into tough chitin to protect us from damage."
- helptext = "Upkeep of the armor requires a low expenditure of chemicals. The armor is strong against brute force, but does not provide much protection from lasers. Cannot be used in lesser form."
+ helptext = "Upkeep of the armor requires a low expenditure of chemicals. The armor is strong against brute force, but does not provide much protection from lasers. Cannot be used in lesser form. This ability is loud, and might cause our blood to react violently to heat."
chemical_cost = 20
dna_cost = 1
+ loudness = 2
req_human = 1
recharge_slowdown = 0.25
diff --git a/code/modules/antagonists/changeling/powers/shriek.dm b/code/modules/antagonists/changeling/powers/shriek.dm
index ca79562081..f77624d072 100644
--- a/code/modules/antagonists/changeling/powers/shriek.dm
+++ b/code/modules/antagonists/changeling/powers/shriek.dm
@@ -1,9 +1,10 @@
/obj/effect/proc_holder/changeling/resonant_shriek
name = "Resonant Shriek"
desc = "Our lungs and vocal cords shift, allowing us to briefly emit a noise that deafens and confuses the weak-minded."
- helptext = "Emits a high-frequency sound that confuses and deafens humans, blows out nearby lights and overloads cyborg sensors."
+ helptext = "Emits a high-frequency sound that confuses and deafens humans, blows out nearby lights and overloads cyborg sensors. This ability is somewhat loud, and carries a small risk of our blood gaining violent sensitivity to heat."
chemical_cost = 20
dna_cost = 1
+ loudness = 1
req_human = 1
//A flashy ability, good for crowd control and sewing chaos.
@@ -25,13 +26,16 @@
for(var/obj/machinery/light/L in range(4, user))
L.on = 1
L.break_light_tube()
+ playsound(get_turf(user), 'sound/effects/lingscreech.ogg', 75, TRUE, 5, soundenvwet = 0)
return TRUE
/obj/effect/proc_holder/changeling/dissonant_shriek
name = "Dissonant Shriek"
desc = "We shift our vocal cords to release a high-frequency sound that overloads nearby electronics."
+ helptext = "Emits a high-frequency sound that overloads nearby electronics. This ability is somewhat loud, and carries a small risk of our blood gaining violent sensitivity to heat."
chemical_cost = 20
dna_cost = 1
+ loudness = 1
//A flashy ability, good for crowd control and sewing chaos.
/obj/effect/proc_holder/changeling/dissonant_shriek/sting_action(mob/user)
@@ -39,4 +43,5 @@
L.on = 1
L.break_light_tube()
empulse(get_turf(user), 2, 5, 1)
+ playsound(get_turf(user), 'sound/effects/lingempscreech.ogg', 75, TRUE, 5, soundenvwet = 0)
return TRUE
diff --git a/code/modules/antagonists/changeling/powers/spiders.dm b/code/modules/antagonists/changeling/powers/spiders.dm
index 685767f601..2bd1bc8a35 100644
--- a/code/modules/antagonists/changeling/powers/spiders.dm
+++ b/code/modules/antagonists/changeling/powers/spiders.dm
@@ -1,9 +1,10 @@
/obj/effect/proc_holder/changeling/spiders
name = "Spread Infestation"
desc = "Our form divides, creating arachnids which will grow into deadly beasts."
- helptext = "The spiders are thoughtless creatures, and may attack their creators when fully grown. Requires at least 3 DNA gained through Absorb, and not through DNA sting."
+ helptext = "The spiders are thoughtless creatures, and may attack their creators when fully grown. Requires at least 3 DNA gained through Absorb, and not through DNA sting. This ability is very loud, and will guarantee that our blood will react violently to heat."
chemical_cost = 45
dna_cost = 1
+ loudness = 4
req_absorbs = 3
//Makes some spiderlings. Good for setting traps and causing general trouble.
diff --git a/code/modules/antagonists/changeling/powers/tiny_prick.dm b/code/modules/antagonists/changeling/powers/tiny_prick.dm
index 9bf4a76454..6c9e0c6599 100644
--- a/code/modules/antagonists/changeling/powers/tiny_prick.dm
+++ b/code/modules/antagonists/changeling/powers/tiny_prick.dm
@@ -64,10 +64,11 @@
/obj/effect/proc_holder/changeling/sting/transformation
name = "Transformation Sting"
desc = "We silently sting a human, injecting a retrovirus that forces them to transform."
- helptext = "The victim will transform much like a changeling would. Does not provide a warning to others. Mutations will not be transferred, and monkeys will become human."
+ helptext = "The victim will transform much like a changeling would. Does not provide a warning to others. Mutations will not be transferred, and monkeys will become human. This ability is somewhat loud, and carries a small risk of our blood gaining violent sensitivity to heat."
sting_icon = "sting_transform"
chemical_cost = 50
dna_cost = 3
+ loudness = 1
var/datum/changelingprofile/selected_dna = null
/obj/effect/proc_holder/changeling/sting/transformation/Click()
@@ -111,10 +112,11 @@
/obj/effect/proc_holder/changeling/sting/false_armblade
name = "False Armblade Sting"
desc = "We silently sting a human, injecting a retrovirus that mutates their arm to temporarily appear as an armblade."
- helptext = "The victim will form an armblade much like a changeling would, except the armblade is dull and useless."
+ helptext = "The victim will form an armblade much like a changeling would, except the armblade is dull and useless. This ability is somewhat loud, and carries a small risk of our blood gaining violent sensitivity to heat."
sting_icon = "sting_armblade"
chemical_cost = 20
dna_cost = 1
+ loudness = 1
/obj/item/melee/arm_blade/false
desc = "A grotesque mass of flesh that used to be your arm. Although it looks dangerous at first, you can tell it's actually quite dull and useless."
@@ -183,10 +185,11 @@
/obj/effect/proc_holder/changeling/sting/mute
name = "Mute Sting"
desc = "We silently sting a human, completely silencing them for a short time."
- helptext = "Does not provide a warning to the victim that they have been stung, until they try to speak and cannot."
+ helptext = "Does not provide a warning to the victim that they have been stung, until they try to speak and cannot. This ability is loud, and might cause our blood to react violently to heat."
sting_icon = "sting_mute"
chemical_cost = 20
dna_cost = 2
+ loudness = 2
/obj/effect/proc_holder/changeling/sting/mute/sting_action(mob/user, mob/living/carbon/target)
log_combat(user, target, "stung", "mute sting")
@@ -196,10 +199,11 @@
/obj/effect/proc_holder/changeling/sting/blind
name = "Blind Sting"
desc = "Temporarily blinds the target."
- helptext = "This sting completely blinds a target for a short time."
+ helptext = "This sting completely blinds a target for a short time. This ability is somewhat loud, and carries a small risk of our blood gaining violent sensitivity to heat."
sting_icon = "sting_blind"
chemical_cost = 25
dna_cost = 1
+ loudness = 1
/obj/effect/proc_holder/changeling/sting/blind/sting_action(mob/user, mob/living/carbon/target)
log_combat(user, target, "stung", "blind sting")
@@ -229,10 +233,11 @@
/obj/effect/proc_holder/changeling/sting/cryo
name = "Cryogenic Sting"
desc = "We silently sting a human with a cocktail of chemicals that freeze them."
- helptext = "Does not provide a warning to the victim, though they will likely realize they are suddenly freezing."
+ helptext = "Does not provide a warning to the victim, though they will likely realize they are suddenly freezing. This ability is somewhat loud, and carries a small risk of our blood gaining violent sensitivity to heat."
sting_icon = "sting_cryo"
chemical_cost = 15
dna_cost = 2
+ loudness = 1
/obj/effect/proc_holder/changeling/sting/cryo/sting_action(mob/user, mob/target)
log_combat(user, target, "stung", "cryo sting")
diff --git a/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm b/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm
index ad83d5f4d2..530c4c5662 100644
--- a/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm
+++ b/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm
@@ -194,9 +194,12 @@
else
L.visible_message("[L]'s eyes blaze with brilliant light!", \
"Your vision suddenly screams with white-hot light!")
- L.Knockdown(15)
+ L.Knockdown(15, TRUE, FALSE, 15)
L.apply_status_effect(STATUS_EFFECT_KINDLE)
L.flash_act(1, 1)
+ if(issilicon(target))
+ var/mob/living/silicon/S = L
+ S.emp_act(EMP_HEAVY)
if(iscultist(L))
L.adjustFireLoss(15)
..()
diff --git a/code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm b/code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm
index e78a6e4623..6415d9f91a 100644
--- a/code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm
+++ b/code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm
@@ -71,7 +71,7 @@
desc = "Charges your slab with divine energy, allowing you to overwhelm a target with Ratvar's light."
invocations = list("Divinity, show them your light!")
whispered = TRUE
- channel_time = 30
+ channel_time = 20 // I think making kindle channel a third of the time less is a good make up for the fact that it silences people for such a little amount of time.
power_cost = 125
usage_tip = "The light can be used from up to two tiles away. Damage taken will GREATLY REDUCE the stun's duration."
tier = SCRIPTURE_DRIVER
@@ -112,21 +112,21 @@
quickbind_desc = "Applies handcuffs to a struck target."
-//Vanguard: Provides twenty seconds of stun immunity. At the end of the twenty seconds, 25% of all stuns absorbed are applied to the invoker.
+//Vanguard: Provides twenty seconds of greatly increased stamina and stun immunity. At the end of the twenty seconds, 25% of all stuns absorbed are applied to the invoker.
/datum/clockwork_scripture/vanguard
descname = "Self Stun Immunity"
name = "Vanguard"
- desc = "Provides twenty seconds of stun immunity. At the end of the twenty seconds, the invoker is knocked down for the equivalent of 25% of all stuns they absorbed. \
+ desc = "Provides twenty seconds of greatly increased stamina and stun immunity. At the end of the twenty seconds, the invoker is knocked down for the equivalent of 25% of all stuns they absorbed. \
Excessive absorption will cause unconsciousness."
invocations = list("Shield me...", "...from darkness!")
channel_time = 30
- power_cost = 25
+ power_cost = 75
usage_tip = "You cannot reactivate Vanguard while still shielded by it."
tier = SCRIPTURE_DRIVER
primary_component = VANGUARD_COGWHEEL
sort_priority = 6
quickbind = TRUE
- quickbind_desc = "Allows you to temporarily absorb stuns. All stuns absorbed will affect you when disabled."
+ quickbind_desc = "Allows you to temporarily have quickly regenerating stamina and absorb stuns. All stuns absorbed will affect you when disabled."
/datum/clockwork_scripture/vanguard/check_special_requirements()
if(!GLOB.ratvar_awakens && islist(invoker.stun_absorption) && invoker.stun_absorption["vanguard"] && invoker.stun_absorption["vanguard"]["end_time"] > world.time)
diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm
index 5e3c0aa872..c582d0f8f2 100644
--- a/code/modules/antagonists/cult/cult_items.dm
+++ b/code/modules/antagonists/cult/cult_items.dm
@@ -508,7 +508,9 @@
if(SEC_LEVEL_GREEN)
set_coefficient = 2
if(SEC_LEVEL_BLUE)
- set_coefficient = 1
+ set_coefficient = 1.2
+ if(SEC_LEVEL_AMBER)
+ set_coefficient = 0.8
else
set_coefficient = 0.5
var/surplus = timer - (SSshuttle.emergencyCallTime * set_coefficient)
diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm
index 51c8803cee..274273fdcf 100644
--- a/code/modules/antagonists/cult/runes.dm
+++ b/code/modules/antagonists/cult/runes.dm
@@ -185,6 +185,9 @@ structure_check() searches for nearby cultist structures required for the invoca
color = RUNE_COLOR_OFFER
req_cultists = 1
rune_in_use = FALSE
+ var/mob/living/currentconversionman
+ var/conversiontimeout
+ var/conversionresult
/obj/effect/rune/convert/do_invoke_glow()
return
@@ -241,6 +244,21 @@ structure_check() searches for nearby cultist structures required for the invoca
to_chat(M, "Something is shielding [convertee]'s mind!")
log_game("Offer rune failed - convertee had anti-magic")
return 0
+ to_chat(convertee, "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible, truth. The veil of reality has been ripped away \
+ and something evil takes root.")
+ to_chat(convertee, "Do you wish to embrace the Geometer of Blood? Click here to stop resisting the truth. Or you could choose to continue resisting...")
+ currentconversionman = convertee
+ conversiontimeout = world.time + (10 SECONDS)
+ convertee.Stun(100)
+ conversionresult = FALSE
+ while(world.time < conversiontimeout && convertee && !conversionresult)
+ stoplag(1)
+ currentconversionman = null
+ if(convertee && get_turf(convertee) != get_turf(src))
+ return FALSE
+ if(!conversionresult && convertee)
+ do_sacrifice(convertee, invokers)
+ return FALSE
var/brutedamage = convertee.getBruteLoss()
var/burndamage = convertee.getFireLoss()
if(brutedamage || burndamage)
@@ -252,8 +270,6 @@ structure_check() searches for nearby cultist structures required for the invoca
SSticker.mode.add_cultist(convertee.mind, 1)
new /obj/item/melee/cultblade/dagger(get_turf(src))
convertee.mind.special_role = ROLE_CULTIST
- to_chat(convertee, "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible, truth. The veil of reality has been ripped away \
- and something evil takes root.")
to_chat(convertee, "Assist your new compatriots in their dark dealings. Your goal is theirs, and theirs is yours. You serve the Geometer above all else. Bring it back.\
")
if(ishuman(convertee))
@@ -313,6 +329,12 @@ structure_check() searches for nearby cultist structures required for the invoca
sacrificial.gib()
return TRUE
+/obj/effect/rune/convert/Topic(href, href_list)
+ if(href_list["signmeup"])
+ if(currentconversionman == usr)
+ conversionresult = TRUE
+ else
+ to_chat(usr, "Your fate has already been set in stone.")
/obj/effect/rune/empower
@@ -442,9 +464,9 @@ structure_check() searches for nearby cultist structures required for the invoca
//Ritual of Dimensional Rending: Calls forth the avatar of Nar'Sie upon the station.
/obj/effect/rune/narsie
cultist_name = "Nar'Sie"
- cultist_desc = "tears apart dimensional barriers, calling forth the Geometer. Requires 9 invokers."
+ cultist_desc = "tears apart dimensional barriers, calling forth the Geometer. Requires 9 invokers, minus one for every 3 sacrifices."
invocation = "TOK-LYR RQA-NAP G'OLT-ULOFT!!"
- req_cultists = 9
+ req_cultists = 1
icon = 'icons/effects/96x96.dmi'
color = RUNE_COLOR_DARKRED
icon_state = "rune_large"
@@ -471,6 +493,10 @@ structure_check() searches for nearby cultist structures required for the invoca
if(!is_station_level(z))
return
var/mob/living/user = invokers[1]
+ if(invokers.len < 9 - (GLOB.sacrificed.len * 0.35))
+ to_chat(user, "You need at least [(9 - (GLOB.sacrificed.len * 0.35)) - invokers.len] more adjacent cultists to use this rune in such a manner.")
+ fail_invoke()
+ return
var/datum/antagonist/cult/user_antag = user.mind.has_antag_datum(/datum/antagonist/cult,TRUE)
var/datum/objective/eldergod/summon_objective = locate() in user_antag.cult_team.objectives
var/area/place = get_area(src)
diff --git a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm
index e365f09b55..ade5458765 100644
--- a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm
+++ b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm
@@ -588,12 +588,18 @@ This is here to make the tiles around the station mininuke change when it's arme
var/datum/round_event_control/operative/loneop = locate(/datum/round_event_control/operative) in SSevents.control
if(istype(loneop))
loneop.weight += 1
+ if(loneop.weight % 5 == 0)
+ message_admins("[src] is stationary in [ADMIN_VERBOSEJMP(newturf)]. The weight of Lone Operative is now [loneop.weight].")
+ log_game("[src] is stationary for too long in [loc_name(newturf)], and has increased the weight of the Lone Operative event to [loneop.weight].")
else
lastlocation = newturf
last_disk_move = world.time
var/datum/round_event_control/operative/loneop = locate(/datum/round_event_control/operative) in SSevents.control
if(istype(loneop) && prob(loneop.weight))
loneop.weight = max(loneop.weight - 1, 0)
+ if(loneop.weight % 5 == 0)
+ message_admins("[src] is on the move (currently in [ADMIN_VERBOSEJMP(newturf)]). The weight of Lone Operative is now [loneop.weight].")
+ log_game("[src] being on the move has reduced the weight of the Lone Operative event to [loneop.weight].")
/obj/item/disk/nuclear/examine(mob/user)
. = ..()
diff --git a/code/modules/antagonists/wizard/wizard.dm b/code/modules/antagonists/wizard/wizard.dm
index 6fac9730f3..e6cae518b6 100644
--- a/code/modules/antagonists/wizard/wizard.dm
+++ b/code/modules/antagonists/wizard/wizard.dm
@@ -60,50 +60,13 @@
owner.current.forceMove(pick(GLOB.wizardstart))
/datum/antagonist/wizard/proc/create_objectives()
- switch(rand(1,100))
- if(1 to 30)
- var/datum/objective/assassinate/kill_objective = new
- kill_objective.owner = owner
- kill_objective.find_target()
- objectives += kill_objective
+ var/datum/objective/new_objective = new("Cause as much creative mayhem as you can aboard the station! The more outlandish your methods of achieving this, the better! Make sure there's a decent amount of crew alive to tell of your tale.")
+ new_objective.owner = owner
+ objectives += new_objective
- if (!(locate(/datum/objective/escape) in owner.objectives))
- var/datum/objective/escape/escape_objective = new
- escape_objective.owner = owner
- objectives += escape_objective
-
- if(31 to 60)
- var/datum/objective/steal/steal_objective = new
- steal_objective.owner = owner
- steal_objective.find_target()
- objectives += steal_objective
-
- if (!(locate(/datum/objective/escape) in owner.objectives))
- var/datum/objective/escape/escape_objective = new
- escape_objective.owner = owner
- objectives += escape_objective
-
- if(61 to 85)
- var/datum/objective/assassinate/kill_objective = new
- kill_objective.owner = owner
- kill_objective.find_target()
- objectives += kill_objective
-
- var/datum/objective/steal/steal_objective = new
- steal_objective.owner = owner
- steal_objective.find_target()
- objectives += steal_objective
-
- if (!(locate(/datum/objective/survive) in owner.objectives))
- var/datum/objective/survive/survive_objective = new
- survive_objective.owner = owner
- objectives += survive_objective
-
- else
- if (!(locate(/datum/objective/hijack) in owner.objectives))
- var/datum/objective/hijack/hijack_objective = new
- hijack_objective.owner = owner
- objectives += hijack_objective
+ var/datum/objective/escape/escape_objective = new
+ escape_objective.owner = owner
+ objectives += escape_objective
for(var/datum/objective/O in objectives)
owner.objectives += O
diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm
index b653c3de7f..ad83ed8c13 100644
--- a/code/modules/assembly/flash.dm
+++ b/code/modules/assembly/flash.dm
@@ -125,7 +125,9 @@
to_chat(M, "[user] blinds you with the flash!")
else
to_chat(M, "You are blinded by [src]!")
- M.Knockdown(rand(80,120))
+ var/toblur = 20 - M.eye_blurry
+ if(toblur > 0)
+ M.blur_eyes(toblur)
else if(user)
visible_message("[user] fails to blind [M] with the flash!")
to_chat(user, "You fail to blind [M] with the flash!")
@@ -141,7 +143,7 @@
if(!try_use_flash(user))
return FALSE
if(iscarbon(M))
- flash_carbon(M, user, 5, 1)
+ flash_carbon(M, user, 20, 1)
return TRUE
else if(issilicon(M))
var/mob/living/silicon/robot/R = M
diff --git a/code/modules/atmospherics/environmental/LINDA_fire.dm b/code/modules/atmospherics/environmental/LINDA_fire.dm
index ebca252167..bf5d8efb13 100644
--- a/code/modules/atmospherics/environmental/LINDA_fire.dm
+++ b/code/modules/atmospherics/environmental/LINDA_fire.dm
@@ -20,8 +20,8 @@
if(active_hotspot)
if(soh)
if((tox > 0.5 || trit > 0.5) && oxy > 0.5)
- if(active_hotspot.temperature < exposed_temperature)
- active_hotspot.temperature = exposed_temperature
+ if(active_hotspot.temperature < exposed_temperature*50)
+ active_hotspot.temperature = exposed_temperature*50
if(active_hotspot.volume < exposed_volume)
active_hotspot.volume = exposed_volume
return 1
@@ -36,7 +36,7 @@
return 0
active_hotspot = new /obj/effect/hotspot(src)
- active_hotspot.temperature = exposed_temperature
+ active_hotspot.temperature = exposed_temperature*50
active_hotspot.volume = exposed_volume*25
active_hotspot.just_spawned = (current_cycle < SSair.times_fired)
@@ -47,6 +47,7 @@
heating.temperature = exposed_temperature
heating.react()
assume_air(heating)
+ air_update_turf()
return igniting
//This is the icon for fire on turfs, also helps for nurturing small fires until they are full tile
diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm
index bcb3752cbf..0a7b76cc79 100644
--- a/code/modules/atmospherics/machinery/airalarm.dm
+++ b/code/modules/atmospherics/machinery/airalarm.dm
@@ -650,7 +650,7 @@
if(0)
add_overlay(AALARM_OVERLAY_GREEN)
overlay_state = AALARM_OVERLAY_GREEN
- light_color = LIGHT_COLOR_BLUEGREEN
+ light_color = LIGHT_COLOR_PALEBLUE
set_light(brightness_on)
if(1)
add_overlay(AALARM_OVERLAY_WARN)
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm
index 6bafba9abc..07ee17a1bd 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm
@@ -61,6 +61,8 @@
//Actually transfer the gas
var/datum/gas_mixture/removed = air2.remove(transfer_moles)
+ removed.react(src)
+
update_parents()
return removed
diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm
index 16ecae7a5f..7cb771737e 100644
--- a/code/modules/awaymissions/mission_code/snowdin.dm
+++ b/code/modules/awaymissions/mission_code/snowdin.dm
@@ -10,6 +10,10 @@
name = "Snowdin Tundra Plains"
icon_state = "awaycontent25"
+/area/awaymission/snowdin/outside/vip
+ name = "Snowdin Tundra Plains"
+ icon_state = "awaycontent25"
+
/area/awaymission/snowdin/post
name = "Snowdin Outpost"
icon_state = "awaycontent2"
@@ -116,7 +120,7 @@
name = "Snowdin Main Base"
icon_state = "awaycontent16"
dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
- requires_power = TRUE
+ requires_power = FALSE
/area/awaymission/snowdin/dungeon1
name = "Snowdin Depths"
diff --git a/code/modules/cargo/bounties/engineering.dm b/code/modules/cargo/bounties/engineering.dm
index 8b73ebac4b..eb1764d482 100644
--- a/code/modules/cargo/bounties/engineering.dm
+++ b/code/modules/cargo/bounties/engineering.dm
@@ -24,6 +24,19 @@
description = "Station 49 is looking to kickstart their research program. Ship them a tank full of Tritium."
gas_type = /datum/gas/tritium
+/datum/bounty/item/engineering/pacman
+ name = "P.A.C.M.A.N.-type portable generator"
+ description = "A neighboring station had a problem with their SMES, and now need something to power their communications console. Can you send them a P.AC.M.A.N.?"
+ reward = 3500 //2500 for the cargo one
+ wanted_types = list(/obj/machinery/power/port_gen/pacman)
+
+/datum/bounty/item/engineering/canisters
+ name = "Gas Canisters"
+ description = "After a recent debacle in a nearby sector, 10 gas canisters are needed for containing an experimental aerosol before it kills all the local fauna."
+ reward = 5000
+ required_count = 10 //easy to make
+ wanted_types = list(/obj/machinery/portable_atmospherics/canister)
+
/datum/bounty/item/engineering/energy_ball
name = "Contained Tesla Ball"
description = "Station 24 is being overrun by hordes of angry Mothpeople. They are requesting the ultimate bug zapper."
diff --git a/code/modules/cargo/bounties/medical.dm b/code/modules/cargo/bounties/medical.dm
index d139775969..3129051754 100644
--- a/code/modules/cargo/bounties/medical.dm
+++ b/code/modules/cargo/bounties/medical.dm
@@ -57,3 +57,71 @@
description = "Central Command has run out of heavy duty pipe cleaners. Can you ship over a cat tail to help us out?"
reward = 3000
wanted_types = list(/obj/item/organ/tail/cat)
+
+/datum/bounty/item/medical/blood
+ name = "Generic Blood"
+ description = "Nanotrasen's annual blood drive is back up to full speed, following the garlic incident. Good blood in good volumes accepted for Credit returns."
+ reward = 3500
+ required_count = 600
+ wanted_types = list(/datum/reagent/blood)
+
+/* If anyone wants to try and fix/work, go for it
+/datum/bounty/item/medical/medibot // Mob so this dosn't work yet*
+ name = "Medibot"
+ description = "A sister station is dealing with um problem, they need a medibot to help treat their wounded..."
+ reward = 3000
+ wanted_types = list(/mob/living/simple_animal/bot/medbot)
+
+/datum/bounty/item/medical/bloodl //Dosnt work do to how blood is yet*
+ name = "L-type Blood"
+ description = "After a small scuffle, a few of our lizard employees need another blood transfusion."
+ reward = 4000
+ required_count = 200
+ wanted_types = (L,/datum/reagent/blood)
+ if(istype(L,/datum/reagent/blood))
+ wanted_types += L
+
+/datum/bounty/item/medical/bloodu //Dosnt work do to how blood is yet*
+ name = "U-Type Blood"
+ description = "After dealing with a small revolt in a local penal colony, the colony's anemic CMO needs blood, urgently. With his compromised immune system, only the best blood can be used."
+ reward = 5500 // Rarer blood
+ required_count = 200
+ wanted_types = (U,/datum/reagent/blood)
+ if(istype(U,/datum/reagent/blood))
+ wanted_types += U
+
+*/
+
+/datum/bounty/item/medical/surgery
+ name = "Surgery tool implants"
+ description = "Our medical interns keep dropping their Shambler's Juice while they're performing open heart surgery. One of them even had the audacity to say he only had two hands!"
+ reward = 10000
+ required_count = 3
+ wanted_types = list(/obj/item/organ/cyberimp/arm/surgery)
+
+/datum/bounty/item/medical/chemmaker
+ name = "Portable Chem Dispenser"
+ description = "After a new chemist mixed up some water and a banana, we lost our only chem dispenser. Please send us a replacement and you will be compensated."
+ reward = 7000
+ wanted_types = list(/obj/machinery/chem_dispenser)
+
+/datum/bounty/item/medical/advhealthscaner
+ name = "Advanced Health Analyzer"
+ description = "A ERT Medical unit needs the new 'advanced health analyzer', for a mission at a Station 4. Can you send some?."
+ reward = 4000
+ required_count = 5
+ wanted_types = list(/obj/item/healthanalyzer/advanced)
+
+/datum/bounty/item/medical/wallmounts
+ name = "Defibrillator wall mounts"
+ description = "New Space OSHA regulation state that are new cloning medical wing needs a few 'Easy to access defibrillartors'. Can you send a few before we get a lawsuit?"
+ reward = 5000
+ required_count = 3
+ wanted_types = list(/obj/machinery/defibrillator_mount)
+
+/datum/bounty/item/medical/defibrillator
+ name = "New defibillators"
+ description = "After years of storge are defibrillator units have become more liabilities then we want. Please send us some new ones to replace these old ones."
+ reward = 5000
+ required_count = 5
+ wanted_types = list(/obj/item/defibrillator)
diff --git a/code/modules/cargo/bounties/mining.dm b/code/modules/cargo/bounties/mining.dm
index 1b8b46734f..51d93f83b5 100644
--- a/code/modules/cargo/bounties/mining.dm
+++ b/code/modules/cargo/bounties/mining.dm
@@ -49,3 +49,17 @@
reward = 5000
required_count = 3
wanted_types = list(/obj/item/kitchen/knife/combat/bone)
+
+/datum/bounty/item/mining/basalt
+ name = "Artificial Basalt Tiles"
+ description = "Central Command's Ash Walker exhibit needs to be expanded again, we just need some more basalt flooring."
+ reward = 5000
+ required_count = 60
+ wanted_types = list(/obj/item/stack/tile/basalt)
+
+/datum/bounty/item/mining/fruit
+ name = "Cactus Fruit"
+ description = "Central Command's Ash Walker habitat needs more fauna, send us some local fruit seeds!"
+ reward = 2000
+ required_count = 1
+ wanted_types = list(/obj/item/seeds/lavaland/cactus)
diff --git a/code/modules/cargo/bounties/science.dm b/code/modules/cargo/bounties/science.dm
index 33f334ac47..2ac79f6ee8 100644
--- a/code/modules/cargo/bounties/science.dm
+++ b/code/modules/cargo/bounties/science.dm
@@ -64,3 +64,55 @@
description = "With the price of rechargers on the rise, upper management is interested in purchasing guns that are self-powered. If you ship one, they'll pay."
reward = 10000
wanted_types = list(/obj/item/gun/energy/e_gun/nuclear)
+
+/datum/bounty/item/science/bscells
+ name = "Bluespace Power Cells"
+ description = "Someone in upper management keeps using the excuse that his tablet battery dies when he's in the middle of work. This will be the last time he doesn't have his presentation, I swear to -"
+ reward = 7000
+ required_count = 10 //Easy to make
+ wanted_types = list(/obj/item/stock_parts/cell/bluespace)
+
+/datum/bounty/item/science/t4manip
+ name = "Femto-Manipulators"
+ description = "One of our Chief Engineers has OCD. Can you send us some femto-manipulators so he stops complaining that his ID doesn't fit perfectly in the PDA slot?"
+ reward = 7000
+ required_count = 20 //Easy to make
+ wanted_types = list(/obj/item/stock_parts/manipulator/femto)
+
+/datum/bounty/item/science/t4bins
+ name = "Bluespace Matter Bins"
+ description = "The local Janitorial union has gone on strike. Can you send us some bluespace bins so we don't have to take out our own trash?"
+ reward = 7000
+ required_count = 20 //Easy to make
+ wanted_types = list(/obj/item/stock_parts/matter_bin/bluespace)
+
+/datum/bounty/item/science/t4capacitor
+ name = "Quadratic Capacitor"
+ description = "One of our linguists doesn't understand why they're called Quadratic capacitors. Can you give him a few so he leaves us alone about it?"
+ reward = 7000
+ required_count = 20 //Easy to make
+ wanted_types = list(/obj/item/stock_parts/capacitor/quadratic)
+
+/datum/bounty/item/science/t4triphasic
+ name = "Triphasic Scanning Module"
+ description = "One of our scientists got into the liberty caps and is demanding new scanning modules so he can talk to ghosts. At this point we just want him out of our office."
+ reward = 7000
+ required_count = 20 //Easy to make
+ wanted_types = list(/obj/item/stock_parts/scanning_module/triphasic)
+
+/datum/bounty/item/science/t4microlaser
+ name = "Quad-Ultra Micro-Laser"
+ description = "The cats on Vega 9 are breeding out of control. We need something to corral them into one area so we can saturation bomb it."
+ reward = 7000
+ required_count = 20 //Easy to make
+ wanted_types = list(/obj/item/stock_parts/micro_laser/quadultra)
+
+/datum/bounty/item/science/fakecrystals
+ name = "synthetic bluespace crystals"
+ description = "Don't, uh, tell anyone, but one of our BSA arrays might have had a little... accident. Send us some bluespace crystals so we can recalibrate it before anyone realizes. The whole set uses artificial bluespace crystals, so we need and not any other type of bluespace crystals..."
+ reward = 10000
+ required_count = 5
+ wanted_types = list(/obj/item/stack/ore/bluespace_crystal/artificial)
+ exclude_types = list(/obj/item/stack/ore/bluespace_crystal,
+ /obj/item/stack/sheet/bluespace_crystal,
+ /obj/item/stack/ore/bluespace_crystal/refined)
diff --git a/code/modules/cargo/bounties/security.dm b/code/modules/cargo/bounties/security.dm
index bcf7b89f3a..cae8d10c61 100644
--- a/code/modules/cargo/bounties/security.dm
+++ b/code/modules/cargo/bounties/security.dm
@@ -11,3 +11,44 @@
reward = 2000
required_count = 3
wanted_types = list(/obj/machinery/recharger)
+
+/datum/bounty/item/security/practice
+ name = "Practice Laser Gun"
+ description = "Nanotrasen Military Academy is conducting routine marksmanship exercises. The clown hid all the practice lasers, and we're not using live weapons after last time."
+ reward = 3000
+ required_count = 3
+ wanted_types = list(/obj/item/gun/energy/laser/practice)
+
+/datum/bounty/item/security/flashshield
+ name = "Strobe Shield"
+ description = "One of our Emergency Response Agents thinks there's vampires in a local station. Send him something to help with his fear of the dark and protect him, too."
+ reward = 5000
+ wanted_types = list(/obj/item/assembly/flash/shield)
+
+/datum/bounty/item/security/sechuds
+ name = "Sec HUDs"
+ description = "Nanotrasen military academy has started to train officers how to use Sec HUDs to the fullest affect. Please send spare Sec HUDs so we can teach the men."
+ reward = 3000
+ required_count = 5
+ wanted_types = list(/obj/item/clothing/glasses/hud/security)
+
+/datum/bounty/item/security/techslugs
+ name = "Tech Slugs"
+ description = "Nanotrasen Military Academy is conducting an ammo loading and use lessons, on the new 'Tech Slugs'. Problem is we don't have any, please fix this..."
+ reward = 7500
+ required_count = 15
+ wanted_types = list(/obj/item/ammo_casing/shotgun/techshell)
+
+/datum/bounty/item/security/WT550
+ name = "Spare WT-550 clips"
+ description = "Nanotrasen Military Academy's ammunition is running low, please send in spare ammo for practice."
+ reward = 7500
+ required_count = 5
+ wanted_types = list(/obj/item/ammo_box/magazine/wt550m9)
+
+/datum/bounty/item/security/pins
+ name = "Test range firing pins"
+ description = "Nanotrasen Military Academy just got a new set of guns, sadly they didn't come with any pins. Can you send us some Test range locked firing pins?"
+ reward = 5000
+ required_count = 3
+ wanted_types = list(/obj/item/firing_pin/test_range)
diff --git a/code/modules/cargo/exports/manifest.dm b/code/modules/cargo/exports/manifest.dm
index d59ef1093f..763ca70dfe 100644
--- a/code/modules/cargo/exports/manifest.dm
+++ b/code/modules/cargo/exports/manifest.dm
@@ -76,3 +76,17 @@
/datum/export/manifest_correct_denied/get_cost(obj/O)
var/obj/item/paper/fluff/jobs/cargo/manifest/M = O
return ..() - M.order_cost
+
+// Paper work done correctly
+
+/datum/export/paperwork_correct
+ cost = 50
+ unit_name = "correct paperwork"
+ export_types = list(/obj/item/paper/fluff/jobs/cargo/manifest/paperwork_correct)
+
+// Paper work not done retruned
+
+/datum/export/paperwork_incorrect
+ cost = -500 // Failed to meet NT standers
+ unit_name = "returned incorrect paperwork"
+ export_types = list(/obj/item/paper/fluff/jobs/cargo/manifest/paperwork)
diff --git a/code/modules/cargo/order.dm b/code/modules/cargo/order.dm
index cef8685027..1f0d7d29b3 100644
--- a/code/modules/cargo/order.dm
+++ b/code/modules/cargo/order.dm
@@ -95,3 +95,14 @@
while(--lost >= 0)
qdel(pick(C.contents))
return C
+
+//Paperwork for NT
+/obj/item/paper/fluff/jobs/cargo/manifest/paperwork
+ name = "Incomplete Paperwork"
+ desc = "These should've been filled out four months ago! Unfinished grant papers issued by Nanotrasen's finance department. Complete this page for additional funding."
+ icon = 'icons/obj/bureaucracy.dmi'
+
+/obj/item/paper/fluff/jobs/cargo/manifest/paperwork_correct
+ name = "Finished Paperwork"
+ desc = "A neat stack of filled-out forms, in triplicate and signed. Is there anything more satisfying? Make sure they get stamped."
+ icon = 'icons/obj/bureaucracy.dmi'
diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm
index 1bf41e3d25..a9972ca2d4 100644
--- a/code/modules/cargo/packs.dm
+++ b/code/modules/cargo/packs.dm
@@ -81,10 +81,19 @@
crate_name = "emergency crate"
crate_type = /obj/structure/closet/crate/internals
+/datum/supply_pack/emergency/rcds
+ name = "Emergency RCDs"
+ desc = "Bombs going off on station? SME blown and now you need to fix the hole it left behind? Well this crate has a pare of Rcds to be able to easily fix up any problem you may have!"
+ cost = 1500
+ contains = list(/obj/item/construction/rcd,
+ /obj/item/construction/rcd)
+ crate_name = "emergency rcds"
+ crate_type = /obj/structure/closet/crate/internals
+
/datum/supply_pack/emergency/soft_suit
name = "Emergency Space Suit "
desc = "Is there bombs going off left and right? Is there meteors shooting around the station? Well we have two fragile space suit for emergencys as well as air and masks."
- cost = 1000
+ cost = 1000
contains = list(/obj/item/tank/internals/air,
/obj/item/tank/internals/air,
/obj/item/clothing/mask/gas,
@@ -256,6 +265,26 @@
crate_name = "weed control crate"
crate_type = /obj/structure/closet/crate/secure/hydroponics
+/datum/supply_pack/medical/anitvirus
+ name = "Virus Containment Crate"
+ desc = "Viro let out a death plague Mk II again? Someone didnt wash there hands? Old plagues born anew? Well this crate is for you! Hope you cure it before it brakes out of the station... This crate needs medical access to open and has two bio suits, a box of needles and beakers, five spaceacillin needles, and a medibot."
+ cost = 3000
+ access = ACCESS_MEDICAL
+ contains = list(/mob/living/simple_animal/bot/medbot,
+ /obj/item/clothing/head/bio_hood,
+ /obj/item/clothing/head/bio_hood,
+ /obj/item/clothing/suit/bio_suit,
+ /obj/item/clothing/suit/bio_suit,
+ /obj/item/reagent_containers/syringe/antiviral,
+ /obj/item/reagent_containers/syringe/antiviral,
+ /obj/item/reagent_containers/syringe/antiviral,
+ /obj/item/reagent_containers/syringe/antiviral,
+ /obj/item/reagent_containers/syringe/antiviral,
+ /obj/item/storage/box/syringes,
+ /obj/item/storage/box/beakers)
+ crate_name = "virus containment unit crate"
+ crate_type = /obj/structure/closet/crate/secure/plasma
+
//////////////////////////////////////////////////////////////////////////////
//////////////////////////// Security ////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
@@ -386,6 +415,29 @@
/obj/item/melee/baton/loaded)
crate_name = "stun baton crate"
+/datum/supply_pack/security/russianclothing
+ name = "Russian Surplus Clothing"
+ desc = "An old russian crate full of surplus armor that they used to use! Has two sets of bulletproff armor, a few union suits and some warm hats!"
+ hidden = TRUE
+ contraband = TRUE
+ cost = 5000 // Its basicly sec suits, good boots/gloves
+ contains = list(/obj/item/clothing/suit/security/officer/russian,
+ /obj/item/clothing/suit/security/officer/russian,
+ /obj/item/clothing/shoes/combat,
+ /obj/item/clothing/shoes/combat,
+ /obj/item/clothing/head/ushanka,
+ /obj/item/clothing/head/ushanka,
+ /obj/item/clothing/suit/armor/bulletproof,
+ /obj/item/clothing/suit/armor/bulletproof,
+ /obj/item/clothing/head/helmet/alt,
+ /obj/item/clothing/head/helmet/alt,
+ /obj/item/clothing/gloves/combat,
+ /obj/item/clothing/gloves/combat,
+ /obj/item/clothing/mask/gas,
+ /obj/item/clothing/mask/gas)
+ crate_name = "surplus russian clothing"
+ crate_type = /obj/structure/closet/crate/internals
+
/datum/supply_pack/security/taser
name = "Taser Crate"
desc = "From the depths of stunbased combat, this order rises above, supreme. Contains three hybrid tasers, capable of firing both electrodes and disabling shots. Requires Security access to open."
@@ -570,7 +622,7 @@
/datum/supply_pack/security/armory/wt550
- name = "WT-550 Auto Rifle Crate"
+ name = "WT-550 Semi-Auto Rifle Crate"
desc = "Contains two high-powered, semiautomatic rifles chambered in 4.6x30mm. Requires Armory access to open."
cost = 3500
contains = list(/obj/item/gun/ballistic/automatic/wt550,
@@ -578,8 +630,8 @@
crate_name = "auto rifle crate"
/datum/supply_pack/security/armory/wt550ammo
- name = "WT-550 Auto Rifle Ammo Crate"
- desc = "Contains four 20-round magazines for the WT-550 Auto Rifle. Each magazine is designed to facilitate rapid tactical reloads. Requires Armory access to open."
+ name = "WT-550 Semi-Auto SMG Ammo Crate"
+ desc = "Contains four 20-round magazines for the WT-550 Semi-Auto SMG. Each magazine is designed to facilitate rapid tactical reloads. Requires Armory access to open."
cost = 2500
contains = list(/obj/item/ammo_box/magazine/wt550m9,
/obj/item/ammo_box/magazine/wt550m9,
@@ -587,9 +639,9 @@
/obj/item/ammo_box/magazine/wt550m9)
crate_name = "auto rifle ammo crate"
-/datum/supply_pack/security/armory/wt550ammo_nonlethal // Takes around 11 shots to stun crit someone
- name = "WT-550 Auto Rifle Non-Lethal Ammo Crate"
- desc = "Contains four 20-round magazines for the WT-550 Auto Rifle. Each magazine is designed to facilitate rapid tactical reloads. Requires Armory access to open."
+/datum/supply_pack/security/armory/wt550ammo_nonlethal // Takes around 12 shots to stun crit someone
+ name = "WT-550 Semi-Auto SMG Non-Lethal Ammo Crate"
+ desc = "Contains four 20-round magazines for the WT-550 Semi-Auto SMG. Each magazine is designed to facilitate rapid tactical reloads. Requires Armory access to open."
cost = 1500
contains = list(/obj/item/ammo_box/magazine/wt550m9/wtrubber,
/obj/item/ammo_box/magazine/wt550m9/wtrubber,
@@ -598,8 +650,8 @@
crate_name = "auto rifle ammo crate"
/datum/supply_pack/security/armory/wt550ammo_special
- name = "WT-550 Auto Rifle Special Ammo Crate"
- desc = "Contains 2 20-round Armour Piercing and Incendiary magazines for the WT-550 Auto Rifle. Each magazine is designed to facilitate rapid tactical reloads. Requires Armory access to open."
+ name = "WT-550 Semi-Auto SMG Special Ammo Crate"
+ desc = "Contains 2 20-round Armour Piercing and Incendiary magazines for the WT-550 Semi-Auto SMG. Each magazine is designed to facilitate rapid tactical reloads. Requires Armory access to open."
cost = 4500
contains = list(/obj/item/ammo_box/magazine/wt550m9/wtap,
/obj/item/ammo_box/magazine/wt550m9/wtap,
@@ -666,6 +718,15 @@
/obj/item/clothing/suit/space/hardsuit/engine)
crate_name = "engineering hardsuit"
+/datum/supply_pack/engineering/industrialrcd
+ name = "Industrial RCD"
+ desc = "A industrial RCD in case the station has gone through more then one meteor storm and the CE needs to bring out the somthing a bit more reliable. Dose not contain spare ammo for the industrial RCD or any other RCD modles."
+ cost = 4500
+ access = ACCESS_CE
+ contains = list(/obj/item/construction/rcd/industrial)
+ crate_name = "industrial rcd"
+ crate_type = /obj/structure/closet/crate/secure/engineering
+
/datum/supply_pack/engineering/powergamermitts
name = "Insulated Gloves Crate"
desc = "The backbone of modern society. Barely ever ordered for actual engineering. Contains three insulated gloves."
@@ -1011,6 +1072,28 @@
contains = list(/obj/item/stack/sheet/mineral/wood/fifty)
crate_name = "wood planks crate"
+/datum/supply_pack/materials/rcdammo
+ name = "Spare RDC ammo"
+ desc = "This crate contains sixteen RCD ammo packs, to help with any holes or projects people mite be working on."
+ cost = 3750
+ contains = list(/obj/item/rcd_ammo,
+ /obj/item/rcd_ammo,
+ /obj/item/rcd_ammo,
+ /obj/item/rcd_ammo,
+ /obj/item/rcd_ammo,
+ /obj/item/rcd_ammo,
+ /obj/item/rcd_ammo,
+ /obj/item/rcd_ammo,
+ /obj/item/rcd_ammo,
+ /obj/item/rcd_ammo,
+ /obj/item/rcd_ammo,
+ /obj/item/rcd_ammo,
+ /obj/item/rcd_ammo,
+ /obj/item/rcd_ammo,
+ /obj/item/rcd_ammo,
+ /obj/item/rcd_ammo)
+ crate_name = "rcd ammo"
+
/datum/supply_pack/materials/bz
name = "BZ Canister Crate"
desc = "Contains a canister of BZ. Requires Toxins access to open."
@@ -1153,6 +1236,24 @@
/obj/item/storage/firstaid/regular)
crate_name = "first aid kit crate"
+/datum/supply_pack/medical/iv_drip
+ name = "IV Drip Crate"
+ desc = "Contains a single IV drip stand for intravenous delivery."
+ cost = 700
+ contains = list(/obj/machinery/iv_drip)
+ crate_name = "iv drip crate"
+
+/datum/supply_pack/science/adv_surgery_tools
+ name = "Med-Co Advanced surgery tools"
+ desc = "A full set of Med-Co advanced surgery tools, this crate also comes with a spay of synth flesh as well as a can of . Requires Surgery access to open."
+ cost = 5000
+ access = ACCESS_SURGERY
+ contains = list(/obj/item/storage/belt/medical/surgery_belt_adv,
+ /obj/item/reagent_containers/medspray/synthflesh,
+ /obj/item/reagent_containers/medspray/sterilizine)
+ crate_name = "medco newest surgery tools"
+ crate_type = /obj/structure/closet/crate/medical
+
/datum/supply_pack/medical/medicalhardsuit
name = "Medical Hardsuit"
desc = "Got people being spaced left and right? Hole in the same room as the dead body of Hos or cap? Fear not, now you can buy one medical hardsuit with a mask and air tank to save your fellow crewmembers."
@@ -1162,13 +1263,6 @@
/obj/item/clothing/suit/space/hardsuit/medical)
crate_name = "medical hardsuit"
-/datum/supply_pack/medical/iv_drip
- name = "IV Drip Crate"
- desc = "Contains a single IV drip for administering blood to patients."
- cost = 700
- contains = list(/obj/machinery/iv_drip)
- crate_name = "iv drip crate"
-
/datum/supply_pack/medical/supplies
name = "Medical Supplies Crate"
desc = "Contains seven beakers, syringes, and bodybags. Three morphine bottles, four insulin pills. Two charcoal bottles, epinephrine bottles, antitoxin bottles, and large beakers. Finally, a single roll of medical gauze, as well as a bottle of stimulant pills for long, hard work days. German doctor not included."
@@ -1280,6 +1374,7 @@
crate_type = /obj/structure/closet/crate/secure/plasma
dangerous = TRUE
+
//////////////////////////////////////////////////////////////////////////////
//////////////////////////// Science /////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
@@ -1395,6 +1490,19 @@
/datum/supply_pack/service
group = "Service"
+
+/datum/supply_pack/service/advlighting
+ name = "Advanced Lighting crate"
+ desc = "Thanks to advanced lighting tech we here at the Lamp Factory have be able to produce more lamps and lamp items! This crate has three lamps, a box of lights and a state of the art rapid-light-device!"
+ cost = 2500 //Fair
+ contains = list(/obj/item/construction/rld,
+ /obj/item/flashlight/lamp,
+ /obj/item/flashlight/lamp,
+ /obj/item/flashlight/lamp/green,
+ /obj/item/storage/box/lights/mixed)
+ crate_name = "advanced lighting crate"
+ crate_type = /obj/structure/closet/crate/secure
+
/datum/supply_pack/service/cargo_supples
name = "Cargo Supplies Crate"
desc = "Sold everything that wasn't bolted down? You can get right back to work with this crate containing stamps, an export scanner, destination tagger, hand labeler and some package wrapping."
@@ -1453,6 +1561,20 @@
crate_name = "janitor backpack crate"
crate_type = /obj/structure/closet/crate/secure
+/datum/supply_pack/service/janitor/janpremium
+ name = "Janitor Premium Supplies"
+ desc = "Do to the union for better supplies, we have desided to make a deal for you, In this crate you can get a brand new chem, Drying Angent this stuff is the work of slimes or magic! This crate also contains a rag to test out the Drying Angent magic, three wet floor signs, and some spare bottles of ammonia."
+ cost = 3000
+ access = ACCESS_JANITOR
+ contains = list(/obj/item/caution,
+ /obj/item/caution,
+ /obj/item/caution,
+ /obj/item/reagent_containers/glass/rag,
+ /obj/item/reagent_containers/glass/bottle/ammonia,
+ /obj/item/reagent_containers/glass/bottle/ammonia,
+ /obj/item/reagent_containers/spray/drying_agent)
+ crate_name = "janitor backpack crate"
+
/datum/supply_pack/service/mule
name = "MULEbot Crate"
desc = "Pink-haired Quartermaster not doing her job? Replace her with this tireless worker, today!"
@@ -1602,11 +1724,44 @@
crate_name = "beekeeping starter crate"
crate_type = /obj/structure/closet/crate/hydroponics
+/datum/supply_pack/organic/candy
+ name = "Candy Crate"
+ desc = "For people that have a insatiable sweet tooth! Has ten candies to be eaten up.."
+ cost = 2500
+ var/num_contained = 10 //number of items picked to be contained in a randomised crate
+ contains = list(/obj/item/reagent_containers/food/snacks/candy,
+ /obj/item/reagent_containers/food/snacks/lollipop,
+ /obj/item/reagent_containers/food/snacks/gumball,
+ /obj/item/reagent_containers/food/snacks/chocolateegg,
+ /obj/item/reagent_containers/food/snacks/donut,
+ /obj/item/reagent_containers/food/snacks/cookie,
+ /obj/item/reagent_containers/food/snacks/sugarcookie,
+ /obj/item/reagent_containers/food/snacks/chococornet,
+ /obj/item/reagent_containers/food/snacks/mint,
+ /obj/item/reagent_containers/food/snacks/spiderlollipop,
+ /obj/item/reagent_containers/food/snacks/chococoin,
+ /obj/item/reagent_containers/food/snacks/fudgedice,
+ /obj/item/reagent_containers/food/snacks/chocoorange,
+ /obj/item/reagent_containers/food/snacks/honeybar,
+ /obj/item/reagent_containers/food/snacks/tinychocolate,
+ /obj/item/reagent_containers/food/snacks/spacetwinkie,
+ /obj/item/reagent_containers/food/snacks/syndicake,
+ /obj/item/reagent_containers/food/snacks/cheesiehonkers,
+ /obj/item/reagent_containers/food/snacks/sugarcookie/spookyskull,
+ /obj/item/reagent_containers/food/snacks/sugarcookie/spookycoffin,
+ /obj/item/reagent_containers/food/snacks/candy_corn,
+ /obj/item/reagent_containers/food/snacks/candiedapple,
+ /obj/item/reagent_containers/food/snacks/chocolatebar,
+ /obj/item/reagent_containers/food/snacks/candyheart,
+ /obj/item/storage/fancy/heart_box,
+ /obj/item/storage/fancy/donut_box)
+ crate_name = "candy crate"
+
/datum/supply_pack/organic/cutlery
name = "Kitchen Cutlery Deluxe Set"
desc = "Need to slice and dice away those ''Tomatos'' well we got what you need! From a nice set of knifes, forks, plates, glasses, and a whetstone for when you got some grizzle that is a bit harder to slice then normal."
cost = 10000
- contraband = TRUE
+ contraband = TRUE
contains = list(/obj/item/sharpener,
/obj/item/kitchen/fork,
/obj/item/kitchen/fork,
@@ -1663,6 +1818,22 @@
access = ACCESS_THEATRE
crate_type = /obj/structure/closet/crate/secure
+/datum/supply_pack/organic/hunting
+ name = "Huntting gear"
+ desc = "Even in space, we can fine prey to hunt, this crate contains everthing a fine hunter needs to have a sporting time. This crate needs armory access to open. A true huntter only needs a fine bottle of cognac, a nice coat, some good o' cigars, and of cource a huntting shotgun. "
+ cost = 3500
+ contraband = TRUE
+ contains = list(/obj/item/clothing/head/flatcap,
+ /obj/item/clothing/suit/hooded/wintercoat/captain,
+ /obj/item/reagent_containers/food/drinks/bottle/cognac,
+ /obj/item/storage/fancy/cigarettes/cigars/havana,
+ /obj/item/clothing/gloves/color/white,
+ /obj/item/clothing/under/rank/curator,
+ /obj/item/gun/ballistic/shotgun/lethal)
+ access = ACCESS_ARMORY
+ crate_name = "sporting crate"
+ crate_type = /obj/structure/closet/crate/secure // Would have liked a wooden crate but access >:(
+
/datum/supply_pack/organic/hydroponics
name = "Hydroponics Crate"
desc = "Supplies for growing a great garden! Contains two bottles of ammonia, two Plant-B-Gone spray bottles, a hatchet, cultivator, plant analyzer, as well as a pair of leather gloves and a botanist's apron."
@@ -1754,6 +1925,27 @@
crate_name = "seeds crate"
crate_type = /obj/structure/closet/crate/hydroponics
+/datum/supply_pack/organic/vday
+ name = "Surplus Valentine Crate"
+ desc = "Turns out we got warehouses of this love-y dove-y crap. Were sending out small barged buddle of Valentine gear. This crate has two boxes of chocolate, three poppy flowers, five candy hearts, and three cards."
+ cost = 3000
+ contraband = TRUE
+ contains = list(/obj/item/storage/fancy/heart_box,
+ /obj/item/storage/fancy/heart_box,
+ /obj/item/reagent_containers/food/snacks/grown/poppy,
+ /obj/item/reagent_containers/food/snacks/grown/poppy,
+ /obj/item/reagent_containers/food/snacks/grown/poppy,
+ /obj/item/reagent_containers/food/snacks/candyheart,
+ /obj/item/reagent_containers/food/snacks/candyheart,
+ /obj/item/reagent_containers/food/snacks/candyheart,
+ /obj/item/reagent_containers/food/snacks/candyheart,
+ /obj/item/reagent_containers/food/snacks/candyheart,
+ /obj/item/valentine,
+ /obj/item/valentine,
+ /obj/item/valentine)
+ crate_name = "valentine crate"
+ crate_type = /obj/structure/closet/crate/secure
+
/datum/supply_pack/organic/exoticseeds
name = "Exotic Seeds Crate"
desc = "Any entrepreneuring botanist's dream. Contains twelve different seeds, including three replica-pod seeds and two mystery seeds!"
@@ -2106,8 +2298,7 @@
/datum/supply_pack/costumes_toys/randomised/toys
name = "Toy Crate"
desc = "Who cares about pride and accomplishment? Skip the gaming and get straight to the sweet rewards with this product! Contains five random toys. Warranty void if used to prank research directors."
- cost = 5000 // or play the arcade machines ya lazy bum
- // TODID make this actually just use the arcade machine loot list
+ cost = 1500 // or play the arcade machines ya lazy bum
num_contained = 5
contains = list(/obj/item/storage/box/snappops,
/obj/item/toy/talking/AI,
@@ -2161,6 +2352,19 @@
crate_name = "toy crate"
crate_type = /obj/structure/closet/crate/wooden
+/datum/supply_pack/costumes_toys/randomised/plush
+ name = "Plush Crate"
+ desc = "Plush tide station wide. Contains 5 random plushies for you to love. Warranty void if your love violates the terms of use."
+ cost = 1500 // or play the arcade machines ya lazy bum
+ num_contained = 5
+ contains = list(/obj/item/toy/plush/random,
+ /obj/item/toy/plush/random,
+ /obj/item/toy/plush/random,
+ /obj/item/toy/plush/random,
+ /obj/item/toy/plush/random) //I'm lazy
+ crate_name = "plushie crate"
+ crate_type = /obj/structure/closet/crate/wooden
+
/datum/supply_pack/costumes_toys/wizard
name = "Wizard Costume Crate"
desc = "Pretend to join the Wizard Federation with this full wizard outfit! Nanotrasen would like to remind its employees that actually joining the Wizard Federation is subject to termination of job and life."
@@ -2404,7 +2608,7 @@
crate_type = /obj/structure/closet/crate
/datum/supply_pack/misc/lewdkeg
- name = "Lewd Deluxe Keg"
+ name = "Lewd Deluxe Keg"
desc = "That other stuff not getting you ready? Well I have a Chemslut making tons of the good stuff."
cost = 7000 //It can be a weapon
contraband = TRUE
@@ -2412,6 +2616,27 @@
crate_name = "deluxe keg"
crate_type = /obj/structure/closet/crate
+/datum/supply_pack/misc/paper_work
+ name = "Freelance Paper work"
+ desc = "The Nanotrasen Primary Bureaucratic Database Intelligence (PDBI) reports that the station has not completed its funding and grant paperwork this solar cycle. In order to gain further funding, your station is required to fill out (10) ten of these forms or no additional capital will be disbursed. We have sent you ten copies of the following form and we expect every one to be up to Nanotrasen Standards." // Disbursement. It's not a typo, look it up.
+ cost = 400 // Net of 0 credits
+ contains = list(/obj/item/paper/fluff/jobs/cargo/manifest/paperwork,
+ /obj/item/paper/fluff/jobs/cargo/manifest/paperwork,
+ /obj/item/paper/fluff/jobs/cargo/manifest/paperwork,
+ /obj/item/paper/fluff/jobs/cargo/manifest/paperwork,
+ /obj/item/paper/fluff/jobs/cargo/manifest/paperwork,
+ /obj/item/paper/fluff/jobs/cargo/manifest/paperwork,
+ /obj/item/paper/fluff/jobs/cargo/manifest/paperwork,
+ /obj/item/paper/fluff/jobs/cargo/manifest/paperwork,
+ /obj/item/paper/fluff/jobs/cargo/manifest/paperwork,
+ /obj/item/paper/fluff/jobs/cargo/manifest/paperwork,
+ /obj/item/pen/fountain,
+ /obj/item/pen/fountain,
+ /obj/item/pen/fountain,
+ /obj/item/pen/fountain,
+ /obj/item/pen/fountain)
+ crate_name = "Paperwork"
+
/datum/supply_pack/misc/toner
name = "Toner Crate"
desc = "Spent too much ink printing butt pictures? Fret not, with these six toner refills, you'll be printing butts 'till the cows come home!'"
diff --git a/code/modules/client/client_defines.dm b/code/modules/client/client_defines.dm
index c85eb95b05..7216b73af6 100644
--- a/code/modules/client/client_defines.dm
+++ b/code/modules/client/client_defines.dm
@@ -72,4 +72,6 @@
var/list/credits //lazy list of all credit object bound to this client
- var/datum/player_details/player_details //these persist between logins/logouts during the same round.
\ No newline at end of file
+ var/datum/player_details/player_details //these persist between logins/logouts during the same round.
+
+ var/list/char_render_holders //Should only be a key-value list of north/south/east/west = obj/screen.
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 85d1b4f150..06f23574e1 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -454,6 +454,7 @@ GLOBAL_LIST_EMPTY(external_rsc_urls)
GLOB.ahelp_tickets.ClientLogout(src)
GLOB.directory -= ckey
GLOB.clients -= src
+ QDEL_LIST_ASSOC_VAL(char_render_holders)
if(movingmob != null)
movingmob.client_mobs_in_contents -= mob
UNSETEMPTY(movingmob.client_mobs_in_contents)
@@ -498,7 +499,7 @@ GLOBAL_LIST_EMPTY(external_rsc_urls)
qdel(query_client_in_db)
return
if(!query_client_in_db.NextRow())
- if (CONFIG_GET(flag/panic_bunker) && !holder && !GLOB.deadmins[ckey])
+ if (CONFIG_GET(flag/panic_bunker) && !holder && !GLOB.deadmins[ckey] && !(ckey in GLOB.bunker_passthrough))
log_access("Failed Login: [key] - New account attempting to connect during panic bunker")
message_admins("Failed Login: [key] - New account attempting to connect during panic bunker")
to_chat(src, "You must first join the Discord to verify your account before joining this server.
To do so, read the rules and post a request in the #station-access-requests channel under the \"Main server\" category in the Discord server linked here: https://discord.gg/E6SQuhz") //CIT CHANGE - makes the panic bunker disconnect message point to the discord
@@ -877,3 +878,23 @@ GLOBAL_LIST_EMPTY(external_rsc_urls)
/client/proc/AnnouncePR(announcement)
if(prefs && prefs.chat_toggles & CHAT_PULLR)
to_chat(src, announcement)
+
+/client/proc/show_character_previews(mutable_appearance/MA)
+ var/pos = 0
+ for(var/D in GLOB.cardinals)
+ pos++
+ var/obj/screen/O = LAZYACCESS(char_render_holders, "[D]")
+ if(!O)
+ O = new
+ LAZYSET(char_render_holders, "[D]", O)
+ screen |= O
+ O.appearance = MA
+ O.dir = D
+ O.screen_loc = "character_preview_map:0,[pos]"
+
+/client/proc/clear_character_previews()
+ for(var/index in char_render_holders)
+ var/obj/screen/S = char_render_holders[index]
+ screen -= S
+ qdel(S)
+ char_render_holders = null
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 53a8d84af2..f245dd330e 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -1,2119 +1,2212 @@
- /* CAUTION! CAUTION! CAUTION! CAUTION! CAUTION! *\
- | THIS FILE CONTAINS HOOKS FOR FOR |
- | CHANGES SPECIFIC TO CITADEL. IF |
- | YOU'RE FIXING A MERGE CONFLICT |
- | HERE, PLEASE ASK FOR REVIEW FROM |
- | ANOTHER MAINTAINER TO ENSURE YOU |
- | DON'T INTRODUCE REGRESSIONS. |
- \* */
-
-GLOBAL_LIST_EMPTY(preferences_datums)
-
-/datum/preferences
- var/client/parent
- //doohickeys for savefiles
- var/path
- var/default_slot = 1 //Holder so it doesn't default to slot 1, rather the last one used
- var/max_save_slots = 8
-
- //non-preference stuff
- var/muted = 0
- var/last_ip
- var/last_id
-
- //game-preferences
- var/lastchangelog = "" //Saved changlog filesize to detect if there was a change
- var/ooccolor = null
- var/enable_tips = TRUE
- var/tip_delay = 500 //tip delay in milliseconds
-
- //Antag preferences
- var/list/be_special = list() //Special role selection
- var/tmp/old_be_special = 0 //Bitflag version of be_special, used to update old savefiles and nothing more
- //If it's 0, that's good, if it's anything but 0, the owner of this prefs file's antag choices were,
- //autocorrected this round, not that you'd need to check that.
-
-
- var/UI_style = null
- var/buttons_locked = FALSE
- var/hotkeys = FALSE
- var/tgui_fancy = TRUE
- var/tgui_lock = TRUE
- var/windowflashing = TRUE
- var/toggles = TOGGLES_DEFAULT
- var/db_flags
- var/chat_toggles = TOGGLES_DEFAULT_CHAT
- var/ghost_form = "ghost"
- var/ghost_orbit = GHOST_ORBIT_CIRCLE
- var/ghost_accs = GHOST_ACCS_DEFAULT_OPTION
- var/ghost_others = GHOST_OTHERS_DEFAULT_OPTION
- var/ghost_hud = 1
- var/inquisitive_ghost = 1
- var/allow_midround_antag = 1
- var/preferred_map = null
- var/pda_style = MONO
- var/pda_color = "#808000"
-
- var/uses_glasses_colour = 0
-
- //character preferences
- var/real_name //our character's name
- var/be_random_name = 0 //whether we'll have a random name every round
- var/be_random_body = 0 //whether we'll have a random body every round
- var/gender = MALE //gender of character (well duh)
- var/age = 30 //age of character
- var/underwear = "Nude" //underwear type
- var/undershirt = "Nude" //undershirt type
- var/socks = "Nude" //socks type
- var/backbag = DBACKPACK //backpack type
- var/hair_style = "Bald" //Hair type
- var/hair_color = "000" //Hair color
- var/facial_hair_style = "Shaved" //Face hair type
- var/facial_hair_color = "000" //Facial hair color
- var/skin_tone = "caucasian1" //Skin color
- var/eye_color = "000" //Eye color
- var/datum/species/pref_species = new /datum/species/human() //Mutant race
- var/list/features = list("mcolor" = "FFF",
- "tail_lizard" = "Smooth", "tail_human" = "None",
- "snout" = "Round", "horns" = "None", "ears" = "None",
- "wings" = "None", "frills" = "None", "spines" = "None",
- "body_markings" = "None", "legs" = "Normal Legs", "moth_wings" = "Plain")
-
- var/list/custom_names = list()
- var/prefered_security_department = SEC_DEPT_RANDOM
-
- //Mob preview
- var/icon/preview_icon = null
-
- //Quirk list
- var/list/positive_quirks = list()
- var/list/negative_quirks = list()
- var/list/neutral_quirks = list()
- var/list/all_quirks = list()
- var/list/character_quirks = list()
-
- //Jobs, uses bitflags
- var/job_civilian_high = 0
- var/job_civilian_med = 0
- var/job_civilian_low = 0
-
- var/job_medsci_high = 0
- var/job_medsci_med = 0
- var/job_medsci_low = 0
-
- var/job_engsec_high = 0
- var/job_engsec_med = 0
- var/job_engsec_low = 0
-
- // Want randomjob if preferences already filled - Donkie
- var/joblessrole = BERANDOMJOB //defaults to 1 for fewer assistants
-
- // 0 = character settings, 1 = game preferences
- var/current_tab = 0
-
- var/unlock_content = 0
-
- var/list/ignoring = list()
-
- var/clientfps = 0
-
- var/parallax
-
- var/ambientocclusion = TRUE
- var/auto_fit_viewport = TRUE
-
- var/uplink_spawn_loc = UPLINK_PDA
-
- var/list/exp = list()
- var/list/menuoptions
-
- var/action_buttons_screen_locs = list()
-
-/datum/preferences/New(client/C)
- parent = C
-
- for(var/custom_name_id in GLOB.preferences_custom_names)
- custom_names[custom_name_id] = get_default_name(custom_name_id)
-
- UI_style = GLOB.available_ui_styles[1]
- if(istype(C))
- if(!IsGuestKey(C.key))
- load_path(C.ckey)
- unlock_content = C.IsByondMember()
- if(unlock_content)
- max_save_slots = 16
- var/loaded_preferences_successfully = load_preferences()
- if(loaded_preferences_successfully)
- if(load_character())
- return
- //we couldn't load character data so just randomize the character appearance + name
- random_character() //let's create a random character then - rather than a fat, bald and naked man.
- real_name = pref_species.random_name(gender,1)
- if(!loaded_preferences_successfully)
- save_preferences()
- save_character() //let's save this new random character so it doesn't keep generating new ones.
- menuoptions = list()
- return
-
-#define APPEARANCE_CATEGORY_COLUMN ""
-#define MAX_MUTANT_ROWS 4
-
-/datum/preferences/proc/ShowChoices(mob/user)
- if(!user || !user.client)
- return
- if(current_tab == 2) //CITADEL EDIT, for muh nudies
- update_preview_icon(nude=TRUE)
- else
- update_preview_icon(nude=FALSE) //EDIT END
- user << browse_rsc(preview_icon, "previewicon.png")
- var/list/dat = list("")
-
- dat += "Character Settings"
- dat += "Character Appearance"
- dat += "Loadout"
- dat += "Game Preferences"
-
- if(!path)
- dat += " Please create an account to save your preferences "
-
- dat += ""
-
- dat += "
"
-
- switch(current_tab)
- if (0) // Character Settings#
- if(path)
- var/savefile/S = new /savefile(path)
- if(S)
- dat += ""
- var/name
- var/unspaced_slots = 0
- for(var/i=1, i<=max_save_slots, i++)
- unspaced_slots++
- if(unspaced_slots > 4)
- dat += "
"
- unspaced_slots = 0
- S.cd = "/character[i]"
- S["real_name"] >> name
- if(!name)
- name = "Character[i]"
- dat += "[name] "
- dat += ""
-
- dat += "Occupation Choices"
- dat += "Set Occupation Preferences
"
- if(CONFIG_GET(flag/roundstart_traits))
- dat += "Quirk Setup"
- dat += "Configure Quirks
"
- dat += "Current Quirks: [all_quirks.len ? all_quirks.Join(", ") : "None"]"
- dat += "Identity"
- dat += ""
-
- //Character Appearance
- if(2)
- update_preview_icon(nude=TRUE)
- user << browse_rsc(preview_icon, "previewicon.png")
- dat += ""
- dat += ""
- dat += "Set Flavor Text
"
- if(lentext(features["flavor_text"]) <= 40)
- if(!lentext(features["flavor_text"]))
- dat += "\[...\]"
- else
- dat += "[features["flavor_text"]]"
- else
- dat += "[TextPreview(features["flavor_text"])]...
"
- dat += "Body"
- dat += "Gender: [gender == MALE ? "Male" : (gender == FEMALE ? "Female" : (gender == PLURAL ? "Non-binary" : "Object"))]
"
- dat += "Species:[pref_species.id]
"
- dat += "Random Body
"
- dat += "Always Random Body: [be_random_body ? "Yes" : "No"]
"
-
- var/use_skintones = pref_species.use_skintones
- if(use_skintones)
- dat += APPEARANCE_CATEGORY_COLUMN
-
- dat += "Skin Tone"
-
- dat += "[skin_tone]
"
-
- var/mutant_colors
- if((MUTCOLORS in pref_species.species_traits) || (MUTCOLORS_PARTSONLY in pref_species.species_traits))
- if(!use_skintones)
- dat += APPEARANCE_CATEGORY_COLUMN
-
- dat += "Body Colors
"
- dat += "Primary Color: Change
"
- dat += "Secondary Color: Change
"
- dat += "Tertiary Color: Change
"
- mutant_colors = TRUE
-
- if((EYECOLOR in pref_species.species_traits) && !(NOEYES in pref_species.species_traits))
-
- if(!use_skintones && !mutant_colors)
- dat += APPEARANCE_CATEGORY_COLUMN
-
- dat += "Eye Color"
-
- dat += " Change
"
-
- dat += " | "
- else if(use_skintones || mutant_colors)
- dat += ""
-
- if(HAIR in pref_species.species_traits)
-
- dat += APPEARANCE_CATEGORY_COLUMN
-
- dat += "Hair Style"
-
- dat += "[hair_style]
"
- dat += "< >
"
- dat += " Change
"
-
- dat += "Facial Hair Style"
-
- dat += "[facial_hair_style]
"
- dat += "< >
"
- dat += " Change
"
-
- dat += ""
- //Mutant stuff
- var/mutant_category = 0
-
- if("tail_lizard" in pref_species.default_features)
- if(!mutant_category)
- dat += APPEARANCE_CATEGORY_COLUMN
-
- dat += "Tail"
-
- dat += "[features["tail_lizard"]]
"
-
- mutant_category++
- if(mutant_category >= MAX_MUTANT_ROWS)
- dat += ""
- mutant_category = 0
-
- if("mam_tail" in pref_species.default_features)
- if(!mutant_category)
- dat += APPEARANCE_CATEGORY_COLUMN
-
- dat += "Tail"
-
- dat += "[features["mam_tail"]]
"
-
- mutant_category++
- if(mutant_category >= MAX_MUTANT_ROWS)
- dat += ""
- mutant_category = 0
- if("tail_human" in pref_species.default_features)
- if(!mutant_category)
- dat += APPEARANCE_CATEGORY_COLUMN
-
- dat += "Tail"
-
- dat += "[features["tail_human"]]
"
-
- mutant_category++
- if(mutant_category >= MAX_MUTANT_ROWS)
- dat += ""
- mutant_category = 0
- if("snout" in pref_species.default_features)
- if(!mutant_category)
- dat += APPEARANCE_CATEGORY_COLUMN
-
- dat += "Snout"
-
- dat += "[features["snout"]]
"
-
- mutant_category++
- if(mutant_category >= MAX_MUTANT_ROWS)
- dat += ""
- mutant_category = 0
- if("horns" in pref_species.default_features)
- if(!mutant_category)
- dat += APPEARANCE_CATEGORY_COLUMN
-
- dat += "Horns"
-
- dat += "[features["horns"]]
"
-
- mutant_category++
- if(mutant_category >= MAX_MUTANT_ROWS)
- dat += ""
- if("frills" in pref_species.default_features)
- if(!mutant_category)
- dat += APPEARANCE_CATEGORY_COLUMN
-
- dat += "Frills"
-
- dat += "[features["frills"]]
"
-
- mutant_category++
- if(mutant_category >= MAX_MUTANT_ROWS)
- dat += ""
- mutant_category = 0
-
- if("spines" in pref_species.default_features)
- if(!mutant_category)
- dat += APPEARANCE_CATEGORY_COLUMN
-
- dat += "Spines"
-
- dat += "[features["spines"]]
"
-
- mutant_category++
- if(mutant_category >= MAX_MUTANT_ROWS)
- dat += ""
- mutant_category = 0
-
- if("body_markings" in pref_species.default_features)
- if(!mutant_category)
- dat += APPEARANCE_CATEGORY_COLUMN
-
- dat += "Body Markings"
-
- dat += "[features["body_markings"]]
"
-
- mutant_category++
- if(mutant_category >= MAX_MUTANT_ROWS)
- dat += ""
- mutant_category = 0
- if("mam_body_markings" in pref_species.default_features)
- if(!mutant_category)
- dat += APPEARANCE_CATEGORY_COLUMN
-
- dat += "Species Markings"
-
- dat += "[features["mam_body_markings"]]
"
-
- mutant_category++
- if(mutant_category >= MAX_MUTANT_ROWS)
- dat += ""
-
- if("mam_ears" in pref_species.default_features)
- if(!mutant_category)
- dat += APPEARANCE_CATEGORY_COLUMN
-
- dat += "Ears"
-
- dat += "[features["mam_ears"]]
"
-
- mutant_category++
- if(mutant_category >= MAX_MUTANT_ROWS)
- dat += ""
- mutant_category = 0
- if("ears" in pref_species.default_features)
- if(!mutant_category)
- dat += APPEARANCE_CATEGORY_COLUMN
-
- dat += "Ears"
-
- dat += "[features["ears"]]
"
-
- mutant_category++
- if(mutant_category >= MAX_MUTANT_ROWS)
- dat += ""
- mutant_category = 0
- if("legs" in pref_species.default_features)
- if(!mutant_category)
- dat += APPEARANCE_CATEGORY_COLUMN
-
- dat += "Legs"
-
- dat += "[features["legs"]]
"
-
- mutant_category++
- if(mutant_category >= MAX_MUTANT_ROWS)
- dat += ""
- mutant_category = 0
- if("moth_wings" in pref_species.default_features)
- if(!mutant_category)
- dat += APPEARANCE_CATEGORY_COLUMN
-
- dat += "Moth wings"
-
- dat += "[features["moth_wings"]]
"
-
- mutant_category++
- if(mutant_category >= MAX_MUTANT_ROWS)
- dat += ""
- mutant_category = 0
- if("taur" in pref_species.default_features)
- if(!mutant_category)
- dat += APPEARANCE_CATEGORY_COLUMN
-
- dat += "Tauric Body"
-
- dat += "[features["taur"]]
"
-
- mutant_category++
- if(mutant_category >= MAX_MUTANT_ROWS)
- dat += ""
- mutant_category = 0
- if("wings" in pref_species.mutant_bodyparts && GLOB.r_wings_list.len >1)
- if(!mutant_category)
- dat += APPEARANCE_CATEGORY_COLUMN
-
- dat += "Wings"
-
- dat += "[features["wings"]]
"
-
- mutant_category++
- if(mutant_category >= MAX_MUTANT_ROWS)
- dat += ""
- mutant_category = 0
- if("xenohead" in pref_species.default_features)
- if(!mutant_category)
- dat += APPEARANCE_CATEGORY_COLUMN
-
- dat += "Caste Head"
-
- dat += "[features["xenohead"]]
"
-
- mutant_category++
- if(mutant_category >= MAX_MUTANT_ROWS)
- dat += ""
- mutant_category = 0
- if("xenotail" in pref_species.default_features)
- if(!mutant_category)
- dat += APPEARANCE_CATEGORY_COLUMN
-
- dat += "Tail"
-
- dat += "[features["xenotail"]]
"
-
- mutant_category++
- if(mutant_category >= MAX_MUTANT_ROWS)
- dat += ""
- mutant_category = 0
- if("xenodorsal" in pref_species.default_features)
- if(!mutant_category)
- dat += APPEARANCE_CATEGORY_COLUMN
-
- dat += "Dorsal Spines"
-
- dat += "[features["xenodorsal"]]
"
-
- mutant_category++
- if(mutant_category >= MAX_MUTANT_ROWS)
- dat += ""
- mutant_category = 0
- if("ipc_screen" in pref_species.default_features)
- if(!mutant_category)
- dat += APPEARANCE_CATEGORY_COLUMN
-
- dat += "Screen"
-
- dat += "[features["ipc_screen"]]
"
-
- mutant_category++
- if(mutant_category >= MAX_MUTANT_ROWS)
- dat += ""
- mutant_category = 0
- if("ipc_antenna" in pref_species.default_features)
- if(!mutant_category)
- dat += APPEARANCE_CATEGORY_COLUMN
-
- dat += "Antenna"
-
- dat += "[features["ipc_antenna"]]
"
-
- mutant_category++
- if(mutant_category >= MAX_MUTANT_ROWS)
- dat += ""
- mutant_category = 0
-
- if(mutant_category)
- dat += ""
- mutant_category = 0
-
- dat += "
"
-
- dat += " | "
-
- dat += "Clothing & Equipment"
-
- dat += "Underwear:[underwear]
"
- dat += "Undershirt:[undershirt]
"
- dat += "Socks:[socks]
"
- dat += "Backpack:[backbag]
"
- dat += "Uplink Location:[uplink_spawn_loc]
"
-
- dat += "Genitals"
- if(NOGENITALS in pref_species.species_traits)
- dat += "Your species ([pref_species.name]) does not support genitals!
"
- else
- if(pref_species.use_skintones)
- dat += "Genitals use skintone:[features["genitals_use_skintone"] == TRUE ? "Yes" : "No"]
"
- dat += "Has Penis:[features["has_cock"] == TRUE ? "Yes" : "No"]
"
- if(features["has_cock"] == TRUE)
- if(pref_species.use_skintones && features["genitals_use_skintone"] == TRUE)
- dat += "Penis Color: (Skin tone overriding)
"
- else
- dat += "Penis Color: Change
"
- dat += "Penis Shape: [features["cock_shape"]]
"
- dat += "Penis Length: [features["cock_length"]] inch(es)
"
- dat += "Has Testicles:[features["has_balls"] == TRUE ? "Yes" : "No"]
"
- if(features["has_balls"] == TRUE)
- if(pref_species.use_skintones && features["genitals_use_skintone"] == TRUE)
- dat += "Testicles Color: (Skin tone overriding)
"
- else
- dat += "Testicles Color: Change
"
- dat += "Has Vagina:[features["has_vag"] == TRUE ? "Yes" : "No"]
"
- if(features["has_vag"])
- dat += "Vagina Type: [features["vag_shape"]]
"
- if(pref_species.use_skintones && features["genitals_use_skintone"] == TRUE)
- dat += "Vagina Color: (Skin tone overriding)
"
- else
- dat += "Vagina Color: Change
"
- dat += "Has Womb:[features["has_womb"] == TRUE ? "Yes" : "No"]
"
- dat += "Has Breasts:[features["has_breasts"] == TRUE ? "Yes" : "No"]
"
- if(features["has_breasts"])
- if(pref_species.use_skintones && features["genitals_use_skintone"] == TRUE)
- dat += "Color: (Skin tone overriding)
"
- else
- dat += "Color: Change
"
- dat += "Cup Size:[features["breasts_size"]]
"
- dat += "Breast Shape:[features["breasts_shape"]]
"
- dat += " | "
-
- if (1) // Game Preferences
- dat += ""
- if(unlock_content)
- dat += "Ghost Form: [ghost_form]
"
- dat += "Ghost Orbit: [ghost_orbit]
"
- var/button_name = "If you see this something went wrong."
- switch(ghost_accs)
- if(GHOST_ACCS_FULL)
- button_name = GHOST_ACCS_FULL_NAME
- if(GHOST_ACCS_DIR)
- button_name = GHOST_ACCS_DIR_NAME
- if(GHOST_ACCS_NONE)
- button_name = GHOST_ACCS_NONE_NAME
-
- dat += "Ghost Accessories: [button_name]
"
- switch(ghost_others)
- if(GHOST_OTHERS_THEIR_SETTING)
- button_name = GHOST_OTHERS_THEIR_SETTING_NAME
- if(GHOST_OTHERS_DEFAULT_SPRITE)
- button_name = GHOST_OTHERS_DEFAULT_SPRITE_NAME
- if(GHOST_OTHERS_SIMPLE)
- button_name = GHOST_OTHERS_SIMPLE_NAME
-
- dat += "Ghosts of Others: [button_name]
"
- dat += "
"
- dat += "FPS: [clientfps]
"
- dat += "Parallax (Fancy Space): "
- switch (parallax)
- if (PARALLAX_LOW)
- dat += "Low"
- if (PARALLAX_MED)
- dat += "Medium"
- if (PARALLAX_INSANE)
- dat += "Insane"
- if (PARALLAX_DISABLE)
- dat += "Disabled"
- else
- dat += "High"
- dat += "
"
- dat += "Ambient Occlusion: [ambientocclusion ? "Enabled" : "Disabled"]
"
- dat += "Fit Viewport: [auto_fit_viewport ? "Auto" : "Manual"]
"
-
- if (CONFIG_GET(flag/maprotation) && CONFIG_GET(flag/tgstyle_maprotation))
- var/p_map = preferred_map
- if (!p_map)
- p_map = "Default"
- if (config.defaultmap)
- p_map += " ([config.defaultmap.map_name])"
- else
- if (p_map in config.maplist)
- var/datum/map_config/VM = config.maplist[p_map]
- if (!VM)
- p_map += " (No longer exists)"
- else
- p_map = VM.map_name
- else
- p_map += " (No longer exists)"
- if(CONFIG_GET(flag/allow_map_voting))
- dat += "Preferred Map: [p_map]
"
-
- dat += ""
-
- dat += "Special Role Settings"
-
- if(jobban_isbanned(user, ROLE_SYNDICATE))
- dat += "You are banned from antagonist roles."
- src.be_special = list()
-
-
- for (var/i in GLOB.special_roles)
- if(jobban_isbanned(user, i))
- dat += "Be [capitalize(i)]: BANNED
"
- else
- var/days_remaining = null
- if(ispath(GLOB.special_roles[i]) && CONFIG_GET(flag/use_age_restriction_for_jobs)) //If it's a game mode antag, check if the player meets the minimum age
- var/mode_path = GLOB.special_roles[i]
- var/datum/game_mode/temp_mode = new mode_path
- days_remaining = temp_mode.get_remaining_days(user.client)
-
- if(days_remaining)
- dat += "Be [capitalize(i)]: \[IN [days_remaining] DAYS]
"
- else
- dat += "Be [capitalize(i)]: [(i in be_special) ? "Enabled" : "Disabled"]
"
- dat += "Midround Antagonist: [(toggles & MIDROUND_ANTAG) ? "Enabled" : "Disabled"]
"
-
- dat += "
"
- dat += "Citadel Preferences" //Because fuck me if preferences can't be fucking modularized and expected to update in a reasonable timeframe.
- dat += "Arousal:[arousable == TRUE ? "Enabled" : "Disabled"]
"
- dat += "Exhibitionist:[features["exhibitionist"] == TRUE ? "Yes" : "No"]
"
- dat += "Voracious MediHound sleepers: [(cit_toggles & MEDIHOUND_SLEEPER) ? "Yes" : "No"]
"
- dat += "Hear Vore Sounds: [(cit_toggles & EATING_NOISES) ? "Yes" : "No"]
"
- dat += "Hear Vore Digestion Sounds: [(cit_toggles & DIGESTION_NOISES) ? "Yes" : "No"]
"
- dat += "Widescreen: [widescreenpref ? "Enabled ([CONFIG_GET(string/default_view)])" : "Disabled (15x15)"]
"
- dat += "Auto stand: [autostand ? "Enabled" : "Disabled"]
"
- dat += "Screen Shake: [(screenshake==100) ? "Full" : ((screenshake==0) ? "None" : "[screenshake]")]
"
- if (user && user.client && !user.client.prefs.screenshake==0)
- dat += "Damage Screen Shake: [(damagescreenshake==1) ? "On" : ((damagescreenshake==0) ? "Off" : "Only when down")]
"
- dat += "
"
-
- if(3)
- if(!gear_tab)
- gear_tab = GLOB.loadout_items[1]
- dat += ""
- dat += "| [gear_points] loadout points remaining. \[Clear Loadout\] | "
- dat += "| You can only choose one item per category, unless it's an item that spawns in your backpack or hands. | "
- dat += "| "
- var/firstcat = TRUE
- for(var/i in GLOB.loadout_items)
- if(firstcat)
- firstcat = FALSE
- else
- dat += " |"
- if(i == gear_tab)
- dat += " [i] "
- else
- dat += " [i] "
- dat += " | "
- dat += "
| "
- dat += "| [gear_tab] | "
- dat += "
| "
- dat += "| Name | "
- dat += "Cost | "
- dat += "Restrictions | "
- dat += "Description | "
- for(var/j in GLOB.loadout_items[gear_tab])
- var/datum/gear/gear = GLOB.loadout_items[gear_tab][j]
- var/donoritem
- if(gear.ckeywhitelist && gear.ckeywhitelist.len)
- donoritem = TRUE
- if(!(user.ckey in gear.ckeywhitelist))
- continue
- var/class_link = ""
- if(gear.type in chosen_gear)
- class_link = "style='white-space:normal;' class='linkOn' href='?_src_=prefs;preference=gear;toggle_gear_path=[html_encode(j)];toggle_gear=0'"
- else if(gear_points <= 0)
- class_link = "style='white-space:normal;' class='linkOff'"
- else if(donoritem)
- class_link = "style='white-space:normal;background:#ebc42e;' href='?_src_=prefs;preference=gear;toggle_gear_path=[html_encode(j)];toggle_gear=1'"
- else
- class_link = "style='white-space:normal;' href='?_src_=prefs;preference=gear;toggle_gear_path=[html_encode(j)];toggle_gear=1'"
- dat += "| [j] | "
- dat += "[gear.cost] | "
- if(islist(gear.restricted_roles))
- if(gear.restricted_roles.len)
- dat += ""
- dat += gear.restricted_roles.Join(";")
- dat += ""
- dat += " | [gear.description] | "
- dat += " "
-
- dat += "
"
-
- if(!IsGuestKey(user.key))
- dat += "Undo "
- dat += "Save Setup "
-
- dat += "Reset Setup"
- dat += ""
-
- var/datum/browser/popup = new(user, "preferences", "Character Setup ", 640, 770)
- popup.set_content(dat.Join())
- popup.open(0)
-
-#undef APPEARANCE_CATEGORY_COLUMN
-#undef MAX_MUTANT_ROWS
-
-/datum/preferences/proc/SetChoices(mob/user, limit = 17, list/splitJobs = list("Chief Engineer"), widthPerColumn = 295, height = 620)
- if(!SSjob)
- return
-
- //limit - The amount of jobs allowed per column. Defaults to 17 to make it look nice.
- //splitJobs - Allows you split the table by job. You can make different tables for each department by including their heads. Defaults to CE to make it look nice.
- //widthPerColumn - Screen's width for every column.
- //height - Screen's height.
-
- var/width = widthPerColumn
-
- var/HTML = ""
- if(SSjob.occupations.len <= 0)
- HTML += "The job SSticker is not yet finished creating jobs, please try again later"
- HTML += "Done
" // Easier to press up here.
-
- else
- HTML += "Choose occupation chances
"
- HTML += "Left-click to raise an occupation preference, right-click to lower it.
"
- HTML += "Done
" // Easier to press up here.
- HTML += ""
- HTML += "" // Table within a table for alignment, also allows you to easily add more colomns.
- HTML += ""
- var/index = -1
-
- //The job before the current job. I only use this to get the previous jobs color when I'm filling in blank rows.
- var/datum/job/lastJob
-
- var/datum/job/overflow = SSjob.GetJob(SSjob.overflow_role)
-
- for(var/datum/job/job in SSjob.occupations)
-
- index += 1
- if((index >= limit) || (job.title in splitJobs))
- width += widthPerColumn
- if((index < limit) && (lastJob != null))
- //If the cells were broken up by a job in the splitJob list then it will fill in the rest of the cells with
- //the last job's selection color. Creating a rather nice effect.
- for(var/i = 0, i < (limit - index), i += 1)
- HTML += "| | | "
- HTML += " | "
- index = 0
-
- HTML += "| "
- var/rank = job.title
- lastJob = job
- if(jobban_isbanned(user, rank))
- HTML += "[rank] | BANNED | "
- continue
- var/required_playtime_remaining = job.required_playtime_remaining(user.client)
- if(required_playtime_remaining)
- HTML += "[rank] \[ [get_exp_format(required_playtime_remaining)] as [job.get_exp_req_type()] \] | "
- continue
- if(!job.player_old_enough(user.client))
- var/available_in_days = job.available_in_days(user.client)
- HTML += "[rank] \[IN [(available_in_days)] DAYS\] | "
- continue
- if((job_civilian_low & overflow.flag) && (rank != SSjob.overflow_role) && !jobban_isbanned(user, SSjob.overflow_role))
- HTML += "[rank] | "
- continue
- if((rank in GLOB.command_positions) || (rank == "AI"))//Bold head jobs
- HTML += "[rank]"
- else
- HTML += "[rank]"
-
- HTML += ""
-
- var/prefLevelLabel = "ERROR"
- var/prefLevelColor = "pink"
- var/prefUpperLevel = -1 // level to assign on left click
- var/prefLowerLevel = -1 // level to assign on right click
-
- if(GetJobDepartment(job, 1) & job.flag)
- prefLevelLabel = "High"
- prefLevelColor = "slateblue"
- prefUpperLevel = 4
- prefLowerLevel = 2
- else if(GetJobDepartment(job, 2) & job.flag)
- prefLevelLabel = "Medium"
- prefLevelColor = "green"
- prefUpperLevel = 1
- prefLowerLevel = 3
- else if(GetJobDepartment(job, 3) & job.flag)
- prefLevelLabel = "Low"
- prefLevelColor = "orange"
- prefUpperLevel = 2
- prefLowerLevel = 4
- else
- prefLevelLabel = "NEVER"
- prefLevelColor = "red"
- prefUpperLevel = 3
- prefLowerLevel = 1
-
-
- HTML += ""
-
- if(rank == SSjob.overflow_role)//Overflow is special
- if(job_civilian_low & overflow.flag)
- HTML += "Yes"
- else
- HTML += "No"
- HTML += " | "
- continue
-
- HTML += "[prefLevelLabel]"
- HTML += ""
-
- for(var/i = 1, i < (limit - index), i += 1) // Finish the column so it is even
- HTML += "| | | "
-
- HTML += " "
- HTML += " |
"
-
- var/message = "Be an [SSjob.overflow_role] if preferences unavailable"
- if(joblessrole == BERANDOMJOB)
- message = "Get random job if preferences unavailable"
- else if(joblessrole == RETURNTOLOBBY)
- message = "Return to lobby if preferences unavailable"
- HTML += "
[message]"
- HTML += "Reset Preferences"
-
- user << browse(null, "window=preferences")
- var/datum/browser/popup = new(user, "mob_occupation", "Occupation Preferences ", width, height)
- popup.set_window_options("can_close=0")
- popup.set_content(HTML)
- popup.open(0)
- return
-
-/datum/preferences/proc/SetJobPreferenceLevel(datum/job/job, level)
- if (!job)
- return 0
-
- if (level == 1) // to high
- // remove any other job(s) set to high
- job_civilian_med |= job_civilian_high
- job_engsec_med |= job_engsec_high
- job_medsci_med |= job_medsci_high
- job_civilian_high = 0
- job_engsec_high = 0
- job_medsci_high = 0
-
- if (job.department_flag == CIVILIAN)
- job_civilian_low &= ~job.flag
- job_civilian_med &= ~job.flag
- job_civilian_high &= ~job.flag
-
- switch(level)
- if (1)
- job_civilian_high |= job.flag
- if (2)
- job_civilian_med |= job.flag
- if (3)
- job_civilian_low |= job.flag
-
- return 1
- else if (job.department_flag == ENGSEC)
- job_engsec_low &= ~job.flag
- job_engsec_med &= ~job.flag
- job_engsec_high &= ~job.flag
-
- switch(level)
- if (1)
- job_engsec_high |= job.flag
- if (2)
- job_engsec_med |= job.flag
- if (3)
- job_engsec_low |= job.flag
-
- return 1
- else if (job.department_flag == MEDSCI)
- job_medsci_low &= ~job.flag
- job_medsci_med &= ~job.flag
- job_medsci_high &= ~job.flag
-
- switch(level)
- if (1)
- job_medsci_high |= job.flag
- if (2)
- job_medsci_med |= job.flag
- if (3)
- job_medsci_low |= job.flag
-
- return 1
-
- return 0
-
-/datum/preferences/proc/UpdateJobPreference(mob/user, role, desiredLvl)
- if(!SSjob || SSjob.occupations.len <= 0)
- return
- var/datum/job/job = SSjob.GetJob(role)
-
- if(!job)
- user << browse(null, "window=mob_occupation")
- ShowChoices(user)
- return
-
- if (!isnum(desiredLvl))
- to_chat(user, "UpdateJobPreference - desired level was not a number. Please notify coders!")
- ShowChoices(user)
- return
-
- if(role == SSjob.overflow_role)
- if(job_civilian_low & job.flag)
- job_civilian_low &= ~job.flag
- else
- job_civilian_low |= job.flag
- SetChoices(user)
- return 1
-
- SetJobPreferenceLevel(job, desiredLvl)
- SetChoices(user)
-
- return 1
-
-
-/datum/preferences/proc/ResetJobs()
-
- job_civilian_high = 0
- job_civilian_med = 0
- job_civilian_low = 0
-
- job_medsci_high = 0
- job_medsci_med = 0
- job_medsci_low = 0
-
- job_engsec_high = 0
- job_engsec_med = 0
- job_engsec_low = 0
-
-
-/datum/preferences/proc/GetJobDepartment(datum/job/job, level)
- if(!job || !level)
- return 0
- switch(job.department_flag)
- if(CIVILIAN)
- switch(level)
- if(1)
- return job_civilian_high
- if(2)
- return job_civilian_med
- if(3)
- return job_civilian_low
- if(MEDSCI)
- switch(level)
- if(1)
- return job_medsci_high
- if(2)
- return job_medsci_med
- if(3)
- return job_medsci_low
- if(ENGSEC)
- switch(level)
- if(1)
- return job_engsec_high
- if(2)
- return job_engsec_med
- if(3)
- return job_engsec_low
- return 0
-
-/datum/preferences/proc/SetQuirks(mob/user)
- if(!SSquirks)
- to_chat(user, "The quirk subsystem is still initializing! Try again in a minute.")
- return
-
- var/list/dat = list()
- if(!SSquirks.quirks.len)
- dat += "The quirk subsystem hasn't finished initializing, please hold..."
- dat += "Done
"
-
- else
- dat += "Choose quirk setup
"
- dat += "Left-click to add or remove quirks. You need negative quirks to have positive ones.
\
- Quirks are applied at roundstart and cannot normally be removed. "
- dat += "Done"
- dat += "
"
- dat += "Current quirks: [all_quirks.len ? all_quirks.Join(", ") : "None"]"
- dat += "[positive_quirks.len] / [MAX_QUIRKS] max positive quirks
\
- Quirk balance remaining: [GetQuirkBalance()]
"
- for(var/V in SSquirks.quirks)
- var/datum/quirk/T = SSquirks.quirks[V]
- var/quirk_name = initial(T.name)
- var/has_quirk
- var/quirk_cost = initial(T.value) * -1
- var/lock_reason = "This trait is unavailable."
- var/quirk_conflict = FALSE
- for(var/_V in all_quirks)
- if(_V == quirk_name)
- has_quirk = TRUE
- if(initial(T.mood_quirk) && CONFIG_GET(flag/disable_human_mood))
- lock_reason = "Mood is disabled."
- quirk_conflict = TRUE
- if(has_quirk)
- if(quirk_conflict)
- all_quirks -= quirk_name
- has_quirk = FALSE
- else
- quirk_cost *= -1 //invert it back, since we'd be regaining this amount
- if(quirk_cost > 0)
- quirk_cost = "+[quirk_cost]"
- var/font_color = "#AAAAFF"
- if(initial(T.value) != 0)
- font_color = initial(T.value) > 0 ? "#AAFFAA" : "#FFAAAA"
- if(quirk_conflict)
- dat += "[quirk_name] - [initial(T.desc)] \
- LOCKED: [lock_reason]
"
- else
- if(has_quirk)
- dat += "[quirk_name] - [initial(T.desc)] \
- [has_quirk ? "Lose" : "Take"] ([quirk_cost] pts.)
"
- else
- dat += "[quirk_name] - [initial(T.desc)] \
- [has_quirk ? "Lose" : "Take"] ([quirk_cost] pts.)
"
- dat += "
Reset Traits"
-
- user << browse(null, "window=preferences")
- var/datum/browser/popup = new(user, "mob_occupation", "Quirk Preferences ", 900, 600) //no reason not to reuse the occupation window, as it's cleaner that way
- popup.set_window_options("can_close=0")
- popup.set_content(dat.Join())
- popup.open(0)
- return
-
-/datum/preferences/proc/GetQuirkBalance()
- var/bal = 0
- for(var/V in all_quirks)
- var/datum/quirk/T = SSquirks.quirks[V]
- bal -= initial(T.value)
- return bal
-
-/datum/preferences/proc/process_link(mob/user, list/href_list)
- if(href_list["jobbancheck"])
- var/job = sanitizeSQL(href_list["jobbancheck"])
- var/sql_ckey = sanitizeSQL(user.ckey)
- var/datum/DBQuery/query_get_jobban = SSdbcore.NewQuery("SELECT reason, bantime, duration, expiration_time, IFNULL((SELECT byond_key FROM [format_table_name("player")] WHERE [format_table_name("player")].ckey = [format_table_name("ban")].a_ckey), a_ckey) FROM [format_table_name("ban")] WHERE ckey = '[sql_ckey]' AND (bantype = 'JOB_PERMABAN' OR (bantype = 'JOB_TEMPBAN' AND expiration_time > Now())) AND isnull(unbanned) AND job = '[job]'")
- if(!query_get_jobban.warn_execute())
- qdel(query_get_jobban)
- return
- if(query_get_jobban.NextRow())
- var/reason = query_get_jobban.item[1]
- var/bantime = query_get_jobban.item[2]
- var/duration = query_get_jobban.item[3]
- var/expiration_time = query_get_jobban.item[4]
- var/admin_key = query_get_jobban.item[5]
- var/text
- text = "You, or another user of this computer, ([user.key]) is banned from playing [job]. The ban reason is:
[reason]
This ban was applied by [admin_key] on [bantime]"
- if(text2num(duration) > 0)
- text += ". The ban is for [duration] minutes and expires on [expiration_time] (server time)"
- text += "."
- to_chat(user, text)
- qdel(query_get_jobban)
- return
-
- if(href_list["preference"] == "job")
- switch(href_list["task"])
- if("close")
- user << browse(null, "window=mob_occupation")
- ShowChoices(user)
- if("reset")
- ResetJobs()
- SetChoices(user)
- if("random")
- switch(joblessrole)
- if(RETURNTOLOBBY)
- if(jobban_isbanned(user, SSjob.overflow_role))
- joblessrole = BERANDOMJOB
- else
- joblessrole = BEOVERFLOW
- if(BEOVERFLOW)
- joblessrole = BERANDOMJOB
- if(BERANDOMJOB)
- joblessrole = RETURNTOLOBBY
- SetChoices(user)
- if("setJobLevel")
- UpdateJobPreference(user, href_list["text"], text2num(href_list["level"]))
- else
- SetChoices(user)
- return 1
-
- else if(href_list["preference"] == "trait")
- switch(href_list["task"])
- if("close")
- user << browse(null, "window=mob_occupation")
- ShowChoices(user)
- if("update")
- var/quirk = href_list["trait"]
- if(!SSquirks.quirks[quirk])
- return
- var/value = SSquirks.quirk_points[quirk]
- if(value == 0)
- if(quirk in neutral_quirks)
- neutral_quirks -= quirk
- all_quirks -= quirk
- else
- neutral_quirks += quirk
- all_quirks += quirk
- else
- var/balance = GetQuirkBalance()
- if(quirk in positive_quirks)
- positive_quirks -= quirk
- all_quirks -= quirk
- else if(quirk in negative_quirks)
- if(balance + value < 0)
- to_chat(user, "Refunding this would cause you to go below your balance!")
- return
- negative_quirks -= quirk
- all_quirks -= quirk
- else if(value > 0)
- if(positive_quirks.len >= MAX_QUIRKS)
- to_chat(user, "You can't have more than [MAX_QUIRKS] positive quirks!")
- return
- if(balance - value < 0)
- to_chat(user, "You don't have enough balance to gain this quirk!")
- return
- positive_quirks += quirk
- all_quirks += quirk
- else
- negative_quirks += quirk
- all_quirks += quirk
- SetQuirks(user)
- if("reset")
- all_quirks = list()
- positive_quirks = list()
- negative_quirks = list()
- neutral_quirks = list()
- SetQuirks(user)
- else
- SetQuirks(user)
- return TRUE
-
- switch(href_list["task"])
- if("random")
- switch(href_list["preference"])
- if("name")
- real_name = pref_species.random_name(gender,1)
- if("age")
- age = rand(AGE_MIN, AGE_MAX)
- if("hair")
- hair_color = random_short_color()
- if("hair_style")
- hair_style = random_hair_style(gender)
- if("facial")
- facial_hair_color = random_short_color()
- if("facial_hair_style")
- facial_hair_style = random_facial_hair_style(gender)
- if("underwear")
- underwear = random_underwear(gender)
- if("undershirt")
- undershirt = random_undershirt(gender)
- if("socks")
- socks = random_socks()
- if(BODY_ZONE_PRECISE_EYES)
- eye_color = random_eye_color()
- if("s_tone")
- skin_tone = random_skin_tone()
- if("bag")
- backbag = pick(GLOB.backbaglist)
- if("all")
- random_character()
-
- if("input")
-
- if(href_list["preference"] in GLOB.preferences_custom_names)
- ask_for_custom_name(user,href_list["preference"])
-
-
- switch(href_list["preference"])
- if("ghostform")
- if(unlock_content)
- var/new_form = input(user, "Thanks for supporting BYOND - Choose your ghostly form:","Thanks for supporting BYOND",null) as null|anything in GLOB.ghost_forms
- if(new_form)
- ghost_form = new_form
- if("ghostorbit")
- if(unlock_content)
- var/new_orbit = input(user, "Thanks for supporting BYOND - Choose your ghostly orbit:","Thanks for supporting BYOND", null) as null|anything in GLOB.ghost_orbits
- if(new_orbit)
- ghost_orbit = new_orbit
-
- if("ghostaccs")
- var/new_ghost_accs = alert("Do you want your ghost to show full accessories where possible, hide accessories but still use the directional sprites where possible, or also ignore the directions and stick to the default sprites?",,GHOST_ACCS_FULL_NAME, GHOST_ACCS_DIR_NAME, GHOST_ACCS_NONE_NAME)
- switch(new_ghost_accs)
- if(GHOST_ACCS_FULL_NAME)
- ghost_accs = GHOST_ACCS_FULL
- if(GHOST_ACCS_DIR_NAME)
- ghost_accs = GHOST_ACCS_DIR
- if(GHOST_ACCS_NONE_NAME)
- ghost_accs = GHOST_ACCS_NONE
-
- if("ghostothers")
- var/new_ghost_others = alert("Do you want the ghosts of others to show up as their own setting, as their default sprites or always as the default white ghost?",,GHOST_OTHERS_THEIR_SETTING_NAME, GHOST_OTHERS_DEFAULT_SPRITE_NAME, GHOST_OTHERS_SIMPLE_NAME)
- switch(new_ghost_others)
- if(GHOST_OTHERS_THEIR_SETTING_NAME)
- ghost_others = GHOST_OTHERS_THEIR_SETTING
- if(GHOST_OTHERS_DEFAULT_SPRITE_NAME)
- ghost_others = GHOST_OTHERS_DEFAULT_SPRITE
- if(GHOST_OTHERS_SIMPLE_NAME)
- ghost_others = GHOST_OTHERS_SIMPLE
-
- if("name")
- var/new_name = input(user, "Choose your character's name:", "Character Preference") as text|null
- if(new_name)
- new_name = reject_bad_name(new_name)
- if(new_name)
- real_name = new_name
- else
- to_chat(user, "Invalid name. Your name should be at least 2 and at most [MAX_NAME_LEN] characters long. It may only contain the characters A-Z, a-z, -, ' and .")
-
- if("age")
- var/new_age = input(user, "Choose your character's age:\n([AGE_MIN]-[AGE_MAX])", "Character Preference") as num|null
- if(new_age)
- age = max(min( round(text2num(new_age)), AGE_MAX),AGE_MIN)
-
- if("flavor_text")
- var/msg = stripped_multiline_input(usr,"Set the flavor text in your 'examine' verb. This can also be used for OOC notes and preferences!","Flavor Text",html_decode(features["flavor_text"]), MAX_MESSAGE_LEN*2, TRUE) as null|message
- if(!isnull(msg))
- msg = copytext(msg, 1, MAX_MESSAGE_LEN*2)
- features["flavor_text"] = msg
-
- if("hair")
- var/new_hair = input(user, "Choose your character's hair colour:", "Character Preference","#"+hair_color) as color|null
- if(new_hair)
- hair_color = sanitize_hexcolor(new_hair)
-
- if("hair_style")
- var/new_hair_style
- if(gender == MALE)
- new_hair_style = input(user, "Choose your character's hair style:", "Character Preference") as null|anything in GLOB.hair_styles_male_list
- else
- new_hair_style = input(user, "Choose your character's hair style:", "Character Preference") as null|anything in GLOB.hair_styles_female_list
- if(new_hair_style)
- hair_style = new_hair_style
-
- if("next_hair_style")
- if (gender == MALE)
- hair_style = next_list_item(hair_style, GLOB.hair_styles_male_list)
- else
- hair_style = next_list_item(hair_style, GLOB.hair_styles_female_list)
-
- if("previous_hair_style")
- if (gender == MALE)
- hair_style = previous_list_item(hair_style, GLOB.hair_styles_male_list)
- else
- hair_style = previous_list_item(hair_style, GLOB.hair_styles_female_list)
-
- if("facial")
- var/new_facial = input(user, "Choose your character's facial-hair colour:", "Character Preference","#"+facial_hair_color) as color|null
- if(new_facial)
- facial_hair_color = sanitize_hexcolor(new_facial)
- if("facial_hair_style")
- var/new_facial_hair_style
- if(gender == MALE)
- new_facial_hair_style = input(user, "Choose your character's facial-hair style:", "Character Preference") as null|anything in GLOB.facial_hair_styles_male_list
- else
- new_facial_hair_style = input(user, "Choose your character's facial-hair style:", "Character Preference") as null|anything in GLOB.facial_hair_styles_female_list
- if(new_facial_hair_style)
- facial_hair_style = new_facial_hair_style
-
- if("next_facehair_style")
- if (gender == MALE)
- facial_hair_style = next_list_item(facial_hair_style, GLOB.facial_hair_styles_male_list)
- else
- facial_hair_style = next_list_item(facial_hair_style, GLOB.facial_hair_styles_female_list)
- if("previous_facehair_style")
- if (gender == MALE)
- facial_hair_style = previous_list_item(facial_hair_style, GLOB.facial_hair_styles_male_list)
- else
- facial_hair_style = previous_list_item(facial_hair_style, GLOB.facial_hair_styles_female_list)
-
- if("underwear")
- var/new_underwear
- if(gender == MALE)
- new_underwear = input(user, "Choose your character's underwear:", "Character Preference") as null|anything in GLOB.underwear_m
- else
- new_underwear = input(user, "Choose your character's underwear:", "Character Preference") as null|anything in GLOB.underwear_f
- if(new_underwear)
- underwear = new_underwear
-
- if("undershirt")
- var/new_undershirt
- if(gender == MALE)
- new_undershirt = input(user, "Choose your character's undershirt:", "Character Preference") as null|anything in GLOB.undershirt_m
- else
- new_undershirt = input(user, "Choose your character's undershirt:", "Character Preference") as null|anything in GLOB.undershirt_f
- if(new_undershirt)
- undershirt = new_undershirt
-
- if("socks")
- var/new_socks
- new_socks = input(user, "Choose your character's socks:", "Character Preference") as null|anything in GLOB.socks_list
- if(new_socks)
- socks = new_socks
-
- if("eyes")
- var/new_eyes = input(user, "Choose your character's eye colour:", "Character Preference","#"+eye_color) as color|null
- if(new_eyes)
- eye_color = sanitize_hexcolor(new_eyes)
-
- if("species")
- var/result = input(user, "Select a species", "Species Selection") as null|anything in GLOB.roundstart_races
- if(result)
- var/newtype = GLOB.species_list[result]
- pref_species = new newtype()
- //Now that we changed our species, we must verify that the mutant colour is still allowed.
- var/temp_hsv = RGBtoHSV(features["mcolor"])
- if(features["mcolor"] == "#000" || (!(MUTCOLORS_PARTSONLY in pref_species.species_traits) && ReadHSV(temp_hsv)[3] < ReadHSV("#202020")[3]))
- features["mcolor"] = pref_species.default_color
- if(features["mcolor2"] == "#000" || (!(MUTCOLORS_PARTSONLY in pref_species.species_traits) && ReadHSV(temp_hsv)[3] < ReadHSV("#202020")[3]))
- features["mcolor2"] = pref_species.default_color
- if(features["mcolor3"] == "#000" || (!(MUTCOLORS_PARTSONLY in pref_species.species_traits) && ReadHSV(temp_hsv)[3] < ReadHSV("#202020")[3]))
- features["mcolor3"] = pref_species.default_color
-
- if("mutant_color")
- var/new_mutantcolor = input(user, "Choose your character's alien/mutant color:", "Character Preference","#"+features["mcolor"]) as color|null
- if(new_mutantcolor)
- var/temp_hsv = RGBtoHSV(new_mutantcolor)
- if(new_mutantcolor == "#000000")
- features["mcolor"] = pref_species.default_color
- else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3]) // mutantcolors must be bright, but only if they affect the skin
- features["mcolor"] = sanitize_hexcolor(new_mutantcolor)
- else
- to_chat(user, "Invalid color. Your color is not bright enough.")
-
- if("mutant_color2")
- var/new_mutantcolor = input(user, "Choose your character's secondary alien/mutant color:", "Character Preference") as color|null
- if(new_mutantcolor)
- var/temp_hsv = RGBtoHSV(new_mutantcolor)
- if(new_mutantcolor == "#000000")
- features["mcolor2"] = pref_species.default_color
- else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3]) // mutantcolors must be bright, but only if they affect the skin
- features["mcolor2"] = sanitize_hexcolor(new_mutantcolor)
- else
- to_chat(user, "Invalid color. Your color is not bright enough.")
-
- if("mutant_color3")
- var/new_mutantcolor = input(user, "Choose your character's tertiary alien/mutant color:", "Character Preference") as color|null
- if(new_mutantcolor)
- var/temp_hsv = RGBtoHSV(new_mutantcolor)
- if(new_mutantcolor == "#000000")
- features["mcolor3"] = pref_species.default_color
- else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3]) // mutantcolors must be bright, but only if they affect the skin
- features["mcolor3"] = sanitize_hexcolor(new_mutantcolor)
- else
- to_chat(user, "Invalid color. Your color is not bright enough.")
-
- if("ipc_screen")
- var/new_ipc_screen
- new_ipc_screen = input(user, "Choose your character's screen:", "Character Preference") as null|anything in GLOB.ipc_screens_list
- if(new_ipc_screen)
- features["ipc_screen"] = new_ipc_screen
-
- if("ipc_antenna")
- var/new_ipc_antenna
- new_ipc_antenna = input(user, "Choose your character's antenna:", "Character Preference") as null|anything in GLOB.ipc_antennas_list
- if(new_ipc_antenna)
- features["ipc_antenna"] = new_ipc_antenna
-
- if("tail_lizard")
- var/new_tail
- new_tail = input(user, "Choose your character's tail:", "Character Preference") as null|anything in GLOB.tails_list_lizard
- if(new_tail)
- features["tail_lizard"] = new_tail
- if(new_tail != "None")
- features["taur"] = "None"
- features["tail_human"] = "None"
- features["mam_tail"] = "None"
-
- if("tail_human")
- var/list/snowflake_tails_list = list()
- for(var/path in GLOB.tails_list_human)
- var/datum/sprite_accessory/tails/human/instance = GLOB.tails_list_human[path]
- if(istype(instance, /datum/sprite_accessory))
- var/datum/sprite_accessory/S = instance
- if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(user.client.ckey)))
- snowflake_tails_list[S.name] = path
- var/new_tail
- new_tail = input(user, "Choose your character's tail:", "Character Preference") as null|anything in snowflake_tails_list
- if(new_tail)
- features["tail_human"] = new_tail
- if(new_tail != "None")
- features["taur"] = "None"
- features["tail_lizard"] = "None"
- features["mam_tail"] = "None"
-
- if("mam_tail")
- var/list/snowflake_tails_list = list()
- for(var/path in GLOB.mam_tails_list)
- var/datum/sprite_accessory/mam_tails/instance = GLOB.mam_tails_list[path]
- if(istype(instance, /datum/sprite_accessory))
- var/datum/sprite_accessory/S = instance
- if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(user.client.ckey)))
- snowflake_tails_list[S.name] = path
- var/new_tail
- new_tail = input(user, "Choose your character's tail:", "Character Preference") as null|anything in snowflake_tails_list
- if(new_tail)
- features["mam_tail"] = new_tail
- if(new_tail != "None")
- features["taur"] = "None"
- features["tail_human"] = "None"
- features["tail_lizard"] = "None"
-
- if("snout")
- var/new_snout
- new_snout = input(user, "Choose your character's snout:", "Character Preference") as null|anything in GLOB.snouts_list
- if(new_snout)
- features["snout"] = new_snout
-
- if("horns")
- var/new_horns
- new_horns = input(user, "Choose your character's horns:", "Character Preference") as null|anything in GLOB.horns_list
- if(new_horns)
- features["horns"] = new_horns
-
- if("ears")
- var/new_ears
- new_ears = input(user, "Choose your character's ears:", "Character Preference") as null|anything in GLOB.ears_list
- if(new_ears)
- features["ears"] = new_ears
-
- if("wings")
- var/new_wings
- new_wings = input(user, "Choose your character's wings:", "Character Preference") as null|anything in GLOB.r_wings_list
- if(new_wings)
- features["wings"] = new_wings
-
- if("frills")
- var/new_frills
- new_frills = input(user, "Choose your character's frills:", "Character Preference") as null|anything in GLOB.frills_list
- if(new_frills)
- features["frills"] = new_frills
-
- if("spines")
- var/new_spines
- new_spines = input(user, "Choose your character's spines:", "Character Preference") as null|anything in GLOB.spines_list
- if(new_spines)
- features["spines"] = new_spines
-
- if("body_markings")
- var/new_body_markings
- new_body_markings = input(user, "Choose your character's body markings:", "Character Preference") as null|anything in GLOB.body_markings_list
- if(new_body_markings)
- features["body_markings"] = new_body_markings
-
- if("legs")
- var/new_legs
- new_legs = input(user, "Choose your character's legs:", "Character Preference") as null|anything in GLOB.legs_list
- if(new_legs)
- features["legs"] = new_legs
-
- if("moth_wings")
- var/new_moth_wings
- new_moth_wings = input(user, "Choose your character's wings:", "Character Preference") as null|anything in GLOB.moth_wings_list
- if(new_moth_wings)
- features["moth_wings"] = new_moth_wings
-
- if("s_tone")
- var/new_s_tone = input(user, "Choose your character's skin-tone:", "Character Preference") as null|anything in GLOB.skin_tones
- if(new_s_tone)
- skin_tone = new_s_tone
-
- if("taur")
- var/list/snowflake_taur_list = list()
- for(var/path in GLOB.taur_list)
- var/datum/sprite_accessory/taur/instance = GLOB.taur_list[path]
- if(istype(instance, /datum/sprite_accessory))
- var/datum/sprite_accessory/S = instance
- if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(user.client.ckey)))
- snowflake_taur_list[S.name] = path
- var/new_taur
- new_taur = input(user, "Choose your character's tauric body:", "Character Preference") as null|anything in snowflake_taur_list
- if(new_taur)
- features["taur"] = new_taur
- if(new_taur != "None")
- features["mam_tail"] = "None"
- features["xenotail"] = "None"
- features["tail_human"] = "None"
- features["tail_lizard"] = "None"
-
- if("ears")
- var/list/snowflake_ears_list = list()
- for(var/path in GLOB.ears_list)
- var/datum/sprite_accessory/ears/instance = GLOB.ears_list[path]
- if(istype(instance, /datum/sprite_accessory))
- var/datum/sprite_accessory/S = instance
- if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(user.client.ckey)))
- snowflake_ears_list[S.name] = path
- var/new_ears
- new_ears = input(user, "Choose your character's ears:", "Character Preference") as null|anything in snowflake_ears_list
- if(new_ears)
- features["ears"] = new_ears
-
- if("mam_ears")
- var/list/snowflake_ears_list = list()
- for(var/path in GLOB.mam_ears_list)
- var/datum/sprite_accessory/mam_ears/instance = GLOB.mam_ears_list[path]
- if(istype(instance, /datum/sprite_accessory))
- var/datum/sprite_accessory/S = instance
- if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(user.client.ckey)))
- snowflake_ears_list[S.name] = path
- var/new_ears
- new_ears = input(user, "Choose your character's ears:", "Character Preference") as null|anything in snowflake_ears_list
- if(new_ears)
- features["mam_ears"] = new_ears
-
- if("mam_body_markings")
- var/list/snowflake_markings_list = list()
- for(var/path in GLOB.mam_body_markings_list)
- var/datum/sprite_accessory/mam_body_markings/instance = GLOB.mam_body_markings_list[path]
- if(istype(instance, /datum/sprite_accessory))
- var/datum/sprite_accessory/S = instance
- if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(user.client.ckey)))
- snowflake_markings_list[S.name] = path
- var/new_mam_body_markings
- new_mam_body_markings = input(user, "Choose your character's body markings:", "Character Preference") as null|anything in snowflake_markings_list
- if(new_mam_body_markings)
- features["mam_body_markings"] = new_mam_body_markings
-
- //Xeno Bodyparts
- if("xenohead")//Head or caste type
- var/new_head
- new_head = input(user, "Choose your character's caste:", "Character Preference") as null|anything in GLOB.xeno_head_list
- if(new_head)
- features["xenohead"] = new_head
-
- if("xenotail")//Currently one one type, more maybe later if someone sprites them. Might include animated variants in the future.
- var/new_tail
- new_tail = input(user, "Choose your character's tail:", "Character Preference") as null|anything in GLOB.xeno_tail_list
- if(new_tail)
- features["xenotail"] = new_tail
- if(new_tail != "None")
- features["mam_tail"] = "None"
- features["taur"] = "None"
- features["tail_human"] = "None"
- features["tail_lizard"] = "None"
-
- if("xenodorsal")
- var/new_dors
- new_dors = input(user, "Choose your character's dorsal tube type:", "Character Preference") as null|anything in GLOB.xeno_dorsal_list
- if(new_dors)
- features["xenodorsal"] = new_dors
- //Genital code
- if("cock_color")
- var/new_cockcolor = input(user, "Penis color:", "Character Preference") as color|null
- if(new_cockcolor)
- var/temp_hsv = RGBtoHSV(new_cockcolor)
- if(new_cockcolor == "#000000")
- features["cock_color"] = pref_species.default_color
- else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3])
- features["cock_color"] = sanitize_hexcolor(new_cockcolor)
- else
- user << "Invalid color. Your color is not bright enough."
-
- if("cock_length")
- var/new_length = input(user, "Penis length in inches:\n([COCK_SIZE_MIN]-[COCK_SIZE_MAX])", "Character Preference") as num|null
- if(new_length)
- features["cock_length"] = max(min( round(text2num(new_length)), COCK_SIZE_MAX),COCK_SIZE_MIN)
-
- if("cock_shape")
- var/new_shape
- new_shape = input(user, "Penis shape:", "Character Preference") as null|anything in GLOB.cock_shapes_list
- if(new_shape)
- features["cock_shape"] = new_shape
-
- if("balls_color")
- var/new_ballscolor = input(user, "Testicle Color:", "Character Preference") as color|null
- if(new_ballscolor)
- var/temp_hsv = RGBtoHSV(new_ballscolor)
- if(new_ballscolor == "#000000")
- features["balls_color"] = pref_species.default_color
- else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3])
- features["balls_color"] = sanitize_hexcolor(new_ballscolor)
- else
- user << "Invalid color. Your color is not bright enough."
-
- if("egg_size")
- var/new_size
- var/list/egg_sizes = list(1,2,3)
- new_size = input(user, "Egg Diameter(inches):", "Egg Size") as null|anything in egg_sizes
- if(new_size)
- features["eggsack_egg_size"] = new_size
-
- if("egg_color")
- var/new_egg_color = input(user, "Egg Color:", "Character Preference") as color|null
- if(new_egg_color)
- var/temp_hsv = RGBtoHSV(new_egg_color)
- if(ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3])
- features["eggsack_egg_color"] = sanitize_hexcolor(new_egg_color)
- else
- user << "Invalid color. Your color is not bright enough."
-
- if("breasts_size")
- var/new_size
- new_size = input(user, "Breast Size", "Character Preference") as null|anything in GLOB.breasts_size_list
- if(new_size)
- features["breasts_size"] = new_size
-
- if("breasts_shape")
- var/new_shape
- new_shape = input(user, "Breast Shape", "Character Preference") as null|anything in GLOB.breasts_shapes_list
- if(new_shape)
- features["breasts_shape"] = new_shape
-
- if("breasts_color")
- var/new_breasts_color = input(user, "Breast Color:", "Character Preference") as color|null
- if(new_breasts_color)
- var/temp_hsv = RGBtoHSV(new_breasts_color)
- if(new_breasts_color == "#000000")
- features["breasts_color"] = pref_species.default_color
- else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3])
- features["breasts_color"] = sanitize_hexcolor(new_breasts_color)
- else
- user << "Invalid color. Your color is not bright enough."
-
- if("vag_shape")
- var/new_shape
- new_shape = input(user, "Vagina Type", "Character Preference") as null|anything in GLOB.vagina_shapes_list
- if(new_shape)
- features["vag_shape"] = new_shape
-
- if("vag_color")
- var/new_vagcolor = input(user, "Vagina color:", "Character Preference") as color|null
- if(new_vagcolor)
- var/temp_hsv = RGBtoHSV(new_vagcolor)
- if(new_vagcolor == "#000000")
- features["vag_color"] = pref_species.default_color
- else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3])
- features["vag_color"] = sanitize_hexcolor(new_vagcolor)
- else
- user << "Invalid color. Your color is not bright enough."
-
- if("ooccolor")
- var/new_ooccolor = input(user, "Choose your OOC colour:", "Game Preference",ooccolor) as color|null
- if(new_ooccolor)
- ooccolor = new_ooccolor
-
- if("bag")
- var/new_backbag = input(user, "Choose your character's style of bag:", "Character Preference") as null|anything in GLOB.backbaglist
- if(new_backbag)
- backbag = new_backbag
-
- if("uplink_loc")
- var/new_loc = input(user, "Choose your character's traitor uplink spawn location:", "Character Preference") as null|anything in GLOB.uplink_spawn_loc_list
- if(new_loc)
- uplink_spawn_loc = new_loc
-
- if("sec_dept")
- var/department = input(user, "Choose your prefered security department:", "Security Departments") as null|anything in GLOB.security_depts_prefs
- if(department)
- prefered_security_department = department
-
- if ("preferred_map")
- var/maplist = list()
- var/default = "Default"
- if (config.defaultmap)
- default += " ([config.defaultmap.map_name])"
- for (var/M in config.maplist)
- var/datum/map_config/VM = config.maplist[M]
- var/friendlyname = "[VM.map_name] "
- if (VM.voteweight <= 0)
- friendlyname += " (disabled)"
- maplist[friendlyname] = VM.map_name
- maplist[default] = null
- var/pickedmap = input(user, "Choose your preferred map. This will be used to help weight random map selection.", "Character Preference") as null|anything in maplist
- if (pickedmap)
- preferred_map = maplist[pickedmap]
-
- if ("clientfps")
- var/desiredfps = input(user, "Choose your desired fps. (0 = synced with server tick rate (currently:[world.fps]))", "Character Preference", clientfps) as null|num
- if (!isnull(desiredfps))
- clientfps = desiredfps
- parent.fps = desiredfps
- if("ui")
- var/pickedui = input(user, "Choose your UI style.", "Character Preference", UI_style) as null|anything in GLOB.available_ui_styles
- if(pickedui)
- UI_style = pickedui
- if (parent && parent.mob && parent.mob.hud_used)
- parent.mob.hud_used.update_ui_style(ui_style2icon(UI_style))
- if("pda_style")
- var/pickedPDAStyle = input(user, "Choose your PDA style.", "Character Preference", pda_style) as null|anything in GLOB.pda_styles
- if(pickedPDAStyle)
- pda_style = pickedPDAStyle
- if("pda_color")
- var/pickedPDAColor = input(user, "Choose your PDA Interface color.", "Character Preference",pda_color) as color|null
- if(pickedPDAColor)
- pda_color = pickedPDAColor
-
- else
- switch(href_list["preference"])
- //CITADEL PREFERENCES EDIT - I can't figure out how to modularize these, so they have to go here. :c -Pooj
- if("genital_colour")
- features["genitals_use_skintone"] = !features["genitals_use_skintone"]
- if("arousable")
- arousable = !arousable
- if("has_cock")
- features["has_cock"] = !features["has_cock"]
- if("has_balls")
- features["has_balls"] = !features["has_balls"]
- if("has_ovi")
- features["has_ovi"] = !features["has_ovi"]
- if("has_eggsack")
- features["has_eggsack"] = !features["has_eggsack"]
- if("balls_internal")
- features["balls_internal"] = !features["balls_internal"]
- if("eggsack_internal")
- features["eggsack_internal"] = !features["eggsack_internal"]
- if("has_breasts")
- features["has_breasts"] = !features["has_breasts"]
- if("has_vag")
- features["has_vag"] = !features["has_vag"]
- if("has_womb")
- features["has_womb"] = !features["has_womb"]
- if("exhibitionist")
- features["exhibitionist"] = !features["exhibitionist"]
- if("widescreenpref")
- widescreenpref = !widescreenpref
- user.client.change_view(CONFIG_GET(string/default_view))
- if("autostand")
- autostand = !autostand
- if ("screenshake")
- var/desiredshake = input(user, "Set the amount of screenshake you want. \n(0 = disabled, 100 = full, 200 = maximum.)", "Character Preference", screenshake) as null|num
- if (!isnull(desiredshake))
- screenshake = desiredshake
- if("damagescreenshake")
- switch(damagescreenshake)
- if(0)
- damagescreenshake = 1
- if(1)
- damagescreenshake = 2
- if(2)
- damagescreenshake = 0
- else
- damagescreenshake = 1
- //END CITADEL EDIT
- if("publicity")
- if(unlock_content)
- toggles ^= MEMBER_PUBLIC
- if("gender")
- var/chosengender = input(user, "Select your character's gender.", "Gender Selection", gender) in list(MALE,FEMALE,"nonbinary","object")
- switch(chosengender)
- if("nonbinary")
- chosengender = PLURAL
- if("object")
- chosengender = NEUTER
- gender = chosengender
- facial_hair_style = random_facial_hair_style(gender)
- hair_style = random_hair_style(gender)
-
- if("hotkeys")
- hotkeys = !hotkeys
- if(hotkeys)
- winset(user, null, "input.focus=true input.background-color=[COLOR_INPUT_ENABLED] mainwindow.macro=default")
- else
- winset(user, null, "input.focus=true input.background-color=[COLOR_INPUT_ENABLED] mainwindow.macro=old_default")
- if("action_buttons")
- buttons_locked = !buttons_locked
- if("tgui_fancy")
- tgui_fancy = !tgui_fancy
- if("tgui_lock")
- tgui_lock = !tgui_lock
- if("winflash")
- windowflashing = !windowflashing
- if("hear_adminhelps")
- toggles ^= SOUND_ADMINHELP
- if("announce_login")
- toggles ^= ANNOUNCE_LOGIN
- if("combohud_lighting")
- toggles ^= COMBOHUD_LIGHTING
-
- if("be_special")
- var/be_special_type = href_list["be_special_type"]
- if(be_special_type in be_special)
- be_special -= be_special_type
- else
- be_special += be_special_type
-
- if("name")
- be_random_name = !be_random_name
-
- if("all")
- be_random_body = !be_random_body
-
- if("hear_midis")
- toggles ^= SOUND_MIDI
-
- if("lobby_music")
- toggles ^= SOUND_LOBBY
- if((toggles & SOUND_LOBBY) && user.client && isnewplayer(user))
- user.client.playtitlemusic()
- else
- user.stop_sound_channel(CHANNEL_LOBBYMUSIC)
-
- if("ghost_ears")
- chat_toggles ^= CHAT_GHOSTEARS
-
- if("ghost_sight")
- chat_toggles ^= CHAT_GHOSTSIGHT
-
- if("ghost_whispers")
- chat_toggles ^= CHAT_GHOSTWHISPER
-
- if("ghost_radio")
- chat_toggles ^= CHAT_GHOSTRADIO
-
- if("ghost_pda")
- chat_toggles ^= CHAT_GHOSTPDA
-
- if("pull_requests")
- chat_toggles ^= CHAT_PULLR
-
- if("allow_midround_antag")
- toggles ^= MIDROUND_ANTAG
-
- if("parallaxup")
- parallax = WRAP(parallax + 1, PARALLAX_INSANE, PARALLAX_DISABLE + 1)
- if (parent && parent.mob && parent.mob.hud_used)
- parent.mob.hud_used.update_parallax_pref(parent.mob)
-
- if("parallaxdown")
- parallax = WRAP(parallax - 1, PARALLAX_INSANE, PARALLAX_DISABLE + 1)
- if (parent && parent.mob && parent.mob.hud_used)
- parent.mob.hud_used.update_parallax_pref(parent.mob)
-
- // Citadel edit - Prefs don't work outside of this. :c
- if("hound_sleeper")
- cit_toggles ^= MEDIHOUND_SLEEPER
-
- if("toggleeatingnoise")
- cit_toggles ^= EATING_NOISES
-
- if("toggledigestionnoise")
- cit_toggles ^= DIGESTION_NOISES
- //END CITADEL EDIT
-
- if("ambientocclusion")
- ambientocclusion = !ambientocclusion
- if(parent && parent.screen && parent.screen.len)
- var/obj/screen/plane_master/game_world/PM = locate(/obj/screen/plane_master/game_world) in parent.screen
- PM.backdrop(parent.mob)
-
- if("auto_fit_viewport")
- auto_fit_viewport = !auto_fit_viewport
- if(auto_fit_viewport && parent)
- parent.fit_viewport()
-
- if("save")
- save_preferences()
- save_character()
-
- if("load")
- load_preferences()
- load_character()
- if(parent && parent.prefs_vr)
- attempt_vr(parent.prefs_vr,"load_vore","")
-
- if("changeslot")
- if(!load_character(text2num(href_list["num"])))
- random_character()
- real_name = random_unique_name(gender)
- save_character()
- if(parent && parent.prefs_vr)
- attempt_vr(parent.prefs_vr,"load_vore","")
-
- if("tab")
- if (href_list["tab"])
- current_tab = text2num(href_list["tab"])
- if(href_list["preference"] == "gear")
- if(href_list["clear_loadout"])
- LAZYCLEARLIST(chosen_gear)
- gear_points = initial(gear_points)
- save_preferences()
- if(href_list["select_category"])
- for(var/i in GLOB.loadout_items)
- if(i == href_list["select_category"])
- gear_tab = i
- if(href_list["toggle_gear_path"])
- var/datum/gear/G = GLOB.loadout_items[gear_tab][html_decode(href_list["toggle_gear_path"])]
- if(!G)
- return
- var/toggle = text2num(href_list["toggle_gear"])
- if(!toggle && (G.type in chosen_gear))//toggling off and the item effectively is in chosen gear)
- LAZYREMOVE(chosen_gear, G.type)
- gear_points += initial(G.cost)
- else if(toggle && (!(is_type_in_ref_list(G, chosen_gear))))
- if(!is_loadout_slot_available(G.category))
- to_chat(user, "You cannot take this loadout, as you've already chosen too many of the same category!")
- return
- if(G.ckeywhitelist && G.ckeywhitelist.len && !(user.ckey in G.ckeywhitelist))
- to_chat(user, "This is an item intended for donator use only. You are not authorized to use this item.")
- return
- if(gear_points >= initial(G.cost))
- LAZYADD(chosen_gear, G.type)
- gear_points -= initial(G.cost)
-
- ShowChoices(user)
- return 1
-
-/datum/preferences/proc/copy_to(mob/living/carbon/human/character, icon_updates = 1, roundstart_checks = TRUE)
- if(be_random_name)
- real_name = pref_species.random_name(gender)
-
- if(be_random_body)
- random_character(gender)
-
- if(roundstart_checks)
- if(CONFIG_GET(flag/humans_need_surnames) && (pref_species.id == "human"))
- var/firstspace = findtext(real_name, " ")
- var/name_length = length(real_name)
- if(!firstspace) //we need a surname
- real_name += " [pick(GLOB.last_names)]"
- else if(firstspace == name_length)
- real_name += "[pick(GLOB.last_names)]"
-
- character.real_name = real_name
- character.name = character.real_name
-
- character.gender = gender
- character.age = age
-
- character.eye_color = eye_color
- var/obj/item/organ/eyes/organ_eyes = character.getorgan(/obj/item/organ/eyes)
- if(organ_eyes)
- if(!initial(organ_eyes.eye_color))
- organ_eyes.eye_color = eye_color
- organ_eyes.old_eye_color = eye_color
- character.hair_color = hair_color
- character.facial_hair_color = facial_hair_color
-
- character.skin_tone = skin_tone
- character.hair_style = hair_style
- character.facial_hair_style = facial_hair_style
- character.underwear = underwear
- character.undershirt = undershirt
- character.socks = socks
-
- character.backbag = backbag
-
- var/datum/species/chosen_species
- if(!roundstart_checks || (pref_species.id in GLOB.roundstart_races))
- chosen_species = pref_species.type
- else
- chosen_species = /datum/species/human
- pref_species = new /datum/species/human
- save_character()
-
- character.set_species(chosen_species, icon_update = FALSE, pref_load = TRUE)
- character.dna.features = features.Copy()
- character.dna.real_name = character.real_name
-
- if("tail_lizard" in pref_species.default_features)
- character.dna.species.mutant_bodyparts |= "tail_lizard"
- else if("mam_tail" in pref_species.default_features)
- character.dna.species.mutant_bodyparts |= "mam_tail"
- else if("xenotail" in pref_species.default_features)
- character.dna.species.mutant_bodyparts |= "xenotail"
-
- if("legs" in pref_species.default_features)
- if(character.dna.features["legs"] == "Digitigrade Legs")
- pref_species.species_traits += DIGITIGRADE
- character.Digitigrade_Leg_Swap(FALSE)
-
- if(character.dna.features["legs"] == "Normal Legs" && DIGITIGRADE in pref_species.species_traits)
- pref_species.species_traits -= DIGITIGRADE
- character.Digitigrade_Leg_Swap(TRUE)
-
- else if((!"legs" in pref_species.default_features) && DIGITIGRADE in pref_species.species_traits)
- pref_species.species_traits -= DIGITIGRADE
- character.Digitigrade_Leg_Swap(TRUE)
-
- if(DIGITIGRADE in pref_species.species_traits)
- character.Digitigrade_Leg_Swap(FALSE)
-
- if(icon_updates)
- character.update_body()
- character.update_hair()
- character.update_body_parts()
-
-/datum/preferences/proc/get_default_name(name_id)
- switch(name_id)
- if("human")
- return random_unique_name()
- if("ai")
- return pick(GLOB.ai_names)
- if("cyborg")
- return DEFAULT_CYBORG_NAME
- if("clown")
- return pick(GLOB.clown_names)
- if("mime")
- return pick(GLOB.mime_names)
- return random_unique_name()
-
-/datum/preferences/proc/ask_for_custom_name(mob/user,name_id)
- var/namedata = GLOB.preferences_custom_names[name_id]
- if(!namedata)
- return
-
- var/raw_name = input(user, "Choose your character's [namedata["qdesc"]]:","Character Preference") as text|null
- if(!raw_name)
- if(namedata["allow_null"])
- custom_names[name_id] = get_default_name(name_id)
- else
- return
- else
- var/sanitized_name = reject_bad_name(raw_name,namedata["allow_numbers"])
- if(!sanitized_name)
- to_chat(user, "Invalid name. Your name should be at least 2 and at most [MAX_NAME_LEN] characters long. It may only contain the characters A-Z, a-z,[namedata["allow_numbers"] ? ",0-9," : ""] -, ' and .")
- return
- else
- custom_names[name_id] = sanitized_name
+ /* CAUTION! CAUTION! CAUTION! CAUTION! CAUTION! *\
+ | THIS FILE CONTAINS HOOKS FOR FOR |
+ | CHANGES SPECIFIC TO CITADEL. IF |
+ | YOU'RE FIXING A MERGE CONFLICT |
+ | HERE, PLEASE ASK FOR REVIEW FROM |
+ | ANOTHER MAINTAINER TO ENSURE YOU |
+ | DON'T INTRODUCE REGRESSIONS. |
+ \* */
+
+GLOBAL_LIST_EMPTY(preferences_datums)
+
+/datum/preferences
+ var/client/parent
+ //doohickeys for savefiles
+ var/path
+ var/default_slot = 1 //Holder so it doesn't default to slot 1, rather the last one used
+ var/max_save_slots = 8
+
+ //non-preference stuff
+ var/muted = 0
+ var/last_ip
+ var/last_id
+
+ //game-preferences
+ var/lastchangelog = "" //Saved changlog filesize to detect if there was a change
+ var/ooccolor = null
+ var/enable_tips = TRUE
+ var/tip_delay = 500 //tip delay in milliseconds
+
+ //Antag preferences
+ var/list/be_special = list() //Special role selection
+ var/tmp/old_be_special = 0 //Bitflag version of be_special, used to update old savefiles and nothing more
+ //If it's 0, that's good, if it's anything but 0, the owner of this prefs file's antag choices were,
+ //autocorrected this round, not that you'd need to check that.
+
+
+ var/UI_style = null
+ var/buttons_locked = FALSE
+ var/hotkeys = FALSE
+ var/tgui_fancy = TRUE
+ var/tgui_lock = TRUE
+ var/windowflashing = TRUE
+ var/toggles = TOGGLES_DEFAULT
+ var/db_flags
+ var/chat_toggles = TOGGLES_DEFAULT_CHAT
+ var/ghost_form = "ghost"
+ var/ghost_orbit = GHOST_ORBIT_CIRCLE
+ var/ghost_accs = GHOST_ACCS_DEFAULT_OPTION
+ var/ghost_others = GHOST_OTHERS_DEFAULT_OPTION
+ var/ghost_hud = 1
+ var/inquisitive_ghost = 1
+ var/allow_midround_antag = 1
+ var/preferred_map = null
+ var/pda_style = MONO
+ var/pda_color = "#808000"
+
+ var/uses_glasses_colour = 0
+
+ //character preferences
+ var/real_name //our character's name
+ var/nameless = FALSE //whether or not our character is nameless
+ var/be_random_name = 0 //whether we'll have a random name every round
+ var/be_random_body = 0 //whether we'll have a random body every round
+ var/gender = MALE //gender of character (well duh)
+ var/age = 30 //age of character
+ var/underwear = "Nude" //underwear type
+ var/undershirt = "Nude" //undershirt type
+ var/socks = "Nude" //socks type
+ var/backbag = DBACKPACK //backpack type
+ var/hair_style = "Bald" //Hair type
+ var/hair_color = "000" //Hair color
+ var/facial_hair_style = "Shaved" //Face hair type
+ var/facial_hair_color = "000" //Facial hair color
+ var/skin_tone = "caucasian1" //Skin color
+ var/eye_color = "000" //Eye color
+ var/datum/species/pref_species = new /datum/species/human() //Mutant race
+ var/list/features = list("mcolor" = "FFF",
+ "tail_lizard" = "Smooth", "tail_human" = "Cat",
+ "snout" = "Round", "horns" = "None", "ears" = "Cat",
+ "wings" = "None", "frills" = "None", "spines" = "None",
+ "body_markings" = "None", "legs" = "Normal Legs", "moth_wings" = "Plain")
+
+ var/list/custom_names = list()
+ var/prefered_security_department = SEC_DEPT_RANDOM
+
+ //Quirk list
+ var/list/positive_quirks = list()
+ var/list/negative_quirks = list()
+ var/list/neutral_quirks = list()
+ var/list/all_quirks = list()
+ var/list/character_quirks = list()
+
+ //Jobs, uses bitflags
+ var/job_civilian_high = 0
+ var/job_civilian_med = 0
+ var/job_civilian_low = 0
+
+ var/job_medsci_high = 0
+ var/job_medsci_med = 0
+ var/job_medsci_low = 0
+
+ var/job_engsec_high = 0
+ var/job_engsec_med = 0
+ var/job_engsec_low = 0
+
+ // Want randomjob if preferences already filled - Donkie
+ var/joblessrole = BERANDOMJOB //defaults to 1 for fewer assistants
+
+ // 0 = character settings, 1 = game preferences
+ var/current_tab = 0
+
+ var/unlock_content = 0
+
+ var/list/ignoring = list()
+
+ var/clientfps = 0
+
+ var/parallax
+
+ var/ambientocclusion = TRUE
+ var/auto_fit_viewport = TRUE
+
+ var/uplink_spawn_loc = UPLINK_PDA
+
+ var/list/exp = list()
+ var/list/menuoptions
+
+ var/action_buttons_screen_locs = list()
+
+/datum/preferences/New(client/C)
+ parent = C
+
+ for(var/custom_name_id in GLOB.preferences_custom_names)
+ custom_names[custom_name_id] = get_default_name(custom_name_id)
+
+ UI_style = GLOB.available_ui_styles[1]
+ if(istype(C))
+ if(!IsGuestKey(C.key))
+ load_path(C.ckey)
+ unlock_content = C.IsByondMember()
+ if(unlock_content)
+ max_save_slots = 16
+ var/loaded_preferences_successfully = load_preferences()
+ if(loaded_preferences_successfully)
+ if(load_character())
+ return
+ //we couldn't load character data so just randomize the character appearance + name
+ random_character() //let's create a random character then - rather than a fat, bald and naked man.
+ real_name = pref_species.random_name(gender,1)
+ if(!loaded_preferences_successfully)
+ save_preferences()
+ save_character() //let's save this new random character so it doesn't keep generating new ones.
+ menuoptions = list()
+ return
+
+#define APPEARANCE_CATEGORY_COLUMN ""
+#define MAX_MUTANT_ROWS 4
+
+/datum/preferences/proc/ShowChoices(mob/user)
+ if(!user || !user.client)
+ return
+ update_preview_icon()
+ var/list/dat = list("")
+
+ dat += "Character Settings"
+ dat += "Character Appearance"
+ dat += "Loadout"
+ dat += "Game Preferences"
+
+ if(!path)
+ dat += " Please create an account to save your preferences "
+
+ dat += ""
+
+ dat += "
"
+
+ switch(current_tab)
+ if (0) // Character Settings#
+ if(path)
+ var/savefile/S = new /savefile(path)
+ if(S)
+ dat += ""
+ var/name
+ var/unspaced_slots = 0
+ for(var/i=1, i<=max_save_slots, i++)
+ unspaced_slots++
+ if(unspaced_slots > 4)
+ dat += "
"
+ unspaced_slots = 0
+ S.cd = "/character[i]"
+ S["real_name"] >> name
+ if(!name)
+ name = "Character[i]"
+ dat += "[name] "
+ dat += ""
+
+ dat += "Occupation Choices"
+ dat += "Set Occupation Preferences
"
+ if(CONFIG_GET(flag/roundstart_traits))
+ dat += "Quirk Setup"
+ dat += "Configure Quirks
"
+ dat += "Current Quirks: [all_quirks.len ? all_quirks.Join(", ") : "None"]"
+ dat += "Identity"
+ dat += ""
+
+ //Character Appearance
+ if(2)
+ if(path)
+ var/savefile/S = new /savefile(path)
+ if(S)
+ dat += ""
+ var/name
+ var/unspaced_slots = 0
+ for(var/i=1, i<=max_save_slots, i++)
+ unspaced_slots++
+ if(unspaced_slots > 4)
+ dat += "
"
+ unspaced_slots = 0
+ S.cd = "/character[i]"
+ S["real_name"] >> name
+ if(!name)
+ name = "Character[i]"
+ dat += "[name] "
+ dat += ""
+
+ update_preview_icon()
+ dat += ""
+ dat += "Flavor Text"
+ dat += "Set Examine Text
"
+ if(lentext(features["flavor_text"]) <= 40)
+ if(!lentext(features["flavor_text"]))
+ dat += "\[...\]"
+ else
+ dat += "[features["flavor_text"]]"
+ else
+ dat += "[TextPreview(features["flavor_text"])]...
"
+ dat += "Body"
+ dat += "Gender:[gender == MALE ? "Male" : (gender == FEMALE ? "Female" : (gender == PLURAL ? "Non-binary" : "Object"))]
"
+ dat += "Species:[pref_species.id]
"
+ dat += "Random Body
"
+ dat += "Always Random Body:[be_random_body ? "Yes" : "No"]
"
+
+ var/use_skintones = pref_species.use_skintones
+ if(use_skintones)
+ dat += APPEARANCE_CATEGORY_COLUMN
+
+ dat += "Skin Tone"
+
+ dat += "[skin_tone]
"
+
+ var/mutant_colors
+ if((MUTCOLORS in pref_species.species_traits) || (MUTCOLORS_PARTSONLY in pref_species.species_traits))
+ if(!use_skintones)
+ dat += APPEARANCE_CATEGORY_COLUMN
+
+ dat += "Body Colors"
+
+ dat += "Primary Color:
"
+ dat += " Change
"
+
+ dat += "Secondary Color:
"
+ dat += " Change
"
+
+ dat += "Tertiary Color:
"
+ dat += " Change
"
+ mutant_colors = TRUE
+
+ if((EYECOLOR in pref_species.species_traits) && !(NOEYES in pref_species.species_traits))
+
+ if(!use_skintones && !mutant_colors)
+ dat += APPEARANCE_CATEGORY_COLUMN
+
+ dat += "Eye Color"
+
+ dat += " Change
"
+
+ dat += " | "
+ else if(use_skintones || mutant_colors)
+ dat += ""
+
+ if(HAIR in pref_species.species_traits)
+
+ dat += APPEARANCE_CATEGORY_COLUMN
+
+ dat += "Hair Style"
+
+ dat += "[hair_style]"
+ dat += "< >
"
+ dat += " Change
"
+
+ dat += "Facial Hair Style"
+
+ dat += "[facial_hair_style]"
+ dat += "< >
"
+ dat += " Change
"
+
+ dat += ""
+ //Mutant stuff
+ var/mutant_category = 0
+
+ if("tail_lizard" in pref_species.default_features)
+ if(!mutant_category)
+ dat += APPEARANCE_CATEGORY_COLUMN
+
+ dat += "Tail"
+
+ dat += "[features["tail_lizard"]]"
+
+ mutant_category++
+ if(mutant_category >= MAX_MUTANT_ROWS)
+ dat += ""
+ mutant_category = 0
+
+ if("mam_tail" in pref_species.default_features)
+ if(!mutant_category)
+ dat += APPEARANCE_CATEGORY_COLUMN
+
+ dat += "Tail"
+
+ dat += "[features["mam_tail"]]"
+
+ mutant_category++
+ if(mutant_category >= MAX_MUTANT_ROWS)
+ dat += ""
+ mutant_category = 0
+ if("tail_human" in pref_species.default_features)
+ if(!mutant_category)
+ dat += APPEARANCE_CATEGORY_COLUMN
+
+ dat += "Tail"
+
+ dat += "[features["tail_human"]]"
+
+ mutant_category++
+ if(mutant_category >= MAX_MUTANT_ROWS)
+ dat += ""
+ mutant_category = 0
+ if("snout" in pref_species.default_features)
+ if(!mutant_category)
+ dat += APPEARANCE_CATEGORY_COLUMN
+
+ dat += "Snout"
+
+ dat += "[features["snout"]]"
+
+ mutant_category++
+ if(mutant_category >= MAX_MUTANT_ROWS)
+ dat += ""
+ mutant_category = 0
+ if("horns" in pref_species.default_features)
+ if(!mutant_category)
+ dat += APPEARANCE_CATEGORY_COLUMN
+
+ dat += "Horns"
+
+ dat += "[features["horns"]]"
+
+ mutant_category++
+ if(mutant_category >= MAX_MUTANT_ROWS)
+ dat += ""
+ if("frills" in pref_species.default_features)
+ if(!mutant_category)
+ dat += APPEARANCE_CATEGORY_COLUMN
+
+ dat += "Frills"
+
+ dat += "[features["frills"]]"
+
+ mutant_category++
+ if(mutant_category >= MAX_MUTANT_ROWS)
+ dat += ""
+ mutant_category = 0
+
+ if("spines" in pref_species.default_features)
+ if(!mutant_category)
+ dat += APPEARANCE_CATEGORY_COLUMN
+
+ dat += "Spines"
+
+ dat += "[features["spines"]]"
+
+ mutant_category++
+ if(mutant_category >= MAX_MUTANT_ROWS)
+ dat += ""
+ mutant_category = 0
+
+ if("body_markings" in pref_species.default_features)
+ if(!mutant_category)
+ dat += APPEARANCE_CATEGORY_COLUMN
+
+ dat += "Body Markings"
+
+ dat += "[features["body_markings"]]"
+
+ mutant_category++
+ if(mutant_category >= MAX_MUTANT_ROWS)
+ dat += ""
+ mutant_category = 0
+ if("mam_body_markings" in pref_species.default_features)
+ if(!mutant_category)
+ dat += APPEARANCE_CATEGORY_COLUMN
+
+ dat += "Species Markings"
+
+ dat += "[features["mam_body_markings"]]"
+
+ mutant_category++
+ if(mutant_category >= MAX_MUTANT_ROWS)
+ dat += ""
+
+ if("mam_ears" in pref_species.default_features)
+ if(!mutant_category)
+ dat += APPEARANCE_CATEGORY_COLUMN
+
+ dat += "Ears"
+
+ dat += "[features["mam_ears"]]"
+
+ mutant_category++
+ if(mutant_category >= MAX_MUTANT_ROWS)
+ dat += ""
+ mutant_category = 0
+ if("ears" in pref_species.default_features)
+ if(!mutant_category)
+ dat += APPEARANCE_CATEGORY_COLUMN
+
+ dat += "Ears"
+
+ dat += "[features["ears"]]"
+
+ mutant_category++
+ if(mutant_category >= MAX_MUTANT_ROWS)
+ dat += ""
+ mutant_category = 0
+ if("mam_snouts" in pref_species.default_features)
+ if(!mutant_category)
+ dat += APPEARANCE_CATEGORY_COLUMN
+
+ dat += "Snout"
+
+ dat += "[features["mam_snouts"]]"
+
+ mutant_category++
+ if(mutant_category >= MAX_MUTANT_ROWS)
+ dat += ""
+ mutant_category = 0
+ if("legs" in pref_species.default_features)
+ if(!mutant_category)
+ dat += APPEARANCE_CATEGORY_COLUMN
+
+ dat += "Legs"
+
+ dat += "[features["legs"]]"
+
+ mutant_category++
+ if(mutant_category >= MAX_MUTANT_ROWS)
+ dat += ""
+ mutant_category = 0
+ if("moth_wings" in pref_species.default_features)
+ if(!mutant_category)
+ dat += APPEARANCE_CATEGORY_COLUMN
+
+ dat += "Moth wings"
+
+ dat += "[features["moth_wings"]]"
+
+ mutant_category++
+ if(mutant_category >= MAX_MUTANT_ROWS)
+ dat += ""
+ mutant_category = 0
+ if("taur" in pref_species.default_features)
+ if(!mutant_category)
+ dat += APPEARANCE_CATEGORY_COLUMN
+
+ dat += "Tauric Body"
+
+ dat += "[features["taur"]]"
+
+ mutant_category++
+ if(mutant_category >= MAX_MUTANT_ROWS)
+ dat += ""
+ mutant_category = 0
+ if("wings" in pref_species.mutant_bodyparts && GLOB.r_wings_list.len >1)
+ if(!mutant_category)
+ dat += APPEARANCE_CATEGORY_COLUMN
+
+ dat += "Wings"
+
+ dat += "[features["wings"]]"
+
+ mutant_category++
+ if(mutant_category >= MAX_MUTANT_ROWS)
+ dat += ""
+ mutant_category = 0
+ if("xenohead" in pref_species.default_features)
+ if(!mutant_category)
+ dat += APPEARANCE_CATEGORY_COLUMN
+
+ dat += "Caste Head"
+
+ dat += "[features["xenohead"]]"
+
+ mutant_category++
+ if(mutant_category >= MAX_MUTANT_ROWS)
+ dat += ""
+ mutant_category = 0
+ if("xenotail" in pref_species.default_features)
+ if(!mutant_category)
+ dat += APPEARANCE_CATEGORY_COLUMN
+
+ dat += "Tail"
+
+ dat += "[features["xenotail"]]"
+
+ mutant_category++
+ if(mutant_category >= MAX_MUTANT_ROWS)
+ dat += ""
+ mutant_category = 0
+ if("xenodorsal" in pref_species.default_features)
+ if(!mutant_category)
+ dat += APPEARANCE_CATEGORY_COLUMN
+
+ dat += "Dorsal Spines"
+
+ dat += "[features["xenodorsal"]]"
+
+ mutant_category++
+ if(mutant_category >= MAX_MUTANT_ROWS)
+ dat += ""
+ mutant_category = 0
+ if("ipc_screen" in pref_species.default_features)
+ if(!mutant_category)
+ dat += APPEARANCE_CATEGORY_COLUMN
+
+ dat += "Screen"
+
+ dat += "[features["ipc_screen"]]"
+
+ mutant_category++
+ if(mutant_category >= MAX_MUTANT_ROWS)
+ dat += ""
+ mutant_category = 0
+ if("ipc_antenna" in pref_species.default_features)
+ if(!mutant_category)
+ dat += APPEARANCE_CATEGORY_COLUMN
+
+ dat += "Antenna"
+
+ dat += "[features["ipc_antenna"]]"
+
+ mutant_category++
+ if(mutant_category >= MAX_MUTANT_ROWS)
+ dat += ""
+ mutant_category = 0
+
+ if(mutant_category)
+ dat += ""
+ mutant_category = 0
+
+ dat += "
"
+
+ dat += " | "
+ dat += ""
+
+ if (1) // Game Preferences
+ dat += ""
+ if(unlock_content)
+ dat += "Ghost Form: [ghost_form]
"
+ dat += "Ghost Orbit: [ghost_orbit]
"
+ var/button_name = "If you see this something went wrong."
+ switch(ghost_accs)
+ if(GHOST_ACCS_FULL)
+ button_name = GHOST_ACCS_FULL_NAME
+ if(GHOST_ACCS_DIR)
+ button_name = GHOST_ACCS_DIR_NAME
+ if(GHOST_ACCS_NONE)
+ button_name = GHOST_ACCS_NONE_NAME
+
+ dat += "Ghost Accessories: [button_name]
"
+ switch(ghost_others)
+ if(GHOST_OTHERS_THEIR_SETTING)
+ button_name = GHOST_OTHERS_THEIR_SETTING_NAME
+ if(GHOST_OTHERS_DEFAULT_SPRITE)
+ button_name = GHOST_OTHERS_DEFAULT_SPRITE_NAME
+ if(GHOST_OTHERS_SIMPLE)
+ button_name = GHOST_OTHERS_SIMPLE_NAME
+
+ dat += "Ghosts of Others: [button_name]
"
+ dat += "
"
+ dat += "FPS: [clientfps]
"
+ dat += "Parallax (Fancy Space): "
+ switch (parallax)
+ if (PARALLAX_LOW)
+ dat += "Low"
+ if (PARALLAX_MED)
+ dat += "Medium"
+ if (PARALLAX_INSANE)
+ dat += "Insane"
+ if (PARALLAX_DISABLE)
+ dat += "Disabled"
+ else
+ dat += "High"
+ dat += "
"
+ dat += "Ambient Occlusion: [ambientocclusion ? "Enabled" : "Disabled"]
"
+ dat += "Fit Viewport: [auto_fit_viewport ? "Auto" : "Manual"]
"
+
+ if (CONFIG_GET(flag/maprotation) && CONFIG_GET(flag/tgstyle_maprotation))
+ var/p_map = preferred_map
+ if (!p_map)
+ p_map = "Default"
+ if (config.defaultmap)
+ p_map += " ([config.defaultmap.map_name])"
+ else
+ if (p_map in config.maplist)
+ var/datum/map_config/VM = config.maplist[p_map]
+ if (!VM)
+ p_map += " (No longer exists)"
+ else
+ p_map = VM.map_name
+ else
+ p_map += " (No longer exists)"
+ if(CONFIG_GET(flag/allow_map_voting))
+ dat += "Preferred Map: [p_map]
"
+
+ dat += " | "
+
+ dat += "Special Role Settings"
+
+ if(jobban_isbanned(user, ROLE_SYNDICATE))
+ dat += "You are banned from antagonist roles."
+ src.be_special = list()
+
+
+ for (var/i in GLOB.special_roles)
+ if(jobban_isbanned(user, i))
+ dat += "Be [capitalize(i)]: BANNED
"
+ else
+ var/days_remaining = null
+ if(ispath(GLOB.special_roles[i]) && CONFIG_GET(flag/use_age_restriction_for_jobs)) //If it's a game mode antag, check if the player meets the minimum age
+ var/mode_path = GLOB.special_roles[i]
+ var/datum/game_mode/temp_mode = new mode_path
+ days_remaining = temp_mode.get_remaining_days(user.client)
+
+ if(days_remaining)
+ dat += "Be [capitalize(i)]: \[IN [days_remaining] DAYS]
"
+ else
+ dat += "Be [capitalize(i)]: [(i in be_special) ? "Enabled" : "Disabled"]
"
+ dat += "Midround Antagonist: [(toggles & MIDROUND_ANTAG) ? "Enabled" : "Disabled"]
"
+
+ dat += "
"
+
+ if(3)
+ if(!gear_tab)
+ gear_tab = GLOB.loadout_items[1]
+ dat += ""
+ dat += "| [gear_points] loadout points remaining. \[Clear Loadout\] | "
+ dat += "| You can only choose one item per category, unless it's an item that spawns in your backpack or hands. | "
+ dat += "| "
+ var/firstcat = TRUE
+ for(var/i in GLOB.loadout_items)
+ if(firstcat)
+ firstcat = FALSE
+ else
+ dat += " |"
+ if(i == gear_tab)
+ dat += " [i] "
+ else
+ dat += " [i] "
+ dat += " | "
+ dat += "
| "
+ dat += "| [gear_tab] | "
+ dat += "
| "
+ dat += "| Name | "
+ dat += "Cost | "
+ dat += "Restrictions | "
+ dat += "Description | "
+ for(var/j in GLOB.loadout_items[gear_tab])
+ var/datum/gear/gear = GLOB.loadout_items[gear_tab][j]
+ var/donoritem
+ if(gear.ckeywhitelist && gear.ckeywhitelist.len)
+ donoritem = TRUE
+ if(!(user.ckey in gear.ckeywhitelist))
+ continue
+ var/class_link = ""
+ if(gear.type in chosen_gear)
+ class_link = "style='white-space:normal;' class='linkOn' href='?_src_=prefs;preference=gear;toggle_gear_path=[html_encode(j)];toggle_gear=0'"
+ else if(gear_points <= 0)
+ class_link = "style='white-space:normal;' class='linkOff'"
+ else if(donoritem)
+ class_link = "style='white-space:normal;background:#ebc42e;' href='?_src_=prefs;preference=gear;toggle_gear_path=[html_encode(j)];toggle_gear=1'"
+ else
+ class_link = "style='white-space:normal;' href='?_src_=prefs;preference=gear;toggle_gear_path=[html_encode(j)];toggle_gear=1'"
+ dat += "| [j] | "
+ dat += "[gear.cost] | "
+ if(islist(gear.restricted_roles))
+ if(gear.restricted_roles.len)
+ dat += ""
+ dat += gear.restricted_roles.Join(";")
+ dat += ""
+ dat += " | [gear.description] | "
+ dat += " "
+
+ dat += "
"
+
+ if(!IsGuestKey(user.key))
+ dat += "Undo "
+ dat += "Save Setup "
+
+ dat += "Reset Setup"
+ dat += ""
+
+ winshow(user, "preferences_window", TRUE)
+ var/datum/browser/popup = new(user, "preferences_browser", "Character Setup ", 640, 770)
+ popup.set_content(dat.Join())
+ popup.open(FALSE)
+ onclose(user, "preferences_window", src)
+
+#undef APPEARANCE_CATEGORY_COLUMN
+#undef MAX_MUTANT_ROWS
+
+/datum/preferences/proc/SetChoices(mob/user, limit = 17, list/splitJobs = list("Chief Engineer"), widthPerColumn = 295, height = 620)
+ if(!SSjob)
+ return
+
+ //limit - The amount of jobs allowed per column. Defaults to 17 to make it look nice.
+ //splitJobs - Allows you split the table by job. You can make different tables for each department by including their heads. Defaults to CE to make it look nice.
+ //widthPerColumn - Screen's width for every column.
+ //height - Screen's height.
+
+ var/width = widthPerColumn
+
+ var/HTML = ""
+ if(SSjob.occupations.len <= 0)
+ HTML += "The job SSticker is not yet finished creating jobs, please try again later"
+ HTML += "Done
" // Easier to press up here.
+
+ else
+ HTML += "Choose occupation chances
"
+ HTML += "Left-click to raise an occupation preference, right-click to lower it.
"
+ HTML += "Done
" // Easier to press up here.
+ HTML += ""
+ HTML += "" // Table within a table for alignment, also allows you to easily add more colomns.
+ HTML += ""
+ var/index = -1
+
+ //The job before the current job. I only use this to get the previous jobs color when I'm filling in blank rows.
+ var/datum/job/lastJob
+
+ var/datum/job/overflow = SSjob.GetJob(SSjob.overflow_role)
+
+ for(var/datum/job/job in SSjob.occupations)
+
+ index += 1
+ if((index >= limit) || (job.title in splitJobs))
+ width += widthPerColumn
+ if((index < limit) && (lastJob != null))
+ //If the cells were broken up by a job in the splitJob list then it will fill in the rest of the cells with
+ //the last job's selection color. Creating a rather nice effect.
+ for(var/i = 0, i < (limit - index), i += 1)
+ HTML += "| | | "
+ HTML += " | "
+ index = 0
+
+ HTML += "| "
+ var/rank = job.title
+ lastJob = job
+ if(jobban_isbanned(user, rank))
+ HTML += "[rank] | BANNED | "
+ continue
+ var/required_playtime_remaining = job.required_playtime_remaining(user.client)
+ if(required_playtime_remaining)
+ HTML += "[rank] \[ [get_exp_format(required_playtime_remaining)] as [job.get_exp_req_type()] \] | "
+ continue
+ if(!job.player_old_enough(user.client))
+ var/available_in_days = job.available_in_days(user.client)
+ HTML += "[rank] \[IN [(available_in_days)] DAYS\] | "
+ continue
+ if((job_civilian_low & overflow.flag) && (rank != SSjob.overflow_role) && !jobban_isbanned(user, SSjob.overflow_role))
+ HTML += "[rank] | "
+ continue
+ if((rank in GLOB.command_positions) || (rank == "AI"))//Bold head jobs
+ HTML += "[rank]"
+ else
+ HTML += "[rank]"
+
+ HTML += ""
+
+ var/prefLevelLabel = "ERROR"
+ var/prefLevelColor = "pink"
+ var/prefUpperLevel = -1 // level to assign on left click
+ var/prefLowerLevel = -1 // level to assign on right click
+
+ if(GetJobDepartment(job, 1) & job.flag)
+ prefLevelLabel = "High"
+ prefLevelColor = "slateblue"
+ prefUpperLevel = 4
+ prefLowerLevel = 2
+ else if(GetJobDepartment(job, 2) & job.flag)
+ prefLevelLabel = "Medium"
+ prefLevelColor = "green"
+ prefUpperLevel = 1
+ prefLowerLevel = 3
+ else if(GetJobDepartment(job, 3) & job.flag)
+ prefLevelLabel = "Low"
+ prefLevelColor = "orange"
+ prefUpperLevel = 2
+ prefLowerLevel = 4
+ else
+ prefLevelLabel = "NEVER"
+ prefLevelColor = "red"
+ prefUpperLevel = 3
+ prefLowerLevel = 1
+
+
+ HTML += ""
+
+ if(rank == SSjob.overflow_role)//Overflow is special
+ if(job_civilian_low & overflow.flag)
+ HTML += "Yes"
+ else
+ HTML += "No"
+ HTML += " | "
+ continue
+
+ HTML += "[prefLevelLabel]"
+ HTML += ""
+
+ for(var/i = 1, i < (limit - index), i += 1) // Finish the column so it is even
+ HTML += "| | | "
+
+ HTML += " "
+ HTML += " |
"
+
+ var/message = "Be an [SSjob.overflow_role] if preferences unavailable"
+ if(joblessrole == BERANDOMJOB)
+ message = "Get random job if preferences unavailable"
+ else if(joblessrole == RETURNTOLOBBY)
+ message = "Return to lobby if preferences unavailable"
+ HTML += "
[message]"
+ HTML += "Reset Preferences"
+
+ var/datum/browser/popup = new(user, "mob_occupation", "Occupation Preferences ", width, height)
+ popup.set_window_options("can_close=0")
+ popup.set_content(HTML)
+ popup.open(FALSE)
+
+/datum/preferences/proc/SetJobPreferenceLevel(datum/job/job, level)
+ if (!job)
+ return 0
+
+ if (level == 1) // to high
+ // remove any other job(s) set to high
+ job_civilian_med |= job_civilian_high
+ job_engsec_med |= job_engsec_high
+ job_medsci_med |= job_medsci_high
+ job_civilian_high = 0
+ job_engsec_high = 0
+ job_medsci_high = 0
+
+ if (job.department_flag == CIVILIAN)
+ job_civilian_low &= ~job.flag
+ job_civilian_med &= ~job.flag
+ job_civilian_high &= ~job.flag
+
+ switch(level)
+ if (1)
+ job_civilian_high |= job.flag
+ if (2)
+ job_civilian_med |= job.flag
+ if (3)
+ job_civilian_low |= job.flag
+
+ return 1
+ else if (job.department_flag == ENGSEC)
+ job_engsec_low &= ~job.flag
+ job_engsec_med &= ~job.flag
+ job_engsec_high &= ~job.flag
+
+ switch(level)
+ if (1)
+ job_engsec_high |= job.flag
+ if (2)
+ job_engsec_med |= job.flag
+ if (3)
+ job_engsec_low |= job.flag
+
+ return 1
+ else if (job.department_flag == MEDSCI)
+ job_medsci_low &= ~job.flag
+ job_medsci_med &= ~job.flag
+ job_medsci_high &= ~job.flag
+
+ switch(level)
+ if (1)
+ job_medsci_high |= job.flag
+ if (2)
+ job_medsci_med |= job.flag
+ if (3)
+ job_medsci_low |= job.flag
+
+ return 1
+
+ return 0
+
+/datum/preferences/proc/UpdateJobPreference(mob/user, role, desiredLvl)
+ if(!SSjob || SSjob.occupations.len <= 0)
+ return
+ var/datum/job/job = SSjob.GetJob(role)
+
+ if(!job)
+ user << browse(null, "window=mob_occupation")
+ ShowChoices(user)
+ return
+
+ if (!isnum(desiredLvl))
+ to_chat(user, "UpdateJobPreference - desired level was not a number. Please notify coders!")
+ ShowChoices(user)
+ return
+
+ if(role == SSjob.overflow_role)
+ if(job_civilian_low & job.flag)
+ job_civilian_low &= ~job.flag
+ else
+ job_civilian_low |= job.flag
+ SetChoices(user)
+ return 1
+
+ SetJobPreferenceLevel(job, desiredLvl)
+ SetChoices(user)
+
+ return 1
+
+
+/datum/preferences/proc/ResetJobs()
+
+ job_civilian_high = 0
+ job_civilian_med = 0
+ job_civilian_low = 0
+
+ job_medsci_high = 0
+ job_medsci_med = 0
+ job_medsci_low = 0
+
+ job_engsec_high = 0
+ job_engsec_med = 0
+ job_engsec_low = 0
+
+
+/datum/preferences/proc/GetJobDepartment(datum/job/job, level)
+ if(!job || !level)
+ return 0
+ switch(job.department_flag)
+ if(CIVILIAN)
+ switch(level)
+ if(1)
+ return job_civilian_high
+ if(2)
+ return job_civilian_med
+ if(3)
+ return job_civilian_low
+ if(MEDSCI)
+ switch(level)
+ if(1)
+ return job_medsci_high
+ if(2)
+ return job_medsci_med
+ if(3)
+ return job_medsci_low
+ if(ENGSEC)
+ switch(level)
+ if(1)
+ return job_engsec_high
+ if(2)
+ return job_engsec_med
+ if(3)
+ return job_engsec_low
+ return 0
+
+/datum/preferences/proc/SetQuirks(mob/user)
+ if(!SSquirks)
+ to_chat(user, "The quirk subsystem is still initializing! Try again in a minute.")
+ return
+
+ var/list/dat = list()
+ if(!SSquirks.quirks.len)
+ dat += "The quirk subsystem hasn't finished initializing, please hold..."
+ dat += "Done
"
+
+ else
+ dat += "Choose quirk setup
"
+ dat += "Left-click to add or remove quirks. You need negative quirks to have positive ones.
\
+ Quirks are applied at roundstart and cannot normally be removed. "
+ dat += "Done"
+ dat += "
"
+ dat += "Current quirks: [all_quirks.len ? all_quirks.Join(", ") : "None"]"
+ dat += "[positive_quirks.len] / [MAX_QUIRKS] max positive quirks
\
+ Quirk balance remaining: [GetQuirkBalance()]
"
+ for(var/V in SSquirks.quirks)
+ var/datum/quirk/T = SSquirks.quirks[V]
+ var/quirk_name = initial(T.name)
+ var/has_quirk
+ var/quirk_cost = initial(T.value) * -1
+ var/lock_reason = "This trait is unavailable."
+ var/quirk_conflict = FALSE
+ for(var/_V in all_quirks)
+ if(_V == quirk_name)
+ has_quirk = TRUE
+ if(initial(T.mood_quirk) && CONFIG_GET(flag/disable_human_mood))
+ lock_reason = "Mood is disabled."
+ quirk_conflict = TRUE
+ if(has_quirk)
+ if(quirk_conflict)
+ all_quirks -= quirk_name
+ has_quirk = FALSE
+ else
+ quirk_cost *= -1 //invert it back, since we'd be regaining this amount
+ if(quirk_cost > 0)
+ quirk_cost = "+[quirk_cost]"
+ var/font_color = "#AAAAFF"
+ if(initial(T.value) != 0)
+ font_color = initial(T.value) > 0 ? "#AAFFAA" : "#FFAAAA"
+ if(quirk_conflict)
+ dat += "[quirk_name] - [initial(T.desc)] \
+ LOCKED: [lock_reason]
"
+ else
+ if(has_quirk)
+ dat += "[quirk_name] - [initial(T.desc)] \
+ [has_quirk ? "Lose" : "Take"] ([quirk_cost] pts.)
"
+ else
+ dat += "[quirk_name] - [initial(T.desc)] \
+ [has_quirk ? "Lose" : "Take"] ([quirk_cost] pts.)
"
+ dat += "
Reset Traits"
+
+ var/datum/browser/popup = new(user, "mob_occupation", "Quirk Preferences ", 900, 600) //no reason not to reuse the occupation window, as it's cleaner that way
+ popup.set_window_options("can_close=0")
+ popup.set_content(dat.Join())
+ popup.open(FALSE)
+
+/datum/preferences/proc/GetQuirkBalance()
+ var/bal = 0
+ for(var/V in all_quirks)
+ var/datum/quirk/T = SSquirks.quirks[V]
+ bal -= initial(T.value)
+ return bal
+
+/datum/preferences/Topic(href, href_list, hsrc) //yeah, gotta do this I guess..
+ . = ..()
+ if(href_list["close"])
+ var/client/C = usr.client
+ if(C)
+ C.clear_character_previews()
+
+/datum/preferences/proc/process_link(mob/user, list/href_list)
+ if(href_list["jobbancheck"])
+ var/job = sanitizeSQL(href_list["jobbancheck"])
+ var/sql_ckey = sanitizeSQL(user.ckey)
+ var/datum/DBQuery/query_get_jobban = SSdbcore.NewQuery("SELECT reason, bantime, duration, expiration_time, IFNULL((SELECT byond_key FROM [format_table_name("player")] WHERE [format_table_name("player")].ckey = [format_table_name("ban")].a_ckey), a_ckey) FROM [format_table_name("ban")] WHERE ckey = '[sql_ckey]' AND (bantype = 'JOB_PERMABAN' OR (bantype = 'JOB_TEMPBAN' AND expiration_time > Now())) AND isnull(unbanned) AND job = '[job]'")
+ if(!query_get_jobban.warn_execute())
+ qdel(query_get_jobban)
+ return
+ if(query_get_jobban.NextRow())
+ var/reason = query_get_jobban.item[1]
+ var/bantime = query_get_jobban.item[2]
+ var/duration = query_get_jobban.item[3]
+ var/expiration_time = query_get_jobban.item[4]
+ var/admin_key = query_get_jobban.item[5]
+ var/text
+ text = "You, or another user of this computer, ([user.key]) is banned from playing [job]. The ban reason is:
[reason]
This ban was applied by [admin_key] on [bantime]"
+ if(text2num(duration) > 0)
+ text += ". The ban is for [duration] minutes and expires on [expiration_time] (server time)"
+ text += "."
+ to_chat(user, text)
+ qdel(query_get_jobban)
+ return
+
+ if(href_list["preference"] == "job")
+ switch(href_list["task"])
+ if("close")
+ user << browse(null, "window=mob_occupation")
+ ShowChoices(user)
+ if("reset")
+ ResetJobs()
+ SetChoices(user)
+ if("random")
+ switch(joblessrole)
+ if(RETURNTOLOBBY)
+ if(jobban_isbanned(user, SSjob.overflow_role))
+ joblessrole = BERANDOMJOB
+ else
+ joblessrole = BEOVERFLOW
+ if(BEOVERFLOW)
+ joblessrole = BERANDOMJOB
+ if(BERANDOMJOB)
+ joblessrole = RETURNTOLOBBY
+ SetChoices(user)
+ if("setJobLevel")
+ UpdateJobPreference(user, href_list["text"], text2num(href_list["level"]))
+ else
+ SetChoices(user)
+ return 1
+
+ else if(href_list["preference"] == "trait")
+ switch(href_list["task"])
+ if("close")
+ user << browse(null, "window=mob_occupation")
+ ShowChoices(user)
+ if("update")
+ var/quirk = href_list["trait"]
+ if(!SSquirks.quirks[quirk])
+ return
+ var/value = SSquirks.quirk_points[quirk]
+ if(value == 0)
+ if(quirk in neutral_quirks)
+ neutral_quirks -= quirk
+ all_quirks -= quirk
+ else
+ neutral_quirks += quirk
+ all_quirks += quirk
+ else
+ var/balance = GetQuirkBalance()
+ if(quirk in positive_quirks)
+ positive_quirks -= quirk
+ all_quirks -= quirk
+ else if(quirk in negative_quirks)
+ if(balance + value < 0)
+ to_chat(user, "Refunding this would cause you to go below your balance!")
+ return
+ negative_quirks -= quirk
+ all_quirks -= quirk
+ else if(value > 0)
+ if(positive_quirks.len >= MAX_QUIRKS)
+ to_chat(user, "You can't have more than [MAX_QUIRKS] positive quirks!")
+ return
+ if(balance - value < 0)
+ to_chat(user, "You don't have enough balance to gain this quirk!")
+ return
+ positive_quirks += quirk
+ all_quirks += quirk
+ else
+ negative_quirks += quirk
+ all_quirks += quirk
+ SetQuirks(user)
+ if("reset")
+ all_quirks = list()
+ positive_quirks = list()
+ negative_quirks = list()
+ neutral_quirks = list()
+ SetQuirks(user)
+ else
+ SetQuirks(user)
+ return TRUE
+
+ switch(href_list["task"])
+ if("random")
+ switch(href_list["preference"])
+ if("name")
+ real_name = pref_species.random_name(gender,1)
+ if("age")
+ age = rand(AGE_MIN, AGE_MAX)
+ if("hair")
+ hair_color = random_short_color()
+ if("hair_style")
+ hair_style = random_hair_style(gender)
+ if("facial")
+ facial_hair_color = random_short_color()
+ if("facial_hair_style")
+ facial_hair_style = random_facial_hair_style(gender)
+ if("underwear")
+ underwear = random_underwear(gender)
+ if("undershirt")
+ undershirt = random_undershirt(gender)
+ if("socks")
+ socks = random_socks()
+ if(BODY_ZONE_PRECISE_EYES)
+ eye_color = random_eye_color()
+ if("s_tone")
+ skin_tone = random_skin_tone()
+ if("bag")
+ backbag = pick(GLOB.backbaglist)
+ if("all")
+ random_character()
+
+ if("input")
+
+ if(href_list["preference"] in GLOB.preferences_custom_names)
+ ask_for_custom_name(user,href_list["preference"])
+
+
+ switch(href_list["preference"])
+ if("ghostform")
+ if(unlock_content)
+ var/new_form = input(user, "Thanks for supporting BYOND - Choose your ghostly form:","Thanks for supporting BYOND",null) as null|anything in GLOB.ghost_forms
+ if(new_form)
+ ghost_form = new_form
+ if("ghostorbit")
+ if(unlock_content)
+ var/new_orbit = input(user, "Thanks for supporting BYOND - Choose your ghostly orbit:","Thanks for supporting BYOND", null) as null|anything in GLOB.ghost_orbits
+ if(new_orbit)
+ ghost_orbit = new_orbit
+
+ if("ghostaccs")
+ var/new_ghost_accs = alert("Do you want your ghost to show full accessories where possible, hide accessories but still use the directional sprites where possible, or also ignore the directions and stick to the default sprites?",,GHOST_ACCS_FULL_NAME, GHOST_ACCS_DIR_NAME, GHOST_ACCS_NONE_NAME)
+ switch(new_ghost_accs)
+ if(GHOST_ACCS_FULL_NAME)
+ ghost_accs = GHOST_ACCS_FULL
+ if(GHOST_ACCS_DIR_NAME)
+ ghost_accs = GHOST_ACCS_DIR
+ if(GHOST_ACCS_NONE_NAME)
+ ghost_accs = GHOST_ACCS_NONE
+
+ if("ghostothers")
+ var/new_ghost_others = alert("Do you want the ghosts of others to show up as their own setting, as their default sprites or always as the default white ghost?",,GHOST_OTHERS_THEIR_SETTING_NAME, GHOST_OTHERS_DEFAULT_SPRITE_NAME, GHOST_OTHERS_SIMPLE_NAME)
+ switch(new_ghost_others)
+ if(GHOST_OTHERS_THEIR_SETTING_NAME)
+ ghost_others = GHOST_OTHERS_THEIR_SETTING
+ if(GHOST_OTHERS_DEFAULT_SPRITE_NAME)
+ ghost_others = GHOST_OTHERS_DEFAULT_SPRITE
+ if(GHOST_OTHERS_SIMPLE_NAME)
+ ghost_others = GHOST_OTHERS_SIMPLE
+
+ if("name")
+ var/new_name = input(user, "Choose your character's name:", "Character Preference") as text|null
+ if(new_name)
+ new_name = reject_bad_name(new_name)
+ if(new_name)
+ real_name = new_name
+ else
+ to_chat(user, "Invalid name. Your name should be at least 2 and at most [MAX_NAME_LEN] characters long. It may only contain the characters A-Z, a-z, -, ' and .")
+
+ if("age")
+ var/new_age = input(user, "Choose your character's age:\n([AGE_MIN]-[AGE_MAX])", "Character Preference") as num|null
+ if(new_age)
+ age = max(min( round(text2num(new_age)), AGE_MAX),AGE_MIN)
+
+ if("flavor_text")
+ var/msg = stripped_multiline_input(usr,"Set the flavor text in your 'examine' verb. This can also be used for OOC notes and preferences!","Flavor Text",html_decode(features["flavor_text"]), MAX_MESSAGE_LEN*2, TRUE) as null|message
+ if(!isnull(msg))
+ msg = copytext(msg, 1, MAX_MESSAGE_LEN*2)
+ features["flavor_text"] = msg
+
+ if("hair")
+ var/new_hair = input(user, "Choose your character's hair colour:", "Character Preference","#"+hair_color) as color|null
+ if(new_hair)
+ hair_color = sanitize_hexcolor(new_hair)
+
+ if("hair_style")
+ var/new_hair_style
+ if(gender == MALE)
+ new_hair_style = input(user, "Choose your character's hair style:", "Character Preference") as null|anything in GLOB.hair_styles_male_list
+ else
+ new_hair_style = input(user, "Choose your character's hair style:", "Character Preference") as null|anything in GLOB.hair_styles_female_list
+ if(new_hair_style)
+ hair_style = new_hair_style
+
+ if("next_hair_style")
+ if (gender == MALE)
+ hair_style = next_list_item(hair_style, GLOB.hair_styles_male_list)
+ else
+ hair_style = next_list_item(hair_style, GLOB.hair_styles_female_list)
+
+ if("previous_hair_style")
+ if (gender == MALE)
+ hair_style = previous_list_item(hair_style, GLOB.hair_styles_male_list)
+ else
+ hair_style = previous_list_item(hair_style, GLOB.hair_styles_female_list)
+
+ if("facial")
+ var/new_facial = input(user, "Choose your character's facial-hair colour:", "Character Preference","#"+facial_hair_color) as color|null
+ if(new_facial)
+ facial_hair_color = sanitize_hexcolor(new_facial)
+ if("facial_hair_style")
+ var/new_facial_hair_style
+ if(gender == MALE)
+ new_facial_hair_style = input(user, "Choose your character's facial-hair style:", "Character Preference") as null|anything in GLOB.facial_hair_styles_male_list
+ else
+ new_facial_hair_style = input(user, "Choose your character's facial-hair style:", "Character Preference") as null|anything in GLOB.facial_hair_styles_female_list
+ if(new_facial_hair_style)
+ facial_hair_style = new_facial_hair_style
+
+ if("next_facehair_style")
+ if (gender == MALE)
+ facial_hair_style = next_list_item(facial_hair_style, GLOB.facial_hair_styles_male_list)
+ else
+ facial_hair_style = next_list_item(facial_hair_style, GLOB.facial_hair_styles_female_list)
+ if("previous_facehair_style")
+ if (gender == MALE)
+ facial_hair_style = previous_list_item(facial_hair_style, GLOB.facial_hair_styles_male_list)
+ else
+ facial_hair_style = previous_list_item(facial_hair_style, GLOB.facial_hair_styles_female_list)
+
+ if("underwear")
+ var/new_underwear
+ if(gender == MALE)
+ new_underwear = input(user, "Choose your character's underwear:", "Character Preference") as null|anything in GLOB.underwear_m
+ else
+ new_underwear = input(user, "Choose your character's underwear:", "Character Preference") as null|anything in GLOB.underwear_f
+ if(new_underwear)
+ underwear = new_underwear
+
+ if("undershirt")
+ var/new_undershirt
+ if(gender == MALE)
+ new_undershirt = input(user, "Choose your character's undershirt:", "Character Preference") as null|anything in GLOB.undershirt_m
+ else
+ new_undershirt = input(user, "Choose your character's undershirt:", "Character Preference") as null|anything in GLOB.undershirt_f
+ if(new_undershirt)
+ undershirt = new_undershirt
+
+ if("socks")
+ var/new_socks
+ new_socks = input(user, "Choose your character's socks:", "Character Preference") as null|anything in GLOB.socks_list
+ if(new_socks)
+ socks = new_socks
+
+ if("eyes")
+ var/new_eyes = input(user, "Choose your character's eye colour:", "Character Preference","#"+eye_color) as color|null
+ if(new_eyes)
+ eye_color = sanitize_hexcolor(new_eyes)
+
+ if("species")
+ var/result = input(user, "Select a species", "Species Selection") as null|anything in GLOB.roundstart_races
+ if(result)
+ var/newtype = GLOB.species_list[result]
+ pref_species = new newtype()
+ //let's ensure that no weird shit happens on species swapping.
+ if(!("body_markings" in pref_species.default_features))
+ features["body_markings"] = "None"
+ if(!("mam_body_markings" in pref_species.default_features))
+ features["mam_body_markings"] = "None"
+ if("mam_body_markings" in pref_species.default_features && features["mam_body_markings"] == "None")
+ features["mam_body_markings"] = "Plain"
+ if("tail_lizard" in pref_species.default_features)
+ features["tail_lizard"] = "Smooth"
+ if("mam_tail" in pref_species.default_features)
+ features["mam_tail"] = "None"
+ if("mam_ears" in pref_species.default_features)
+ features["mam_ears"] = "None"
+ if(pref_species.id == "felinid")
+ features["mam_tail"] = "Cat"
+ features["mam_ears"] = "Cat"
+
+ //Now that we changed our species, we must verify that the mutant colour is still allowed.
+ var/temp_hsv = RGBtoHSV(features["mcolor"])
+ if(features["mcolor"] == "#000" || (!(MUTCOLORS_PARTSONLY in pref_species.species_traits) && ReadHSV(temp_hsv)[3] < ReadHSV("#202020")[3]))
+ features["mcolor"] = pref_species.default_color
+ if(features["mcolor2"] == "#000" || (!(MUTCOLORS_PARTSONLY in pref_species.species_traits) && ReadHSV(temp_hsv)[3] < ReadHSV("#202020")[3]))
+ features["mcolor2"] = pref_species.default_color
+ if(features["mcolor3"] == "#000" || (!(MUTCOLORS_PARTSONLY in pref_species.species_traits) && ReadHSV(temp_hsv)[3] < ReadHSV("#202020")[3]))
+ features["mcolor3"] = pref_species.default_color
+
+ if("mutant_color")
+ var/new_mutantcolor = input(user, "Choose your character's alien/mutant color:", "Character Preference","#"+features["mcolor"]) as color|null
+ if(new_mutantcolor)
+ var/temp_hsv = RGBtoHSV(new_mutantcolor)
+ if(new_mutantcolor == "#000000")
+ features["mcolor"] = pref_species.default_color
+ update_preview_icon()
+ else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3]) // mutantcolors must be bright, but only if they affect the skin
+ features["mcolor"] = sanitize_hexcolor(new_mutantcolor)
+ update_preview_icon()
+ else
+ to_chat(user, "Invalid color. Your color is not bright enough.")
+
+ if("mutant_color2")
+ var/new_mutantcolor = input(user, "Choose your character's secondary alien/mutant color:", "Character Preference") as color|null
+ if(new_mutantcolor)
+ var/temp_hsv = RGBtoHSV(new_mutantcolor)
+ if(new_mutantcolor == "#000000")
+ features["mcolor2"] = pref_species.default_color
+ update_preview_icon()
+ else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3]) // mutantcolors must be bright, but only if they affect the skin
+ features["mcolor2"] = sanitize_hexcolor(new_mutantcolor)
+ update_preview_icon()
+ else
+ to_chat(user, "Invalid color. Your color is not bright enough.")
+
+ if("mutant_color3")
+ var/new_mutantcolor = input(user, "Choose your character's tertiary alien/mutant color:", "Character Preference") as color|null
+ if(new_mutantcolor)
+ var/temp_hsv = RGBtoHSV(new_mutantcolor)
+ if(new_mutantcolor == "#000000")
+ features["mcolor3"] = pref_species.default_color
+ update_preview_icon()
+ else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3]) // mutantcolors must be bright, but only if they affect the skin
+ features["mcolor3"] = sanitize_hexcolor(new_mutantcolor)
+ update_preview_icon()
+ else
+ to_chat(user, "Invalid color. Your color is not bright enough.")
+
+ if("ipc_screen")
+ var/new_ipc_screen
+ new_ipc_screen = input(user, "Choose your character's screen:", "Character Preference") as null|anything in GLOB.ipc_screens_list
+ if(new_ipc_screen)
+ features["ipc_screen"] = new_ipc_screen
+
+ if("ipc_antenna")
+ var/new_ipc_antenna
+ new_ipc_antenna = input(user, "Choose your character's antenna:", "Character Preference") as null|anything in GLOB.ipc_antennas_list
+ if(new_ipc_antenna)
+ features["ipc_antenna"] = new_ipc_antenna
+
+ if("tail_lizard")
+ var/new_tail
+ new_tail = input(user, "Choose your character's tail:", "Character Preference") as null|anything in GLOB.tails_list_lizard
+ if(new_tail)
+ features["tail_lizard"] = new_tail
+ if(new_tail != "None")
+ features["taur"] = "None"
+ features["tail_human"] = "None"
+ features["mam_tail"] = "None"
+
+ if("tail_human")
+ var/list/snowflake_tails_list = list()
+ for(var/path in GLOB.tails_list_human)
+ var/datum/sprite_accessory/tails/human/instance = GLOB.tails_list_human[path]
+ if(istype(instance, /datum/sprite_accessory))
+ var/datum/sprite_accessory/S = instance
+ if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(user.client.ckey)))
+ snowflake_tails_list[S.name] = path
+ var/new_tail
+ new_tail = input(user, "Choose your character's tail:", "Character Preference") as null|anything in snowflake_tails_list
+ if(new_tail)
+ features["tail_human"] = new_tail
+ if(new_tail != "None")
+ features["taur"] = "None"
+ features["tail_lizard"] = "None"
+ features["mam_tail"] = "None"
+
+ if("mam_tail")
+ var/list/snowflake_tails_list = list()
+ for(var/path in GLOB.mam_tails_list)
+ var/datum/sprite_accessory/mam_tails/instance = GLOB.mam_tails_list[path]
+ if(istype(instance, /datum/sprite_accessory))
+ var/datum/sprite_accessory/S = instance
+ if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(user.client.ckey)))
+ snowflake_tails_list[S.name] = path
+ var/new_tail
+ new_tail = input(user, "Choose your character's tail:", "Character Preference") as null|anything in snowflake_tails_list
+ if(new_tail)
+ features["mam_tail"] = new_tail
+ if(new_tail != "None")
+ features["taur"] = "None"
+ features["tail_human"] = "None"
+ features["tail_lizard"] = "None"
+
+ if("snout")
+ var/new_snout
+ new_snout = input(user, "Choose your character's snout:", "Character Preference") as null|anything in GLOB.snouts_list
+ if(new_snout)
+ features["snout"] = new_snout
+
+ if("mam_snouts")
+ var/new_mam_snouts
+ new_mam_snouts = input(user, "Choose your character's snout:", "Character Preference") as null|anything in GLOB.mam_snouts_list
+ if(new_mam_snouts)
+ features["mam_snouts"] = new_mam_snouts
+
+ if("horns")
+ var/new_horns
+ new_horns = input(user, "Choose your character's horns:", "Character Preference") as null|anything in GLOB.horns_list
+ if(new_horns)
+ features["horns"] = new_horns
+
+ if("ears")
+ var/new_ears
+ new_ears = input(user, "Choose your character's ears:", "Character Preference") as null|anything in GLOB.ears_list
+ if(new_ears)
+ features["ears"] = new_ears
+
+ if("wings")
+ var/new_wings
+ new_wings = input(user, "Choose your character's wings:", "Character Preference") as null|anything in GLOB.r_wings_list
+ if(new_wings)
+ features["wings"] = new_wings
+
+ if("frills")
+ var/new_frills
+ new_frills = input(user, "Choose your character's frills:", "Character Preference") as null|anything in GLOB.frills_list
+ if(new_frills)
+ features["frills"] = new_frills
+
+ if("spines")
+ var/new_spines
+ new_spines = input(user, "Choose your character's spines:", "Character Preference") as null|anything in GLOB.spines_list
+ if(new_spines)
+ features["spines"] = new_spines
+
+ if("body_markings")
+ var/new_body_markings
+ new_body_markings = input(user, "Choose your character's body markings:", "Character Preference") as null|anything in GLOB.body_markings_list
+ if(new_body_markings)
+ features["body_markings"] = new_body_markings
+ if(new_body_markings != "None")
+ features["mam_body_markings"] = "None"
+ update_preview_icon()
+
+ if("legs")
+ var/new_legs
+ new_legs = input(user, "Choose your character's legs:", "Character Preference") as null|anything in GLOB.legs_list
+ if(new_legs)
+ features["legs"] = new_legs
+ update_preview_icon()
+
+ if("moth_wings")
+ var/new_moth_wings
+ new_moth_wings = input(user, "Choose your character's wings:", "Character Preference") as null|anything in GLOB.moth_wings_list
+ if(new_moth_wings)
+ features["moth_wings"] = new_moth_wings
+
+ if("s_tone")
+ var/new_s_tone = input(user, "Choose your character's skin-tone:", "Character Preference") as null|anything in GLOB.skin_tones
+ if(new_s_tone)
+ skin_tone = new_s_tone
+
+ if("taur")
+ var/list/snowflake_taur_list = list()
+ for(var/path in GLOB.taur_list)
+ var/datum/sprite_accessory/taur/instance = GLOB.taur_list[path]
+ if(istype(instance, /datum/sprite_accessory))
+ var/datum/sprite_accessory/S = instance
+ if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(user.client.ckey)))
+ snowflake_taur_list[S.name] = path
+ var/new_taur
+ new_taur = input(user, "Choose your character's tauric body:", "Character Preference") as null|anything in snowflake_taur_list
+ if(new_taur)
+ features["taur"] = new_taur
+ if(new_taur != "None")
+ features["mam_tail"] = "None"
+ features["xenotail"] = "None"
+ features["tail_human"] = "None"
+ features["tail_lizard"] = "None"
+
+ if("ears")
+ var/list/snowflake_ears_list = list()
+ for(var/path in GLOB.ears_list)
+ var/datum/sprite_accessory/ears/instance = GLOB.ears_list[path]
+ if(istype(instance, /datum/sprite_accessory))
+ var/datum/sprite_accessory/S = instance
+ if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(user.client.ckey)))
+ snowflake_ears_list[S.name] = path
+ var/new_ears
+ new_ears = input(user, "Choose your character's ears:", "Character Preference") as null|anything in snowflake_ears_list
+ if(new_ears)
+ features["ears"] = new_ears
+
+ if("mam_ears")
+ var/list/snowflake_ears_list = list()
+ for(var/path in GLOB.mam_ears_list)
+ var/datum/sprite_accessory/mam_ears/instance = GLOB.mam_ears_list[path]
+ if(istype(instance, /datum/sprite_accessory))
+ var/datum/sprite_accessory/S = instance
+ if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(user.client.ckey)))
+ snowflake_ears_list[S.name] = path
+ var/new_ears
+ new_ears = input(user, "Choose your character's ears:", "Character Preference") as null|anything in snowflake_ears_list
+ if(new_ears)
+ features["mam_ears"] = new_ears
+
+ if("mam_body_markings")
+ var/list/snowflake_markings_list = list()
+ for(var/path in GLOB.mam_body_markings_list)
+ var/datum/sprite_accessory/mam_body_markings/instance = GLOB.mam_body_markings_list[path]
+ if(istype(instance, /datum/sprite_accessory))
+ var/datum/sprite_accessory/S = instance
+ if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(user.client.ckey)))
+ snowflake_markings_list[S.name] = path
+ var/new_mam_body_markings
+ new_mam_body_markings = input(user, "Choose your character's body markings:", "Character Preference") as null|anything in snowflake_markings_list
+ if(new_mam_body_markings)
+ features["mam_body_markings"] = new_mam_body_markings
+ if(new_mam_body_markings != "None")
+ features["body_markings"] = "None"
+ else if(new_mam_body_markings == "None")
+ features["mam_body_markings"] = "Plain"
+ features["body_markings"] = "None"
+ update_preview_icon()
+
+ //Xeno Bodyparts
+ if("xenohead")//Head or caste type
+ var/new_head
+ new_head = input(user, "Choose your character's caste:", "Character Preference") as null|anything in GLOB.xeno_head_list
+ if(new_head)
+ features["xenohead"] = new_head
+
+ if("xenotail")//Currently one one type, more maybe later if someone sprites them. Might include animated variants in the future.
+ var/new_tail
+ new_tail = input(user, "Choose your character's tail:", "Character Preference") as null|anything in GLOB.xeno_tail_list
+ if(new_tail)
+ features["xenotail"] = new_tail
+ if(new_tail != "None")
+ features["mam_tail"] = "None"
+ features["taur"] = "None"
+ features["tail_human"] = "None"
+ features["tail_lizard"] = "None"
+
+ if("xenodorsal")
+ var/new_dors
+ new_dors = input(user, "Choose your character's dorsal tube type:", "Character Preference") as null|anything in GLOB.xeno_dorsal_list
+ if(new_dors)
+ features["xenodorsal"] = new_dors
+ //Genital code
+ if("cock_color")
+ var/new_cockcolor = input(user, "Penis color:", "Character Preference") as color|null
+ if(new_cockcolor)
+ var/temp_hsv = RGBtoHSV(new_cockcolor)
+ if(new_cockcolor == "#000000")
+ features["cock_color"] = pref_species.default_color
+ else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3])
+ features["cock_color"] = sanitize_hexcolor(new_cockcolor)
+ else
+ user << "Invalid color. Your color is not bright enough."
+
+ if("cock_length")
+ var/new_length = input(user, "Penis length in inches:\n([COCK_SIZE_MIN]-[COCK_SIZE_MAX])", "Character Preference") as num|null
+ if(new_length)
+ features["cock_length"] = max(min( round(text2num(new_length)), COCK_SIZE_MAX),COCK_SIZE_MIN)
+
+ if("cock_shape")
+ var/new_shape
+ new_shape = input(user, "Penis shape:", "Character Preference") as null|anything in GLOB.cock_shapes_list
+ if(new_shape)
+ features["cock_shape"] = new_shape
+
+ if("balls_color")
+ var/new_ballscolor = input(user, "Testicle Color:", "Character Preference") as color|null
+ if(new_ballscolor)
+ var/temp_hsv = RGBtoHSV(new_ballscolor)
+ if(new_ballscolor == "#000000")
+ features["balls_color"] = pref_species.default_color
+ else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3])
+ features["balls_color"] = sanitize_hexcolor(new_ballscolor)
+ else
+ user << "Invalid color. Your color is not bright enough."
+
+ if("egg_size")
+ var/new_size
+ var/list/egg_sizes = list(1,2,3)
+ new_size = input(user, "Egg Diameter(inches):", "Egg Size") as null|anything in egg_sizes
+ if(new_size)
+ features["eggsack_egg_size"] = new_size
+
+ if("egg_color")
+ var/new_egg_color = input(user, "Egg Color:", "Character Preference") as color|null
+ if(new_egg_color)
+ var/temp_hsv = RGBtoHSV(new_egg_color)
+ if(ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3])
+ features["eggsack_egg_color"] = sanitize_hexcolor(new_egg_color)
+ else
+ user << "Invalid color. Your color is not bright enough."
+
+ if("breasts_size")
+ var/new_size
+ new_size = input(user, "Breast Size", "Character Preference") as null|anything in GLOB.breasts_size_list
+ if(new_size)
+ features["breasts_size"] = new_size
+
+ if("breasts_shape")
+ var/new_shape
+ new_shape = input(user, "Breast Shape", "Character Preference") as null|anything in GLOB.breasts_shapes_list
+ if(new_shape)
+ features["breasts_shape"] = new_shape
+
+ if("breasts_color")
+ var/new_breasts_color = input(user, "Breast Color:", "Character Preference") as color|null
+ if(new_breasts_color)
+ var/temp_hsv = RGBtoHSV(new_breasts_color)
+ if(new_breasts_color == "#000000")
+ features["breasts_color"] = pref_species.default_color
+ else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3])
+ features["breasts_color"] = sanitize_hexcolor(new_breasts_color)
+ else
+ user << "Invalid color. Your color is not bright enough."
+
+ if("vag_shape")
+ var/new_shape
+ new_shape = input(user, "Vagina Type", "Character Preference") as null|anything in GLOB.vagina_shapes_list
+ if(new_shape)
+ features["vag_shape"] = new_shape
+
+ if("vag_color")
+ var/new_vagcolor = input(user, "Vagina color:", "Character Preference") as color|null
+ if(new_vagcolor)
+ var/temp_hsv = RGBtoHSV(new_vagcolor)
+ if(new_vagcolor == "#000000")
+ features["vag_color"] = pref_species.default_color
+ else if((MUTCOLORS_PARTSONLY in pref_species.species_traits) || ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3])
+ features["vag_color"] = sanitize_hexcolor(new_vagcolor)
+ else
+ user << "Invalid color. Your color is not bright enough."
+
+ if("ooccolor")
+ var/new_ooccolor = input(user, "Choose your OOC colour:", "Game Preference",ooccolor) as color|null
+ if(new_ooccolor)
+ ooccolor = new_ooccolor
+
+ if("bag")
+ var/new_backbag = input(user, "Choose your character's style of bag:", "Character Preference") as null|anything in GLOB.backbaglist
+ if(new_backbag)
+ backbag = new_backbag
+
+ if("uplink_loc")
+ var/new_loc = input(user, "Choose your character's traitor uplink spawn location:", "Character Preference") as null|anything in GLOB.uplink_spawn_loc_list
+ if(new_loc)
+ uplink_spawn_loc = new_loc
+
+ if("sec_dept")
+ var/department = input(user, "Choose your prefered security department:", "Security Departments") as null|anything in GLOB.security_depts_prefs
+ if(department)
+ prefered_security_department = department
+
+ if ("preferred_map")
+ var/maplist = list()
+ var/default = "Default"
+ if (config.defaultmap)
+ default += " ([config.defaultmap.map_name])"
+ for (var/M in config.maplist)
+ var/datum/map_config/VM = config.maplist[M]
+ var/friendlyname = "[VM.map_name] "
+ if (VM.voteweight <= 0)
+ friendlyname += " (disabled)"
+ maplist[friendlyname] = VM.map_name
+ maplist[default] = null
+ var/pickedmap = input(user, "Choose your preferred map. This will be used to help weight random map selection.", "Character Preference") as null|anything in maplist
+ if (pickedmap)
+ preferred_map = maplist[pickedmap]
+
+ if ("clientfps")
+ var/desiredfps = input(user, "Choose your desired fps. (0 = synced with server tick rate (currently:[world.fps]))", "Character Preference", clientfps) as null|num
+ if (!isnull(desiredfps))
+ clientfps = desiredfps
+ parent.fps = desiredfps
+ if("ui")
+ var/pickedui = input(user, "Choose your UI style.", "Character Preference", UI_style) as null|anything in GLOB.available_ui_styles
+ if(pickedui)
+ UI_style = pickedui
+ if (parent && parent.mob && parent.mob.hud_used)
+ parent.mob.hud_used.update_ui_style(ui_style2icon(UI_style))
+ if("pda_style")
+ var/pickedPDAStyle = input(user, "Choose your PDA style.", "Character Preference", pda_style) as null|anything in GLOB.pda_styles
+ if(pickedPDAStyle)
+ pda_style = pickedPDAStyle
+ if("pda_color")
+ var/pickedPDAColor = input(user, "Choose your PDA Interface color.", "Character Preference",pda_color) as color|null
+ if(pickedPDAColor)
+ pda_color = pickedPDAColor
+
+ else
+ switch(href_list["preference"])
+ //CITADEL PREFERENCES EDIT - I can't figure out how to modularize these, so they have to go here. :c -Pooj
+ if("genital_colour")
+ features["genitals_use_skintone"] = !features["genitals_use_skintone"]
+ if("arousable")
+ arousable = !arousable
+ if("has_cock")
+ features["has_cock"] = !features["has_cock"]
+ if("has_balls")
+ features["has_balls"] = !features["has_balls"]
+ if("has_ovi")
+ features["has_ovi"] = !features["has_ovi"]
+ if("has_eggsack")
+ features["has_eggsack"] = !features["has_eggsack"]
+ if("balls_internal")
+ features["balls_internal"] = !features["balls_internal"]
+ if("eggsack_internal")
+ features["eggsack_internal"] = !features["eggsack_internal"]
+ if("has_breasts")
+ features["has_breasts"] = !features["has_breasts"]
+ if("has_vag")
+ features["has_vag"] = !features["has_vag"]
+ if("has_womb")
+ features["has_womb"] = !features["has_womb"]
+ if("exhibitionist")
+ features["exhibitionist"] = !features["exhibitionist"]
+ if("widescreenpref")
+ widescreenpref = !widescreenpref
+ user.client.change_view(CONFIG_GET(string/default_view))
+ if("autostand")
+ autostand = !autostand
+ if ("screenshake")
+ var/desiredshake = input(user, "Set the amount of screenshake you want. \n(0 = disabled, 100 = full, 200 = maximum.)", "Character Preference", screenshake) as null|num
+ if (!isnull(desiredshake))
+ screenshake = desiredshake
+ if("damagescreenshake")
+ switch(damagescreenshake)
+ if(0)
+ damagescreenshake = 1
+ if(1)
+ damagescreenshake = 2
+ if(2)
+ damagescreenshake = 0
+ else
+ damagescreenshake = 1
+ if("nameless")
+ nameless = !nameless
+ //END CITADEL EDIT
+ if("publicity")
+ if(unlock_content)
+ toggles ^= MEMBER_PUBLIC
+ if("gender")
+ var/chosengender = input(user, "Select your character's gender.", "Gender Selection", gender) in list(MALE,FEMALE,"nonbinary","object")
+ switch(chosengender)
+ if("nonbinary")
+ chosengender = PLURAL
+ if("object")
+ chosengender = NEUTER
+ gender = chosengender
+ facial_hair_style = random_facial_hair_style(gender)
+ hair_style = random_hair_style(gender)
+
+ if("hotkeys")
+ hotkeys = !hotkeys
+ if(hotkeys)
+ winset(user, null, "input.focus=true input.background-color=[COLOR_INPUT_ENABLED] mainwindow.macro=default")
+ else
+ winset(user, null, "input.focus=true input.background-color=[COLOR_INPUT_ENABLED] mainwindow.macro=old_default")
+ if("action_buttons")
+ buttons_locked = !buttons_locked
+ if("tgui_fancy")
+ tgui_fancy = !tgui_fancy
+ if("tgui_lock")
+ tgui_lock = !tgui_lock
+ if("winflash")
+ windowflashing = !windowflashing
+ if("hear_adminhelps")
+ toggles ^= SOUND_ADMINHELP
+ if("announce_login")
+ toggles ^= ANNOUNCE_LOGIN
+ if("combohud_lighting")
+ toggles ^= COMBOHUD_LIGHTING
+
+ if("be_special")
+ var/be_special_type = href_list["be_special_type"]
+ if(be_special_type in be_special)
+ be_special -= be_special_type
+ else
+ be_special += be_special_type
+
+ if("name")
+ be_random_name = !be_random_name
+
+ if("all")
+ be_random_body = !be_random_body
+
+ if("hear_midis")
+ toggles ^= SOUND_MIDI
+
+ if("lobby_music")
+ toggles ^= SOUND_LOBBY
+ if((toggles & SOUND_LOBBY) && user.client && isnewplayer(user))
+ user.client.playtitlemusic()
+ else
+ user.stop_sound_channel(CHANNEL_LOBBYMUSIC)
+
+ if("ghost_ears")
+ chat_toggles ^= CHAT_GHOSTEARS
+
+ if("ghost_sight")
+ chat_toggles ^= CHAT_GHOSTSIGHT
+
+ if("ghost_whispers")
+ chat_toggles ^= CHAT_GHOSTWHISPER
+
+ if("ghost_radio")
+ chat_toggles ^= CHAT_GHOSTRADIO
+
+ if("ghost_pda")
+ chat_toggles ^= CHAT_GHOSTPDA
+
+ if("pull_requests")
+ chat_toggles ^= CHAT_PULLR
+
+ if("allow_midround_antag")
+ toggles ^= MIDROUND_ANTAG
+
+ if("parallaxup")
+ parallax = WRAP(parallax + 1, PARALLAX_INSANE, PARALLAX_DISABLE + 1)
+ if (parent && parent.mob && parent.mob.hud_used)
+ parent.mob.hud_used.update_parallax_pref(parent.mob)
+
+ if("parallaxdown")
+ parallax = WRAP(parallax - 1, PARALLAX_INSANE, PARALLAX_DISABLE + 1)
+ if (parent && parent.mob && parent.mob.hud_used)
+ parent.mob.hud_used.update_parallax_pref(parent.mob)
+
+ // Citadel edit - Prefs don't work outside of this. :c
+ if("hound_sleeper")
+ cit_toggles ^= MEDIHOUND_SLEEPER
+
+ if("toggleeatingnoise")
+ cit_toggles ^= EATING_NOISES
+
+ if("toggledigestionnoise")
+ cit_toggles ^= DIGESTION_NOISES
+ //END CITADEL EDIT
+
+ if("ambientocclusion")
+ ambientocclusion = !ambientocclusion
+ if(parent && parent.screen && parent.screen.len)
+ var/obj/screen/plane_master/game_world/PM = locate(/obj/screen/plane_master/game_world) in parent.screen
+ PM.backdrop(parent.mob)
+
+ if("auto_fit_viewport")
+ auto_fit_viewport = !auto_fit_viewport
+ if(auto_fit_viewport && parent)
+ parent.fit_viewport()
+
+ if("save")
+ save_preferences()
+ save_character()
+
+ if("load")
+ load_preferences()
+ load_character()
+ if(parent && parent.prefs_vr)
+ attempt_vr(parent.prefs_vr,"load_vore","")
+
+ if("changeslot")
+ if(!load_character(text2num(href_list["num"])))
+ random_character()
+ real_name = random_unique_name(gender)
+ save_character()
+ if(parent && parent.prefs_vr)
+ attempt_vr(parent.prefs_vr,"load_vore","")
+
+ if("tab")
+ if (href_list["tab"])
+ current_tab = text2num(href_list["tab"])
+ if(href_list["preference"] == "gear")
+ if(href_list["clear_loadout"])
+ LAZYCLEARLIST(chosen_gear)
+ gear_points = initial(gear_points)
+ save_preferences()
+ if(href_list["select_category"])
+ for(var/i in GLOB.loadout_items)
+ if(i == href_list["select_category"])
+ gear_tab = i
+ if(href_list["toggle_gear_path"])
+ var/datum/gear/G = GLOB.loadout_items[gear_tab][html_decode(href_list["toggle_gear_path"])]
+ if(!G)
+ return
+ var/toggle = text2num(href_list["toggle_gear"])
+ if(!toggle && (G.type in chosen_gear))//toggling off and the item effectively is in chosen gear)
+ LAZYREMOVE(chosen_gear, G.type)
+ gear_points += initial(G.cost)
+ else if(toggle && (!(is_type_in_ref_list(G, chosen_gear))))
+ if(!is_loadout_slot_available(G.category))
+ to_chat(user, "You cannot take this loadout, as you've already chosen too many of the same category!")
+ return
+ if(G.ckeywhitelist && G.ckeywhitelist.len && !(user.ckey in G.ckeywhitelist))
+ to_chat(user, "This is an item intended for donator use only. You are not authorized to use this item.")
+ return
+ if(gear_points >= initial(G.cost))
+ LAZYADD(chosen_gear, G.type)
+ gear_points -= initial(G.cost)
+
+ ShowChoices(user)
+ return 1
+
+/datum/preferences/proc/copy_to(mob/living/carbon/human/character, icon_updates = 1, roundstart_checks = TRUE)
+ if(be_random_name)
+ real_name = pref_species.random_name(gender)
+
+ if(be_random_body)
+ random_character(gender)
+
+ if(roundstart_checks)
+ if(CONFIG_GET(flag/humans_need_surnames) && (pref_species.id == "human"))
+ var/firstspace = findtext(real_name, " ")
+ var/name_length = length(real_name)
+ if(!firstspace) //we need a surname
+ real_name += " [pick(GLOB.last_names)]"
+ else if(firstspace == name_length)
+ real_name += "[pick(GLOB.last_names)]"
+
+ character.real_name = nameless ? "[real_name] #[rand(10000, 99999)]" : real_name
+ character.name = character.real_name
+ character.nameless = nameless
+
+ character.gender = gender
+ character.age = age
+
+ character.eye_color = eye_color
+ var/obj/item/organ/eyes/organ_eyes = character.getorgan(/obj/item/organ/eyes)
+ if(organ_eyes)
+ if(!initial(organ_eyes.eye_color))
+ organ_eyes.eye_color = eye_color
+ organ_eyes.old_eye_color = eye_color
+ character.hair_color = hair_color
+ character.facial_hair_color = facial_hair_color
+
+ character.skin_tone = skin_tone
+ character.hair_style = hair_style
+ character.facial_hair_style = facial_hair_style
+ character.underwear = underwear
+ character.undershirt = undershirt
+ character.socks = socks
+
+ character.backbag = backbag
+
+ var/datum/species/chosen_species
+ if(!roundstart_checks || (pref_species.id in GLOB.roundstart_races))
+ chosen_species = pref_species.type
+ else
+ chosen_species = /datum/species/human
+ pref_species = new /datum/species/human
+ save_character()
+
+ character.set_species(chosen_species, icon_update = FALSE, pref_load = TRUE)
+ character.dna.features = features.Copy()
+ character.dna.real_name = character.real_name
+ character.dna.nameless = character.nameless
+
+ if("tail_lizard" in pref_species.default_features)
+ character.dna.species.mutant_bodyparts |= "tail_lizard"
+ else if("mam_tail" in pref_species.default_features)
+ character.dna.species.mutant_bodyparts |= "mam_tail"
+ else if("xenotail" in pref_species.default_features)
+ character.dna.species.mutant_bodyparts |= "xenotail"
+
+ if("legs" in pref_species.default_features)
+ if(character.dna.features["legs"] == "Digitigrade Legs")
+ pref_species.species_traits += DIGITIGRADE
+ character.Digitigrade_Leg_Swap(FALSE)
+
+ if(character.dna.features["legs"] == "Normal Legs" && DIGITIGRADE in pref_species.species_traits)
+ pref_species.species_traits -= DIGITIGRADE
+ character.Digitigrade_Leg_Swap(TRUE)
+
+ else if((!"legs" in pref_species.default_features) && DIGITIGRADE in pref_species.species_traits)
+ pref_species.species_traits -= DIGITIGRADE
+ character.Digitigrade_Leg_Swap(TRUE)
+
+ if(DIGITIGRADE in pref_species.species_traits)
+ character.Digitigrade_Leg_Swap(FALSE)
+
+ if(icon_updates)
+ character.update_body()
+ character.update_hair()
+ character.update_body_parts()
+
+/datum/preferences/proc/get_default_name(name_id)
+ switch(name_id)
+ if("human")
+ return random_unique_name()
+ if("ai")
+ return pick(GLOB.ai_names)
+ if("cyborg")
+ return DEFAULT_CYBORG_NAME
+ if("clown")
+ return pick(GLOB.clown_names)
+ if("mime")
+ return pick(GLOB.mime_names)
+ return random_unique_name()
+
+/datum/preferences/proc/ask_for_custom_name(mob/user,name_id)
+ var/namedata = GLOB.preferences_custom_names[name_id]
+ if(!namedata)
+ return
+
+ var/raw_name = input(user, "Choose your character's [namedata["qdesc"]]:","Character Preference") as text|null
+ if(!raw_name)
+ if(namedata["allow_null"])
+ custom_names[name_id] = get_default_name(name_id)
+ else
+ return
+ else
+ var/sanitized_name = reject_bad_name(raw_name,namedata["allow_numbers"])
+ if(!sanitized_name)
+ to_chat(user, "Invalid name. Your name should be at least 2 and at most [MAX_NAME_LEN] characters long. It may only contain the characters A-Z, a-z,[namedata["allow_numbers"] ? ",0-9," : ""] -, ' and .")
+ return
+ else
+ custom_names[name_id] = sanitized_name
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index dbf782c5fe..9e19ab65a2 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -235,6 +235,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
//Character
S["real_name"] >> real_name
+ S["nameless"] >> nameless
S["name_is_always_random"] >> be_random_name
S["body_is_always_random"] >> be_random_body
S["gender"] >> gender
@@ -301,6 +302,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["feature_mam_ears"] >> features["mam_ears"]
S["feature_mam_tail_animated"] >> features["mam_tail_animated"]
S["feature_taur"] >> features["taur"]
+ S["feature_mam_snouts"] >> features["mam_snouts"]
//Xeno features
S["feature_xeno_tail"] >> features["xenotail"]
S["feature_xeno_dors"] >> features["xenodorsal"]
@@ -362,6 +364,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
if(!features["mcolor"] || features["mcolor"] == "#000")
features["mcolor"] = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F")
+ nameless = sanitize_integer(nameless, 0, 1, initial(nameless))
be_random_name = sanitize_integer(be_random_name, 0, 1, initial(be_random_name))
be_random_body = sanitize_integer(be_random_body, 0, 1, initial(be_random_body))
@@ -427,6 +430,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
//Character
WRITE_FILE(S["real_name"] , real_name)
+ WRITE_FILE(S["nameless"] , nameless)
WRITE_FILE(S["name_is_always_random"] , be_random_name)
WRITE_FILE(S["body_is_always_random"] , be_random_body)
WRITE_FILE(S["gender"] , gender)
diff --git a/code/modules/client/verbs/aooc.dm b/code/modules/client/verbs/aooc.dm
index 90c0dc5a55..893501a852 100644
--- a/code/modules/client/verbs/aooc.dm
+++ b/code/modules/client/verbs/aooc.dm
@@ -61,7 +61,7 @@
antaglisting |= M.current.client
for(var/mob/M in GLOB.player_list)
- if(M.client && (M.stat == DEAD || M.client.holder))
+ if(M.client && (M.stat == DEAD || M.client.holder) && !istype(M, /mob/dead/new_player))
antaglisting |= M.client
for(var/client/C in antaglisting)
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 1e65c6ca3f..746d5da60d 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -24,6 +24,8 @@
var/can_flashlight = 0
var/scan_reagents = 0 //Can the wearer see reagents while it's equipped?
+ var/blocks_shove_knockdown = FALSE //Whether wearing the clothing item blocks the ability for shove to knock down.
+
var/clothing_flags = NONE
//Var modification - PLEASE be careful with this I know who you are and where you live
diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm
index a5465354ac..7f7b3ae0ed 100644
--- a/code/modules/clothing/glasses/_glasses.dm
+++ b/code/modules/clothing/glasses/_glasses.dm
@@ -67,6 +67,11 @@
user.visible_message("[user] is putting \the [src] to [user.p_their()] eyes and overloading the brightness! It looks like [user.p_theyre()] trying to commit suicide!")
return BRUTELOSS
+/obj/item/clothing/glasses/meson/prescription
+ name = "prescription optical meson scanner"
+ desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting conditions. This one has prescription lens fitted in."
+ vision_correction = 1
+
/obj/item/clothing/glasses/meson/night
name = "night vision meson scanner"
desc = "An optical meson scanner fitted with an amplified visible light spectrum overlay, providing greater visual clarity in darkness."
@@ -159,6 +164,7 @@
attack_verb = list("sliced")
hitsound = 'sound/weapons/bladeslice.ogg'
sharpness = IS_SHARP
+ vision_correction = 1
glass_colour_type = /datum/client_colour/glass_colour/lightgreen
/obj/item/clothing/glasses/regular
diff --git a/code/modules/clothing/glasses/engine_goggles.dm b/code/modules/clothing/glasses/engine_goggles.dm
index 336881106e..47706a3e1e 100644
--- a/code/modules/clothing/glasses/engine_goggles.dm
+++ b/code/modules/clothing/glasses/engine_goggles.dm
@@ -21,6 +21,11 @@
var/mode = MODE_NONE
var/range = 1
+/obj/item/clothing/glasses/meson/engine/prescription
+ name = "prescription engineering scanner goggles"
+ desc = "Goggles used by engineers. The Meson Scanner mode lets you see basic structural and terrain layouts through walls, the T-ray Scanner mode lets you see underfloor objects such as cables and pipes, and the Radiation Scanner mode let's you see objects contaminated by radiation. Each lens has been replaced with a corrective lens."
+ vision_correction = 1
+
/obj/item/clothing/glasses/meson/engine/Initialize()
. = ..()
START_PROCESSING(SSobj, src)
@@ -137,6 +142,11 @@
modes = list(MODE_NONE = MODE_TRAY, MODE_TRAY = MODE_NONE)
+/obj/item/clothing/glasses/meson/engine/tray/prescription
+ name = "prescription optical t-ray scanner"
+ desc = "Goggles used by engineers. The Meson Scanner mode lets you see basic structural and terrain layouts through walls, the T-ray Scanner mode lets you see underfloor objects such as cables and pipes, and the Radiation Scanner mode let's you see objects contaminated by radiation. This one has a lens that help correct eye sight."
+ vision_correction = 1
+
/obj/item/clothing/glasses/meson/engine/shuttle
name = "shuttle region scanner"
icon_state = "trayson-shuttle"
diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index 19bcf470bd..a87e95e28c 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -37,6 +37,14 @@
hud_type = DATA_HUD_MEDICAL_ADVANCED
glass_colour_type = /datum/client_colour/glass_colour/lightblue
+/obj/item/clothing/glasses/hud/health/prescription
+ name = "prescription health scanner HUD"
+ desc = "A heads-up display, made with a prescription lens, that scans the humans in view and provides accurate data about their health status."
+ icon_state = "healthhud"
+ hud_type = DATA_HUD_MEDICAL_ADVANCED
+ vision_correction = 1
+ glass_colour_type = /datum/client_colour/glass_colour/lightblue
+
/obj/item/clothing/glasses/hud/health/night
name = "night vision health scanner HUD"
desc = "An advanced medical head-up display that allows doctors to find patients in complete darkness."
@@ -62,6 +70,14 @@
hud_type = DATA_HUD_DIAGNOSTIC_BASIC
glass_colour_type = /datum/client_colour/glass_colour/lightorange
+/obj/item/clothing/glasses/hud/diagnostic/prescription
+ name = "prescription diagnostic HUD"
+ desc = "A heads-up display capable of analyzing the integrity and status of robotics and exosuits. This one has a prescription lens."
+ icon_state = "diagnostichud"
+ hud_type = DATA_HUD_DIAGNOSTIC_BASIC
+ vision_correction = 1
+ glass_colour_type = /datum/client_colour/glass_colour/lightorange
+
/obj/item/clothing/glasses/hud/diagnostic/night
name = "night vision diagnostic HUD"
desc = "A robotics diagnostic HUD fitted with a light amplifier."
@@ -78,6 +94,14 @@
hud_type = DATA_HUD_SECURITY_ADVANCED
glass_colour_type = /datum/client_colour/glass_colour/red
+/obj/item/clothing/glasses/hud/security/prescription
+ name = "prescription security HUD"
+ desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status and security records. This one has a prescription lens so you can see the banana peal that slipped you."
+ icon_state = "securityhud"
+ hud_type = DATA_HUD_SECURITY_ADVANCED
+ vision_correction = 1
+ glass_colour_type = /datum/client_colour/glass_colour/red
+
/obj/item/clothing/glasses/hud/security/chameleon
name = "chameleon security HUD"
desc = "A stolen security HUD integrated with Syndicate chameleon technology. Provides flash protection."
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 7265800c49..ab9ffb9b18 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -3,7 +3,7 @@
desc = "Standard Security gear. Protects the head from impacts."
icon_state = "helmet"
item_state = "helmet"
- armor = list("melee" = 35, "bullet" = 30, "laser" = 30,"energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+ armor = list("melee" = 40, "bullet" = 30, "laser" = 30,"energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
flags_inv = HIDEEARS
cold_protection = HEAD
min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index ad8fafb872..8b1b1dac25 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -139,7 +139,7 @@
name = "security beret"
desc = "A robust beret with the security insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection."
icon_state = "beret_badge"
- armor = list("melee" = 40, "bullet" = 30, "laser" = 30,"energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 50)
+ armor = list("melee" = 40, "bullet" = 30, "laser" = 30,"energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
strip_delay = 60
dog_fashion = null
@@ -152,7 +152,7 @@
name = "warden's beret"
desc = "A special beret with the Warden's insignia emblazoned on it. For wardens with class."
icon_state = "wardenberet"
- armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 50)
+ armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
strip_delay = 60
/obj/item/clothing/head/beret/sec/navyofficer
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index 89f114f7e5..cd8efd74bf 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -168,6 +168,7 @@ Contains:
strip_delay = 130
item_flags = NODROP
brightness_on = 7
+ resistance_flags = ACID_PROOF
/obj/item/clothing/suit/space/hardsuit/ert
name = "emergency response team suit"
@@ -179,6 +180,7 @@ Contains:
armor = list("melee" = 65, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 80)
slowdown = 0
strip_delay = 130
+ resistance_flags = ACID_PROOF
//ERT Security
/obj/item/clothing/head/helmet/space/hardsuit/ert/sec
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 97c9da289b..b10bf39729 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -110,13 +110,14 @@
/obj/item/clothing/suit/armor/riot
name = "riot suit"
- desc = "A suit of semi-flexible polycarbonate body armor with heavy padding to protect against melee attacks."
+ desc = "A suit of semi-flexible polycarbonate body armor with heavy padding to protect against melee attacks. Helps the wearer resist shoving in close quarters."
icon_state = "riot"
item_state = "swat_suit"
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
armor = list("melee" = 50, "bullet" = 10, "laser" = 10, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80)
+ blocks_shove_knockdown = TRUE
strip_delay = 80
equip_delay_other = 60
diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm
index cbc8f33e3a..6d9a02e05a 100644
--- a/code/modules/clothing/suits/bio.dm
+++ b/code/modules/clothing/suits/bio.dm
@@ -5,7 +5,7 @@
desc = "A hood that protects the head and face from biological contaminants."
permeability_coefficient = 0.01
clothing_flags = THICKMATERIAL | BLOCK_GAS_SMOKE_EFFECT
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 80, "fire" = 30, "acid" = 100)
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 60, "fire" = 30, "acid" = 100)
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR|HIDEFACE
resistance_flags = ACID_PROOF
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
@@ -22,7 +22,7 @@
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
slowdown = 1
allowed = list(/obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/pen, /obj/item/flashlight/pen, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray)
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 80, "fire" = 30, "acid" = 100)
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 60, "fire" = 30, "acid" = 100)
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAUR
strip_delay = 70
equip_delay_other = 70
diff --git a/code/modules/clothing/suits/reactive_armour.dm b/code/modules/clothing/suits/reactive_armour.dm
index 2516d446d6..5b2291e59c 100644
--- a/code/modules/clothing/suits/reactive_armour.dm
+++ b/code/modules/clothing/suits/reactive_armour.dm
@@ -37,6 +37,7 @@
actions_types = list(/datum/action/item_action/toggle)
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
hit_reaction_chance = 50 // Only on the chest yet blocks all attacks?
+ rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE
/obj/item/clothing/suit/armor/reactive/attack_self(mob/user)
active = !(active)
@@ -64,8 +65,9 @@
/obj/item/clothing/suit/armor/reactive/teleport
name = "reactive teleport armor"
desc = "Someone separated our Research Director from his own head!"
- var/tele_range = 6
- var/rad_amount= 15
+ var/tele_range = 8
+ var/rad_amount = 60
+ var/rad_amount_before = 120
reactivearmor_cooldown_duration = 100
/obj/item/clothing/suit/armor/reactive/teleport/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
@@ -79,6 +81,7 @@
owner.visible_message("The reactive teleport system flings [H] clear of [attack_text], shutting itself off in the process!")
playsound(get_turf(owner),'sound/magic/blink.ogg', 100, 1)
var/list/turfs = new/list()
+ var/turf/old = get_turf(src)
for(var/turf/T in orange(tele_range, H))
if(T.density)
continue
@@ -93,7 +96,8 @@
if(!isturf(picked))
return
H.forceMove(picked)
- H.rad_act(rad_amount)
+ radiation_pulse(old, rad_amount_before)
+ radiation_pulse(src, rad_amount)
reactivearmor_cooldown = world.time + reactivearmor_cooldown_duration
return 1
return 0
@@ -157,6 +161,8 @@
var/tesla_power = 25000
var/tesla_range = 20
var/tesla_flags = TESLA_MOB_DAMAGE | TESLA_OBJ_DAMAGE
+ var/legacy = FALSE
+ var/legacy_dmg = 30
/obj/item/clothing/suit/armor/reactive/tesla/dropped(mob/user)
..()
@@ -179,7 +185,15 @@
owner.visible_message("The tesla capacitors on [owner]'s reactive tesla armor are still recharging! The armor merely emits some sparks.")
return
owner.visible_message("[src] blocks [attack_text], sending out arcs of lightning!")
- tesla_zap(owner, tesla_range, tesla_power, tesla_flags)
+ if(!legacy)
+ tesla_zap(owner, tesla_range, tesla_power, tesla_flags)
+ else
+ for(var/mob/living/M in view(7, owner))
+ if(M == owner)
+ continue
+ owner.Beam(M,icon_state="purple_lightning",icon='icons/effects/effects.dmi',time=5)
+ M.adjustFireLoss(legacy_dmg)
+ playsound(M, 'sound/machines/defib_zap.ogg', 50, 1, -1)
reactivearmor_cooldown = world.time + reactivearmor_cooldown_duration
return TRUE
diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm
index 6bf96429b9..396bcb4766 100644
--- a/code/modules/clothing/under/accessories.dm
+++ b/code/modules/clothing/under/accessories.dm
@@ -158,14 +158,14 @@
icon_state = "bronze_heart"
/obj/item/clothing/accessory/medal/engineer
- name = "\"Shift's Best Electrician\" award"
- desc = "An award bestowed upon engineers who have excelled at keeping the station running in the best possible condition against all odds."
- icon_state = "engineer"
+ name = "\"Shift's Best Electrician\" award"
+ desc = "An award bestowed upon engineers who have excelled at keeping the station running in the best possible condition against all odds."
+ icon_state = "engineer"
/obj/item/clothing/accessory/medal/greytide
- name = "\"Greytider of the shift\" award"
- desc = "An award for only the most annoying of assistants. Locked doors mean nothing to you and behaving is not in your vocabulary"
- icon_state = "greytide"
+ name = "\"Greytider of the shift\" award"
+ desc = "An award for only the most annoying of assistants. Locked doors mean nothing to you and behaving is not in your vocabulary"
+ icon_state = "greytide"
/obj/item/clothing/accessory/medal/ribbon
name = "ribbon"
@@ -178,9 +178,9 @@
desc = "An award bestowed only upon those cargotechs who have exhibited devotion to their duty in keeping with the highest traditions of Cargonia."
/obj/item/clothing/accessory/medal/ribbon/medical_doctor
- name = "\"doctor of the shift\" award"
- desc = "An award bestowed only upon the most capable doctors who have upheld the Hippocratic Oath to the best of their ability"
- icon_state = "medical_doctor"
+ name = "\"doctor of the shift\" award"
+ desc = "An award bestowed only upon the most capable doctors who have upheld the Hippocratic Oath to the best of their ability"
+ icon_state = "medical_doctor"
/obj/item/clothing/accessory/medal/silver
name = "silver medal"
@@ -211,6 +211,12 @@
desc = "A golden medal awarded exclusively to those promoted to the rank of captain. It signifies the codified responsibilities of a captain to Nanotrasen, and their undisputable authority over their crew."
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
+/obj/item/clothing/accessory/medal/gold/captain/family
+ name = "old medal of captaincy"
+ desc = "A rustic badge pure gold, has been through hell and back by the looks, the syndcate have been after these by the looks of it for generations..."
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 10) //Pure gold
+ materials = list(MAT_GOLD=2000)
+
/obj/item/clothing/accessory/medal/gold/heroism
name = "medal of exceptional heroism"
desc = "An extremely rare golden medal awarded only by CentCom. To receive such a medal is the highest honor and as such, very few exist. This medal is almost never awarded to anybody but commanders."
@@ -234,8 +240,6 @@
name = "nobel sciences award"
desc = "A plasma medal which represents significant contributions to the field of science or engineering."
-
-
////////////
//Armbands//
////////////
diff --git a/code/modules/clothing/under/vg_under.dm b/code/modules/clothing/under/vg_under.dm
index 64bf75d5ac..f416f2ecc5 100644
--- a/code/modules/clothing/under/vg_under.dm
+++ b/code/modules/clothing/under/vg_under.dm
@@ -1,3 +1,6 @@
+// Fixed to work with Citadel code. Apparently none of them had NO_MUTANTRACE flags.
+// I was pissy when I realised how to fix this because it's so fucking easy and nobody apparently had done it.
+
/obj/item/clothing/under/stripper_pink
name = "pink stripper outfit"
icon_state = "stripper_p"
@@ -6,7 +9,7 @@
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/stripper_green
name = "green stripper outfit"
@@ -16,8 +19,7 @@
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
-
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/wedding/bride_orange
name = "orange wedding dress"
@@ -28,7 +30,7 @@
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/wedding/bride_purple
name = "purple wedding dress"
@@ -39,7 +41,7 @@
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/wedding/bride_blue
name = "blue wedding dress"
@@ -50,7 +52,7 @@
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/wedding/bride_red
name = "red wedding dress"
@@ -61,7 +63,7 @@
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/wedding/bride_white
name = "white wedding dress"
@@ -72,7 +74,7 @@
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/mankini
name = "pink mankini"
@@ -82,6 +84,7 @@
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
/*
/obj/item/clothing/under/psysuit
@@ -126,7 +129,7 @@
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/russobluecamooutfit
name = "russian blue camo"
@@ -137,7 +140,7 @@
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/stilsuit
name = "stillsuit"
@@ -148,7 +151,7 @@
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/aviatoruniform
name = "aviator uniform"
@@ -159,7 +162,7 @@
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/bikersuit
name = "biker's outfit"
@@ -169,7 +172,7 @@
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/jacketsuit
name = "richard's outfit"
@@ -180,7 +183,7 @@
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
obj/item/clothing/under/mega
name = "\improper DRN-001 suit"
@@ -191,7 +194,7 @@ obj/item/clothing/under/mega
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/proto
name = "The Prototype Suit"
@@ -202,7 +205,7 @@ obj/item/clothing/under/mega
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/megax
name = "\improper Maverick Hunter regalia"
@@ -213,7 +216,7 @@ obj/item/clothing/under/mega
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/joe
name = "The Sniper Suit"
@@ -224,7 +227,7 @@ obj/item/clothing/under/mega
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/roll
name = "\improper DRN-002 Dress"
@@ -235,7 +238,7 @@ obj/item/clothing/under/mega
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/gokugidown
name = "turtle hermit undershirt"
@@ -246,7 +249,7 @@ obj/item/clothing/under/mega
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/gokugi
name = "turtle hermit outfit"
@@ -257,7 +260,7 @@ obj/item/clothing/under/mega
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/doomguy
name = "\improper Doomguy's pants"
@@ -268,7 +271,7 @@ obj/item/clothing/under/mega
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/vault13
name = "vault 13 Jumpsuit"
@@ -279,7 +282,7 @@ obj/item/clothing/under/mega
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/vault
name = "vault jumpsuit"
@@ -290,7 +293,7 @@ obj/item/clothing/under/mega
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/clownpiece
name = "Clownpiece's Pierrot suit"
@@ -301,7 +304,7 @@ obj/item/clothing/under/mega
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/cia
name = "casual IAA outfit"
@@ -312,7 +315,7 @@ obj/item/clothing/under/mega
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/greaser
name = "greaser outfit"
@@ -322,7 +325,7 @@ obj/item/clothing/under/mega
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/greaser/New()
var/greaser_colour = "default"
@@ -341,6 +344,8 @@ obj/item/clothing/under/mega
item_color = "greaser_[greaser_colour]"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
+
/obj/item/clothing/under/wintercasualwear
name = "winter casualwear"
@@ -351,8 +356,7 @@ obj/item/clothing/under/mega
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
-
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/casualwear
name = "spring casualwear"
@@ -363,7 +367,7 @@ obj/item/clothing/under/mega
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/keyholesweater
name = "keyhole sweater"
@@ -374,7 +378,7 @@ obj/item/clothing/under/mega
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/casualhoodie
name = "casual hoodie"
@@ -385,8 +389,7 @@ obj/item/clothing/under/mega
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
-
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/under/casualhoodie/skirt
icon_state = "hoodieskirt"
@@ -394,6 +397,8 @@ obj/item/clothing/under/mega
item_color = "hoodieskirt"
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
+
/*
/obj/item/clothing/under/mummy_rags
name = "mummy rags"
@@ -427,3 +432,5 @@ obj/item/clothing/under/mega
can_adjust = 0
icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
+
diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm
index 586819ed8f..750b172286 100644
--- a/code/modules/crafting/recipes.dm
+++ b/code/modules/crafting/recipes.dm
@@ -694,10 +694,18 @@
/obj/item/reagent_containers/food/snacks/grown/potato = 1)
category = CAT_MISC
+/datum/crafting_recipe/paperwork
+ name = "Filed Paper Work"
+ result = /obj/item/paper/fluff/jobs/cargo/manifest/paperwork_correct
+ time = 90 //Takes time for people to file and complete paper work!
+ reqs = list(/obj/item/pen = 1,
+ /obj/item/paper/fluff/jobs/cargo/manifest/paperwork = 2)
+ category = CAT_MISC
+
/datum/crafting_recipe/ghettojetpack
name = "Improvised Jetpack"
result = /obj/item/tank/jetpack/improvised
time = 30
reqs = list(/obj/item/tank/internals/oxygen/red = 2, /obj/item/extinguisher = 1, /obj/item/pipe = 3, /obj/item/stack/cable_coil = 30)//red oxygen tank so it looks right
category = CAT_MISC
- tools = list(TOOL_WRENCH, TOOL_WELDER, TOOL_WIRECUTTER)
\ No newline at end of file
+ tools = list(TOOL_WRENCH, TOOL_WELDER, TOOL_WIRECUTTER)
diff --git a/code/modules/detectivework/detective_work.dm b/code/modules/detectivework/detective_work.dm
index 42d6fcbe1e..c892bfeffc 100644
--- a/code/modules/detectivework/detective_work.dm
+++ b/code/modules/detectivework/detective_work.dm
@@ -93,6 +93,15 @@
else if(length(blood_dna))
AddComponent(/datum/component/forensics, null, null, blood_dna)
bloody_hands = rand(2, 4)
+ if(head)
+ head.add_blood_DNA(blood_dna)
+ update_inv_head()
+ else if(wear_mask)
+ wear_mask.add_blood_DNA(blood_dna)
+ update_inv_wear_mask()
+ if(wear_neck)
+ wear_neck.add_blood_DNA(blood_dna)
+ update_inv_neck()
update_inv_gloves() //handles bloody hands overlays and updating
return TRUE
diff --git a/code/modules/events/brand_intelligence.dm b/code/modules/events/brand_intelligence.dm
index e33cfbd25d..a838b62e0d 100644
--- a/code/modules/events/brand_intelligence.dm
+++ b/code/modules/events/brand_intelligence.dm
@@ -18,7 +18,14 @@
"Your money can buy happiness!", \
"Engage direct marketing!", \
"Advertising is legalized lying! But don't let that put you off our great deals!", \
- "You don't want to buy anything? Yeah, well, I didn't want to buy your mom either.")
+ "You don't want to buy anything? Yeah, well, I didn't want to buy your mom either.",
+ "Gamers, rise up!",
+ "Ok, now, this is epic.",
+ "HUMAN FUNNY.",
+ "But I'm already tracer!",
+ "How do I vore people?",
+ "ERP?",
+ "Not epic bros...")
/datum/round_event/brand_intelligence/announce(fake)
diff --git a/code/modules/events/devil.dm b/code/modules/events/devil.dm
index 3760cbe05d..7d6e0bd441 100644
--- a/code/modules/events/devil.dm
+++ b/code/modules/events/devil.dm
@@ -39,6 +39,7 @@
var/datum/job/jobdatum = SSjob.GetJob("Assistant")
devil.job = jobdatum.title
jobdatum.equip(devil)
+ success_spawn = TRUE
return SUCCESSFUL_SPAWN
diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm
index ba57643339..3ae71f99d8 100644
--- a/code/modules/events/ion_storm.dm
+++ b/code/modules/events/ion_storm.dm
@@ -12,7 +12,7 @@
var/removeDontImproveChance = 10 //chance the randomly created law replaces a random law instead of simply being added
var/shuffleLawsChance = 10 //chance the AI's laws are shuffled afterwards
var/botEmagChance = 10
- var/announceEvent = ION_RANDOM // -1 means don't announce, 0 means have it randomly announce, 1 means
+ var/announceEvent = ION_RANDOM // -1 means don't announce, 0 means have it randomly announce, 1 means it is announced
var/ionMessage = null
var/ionAnnounceChance = 33
announceWhen = 1
@@ -30,7 +30,7 @@
/datum/round_event/ion_storm/start()
- //AI laws
+ //Generate AI law change
for(var/mob/living/silicon/ai/M in GLOB.alive_mob_list)
M.laws_sanity_check()
if(M.stat != DEAD && M.see_in_dark != 0)
@@ -53,6 +53,31 @@
log_game("Ion storm changed laws of [key_name(M)] to [english_list(M.laws.get_law_list(TRUE, TRUE))]")
M.post_lawchange()
+ //Generate Cyborg law change
+ for(var/mob/living/silicon/robot/M in GLOB.alive_mob_list)
+ M.laws_sanity_check()
+ if(M.stat != DEAD && M.see_in_dark != 0)
+ if(prob(replaceLawsetChance))
+ M.laws.pick_weighted_lawset()
+
+ if(prob(removeRandomLawChance))
+ M.remove_law(rand(1, M.laws.get_law_amount(list(LAW_INHERENT, LAW_SUPPLIED))))
+
+ var/message = ionMessage || generate_ion_law()
+ if(message)
+ if(prob(removeDontImproveChance))
+ M.replace_random_law(message, list(LAW_INHERENT, LAW_SUPPLIED, LAW_ION))
+ else
+ M.add_ion_law(message)
+
+ if(prob(shuffleLawsChance))
+ M.shuffle_laws(list(LAW_INHERENT, LAW_SUPPLIED, LAW_ION))
+
+ log_game("Ion storm changed laws of [key_name(M)] to [english_list(M.laws.get_law_list(TRUE, TRUE))]")
+ M.post_lawchange()
+
+
+ //Chance to emag a Bot
if(botEmagChance)
for(var/mob/living/simple_animal/bot/bot in GLOB.alive_mob_list)
if(prob(botEmagChance))
diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm
index 160304b1c3..3945a12a40 100644
--- a/code/modules/events/vent_clog.dm
+++ b/code/modules/events/vent_clog.dm
@@ -79,12 +79,28 @@
typepath = /datum/round_event/vent_clog/beer
max_occurrences = 0
+/datum/round_event/vent_clog/beer
+ reagentsAmount = 100
+
/datum/round_event_control/vent_clog/plasma_decon
name = "Plasma decontamination"
typepath = /datum/round_event/vent_clog/plasma_decon
max_occurrences = 0
-/datum/round_event/vent_clog/beer
+/datum/round_event_control/vent_clog/female
+ name = "FemCum stationwide"
+ typepath = /datum/round_event/vent_clog/female
+ max_occurrences = 0
+
+/datum/round_event/vent_clog/female
+ reagentsAmount = 100
+
+/datum/round_event_control/vent_clog/male
+ name = "Semen stationwide"
+ typepath = /datum/round_event/vent_clog/male
+ max_occurrences = 0
+
+/datum/round_event/vent_clog/male
reagentsAmount = 100
/datum/round_event/vent_clog/beer/announce()
@@ -102,6 +118,30 @@
foam.start()
CHECK_TICK
+/datum/round_event/vent_clog/male/start()
+ for(var/obj/machinery/atmospherics/components/unary/vent in vents)
+ if(vent && vent.loc)
+ var/datum/reagents/R = new/datum/reagents(1000)
+ R.my_atom = vent
+ R.add_reagent("semen", reagentsAmount)
+
+ var/datum/effect_system/foam_spread/foam = new
+ foam.set_up(200, get_turf(vent), R)
+ foam.start()
+ CHECK_TICK
+
+/datum/round_event/vent_clog/female/start()
+ for(var/obj/machinery/atmospherics/components/unary/vent in vents)
+ if(vent && vent.loc)
+ var/datum/reagents/R = new/datum/reagents(1000)
+ R.my_atom = vent
+ R.add_reagent("femcum", reagentsAmount)
+
+ var/datum/effect_system/foam_spread/foam = new
+ foam.set_up(200, get_turf(vent), R)
+ foam.start()
+ CHECK_TICK
+
/datum/round_event/vent_clog/plasma_decon/announce()
priority_announce("We are deploying an experimental plasma decontamination system. Please stand away from the vents and do not breathe the smoke that comes out.", "Central Command Update")
diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
index 9256f5bdd1..6594146e81 100644
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -120,6 +120,12 @@
I.SwapColor(rgb(255, 0, 220, 255), rgb(0, 0, 0, 0))
B.icon = I
B.name = "broken [name]"
+ if(ranged)
+ var/matrix/M = matrix(B.transform)
+ M.Turn(rand(-170, 170))
+ B.transform = M
+ B.pixel_x = rand(-12, 12)
+ B.pixel_y = rand(-12, 12)
if(prob(33))
new/obj/item/shard(drop_location())
playsound(src, "shatter", 70, 1)
@@ -296,6 +302,12 @@
B.force = 0
B.throwforce = 0
B.desc = "A carton with the bottom half burst open. Might give you a papercut."
+ if(ranged)
+ var/matrix/M = matrix(B.transform)
+ M.Turn(rand(-170, 170))
+ B.transform = M
+ B.pixel_x = rand(-12, 12)
+ B.pixel_y = rand(-12, 12)
transfer_fingerprints_to(B)
qdel(src)
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index 3bc7443a9b..46e637e640 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -23,6 +23,12 @@
var/obj/item/broken_bottle/B = new (loc)
if(!ranged)
thrower.put_in_hands(B)
+ else
+ var/matrix/M = matrix(B.transform)
+ M.Turn(rand(-170, 170))
+ B.transform = M
+ B.pixel_x = rand(-12, 12)
+ B.pixel_y = rand(-12, 12)
B.icon_state = icon_state
var/icon/I = new('icons/obj/drinks.dmi', src.icon_state)
diff --git a/code/modules/food_and_drinks/food/snacks_bread.dm b/code/modules/food_and_drinks/food/snacks_bread.dm
index 0638bfad25..0f11fc8ed2 100644
--- a/code/modules/food_and_drinks/food/snacks_bread.dm
+++ b/code/modules/food_and_drinks/food/snacks_bread.dm
@@ -185,6 +185,17 @@
icon_state = ""
bitesize = 2
+GLOBAL_VAR_INIT(frying_hardmode, TRUE)
+GLOBAL_VAR_INIT(frying_bad_chem_add_volume, TRUE)
+GLOBAL_LIST_INIT(frying_bad_chems, list(
+"bad_food" = 10,
+"clf3" = 2,
+"aranesp" = 2,
+"blackpowder" = 10,
+"phlogiston" = 3,
+"cyanide" = 3,
+))
+
/obj/item/reagent_containers/food/snacks/deepfryholder/Initialize(mapload, obj/item/fried)
. = ..()
name = fried.name //We'll determine the other stuff when it's actually removed
@@ -210,6 +221,13 @@
else
fried.forceMove(src)
trash = fried
+ if(!istype(fried, /obj/item/reagent_containers/food) && GLOB.frying_hardmode && GLOB.frying_bad_chems.len)
+ var/R = rand(1, GLOB.frying_bad_chems.len)
+ var/bad_chem = GLOB.frying_bad_chems[R]
+ var/bad_chem_amount = GLOB.frying_bad_chems[bad_chem]
+ if(GLOB.frying_bad_chem_add_volume)
+ reagents.maximum_volume += bad_chem_amount
+ reagents.add_reagent(bad_chem, bad_chem_amount)
/obj/item/reagent_containers/food/snacks/deepfryholder/Destroy()
if(trash)
diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm
index a2f5b06042..af7a8c06f4 100644
--- a/code/modules/food_and_drinks/food/snacks_other.dm
+++ b/code/modules/food_and_drinks/food/snacks_other.dm
@@ -563,9 +563,9 @@
/obj/item/reagent_containers/food/snacks/tinychocolate
name = "chocolate"
- desc = "A tiny and sweet chocolate."
+ desc = "A tiny and sweet chocolate. Has a 'strawberry' filling!"
icon_state = "tiny_chocolate"
- list_reagents = list("nutriment" = 1, "sugar" = 1, "cocoa" = 1)
+ list_reagents = list("nutriment" = 1, "sugar" = 1, "cocoa" = 1, "aphro" = 1)
filling_color = "#A0522D"
tastes = list("chocolate" = 1)
- foodtype = JUNKFOOD | SUGAR
\ No newline at end of file
+ foodtype = JUNKFOOD | SUGAR
diff --git a/code/modules/food_and_drinks/food/snacks_pastry.dm b/code/modules/food_and_drinks/food/snacks_pastry.dm
index 8574933bda..435b4a371a 100644
--- a/code/modules/food_and_drinks/food/snacks_pastry.dm
+++ b/code/modules/food_and_drinks/food/snacks_pastry.dm
@@ -89,13 +89,24 @@
icon_state = "jdonut1"
extra_reagent = "cherryjelly"
foodtype = JUNKFOOD | GRAIN | FRIED | FRUIT
-
+
/obj/item/reagent_containers/food/snacks/donut/meat
bonus_reagents = list("ketchup" = 1)
list_reagents = list("nutriment" = 3, "ketchup" = 2)
tastes = list("meat" = 1)
foodtype = JUNKFOOD | MEAT | GROSS | FRIED
-
+
+/obj/item/reagent_containers/food/snacks/donut/semen
+ name = "\"cream\" donut"
+ desc = "That cream looks a little runny..."
+ icon_state = "donut3"
+ bitesize = 10
+ bonus_reagents = list("semen" = 1)
+ list_reagents = list("nutriment" = 3, "sugar" = 2, "semen" = 5)
+ filling_color = "#FFFFFF"
+ tastes = list("donut" = 1, "salt" = 3)
+ foodtype = JUNKFOOD | GRAIN | FRIED | SUGAR
+
////////////////////////////////////////////MUFFINS////////////////////////////////////////////
diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm
index 3592f5a437..02106e808c 100644
--- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm
+++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm
@@ -1,6 +1,5 @@
////////////////////////////////////////// COCKTAILS //////////////////////////////////////
-
/datum/chemical_reaction/goldschlager
name = "Goldschlager"
id = "goldschlager"
@@ -676,7 +675,6 @@
results = list("fernet_cola" = 2)
required_reagents = list("fernet" = 1, "cola" = 1)
-
/datum/chemical_reaction/fanciulli
name = "Fanciulli"
id = "fanciulli"
@@ -688,3 +686,9 @@
id = "branca_menta"
results = list("branca_menta" = 3)
required_reagents = list("fernet" = 1, "creme_de_menthe" = 1, "ice" = 1)
+
+/datum/chemical_reaction/pwrgame
+ name = "Power Gamer"
+ id = "pwr_game"
+ results = list("pwr_game" = 5)
+ required_reagents = list("sodawater" = 1, "blackcrayonpowder" = 1, "sodiumchloride" = 1)
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm
index e751bf887e..4b76ca120b 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm
@@ -23,6 +23,16 @@
result = /obj/item/reagent_containers/food/snacks/donut
subcategory = CAT_PASTRY
+/datum/crafting_recipe/food/donut
+ time = 15
+ name = "Semen donut"
+ reqs = list(
+ /datum/reagent/consumable/semen = 10,
+ /obj/item/reagent_containers/food/snacks/pastrybase = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/donut/semen
+ subcategory = CAT_PASTRY
+
datum/crafting_recipe/food/donut/meat
time = 15
name = "Meat donut"
diff --git a/code/modules/holodeck/turfs.dm b/code/modules/holodeck/turfs.dm
index 2a36983561..a4c89b8874 100644
--- a/code/modules/holodeck/turfs.dm
+++ b/code/modules/holodeck/turfs.dm
@@ -122,7 +122,7 @@
/turf/open/floor/holofloor/wood
icon_state = "wood"
tiled_dirt = FALSE
-
+
/turf/open/floor/holofloor/snow
gender = PLURAL
name = "snow"
@@ -133,6 +133,15 @@
bullet_sizzle = TRUE
bullet_bounce_sound = null
tiled_dirt = FALSE
+ baseturfs = /turf/open/floor/holofloor/snow
+
+/turf/open/floor/holofloor/snow/attack_hand(mob/living/user)
+ . = ..()
+ if(.)
+ return
+ user.visible_message("[user] scroops up some snow from [src].", "You scoop up some snow from [src].")
+ var/obj/item/toy/snowball/S = new(get_turf(src))
+ user.put_in_hands(S)
/turf/open/floor/holofloor/snow/cold
initial_gas_mix = "nob=7500;TEMP=2.7"
@@ -143,3 +152,22 @@
icon = 'icons/turf/floors.dmi'
icon_state = "asteroid"
tiled_dirt = FALSE
+
+/turf/open/floor/holofloor/ice
+ name = "ice sheet"
+ desc = "A sheet of solid ice. Looks slippery."
+ icon = 'icons/turf/floors/ice_turf.dmi'
+ icon_state = "unsmooth"
+ baseturfs = /turf/open/floor/holofloor/ice
+ slowdown = 1
+ footstep = FOOTSTEP_FLOOR
+
+/turf/open/floor/holofloor/ice/smooth
+ icon_state = "smooth"
+ smooth = SMOOTH_MORE | SMOOTH_BORDER
+ canSmoothWith = list(/turf/open/floor/plating/ice/smooth, /turf/open/floor/plating/ice, /turf/open/floor/holofloor/ice)
+ baseturfs = /turf/open/floor/holofloor/ice/smooth
+
+/turf/open/floor/holofloor/ice/Initialize()
+ . = ..()
+ MakeSlippery(TURF_WET_PERMAFROST, INFINITY, 0, INFINITY, TRUE)
diff --git a/code/modules/hydroponics/grown/tomato.dm b/code/modules/hydroponics/grown/tomato.dm
index 5a44cb78f8..d07f5d4d08 100644
--- a/code/modules/hydroponics/grown/tomato.dm
+++ b/code/modules/hydroponics/grown/tomato.dm
@@ -136,7 +136,7 @@
spawn(30)
if(!QDELETED(src))
- investigate_log(INVESTIGATE_BOTANY, "[key_name(user)] released a killer tomato at [COORD(src)]")
+ investigate_log("[key_name(user)] released a killer tomato at [COORD(src)]", INVESTIGATE_BOTANY)
var/mob/living/simple_animal/hostile/killertomato/K = new /mob/living/simple_animal/hostile/killertomato(get_turf(src.loc))
K.maxHealth += round(seed.endurance / 3)
K.melee_damage_lower += round(seed.potency / 10)
diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm
index e3ca576944..1ea0068a1a 100644
--- a/code/modules/hydroponics/hydroitemdefines.dm
+++ b/code/modules/hydroponics/hydroitemdefines.dm
@@ -24,10 +24,7 @@
lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/hydroponics_righthand.dmi'
volume = 100
-
-/obj/item/reagent_containers/spray/weedspray/Initialize()
- . = ..()
- reagents.add_reagent("weedkiller", 100)
+ list_reagents = list("weedkiller" = 100)
/obj/item/reagent_containers/spray/weedspray/suicide_act(mob/user)
user.visible_message("[user] is huffing [src]! It looks like [user.p_theyre()] trying to commit suicide!")
@@ -42,10 +39,7 @@
lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/hydroponics_righthand.dmi'
volume = 100
-
-/obj/item/reagent_containers/spray/pestspray/Initialize()
- . = ..()
- reagents.add_reagent("pestkiller", 100)
+ list_reagents = list("pestkiller" = 100)
/obj/item/reagent_containers/spray/pestspray/suicide_act(mob/user)
user.visible_message("[user] is huffing [src]! It looks like [user.p_theyre()] trying to commit suicide!")
@@ -157,71 +151,45 @@
/obj/item/reagent_containers/glass/bottle/nutrient
name = "bottle of nutrient"
- icon = 'icons/obj/chemical.dmi'
volume = 50
- w_class = WEIGHT_CLASS_TINY
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(1,2,5,10,15,25,50)
/obj/item/reagent_containers/glass/bottle/nutrient/Initialize()
. = ..()
- src.pixel_x = rand(-5, 5)
- src.pixel_y = rand(-5, 5)
+ pixel_x = rand(-5, 5)
+ pixel_y = rand(-5, 5)
/obj/item/reagent_containers/glass/bottle/nutrient/ez
name = "bottle of E-Z-Nutrient"
desc = "Contains a fertilizer that causes mild mutations with each harvest."
- icon = 'icons/obj/chemical.dmi'
-
-/obj/item/reagent_containers/glass/bottle/nutrient/ez/Initialize()
- . = ..()
- reagents.add_reagent("eznutriment", 50)
+ list_reagents = list("eznutriment" = 50)
/obj/item/reagent_containers/glass/bottle/nutrient/l4z
name = "bottle of Left 4 Zed"
desc = "Contains a fertilizer that limits plant yields to no more than one and causes significant mutations in plants."
- icon = 'icons/obj/chemical.dmi'
-
-/obj/item/reagent_containers/glass/bottle/nutrient/l4z/Initialize()
- . = ..()
- reagents.add_reagent("left4zednutriment", 50)
+ list_reagents = list("left4zednutriment" = 50)
/obj/item/reagent_containers/glass/bottle/nutrient/rh
name = "bottle of Robust Harvest"
desc = "Contains a fertilizer that increases the yield of a plant by 30% while causing no mutations."
- icon = 'icons/obj/chemical.dmi'
-
-/obj/item/reagent_containers/glass/bottle/nutrient/rh/Initialize()
- . = ..()
- reagents.add_reagent("robustharvestnutriment", 50)
+ list_reagents = list("robustharvestnutriment" = 50)
/obj/item/reagent_containers/glass/bottle/nutrient/empty
name = "bottle"
- icon = 'icons/obj/chemical.dmi'
/obj/item/reagent_containers/glass/bottle/killer
- name = "bottle"
- icon = 'icons/obj/chemical.dmi'
volume = 50
- w_class = WEIGHT_CLASS_TINY
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(1,2,5,10,15,25,50)
/obj/item/reagent_containers/glass/bottle/killer/weedkiller
name = "bottle of weed killer"
desc = "Contains a herbicide."
- icon = 'icons/obj/chemical.dmi'
-
-/obj/item/reagent_containers/glass/bottle/killer/weedkiller/Initialize()
- . = ..()
- reagents.add_reagent("weedkiller", 50)
+ list_reagents = list("weedkiller" = 50)
/obj/item/reagent_containers/glass/bottle/killer/pestkiller
name = "bottle of pest spray"
desc = "Contains a pesticide."
- icon = 'icons/obj/chemical.dmi'
-
-/obj/item/reagent_containers/glass/bottle/killer/pestkiller/Initialize()
- . = ..()
- reagents.add_reagent("pestkiller", 50)
+ list_reagents = list("pestkiller" = 50)
\ No newline at end of file
diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm
index 94cf27749e..cd9c914e7a 100755
--- a/code/modules/jobs/job_types/captain.dm
+++ b/code/modules/jobs/job_types/captain.dm
@@ -26,7 +26,7 @@ Captain
/datum/job/captain/announce(mob/living/carbon/human/H)
..()
- SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, .proc/minor_announce, "Captain [H.real_name] on deck!"))
+ SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, .proc/minor_announce, "Captain [H.nameless ? "" : "[H.real_name] "]on deck!"))
/datum/outfit/job/captain
name = "Captain"
diff --git a/code/modules/jobs/job_types/job.dm b/code/modules/jobs/job_types/job.dm
index 16e1ccdfb7..e441b3e889 100644
--- a/code/modules/jobs/job_types/job.dm
+++ b/code/modules/jobs/job_types/job.dm
@@ -127,6 +127,8 @@
return 0
if(!CONFIG_GET(flag/use_age_restriction_for_jobs))
return 0
+ if(C.prefs.db_flags & DB_FLAG_EXEMPT)
+ return 0
if(!isnum(C.player_age))
return 0 //This is only a number if the db connection is established, otherwise it is text: "Requires database", meaning these restrictions cannot be enforced
if(!isnum(minimal_player_age))
@@ -191,6 +193,12 @@
if(!J)
J = SSjob.GetJob(H.job)
+ if(H.nameless && J.dresscodecompliant)
+ if(J.title in GLOB.command_positions)
+ H.real_name = J.title
+ else
+ H.real_name = "[J.title] #[rand(10000, 99999)]"
+
var/obj/item/card/id/C = H.wear_id
if(istype(C))
C.access = J.get_access()
diff --git a/code/modules/mapping/space_management/space_reservation.dm b/code/modules/mapping/space_management/space_reservation.dm
index f1b3b1ccdc..43fe69d633 100644
--- a/code/modules/mapping/space_management/space_reservation.dm
+++ b/code/modules/mapping/space_management/space_reservation.dm
@@ -9,9 +9,11 @@
var/top_right_coords[3]
var/wipe_reservation_on_release = TRUE
var/turf_type = /turf/open/space
+ var/borderturf
/datum/turf_reservation/transit
turf_type = /turf/open/space/transit
+ borderturf = /turf/open/space/transit/border
/datum/turf_reservation/proc/Release()
var/v = reserved_turfs.Copy()
@@ -20,6 +22,12 @@
SSmapping.used_turfs -= i
SSmapping.reserve_turfs(v)
+/datum/turf_reservation/transit/Release()
+ for(var/turf/open/space/transit/T in reserved_turfs)
+ for(var/atom/movable/AM in T)
+ T.throw_atom(AM)
+ . = ..()
+
/datum/turf_reservation/proc/Reserve(width, height, zlevel)
if(width > world.maxx || height > world.maxy || width < 1 || height < 1)
return FALSE
@@ -60,7 +68,10 @@
T.flags_1 &= ~UNUSED_RESERVATION_TURF_1
SSmapping.unused_turfs["[T.z]"] -= T
SSmapping.used_turfs[T] = src
- T.ChangeTurf(turf_type, turf_type)
+ if(borderturf && (T.x == BL.x || T.x == TR.x || T.y == BL.y || T.y == TR.y))
+ T.ChangeTurf(borderturf, borderturf)
+ else
+ T.ChangeTurf(turf_type, turf_type)
src.width = width
src.height = height
return TRUE
diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm
index 2e695e6772..b8195e23d9 100644
--- a/code/modules/mining/equipment/kinetic_crusher.dm
+++ b/code/modules/mining/equipment/kinetic_crusher.dm
@@ -239,10 +239,10 @@
if(ishostile(target))
var/mob/living/simple_animal/hostile/H = target
if(H.ranged) //briefly delay ranged attacks
- if(H.ranged_cooldown_time >= world.time)
- H.ranged_cooldown_time += bonus_value
+ if(H.ranged_cooldown >= world.time)
+ H.ranged_cooldown += bonus_value
else
- H.ranged_cooldown_time = bonus_value + world.time
+ H.ranged_cooldown = bonus_value + world.time
//magmawing watcher
/obj/item/crusher_trophy/blaster_tubes/magma_wing
diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm
index ca1fd7f9bb..7276039443 100644
--- a/code/modules/mining/machine_vending.dm
+++ b/code/modules/mining/machine_vending.dm
@@ -11,6 +11,7 @@
var/obj/item/card/id/inserted_id
var/list/prize_list = list( //if you add something to this, please, for the love of god, sort it by price/type. use tabs and not spaces.
new /datum/data/mining_equipment("1 Marker Beacon", /obj/item/stack/marker_beacon, 10),
+ new /datum/data/mining_equipment("50 Point Transfer Card", /obj/item/card/mining_point_card, 50),
new /datum/data/mining_equipment("10 Marker Beacons", /obj/item/stack/marker_beacon/ten, 100),
new /datum/data/mining_equipment("30 Marker Beacons", /obj/item/stack/marker_beacon/thirty, 300),
new /datum/data/mining_equipment("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 100),
@@ -19,26 +20,31 @@
new /datum/data/mining_equipment("Soap", /obj/item/soap/nanotrasen, 200),
new /datum/data/mining_equipment("Laser Pointer", /obj/item/laser_pointer, 300),
new /datum/data/mining_equipment("Alien Toy", /obj/item/clothing/mask/facehugger/toy, 300),
- new /datum/data/mining_equipment("Stabilizing Serum", /obj/item/hivelordstabilizer, 400),
new /datum/data/mining_equipment("Fulton Beacon", /obj/item/fulton_core, 400),
new /datum/data/mining_equipment("Shelter Capsule", /obj/item/survivalcapsule, 400),
new /datum/data/mining_equipment("GAR Meson Scanners", /obj/item/clothing/glasses/meson/gar, 500),
new /datum/data/mining_equipment("Explorer's Webbing", /obj/item/storage/belt/mining, 500),
- new /datum/data/mining_equipment("Point Transfer Card", /obj/item/card/mining_point_card, 500),
- new /datum/data/mining_equipment("Survival Medipen", /obj/item/reagent_containers/hypospray/medipen/survival, 500),
+ new /datum/data/mining_equipment("500 Point Transfer Card", /obj/item/card/mining_point_card/mp500, 500),
+ new /datum/data/mining_equipment("Brute First-Aid Kit", /obj/item/storage/firstaid/brute, 600),
new /datum/data/mining_equipment("Tracking Implant Kit", /obj/item/storage/box/minertracker, 600),
+ new /datum/data/mining_equipment("Survival Medipen", /obj/item/reagent_containers/hypospray/medipen/survival, 750),
+ new /datum/data/mining_equipment("Stabilizing Serum", /obj/item/hivelordstabilizer, 750),
new /datum/data/mining_equipment("Jaunter", /obj/item/wormhole_jaunter, 750),
new /datum/data/mining_equipment("Kinetic Crusher", /obj/item/twohanded/required/kinetic_crusher, 750),
new /datum/data/mining_equipment("Kinetic Accelerator", /obj/item/gun/energy/kinetic_accelerator, 750),
new /datum/data/mining_equipment("Brute First-Aid Kit", /obj/item/storage/firstaid/brute, 800),
new /datum/data/mining_equipment("Burn First-Aid Kit", /obj/item/storage/firstaid/fire, 800),
- new /datum/data/mining_equipment("First-Aid Kit", /obj/item/storage/firstaid/regular, 800),
+ new /datum/data/mining_equipment("First-Aid Kit", /obj/item/storage/firstaid/regular, 800),
new /datum/data/mining_equipment("Advanced Scanner", /obj/item/t_scanner/adv_mining_scanner, 800),
new /datum/data/mining_equipment("Resonator", /obj/item/resonator, 800),
+ new /datum/data/mining_equipment("Mini Extinguisher", /obj/item/extinguisher/mini, 1000),
new /datum/data/mining_equipment("Fulton Pack", /obj/item/extraction_pack, 1000),
new /datum/data/mining_equipment("Lazarus Injector", /obj/item/lazarus_injector, 1000),
new /datum/data/mining_equipment("Silver Pickaxe", /obj/item/pickaxe/silver, 1000),
new /datum/data/mining_equipment("Mining Conscription Kit", /obj/item/storage/backpack/duffelbag/mining_conscript, 1000),
+ new /datum/data/mining_equipment("1000 Point Transfer Card", /obj/item/card/mining_point_card/mp1000, 1000),
+ new /datum/data/mining_equipment("1500 Point Transfer Card", /obj/item/card/mining_point_card/mp1500, 1500),
+ new /datum/data/mining_equipment("2000 Point Transfer Card", /obj/item/card/mining_point_card/mp2000, 2000),
new /datum/data/mining_equipment("Jetpack Upgrade", /obj/item/tank/jetpack/suit, 2000),
new /datum/data/mining_equipment("Space Cash", /obj/item/stack/spacecash/c1000, 2000),
new /datum/data/mining_equipment("Mining Hardsuit", /obj/item/clothing/suit/space/hardsuit/mining, 2000),
@@ -243,12 +249,30 @@
w_class = WEIGHT_CLASS_TINY
/**********************Mining Point Card**********************/
-
+//mp = Miner Pointers
+//c = Cash
+//TODO add in cr = Credits for cargo
/obj/item/card/mining_point_card
name = "mining points card"
- desc = "A small card preloaded with mining points. Swipe your ID card over it to transfer the points, then discard."
+ desc = "A small card preloaded with mining points. Swipe your ID card over it to transfer the points, then discard. This one only holds a small 50 points on it."
icon_state = "data_1"
- var/points = 500
+ var/points = 50
+
+/obj/item/card/mining_point_card/mp500
+ desc = "A small card preloaded with 500 mining points. Swipe your ID card over it to transfer the points, then discard."
+ points = 500
+
+/obj/item/card/mining_point_card/mp1000
+ desc = "A small card preloaded with 1000 mining points. Swipe your ID card over it to transfer the points, then discard."
+ points = 1000
+
+/obj/item/card/mining_point_card/mp1500
+ desc = "A small card preloaded with 1500 mining points. Swipe your ID card over it to transfer the points, then discard."
+ points = 1500
+
+/obj/item/card/mining_point_card/mp2000
+ desc = "A small card preloaded with 2000 mining points. Swipe your ID card over it to transfer the points, then discard."
+ points = 2000
/obj/item/card/mining_point_card/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/card/id))
@@ -315,4 +339,4 @@
new /obj/item/clothing/mask/gas/seva(drop_location)
SSblackbox.record_feedback("tally", "suit_voucher_redeemed", 1, selection)
- qdel(voucher)
\ No newline at end of file
+ qdel(voucher)
diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm
index 746b87e434..84be6438c0 100644
--- a/code/modules/mob/dead/new_player/new_player.dm
+++ b/code/modules/mob/dead/new_player/new_player.dm
@@ -33,7 +33,8 @@
return
/mob/dead/new_player/proc/new_player_panel()
- var/output = "Setup Character "
+ var/output = "Welcome, [client ? client.prefs.real_name : "Unknown User"] "
+ output += "Setup Character "
if(SSticker.current_state <= GAME_STATE_PREGAME)
switch(ready)
@@ -441,58 +442,87 @@
var/available_job_count = 0
for(var/datum/job/job in SSjob.occupations)
if(job && IsJobUnavailable(job.title, TRUE) == JOB_AVAILABLE)
- available_job_count++;
+ available_job_count++
for(var/spawner in GLOB.mob_spawners)
available_job_count++
+ break
- for(var/datum/job/prioritized_job in SSjob.prioritized_jobs)
- if(prioritized_job.current_positions >= prioritized_job.total_positions)
- SSjob.prioritized_jobs -= prioritized_job
+ if(!available_job_count)
+ dat += "There are currently no open positions! "
- if(length(SSjob.prioritized_jobs))
- dat += "The station has flagged these jobs as high priority:
"
- var/amt = length(SSjob.prioritized_jobs)
- var/amt_count
- for(var/datum/job/a in SSjob.prioritized_jobs)
- amt_count++
- if(amt_count != amt) // checks for the last job added.
- dat += " [a.title], "
- else
- dat += " [a.title]. "
+ else
+ dat += "Choose from the following open positions:
"
+ var/list/categorizedJobs = list(
+ "Command" = list(jobs = list(), titles = GLOB.command_positions, color = "#aac1ee"),
+ "Engineering" = list(jobs = list(), titles = GLOB.engineering_positions, color = "#ffd699"),
+ "Supply" = list(jobs = list(), titles = GLOB.supply_positions, color = "#ead4ae"),
+ "Miscellaneous" = list(jobs = list(), titles = list(), color = "#ffffff", colBreak = TRUE),
+ "Ghost Role" = list(jobs = list(), titles = GLOB.mob_spawners, color = "#ffffff"),
+ "Synthetic" = list(jobs = list(), titles = GLOB.nonhuman_positions, color = "#ccffcc"),
+ "Service" = list(jobs = list(), titles = GLOB.civilian_positions, color = "#cccccc"),
+ "Medical" = list(jobs = list(), titles = GLOB.medical_positions, color = "#99ffe6", colBreak = TRUE),
+ "Science" = list(jobs = list(), titles = GLOB.science_positions, color = "#e6b3e6"),
+ "Security" = list(jobs = list(), titles = GLOB.security_positions, color = "#ff9999"),
+ )
+ for(var/spawner in GLOB.mob_spawners)
+ categorizedJobs["Ghost Role"]["jobs"] += spawner
- dat += "Choose from the following open positions:
"
- dat += "(G) - Ghost Role
"
- dat += ""
- var/job_count = 0
- for(var/datum/job/job in SSjob.occupations)
- if(job && IsJobUnavailable(job.title, TRUE) == JOB_AVAILABLE)
- job_count++;
- if (job_count > round(available_job_count / 2))
- dat += " "
- var/position_class = "otherPosition"
- if (job.title in GLOB.command_positions)
- position_class = "commandPosition"
- dat += " [job.title] ([job.current_positions])"
- if(!job_count) //if there's nowhere to go, overflow opens up.
for(var/datum/job/job in SSjob.occupations)
- if(job.title != SSjob.overflow_role)
+ if(job && IsJobUnavailable(job.title, TRUE) == JOB_AVAILABLE)
+ var/categorized = FALSE
+ for(var/jobcat in categorizedJobs)
+ var/list/jobs = categorizedJobs[jobcat]["jobs"]
+ if(job.title in categorizedJobs[jobcat]["titles"])
+ categorized = TRUE
+ if(jobcat == "Command")
+
+ if(job.title == "Captain") // Put captain at top of command jobs
+ jobs.Insert(1, job)
+ else
+ jobs += job
+ else // Put heads at top of non-command jobs
+ if(job.title in GLOB.command_positions)
+ jobs.Insert(1, job)
+ else
+ jobs += job
+ if(!categorized)
+ categorizedJobs["Miscellaneous"]["jobs"] += job
+
+
+ dat += " | "
+ for(var/jobcat in categorizedJobs)
+ if(categorizedJobs[jobcat]["colBreak"])
+ dat += " | "
+ if(!length(categorizedJobs[jobcat]["jobs"]))
continue
- dat += "[job.title] ([job.current_positions])
"
- break
- for(var/spawner in GLOB.mob_spawners)
- job_count++
- if(job_count > round(available_job_count / 2))
- dat += "[spawner] (G)
"
- dat += ""
+ var/color = categorizedJobs[jobcat]["color"]
+ dat += "
"
+ dat += " |
"
+ dat += " | 