cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-22 08:01:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Mechfabs not dispensing synthskin limbs (#10709)

Browse Source 
title
note that this also makes all ipc limbs a subset of external/[organ_type]/ipc now
fixes #10707
This commit is contained in:
Wildkins
2020-12-06 07:43:29 -05:00
committed by GitHub
parent 0f8e20ad0f
commit bc2ada79bd
6 changed files with 176 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/game/machinery/mecha_fabricator.dm
View File

@@ -99,10 +99,10 @@
data["buildable"] = get_build_options()
data["category"] = category
data["categories"] = categories
if(fabricator_robolimbs )
if(fabricator_robolimbs)
var/list/T = list()
for(var/A in fabricator_robolimbs )
var/datum/robolimb/R = fabricator_robolimbs [A]
for(var/A in fabricator_robolimbs)
var/datum/robolimb/R = fabricator_robolimbs[A]
T += list(list("id" = A, "company" = R.company))
data["manufacturers"] = T
data["manufacturer"] = manufacturer
@@ -135,7 +135,7 @@
category = href_list["category"]
if(href_list["manufacturer"])
if(href_list["manufacturer"] in fabricator_robolimbs )
if(href_list["manufacturer"] in fabricator_robolimbs)
manufacturer = href_list["manufacturer"]
if(href_list["eject"])
@@ -392,4 +392,4 @@
files.AddTech2Known(T)
files.RefreshResearch()
sync_message = "Sync complete."
update_categories()
update_categories()

156
code/modules/mob/living/carbon/human/species/station/ipc/ipc_subspecies.dm
View File

@@ -47,17 +47,17 @@
appearance_flags = HAS_HAIR_COLOR | HAS_SKIN_TONE | HAS_EYE_COLOR | HAS_FBP | HAS_SKIN_PRESET | HAS_UNDERWEAR | HAS_SOCKS | HAS_LIPS
has_limbs = list(
BP_CHEST = list("path" = /obj/item/organ/external/chest/shell),
BP_GROIN = list("path" = /obj/item/organ/external/groin/shell),
BP_HEAD = list("path" = /obj/item/organ/external/head/shell),
BP_L_ARM = list("path" = /obj/item/organ/external/arm/shell),
BP_R_ARM = list("path" = /obj/item/organ/external/arm/right/shell),
BP_L_LEG = list("path" = /obj/item/organ/external/leg/shell),
BP_R_LEG = list("path" = /obj/item/organ/external/leg/right/shell),
BP_L_HAND = list("path" = /obj/item/organ/external/hand/shell),
BP_R_HAND = list("path" = /obj/item/organ/external/hand/right/shell),
BP_L_FOOT = list("path" = /obj/item/organ/external/foot/shell),
BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right/shell)
BP_CHEST = list("path" = /obj/item/organ/external/chest/ipc/shell),
BP_GROIN = list("path" = /obj/item/organ/external/groin/ipc/shell),
BP_HEAD = list("path" = /obj/item/organ/external/head/ipc/shell),
BP_L_ARM = list("path" = /obj/item/organ/external/arm/ipc/shell),
BP_R_ARM = list("path" = /obj/item/organ/external/arm/right/ipc/shell),
BP_L_LEG = list("path" = /obj/item/organ/external/leg/ipc/shell),
BP_R_LEG = list("path" = /obj/item/organ/external/leg/right/ipc/shell),
BP_L_HAND = list("path" = /obj/item/organ/external/hand/ipc/shell),
BP_R_HAND = list("path" = /obj/item/organ/external/hand/right/ipc/shell),
BP_L_FOOT = list("path" = /obj/item/organ/external/foot/ipc/shell),
BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right/ipc/shell)
)
base_color = "#25032"
@@ -140,17 +140,17 @@
show_ssd = "completely quiescent"
has_limbs = list(
BP_CHEST = list("path" = /obj/item/organ/external/chest/industrial),
BP_GROIN = list("path" = /obj/item/organ/external/groin/industrial),
BP_HEAD = list("path" = /obj/item/organ/external/head/industrial),
BP_L_ARM = list("path" = /obj/item/organ/external/arm/industrial),
BP_R_ARM = list("path" = /obj/item/organ/external/arm/right/industrial),
BP_L_LEG = list("path" = /obj/item/organ/external/leg/industrial),
BP_R_LEG = list("path" = /obj/item/organ/external/leg/right/industrial),
BP_L_HAND = list("path" = /obj/item/organ/external/hand/industrial),
BP_R_HAND = list("path" = /obj/item/organ/external/hand/right/industrial),
BP_L_FOOT = list("path" = /obj/item/organ/external/foot/industrial),
BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right/industrial)
BP_CHEST = list("path" = /obj/item/organ/external/chest/ipc/industrial),
BP_GROIN = list("path" = /obj/item/organ/external/groin/ipc/industrial),
BP_HEAD = list("path" = /obj/item/organ/external/head/ipc/industrial),
BP_L_ARM = list("path" = /obj/item/organ/external/arm/ipc/industrial),
BP_R_ARM = list("path" = /obj/item/organ/external/arm/right/ipc/industrial),
BP_L_LEG = list("path" = /obj/item/organ/external/leg/ipc/industrial),
BP_R_LEG = list("path" = /obj/item/organ/external/leg/right/ipc/industrial),
BP_L_HAND = list("path" = /obj/item/organ/external/hand/ipc/industrial),
BP_R_HAND = list("path" = /obj/item/organ/external/hand/right/ipc/industrial),
BP_L_FOOT = list("path" = /obj/item/organ/external/foot/ipc/industrial),
BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right/ipc/industrial)
)
flags = IS_IPC | ACCEPTS_COOLER
@@ -322,17 +322,17 @@
blurb = "An extremely durable and heavy Industrial model branded by Hephaestus Industries. It is their improved Industrial model, with thicker plating and improved power cell. Its actuators struggle to carry the immense weight, however, making the unit quite slow. This chassis would be seen in roles where it would be dangerous or inefficient to use a less durable unit, such as engineering, security, and mining. While this unit still possesses built-in cooling conduits, the increased plating and thickness of said plating proved a difficult challenge for the engineers to develop good cooling, so the unit suffers somewhat from increased heat loads. Overtaxing its hardware will quickly lead to overheating."
has_limbs = list(
BP_CHEST = list("path" = /obj/item/organ/external/chest/industrial/hephaestus),
BP_GROIN = list("path" = /obj/item/organ/external/groin/industrial/hephaestus),
BP_HEAD = list("path" = /obj/item/organ/external/head/industrial/hephaestus),
BP_L_ARM = list("path" = /obj/item/organ/external/arm/industrial/hephaestus),
BP_R_ARM = list("path" = /obj/item/organ/external/arm/right/industrial/hephaestus),
BP_L_LEG = list("path" = /obj/item/organ/external/leg/industrial/hephaestus),
BP_R_LEG = list("path" = /obj/item/organ/external/leg/right/industrial/hephaestus),
BP_L_HAND = list("path" = /obj/item/organ/external/hand/industrial/hephaestus),
BP_R_HAND = list("path" = /obj/item/organ/external/hand/right/industrial/hephaestus),
BP_L_FOOT = list("path" = /obj/item/organ/external/foot/industrial/hephaestus),
BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right/industrial/hephaestus)
BP_CHEST = list("path" = /obj/item/organ/external/chest/ipc/industrial/hephaestus),
BP_GROIN = list("path" = /obj/item/organ/external/groin/ipc/industrial/hephaestus),
BP_HEAD = list("path" = /obj/item/organ/external/head/ipc/industrial/hephaestus),
BP_L_ARM = list("path" = /obj/item/organ/external/arm/ipc/industrial/hephaestus),
BP_R_ARM = list("path" = /obj/item/organ/external/arm/right/ipc/industrial/hephaestus),
BP_L_LEG = list("path" = /obj/item/organ/external/leg/ipc/industrial/hephaestus),
BP_R_LEG = list("path" = /obj/item/organ/external/leg/right/ipc/industrial/hephaestus),
BP_L_HAND = list("path" = /obj/item/organ/external/hand/ipc/industrial/hephaestus),
BP_R_HAND = list("path" = /obj/item/organ/external/hand/right/ipc/industrial/hephaestus),
BP_L_FOOT = list("path" = /obj/item/organ/external/foot/ipc/industrial/hephaestus),
BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right/ipc/industrial/hephaestus)
)
/datum/species/machine/industrial/hephaestus/get_light_color(mob/living/carbon/human/H)
@@ -371,17 +371,17 @@
blurb = "The Xion Manufacturing Group, being a subsidiary of Hephaestus Industries, saw the original Industrial models and wanted to develop their own chassis based off of the original design. The result is the Xion Industrial model. Sturdy and strong, this chassis is quite powerful and equally durable, with an ample power cell and improved actuators for carrying the increased weight of the body. The Xion model also retains sturdiness without covering the chassis in plating, allowing for the cooling systems to vent heat much easier than the Hephaestus-brand model. This unit can perform EVA without assistance."
has_limbs = list(
BP_CHEST = list("path" = /obj/item/organ/external/chest/industrial/xion),
BP_GROIN = list("path" = /obj/item/organ/external/groin/industrial/xion),
BP_HEAD = list("path" = /obj/item/organ/external/head/industrial/xion),
BP_L_ARM = list("path" = /obj/item/organ/external/arm/industrial/xion),
BP_R_ARM = list("path" = /obj/item/organ/external/arm/right/industrial/xion),
BP_L_LEG = list("path" = /obj/item/organ/external/leg/industrial/xion),
BP_R_LEG = list("path" = /obj/item/organ/external/leg/right/industrial/xion),
BP_L_HAND = list("path" = /obj/item/organ/external/hand/industrial/xion),
BP_R_HAND = list("path" = /obj/item/organ/external/hand/right/industrial/xion),
BP_L_FOOT = list("path" = /obj/item/organ/external/foot/industrial/xion),
BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right/industrial/xion)
BP_CHEST = list("path" = /obj/item/organ/external/chest/ipc/industrial/xion),
BP_GROIN = list("path" = /obj/item/organ/external/groin/ipc/industrial/xion),
BP_HEAD = list("path" = /obj/item/organ/external/head/ipc/industrial/xion),
BP_L_ARM = list("path" = /obj/item/organ/external/arm/ipc/industrial/xion),
BP_R_ARM = list("path" = /obj/item/organ/external/arm/right/ipc/industrial/xion),
BP_L_LEG = list("path" = /obj/item/organ/external/leg/ipc/industrial/xion),
BP_R_LEG = list("path" = /obj/item/organ/external/leg/right/ipc/industrial/xion),
BP_L_HAND = list("path" = /obj/item/organ/external/hand/ipc/industrial/xion),
BP_R_HAND = list("path" = /obj/item/organ/external/hand/right/ipc/industrial/xion),
BP_L_FOOT = list("path" = /obj/item/organ/external/foot/ipc/industrial/xion),
BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right/ipc/industrial/xion)
)
/datum/species/machine/industrial/xion/remote
@@ -426,17 +426,17 @@
blurb = "Being a corporation focused primarily on medical sciences and treatments, Zeng-Hu Pharmaceuticals had little interest in the market of synthetics in the beginning (especially considering a good portion of Zeng-Hu employees are Skrellian). However, after seeing the advances in almost all fields of the galactic market after the advent of synthetics, Zeng-Hu set aside some funds for their own robotics department, focused mainly on medical service and even science related operations. Having taken some inspiration from biological life, the chassis has an interesting leg design: digitigrade legs provide the chassis with enhanced speed. A downside to this development was the reduction of metals on the chassis. Most plates covering the sensitive interior electronics are polymer casts to reduce the weight of the unit, resulting in a not-so-durable android."
has_limbs = list(
BP_CHEST = list("path" = /obj/item/organ/external/chest/industrial/zenghu),
BP_GROIN = list("path" = /obj/item/organ/external/groin/industrial/zenghu),
BP_HEAD = list("path" = /obj/item/organ/external/head/industrial/zenghu),
BP_L_ARM = list("path" = /obj/item/organ/external/arm/industrial/zenghu),
BP_R_ARM = list("path" = /obj/item/organ/external/arm/right/industrial/zenghu),
BP_L_LEG = list("path" = /obj/item/organ/external/leg/industrial/zenghu),
BP_R_LEG = list("path" = /obj/item/organ/external/leg/right/industrial/zenghu),
BP_L_HAND = list("path" = /obj/item/organ/external/hand/industrial/zenghu),
BP_R_HAND = list("path" = /obj/item/organ/external/hand/right/industrial/zenghu),
BP_L_FOOT = list("path" = /obj/item/organ/external/foot/industrial/zenghu),
BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right/industrial/zenghu)
BP_CHEST = list("path" = /obj/item/organ/external/chest/ipc/industrial/zenghu),
BP_GROIN = list("path" = /obj/item/organ/external/groin/ipc/industrial/zenghu),
BP_HEAD = list("path" = /obj/item/organ/external/head/ipc/industrial/zenghu),
BP_L_ARM = list("path" = /obj/item/organ/external/arm/ipc/industrial/zenghu),
BP_R_ARM = list("path" = /obj/item/organ/external/arm/right/ipc/industrial/zenghu),
BP_L_LEG = list("path" = /obj/item/organ/external/leg/ipc/industrial/zenghu),
BP_R_LEG = list("path" = /obj/item/organ/external/leg/right/ipc/industrial/zenghu),
BP_L_HAND = list("path" = /obj/item/organ/external/hand/ipc/industrial/zenghu),
BP_R_HAND = list("path" = /obj/item/organ/external/hand/right/ipc/industrial/zenghu),
BP_L_FOOT = list("path" = /obj/item/organ/external/foot/ipc/industrial/zenghu),
BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right/ipc/industrial/zenghu)
)
inherent_verbs = list(
@@ -475,17 +475,17 @@
blurb = "Bishop Cybernetics frames are among the sleeker, flashier frames widely produced for IPCs. This brand-new, high end design has a focus on pioneering energy efficiency without sacrifice, fitting to Bishop's company vision. Cutting-edge technology in power management means this frame can operate longer while running more demanding processing algorithms than most. This extreme push to minimize power draw means this frame can be equipped with all sorts of extra equipment: a hologram for a face, flashing status displays and embedded lights solely meant for show. The one thing holding this frame back from perfection is the same common criticism leveled against almost all Bishop products: the shiny chrome and glass meant to put all of this tech on display means it's exposed and fragile. It's because of Bishop's unrelenting pursuit of vanity in their designs that these frames often suffer from issues with reliability and struggle to safely perform the same work as cheaper, more rugged frames."
has_limbs = list(
BP_CHEST = list("path" = /obj/item/organ/external/chest/industrial/bishop),
BP_GROIN = list("path" = /obj/item/organ/external/groin/industrial/bishop),
BP_HEAD = list("path" = /obj/item/organ/external/head/industrial/bishop),
BP_L_ARM = list("path" = /obj/item/organ/external/arm/industrial/bishop),
BP_R_ARM = list("path" = /obj/item/organ/external/arm/right/industrial/bishop),
BP_L_LEG = list("path" = /obj/item/organ/external/leg/industrial/bishop),
BP_R_LEG = list("path" = /obj/item/organ/external/leg/right/industrial/bishop),
BP_L_HAND = list("path" = /obj/item/organ/external/hand/industrial/bishop),
BP_R_HAND = list("path" = /obj/item/organ/external/hand/right/industrial/bishop),
BP_L_FOOT = list("path" = /obj/item/organ/external/foot/industrial/bishop),
BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right/industrial/bishop)
BP_CHEST = list("path" = /obj/item/organ/external/chest/ipc/industrial/bishop),
BP_GROIN = list("path" = /obj/item/organ/external/groin/ipc/industrial/bishop),
BP_HEAD = list("path" = /obj/item/organ/external/head/ipc/industrial/bishop),
BP_L_ARM = list("path" = /obj/item/organ/external/arm/ipc/industrial/bishop),
BP_R_ARM = list("path" = /obj/item/organ/external/arm/right/ipc/industrial/bishop),
BP_L_LEG = list("path" = /obj/item/organ/external/leg/ipc/industrial/bishop),
BP_R_LEG = list("path" = /obj/item/organ/external/leg/right/ipc/industrial/bishop),
BP_L_HAND = list("path" = /obj/item/organ/external/hand/ipc/industrial/bishop),
BP_R_HAND = list("path" = /obj/item/organ/external/hand/right/ipc/industrial/bishop),
BP_L_FOOT = list("path" = /obj/item/organ/external/foot/ipc/industrial/bishop),
BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right/ipc/industrial/bishop)
)
inherent_verbs = list(
@@ -519,17 +519,17 @@
spawn_flags = IS_RESTRICTED
has_limbs = list(
BP_CHEST = list("path" = /obj/item/organ/external/chest/unbranded),
BP_GROIN = list("path" = /obj/item/organ/external/groin/unbranded),
BP_HEAD = list("path" = /obj/item/organ/external/head/unbranded),
BP_L_ARM = list("path" = /obj/item/organ/external/arm/unbranded),
BP_R_ARM = list("path" = /obj/item/organ/external/arm/right/unbranded),
BP_L_LEG = list("path" = /obj/item/organ/external/leg/unbranded),
BP_R_LEG = list("path" = /obj/item/organ/external/leg/right/unbranded),
BP_L_HAND = list("path" = /obj/item/organ/external/hand/unbranded),
BP_R_HAND = list("path" = /obj/item/organ/external/hand/right/unbranded),
BP_L_FOOT = list("path" = /obj/item/organ/external/foot/unbranded),
BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right/unbranded)
BP_CHEST = list("path" = /obj/item/organ/external/chest/ipc/unbranded),
BP_GROIN = list("path" = /obj/item/organ/external/groin/ipc/unbranded),
BP_HEAD = list("path" = /obj/item/organ/external/head/ipc/unbranded),
BP_L_ARM = list("path" = /obj/item/organ/external/arm/ipc/unbranded),
BP_R_ARM = list("path" = /obj/item/organ/external/arm/right/ipc/unbranded),
BP_L_LEG = list("path" = /obj/item/organ/external/leg/ipc/unbranded),
BP_R_LEG = list("path" = /obj/item/organ/external/leg/right/ipc/unbranded),
BP_L_HAND = list("path" = /obj/item/organ/external/hand/ipc/unbranded),
BP_R_HAND = list("path" = /obj/item/organ/external/hand/right/ipc/unbranded),
BP_L_FOOT = list("path" = /obj/item/organ/external/foot/ipc/unbranded),
BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right/ipc/unbranded)
)
inherent_verbs = list(
@@ -553,4 +553,4 @@
/datum/species/machine/unbranded/get_light_color(mob/living/carbon/human/H)
if (istype(H))
return rgb(H.r_eyes, H.g_eyes, H.b_eyes)
return rgb(H.r_eyes, H.g_eyes, H.b_eyes)

88
code/modules/organs/subtypes/industrial.dm
View File

@@ -1,141 +1,141 @@
// Heads
/obj/item/organ/external/head/industrial/hephaestus
/obj/item/organ/external/head/ipc/industrial/hephaestus
robotize_type = PROSTHETIC_HI
/obj/item/organ/external/head/industrial/xion
/obj/item/organ/external/head/ipc/industrial/xion
robotize_type = PROSTHETIC_XMG
/obj/item/organ/external/head/industrial/zenghu
/obj/item/organ/external/head/ipc/industrial/zenghu
robotize_type = PROSTHETIC_ZH
/obj/item/organ/external/head/industrial/bishop
/obj/item/organ/external/head/ipc/industrial/bishop
robotize_type = PROSTHETIC_BC
// Chest
/obj/item/organ/external/chest/industrial/hephaestus
/obj/item/organ/external/chest/ipc/industrial/hephaestus
robotize_type = PROSTHETIC_HI
/obj/item/organ/external/chest/industrial/xion
/obj/item/organ/external/chest/ipc/industrial/xion
robotize_type = PROSTHETIC_XMG
/obj/item/organ/external/chest/industrial/zenghu
/obj/item/organ/external/chest/ipc/industrial/zenghu
robotize_type = PROSTHETIC_ZH
/obj/item/organ/external/chest/industrial/bishop
/obj/item/organ/external/chest/ipc/industrial/bishop
robotize_type = PROSTHETIC_BC
// Groin
/obj/item/organ/external/groin/industrial/hephaestus
/obj/item/organ/external/groin/ipc/industrial/hephaestus
robotize_type = PROSTHETIC_HI
/obj/item/organ/external/groin/industrial/xion
/obj/item/organ/external/groin/ipc/industrial/xion
robotize_type = PROSTHETIC_XMG
/obj/item/organ/external/groin/industrial/zenghu
/obj/item/organ/external/groin/ipc/industrial/zenghu
robotize_type = PROSTHETIC_ZH
/obj/item/organ/external/groin/industrial/bishop
/obj/item/organ/external/groin/ipc/industrial/bishop
robotize_type = PROSTHETIC_BC
// Left Arm
/obj/item/organ/external/arm/industrial/hephaestus
/obj/item/organ/external/arm/ipc/industrial/hephaestus
robotize_type = PROSTHETIC_HI
/obj/item/organ/external/arm/industrial/xion
/obj/item/organ/external/arm/ipc/industrial/xion
robotize_type = PROSTHETIC_XMG
/obj/item/organ/external/arm/industrial/zenghu
/obj/item/organ/external/arm/ipc/industrial/zenghu
robotize_type = PROSTHETIC_ZH
/obj/item/organ/external/arm/industrial/bishop
/obj/item/organ/external/arm/ipc/industrial/bishop
robotize_type = PROSTHETIC_BC
// Right Arm
/obj/item/organ/external/arm/right/industrial/hephaestus
/obj/item/organ/external/arm/right/ipc/industrial/hephaestus
robotize_type = PROSTHETIC_HI
/obj/item/organ/external/arm/right/industrial/xion
/obj/item/organ/external/arm/right/ipc/industrial/xion
robotize_type = PROSTHETIC_XMG
/obj/item/organ/external/arm/right/industrial/zenghu
/obj/item/organ/external/arm/right/ipc/industrial/zenghu
robotize_type = PROSTHETIC_ZH
/obj/item/organ/external/arm/right/industrial/bishop
/obj/item/organ/external/arm/right/ipc/industrial/bishop
robotize_type = PROSTHETIC_BC
// Left Leg
/obj/item/organ/external/leg/industrial/hephaestus
/obj/item/organ/external/leg/ipc/industrial/hephaestus
robotize_type = PROSTHETIC_HI
/obj/item/organ/external/leg/industrial/xion
/obj/item/organ/external/leg/ipc/industrial/xion
robotize_type = PROSTHETIC_XMG
/obj/item/organ/external/leg/industrial/zenghu
/obj/item/organ/external/leg/ipc/industrial/zenghu
robotize_type = PROSTHETIC_ZH
/obj/item/organ/external/leg/industrial/bishop
/obj/item/organ/external/leg/ipc/industrial/bishop
robotize_type = PROSTHETIC_BC
// Right Leg
/obj/item/organ/external/leg/right/industrial/hephaestus
/obj/item/organ/external/leg/right/ipc/industrial/hephaestus
robotize_type = PROSTHETIC_HI
/obj/item/organ/external/leg/right/industrial/xion
/obj/item/organ/external/leg/right/ipc/industrial/xion
robotize_type = PROSTHETIC_XMG
/obj/item/organ/external/leg/right/industrial/zenghu
/obj/item/organ/external/leg/right/ipc/industrial/zenghu
robotize_type = PROSTHETIC_ZH
/obj/item/organ/external/leg/right/industrial/bishop
/obj/item/organ/external/leg/right/ipc/industrial/bishop
robotize_type = PROSTHETIC_BC
// Left foot
/obj/item/organ/external/foot/industrial/hephaestus
/obj/item/organ/external/foot/ipc/industrial/hephaestus
robotize_type = PROSTHETIC_HI
/obj/item/organ/external/foot/industrial/xion
/obj/item/organ/external/foot/ipc/industrial/xion
robotize_type = PROSTHETIC_XMG
/obj/item/organ/external/foot/industrial/zenghu
/obj/item/organ/external/foot/ipc/industrial/zenghu
robotize_type = PROSTHETIC_ZH
/obj/item/organ/external/foot/industrial/bishop
/obj/item/organ/external/foot/ipc/industrial/bishop
robotize_type = PROSTHETIC_BC
// Right foot
/obj/item/organ/external/foot/right/industrial/hephaestus
/obj/item/organ/external/foot/right/ipc/industrial/hephaestus
robotize_type = PROSTHETIC_HI
/obj/item/organ/external/foot/right/industrial/xion
/obj/item/organ/external/foot/right/ipc/industrial/xion
robotize_type = PROSTHETIC_XMG
/obj/item/organ/external/foot/right/industrial/zenghu
/obj/item/organ/external/foot/right/ipc/industrial/zenghu
robotize_type = PROSTHETIC_ZH
/obj/item/organ/external/foot/right/industrial/bishop
/obj/item/organ/external/foot/right/ipc/industrial/bishop
robotize_type = PROSTHETIC_BC
/obj/item/organ/external/hand/industrial/hephaestus
/obj/item/organ/external/hand/ipc/industrial/hephaestus
robotize_type = PROSTHETIC_HI
/obj/item/organ/external/hand/industrial/xion
/obj/item/organ/external/hand/ipc/industrial/xion
robotize_type = PROSTHETIC_XMG
/obj/item/organ/external/hand/industrial/zenghu
/obj/item/organ/external/hand/ipc/industrial/zenghu
robotize_type = PROSTHETIC_ZH
/obj/item/organ/external/hand/industrial/bishop
/obj/item/organ/external/hand/ipc/industrial/bishop
robotize_type = PROSTHETIC_BC
// Right hand
/obj/item/organ/external/hand/right/industrial/hephaestus
/obj/item/organ/external/hand/right/ipc/industrial/hephaestus
robotize_type = PROSTHETIC_HI
/obj/item/organ/external/hand/right/industrial/xion
/obj/item/organ/external/hand/right/ipc/industrial/xion
robotize_type = PROSTHETIC_XMG
/obj/item/organ/external/hand/right/industrial/zenghu
/obj/item/organ/external/hand/right/ipc/industrial/zenghu
robotize_type = PROSTHETIC_ZH
/obj/item/organ/external/hand/right/industrial/bishop
/obj/item/organ/external/hand/right/ipc/industrial/bishop
robotize_type = PROSTHETIC_BC

68
code/modules/organs/subtypes/machine.dm
View File

@@ -380,58 +380,58 @@
//Industrial//
//////////////
/obj/item/organ/external/head/industrial
/obj/item/organ/external/head/ipc/industrial
dislocated = -1
can_intake_reagents = 0
encased = "support frame"
robotize_type = PROSTHETIC_IND
/obj/item/organ/external/chest/industrial
/obj/item/organ/external/chest/ipc/industrial
dislocated = -1
encased = "support frame"
robotize_type = PROSTHETIC_IND
/obj/item/organ/external/groin/industrial
/obj/item/organ/external/groin/ipc/industrial
dislocated = -1
encased = "support frame"
robotize_type = PROSTHETIC_IND
/obj/item/organ/external/arm/industrial
/obj/item/organ/external/arm/ipc/industrial
dislocated = -1
encased = "support frame"
robotize_type = PROSTHETIC_IND
/obj/item/organ/external/arm/right/industrial
/obj/item/organ/external/arm/right/ipc/industrial
dislocated = -1
encased = "support frame"
robotize_type = PROSTHETIC_IND
/obj/item/organ/external/leg/industrial
/obj/item/organ/external/leg/ipc/industrial
dislocated = -1
encased = "support frame"
robotize_type = PROSTHETIC_IND
/obj/item/organ/external/leg/right/industrial
/obj/item/organ/external/leg/right/ipc/industrial
dislocated = -1
encased = "support frame"
robotize_type = PROSTHETIC_IND
/obj/item/organ/external/foot/industrial
/obj/item/organ/external/foot/ipc/industrial
dislocated = -1
encased = "support frame"
robotize_type = PROSTHETIC_IND
/obj/item/organ/external/foot/right/industrial
/obj/item/organ/external/foot/right/ipc/industrial
dislocated = -1
encased = "support frame"
robotize_type = PROSTHETIC_IND
/obj/item/organ/external/hand/industrial
/obj/item/organ/external/hand/ipc/industrial
dislocated = -1
encased = "support frame"
robotize_type = PROSTHETIC_IND
/obj/item/organ/external/hand/right/industrial
/obj/item/organ/external/hand/right/ipc/industrial
dislocated = -1
encased = "support frame"
robotize_type = PROSTHETIC_IND
@@ -440,68 +440,68 @@
//Shell limbs//
///////////////
/obj/item/organ/external/head/shell
/obj/item/organ/external/head/ipc/shell
dislocated = -1
can_intake_reagents = 0
encased = "support frame"
force_skintone = TRUE
robotize_type = PROSTHETIC_SYNTHSKIN
/obj/item/organ/external/chest/shell
/obj/item/organ/external/chest/ipc/shell
dislocated = -1
encased = "support frame"
force_skintone = TRUE
robotize_type = PROSTHETIC_SYNTHSKIN
/obj/item/organ/external/groin/shell
/obj/item/organ/external/groin/ipc/shell
dislocated = -1
encased = "support frame"
force_skintone = TRUE
robotize_type = PROSTHETIC_SYNTHSKIN
/obj/item/organ/external/arm/shell
/obj/item/organ/external/arm/ipc/shell
dislocated = -1
encased = "support frame"
force_skintone = TRUE
robotize_type = PROSTHETIC_SYNTHSKIN
/obj/item/organ/external/arm/right/shell
/obj/item/organ/external/arm/right/ipc/shell
dislocated = -1
encased = "support frame"
force_skintone = TRUE
robotize_type = PROSTHETIC_SYNTHSKIN
/obj/item/organ/external/leg/shell
/obj/item/organ/external/leg/ipc/shell
dislocated = -1
encased = "support frame"
force_skintone = TRUE
robotize_type = PROSTHETIC_SYNTHSKIN
/obj/item/organ/external/leg/right/shell
/obj/item/organ/external/leg/right/ipc/shell
dislocated = -1
encased = "support frame"
force_skintone = TRUE
robotize_type = PROSTHETIC_SYNTHSKIN
/obj/item/organ/external/foot/shell
/obj/item/organ/external/foot/ipc/shell
dislocated = -1
encased = "support frame"
force_skintone = TRUE
robotize_type = PROSTHETIC_SYNTHSKIN
/obj/item/organ/external/foot/right/shell
/obj/item/organ/external/foot/right/ipc/shell
dislocated = -1
encased = "support frame"
force_skintone = TRUE
robotize_type = PROSTHETIC_SYNTHSKIN
/obj/item/organ/external/hand/shell
/obj/item/organ/external/hand/ipc/shell
dislocated = -1
encased = "support frame"
force_skintone = TRUE
robotize_type = PROSTHETIC_SYNTHSKIN
/obj/item/organ/external/hand/right/shell
/obj/item/organ/external/hand/right/ipc/shell
dislocated = -1
encased = "support frame"
force_skintone = TRUE
@@ -509,58 +509,58 @@
//unbranded
/obj/item/organ/external/head/unbranded
/obj/item/organ/external/head/ipc/unbranded
dislocated = -1
can_intake_reagents = 0
encased = "support frame"
robotize_type = "Unbranded"
/obj/item/organ/external/chest/unbranded
/obj/item/organ/external/chest/ipc/unbranded
dislocated = -1
encased = "support frame"
robotize_type = "Unbranded"
/obj/item/organ/external/groin/unbranded
/obj/item/organ/external/groin/ipc/unbranded
dislocated = -1
encased = "support frame"
robotize_type = "Unbranded"
/obj/item/organ/external/arm/unbranded
/obj/item/organ/external/arm/ipc/unbranded
dislocated = -1
encased = "support frame"
robotize_type = "Unbranded"
/obj/item/organ/external/arm/right/unbranded
/obj/item/organ/external/arm/right/ipc/unbranded
dislocated = -1
encased = "support frame"
robotize_type = "Unbranded"
/obj/item/organ/external/leg/unbranded
/obj/item/organ/external/leg/ipc/unbranded
dislocated = -1
encased = "support frame"
robotize_type = "Unbranded"
/obj/item/organ/external/leg/right/unbranded
/obj/item/organ/external/leg/right/ipc/unbranded
dislocated = -1
encased = "support frame"
robotize_type = "Unbranded"
/obj/item/organ/external/foot/unbranded
/obj/item/organ/external/foot/ipc/unbranded
dislocated = -1
encased = "support frame"
robotize_type = "Unbranded"
/obj/item/organ/external/foot/right/unbranded
/obj/item/organ/external/foot/right/ipc/unbranded
dislocated = -1
encased = "support frame"
robotize_type = "Unbranded"
/obj/item/organ/external/hand/unbranded
/obj/item/organ/external/hand/ipc/unbranded
dislocated = -1
encased = "support frame"
robotize_type = "Unbranded"
/obj/item/organ/external/hand/right/unbranded
/obj/item/organ/external/hand/right/ipc/unbranded
dislocated = -1
encased = "support frame"
robotize_type = "Unbranded"
robotize_type = "Unbranded"

18
code/modules/research/designs/mechfab/prosthetics/external.dm
View File

@@ -16,48 +16,48 @@
/datum/design/item/mechfab/prosthetic/l_arm
name = "Prosthetic Left Arm"
build_path = /obj/item/organ/external/arm/industrial
build_path = /obj/item/organ/external/arm/ipc
time = 20
materials = list(DEFAULT_WALL_MATERIAL = 18000)
/datum/design/item/mechfab/prosthetic/r_arm
name = "Prosthetic Right Arm"
build_path = /obj/item/organ/external/arm/right/industrial
build_path = /obj/item/organ/external/arm/right/ipc
time = 20
materials = list(DEFAULT_WALL_MATERIAL = 18000)
/datum/design/item/mechfab/prosthetic/l_leg
name = "Prosthetic Left Leg"
build_path = /obj/item/organ/external/leg/industrial
build_path = /obj/item/organ/external/leg/ipc
time = 20
materials = list(DEFAULT_WALL_MATERIAL = 15000)
/datum/design/item/mechfab/prosthetic/r_leg
name = "Prosthetic Right Leg"
build_path = /obj/item/organ/external/leg/right/industrial
build_path = /obj/item/organ/external/leg/right/ipc
time = 20
materials = list(DEFAULT_WALL_MATERIAL = 15000)
/datum/design/item/mechfab/prosthetic/l_hand
name = "Prosthetic Left Hand"
build_path = /obj/item/organ/external/hand/industrial
build_path = /obj/item/organ/external/hand/ipc
time = 20
materials = list(DEFAULT_WALL_MATERIAL = 8000)
/datum/design/item/mechfab/prosthetic/r_hand
name = "Prosthetic Right Hand"
build_path = /obj/item/organ/external/hand/right/industrial
build_path = /obj/item/organ/external/hand/right/ipc
time = 20
materials = list(DEFAULT_WALL_MATERIAL = 8000)
/datum/design/item/mechfab/prosthetic/l_foot
name = "Prosthetic Left Foot"
build_path = /obj/item/organ/external/foot/industrial
build_path = /obj/item/organ/external/foot/ipc
time = 20
materials = list(DEFAULT_WALL_MATERIAL = 8000)
/datum/design/item/mechfab/prosthetic/r_foot
name = "Prosthetic Right Foot"
build_path = /obj/item/organ/external/foot/right/industrial
build_path = /obj/item/organ/external/foot/right/ipc
time = 20
materials = list(DEFAULT_WALL_MATERIAL = 8000)
materials = list(DEFAULT_WALL_MATERIAL = 8000)

6
html/changelogs/johnwildkins-ipcfix.yml Normal file
View File

@@ -0,0 +1,6 @@
author: JohnWildkins
delete-after: True
changes:
- bugfix: "Mechatronic fabricators should now dispense synthskin and other non-industrial IPC limbs correctly."