some robotics inhands (#33676)

* real

* spacing stuff and fix tiny issue
This commit is contained in:
mubururu_
2025-03-19 20:43:00 -05:00
committed by GitHub
parent b9f56be959
commit d3ee9f8bc5
25 changed files with 659 additions and 366 deletions

View File

@@ -44,6 +44,8 @@
- Trash - Trash
- BorgArm - BorgArm
- BorgLArm - BorgLArm
- type: Item
heldPrefix: borg-arm
- type: entity - type: entity
id: RightArmBorg id: RightArmBorg
@@ -62,6 +64,8 @@
- Trash - Trash
- BorgArm - BorgArm
- BorgRArm - BorgRArm
- type: Item
heldPrefix: borg-arm
- type: entity - type: entity
id: LeftLegBorg id: LeftLegBorg
@@ -80,6 +84,8 @@
- Trash - Trash
- BorgLeg - BorgLeg
- BorgLLeg - BorgLLeg
- type: Item
heldPrefix: borg-leg
- type: entity - type: entity
id: RightLegBorg id: RightLegBorg
@@ -98,6 +104,8 @@
- Trash - Trash
- BorgLeg - BorgLeg
- BorgRLeg - BorgRLeg
- type: Item
heldPrefix: borg-leg
- type: entity - type: entity
id: LightHeadBorg id: LightHeadBorg
@@ -114,6 +122,8 @@
tags: tags:
- Trash - Trash
- BorgHead - BorgHead
- type: Item
heldPrefix: borg-head
- type: entity - type: entity
id: TorsoBorg id: TorsoBorg
@@ -130,3 +140,5 @@
tags: tags:
- Trash - Trash
- BorgTorso - BorgTorso
- type: Item
heldPrefix: borg-chest

View File

@@ -7,6 +7,23 @@
components: components:
- type: Item - type: Item
storedRotation: -90 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 - type: Sprite
sprite: Objects/Specific/Robotics/borgmodule.rsi sprite: Objects/Specific/Robotics/borgmodule.rsi
- type: BorgModule - type: BorgModule
@@ -49,6 +66,22 @@
- type: Tag - type: Tag
tags: tags:
- BorgModuleCargo - 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 - type: entity
id: BaseBorgModuleEngineering id: BaseBorgModuleEngineering
@@ -58,6 +91,24 @@
- type: Tag - type: Tag
tags: tags:
- BorgModuleEngineering - 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 - type: entity
id: BaseBorgModuleJanitor id: BaseBorgModuleJanitor
@@ -67,6 +118,24 @@
- type: Tag - type: Tag
tags: tags:
- BorgModuleJanitor - 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 - type: entity
id: BaseBorgModuleMedical id: BaseBorgModuleMedical
@@ -76,6 +145,51 @@
- type: Tag - type: Tag
tags: tags:
- BorgModuleMedical - 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 - type: entity
id: BaseBorgModuleService id: BaseBorgModuleService
@@ -85,24 +199,79 @@
- type: Tag - type: Tag
tags: tags:
- BorgModuleService - 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 - type: entity
id: BaseBorgModuleSyndicate id: BaseBorgModuleSyndicate
parent: BaseBorgModule parent: BaseBorgModule
abstract: true abstract: true
components: components:
- type: Tag - type: Tag
tags: tags:
- BorgModuleSyndicate - 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 - type: entity
id: BaseBorgModuleSyndicateAssault id: BaseBorgModuleSyndicateAssault
parent: BaseBorgModule parent: BaseBorgModule
abstract: true abstract: true
components: components:
- type: Tag - type: Tag
tags: tags:
- BorgModuleSyndicateAssault - 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 # generic modules
- type: entity - type: entity
@@ -427,7 +596,7 @@
# todo: if science ever gets their own custom robot, add more "sci" modules. # todo: if science ever gets their own custom robot, add more "sci" modules.
- type: entity - type: entity
id: BorgModuleArtifact id: BorgModuleArtifact
parent: [ BaseBorgModule, BaseProviderBorgModule ] parent: [ BaseBorgModuleScience, BaseProviderBorgModule ]
name: artifact cyborg module name: artifact cyborg module
components: components:
- type: Sprite - type: Sprite
@@ -442,7 +611,7 @@
- type: entity - type: entity
id: BorgModuleAnomaly id: BorgModuleAnomaly
parent: [ BaseBorgModule, BaseProviderBorgModule ] parent: [ BaseBorgModuleScience, BaseProviderBorgModule ]
name: anomaly cyborg module name: anomaly cyborg module
components: components:
- type: Sprite - type: Sprite
@@ -565,6 +734,24 @@
- EnergyDaggerLoud - EnergyDaggerLoud
- type: BorgModuleIcon - type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-weapon-module } 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 - type: entity
id: BorgModuleOperative id: BorgModuleOperative
@@ -634,3 +821,21 @@
- SelfDestructSeq - SelfDestructSeq
- type: BorgModuleIcon - type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-martyr-module } 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"

View File

@@ -1,4 +1,4 @@
# Generic borg # Generic borg
- type: borgType - type: borgType
id: generic id: generic
@@ -10,6 +10,7 @@
moduleWhitelist: moduleWhitelist:
tags: tags:
- BorgModuleGeneric - BorgModuleGeneric
- BorgModuleScience #until sciborgs are added
defaultModules: defaultModules:
- BorgModuleTool - BorgModuleTool

View File

@@ -117,6 +117,9 @@
- type: Tag - type: Tag
id: BorgModuleMedical id: BorgModuleMedical
- type: Tag
id: BorgModuleScience
- type: Tag - type: Tag
id: BorgModuleService id: BorgModuleService

Binary file not shown.

After

Width:  |  Height:  |  Size: 187 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 186 B

View File

@@ -1,15 +1,23 @@
{ {
"copyright" : "Taken from https://github.com/tgstation/tgstation at at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a", "version": 1,
"license" : "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a. inhands by mubururu_",
"size" : { "license": "CC-BY-SA-3.0",
"x" : 32, "size": {
"y" : 32 "x": 32,
}, "y": 32
"states" : [ },
{ "states": [
"directions" : 1, {
"name" : "icon" "directions": 1,
} "name": "icon"
], },
"version" : 1 {
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 131 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 136 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 185 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 187 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 220 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 223 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 141 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 143 B

View File

@@ -1,131 +1,163 @@
{ {
"version": 1, "version": 1,
"license": "CC0-1.0", "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).", "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": { "size": {
"x": 32, "x": 32,
"y": 32 "y": 32
},
"states": [
{
"name": "cargo"
}, },
{ "states": [
"name": "engineering" {
}, "name": "cargo"
{ },
"name": "generic" {
}, "name": "engineering"
{ },
"name": "icon-anomalies" {
}, "name": "generic"
{ },
"name": "icon-appraisal" {
}, "name": "icon-anomalies"
{ },
"name": "icon-artifacts" {
}, "name": "icon-appraisal"
{ },
"name": "icon-cables" {
}, "name": "icon-artifacts"
{ },
"name": "icon-chemist" {
}, "name": "icon-cables"
{ },
"name": "icon-clown" {
}, "name": "icon-chemist"
{ },
"name": "icon-construction" {
}, "name": "icon-clown"
{ },
"name": "icon-defib" {
}, "name": "icon-construction"
{ },
"name": "icon-diagnosis" {
}, "name": "icon-defib"
{ },
"name": "icon-fire-extinguisher" {
}, "name": "icon-diagnosis"
{ },
"name": "icon-gardening" {
}, "name": "icon-fire-extinguisher"
{ },
"name": "icon-gas-analyzer" {
}, "name": "icon-gardening"
{ },
"name": "icon-gps" {
}, "name": "icon-gas-analyzer"
{ },
"name": "icon-grappling-gun" {
}, "name": "icon-gps"
{ },
"name": "icon-harvesting" {
}, "name": "icon-grappling-gun"
{ },
"name": "icon-light-replacer" {
}, "name": "icon-harvesting"
{ },
"name": "icon-mining" {
}, "name": "icon-light-replacer"
{ },
"name": "icon-mop" {
}, "name": "icon-mining"
{ },
"name": "icon-mop-adv" {
}, "name": "icon-mop"
{ },
"name": "icon-musique" {
}, "name": "icon-mop-adv"
{ },
"name": "icon-pen" {
}, "name": "icon-musique"
{ },
"name": "icon-radiation" {
}, "name": "icon-pen"
{ },
"name": "icon-rcd" {
}, "name": "icon-radiation"
{ },
"name": "icon-template" {
}, "name": "icon-rcd"
{ },
"name": "icon-tools-adv" {
}, "name": "icon-template"
{ },
"name": "icon-tools" {
}, "name": "icon-tools-adv"
{ },
"name": "icon-trash-bag" {
}, "name": "icon-tools"
{ },
"name": "icon-treatment" {
}, "name": "icon-trash-bag"
{ },
"name": "icon-syndicate" {
}, "name": "icon-treatment"
{ },
"name": "janitor" {
}, "name": "icon-syndicate"
{ },
"name": "icon-bomb" {
}, "name": "janitor"
{ },
"name": "medical" {
}, "name": "icon-bomb"
{ },
"name": "science" {
}, "name": "medical"
{ },
"name": "security" {
}, "name": "science"
{ },
"name": "service" {
}, "name": "security"
{ },
"name": "syndicateborgbomb" {
}, "name": "service"
{ },
"name": "syndicate" {
} "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
}
]
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 412 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 399 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1013 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1007 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 702 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 696 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 511 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 516 B

View File

@@ -1,218 +1,250 @@
{ {
"version": 1, "version": 1,
"license": "CC-BY-SA-3.0", "license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/cf45322c7ee16f9d7e43d5260daf24ceb77c1b25", "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/cf45322c7ee16f9d7e43d5260daf24ceb77c1b25, limb sprites edited into inhands by mubururu_ (github)",
"size": { "size": {
"x": 32, "x": 32,
"y": 32 "y": 32
}, },
"states": [ "states": [
{ {
"name": "borg_l_arm" "name": "borg_l_arm"
}, },
{ {
"name": "borg_r_arm" "name": "borg_r_arm"
}, },
{ {
"name": "borg_l_leg" "name": "borg-arm-inhand-left",
}, "directions": 4
{ },
"name": "borg_r_leg" {
}, "name": "borg-arm-inhand-right",
{ "directions": 4
"name": "borg_chest" },
}, {
{ "name": "borg_l_leg"
"name": "borg_head" },
}, {
{ "name": "borg_r_leg"
"name": "robo_suit" },
}, {
{ "name": "borg-leg-inhand-left",
"name": "borg_head+o" "directions": 4
}, },
{ {
"name": "borg_chest+o" "name": "borg-leg-inhand-right",
}, "directions": 4
{ },
"name": "borg_l_arm+o" {
}, "name": "borg_chest"
{ },
"name": "borg_r_arm+o" {
}, "name": "borg-chest-inhand-left",
{ "directions": 4
"name": "borg_l_leg+o" },
}, {
{ "name": "borg-chest-inhand-right",
"name": "borg_r_leg+o" "directions": 4
}, },
{ {
"name": "janitor_l_leg" "name": "borg_head"
}, },
{ {
"name": "janitor_r_leg" "name": "borg-head-inhand-left",
}, "directions": 4
{ },
"name": "janitor_chest" {
}, "name": "borg-head-inhand-right",
{ "directions": 4
"name": "janitor_head" },
}, {
{ "name": "robo_suit"
"name": "janitor_head+o" },
}, {
{ "name": "borg_head+o"
"name": "janitor_chest+o" },
}, {
{ "name": "borg_chest+o"
"name": "janitor_l_leg+o" },
}, {
{ "name": "borg_l_arm+o"
"name": "janitor_r_leg+o" },
}, {
{ "name": "borg_r_arm+o"
"name": "engineer_l_arm" },
}, {
{ "name": "borg_l_leg+o"
"name": "engineer_r_arm" },
}, {
{ "name": "borg_r_leg+o"
"name": "engineer_l_leg" },
}, {
{ "name": "janitor_l_leg"
"name": "engineer_r_leg" },
}, {
{ "name": "janitor_r_leg"
"name": "engineer_chest" },
}, {
{ "name": "janitor_chest"
"name": "engineer_head" },
}, {
{ "name": "janitor_head"
"name": "engineer_head+o" },
}, {
{ "name": "janitor_head+o"
"name": "engineer_chest+o" },
}, {
{ "name": "janitor_chest+o"
"name": "engineer_l_arm+o" },
}, {
{ "name": "janitor_l_leg+o"
"name": "engineer_r_arm+o" },
}, {
{ "name": "janitor_r_leg+o"
"name": "engineer_l_leg+o" },
}, {
{ "name": "engineer_l_arm"
"name": "engineer_r_leg+o" },
}, {
{ "name": "engineer_r_arm"
"name": "medical_l_arm" },
}, {
{ "name": "engineer_l_leg"
"name": "medical_r_arm" },
}, {
{ "name": "engineer_r_leg"
"name": "medical_l_leg" },
}, {
{ "name": "engineer_chest"
"name": "medical_r_leg" },
}, {
{ "name": "engineer_head"
"name": "medical_chest" },
}, {
{ "name": "engineer_head+o"
"name": "medical_head" },
}, {
{ "name": "engineer_chest+o"
"name": "medical_head+o" },
}, {
{ "name": "engineer_l_arm+o"
"name": "medical_chest+o" },
}, {
{ "name": "engineer_r_arm+o"
"name": "medical_l_arm+o" },
}, {
{ "name": "engineer_l_leg+o"
"name": "medical_r_arm+o" },
}, {
{ "name": "engineer_r_leg+o"
"name": "medical_l_leg+o" },
}, {
{ "name": "medical_l_arm"
"name": "medical_r_leg+o" },
}, {
{ "name": "medical_r_arm"
"name": "mining_l_arm" },
}, {
{ "name": "medical_l_leg"
"name": "mining_r_arm" },
}, {
{ "name": "medical_r_leg"
"name": "mining_l_leg" },
}, {
{ "name": "medical_chest"
"name": "mining_r_leg" },
}, {
{ "name": "medical_head"
"name": "mining_chest" },
}, {
{ "name": "medical_head+o"
"name": "mining_head" },
}, {
{ "name": "medical_chest+o"
"name": "mining_head+o" },
}, {
{ "name": "medical_l_arm+o"
"name": "mining_chest+o" },
}, {
{ "name": "medical_r_arm+o"
"name": "mining_l_arm+o" },
}, {
{ "name": "medical_l_leg+o"
"name": "mining_r_arm+o" },
}, {
{ "name": "medical_r_leg+o"
"name": "mining_l_leg+o" },
}, {
{ "name": "mining_l_arm"
"name": "mining_r_leg+o" },
}, {
{ "name": "mining_r_arm"
"name": "service_l_arm" },
}, {
{ "name": "mining_l_leg"
"name": "service_r_arm" },
}, {
{ "name": "mining_r_leg"
"name": "service_l_leg" },
}, {
{ "name": "mining_chest"
"name": "service_r_leg" },
}, {
{ "name": "mining_head"
"name": "service_chest" },
}, {
{ "name": "mining_head+o"
"name": "service_head" },
}, {
{ "name": "mining_chest+o"
"name": "service_head+o" },
}, {
{ "name": "mining_l_arm+o"
"name": "service_chest+o" },
}, {
{ "name": "mining_r_arm+o"
"name": "service_l_arm+o" },
}, {
{ "name": "mining_l_leg+o"
"name": "service_r_arm+o" },
}, {
{ "name": "mining_r_leg+o"
"name": "service_l_leg+o" },
}, {
{ "name": "service_l_arm"
"name": "service_r_leg+o" },
} {
] "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"
}
]
} }