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

New HoP Sprites and new HoP clothes #231

Merged
merged 8 commits into from
Dec 15, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,9 @@
description: Perfect for dealing with paperwork and matters with bureaucracy.
components:
- type: Sprite
sprite: Clothing/Hands/Gloves/hop.rsi
sprite: _Harmony/Clothing/Hands/Gloves/hop.rsi
TheCrimsonJupiter marked this conversation as resolved.
Show resolved Hide resolved
- type: Clothing
sprite: Clothing/Hands/Gloves/hop.rsi
sprite: _Harmony/Clothing/Hands/Gloves/hop.rsi
TheCrimsonJupiter marked this conversation as resolved.
Show resolved Hide resolved
- type: Fiber
fiberMaterial: fibers-durathread
fiberColor: fibers-black
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -322,9 +322,9 @@
description: A grand, stylish head of personnel's cap.
components:
- type: Sprite
sprite: Clothing/Head/Hats/hopcap.rsi
sprite: _Harmony/Clothing/Head/Hats/hopcap.rsi
TheCrimsonJupiter marked this conversation as resolved.
Show resolved Hide resolved
- type: Clothing
sprite: Clothing/Head/Hats/hopcap.rsi
sprite: _Harmony/Clothing/Head/Hats/hopcap.rsi
TheCrimsonJupiter marked this conversation as resolved.
Show resolved Hide resolved
- type: Tag
tags:
- ClothMade
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,9 @@
description: Rather bland and inoffensive. Perfect for vanishing off the face of the universe.
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpskirt/hop.rsi
sprite: _Harmony/Clothing/Uniforms/Jumpskirt/hop.rsi
TheCrimsonJupiter marked this conversation as resolved.
Show resolved Hide resolved
- type: Clothing
sprite: Clothing/Uniforms/Jumpskirt/hop.rsi
sprite: _Harmony/Clothing/Uniforms/Jumpskirt/hop.rsi
TheCrimsonJupiter marked this conversation as resolved.
Show resolved Hide resolved

- type: entity
parent: [ClothingUniformSkirtBase, BaseCommandContraband]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -325,9 +325,9 @@
description: Rather bland and inoffensive. Perfect for vanishing off the face of the universe.
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpsuit/hop.rsi
sprite: _Harmony/Clothing/Uniforms/Jumpsuit/hop.rsi
TheCrimsonJupiter marked this conversation as resolved.
Show resolved Hide resolved
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/hop.rsi
sprite: _Harmony/Clothing/Uniforms/Jumpsuit/hop.rsi
TheCrimsonJupiter marked this conversation as resolved.
Show resolved Hide resolved

- type: entity
parent: [ClothingUniformBase, BaseCommandContraband]
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -985,6 +985,8 @@
- ClothingUniformJumpskirtHoP
- ClothingUniformJumpsuitTurtleneckHoPHarmony # Harmony
- ClothingUniformJumpskirtTurtleneckHoPHarmony #Harmony
- ClothingUniformJumpsuitHoPMessKitHarmony #Harmony
- ClothingUniformJumpskirtHoPMessKitHarmony #Harmony
- ClothingHeadHatBeretHoS
- ClothingHeadHatHoshat
- ClothingHeadHatHoSWidebrimHarmony # Harmony
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,8 @@
- HoPJumpskirt
- HoPJumpsuitTurtleneckHarmony #Harmony
- HoPJumpskirtTurtleneckHarmony #Harmony
- HoPJumpsuitMessKitHarmony #Harmony
- HoPJumpskirtMessKitHarmony #Harmony

- type: loadoutGroup
id: HoPNeck
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,14 @@
sprite: _Harmony/Clothing/Uniforms/Jumpskirt/hop_turtle.rsi
- type: Clothing
sprite: _Harmony/Clothing/Uniforms/Jumpskirt/hop_turtle.rsi

- type: entity
parent: [ClothingUniformBase, BaseCommandContraband]
id: ClothingUniformJumpskirtHeadofPersonnelMessKitHarmony
name: head of personnel's mess kit
description: A blue denim skirt with pockets and a gold trimmed white shirt.
components:
- type: Sprite
sprite: _Harmony/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi
- type: Clothing
sprite: _Harmony/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,14 @@
sprite: _Harmony/Clothing/Uniforms/Jumpsuit/det_blue.rsi
- type: Clothing
sprite: _Harmony/Clothing/Uniforms/Jumpsuit/det_blue.rsi

- type: entity
parent: [ClothingUniformBase, BaseCommandContraband]
id: ClothingUniformJumpsuitHeadofPersonnelMessKitHarmony
name: head of personnel's mess kit
description: Blue jeans and a gold trimmed white shirt.
components:
- type: Sprite
sprite: _Harmony/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi
- type: Clothing
sprite: _Harmony/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,16 @@
id: HoPJumpskirtTurtleneckHarmony
equipment:
jumpsuit: ClothingUniformJumpskirtHeadOfPersonnelTurtleneckHarmony

- type: loadout
id: HoPJumpsuitMessKitHarmony
equipment:
jumpsuit: ClothingUniformJumpsuitHeadofPersonnelMessKitHarmony

- type: loadout
id: HoPJumpskirtMessKitHarmony
equipment:
jumpsuit: ClothingUniformJumpskirtHeadofPersonnelMessKitHarmony

# Shoes
- type: loadout
Expand Down
9 changes: 9 additions & 0 deletions Resources/Prototypes/_Harmony/Recipes/Lathes/clothing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,15 @@
id: ClothingUniformJumpskirtTurtleneckHoPHarmony
result: ClothingUniformJumpskirtHeadOfPersonnelTurtleneckHarmony

- type: latheRecipe
parent: BaseCommandJumpsuitRecipe
id: ClothingUniformJumpsuitHoPMessKitHarmony
result: ClothingUniformJumpsuitHeadofPersonnelMessKitHarmony

- type: latheRecipe
parent: BaseCommandJumpsuitRecipe
id: ClothingUniformJumpskirtHoPMessKitHarmony
result: ClothingUniformJumpskirtHeadofPersonnelMessKitHarmony
## HoS
- type: latheRecipe
parent: BaseCommandHatRecipe
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Icon and inhand drawn by Ubaser and takem from this atcommithttps://github.com/space-wizards/space-station-14/pull/21915 , equipped sprite made by CrimsonJupiter for use in Harmony",
FluffMe marked this conversation as resolved.
Show resolved Hide resolved
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HAND",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from the tg station atcommithttps://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e and then resprited by TadJohnson00 and Timemaster99 for DeltaV atcommithttps://github.com/DeltaV-Station/Delta-v/pull/1501, and then resprited a third time by CrimsonJupiter for Harmony",
TheCrimsonJupiter marked this conversation as resolved.
Show resolved Hide resolved
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "equipped-HELMET-hamster",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Originally taken from tgstation atcommithttps://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 icon, inhand, and equipped resprites by CrimsonJupiter for Harmony.",
TheCrimsonJupiter marked this conversation as resolved.
Show resolved Hide resolved
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by TadJohnson00 and Timemaster99 for DeltaV atcommithttps://github.com/DeltaV-Station/Delta-v/pull/1501, resprited by CrimsonJupiter for Harmony.",
TheCrimsonJupiter marked this conversation as resolved.
Show resolved Hide resolved
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Originally taken from tgstation atcommithttps://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 icon, inhand, and equipped resprites by CrimsonJupiter for Harmony.",
TheCrimsonJupiter marked this conversation as resolved.
Show resolved Hide resolved
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by TadJohnson00 and Timemaster99 for DeltaV atcommithttps://github.com/DeltaV-Station/Delta-v/pull/1501, resprited by CrimsonJupiter for Harmony.",
TheCrimsonJupiter marked this conversation as resolved.
Show resolved Hide resolved
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading