Skip to content

Commit

Permalink
Fixed formatting. Added period to description of Briefcase. Moved fil…
Browse files Browse the repository at this point in the history
…es to _DV instead.
  • Loading branch information
Smugman committed Jan 23, 2025
1 parent a77f11a commit 98ad282
Show file tree
Hide file tree
Showing 44 changed files with 180 additions and 176 deletions.
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 @@ -41,10 +41,12 @@
- id: EncryptionKeySyndie
- id: RubberStampTrader
- id: PhoneInstrumentSyndicate
# - id: ClothingUniformJumpsuitTacticool # begin DeltaV
# - id: ClothingOuterCoatJensen
# begin DeltaV
# - id: ClothingUniformJumpsuitTacticool
# - id: ClothingOuterCoatJensen
- id: ClothingOuterCybersunOvercoat
- id: ClothingUniformCybersunAttorney # end DeltaV
- id: ClothingUniformCybersunAttorney
# end DeltaV
- id: ClothingHandsGlovesCombat
- id: ClothingMaskNeckGaiter
- id: SyndieHandyFlag
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
ClothingNeckScarfStripedOrange: 3
ClothingShoesBootsWinterEngi: 2
contrabandInventory:
ClothingUniformCybersunHazard: 1 #DeltaV
ClothingUniformCybersunHazard: 1 # DeltaV
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@
ClothingHeadHatPwig: 1
# "Legally" obtained currency
SpaceCash100: 2
ClothingUniformCybersunAttorney: 1 # DeltaV
CybersunBriefcase: 1 # DeltaV
ClothingOuterCybersunOvercoat: 1 # DeltaV
# Begin DeltaV additions
ClothingUniformCybersunAttorney: 1
CybersunBriefcase: 1
ClothingOuterCybersunOvercoat: 1
# End DeltaV additions
emaggedInventory:
CyberPen: 1
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
ClothingHeadTinfoil: 2 # Nyanotrasen - Tinfoil hats for Epistemics
ClothingShoesBootsWinterSci: 2
contrabandInventory:
ClothingUniformCybersunRND: 1 #DeltaV
ClothingUniformCybersunRND: 1 # DeltaV
4 changes: 2 additions & 2 deletions Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,6 @@
description: Can hold various nefarious things.
components:
- type: Sprite
sprite: DeltaV/Clothing/Belt/syndbelt_overlay.rsi
sprite: _DV/Clothing/Belt/syndbelt_overlay.rsi
- type: Clothing
sprite: DeltaV/Clothing/Belt/syndbelt_overlay.rsi
sprite: _DV/Clothing/Belt/syndbelt_overlay.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@
description: Heavy black robes with magenta and gold trim. It smells old.
components:
- type: Sprite
sprite: DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi
sprite: _DV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi
- type: Clothing
sprite: DeltaV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi
sprite: _DV/Clothing/OuterClothing/Coats/cybersunovercoat.rsi
- type: TemperatureProtection
coolingCoefficient: 0.1
Original file line number Diff line number Diff line change
Expand Up @@ -459,9 +459,9 @@
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
sprite: _DV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi
sprite: _DV/Clothing/Uniforms/Jumpsuit/cybersunhazard.rsi

- type: entity
parent: ClothingUniformBase
Expand All @@ -470,9 +470,9 @@
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
sprite: _DV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi
sprite: _DV/Clothing/Uniforms/Jumpsuit/cybersuncasual.rsi

- type: entity
parent: ClothingUniformBase
Expand All @@ -481,7 +481,7 @@
description: It's another Turtleneck. What'd you expect?
components:
- type: Sprite
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi
sprite: _DV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi
sprite: _DV/Clothing/Uniforms/Jumpsuit/cybersunrnd.rsi

6 changes: 3 additions & 3 deletions Resources/Prototypes/_DV/Entities/Objects/Misc/briefcases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
parent: BriefcaseBrown
id: CybersunBriefcase
name: cybersun briefcase
description: It's like a brown briefcase, but black
description: It's like a brown briefcase, but black.
components:
- type: Sprite
sprite: DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi
sprite: _DV/Objects/Storage/Briefcases/briefcase_cybersun.rsi
state: icon
- type: Item
sprite: DeltaV/Objects/Storage/Briefcases/briefcase_cybersun.rsi
sprite: _DV/Objects/Storage/Briefcases/briefcase_cybersun.rsi
6 changes: 3 additions & 3 deletions Resources/Prototypes/_DV/Recipes/Lathes/clothing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@

- type: latheRecipe
parent: BaseCoatRecipe
id: ClothingOuterCoatCybersunWindbreaker #unsure because its armored, but with an EMAG you can get far better things than it from machines that you DONT have to steal/make.
id: ClothingOuterCoatCybersunWindbreaker
result: ClothingOuterCoatCybersunWindbreaker
materials:
Cloth: 100
Expand All @@ -162,7 +162,7 @@
Cloth: 100
Durathread: 200 #increased durathread cost since it has "armor" (Caustic is such a real damage type)

- type: latheRecipe #Commented out for now until added
- type: latheRecipe
parent: BaseCoatRecipe
id: ClothingOuterCybersunOvercoat
result: ClothingOuterCybersunOvercoat
Expand All @@ -172,7 +172,7 @@
id: ClothingHeadHatSurgcapCybersun
result: ClothingHeadHatSurgcapCybersun

- type: latheRecipe #unsure about letting people craft a gasmask at the uniform printer, but also dont want to split up the uniform into different machines or leave it half-finished, added higher cloth cost because this is the only way to lathe gasmasks at all, apparently.
- type: latheRecipe
parent: BaseHatRecipe
id: ClothingMaskInterdyneChemistry
result: ClothingMaskInterdyneChemistry
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

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
}
]
}
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
}
]
}
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

0 comments on commit 98ad282

Please sign in to comment.