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

Alternate Corporate Coats Wave 1 #392

Merged
merged 12 commits into from
May 22, 2024
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockClothesFilled
cost: 7250 #DeltaV
cost: 8050
DangerRevolution marked this conversation as resolved.
Show resolved Hide resolved
category: Service
group: market

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,11 @@
ClothingOuterCoatLettermanRed: 2 # Nyano - Clothing addition
ClothingOuterDenimJacket: 2 # DeltaV - Clothing addition
ClothingOuterCorporateJacket: 2 # DeltaV - Clothing addition
ClothingOuterCsCorporateJacket: 2 # Einstein Engines - Clothing addition
ClothingOuterEECorporateJacket: 2 # Einstein Engines - Clothing addition
ClothingOuterHICorporateJacket: 2 # Einstein Engines - Clothing addition
ClothingOuterHMCorporateJacket: 2 # Einstein Engines - Clothing addition
ClothingOuterIdCorporateJacket: 2 # Einstein Engines - Clothing addition
Copy link
Contributor

Choose a reason for hiding this comment

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

Tags are fine here as it's in the middle of many other non-Wiz clothes.

ClothingShoesBootsFishing: 2 # Nyano - Clothing addition
ClothingHeadTinfoil: 2 # Nyano - Clothing addition
ClothingHeadFishCap: 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -541,3 +541,58 @@
Quantity: 20
- type: ToggleableClothing
clothingPrototype: ClothingHeadHatHoodWinterWeb

- type: entity
parent: ClothingOuterWinterCoat
id: ClothingOuterCsCorporateJacket
name: Cybersun Corporate Jacket
description: A cozy jacket with the Cybersun logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
components:
- type: Sprite
sprite: Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi
- type: Clothing
sprite: Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi

- type: entity
parent: ClothingOuterWinterCoat
id: ClothingOuterEECorporateJacket
name: Einstein Engines Corporate Jacket
description: A cozy jacket with the Einstein Engines logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
DangerRevolution marked this conversation as resolved.
Show resolved Hide resolved
components:
- type: Sprite
sprite: Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi
- type: Clothing
sprite: Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi

- type: entity
parent: ClothingOuterWinterCoat
id: ClothingOuterHICorporateJacket
name: Hephaestus Industries Corporate Jacket
description: A cozy jacket with the Hephaestus Industries logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
components:
- type: Sprite
sprite: Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi
- type: Clothing
sprite: Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi

- type: entity
parent: ClothingOuterWinterCoat
id: ClothingOuterHMCorporateJacket
name: Hawkmoon Acquisitions Corporate Jacket
description: A cozy jacket with the Hawkmoon Acquisitions logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
components:
- type: Sprite
sprite: Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi
- type: Clothing
sprite: Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi

- type: entity
parent: ClothingOuterWinterCoat
id: ClothingOuterIdCorporateJacket
name: Interdyne Corporate Jacket
description: A cozy jacket with the Interdyne logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
components:
- type: Sprite
sprite: Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi
- type: Clothing
sprite: Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi
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,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Leonardo DaBepis#4869 on discord / @leonardo-dabepis on Tumblr",
Copy link
Contributor

@DangerRevolution DangerRevolution May 4, 2024

Choose a reason for hiding this comment

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

Did you draw this or did Leo?

Copy link
Member Author

Choose a reason for hiding this comment

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

Leo created the original jacket, I merely edited them to match the color schemes

Copy link
Contributor

Choose a reason for hiding this comment

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

you need to credit yourself for the edit

"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Leonardo DaBepis#4869 on discord / @leonardo-dabepis on Tumblr",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Leonardo DaBepis#4869 on discord / @leonardo-dabepis on Tumblr",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Leonardo DaBepis#4869 on discord / @leonardo-dabepis on Tumblr",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Leonardo DaBepis#4869 on discord / @leonardo-dabepis on Tumblr",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
}
]
}
Loading