-
Notifications
You must be signed in to change notification settings - Fork 478
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
base: master
Are you sure you want to change the base?
Add Advanced Compact Defibrilator #2713
Conversation
RSI Diff Bot; head commit bac5aaa merging into 7d0797a Resources/Textures/_DV/Objects/Medical/advancedcompactdefib.rsi
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please fix these
Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/defib.yml
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
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.
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. |
I just realized I forgot to add it to CMO's locker anyways |
Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/defib.yml
Outdated
Show resolved
Hide resolved
Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/defib.yml
Outdated
Show resolved
Hide resolved
Resources/Textures/_DV/Objects/Medical/advancedcompactdefib.rsi/meta.json
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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 | |||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
untouch this please
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
{ | ||
"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" | ||
} | ||
] | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reindent
{ | |
"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" | |
} | |
] | |
} |
#3365 was merged without needing this due to wizden already making their own version |
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
Breaking changes
Changelog
🆑Tryded