cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 16:47:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Greyscale robotic tesh fish. I mean fix. (#5493)

Browse Source 
## About The Pull Request
fixes https://github.com/Bubberstation/Bubberstation/issues/5489 by
creating wholly new limbs in order to get tesh clothing offsets
## Why It's Good For The Game
Bugfix good merge my eels
## Proof Of Testing
<img width="1808" height="944" alt="image"
src="https://github.com/user-attachments/assets/f38caad1-22b6-4679-9d19-39cf50ca3527"
/>
<details>
<summary>Screenshots/Videos</summary>

</details>

## Changelog
🆑
fix: Greyscale robotic tesh limbs not having clothing offsets and custom
sprites.
add: New-Old sprites for the greyscale robotic tesh limbs to work.
/🆑
This commit is contained in:
MrGloopy
2026-04-26 11:05:02 +02:00
committed by GitHub
parent 7edaec5191
commit 3fb538c11e
4 changed files with 124 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_skyrat/modules/bodyparts/icons/teshari_robotic_greyscale.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

modular_skyrat/modules/tesh_augments/code/limbs.dm
+28 -3
View File
@@ -7,11 +7,21 @@ this goes into the augment preferences section. They do not use the appearance d
path = /obj/item/bodypart/head/robot/teshari
uses_robotic_styles = FALSE
/datum/augment_item/limb/head/teshari_cyborg_greyscale
name = "Greyscale robotic Teshari head"
path = /obj/item/bodypart/head/robot/teshari_greyscale
uses_robotic_styles = FALSE
/datum/augment_item/limb/chest/teshari_cyborg
name = "Raptoral cybernetic chest"
path = /obj/item/bodypart/chest/robot/teshari
uses_robotic_styles = FALSE
/datum/augment_item/limb/chest/teshari_cyborg_greyscale
name = "Greyscale robotic Teshari chest"
path = /obj/item/bodypart/chest/robot/teshari_greyscale
uses_robotic_styles = FALSE
/datum/augment_item/limb/l_arm/teshari_prosthetic
name = "Raptoral prosthetic left forelimb"
path = /obj/item/bodypart/arm/left/robot/teshari_surplus
@@ -23,15 +33,20 @@ this goes into the augment preferences section. They do not use the appearance d
path = /obj/item/bodypart/arm/left/robot/teshari
uses_robotic_styles = FALSE
/datum/augment_item/limb/l_arm/teshari_cybernetic_greyscale
name = "Greyscale robotic Teshari left arm"
path = /obj/item/bodypart/arm/left/robot/teshari_greyscale
uses_robotic_styles = FALSE
/datum/augment_item/limb/r_arm/teshari_prosthetic
name = "Raptoral prototype right forelimb"
path = /obj/item/bodypart/arm/right/robot/teshari_surplus
cost = -1
uses_robotic_styles = FALSE
/datum/augment_item/limb/r_arm/teshari_cybernetic
name = "Raptoral cybernetic right forelimb"
path = /obj/item/bodypart/arm/right/robot/teshari
/datum/augment_item/limb/r_arm/teshari_cybernetic_greyscale
name = "Greyscale robotic Teshari right arm"
path = /obj/item/bodypart/arm/right/robot/teshari_greyscale
uses_robotic_styles = FALSE
/datum/augment_item/limb/l_leg/teshari_prosthetic
@@ -45,6 +60,11 @@ this goes into the augment preferences section. They do not use the appearance d
path = /obj/item/bodypart/leg/left/robot/teshari
uses_robotic_styles = FALSE
/datum/augment_item/limb/l_leg/teshari_cybernetic_greyscale
name = "Greyscale robotic Teshari left leg"
path = /obj/item/bodypart/leg/left/robot/teshari_greyscale
uses_robotic_styles = FALSE
/datum/augment_item/limb/r_leg/teshari_prosthetic
name = "Raptoral prosthetic right hindlimb"
path = /obj/item/bodypart/leg/right/robot/teshari_surplus
@@ -55,3 +75,8 @@ this goes into the augment preferences section. They do not use the appearance d
name = "Raptoral cybernetic right hindlimb"
path = /obj/item/bodypart/leg/right/robot/teshari
uses_robotic_styles = FALSE
/datum/augment_item/limb/r_leg/teshari_cybernetic_greyscale
name = "Greyscale robotic Teshari right leg"
path = /obj/item/bodypart/leg/right/robot/teshari_greyscale
uses_robotic_styles = FALSE
modular_skyrat/modules/tesh_augments/code/robot_bodyparts.dm
+96
View File
@@ -96,6 +96,102 @@
head_flags = HEAD_EYESPRITES
//Teshari greyscale
/obj/item/bodypart/arm/left/robot/teshari_greyscale
name = "cybernetic left raptoral forelimb"
desc = "A skeletal limb wrapped in pseudomuscles and membranous feathers, with a low-conductivity case."
icon = 'modular_skyrat/modules/bodyparts/icons/teshari_robotic_greyscale.dmi'
icon_static = 'modular_skyrat/modules/bodyparts/icons/teshari_robotic_greyscale.dmi'
icon_greyscale = 'modular_skyrat/modules/bodyparts/icons/teshari_robotic_greyscale.dmi'
bodyshape = parent_type::bodyshape | BODYSHAPE_CUSTOM
should_draw_greyscale = TRUE
unarmed_damage_low = TESHARI_PUNCH_LOW
unarmed_damage_high = TESHARI_PUNCH_HIGH
brute_modifier = 1
burn_modifier = 0.9
/obj/item/bodypart/arm/right/robot/teshari_greyscale
name = "cybernetic right raptoral forelimb"
desc = "A skeletal limb wrapped in pseudomuscles and membranous feathers, with a low-conductivity case."
icon_static = 'modular_skyrat/modules/bodyparts/icons/teshari_robotic_greyscale.dmi'
icon = 'modular_skyrat/modules/bodyparts/icons/teshari_robotic_greyscale.dmi'
icon_greyscale = 'modular_skyrat/modules/bodyparts/icons/teshari_robotic_greyscale.dmi'
bodyshape = parent_type::bodyshape | BODYSHAPE_CUSTOM
should_draw_greyscale = TRUE
unarmed_damage_low = TESHARI_PUNCH_LOW
unarmed_damage_high = TESHARI_PUNCH_HIGH
brute_modifier = 1
burn_modifier = 0.9
/obj/item/bodypart/leg/left/robot/teshari_greyscale
name = "cybernetic left raptoral hindlimb"
desc = "A skeletal limb wrapped in pseudomuscles and membranous feathers, with a low-conductivity case."
icon_static = 'modular_skyrat/modules/bodyparts/icons/teshari_robotic_greyscale.dmi'
icon = 'modular_skyrat/modules/bodyparts/icons/teshari_robotic_greyscale.dmi'
icon_greyscale = 'modular_skyrat/modules/bodyparts/icons/teshari_robotic_greyscale.dmi'
bodyshape = parent_type::bodyshape | BODYSHAPE_CUSTOM
should_draw_greyscale = TRUE
unarmed_damage_low = TESHARI_PUNCH_LOW
unarmed_damage_high = TESHARI_PUNCH_HIGH
brute_modifier = 1
burn_modifier = 0.9
/obj/item/bodypart/leg/right/robot/teshari_greyscale
name = "cybernetic right raptoral hindlimb"
desc = "A skeletal limb wrapped in pseudomuscles and membranous feathers, with a low-conductivity case."
icon_static = 'modular_skyrat/modules/bodyparts/icons/teshari_robotic_greyscale.dmi'
icon = 'modular_skyrat/modules/bodyparts/icons/teshari_robotic_greyscale.dmi'
icon_greyscale = 'modular_skyrat/modules/bodyparts/icons/teshari_robotic_greyscale.dmi'
bodyshape = parent_type::bodyshape | BODYSHAPE_CUSTOM
should_draw_greyscale = TRUE
unarmed_damage_low = TESHARI_PUNCH_LOW
unarmed_damage_high = TESHARI_PUNCH_HIGH
brute_modifier = 1
burn_modifier = 0.9
/obj/item/bodypart/chest/robot/teshari_greyscale
name = "cybernetic raptoral torso"
desc = "A heavily reinforced case containing cyborg logic boards, with space for a standard power cell, covered in a layer of membranous feathers."
icon_static = 'modular_skyrat/modules/bodyparts/icons/teshari_robotic_greyscale.dmi'
icon = 'modular_skyrat/modules/bodyparts/icons/teshari_robotic_greyscale.dmi'
icon_greyscale = 'modular_skyrat/modules/bodyparts/icons/teshari_robotic_greyscale.dmi'
bodyshape = parent_type::bodyshape | BODYSHAPE_CUSTOM
should_draw_greyscale = TRUE
brute_modifier = 1
burn_modifier = 0.9
robotic_emp_paralyze_damage_percent_threshold = 0.5
/obj/item/bodypart/head/robot/teshari_greyscale
name = "cybernetic raptoral head"
desc = "A standard reinforced braincase, with spine-plugged neural socket and sensor gimbals. A layer of membranous feathers covers the stark metal."
icon_static = 'modular_skyrat/modules/bodyparts/icons/teshari_robotic_greyscale.dmi'
icon = 'modular_skyrat/modules/bodyparts/icons/teshari_robotic_greyscale.dmi'
icon_greyscale = 'modular_skyrat/modules/bodyparts/icons/teshari_robotic_greyscale.dmi'
bodyshape = parent_type::bodyshape | BODYSHAPE_CUSTOM
should_draw_greyscale = TRUE
unarmed_damage_low = TESHARI_PUNCH_LOW
unarmed_damage_high = TESHARI_PUNCH_HIGH
brute_modifier = 1
burn_modifier = 0.9
head_flags = HEAD_EYESPRITES
// teshari_ surplus
/obj/item/bodypart/arm/left/robot/teshari_surplus
modular_zubbers/code/modules/customization/datums/robotic_styles/robotic_styles.dm
-5
View File
@@ -195,11 +195,6 @@ GLOBAL_LIST_EMPTY(robotic_styles_list)
icon = BODYPART_ICON_XENO
limb_id_override = /obj/item/bodypart/chest/mutant/xenohybrid::limb_id
/datum/robotic_style/dimorphic/teshari
name = "Teshari (Robotic)"
icon = BODYPART_ICON_TESHARI
limb_id_override = /obj/item/bodypart/chest/mutant/teshari::limb_id
// kept at the bottom for parity with other augment dropdowns
/datum/robotic_style/none
icon = 'icons/mob/augmentation/augments.dmi'