-
Notifications
You must be signed in to change notification settings - Fork 122
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Adds cybernetic limb markings from Hesphiastos Industries and Bishop Cybernetics, originally from Deepstation. Also cherry-picks this [PR](SS14-Classic/deep-station-14#39) by @WarMechanic from Deep that increases arm and leg markings available for suitable species from 2 to 6. This allows players to cover all limbs with cybernetics. --- <details><summary><h1>Media</h1></summary> <p> ![image](https://github.com/user-attachments/assets/49eb49c0-4f0c-4346-8463-524a75613f8a) ![image](https://github.com/user-attachments/assets/1d1698a4-4b7b-4c5e-86f5-1c237db25c19) </p> </details> --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: Skubman - add: Added cybernetic limb markings from Hesphiastos Industries and Bishop Cybernetics. --------- Co-authored-by: WarMechanic <[email protected]>
- Loading branch information
1 parent
54c119e
commit 56d039c
Showing
57 changed files
with
546 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
marking-MobIPCHeadDefault = Standard Operational Monitor | ||
marking-MobIPCTorsoDefault = Standard Robotic Chassis | ||
marking-MobIPCTorsoFemaleDefault = Standard Robotic Chassis | ||
marking-MobIPCLArmDefault = Standard Left Robotic Arm | ||
marking-MobIPCLHandDefault = Standard Left Robotic Hand | ||
marking-MobIPCLLegDefault = Standard Left Robotic Leg | ||
marking-MobIPCLFootDefault = Standard Left Robotic Foot | ||
marking-MobIPCRArmDefault = Standard Right Robotic Arm | ||
marking-MobIPCRHandDefault = Standard Right Robotic Hand | ||
marking-MobIPCRLegDefault = Standard Right Robotic Leg | ||
marking-MobIPCRFootDefault = Standard Right Robotic Foot | ||
marking-CyberLimbsMarkingBishopHead = Operational Monitor from Bishop Cybernetics | ||
marking-CyberLimbsMarkingBishopChest = Robotic Chassis from Bishop Cybernetics | ||
marking-CyberLimbsMarkingBishopLArm = Left Robotic Arm from Bishop Cybernetics | ||
marking-CyberLimbsMarkingBishopLHand = Left Robotic Hand from Bishop Cybernetics | ||
marking-CyberLimbsMarkingBishopLLeg = Left Robotic Leg from Bishop Cybernetics | ||
marking-CyberLimbsMarkingBishopLFoot = Left Robotic Foot from Bishop Cybernetics | ||
marking-CyberLimbsMarkingBishopRArm = Right Robotic Arm from Bishop Cybernetics | ||
marking-CyberLimbsMarkingBishopRHand = Right Robotic Hand from Bishop Cybernetics | ||
marking-CyberLimbsMarkingBishopRLeg = Right Robotic Leg from Bishop Cybernetics | ||
marking-CyberLimbsMarkingBishopRFoot = Right Robotic Foot from Bishop Cybernetics | ||
marking-CyberLimbsMarkingHesphiastosHead = Operational Monitor from Hesphiastos Industries | ||
marking-CyberLimbsMarkingHesphiastosChest = Robotic Chassis from Hesphiastos Industries | ||
marking-CyberLimbsMarkingHesphiastosLArm = Left Robotic Arm from Hesphiastos Industries | ||
marking-CyberLimbsMarkingHesphiastosLHand = Left Robotic Hand from Hesphiastos Industries | ||
marking-CyberLimbsMarkingHesphiastosLLeg = Left Robotic Leg from Hesphiastos Industries | ||
marking-CyberLimbsMarkingHesphiastosLFoot = Left Robotic Foot from Hesphiastos Industries | ||
marking-CyberLimbsMarkingHesphiastosRArm = Right Robotic Arm from Hesphiastos Industries | ||
marking-CyberLimbsMarkingHesphiastosRHand = Right Robotic Hand from Hesphiastos Industries | ||
marking-CyberLimbsMarkingHesphiastosRLeg = Right Robotic Leg from Hesphiastos Industries | ||
marking-CyberLimbsMarkingHesphiastosRFoot = Right Robotic Foot from Hesphiastos Industries | ||
marking-CyberLimbsMarkingWardtakahashiHead = Operational Monitor from Ward-Takahashi | ||
marking-CyberLimbsMarkingWardtakahashiChest = Robotic Chassis from Ward-Takahashi | ||
marking-CyberLimbsMarkingWardtakahashiLArm = Left Robotic Arm from Ward-Takahashi | ||
marking-CyberLimbsMarkingWardtakahashiLHand = Left Robotic Hand from Ward-Takahashi | ||
marking-CyberLimbsMarkingWardtakahashiLLeg = Left Robotic Leg from Ward-Takahashi | ||
marking-CyberLimbsMarkingWardtakahashiLFoot = Left Robotic Foot from Ward-Takahashi | ||
marking-CyberLimbsMarkingWardtakahashiRArm = Right Robotic Arm from Ward-Takahashi | ||
marking-CyberLimbsMarkingWardtakahashiRHand = Right Robotic Hand from Ward-Takahashi | ||
marking-CyberLimbsMarkingWardtakahashiRLeg = Right Robotic Leg from Ward-Takahashi | ||
marking-CyberLimbsMarkingWardtakahashiRFoot = Right Robotic Foot from Ward-Takahashi | ||
marking-CyberLimbsMarkingXionHead = Operational Monitor from Xion Manufacturing Group | ||
marking-CyberLimbsMarkingXionChest = Robotic Chassis from Xion Manufacturing Group | ||
marking-CyberLimbsMarkingXionLArm = Left Robotic Arm from Xion Manufacturing Group | ||
marking-CyberLimbsMarkingXionLHand = Left Robotic Hand from Xion Manufacturing Group | ||
marking-CyberLimbsMarkingXionLLeg = Left Robotic Leg from Xion Manufacturing Group | ||
marking-CyberLimbsMarkingXionLFoot = Left Robotic Foot from Xion Manufacturing Group | ||
marking-CyberLimbsMarkingXionRArm = Right Robotic Arm from Xion Manufacturing Group | ||
marking-CyberLimbsMarkingXionRHand = Right Robotic Hand from Xion Manufacturing Group | ||
marking-CyberLimbsMarkingXionRLeg = Right Robotic Leg from Xion Manufacturing Group | ||
marking-CyberLimbsMarkingXionRFoot = Right Robotic Foot from Xion Manufacturing Group | ||
marking-CyberLimbsMarkingShellguardHead = Operational Monitor from Shellguard Munitions | ||
marking-CyberLimbsMarkingShellguardChest = Robotic Chassis from Shellguard Munitions | ||
marking-CyberLimbsMarkingShellguardLArm = Left Robotic Arm from Shellguard Munitions | ||
marking-CyberLimbsMarkingShellguardLHand = Left Robotic Hand from Shellguard Munitions | ||
marking-CyberLimbsMarkingShellguardLLeg = Left Robotic Leg from Shellguard Munitions | ||
marking-CyberLimbsMarkingShellguardLFoot = Left Robotic Foot from Shellguard Munitions | ||
marking-CyberLimbsMarkingShellguardRArm = Right Robotic Arm from Shellguard Munitions | ||
marking-CyberLimbsMarkingShellguardRHand = Right Robotic Hand from Shellguard Munitions | ||
marking-CyberLimbsMarkingShellguardRLeg = Right Robotic Leg from Shellguard Munitions | ||
marking-CyberLimbsMarkingShellguardRFoot = Right Robotic Foot from Shellguard Munitions | ||
marking-CyberLimbsMarkingMorpheusHead = Operational Monitor from Morpheus Cyberkinetics | ||
marking-CyberLimbsMarkingMorpheusChest = Robotic Chassis from Morpheus Cyberkinetics | ||
marking-CyberLimbsMarkingMorpheusLArm = Left Robotic Arm from Morpheus Cyberkinetics | ||
marking-CyberLimbsMarkingMorpheusLHand = Left Robotic Hand from Morpheus Cyberkinetics | ||
marking-CyberLimbsMarkingMorpheusLLeg = Left Robotic Leg from Morpheus Cyberkinetics | ||
marking-CyberLimbsMarkingMorpheusLFoot = Left Robotic Foot from Morpheus Cyberkinetics | ||
marking-CyberLimbsMarkingMorpheusRArm = Right Robotic Arm from Morpheus Cyberkinetics | ||
marking-CyberLimbsMarkingMorpheusRHand = Right Robotic Hand from Morpheus Cyberkinetics | ||
marking-CyberLimbsMarkingMorpheusRLeg = Right Robotic Leg from Morpheus Cyberkinetics | ||
marking-CyberLimbsMarkingMorpheusRFoot = Right Robotic Foot from Morpheus Cyberkinetics |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
110 changes: 110 additions & 0 deletions
110
Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/bishop.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,110 @@ | ||
- type: marking | ||
id: CyberLimbsMarkingBishopHead | ||
bodyPart: Head | ||
markingCategory: Head | ||
speciesRestriction: [IPC] | ||
sprites: | ||
- sprite: Mobs/Customization/cyberlimbs/bishop/bishop_monitor.rsi | ||
state: head | ||
- sprite: Mobs/Customization/cyberlimbs/bishop/bishop_monitor.rsi | ||
state: head-2 | ||
|
||
- type: marking | ||
id: CyberLimbsMarkingBishopChest | ||
bodyPart: Chest | ||
markingCategory: Chest | ||
speciesRestriction: [IPC] | ||
sprites: | ||
- sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi | ||
state: torso-primary | ||
- sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi | ||
state: torso-secondary | ||
|
||
- type: marking | ||
id: CyberLimbsMarkingBishopLArm | ||
bodyPart: LArm | ||
markingCategory: Arms | ||
speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] | ||
sprites: | ||
- sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi | ||
state: l_arm-primary | ||
- sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi | ||
state: l_arm-secondary | ||
- sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi | ||
state: l_arm-tertiary | ||
|
||
- type: marking | ||
id: CyberLimbsMarkingBishopLHand | ||
bodyPart: LHand | ||
markingCategory: Arms | ||
speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] | ||
sprites: | ||
- sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi | ||
state: l_hand | ||
|
||
- type: marking | ||
id: CyberLimbsMarkingBishopLLeg | ||
bodyPart: LLeg | ||
markingCategory: Legs | ||
speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] | ||
sprites: | ||
- sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi | ||
state: l_leg-primary | ||
- sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi | ||
state: l_leg-secondary | ||
|
||
|
||
- type: marking | ||
id: CyberLimbsMarkingBishopLFoot | ||
bodyPart: LFoot | ||
markingCategory: Legs | ||
speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] | ||
sprites: | ||
- sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi | ||
state: l_foot | ||
|
||
|
||
|
||
- type: marking | ||
id: CyberLimbsMarkingBishopRArm | ||
bodyPart: RArm | ||
markingCategory: Arms | ||
speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] | ||
sprites: | ||
- sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi | ||
state: r_arm-primary | ||
- sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi | ||
state: r_arm-secondary | ||
- sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi | ||
state: r_arm-tertiary | ||
|
||
|
||
- type: marking | ||
id: CyberLimbsMarkingBishopRHand | ||
bodyPart: RHand | ||
markingCategory: Arms | ||
speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] | ||
sprites: | ||
- sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi | ||
state: r_hand | ||
|
||
- type: marking | ||
id: CyberLimbsMarkingBishopRLeg | ||
bodyPart: RLeg | ||
markingCategory: Legs | ||
speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] | ||
sprites: | ||
- sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi | ||
state: r_leg-primary | ||
- sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi | ||
state: r_leg-secondary | ||
|
||
|
||
- type: marking | ||
id: CyberLimbsMarkingBishopRFoot | ||
bodyPart: RFoot | ||
markingCategory: Legs | ||
speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] | ||
sprites: | ||
- sprite: Mobs/Customization/cyberlimbs/bishop/bishop_main.rsi | ||
state: r_foot |
115 changes: 115 additions & 0 deletions
115
Resources/Prototypes/Entities/Mobs/Customization/cyberlimbs/hesphiastos.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,115 @@ | ||
- type: marking | ||
id: CyberLimbsMarkingHesphiastosHead | ||
bodyPart: Head | ||
markingCategory: Head | ||
speciesRestriction: [IPC] | ||
sprites: | ||
- sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_monitor.rsi | ||
state: head-1 | ||
- sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_monitor.rsi | ||
state: head-2 | ||
|
||
- type: marking | ||
id: CyberLimbsMarkingHesphiastosChest | ||
bodyPart: Chest | ||
markingCategory: Chest | ||
speciesRestriction: [IPC] | ||
sprites: | ||
- sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi | ||
state: torso-1 | ||
- sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi | ||
state: torso-2 | ||
|
||
- type: marking | ||
id: CyberLimbsMarkingHesphiastosLArm | ||
bodyPart: LArm | ||
markingCategory: Arms | ||
speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] | ||
sprites: | ||
- sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi | ||
state: l_arm-1 | ||
- sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi | ||
state: l_arm-2 | ||
|
||
- type: marking | ||
id: CyberLimbsMarkingHesphiastosLHand | ||
bodyPart: LHand | ||
markingCategory: Arms | ||
speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] | ||
sprites: | ||
- sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi | ||
state: l_hand-1 | ||
- sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi | ||
state: l_hand-2 | ||
|
||
- type: marking | ||
id: CyberLimbsMarkingHesphiastosLLeg | ||
bodyPart: LLeg | ||
markingCategory: Legs | ||
speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] | ||
sprites: | ||
- sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi | ||
state: l_leg-1 | ||
- sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi | ||
state: l_leg-2 | ||
|
||
|
||
- type: marking | ||
id: CyberLimbsMarkingHesphiastosLFoot | ||
bodyPart: LFoot | ||
markingCategory: Legs | ||
speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] | ||
sprites: | ||
- sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi | ||
state: l_foot-1 | ||
- sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi | ||
state: l_foot-2 | ||
|
||
|
||
|
||
- type: marking | ||
id: CyberLimbsMarkingHesphiastosRArm | ||
bodyPart: RArm | ||
markingCategory: Arms | ||
speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] | ||
sprites: | ||
- sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi | ||
state: r_arm-1 | ||
- sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi | ||
state: r_arm-2 | ||
|
||
|
||
- type: marking | ||
id: CyberLimbsMarkingHesphiastosRHand | ||
bodyPart: RHand | ||
markingCategory: Arms | ||
speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] | ||
sprites: | ||
- sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi | ||
state: r_hand-1 | ||
- sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi | ||
state: r_hand-2 | ||
|
||
|
||
- type: marking | ||
id: CyberLimbsMarkingHesphiastosRLeg | ||
bodyPart: RLeg | ||
markingCategory: Legs | ||
speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] | ||
sprites: | ||
- sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi | ||
state: r_leg-1 | ||
- sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi | ||
state: r_leg-2 | ||
|
||
|
||
- type: marking | ||
id: CyberLimbsMarkingHesphiastosRFoot | ||
bodyPart: RFoot | ||
markingCategory: Legs | ||
speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] | ||
sprites: | ||
- sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi | ||
state: r_foot-1 | ||
- sprite: Mobs/Customization/cyberlimbs/hesphiastos/hesphiastos_main.rsi | ||
state: r_foot-2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -35,8 +35,8 @@ | |
points: 1 | ||
required: false | ||
Legs: | ||
points: 2 | ||
points: 6 | ||
required: false | ||
Arms: | ||
points: 2 | ||
points: 6 | ||
required: false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -35,8 +35,8 @@ | |
points: 1 | ||
required: false | ||
Legs: | ||
points: 2 | ||
points: 6 | ||
required: false | ||
Arms: | ||
points: 2 | ||
points: 6 | ||
required: false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+1.03 KB
Resources/Textures/Mobs/Customization/cyberlimbs/bishop/bishop_alt1.rsi/head.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.