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.

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

Cyberorgans #1534

Merged
merged 27 commits into from
Jul 27, 2020
Merged

Cyberorgans #1534

merged 27 commits into from
Jul 27, 2020

Conversation

Tarmunora
Copy link
Member

@Tarmunora Tarmunora commented Jul 19, 2020

About the PR

Cyberorgan changes!
See design doc for details

Why's this needed?

current cyberorgans and emagged effects are boring stamina boosts mostly

Changelog

(u)Tarmunora:
(*)Reworked most cyberorgans and their emagged effects - notably removed blanket stamina buffs from cyberorgans

@Tarmunora Tarmunora added C-Balance Balance changes, buffs and nerfs C-Feature A new feature or enhancements to existing features C-Rework Reworks a feature WIP labels Jul 19, 2020
@Tarmunora Tarmunora requested a review from Kyle2143 July 19, 2020 08:33
@Daktangle
Copy link

I really like this. Adding some extra bonus to having cyberorgans, especially emagged ones, makes them feel worth using beyond just replacing dead organic ones.

demagging already-implanted organs is not supported functionality (will not clear abilites from mob)
@Tarmunora Tarmunora marked this pull request as ready for review July 19, 2020 21:04
@Tarmunora
Copy link
Member Author

Tarmunora commented Jul 19, 2020

Still needs sprites - otherwise ready to roll
Sprites done 🎉

@boring-cyborg boring-cyborg bot added the C-Sprites Automatically applied on any .dmi or icons folder change label Jul 19, 2020
@ZeWaka
Copy link
Member

ZeWaka commented Jul 21, 2020

is this still WIP?

@Tarmunora Tarmunora removed the WIP label Jul 21, 2020
code/obj/item/organs/organ_parent.dm Show resolved Hide resolved
code/obj/item/organ_holder.dm Outdated Show resolved Hide resolved
@@ -211,3 +211,16 @@ while(FALSE)
#define area_space_nopower(x) (x.type == /area || x.type == /area/allowGenerate || x.type == /area/allowGenerate/trench) //areas where we will skip searching for shit like APCs and that do not have innate power
//blahhh i think faster than istypes

#define ADD_STATUS_LIMIT(target, group, value)\
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this define really need to be here? I feel like this can be declared locally in the stomach.dm file since it's really only used in there.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's in here so that there's a general solution available if other people/projects want to play with non-global status effects caps 🤷. Could move it if needed

code/obj/item/organs/pancreas.dm Show resolved Hide resolved
code/obj/item/organ_holder.dm Show resolved Hide resolved
code/obj/item/organs/liver.dm Show resolved Hide resolved
@Tarmunora Tarmunora requested a review from Kyle2143 July 26, 2020 18:50
@Kyle2143 Kyle2143 merged commit 1786f71 into goonstation:master Jul 27, 2020
github-actions bot pushed a commit that referenced this pull request Jul 27, 2020
@Tarmunora Tarmunora deleted the cyberorgans branch August 17, 2020 05:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C-Balance Balance changes, buffs and nerfs C-Feature A new feature or enhancements to existing features C-Rework Reworks a feature C-Sprites Automatically applied on any .dmi or icons folder change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants