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

Adds a number of Cybersun clothing options to emagged vendors #2285

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all 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
8 changes: 5 additions & 3 deletions Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

- type: entity
id: BriefcaseSyndieLobbyingBundleFilled
parent: BriefcaseSyndie
parent: CybersunBriefcase # DeltaV
suffix: Syndicate, Spesos
components:
- type: StorageFill
Expand All @@ -41,8 +41,10 @@
- id: EncryptionKeySyndie
- id: RubberStampTrader
- id: PhoneInstrumentSyndicate
- id: ClothingUniformJumpsuitTacticool
- id: ClothingOuterCoatJensen
# - id: ClothingUniformJumpsuitTacticool # begin DeltaV
# - id: ClothingOuterCoatJensen
- id: ClothingOuterCybersunOvercoat
- id: ClothingUniformCybersunAttorney # end DeltaV
- id: ClothingHandsGlovesCombat
- id: ClothingMaskNeckGaiter
- id: SyndieHandyFlag
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@
ClothingOuterWinterEngi: 2
ClothingNeckScarfStripedOrange: 3
ClothingShoesBootsWinterEngi: 2
emaggedInventory:
Copy link
Member

Choose a reason for hiding this comment

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

comment

ClothingUniformCybersunHazard: 1
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,6 @@
SpaceCash100: 2
emaggedInventory:
CyberPen: 1
ClothingUniformCybersunAttorney: 1 # DeltaV
Copy link
Contributor

Choose a reason for hiding this comment

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

I would also put the briefcase and attorney clothes into contraband inventory instead of emagged, The briefcase is one of the snazziest items on offer!

CybersunBriefcase: 1 # DeltaV
ClothingOuterCybersunOvercoat: 1 # DeltaV
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@
ClothingNeckScarfStripedPurple: 3
ClothingHeadTinfoil: 2 # Nyanotrasen - Tinfoil hats for Epistemics
ClothingShoesBootsWinterSci: 2
emaggedInventory:
Copy link
Member

Choose a reason for hiding this comment

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

comment

ClothingUniformCybersunRND: 1
11 changes: 11 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,14 @@
ents: []
medkit: !type:ContainerSlot {}
- type: Appearance

- type: entity
parent: ClothingBeltUtility
id: ClothingBeltSyndicateUtility
name: syndicate utility belt
description: Can hold various nefarious things.
components:
- type: Sprite
sprite: DeltaV/Clothing/Belt/syndbelt_overlay.rsi
- type: Clothing
sprite: DeltaV/Clothing/Belt/syndbelt_overlay.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -119,3 +119,15 @@
- type: TemperatureProtection
coolingCoefficient: 0.1

- type: entity
parent: ClothingOuterStorageBase
id: ClothingOuterCybersunOvercoat
name: cybersun overcoat
description: Heavy black robes with magenta and gold trim. It smells old.
components:
- type: Sprite
sprite: DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi
- type: Clothing
sprite: DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi
- type: TemperatureProtection
coolingCoefficient: 0.1
Original file line number Diff line number Diff line change
Expand Up @@ -418,3 +418,36 @@
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformCybersunHazard
name: cybersun hazard suit
description: This high-visibility jumpsuit prevents you from getting run over, yet keeps you dark enough to stay unnoticed!
components:
- type: Sprite
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformCybersunCasual
name: cybersun casual jumpsuit
description: With all the non-descript gizmos they shoved in this thing, are you sure it's even safe to put on?
components:
- type: Sprite
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformCybersunRND
name: cybersun research turtleneck
description: It's another Turtleneck. What'd you expect?
components:
- type: Sprite
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
- type: entity
parent: BriefcaseBrown
id: CybersunBriefcase
name: cybersun briefcase
description: It's like a brown briefcase, but black
components:
- type: Sprite
sprite: DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi
state: icon
- type: Item
sprite: DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.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.
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": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. Modified by TJohnson.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-BELT",
"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": "sprites by JustAnOrange (Discord)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"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 JustanOrange",
"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 JustanOrange",
"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 JustanOrange",
"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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/a929584d9db319eb7484113221be25cfa1d5dc09",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "icon"
}
]
}
Loading