Skip to content

Commit

Permalink
fixes for teshvali cybernetics (Bubberstation#900)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

# OOPS
So in the previous and now closed PR
(Bubberstation#871 (comment))
I forgot to commit changes to tgstation.dme. So while the files are now
in the code... they're not enabled. Oops.

## About The Pull Request

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

I didn't notice some more minor changes in the testmerge. This rectifies
some of that - new vars, and such. After I fix the new bugs inherent to
this... Which have now been fixed. ~~Although the current version should
still be functional, teshari cybernetic limbs take approximately 10%
more damage than they should due to the missing var. I think. The var is
weird, and honestly seems to be a redundancy? better safe than sorry.~~
This PR actually enables the previous PR and fixes some things which
would have caused minor statistical inconsistencies on the scale of
+-1-5 damage taken.
### Advanced Raptor limbs
Oh, also advanced cybernetic limbs were implemented since the downstream
made them obtainable. They're a bit brighter than the regular limbs.

![Screenshot_57](https://github.com/Bubberstation/Bubberstation/assets/94389683/9421bc98-1944-4bfe-b707-817123ab8ce1)
![Screenshot_56](https://github.com/Bubberstation/Bubberstation/assets/94389683/870b334a-ce7f-4708-ad97-e0a9d1972b42)
![Screenshot_58](https://github.com/Bubberstation/Bubberstation/assets/94389683/b681ebea-2272-4f38-87ea-adcd75a6aed7)



<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
fix: ACTUALLY enables teshvali cybernetics
add: advanced raptoral cybernetics
fix: some vars that were added in the downstream are now correctly
implemented.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->

---------

Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
Co-authored-by: projectkepler-RU <99981766+projectkepler-ru@users.noreply.github.com>
  • Loading branch information
3 people committed Dec 28, 2023
1 parent 3ad0839 commit 25be46a
Show file tree
Hide file tree
Showing 6 changed files with 316 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,64 @@
RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CYBORG_RAPTORAL
)

//advanced augmentations since those were added in the recent upstream

/datum/design/teshvaliadvanced_l_arm
name = "Advanced Raptoral Cybernetic Left Forelimb"
id = "teshvaliadvanced_l_arm"
build_type = MECHFAB
build_path = /obj/item/bodypart/arm/left/robot/teshvali_advanced
materials = list(
/datum/material/iron=SHEET_MATERIAL_AMOUNT*5,
/datum/material/titanium=SHEET_MATERIAL_AMOUNT*3,
/datum/material/gold=SHEET_MATERIAL_AMOUNT*3,
)
construction_time = 8 SECONDS
category = list(
RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CYBORG_RAPTORAL
)

/datum/design/teshvaliadvanced_r_arm
name = "Advanced Raptoral Cybernetic Right Forelimb"
id = "teshvaliadvanced_r_arm"
build_type = MECHFAB
build_path = /obj/item/bodypart/arm/right/robot/teshvali_advanced
materials = list(
/datum/material/iron=SHEET_MATERIAL_AMOUNT*5,
/datum/material/titanium=SHEET_MATERIAL_AMOUNT*3,
/datum/material/gold=SHEET_MATERIAL_AMOUNT*3,
)
construction_time = 8 SECONDS
category = list(
RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CYBORG_RAPTORAL
)

/datum/design/teshvaliadvanced_l_leg
name = "Advanced Raptoral Cybernetic Left Hindlimb"
id = "teshvaliadvanced_l_leg"
build_type = MECHFAB
build_path = /obj/item/bodypart/leg/left/robot/teshvali_advanced
materials = list(
/datum/material/iron=SHEET_MATERIAL_AMOUNT*5,
/datum/material/titanium=SHEET_MATERIAL_AMOUNT*3,
/datum/material/gold=SHEET_MATERIAL_AMOUNT*3,
)
construction_time = 8 SECONDS
category = list(
RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CYBORG_RAPTORAL
)

/datum/design/teshvaliadvanced_r_leg
name = "Advanced Raptoral Cybernetic Right Hindlimb"
id = "teshvaliadvanced_r_leg"
build_type = MECHFAB
build_path = /obj/item/bodypart/leg/right/robot/teshvali_advanced
materials = list(
/datum/material/iron=SHEET_MATERIAL_AMOUNT*5,
/datum/material/titanium=SHEET_MATERIAL_AMOUNT*3,
/datum/material/gold=SHEET_MATERIAL_AMOUNT*3,
)
construction_time = 8 SECONDS
category = list(
RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CYBORG_RAPTORAL
)
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,17 @@
"teshvalicyber_head",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1000)


/datum/techweb_node/adv_teshvalicyber
id = "adv_teshvalicyber"
display_name = "Advanced Raptoral Cybernetics"
description = "Some technologies from avali archaeological research efforts have been reverse-engineered."
prereq_ids = list("adv_robotics", "teshvalicyber")
design_ids = list(
"teshvaliadvanced_l_arm",
"teshvaliadvanced_r_arm",
"teshvaliadvanced_l_leg",
"teshvaliadvanced_r_leg",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 500)
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,15 @@
icon = 'modular_zubbers/modules/tesh-vali_augments/icons/surplus_augments_teshvali.dmi'
bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM

unarmed_damage_low = TESHARI_PUNCH_LOW
unarmed_damage_high = TESHARI_PUNCH_HIGH

unarmed_damage_low = TESHARI_PUNCH_LOW * 0.3
unarmed_damage_high = TESHARI_PUNCH_HIGH * 0.5

brute_modifier = 1.25
burn_modifier = 1.2

max_damage = LIMB_MAX_HP_PROSTHESIS
body_damage_coeff = LIMB_BODY_DAMAGE_COEFFICIENT_PROSTHESIS

biological_state = (BIO_METAL|BIO_JOINTED)

Expand All @@ -121,13 +123,14 @@
icon = 'modular_zubbers/modules/tesh-vali_augments/icons/surplus_augments_teshvali.dmi'
bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM

unarmed_damage_low = TESHARI_PUNCH_LOW
unarmed_damage_high = TESHARI_PUNCH_HIGH
unarmed_damage_low = TESHARI_PUNCH_LOW * 0.3
unarmed_damage_high = TESHARI_PUNCH_HIGH * 0.5

brute_modifier = 1.25
burn_modifier = 1.2

max_damage = LIMB_MAX_HP_PROSTHESIS
body_damage_coeff = LIMB_BODY_DAMAGE_COEFFICIENT_PROSTHESIS

biological_state = (BIO_METAL|BIO_JOINTED)

Expand All @@ -138,13 +141,14 @@
icon = 'modular_zubbers/modules/tesh-vali_augments/icons/surplus_augments_teshvali.dmi'
bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM

unarmed_damage_low = TESHARI_PUNCH_LOW
unarmed_damage_high = TESHARI_PUNCH_HIGH
unarmed_damage_low = TESHARI_PUNCH_LOW * 0.3
unarmed_damage_high = TESHARI_PUNCH_HIGH * 0.5

brute_modifier = 1.25
burn_modifier = 1.2

max_damage = LIMB_MAX_HP_PROSTHESIS
body_damage_coeff = LIMB_BODY_DAMAGE_COEFFICIENT_PROSTHESIS

biological_state = (BIO_METAL|BIO_JOINTED)

Expand All @@ -155,13 +159,235 @@
icon = 'modular_zubbers/modules/tesh-vali_augments/icons/surplus_augments_teshvali.dmi'
bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM

unarmed_damage_low = TESHARI_PUNCH_LOW
unarmed_damage_high = TESHARI_PUNCH_HIGH
unarmed_damage_low = TESHARI_PUNCH_LOW * 0.3
unarmed_damage_high = TESHARI_PUNCH_HIGH * 0.5

brute_modifier = 1.25
burn_modifier = 1.2

max_damage = LIMB_MAX_HP_PROSTHESIS
body_damage_coeff = LIMB_BODY_DAMAGE_COEFFICIENT_PROSTHESIS

biological_state = (BIO_METAL|BIO_JOINTED)

/obj/item/bodypart/arm/left/robot/teshvali_surplus
name = "prosthetic left raptorial forelimb"
desc = "A skeletal, robotic wing. Outdated and fragile, but it's still better than nothing. A layer of membranous feathers hides the cheap assembly."
icon_static = 'modular_zubbers/modules/tesh-vali_augments/icons/surplus_augments_teshvali.dmi'
icon = 'modular_zubbers/modules/tesh-vali_augments/icons/surplus_augments_teshvali.dmi'
bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM

unarmed_damage_low = TESHARI_PUNCH_LOW * 0.3
unarmed_damage_high = TESHARI_PUNCH_HIGH * 0.5

brute_modifier = 1.25
burn_modifier = 1.2

max_damage = LIMB_MAX_HP_PROSTHESIS
body_damage_coeff = LIMB_BODY_DAMAGE_COEFFICIENT_PROSTHESIS

biological_state = (BIO_METAL|BIO_JOINTED)

/obj/item/bodypart/arm/right/robot/teshvali_surplus
name = "prosthetic right raptorial forelimb"
desc = "A skeletal, robotic wing. Outdated and fragile, but it's still better than nothing. A layer of membranous feathers hides the cheap assembly."
icon_static = 'modular_zubbers/modules/tesh-vali_augments/icons/surplus_augments_teshvali.dmi'
icon = 'modular_zubbers/modules/tesh-vali_augments/icons/surplus_augments_teshvali.dmi'
bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM

unarmed_damage_low = TESHARI_PUNCH_LOW * 0.3
unarmed_damage_high = TESHARI_PUNCH_HIGH * 0.5

brute_modifier = 1.25
burn_modifier = 1.2

max_damage = LIMB_MAX_HP_PROSTHESIS

body_damage_coeff = LIMB_BODY_DAMAGE_COEFFICIENT_PROSTHESIS


biological_state = (BIO_METAL|BIO_JOINTED)

/obj/item/bodypart/leg/left/robot/teshvali_surplus
name = "prosthetic left raptorial hindlimb"
desc = "A skeletal, robotic hindlimb. Outdated and fragile, but it's still better than nothing. A layer of membranous feathers hides the cheap assembly."
icon_static = 'modular_zubbers/modules/tesh-vali_augments/icons/surplus_augments_teshvali.dmi'
icon = 'modular_zubbers/modules/tesh-vali_augments/icons/surplus_augments_teshvali.dmi'
bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM

unarmed_damage_low = TESHARI_PUNCH_LOW * 0.3
unarmed_damage_high = TESHARI_PUNCH_HIGH * 0.5

brute_modifier = 1.25
burn_modifier = 1.2

max_damage = LIMB_MAX_HP_PROSTHESIS

body_damage_coeff = LIMB_BODY_DAMAGE_COEFFICIENT_PROSTHESIS

biological_state = (BIO_METAL|BIO_JOINTED)

/obj/item/bodypart/leg/right/robot/teshvali_surplus
name = "prosthetic right raptorial hindlimb"
desc = "A skeletal, robotic hindlimb. Outdated and fragile, but it's still better than nothing. A layer of membranous feathers hides the cheap assembly."
icon_static = 'modular_zubbers/modules/tesh-vali_augments/icons/surplus_augments_teshvali.dmi'
icon = 'modular_zubbers/modules/tesh-vali_augments/icons/surplus_augments_teshvali.dmi'
bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM

unarmed_damage_low = TESHARI_PUNCH_LOW * 0.3
unarmed_damage_high = TESHARI_PUNCH_HIGH * 0.5

brute_modifier = 1.25
burn_modifier = 1.2

max_damage = LIMB_MAX_HP_PROSTHESIS
body_damage_coeff = LIMB_BODY_DAMAGE_COEFFICIENT_PROSTHESIS

biological_state = (BIO_METAL|BIO_JOINTED)

// Teshvali advanced

/obj/item/bodypart/arm/left/robot/teshvali_advanced
name = "advanced left raptorial forelimb"
desc = "An advanced robotic hindlimb. These designs are usually reserved for those still on the search for Avalon."
icon_static = 'modular_zubbers/modules/tesh-vali_augments/icons/advanced_augments_teshvali.dmi'
icon = 'modular_zubbers/modules/tesh-vali_augments/icons/advanced_augments_teshvali.dmi'
bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM

unarmed_damage_low = TESHARI_PUNCH_LOW * 2
unarmed_damage_high = TESHARI_PUNCH_HIGH * 3

brute_modifier = 0.8
burn_modifier = 1

max_damage = LIMB_MAX_HP_ADVANCED
body_damage_coeff = LIMB_BODY_DAMAGE_COEFFICIENT_ADVANCED

biological_state = (BIO_METAL|BIO_JOINTED)

/obj/item/bodypart/arm/right/robot/teshvali_advanced
name = "advanced right raptorial forelimb"
desc = "An advanced robotic hindlimb. These designs are usually reserved for those still on the search for Avalon."
icon_static = 'modular_zubbers/modules/tesh-vali_augments/icons/advanced_augments_teshvali.dmi'
icon = 'modular_zubbers/modules/tesh-vali_augments/icons/advanced_augments_teshvali.dmi'
bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM

unarmed_damage_low = TESHARI_PUNCH_LOW * 2
unarmed_damage_high = TESHARI_PUNCH_HIGH * 3

brute_modifier = 0.8
burn_modifier = 1

max_damage = LIMB_MAX_HP_ADVANCED
body_damage_coeff = LIMB_BODY_DAMAGE_COEFFICIENT_ADVANCED

biological_state = (BIO_METAL|BIO_JOINTED)

/obj/item/bodypart/leg/left/robot/teshvali_advanced
name = "advanced left raptorial hindlimb"
desc = "An advanced robotic hindlimb. These designs are usually reserved for those still on the search for Avalon."
icon_static = 'modular_zubbers/modules/tesh-vali_augments/icons/advanced_augments_teshvali.dmi'
icon = 'modular_zubbers/modules/tesh-vali_augments/icons/advanced_augments_teshvali.dmi'
bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM

unarmed_damage_low = TESHARI_PUNCH_LOW * 2
unarmed_damage_high = TESHARI_PUNCH_HIGH * 3

brute_modifier = 0.8
burn_modifier = 1

max_damage = LIMB_MAX_HP_ADVANCED
body_damage_coeff = LIMB_BODY_DAMAGE_COEFFICIENT_ADVANCED

biological_state = (BIO_METAL|BIO_JOINTED)

/obj/item/bodypart/leg/right/robot/teshvali_advanced
name = "advanced right raptorial hindlimb"
desc = "An advanced robotic hindlimb. These designs are usually reserved for those still on the search for Avalon."
icon_static = 'modular_zubbers/modules/tesh-vali_augments/icons/advanced_augments_teshvali.dmi'
icon = 'modular_zubbers/modules/tesh-vali_augments/icons/advanced_augments_teshvali.dmi'
bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM

unarmed_damage_low = TESHARI_PUNCH_LOW * 2
unarmed_damage_high = TESHARI_PUNCH_HIGH * 3

brute_modifier = 0.8
burn_modifier = 1

max_damage = LIMB_MAX_HP_ADVANCED
body_damage_coeff = LIMB_BODY_DAMAGE_COEFFICIENT_ADVANCED

biological_state = (BIO_METAL|BIO_JOINTED)

/obj/item/bodypart/arm/left/robot/teshvali_advanced
name = "advanced left raptorial forelimb"
desc = "An advanced robotic hindlimb. These designs are usually reserved for those still on the search for Avalon."
icon_static = 'modular_zubbers/modules/tesh-vali_augments/icons/advanced_augments_teshvali.dmi'
icon = 'modular_zubbers/modules/tesh-vali_augments/icons/advanced_augments_teshvali.dmi'
bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM

unarmed_damage_low = TESHARI_PUNCH_LOW * 2
unarmed_damage_high = TESHARI_PUNCH_HIGH * 3

brute_modifier = 1
burn_modifier = 0.9

max_damage = LIMB_MAX_HP_ADVANCED
body_damage_coeff = LIMB_BODY_DAMAGE_COEFFICIENT_ADVANCED

biological_state = (BIO_METAL|BIO_JOINTED)

/obj/item/bodypart/arm/right/robot/teshvali_advanced
name = "advanced right raptorial forelimb"
desc = "An advanced robotic hindlimb. These designs are usually reserved for those still on the search for Avalon."
icon_static = 'modular_zubbers/modules/tesh-vali_augments/icons/advanced_augments_teshvali.dmi'
icon = 'modular_zubbers/modules/tesh-vali_augments/icons/advanced_augments_teshvali.dmi'
bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM

unarmed_damage_low = TESHARI_PUNCH_LOW * 2
unarmed_damage_high = TESHARI_PUNCH_HIGH * 3

brute_modifier = 1
burn_modifier = 0.9

max_damage = LIMB_MAX_HP_ADVANCED
body_damage_coeff = LIMB_BODY_DAMAGE_COEFFICIENT_ADVANCED

biological_state = (BIO_METAL|BIO_JOINTED)

/obj/item/bodypart/leg/left/robot/teshvali_advanced
name = "advanced left raptorial hindlimb"
desc = "An advanced robotic hindlimb. These designs are usually reserved for those still on the search for Avalon."
icon_static = 'modular_zubbers/modules/tesh-vali_augments/icons/advanced_augments_teshvali.dmi'
icon = 'modular_zubbers/modules/tesh-vali_augments/icons/advanced_augments_teshvali.dmi'
bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM

unarmed_damage_low = TESHARI_PUNCH_LOW * 2
unarmed_damage_high = TESHARI_PUNCH_HIGH * 3

brute_modifier = 1
burn_modifier = 0.9

max_damage = LIMB_MAX_HP_ADVANCED
body_damage_coeff = LIMB_BODY_DAMAGE_COEFFICIENT_ADVANCED

biological_state = (BIO_METAL|BIO_JOINTED)

/obj/item/bodypart/leg/right/robot/teshvali_advanced
name = "advanced right raptorial hindlimb"
desc = "An advanced robotic hindlimb. These designs are usually reserved for those still on the search for Avalon."
icon_static = 'modular_zubbers/modules/tesh-vali_augments/icons/advanced_augments_teshvali.dmi'
icon = 'modular_zubbers/modules/tesh-vali_augments/icons/advanced_augments_teshvali.dmi'
bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM

unarmed_damage_low = TESHARI_PUNCH_LOW * 2
unarmed_damage_high = TESHARI_PUNCH_HIGH * 3

brute_modifier = 1
burn_modifier = 0.9

max_damage = LIMB_MAX_HP_ADVANCED
body_damage_coeff = LIMB_BODY_DAMAGE_COEFFICIENT_ADVANCED

biological_state = (BIO_METAL|BIO_JOINTED)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
/*
additional augment options for "modular_skyrat/modules/customization/modules/client/augment/limbs.dm"
to account for teshari limbs. this is a temporary measure for testing purposes
For some reason, these won't show up in the roundstart options when when slotted into
"modular_skyrat\modules\customization\modules\client\augment\limbs.dm".
so... idfk
this goes into the augment preferences section. They do not use the appearance dropdown for obvious reason.
*/

/datum/augment_item/limb/head/teshvali_cyborg
Expand Down
Binary file not shown.
6 changes: 6 additions & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -8356,6 +8356,12 @@
#include "modular_zubbers\modules\quirks\code\neutral_quirks\waddle.dm"
#include "modular_zubbers\modules\space_background\parallax.dm"
#include "modular_zubbers\modules\space_background\turf_space.dm"
#include "modular_zubbers\modules\tesh-vali_augments\code\__DEFINES\research\research_categories.dm"
#include "modular_zubbers\modules\tesh-vali_augments\code\modules\research\designs\mechfabricator_designs.dm"
#include "modular_zubbers\modules\tesh-vali_augments\code\modules\research\techweb\all_nodes.dm"
#include "modular_zubbers\modules\tesh-vali_augments\code\surgery\bodyparts\robot_bodyparts.dm"
#include "modular_zubbers\modules\tesh-vali_augments\customization\_globalvars\lists.dm"
#include "modular_zubbers\modules\tesh-vali_augments\customization\modules\client\augment\limbs.dm"
#include "modular_zubbers\modules\title_screen\code\title_screen_subsystem.dm"
#include "modular_zubbers\modules\vetted\examine.dm"
#include "modular_zubbers\modules\vetted\vetted.dm"
Expand Down

0 comments on commit 25be46a

Please sign in to comment.