Skip to content

Commit

Permalink
CorporatCoatsWavetwo (#426)
Browse files Browse the repository at this point in the history
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

Further expanded Assistant gang colors and added them to loadouts


VM is bad at helping so image is in comments
---

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- add: Added five new coats
- add: Added loadouts
- fix: Fixed the coat handhole

---------

Co-authored-by: DEATHB4DEFEAT <[email protected]>
Co-authored-by: VMSolidus <[email protected]>
Co-authored-by: Danger Revolution! <[email protected]>
  • Loading branch information
4 people authored Jun 2, 2024
1 parent 00b0d9e commit 6d3e078
Show file tree
Hide file tree
Showing 24 changed files with 234 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,15 @@
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
ClothingOuterEeCorporateJacket: 2 # Einstein Engines - Clothing addition
ClothingOuterHiCorporateJacket: 2 # Einstein Engines - Clothing addition
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 @@ -32,7 +32,7 @@
- ClothMade
- WhitelistChameleon
- type: StaticPrice
price: 70
price: 50

- type: entity
parent: ClothingOuterWinterCoat
Expand Down 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
}
]
}

0 comments on commit 6d3e078

Please sign in to comment.