Skip to content

Add Advanced Compact Defibrilator #2713

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

Open
wants to merge 7 commits into
base: master
Choose a base branch
from

Conversation

Tryded
Copy link
Contributor

@Tryded Tryded commented Jan 12, 2025

About the PR

adds advanced compact debrilator that the CMO owns. It fits around the belt and has infinite charge, making it immune to EMPs. It is also a steal objective.

Why / Balance

Parity with SS13 and #2552 needs this

Technical details

YAML

Media

Requirements

  • I have tested all added content and changes.
  • I have added media to this PR or it does not require an ingame showcase.

Breaking changes

Changelog

🆑Tryded

  • add: Added the advanced compact defibrillator for the Chief Medical Officer. It has infinite charges and is immune to EMPs, however it is a steal objective for traitors.

@Tryded Tryded requested review from a team as code owners January 12, 2025 20:24
@github-actions github-actions bot added S: Needs Review Changes: YML Changes any yml files Changes: Sprite Changes any png or json in an rsi size/M 64-255 lines and removed S: Needs Review labels Jan 12, 2025
Copy link
Contributor

github-actions bot commented Jan 12, 2025

RSI Diff Bot; head commit bac5aaa merging into 7d0797a
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_DV/Objects/Medical/advancedcompactdefib.rsi

State Old New Status
equipped-BELT Added
icon Added
inhand-left Added
inhand-right Added
screen Added

Edit: diff updated after bac5aaa

Copy link
Contributor

@Radezolid Radezolid left a comment

Choose a reason for hiding this comment

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

Please fix these

Copy link
Contributor

Choose a reason for hiding this comment

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

Four space indent on the json.

@ThataKat
Copy link
Contributor

Direction here, after taking a day to review this we ask that you don't give this to the CMO (and remove the associated steal objective). Our general preference is to have heads of staff be focused on leadership rather than elite versions of the standard departmental role.

The item itself is still good to go since it's necessary for your proposed ERT rework.

@Tryded
Copy link
Contributor Author

Tryded commented Jan 14, 2025

I just realized I forgot to add it to CMO's locker anyways

@github-actions github-actions bot added size/S 16-63 lines and removed size/M 64-255 lines labels Jan 16, 2025
Copy link
Contributor

Choose a reason for hiding this comment

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

JSON still needs to be indented with four spaces. For an example check out the foam sabre meta.json

Copy link
Contributor

Choose a reason for hiding this comment

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

End of File newline is needed

@@ -50,7 +50,7 @@
- type: StealCondition
stealGroup: AnimalSilvia
owner: job-name-cmo

Copy link
Contributor

Choose a reason for hiding this comment

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

untouch this please

Copy link
Contributor

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

@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Feb 18, 2025
Comment on lines +1 to +29
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from Paradise Staiton in commit https://github.com/ParadiseSS13/Paradise/pull/15783/commits/7b342f4476bfface771aaa74db5e701dab64131d inhand sprites by Tryded",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-BELT",
"directions": 4
},
{
"name": "screen"
}
]
}
Copy link
Member

Choose a reason for hiding this comment

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

Reindent

Suggested change
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from Paradise Staiton in commit https://github.com/ParadiseSS13/Paradise/pull/15783/commits/7b342f4476bfface771aaa74db5e701dab64131d inhand sprites by Tryded",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-BELT",
"directions": 4
},
{
"name": "screen"
}
]
}
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from Paradise Staiton in commit https://github.com/ParadiseSS13/Paradise/pull/15783/commits/7b342f4476bfface771aaa74db5e701dab64131d inhand sprites by Tryded",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-BELT",
"directions": 4
},
{
"name": "screen"
}
]
}

@Stop-Signs
Copy link
Contributor

#3365 was merged without needing this due to wizden already making their own version

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Merge Conflict Fix your PR! S: Needs Review size/S 16-63 lines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants