From d3ee9f8bc5d3ea83a0e977bee63e50d9ca65f66a Mon Sep 17 00:00:00 2001 From: mubururu_ <139181059+muburu@users.noreply.github.com> Date: Wed, 19 Mar 2025 20:43:00 -0500 Subject: [PATCH] some robotics inhands (#33676) * real * spacing stuff and fix tiny issue --- Resources/Prototypes/Body/Parts/silicon.yml | 12 + .../Specific/Robotics/borg_modules.yml | 221 ++++++++- Resources/Prototypes/borg_types.yml | 3 +- Resources/Prototypes/tags.yml | 3 + .../Misc/proximity_sensor.rsi/inhand-left.png | Bin 0 -> 187 bytes .../proximity_sensor.rsi/inhand-right.png | Bin 0 -> 186 bytes .../Misc/proximity_sensor.rsi/meta.json | 34 +- .../borgmodule.rsi/base-icon-inhand-left.png | Bin 0 -> 131 bytes .../borgmodule.rsi/base-icon-inhand-right.png | Bin 0 -> 136 bytes .../base-module-inhand-left.png | Bin 0 -> 185 bytes .../base-module-inhand-right.png | Bin 0 -> 187 bytes .../borgmodule.rsi/base-part-inhand-left.png | Bin 0 -> 220 bytes .../borgmodule.rsi/base-part-inhand-right.png | Bin 0 -> 223 bytes .../base-stripes-inhand-left.png | Bin 0 -> 141 bytes .../base-stripes-inhand-right.png | Bin 0 -> 143 bytes .../Robotics/borgmodule.rsi/meta.json | 288 ++++++----- .../cyborg_parts.rsi/borg-arm-inhand-left.png | Bin 0 -> 412 bytes .../borg-arm-inhand-right.png | Bin 0 -> 399 bytes .../borg-chest-inhand-left.png | Bin 0 -> 1013 bytes .../borg-chest-inhand-right.png | Bin 0 -> 1007 bytes .../borg-head-inhand-left.png | Bin 0 -> 702 bytes .../borg-head-inhand-right.png | Bin 0 -> 696 bytes .../cyborg_parts.rsi/borg-leg-inhand-left.png | Bin 0 -> 511 bytes .../borg-leg-inhand-right.png | Bin 0 -> 516 bytes .../Robotics/cyborg_parts.rsi/meta.json | 464 ++++++++++-------- 25 files changed, 659 insertions(+), 366 deletions(-) create mode 100644 Resources/Textures/Objects/Misc/proximity_sensor.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Misc/proximity_sensor.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-icon-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-icon-inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-module-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-module-inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-part-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-part-inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-stripes-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-stripes-inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-arm-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-arm-inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-chest-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-chest-inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-head-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-head-inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-leg-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-leg-inhand-right.png diff --git a/Resources/Prototypes/Body/Parts/silicon.yml b/Resources/Prototypes/Body/Parts/silicon.yml index 3b0f254096..9e6d8268c7 100644 --- a/Resources/Prototypes/Body/Parts/silicon.yml +++ b/Resources/Prototypes/Body/Parts/silicon.yml @@ -44,6 +44,8 @@ - Trash - BorgArm - BorgLArm + - type: Item + heldPrefix: borg-arm - type: entity id: RightArmBorg @@ -62,6 +64,8 @@ - Trash - BorgArm - BorgRArm + - type: Item + heldPrefix: borg-arm - type: entity id: LeftLegBorg @@ -80,6 +84,8 @@ - Trash - BorgLeg - BorgLLeg + - type: Item + heldPrefix: borg-leg - type: entity id: RightLegBorg @@ -98,6 +104,8 @@ - Trash - BorgLeg - BorgRLeg + - type: Item + heldPrefix: borg-leg - type: entity id: LightHeadBorg @@ -114,6 +122,8 @@ tags: - Trash - BorgHead + - type: Item + heldPrefix: borg-head - type: entity id: TorsoBorg @@ -130,3 +140,5 @@ tags: - Trash - BorgTorso + - type: Item + heldPrefix: borg-chest diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml index ff8e983399..44855ccfa3 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -7,6 +7,23 @@ components: - type: Item storedRotation: -90 + inhandVisuals: + left: + - state: base-icon-inhand-left + color: "#8FCBCB" + - state: base-module-inhand-left + color: "#A1A1A1" + - state: base-part-inhand-left + - state: base-stripes-inhand-left + color: "#7D7D7D" + right: + - state: base-icon-inhand-right + color: "#8FCBCB" + - state: base-module-inhand-right + color: "#A1A1A1" + - state: base-part-inhand-right + - state: base-stripes-inhand-right + color: "#7D7D7D" - type: Sprite sprite: Objects/Specific/Robotics/borgmodule.rsi - type: BorgModule @@ -49,6 +66,22 @@ - type: Tag tags: - BorgModuleCargo + - type: Item + inhandVisuals: + left: + - state: base-icon-inhand-left + color: "#EBD8B7" + - state: base-module-inhand-left + color: "#613D1D" + - state: base-stripes-inhand-left + color: "#593718" + right: + - state: base-icon-inhand-right + color: "#EBD8B7" + - state: base-module-inhand-right + color: "#613D1D" + - state: base-stripes-inhand-right + color: "#593718" - type: entity id: BaseBorgModuleEngineering @@ -58,6 +91,24 @@ - type: Tag tags: - BorgModuleEngineering + - type: Item + inhandVisuals: + left: + - state: base-icon-inhand-left + color: "#8FCBCB" + - state: base-module-inhand-left + color: "#BA3939" + - state: base-part-inhand-left + - state: base-stripes-inhand-left + color: "#DEC343" + right: + - state: base-icon-inhand-right + color: "#8FCBCB" + - state: base-module-inhand-right + color: "#BA3939" + - state: base-part-inhand-right + - state: base-stripes-inhand-right + color: "#DEC343" - type: entity id: BaseBorgModuleJanitor @@ -67,6 +118,24 @@ - type: Tag tags: - BorgModuleJanitor + - type: Item + inhandVisuals: + left: + - state: base-icon-inhand-left + color: "#CFA2E4" + - state: base-module-inhand-left + color: "#753186" + - state: base-part-inhand-left + - state: base-stripes-inhand-left + color: "#404040" + right: + - state: base-icon-inhand-right + color: "#CFA2E4" + - state: base-module-inhand-right + color: "#753186" + - state: base-part-inhand-right + - state: base-stripes-inhand-right + color: "#404040" - type: entity id: BaseBorgModuleMedical @@ -76,6 +145,51 @@ - type: Tag tags: - BorgModuleMedical + - type: Item + inhandVisuals: + left: + - state: base-icon-inhand-left + color: "#EEF5F5" + - state: base-module-inhand-left + color: "#5A96BB" + - state: base-part-inhand-left + - state: base-stripes-inhand-left + color: "#C3C3C3" + right: + - state: base-icon-inhand-right + color: "#EEF5F5" + - state: base-module-inhand-right + color: "#5A96BB" + - state: base-part-inhand-right + - state: base-stripes-inhand-right + color: "#C3C3C3" + +- type: entity + id: BaseBorgModuleScience + parent: BaseBorgModule + abstract: true + components: + - type: Tag + tags: + - BorgModuleScience + - type: Item + inhandVisuals: + left: + - state: base-icon-inhand-left + color: "#FFAEB6" + - state: base-module-inhand-left + color: "#9C0DE1" + - state: base-part-inhand-left + - state: base-stripes-inhand-left + color: "#C3C3C3" + right: + - state: base-icon-inhand-right + color: "#FFAEB6" + - state: base-module-inhand-right + color: "#9C0DE1" + - state: base-part-inhand-right + - state: base-stripes-inhand-right + color: "#C3C3C3" - type: entity id: BaseBorgModuleService @@ -85,24 +199,79 @@ - type: Tag tags: - BorgModuleService + - type: Item + inhandVisuals: + left: + - state: base-icon-inhand-left + color: "#F3F3F3" + - state: base-module-inhand-left + color: "#3A3A3A" + - state: base-part-inhand-left + - state: base-stripes-inhand-left + color: "#313131" + right: + - state: base-icon-inhand-right + color: "#F3F3F3" + - state: base-module-inhand-right + color: "#3A3A3A" + - state: base-part-inhand-right + - state: base-stripes-inhand-right + color: "#313131" - type: entity id: BaseBorgModuleSyndicate parent: BaseBorgModule abstract: true components: - - type: Tag - tags: - - BorgModuleSyndicate + - type: Tag + tags: + - BorgModuleSyndicate + - type: Item + inhandVisuals: + left: + - state: base-icon-inhand-left + color: "#FF0000" + - state: base-module-inhand-left + color: "#891417" + - state: base-part-inhand-left + - state: base-stripes-inhand-left + color: "#7B0F12" + right: + - state: base-icon-inhand-right + color: "#FF0000" + - state: base-module-inhand-right + color: "#891417" + - state: base-part-inhand-right + - state: base-stripes-inhand-right + color: "#7B0F12" + - type: entity id: BaseBorgModuleSyndicateAssault parent: BaseBorgModule abstract: true components: - - type: Tag - tags: - - BorgModuleSyndicateAssault + - type: Tag + tags: + - BorgModuleSyndicateAssault + - type: Item + inhandVisuals: + left: + - state: base-icon-inhand-left + color: "#FF0000" + - state: base-module-inhand-left + color: "#891417" + - state: base-part-inhand-left + - state: base-stripes-inhand-left + color: "#7B0F12" + right: + - state: base-icon-inhand-right + color: "#FF0000" + - state: base-module-inhand-right + color: "#891417" + - state: base-part-inhand-right + - state: base-stripes-inhand-right + color: "#7B0F12" # generic modules - type: entity @@ -427,7 +596,7 @@ # todo: if science ever gets their own custom robot, add more "sci" modules. - type: entity id: BorgModuleArtifact - parent: [ BaseBorgModule, BaseProviderBorgModule ] + parent: [ BaseBorgModuleScience, BaseProviderBorgModule ] name: artifact cyborg module components: - type: Sprite @@ -442,7 +611,7 @@ - type: entity id: BorgModuleAnomaly - parent: [ BaseBorgModule, BaseProviderBorgModule ] + parent: [ BaseBorgModuleScience, BaseProviderBorgModule ] name: anomaly cyborg module components: - type: Sprite @@ -565,6 +734,24 @@ - EnergyDaggerLoud - type: BorgModuleIcon icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-weapon-module } + - type: Item + inhandVisuals: + left: + - state: base-icon-inhand-left + color: "#FF0000" + - state: base-module-inhand-left + color: "#891417" + - state: base-part-inhand-left + - state: base-stripes-inhand-left + color: "#7B0F12" + right: + - state: base-icon-inhand-right + color: "#FF0000" + - state: base-module-inhand-right + color: "#891417" + - state: base-part-inhand-right + - state: base-stripes-inhand-right + color: "#7B0F12" - type: entity id: BorgModuleOperative @@ -634,3 +821,21 @@ - SelfDestructSeq - type: BorgModuleIcon icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-martyr-module } + - type: Item + inhandVisuals: + left: + - state: base-icon-inhand-left + color: "#FF0000" + - state: base-module-inhand-left + color: "#891417" + - state: base-part-inhand-left + - state: base-stripes-inhand-left + color: "#7B0F12" + right: + - state: base-icon-inhand-right + color: "#FF0000" + - state: base-module-inhand-right + color: "#891417" + - state: base-part-inhand-right + - state: base-stripes-inhand-right + color: "#7B0F12" diff --git a/Resources/Prototypes/borg_types.yml b/Resources/Prototypes/borg_types.yml index f6294be68e..d78cf505dc 100644 --- a/Resources/Prototypes/borg_types.yml +++ b/Resources/Prototypes/borg_types.yml @@ -1,4 +1,4 @@ -# Generic borg +# Generic borg - type: borgType id: generic @@ -10,6 +10,7 @@ moduleWhitelist: tags: - BorgModuleGeneric + - BorgModuleScience #until sciborgs are added defaultModules: - BorgModuleTool diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index e3dcb9b11b..5d7d19950d 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -117,6 +117,9 @@ - type: Tag id: BorgModuleMedical +- type: Tag + id: BorgModuleScience + - type: Tag id: BorgModuleService diff --git a/Resources/Textures/Objects/Misc/proximity_sensor.rsi/inhand-left.png b/Resources/Textures/Objects/Misc/proximity_sensor.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..a1f411c956edd289b002a0a8c1e25b3abc6ea9ce GIT binary patch literal 187 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|N*b6$&iQTfP?n+mUz9>u>r;Jj&_S{uq~RcnIO9MQ*=KgP%*=Yg=gmMuRFZ^o%Ug+ zq&sr%-kh;JPlsNO`73Nx9ClTX6{H3Tu5Y~Tv#&(1zN@3}hIoDWm+k3qR?WJ7hqvVA e4tEBI9WBCcPvs)n*K*W=6nnb*xvXu*$nzM#Q;FdiT14A;u Xe5Tl|skzIZf@C~h{an^LB{Ts5hh`-q literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-icon-inhand-right.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-icon-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..20f2e12b376e1e683d033495fbedcecf2e62b2d5 GIT binary patch literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|oIG6|Ln`LH zy|q!0L4kwW;d{K5*|u#B&;PS1=0

6)-$d^4w*-#q#+7Xb=wsSdaOAZaw%+^g%iU aLqmD4aj)1b_q^srkd&vZpUXO@geCxgoG2gw literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-module-inhand-left.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-module-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..df1fabb985e9a6c2fb2530ed0aba739e8ce9fa40 GIT binary patch literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|ialK%Ln`LH zz2(T)q9DNHVDK;N-+#S5J5HuOKKNoo#)>M2mopEn)MN!JW!SOkt=n^nXKN4ZFJ_)| zHT&R7?u>XPCDj6#Gk>>$FK&ZO~3w_7?r)Z`q(VNC&|CE|NFmn ezgEw}(2$v<9OHA{qiJU^NQbAZpUXO@geCwPiAWm& literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-module-inhand-right.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-module-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..193adb4c2a9e8a11105ae620fd030b54f3feb218 GIT binary patch literal 187 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|N@~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-part-inhand-left.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-part-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..0042f7dd27488afc52a41aaaafa20fbc5a312c0e GIT binary patch literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|rg^$JhE&XX zd&`jPkbwx>1BH7Flf&J=H*Eh9WIG`^U%}RceY#&#yTuOfSuJKCYT18O+WgqOrv<2! zf#HwVu^HRuJ&bR^({TOoq-X1nXxz4V#@2IK=-SK3q-kYaV;I587!=~U%@4o%{KLHX zyXE}p=X7`8Sj8Q&++Cu5X+~P`f5EJf2W7U)_u0SQ7Ztko!!`znH}|B)(v-Ib)ER1l O4DfXIb6Mw<&;$UQO;!p3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-part-inhand-right.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-part-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..53313940989c1ed36873694c13b641cab962ff52 GIT binary patch literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|W_r3fhE&XX zd&`ik*+GEyg6fhJygIqT%f$D%>OE}?s$~ACAZDhy^@hkwrp5!CyhHB2PXEEP`>GEI zP%py)ec#JR>eEj=of2dcs;J{!-Jv)qxa(RWUv2rxxvBPjUsyq^7#JFIHTJgqMD^DP zE4?tF$BzG<_E+>xn&|%73m6#o>}B|#q;x=i R+YDcj0iLdYF6*2UngErxRI~s9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-stripes-inhand-left.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-stripes-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..e1491c0ad6606f9a18f831062da9dd978060105c GIT binary patch literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|+&x_!Ln`LH zy}6N>L4k*P!@vI}k%GzrTbpYgMKptzfGQXoq-V~&E4kpJUE}>?1AUMP1H+8d^TT}( i3Wvr$k(t8F@F9cI>ACvNDQ%v|L6V-XelF{r5}E*7bt;1Z literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-stripes-inhand-right.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/base-stripes-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..4cd90911d401a3da76eb1b856a0d64adf14290fc GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|JUv|;Ln`LH zy=lnBpuof8`2YXQ8(d8hFIm&#Hn;}el>jPXIN%w2^*vifj_q$g{R;~PK|%}+H;(4l lerz-mw>h~R&-5Tw{pS0bd**^9Jzf1=);T3K0RRshEcgHb literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json index 74c9893cae..cb48ef147b 100644 --- a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json @@ -1,131 +1,163 @@ { - "version": 1, - "license": "CC0-1.0", - "copyright": "Created by EmoGarbage404 (github) for Space Station 14. icon-construction.png created by deltanedas (github). syndicateborgbomb.png created by Mangohydra (github).", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "cargo" + "version": 1, + "license": "CC0-1.0", + "copyright": "Created by EmoGarbage404 (github) for Space Station 14. icon-construction.png created by deltanedas (github). syndicateborgbomb.png created by Mangohydra (github). layered inhands by mubururu_ (github).", + "size": { + "x": 32, + "y": 32 }, - { - "name": "engineering" - }, - { - "name": "generic" - }, - { - "name": "icon-anomalies" - }, - { - "name": "icon-appraisal" - }, - { - "name": "icon-artifacts" - }, - { - "name": "icon-cables" - }, - { - "name": "icon-chemist" - }, - { - "name": "icon-clown" - }, - { - "name": "icon-construction" - }, - { - "name": "icon-defib" - }, - { - "name": "icon-diagnosis" - }, - { - "name": "icon-fire-extinguisher" - }, - { - "name": "icon-gardening" - }, - { - "name": "icon-gas-analyzer" - }, - { - "name": "icon-gps" - }, - { - "name": "icon-grappling-gun" - }, - { - "name": "icon-harvesting" - }, - { - "name": "icon-light-replacer" - }, - { - "name": "icon-mining" - }, - { - "name": "icon-mop" - }, - { - "name": "icon-mop-adv" - }, - { - "name": "icon-musique" - }, - { - "name": "icon-pen" - }, - { - "name": "icon-radiation" - }, - { - "name": "icon-rcd" - }, - { - "name": "icon-template" - }, - { - "name": "icon-tools-adv" - }, - { - "name": "icon-tools" - }, - { - "name": "icon-trash-bag" - }, - { - "name": "icon-treatment" - }, - { - "name": "icon-syndicate" - }, - { - "name": "janitor" - }, - { - "name": "icon-bomb" - }, - { - "name": "medical" - }, - { - "name": "science" - }, - { - "name": "security" - }, - { - "name": "service" - }, - { - "name": "syndicateborgbomb" - }, - { - "name": "syndicate" - } - ] + "states": [ + { + "name": "cargo" + }, + { + "name": "engineering" + }, + { + "name": "generic" + }, + { + "name": "icon-anomalies" + }, + { + "name": "icon-appraisal" + }, + { + "name": "icon-artifacts" + }, + { + "name": "icon-cables" + }, + { + "name": "icon-chemist" + }, + { + "name": "icon-clown" + }, + { + "name": "icon-construction" + }, + { + "name": "icon-defib" + }, + { + "name": "icon-diagnosis" + }, + { + "name": "icon-fire-extinguisher" + }, + { + "name": "icon-gardening" + }, + { + "name": "icon-gas-analyzer" + }, + { + "name": "icon-gps" + }, + { + "name": "icon-grappling-gun" + }, + { + "name": "icon-harvesting" + }, + { + "name": "icon-light-replacer" + }, + { + "name": "icon-mining" + }, + { + "name": "icon-mop" + }, + { + "name": "icon-mop-adv" + }, + { + "name": "icon-musique" + }, + { + "name": "icon-pen" + }, + { + "name": "icon-radiation" + }, + { + "name": "icon-rcd" + }, + { + "name": "icon-template" + }, + { + "name": "icon-tools-adv" + }, + { + "name": "icon-tools" + }, + { + "name": "icon-trash-bag" + }, + { + "name": "icon-treatment" + }, + { + "name": "icon-syndicate" + }, + { + "name": "janitor" + }, + { + "name": "icon-bomb" + }, + { + "name": "medical" + }, + { + "name": "science" + }, + { + "name": "security" + }, + { + "name": "service" + }, + { + "name": "syndicateborgbomb" + }, + { + "name": "syndicate" + }, + { + "name": "base-icon-inhand-left", + "directions": 4 + }, + { + "name": "base-icon-inhand-right", + "directions": 4 + }, + { + "name": "base-module-inhand-left", + "directions": 4 + }, + { + "name": "base-module-inhand-right", + "directions": 4 + }, + { + "name": "base-part-inhand-left", + "directions": 4 + }, + { + "name": "base-part-inhand-right", + "directions": 4 + }, + { + "name": "base-stripes-inhand-left", + "directions": 4 + }, + { + "name": "base-stripes-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-arm-inhand-left.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-arm-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..2d844e814518639aaea4267c9460e28886ab0102 GIT binary patch literal 412 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z!#rIaLn`LH zy=9o!>>$8;VZO$@2`em_x6Za?5dXlqtz^mG_SYsd4cTuPGuBL*R>Pd-eR*kw_(`Rf zNrzId34W}fx|+YH?D|m#0YMnh4Y_{%$Mx?8tJ7Z}xcko3n{#K;e4WG3v>%jM{j;i{ zl{wM;dy-_>G--?H0V1rowwa#(a?d$*<9&HwqvdC|HFUTt>%hS;E~SaO{5V{n>A>ub*@E?{0*Rwr!^8*u#5U&) zR=kQ}N-)=$D>U)N-s2BHnA!c9#INC#@8goBrTB8!xh)M__Fi%qKJYxku4Tgut7VTr zzIVH6d2e6wxhD@9ABz^~e|9$e9_j4zB|nx?Jf`DT(F(s;z~E-^boFyt=akR{0OxhL A82|tP literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-arm-inhand-right.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-arm-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..8e1c8cac82f78d2723f96bee87b44a61e31e3fd4 GIT binary patch literal 399 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-leg-inhand-right.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/borg-leg-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..3d9ab79a02b180d8497a09831cc909756a669ea7 GIT binary patch literal 516 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z_j$TFhE&XX zd&|D-kb?y4hv%E7P0D6zGD{Nv&Nj`tE5>2l)-3{J+h!D3@Mdom)MaYCa(l@%k;crl z?z<_ao=IoqO+VDd7I^HN`BSLdoIwx<0{KqQdf|Tk!j|cqm}AQ?cAmT+^*sAx|H;07 zxBLLDb-~x~YKR^#6~Fa)8w11r``^2cJ=beU_5D&}Wzr+wlC+QGA!|M<*U+1a-lk3SZieU@$a-F3l}{r_C6{VK1x znfZ`G&YlJCTC@D~*h?zE3#aaG=zxP4C%2TEE&TGcLFe<&_I<|}c0Q3@xBG(A9`j#& z4t-{HWu5uV!Z%(wJ4nLu`b5#o<|{8T%~9WwTKq$+MZk(nZ#&re!plh3Ug?t86t;n^Ac!r1RjIvjqr%qRY(biul_EM`2; zJne_g^5(9(%J_e4;kpIJhI?~w-`bX&_VJ40{UF2hyZ$Mz@CHUJgQu&X%Q~loCID8{ B=5YW3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/meta.json b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/meta.json index 8cab41943f..76a5858172 100644 --- a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/meta.json @@ -1,218 +1,250 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/cf45322c7ee16f9d7e43d5260daf24ceb77c1b25", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "borg_l_arm" - }, - { - "name": "borg_r_arm" - }, - { - "name": "borg_l_leg" - }, - { - "name": "borg_r_leg" - }, - { - "name": "borg_chest" - }, - { - "name": "borg_head" - }, - { - "name": "robo_suit" - }, - { - "name": "borg_head+o" - }, - { - "name": "borg_chest+o" - }, - { - "name": "borg_l_arm+o" - }, - { - "name": "borg_r_arm+o" - }, - { - "name": "borg_l_leg+o" - }, - { - "name": "borg_r_leg+o" - }, - { - "name": "janitor_l_leg" - }, - { - "name": "janitor_r_leg" - }, - { - "name": "janitor_chest" - }, - { - "name": "janitor_head" - }, - { - "name": "janitor_head+o" - }, - { - "name": "janitor_chest+o" - }, - { - "name": "janitor_l_leg+o" - }, - { - "name": "janitor_r_leg+o" - }, - { - "name": "engineer_l_arm" - }, - { - "name": "engineer_r_arm" - }, - { - "name": "engineer_l_leg" - }, - { - "name": "engineer_r_leg" - }, - { - "name": "engineer_chest" - }, - { - "name": "engineer_head" - }, - { - "name": "engineer_head+o" - }, - { - "name": "engineer_chest+o" - }, - { - "name": "engineer_l_arm+o" - }, - { - "name": "engineer_r_arm+o" - }, - { - "name": "engineer_l_leg+o" - }, - { - "name": "engineer_r_leg+o" - }, - { - "name": "medical_l_arm" - }, - { - "name": "medical_r_arm" - }, - { - "name": "medical_l_leg" - }, - { - "name": "medical_r_leg" - }, - { - "name": "medical_chest" - }, - { - "name": "medical_head" - }, - { - "name": "medical_head+o" - }, - { - "name": "medical_chest+o" - }, - { - "name": "medical_l_arm+o" - }, - { - "name": "medical_r_arm+o" - }, - { - "name": "medical_l_leg+o" - }, - { - "name": "medical_r_leg+o" - }, - { - "name": "mining_l_arm" - }, - { - "name": "mining_r_arm" - }, - { - "name": "mining_l_leg" - }, - { - "name": "mining_r_leg" - }, - { - "name": "mining_chest" - }, - { - "name": "mining_head" - }, - { - "name": "mining_head+o" - }, - { - "name": "mining_chest+o" - }, - { - "name": "mining_l_arm+o" - }, - { - "name": "mining_r_arm+o" - }, - { - "name": "mining_l_leg+o" - }, - { - "name": "mining_r_leg+o" - }, - { - "name": "service_l_arm" - }, - { - "name": "service_r_arm" - }, - { - "name": "service_l_leg" - }, - { - "name": "service_r_leg" - }, - { - "name": "service_chest" - }, - { - "name": "service_head" - }, - { - "name": "service_head+o" - }, - { - "name": "service_chest+o" - }, - { - "name": "service_l_arm+o" - }, - { - "name": "service_r_arm+o" - }, - { - "name": "service_l_leg+o" - }, - { - "name": "service_r_leg+o" - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/cf45322c7ee16f9d7e43d5260daf24ceb77c1b25, limb sprites edited into inhands by mubururu_ (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "borg_l_arm" + }, + { + "name": "borg_r_arm" + }, + { + "name": "borg-arm-inhand-left", + "directions": 4 + }, + { + "name": "borg-arm-inhand-right", + "directions": 4 + }, + { + "name": "borg_l_leg" + }, + { + "name": "borg_r_leg" + }, + { + "name": "borg-leg-inhand-left", + "directions": 4 + }, + { + "name": "borg-leg-inhand-right", + "directions": 4 + }, + { + "name": "borg_chest" + }, + { + "name": "borg-chest-inhand-left", + "directions": 4 + }, + { + "name": "borg-chest-inhand-right", + "directions": 4 + }, + { + "name": "borg_head" + }, + { + "name": "borg-head-inhand-left", + "directions": 4 + }, + { + "name": "borg-head-inhand-right", + "directions": 4 + }, + { + "name": "robo_suit" + }, + { + "name": "borg_head+o" + }, + { + "name": "borg_chest+o" + }, + { + "name": "borg_l_arm+o" + }, + { + "name": "borg_r_arm+o" + }, + { + "name": "borg_l_leg+o" + }, + { + "name": "borg_r_leg+o" + }, + { + "name": "janitor_l_leg" + }, + { + "name": "janitor_r_leg" + }, + { + "name": "janitor_chest" + }, + { + "name": "janitor_head" + }, + { + "name": "janitor_head+o" + }, + { + "name": "janitor_chest+o" + }, + { + "name": "janitor_l_leg+o" + }, + { + "name": "janitor_r_leg+o" + }, + { + "name": "engineer_l_arm" + }, + { + "name": "engineer_r_arm" + }, + { + "name": "engineer_l_leg" + }, + { + "name": "engineer_r_leg" + }, + { + "name": "engineer_chest" + }, + { + "name": "engineer_head" + }, + { + "name": "engineer_head+o" + }, + { + "name": "engineer_chest+o" + }, + { + "name": "engineer_l_arm+o" + }, + { + "name": "engineer_r_arm+o" + }, + { + "name": "engineer_l_leg+o" + }, + { + "name": "engineer_r_leg+o" + }, + { + "name": "medical_l_arm" + }, + { + "name": "medical_r_arm" + }, + { + "name": "medical_l_leg" + }, + { + "name": "medical_r_leg" + }, + { + "name": "medical_chest" + }, + { + "name": "medical_head" + }, + { + "name": "medical_head+o" + }, + { + "name": "medical_chest+o" + }, + { + "name": "medical_l_arm+o" + }, + { + "name": "medical_r_arm+o" + }, + { + "name": "medical_l_leg+o" + }, + { + "name": "medical_r_leg+o" + }, + { + "name": "mining_l_arm" + }, + { + "name": "mining_r_arm" + }, + { + "name": "mining_l_leg" + }, + { + "name": "mining_r_leg" + }, + { + "name": "mining_chest" + }, + { + "name": "mining_head" + }, + { + "name": "mining_head+o" + }, + { + "name": "mining_chest+o" + }, + { + "name": "mining_l_arm+o" + }, + { + "name": "mining_r_arm+o" + }, + { + "name": "mining_l_leg+o" + }, + { + "name": "mining_r_leg+o" + }, + { + "name": "service_l_arm" + }, + { + "name": "service_r_arm" + }, + { + "name": "service_l_leg" + }, + { + "name": "service_r_leg" + }, + { + "name": "service_chest" + }, + { + "name": "service_head" + }, + { + "name": "service_head+o" + }, + { + "name": "service_chest+o" + }, + { + "name": "service_l_arm+o" + }, + { + "name": "service_r_arm+o" + }, + { + "name": "service_l_leg+o" + }, + { + "name": "service_r_leg+o" + } + ] }