cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 05:27:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

New vending machine, enabling Ian clothes, bug fixes, map update

Browse Source
This commit is contained in:
ZomgPonies
2013-09-28 01:38:18 -04:00
parent 853d490660
commit 78f14f11cc
24 changed files with 1970 additions and 1825 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences.dm
+24 -4
View File
@@ -258,7 +258,7 @@ datum/preferences
dat += "Secondary Language:<br><a href='byond://?src=\ref[user];preference=language;task=input'>[language]</a><br>"
dat += "Blood Type: <a href='byond://?src=\ref[user];preference=b_type;task=input'>[b_type]</a><br>"
dat += "Skin Tone: <a href='?_src_=prefs;preference=s_tone;task=input'>[-s_tone + 35]/220<br></a>"
dat += "Skin pattern: <a href='byond://?src=\ref[user];preference=skin_style;task=input'>Adjust</a><br>"
// dat += "Skin pattern: <a href='byond://?src=\ref[user];preference=skin_style;task=input'>Adjust</a><br>"
dat += "<br><b>Handicaps</b><br>"
dat += "\t<a href='byond://?src=\ref[user];task=input;preference=disabilities'><b>\[Set Disabilities\]</b></a><br>"
dat += "\tLimbs: <a href='byond://?src=\ref[user];preference=limbs;task=input'>Adjust</a><br>"
@@ -292,6 +292,13 @@ datum/preferences
if(ind > 1)
dat += ", "
dat += "\tMechanical [organ_name] prothesis"
else if(status == "peg")
++ind
if(ind > 1)
dat += ", "
dat += "\tWooden [organ_name] prothesis"
else if(status == "amputated")
++ind
if(ind > 1)
@@ -1024,13 +1031,16 @@ datum/preferences
var/limb = null
var/second_limb = null // if you try to change the arm, the hand should also change
var/third_limb = null // if you try to unchange the hand, the arm should also change
var/valid_limb_states=list("Normal","Amputated","Prothesis")
switch(limb_name)
if("Left Leg")
limb = "l_leg"
second_limb = "l_foot"
valid_limb_states += "Peg Leg"
if("Right Leg")
limb = "r_leg"
second_limb = "r_foot"
valid_limb_states += "Peg Leg"
if("Left Arm")
limb = "l_arm"
second_limb = "l_hand"
@@ -1050,7 +1060,7 @@ datum/preferences
limb = "r_hand"
third_limb = "r_arm"
var/new_state = input(user, "What state do you wish the limb to be in?") as null|anything in list("Normal","Amputated","Prothesis")
var/new_state = input(user, "What state do you wish the limb to be in?") as null|anything in valid_limb_states
if(!new_state) return
switch(new_state)
@@ -1066,11 +1076,15 @@ datum/preferences
organ_data[limb] = "cyborg"
if(second_limb)
organ_data[second_limb] = "cyborg"
if("Peg Leg")
organ_data[limb] = "peg"
if(second_limb)
organ_data[second_limb] = "amputated"
/*
if("skin_style")
var/skin_style_name = input(user, "Select a new skin style") as null|anything in list("default1", "default2", "default3")
if(!skin_style_name) return
*/
else
switch(href_list["preference"])
if("gender")
@@ -1190,11 +1204,17 @@ datum/preferences
var/status = organ_data[name]
if(status == "amputated")
O.status &= ~ORGAN_ROBOT
O.status &= ~ORGAN_PEG
O.amputated = 1
O.status |= ORGAN_DESTROYED
O.destspawn = 1
else if(status == "cyborg")
O.status &= ~ORGAN_PEG
O.status |= ORGAN_ROBOT
else if(status == "peg")
O.status &= ~ORGAN_ROBOT
O.status |= ORGAN_PEG
if(disabilities & DISABILITY_FLAG_FAT && species=="Human")//character.species.flags & CAN_BE_FAT)
character.mutations += FAT