Merge pull request #731 from Zuhayr/ipcscreen

Display monitors and manufacturer fixes.
This commit is contained in:
Datraen
2016-01-07 12:34:03 -05:00
8 changed files with 93 additions and 76 deletions
@@ -358,6 +358,8 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
var/datum/species/current_species = all_species[pref.species]
if(!current_species.has_organ["brain"])
limb_selection_list -= "Full Body"
else if(pref.organ_data[BP_TORSO] == "cyborg")
limb_selection_list |= "Head"
var/organ_tag = input(user, "Which limb do you want to change?") as null|anything in limb_selection_list
@@ -394,6 +396,9 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
if("Right Hand")
limb = BP_R_HAND
third_limb = BP_R_ARM
if("Head")
limb = BP_HEAD
choice_options = list("Prothesis")
if("Full Body")
limb = BP_TORSO
third_limb = BP_GROIN
+1 -1
View File
@@ -310,7 +310,7 @@ datum/preferences
character.used_skillpoints = used_skillpoints
// Destroy/cyborgize organs and limbs.
for(var/name in BP_ALL)
for(var/name in list(BP_HEAD, BP_L_HAND, BP_R_HAND, BP_L_ARM, BP_R_ARM, BP_L_FOOT, BP_R_FOOT, BP_L_LEG, BP_R_LEG, BP_GROIN, BP_TORSO))
var/status = organ_data[name]
var/obj/item/organ/external/O = character.organs_by_name[name]
if(O)
+4
View File
@@ -345,6 +345,10 @@ var/global/list/gear_datums = list()
display_name = "bandana, red"
path = /obj/item/clothing/mask/bandana/red
/datum/gear/bandanamask/ipc_monitor
display_name = "display monitor (prosthetic head only)"
path = /obj/item/clothing/mask/monitor
/datum/gear/sterilemask
display_name = "sterile mask"
path = /obj/item/clothing/mask/surgical