cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-25 05:51:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Splits organs into organ/internal (#7441)

Browse Source
This commit is contained in:
Matt Atlas
2019-11-20 23:07:10 +01:00
committed by Werner
parent 60b60b9c0a
commit 5da2a9c24b
233 changed files with 1635 additions and 1427 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/general/03_body.dm
+40 -40
View File
@@ -210,31 +210,31 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
var/status = pref.organ_data[name]
var/organ_name = null
switch(name)
if("l_arm")
if(BP_L_ARM)
organ_name = "left arm"
if("r_arm")
if(BP_R_ARM)
organ_name = "right arm"
if("l_leg")
if(BP_L_LEG)
organ_name = "left leg"
if("r_leg")
if(BP_R_LEG)
organ_name = "right leg"
if("l_foot")
if(BP_L_FOOT)
organ_name = "left foot"
if("r_foot")
if(BP_R_FOOT)
organ_name = "right foot"
if("l_hand")
if(BP_L_HAND)
organ_name = "left hand"
if("r_hand")
if(BP_R_HAND)
organ_name = "right hand"
if("groin")
if(BP_GROIN)
organ_name = "lower body"
if("chest")
if(BP_CHEST)
organ_name = "upper body"
if("head")
if(BP_HEAD)
organ_name = "head"
if("heart")
if(BP_HEART)
organ_name = "heart"
if("eyes")
if(BP_EYES)
organ_name = "eyes"
if(status == "cyborg")
@@ -262,11 +262,11 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
if(ind > 1)
out += ", "
switch(organ_name)
if("heart")
if(BP_HEART)
out += "\tPacemaker-assisted [organ_name]"
if("voicebox") //on adding voiceboxes for speaking skrell/similar replacements
out += "\tSurgically altered [organ_name]"
if("eyes")
if(BP_EYES)
out += "\tRetinal overlayed [organ_name]"
else
out += "\tMechanically assisted [organ_name]"
@@ -538,37 +538,37 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
var/third_limb = null // if you try to unchange the hand, the arm should also change
switch(limb_name)
if("Left Leg")
limb = "l_leg"
second_limb = "l_foot"
limb = BP_L_LEG
second_limb = BP_L_FOOT
if("Right Leg")
limb = "r_leg"
second_limb = "r_foot"
limb = BP_R_LEG
second_limb = BP_R_FOOT
if("Left Arm")
limb = "l_arm"
second_limb = "l_hand"
limb = BP_L_ARM
second_limb = BP_L_HAND
if("Right Arm")
limb = "r_arm"
second_limb = "r_hand"
limb = BP_R_ARM
second_limb = BP_R_HAND
if("Left Foot")
limb = "l_foot"
third_limb = "l_leg"
limb = BP_L_FOOT
third_limb = BP_L_LEG
if("Right Foot")
limb = "r_foot"
third_limb = "r_leg"
limb = BP_R_FOOT
third_limb = BP_R_LEG
if("Left Hand")
limb = "l_hand"
third_limb = "l_arm"
limb = BP_L_HAND
third_limb = BP_L_ARM
if("Right Hand")
limb = "r_hand"
third_limb = "r_arm"
limb = BP_R_HAND
third_limb = BP_R_ARM
if("Lower Body")
limb = "groin"
limb = BP_GROIN
carries_organs = 1
if("Upper Body")
limb = "chest"
limb = BP_CHEST
carries_organs = 1
if("Head")
limb = "head"
if(BP_HEAD)
limb = BP_HEAD
carries_organs = 1
else
to_chat(user, "<span class='notice'>Cancelled.</span>")
@@ -617,15 +617,15 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
return TOPIC_REFRESH
else if(href_list["organs"])
var/organ_name = input(user, "Which internal function do you want to change?") as null|anything in list("Heart", "Eyes")
var/organ_name = input(user, "Which internal function do you want to change?") as null|anything in list(BP_HEART, BP_EYES)
if(!organ_name) return
var/organ = null
switch(organ_name)
if("Heart")
organ = "heart"
if("Eyes")
organ = "eyes"
if(BP_HEART)
organ = BP_HEART
if(BP_EYES)
organ = BP_EYES
var/new_state = input(user, "What state do you wish the organ to be in?") as null|anything in list("Normal","Assisted","Mechanical")
if(!new_state) return
code/modules/client/preference_setup/general/06_flavor.dm
+8 -8
View File
@@ -4,9 +4,9 @@
/datum/category_item/player_setup_item/general/flavor/load_character(var/savefile/S)
S["flavor_texts_general"] >> pref.flavor_texts["general"]
S["flavor_texts_head"] >> pref.flavor_texts["head"]
S["flavor_texts_head"] >> pref.flavor_texts[BP_HEAD]
S["flavor_texts_face"] >> pref.flavor_texts["face"]
S["flavor_texts_eyes"] >> pref.flavor_texts["eyes"]
S["flavor_texts_eyes"] >> pref.flavor_texts[BP_EYES]
S["flavor_texts_torso"] >> pref.flavor_texts["torso"]
S["flavor_texts_arms"] >> pref.flavor_texts["arms"]
S["flavor_texts_hands"] >> pref.flavor_texts["hands"]
@@ -23,9 +23,9 @@
/datum/category_item/player_setup_item/general/flavor/save_character(var/savefile/S)
S["flavor_texts_general"] << pref.flavor_texts["general"]
S["flavor_texts_head"] << pref.flavor_texts["head"]
S["flavor_texts_head"] << pref.flavor_texts[BP_HEAD]
S["flavor_texts_face"] << pref.flavor_texts["face"]
S["flavor_texts_eyes"] << pref.flavor_texts["eyes"]
S["flavor_texts_eyes"] << pref.flavor_texts[BP_EYES]
S["flavor_texts_torso"] << pref.flavor_texts["torso"]
S["flavor_texts_arms"] << pref.flavor_texts["arms"]
S["flavor_texts_hands"] << pref.flavor_texts["hands"]
@@ -94,9 +94,9 @@
var/list/var_list = list(
"char_id" = pref.current_character,
"flavour_general" = pref.flavor_texts["general"],
"flavour_head" = pref.flavor_texts["head"],
"flavour_head" = pref.flavor_texts[BP_HEAD],
"flavour_face" = pref.flavor_texts["face"],
"flavour_eyes" = pref.flavor_texts["eyes"],
"flavour_eyes" = pref.flavor_texts[BP_EYES],
"flavour_torso" = pref.flavor_texts["torso"],
"flavour_arms" = pref.flavor_texts["arms"],
"flavour_hands" = pref.flavor_texts["hands"],
@@ -219,13 +219,13 @@
HTML += TextPreview(pref.flavor_texts["general"])
HTML += "<br>"
HTML += "<a href='?src=\ref[src];flavor_text=head'>Head:</a> "
HTML += TextPreview(pref.flavor_texts["head"])
HTML += TextPreview(pref.flavor_texts[BP_HEAD])
HTML += "<br>"
HTML += "<a href='?src=\ref[src];flavor_text=face'>Face:</a> "
HTML += TextPreview(pref.flavor_texts["face"])
HTML += "<br>"
HTML += "<a href='?src=\ref[src];flavor_text=eyes'>Eyes:</a> "
HTML += TextPreview(pref.flavor_texts["eyes"])
HTML += TextPreview(pref.flavor_texts[BP_EYES])
HTML += "<br>"
HTML += "<a href='?src=\ref[src];flavor_text=torso'>Body:</a> "
HTML += TextPreview(pref.flavor_texts["torso"])