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

CorporatCoatsWavetwo #426

Merged
merged 17 commits into from
Jun 2, 2024
Merged
Show file tree
Hide file tree
Changes from 15 commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,11 @@
ClothingOuterHICorporateJacket: 2 # Einstein Engines - Clothing addition
LovelyLophi marked this conversation as resolved.
Show resolved Hide resolved
ClothingOuterHMCorporateJacket: 2 # Einstein Engines - Clothing addition
ClothingOuterIdCorporateJacket: 2 # Einstein Engines - Clothing addition
ClothingOuterZhCorporateJacket: 2 # Einstein Engines - Clothing addition
ClothingOuterGeCorporateJacket: 2 # Einstein Engines - Clothing addition
ClothingOuterFaCorporateJacket: 2 # Einstein Engines - Clothing addition
ClothingOuterDdCorporateJacket: 2 # Einstein Engines - Clothing addition
ClothingOuterBcCorporateJacket: 2 # Einstein Engines - Clothing addition
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 @@ -555,7 +555,7 @@

- type: entity
parent: ClothingOuterWinterCoat
id: ClothingOuterEECorporateJacket
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.
components:
Expand All @@ -566,7 +566,7 @@

- type: entity
parent: ClothingOuterWinterCoat
id: ClothingOuterHICorporateJacket
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:
Expand All @@ -577,7 +577,7 @@

- type: entity
parent: ClothingOuterWinterCoat
id: ClothingOuterHMCorporateJacket
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:
Expand All @@ -596,3 +596,58 @@
sprite: Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi
- type: Clothing
sprite: Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi

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

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

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

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

- type: entity
parent: ClothingOuterWinterCoat
id: ClothingOuterZhCorporateJacket
name: Zeng-Hu Pharmaceuticals Corporate Jacket
description: A cozy jacket with the Zeng-Hu Pharmaceuticals logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
components:
- type: Sprite
sprite: Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi
- type: Clothing
sprite: Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi
77 changes: 77 additions & 0 deletions Resources/Prototypes/Loadouts/outerClothing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,80 @@
cost: 3
items:
- ClothingOuterWinterCoat

- type: loadout
id: LoadoutOuterCorporateJacket
category: Outer
cost: 2
items:
- ClothingOuterCorporateJacket

- type: loadout
id: LoadoutOuterCsCorporateJacket
category: Outer
cost: 2
items:
- ClothingOuterCsCorporateJacket

- type: loadout
id: LoadoutOuterEeCorporateJacket
category: Outer
cost: 2
items:
- ClothingOuterEeCorporateJacket

- type: loadout
id: LoadoutOuterHiCorporateJacket
category: Outer
cost: 2
items:
- ClothingOuterHiCorporateJacket

- type: loadout
id: LoadoutOuterHmCorporateJacket
category: Outer
cost: 2
items:
- ClothingOuterHmCorporateJacket

- type: loadout
id: LoadoutOuterIdCorporateJacket
category: Outer
cost: 2
items:
- ClothingOuterIdCorporateJacket

- type: loadout
id: LoadoutOuterBcCorporateJacket
category: Outer
cost: 2
items:
- ClothingOuterBcCorporateJacket

- type: loadout
id: LoadoutOuterDdCorporateJacket
category: Outer
cost: 2
items:
- ClothingOuterDdCorporateJacket

- type: loadout
id: LoadoutOuterFaCorporateJacket
category: Outer
cost: 2
items:
- ClothingOuterFaCorporateJacket

- type: loadout
id: LoadoutOuterGeCorporateJacket
category: Outer
cost: 2
items:
- ClothingOuterGeCorporateJacket

- type: loadout
id: LoadoutOuterZhCorporateJacket
category: Outer
cost: 2
items:
- ClothingOuterZhCorporateJacket
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 on discord / @leonardo-dabepis on Tumblr, Edited by heartparkyheart on Discord",
"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.
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 on discord / @leonardo-dabepis on Tumblr, Edited by heartparkyheart on Discord",
"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.
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 on discord / @leonardo-dabepis on Tumblr, Edited by heartparkyheart on Discord",
"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 on discord / @leonardo-dabepis on Tumblr, Edited by heartparkyheart on Discord",
"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.
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,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "leonardo_dabepis on discord / @leonardo-dabepis on Tumblr, Edited by heartparkyheart on Discord",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
}
]
}
Loading