diff --git a/code/modules/organs/robolimbs_vr.dm b/code/modules/organs/robolimbs_vr.dm index fd0a8b230c..a777b6d1bc 100644 --- a/code/modules/organs/robolimbs_vr.dm +++ b/code/modules/organs/robolimbs_vr.dm @@ -17,6 +17,13 @@ var/const/cyberbeast_monitor_styles = "blank=cyber_blank;\ idle=cyber_idle;\ nwn=cyber_nwn" +// Placeholder for protean limbs during character spawning, before they have a properly set model +/datum/robolimb/protean + company = "protean" + desc = "Nano-y!" + lifelike = 1 + unavailable_to_build = 1 + //////////////// For-specific-character fluff ones ///////////////// // arokha : Aronai Sieyes /datum/robolimb/kitsuhana @@ -63,7 +70,7 @@ var/const/cyberbeast_monitor_styles = "blank=cyber_blank;\ //Ported from CitRP /datum/robolimb/cyber_beast - company = "Cyber Tech(Protogen analogue)" //CHOMPEdit + company = "Cyber Tech" desc = "Adjusted for deep space, the material is durable and heavy." icon = 'icons/mob/human_races/cyberlimbs/c-tech/c_beast.dmi' unavailable_to_build = 1 @@ -72,4 +79,4 @@ var/const/cyberbeast_monitor_styles = "blank=cyber_blank;\ monitor_styles = cyberbeast_monitor_styles /obj/item/weapon/disk/limb/cyber_beast - company = "Cyber Tech" + company = "Cyber Tech" \ No newline at end of file diff --git a/code/modules/organs/subtypes/nano.dm b/code/modules/organs/subtypes/nano.dm index de89fef1d5..f00a1763ed 100644 --- a/code/modules/organs/subtypes/nano.dm +++ b/code/modules/organs/subtypes/nano.dm @@ -5,66 +5,77 @@ max_damage = 50 // <-- This is different from the rest min_broken_damage = 1000 vital = TRUE // <-- This is different from the rest + model = "protean" /obj/item/organ/external/groin/unbreakable/nano robotic = ORGAN_NANOFORM encased = FALSE max_damage = 30 // <-- This is different from the rest min_broken_damage = 1000 //Multiple vital = FALSE + model = "protean" /obj/item/organ/external/head/unbreakable/nano robotic = ORGAN_NANOFORM encased = FALSE max_damage = 30 min_broken_damage = 1000 //Inheritance vital = FALSE + model = "protean" /obj/item/organ/external/arm/unbreakable/nano robotic = ORGAN_NANOFORM encased = FALSE max_damage = 20 min_broken_damage = 1000 //Please vital = FALSE + model = "protean" /obj/item/organ/external/arm/right/unbreakable/nano robotic = ORGAN_NANOFORM encased = FALSE max_damage = 20 min_broken_damage = 1000 vital = FALSE + model = "protean" /obj/item/organ/external/leg/unbreakable/nano robotic = ORGAN_NANOFORM encased = FALSE max_damage = 20 min_broken_damage = 1000 vital = FALSE + model = "protean" /obj/item/organ/external/leg/right/unbreakable/nano robotic = ORGAN_NANOFORM encased = FALSE max_damage = 20 min_broken_damage = 1000 vital = FALSE + model = "protean" /obj/item/organ/external/hand/unbreakable/nano robotic = ORGAN_NANOFORM encased = FALSE max_damage = 20 min_broken_damage = 1000 vital = FALSE + model = "protean" /obj/item/organ/external/hand/right/unbreakable/nano robotic = ORGAN_NANOFORM encased = FALSE max_damage = 20 min_broken_damage = 1000 vital = FALSE + model = "protean" /obj/item/organ/external/foot/unbreakable/nano robotic = ORGAN_NANOFORM encased = FALSE max_damage = 20 min_broken_damage = 1000 vital = FALSE + model = "protean" /obj/item/organ/external/foot/right/unbreakable/nano robotic = ORGAN_NANOFORM encased = FALSE max_damage = 20 min_broken_damage = 1000 vital = FALSE + model = "protean" // // // Internal Organs /obj/item/organ/internal/nano @@ -175,4 +186,4 @@ /obj/item/device/mmi/digital/posibrain/nano/transfer_identity() . = ..() - icon_state = "posi1" + icon_state = "posi1" \ No newline at end of file