Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Moves IPC limbs from under robot #4307

Merged
merged 3 commits into from
Nov 23, 2024
Merged

Moves IPC limbs from under robot #4307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5de0aa
should work
Shoddd Nov 19, 2024
38fdc94
reorder
Shoddd Nov 19, 2024
d9d9739
undo
Shoddd Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions monkestation/code/modules/research/designs/mechfabricator_designs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
build_type = MECHFAB
construction_time = 15 SECONDS
materials = list(/datum/material/iron = 4000, /datum/material/glass = 500)
build_path = /obj/item/bodypart/head/robot/ipc
build_path = /obj/item/bodypart/head/ipc
category = list(
RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ORGANS_MISC
)
Expand All @@ -29,7 +29,7 @@
build_type = MECHFAB
construction_time = 15 SECONDS
materials = list(/datum/material/iron = 5000)
build_path = /obj/item/bodypart/chest/robot/ipc
build_path = /obj/item/bodypart/chest/ipc
category = list(
RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ORGANS_MISC
)
Expand All @@ -41,7 +41,7 @@
build_type = MECHFAB
construction_time = 15 SECONDS
materials = list(/datum/material/iron = 2000)
build_path = /obj/item/bodypart/arm/left/robot/ipc
build_path = /obj/item/bodypart/arm/left/ipc
category = list(
RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ORGANS_MISC
)
Expand All @@ -53,7 +53,7 @@
build_type = MECHFAB
construction_time = 15 SECONDS
materials = list(/datum/material/iron = 2000)
build_path = /obj/item/bodypart/arm/right/robot/ipc
build_path = /obj/item/bodypart/arm/right/ipc
category = list(
RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ORGANS_MISC
)
Expand All @@ -65,7 +65,7 @@
build_type = MECHFAB
construction_time = 15 SECONDS
materials = list(/datum/material/iron = 2000)
build_path = /obj/item/bodypart/leg/left/robot/ipc
build_path = /obj/item/bodypart/leg/left/ipc
category = list(
RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ORGANS_MISC
)
Expand All @@ -77,7 +77,7 @@
build_type = MECHFAB
construction_time = 15 SECONDS
materials = list(/datum/material/iron = 2000)
build_path = /obj/item/bodypart/leg/right/robot/ipc
build_path = /obj/item/bodypart/leg/right/ipc
category = list(
RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ORGANS_MISC
)
Expand Down
53 changes: 47 additions & 6 deletions monkestation/code/modules/smithing/ipcs/body/base_bodyparts.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/obj/item/bodypart/head/robot/ipc
/obj/item/bodypart/head/ipc
icon = 'monkestation/icons/mob/species/ipc/bodyparts.dmi'
icon_greyscale = 'monkestation/icons/mob/species/ipc/bodyparts.dmi'
icon_static = 'monkestation/icons/mob/species/ipc/bodyparts.dmi'
Expand All @@ -15,7 +15,14 @@
body_damage_coeff = 1.1 //IPC's Head can dismember //Monkestation Edit
max_damage = 40 //Keep in mind that this value is used in the //Monkestation Edit
dmg_overlay_type = "synth"
/obj/item/bodypart/chest/robot/ipc

disabling_threshold_percentage = 1

biological_state = (BIO_ROBOTIC|BIO_JOINTED)

damage_examines = list(BRUTE = ROBOTIC_BRUTE_EXAMINE_TEXT, BURN = ROBOTIC_BURN_EXAMINE_TEXT, CLONE = DEFAULT_CLONE_EXAMINE_TEXT)

/obj/item/bodypart/chest/ipc
icon = 'monkestation/icons/mob/species/ipc/bodyparts.dmi'
icon_greyscale = 'monkestation/icons/mob/species/ipc/bodyparts.dmi'
icon_static = 'monkestation/icons/mob/species/ipc/bodyparts.dmi'
Expand All @@ -33,12 +40,19 @@

dmg_overlay_type = "synth"

/obj/item/bodypart/arm/left/robot/ipc
disabling_threshold_percentage = 1

biological_state = (BIO_ROBOTIC|BIO_JOINTED)

damage_examines = list(BRUTE = ROBOTIC_BRUTE_EXAMINE_TEXT, BURN = ROBOTIC_BURN_EXAMINE_TEXT, CLONE = DEFAULT_CLONE_EXAMINE_TEXT)

/obj/item/bodypart/arm/left/ipc
icon = 'monkestation/icons/mob/species/ipc/bodyparts.dmi'
icon_greyscale = 'monkestation/icons/mob/species/ipc/bodyparts.dmi'
icon_static = 'monkestation/icons/mob/species/ipc/bodyparts.dmi'
limb_id = "synth"
icon_state = "synth_l_arm"
flags_1 = CONDUCT_1
should_draw_greyscale = FALSE
biological_state = BIO_ROBOTIC | BIO_JOINTED | BIO_BLOODED
bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC
Expand All @@ -50,12 +64,19 @@

dmg_overlay_type = "synth"

/obj/item/bodypart/arm/right/robot/ipc
disabling_threshold_percentage = 1

biological_state = (BIO_ROBOTIC|BIO_JOINTED)

damage_examines = list(BRUTE = ROBOTIC_BRUTE_EXAMINE_TEXT, BURN = ROBOTIC_BURN_EXAMINE_TEXT, CLONE = DEFAULT_CLONE_EXAMINE_TEXT)

/obj/item/bodypart/arm/right/ipc
icon = 'monkestation/icons/mob/species/ipc/bodyparts.dmi'
icon_greyscale = 'monkestation/icons/mob/species/ipc/bodyparts.dmi'
icon_static = 'monkestation/icons/mob/species/ipc/bodyparts.dmi'
limb_id = "synth"
icon_state = "synth_r_arm"
flags_1 = CONDUCT_1
should_draw_greyscale = FALSE
biological_state = BIO_ROBOTIC | BIO_JOINTED | BIO_BLOODED
bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC
Expand All @@ -67,12 +88,19 @@

dmg_overlay_type = "synth"

/obj/item/bodypart/leg/left/robot/ipc
disabling_threshold_percentage = 1

biological_state = (BIO_ROBOTIC|BIO_JOINTED)

damage_examines = list(BRUTE = ROBOTIC_BRUTE_EXAMINE_TEXT, BURN = ROBOTIC_BURN_EXAMINE_TEXT, CLONE = DEFAULT_CLONE_EXAMINE_TEXT)

/obj/item/bodypart/leg/left/ipc
icon = 'monkestation/icons/mob/species/ipc/bodyparts.dmi'
icon_greyscale = 'monkestation/icons/mob/species/ipc/bodyparts.dmi'
icon_static = 'monkestation/icons/mob/species/ipc/bodyparts.dmi'
limb_id = "synth"
icon_state = "synth_l_leg"
flags_1 = CONDUCT_1
should_draw_greyscale = FALSE
biological_state = BIO_ROBOTIC | BIO_JOINTED | BIO_BLOODED
bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC
Expand All @@ -82,12 +110,19 @@
dmg_overlay_type = "synth"
step_sounds = list('sound/effects/servostep.ogg')

/obj/item/bodypart/leg/right/robot/ipc
disabling_threshold_percentage = 1

biological_state = (BIO_ROBOTIC|BIO_JOINTED)

damage_examines = list(BRUTE = ROBOTIC_BRUTE_EXAMINE_TEXT, BURN = ROBOTIC_BURN_EXAMINE_TEXT, CLONE = DEFAULT_CLONE_EXAMINE_TEXT)

/obj/item/bodypart/leg/right/ipc
icon = 'monkestation/icons/mob/species/ipc/bodyparts.dmi'
icon_greyscale = 'monkestation/icons/mob/species/ipc/bodyparts.dmi'
icon_static = 'monkestation/icons/mob/species/ipc/bodyparts.dmi'
limb_id = "synth"
icon_state = "synth_r_leg"
flags_1 = CONDUCT_1
should_draw_greyscale = FALSE
biological_state = BIO_ROBOTIC | BIO_JOINTED | BIO_BLOODED
bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC
Expand All @@ -99,3 +134,9 @@

dmg_overlay_type = "synth"
step_sounds = list('sound/effects/servostep.ogg')

disabling_threshold_percentage = 1

biological_state = (BIO_ROBOTIC|BIO_JOINTED)

damage_examines = list(BRUTE = ROBOTIC_BRUTE_EXAMINE_TEXT, BURN = ROBOTIC_BURN_EXAMINE_TEXT, CLONE = DEFAULT_CLONE_EXAMINE_TEXT)
12 changes: 6 additions & 6 deletions monkestation/code/modules/smithing/ipcs/species.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@
exotic_bloodtype = /datum/blood_type/oil

bodypart_overrides = list(
BODY_ZONE_HEAD = /obj/item/bodypart/head/robot/ipc,
BODY_ZONE_CHEST = /obj/item/bodypart/chest/robot/ipc,
BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left/robot/ipc,
BODY_ZONE_R_ARM = /obj/item/bodypart/arm/right/robot/ipc,
BODY_ZONE_L_LEG = /obj/item/bodypart/leg/left/robot/ipc,
BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/robot/ipc,
BODY_ZONE_HEAD = /obj/item/bodypart/head/ipc,
BODY_ZONE_CHEST = /obj/item/bodypart/chest/ipc,
BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left/ipc,
BODY_ZONE_R_ARM = /obj/item/bodypart/arm/right/ipc,
BODY_ZONE_L_LEG = /obj/item/bodypart/leg/left/ipc,
BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/ipc,
)

bodytemp_heat_damage_limit = CELCIUS_TO_KELVIN(450)
Expand Down
Loading