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

Synthetic internal powercell #4559

Merged
merged 18 commits into from
Nov 22, 2023
Merged

Synthetic internal powercell #4559

merged 18 commits into from
Nov 22, 2023

Conversation

QuickLode
Copy link
Contributor

@QuickLode QuickLode commented Oct 1, 2023

About the pull request

This PR should tackle two things:

  1. Synths shouldn't lose blood
  2. Synths shouldn't feel woozy (RP)

revives #3589 from ghostsheet

Explain why it's good for the game

Synthetics should not be feeling woozy. They also shouldn't be going blind from bloodloss.

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

https://cdn.discordapp.com/attachments/490668342357786645/1157856898834497536/image.png?ex=651a21c4&is=6518d044&hm=813abcc8be5fd02367499e24651c97b7f840d8bcbc557364c534f1c0a61f25f5&

https://cdn.discordapp.com/attachments/490668342357786645/1157856899132305529/image.png?ex=651a21c4&is=6518d044&hm=d9fb14dcaa5eb9fa8ad1280636a5f8f188a72e0e5045b892fc29192046acd139&

Changelog

🆑
add: Damage to Synthetic's internal causes debuffs, eventual powercell failure.(death)
fix: Synthetic's should no longer lose blood.
code: moves blood proc to human.dm from blood.dm with above changes.
/:cl:

@github-actions github-actions bot added the Fix Fix one bug, make ten more label Oct 1, 2023
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Oct 1, 2023
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Oct 1, 2023
code/modules/mob/living/blood.dm Outdated Show resolved Hide resolved
code/modules/mob/living/blood.dm Outdated Show resolved Hide resolved
@morrowwolf morrowwolf marked this pull request as draft October 1, 2023 04:54
@Diegoflores31
Copy link
Contributor

i though synths have milky blood . pretty sure winout it they would run non-optimally

@QuickLode
Copy link
Contributor Author

this took me two additional hours but i think its in a borderline perfect spot now

@QuickLode QuickLode marked this pull request as ready for review October 9, 2023 00:29
code/modules/mob/living/blood.dm Outdated Show resolved Hide resolved
code/modules/mob/living/blood.dm Outdated Show resolved Hide resolved
code/modules/mob/living/blood.dm Outdated Show resolved Hide resolved
@realforest2001 realforest2001 marked this pull request as draft October 9, 2023 08:48
@QuickLode QuickLode marked this pull request as ready for review October 10, 2023 02:10
Copy link
Member

@harryob harryob left a comment

Choose a reason for hiding this comment

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

i can't help but feel this is making life code even more annoying but c'est la vie

code/modules/mob/living/blood.dm Outdated Show resolved Hide resolved
code/modules/mob/living/blood.dm Outdated Show resolved Hide resolved
code/modules/mob/living/blood.dm Outdated Show resolved Hide resolved
code/modules/mob/living/blood.dm Outdated Show resolved Hide resolved
@github-actions
Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Oct 27, 2023
Copy link
Contributor

@Diegoflores31 Diegoflores31 left a comment

Choose a reason for hiding this comment

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

along with that since you are touching their blood . when a synth looses all its blood and you try to revive it will instantly die . i would recomend adding maybe a "synthetic blood" to medbay or something so it can be replenished ? + also would be good if synth blood level showed up on the health analyzer

@@ -58,16 +62,22 @@
var/word = pick("dizzy","woozy","faint")
Copy link
Contributor

Choose a reason for hiding this comment

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

you forgot this part

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Wdym?

Copy link
Member

Choose a reason for hiding this comment

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

it'll still say "You feel very dizzy/woozy/faint"

code/modules/mob/living/blood.dm Outdated Show resolved Hide resolved
code/modules/mob/living/blood.dm Outdated Show resolved Hide resolved
@@ -58,16 +62,22 @@
var/word = pick("dizzy","woozy","faint")
Copy link
Member

Choose a reason for hiding this comment

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

it'll still say "You feel very dizzy/woozy/faint"

@harryob
Copy link
Member

harryob commented Nov 6, 2023

really the whole handle_blood proc should be offlaoded to /datum/species for /humans

@QuickLode
Copy link
Contributor Author

QuickLode commented Nov 6, 2023

@QuickLode
Copy link
Contributor Author

idk if you guys mean the syntax but both things work rn. I'll update what I think you are talking about.

https://cdn.discordapp.com/attachments/637832143887663147/1171136482287829062/image.png?ex=655b94d8&is=65491fd8&hm=a98421a6c2ca43eb76408912481bd2cd2958c914269fb5c2620ab2ea0f6ac323&

@github-actions github-actions bot removed the Stale beg a maintainer to review your PR label Nov 7, 2023
Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Nov 17, 2023
Copy link
Contributor

@Zonespace27 Zonespace27 left a comment

Choose a reason for hiding this comment

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

Balance fine; the code for this is a bit gross but 🤷

@Zonespace27 Zonespace27 added Feature Feature coder badge Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. and removed Stale beg a maintainer to review your PR labels Nov 22, 2023
@Zonespace27 Zonespace27 added this pull request to the merge queue Nov 22, 2023
Merged via the queue into cmss13-devs:master with commit 170f3cd Nov 22, 2023
26 checks passed
cm13-github added a commit that referenced this pull request Nov 22, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Feature Feature coder badge Fix Fix one bug, make ten more
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants