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

Cyborgs Extended #132

Closed
wants to merge 15 commits into from

Conversation

OCOtheOmega
Copy link
Contributor

Description

TODO

Media

Changelog

Yeah its simple but look good, everything tested, no errors.

изображение

@github-actions github-actions bot added Changes: Localization Changes any ftl files Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an rsi Status: Needs Review Someone please review this labels May 8, 2023
@github-actions
Copy link

github-actions bot commented May 8, 2023

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

Resources/Textures/Interface/Misc/job_icons.rsi

State Old New Status
Cyborg Modified
MedicalCyborg Modified
ClownCyborg Added
EngineerCyborg Added
JanitorCyborg Added
SecurityCyborg Added
ServiceCyborg Added
ShaftMinerCyborg Added

Resources/Textures/SimpleStation14/Mobs/Silicon/clown_cyborg.rsi

State Old New Status
robot-dead Added
robot-flashlight Added
robot Added

Resources/Textures/SimpleStation14/Mobs/Silicon/engineer_cyborg.rsi

State Old New Status
robot-dead Added
robot-flashlight Added
robot Added

Resources/Textures/SimpleStation14/Mobs/Silicon/janitor_cyborg.rsi

State Old New Status
robot-dead Added
robot-flashlight Added
robot Added

Resources/Textures/SimpleStation14/Mobs/Silicon/security_cyborg.rsi

State Old New Status
robot-dead Added
robot-flashlight Added
robot Added

Resources/Textures/SimpleStation14/Mobs/Silicon/service_cyborg.rsi

State Old New Status
robot-dead Added
robot-flashlight Added
robot Added

Resources/Textures/SimpleStation14/Mobs/Silicon/shaftminer_cyborg.rsi

State Old New Status
robot-dead Added
robot-flashlight Added
robot Added

Edit: diff updated after c8e3632

Copy link
Member

@DEATHB4DEFEAT DEATHB4DEFEAT left a comment

Choose a reason for hiding this comment

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

lots of redundant redefinitions

Copy link
Member

@Pspritechologist Pspritechologist left a comment

Choose a reason for hiding this comment

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

This is pretty dang cool, but I am concerned that it only increases the severity of the existing issue with Cyborgs.
The Janitor Cyborg in particular effectively entirely replaces the Janitor themselves in terms of usefulness, they're stronger, better at doing their job, etc.. Cyborgs are fine in a limited extent, but these ones I worry will significantly displace existing jobs.

Gados ReCreator and others added 2 commits May 9, 2023 03:11
@OCOtheOmega
Copy link
Contributor Author

OCOtheOmega commented May 9, 2023

Yep it need add after IPC merge
Make cyborgs more special
For future need add charge to sec cyborg tools but it IPC moment

@DEATHB4DEFEAT DEATHB4DEFEAT added Priority: 3-Medium Needs to be resolved at some point Size: Medium For medium issues/PRs Status: Needs Discussion Must be discussed labels May 18, 2023
@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jun 7, 2023
@github-actions
Copy link

github-actions bot commented Jun 7, 2023

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

@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Jul 4, 2023
@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jul 23, 2023
@github-actions
Copy link

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

@OCOtheOmega
Copy link
Contributor Author

Well wiz start make own cyborgs, soo this usless.

@OCOtheOmega OCOtheOmega closed this Aug 2, 2023
@OCOtheOmega OCOtheOmega deleted the cyborg-extended branch August 11, 2023 19:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Changes any ftl files Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an rsi Priority: 3-Medium Needs to be resolved at some point Size: Medium For medium issues/PRs Status: Merge Conflict FIX YOUR PR AAAGH Status: Needs Discussion Must be discussed Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants