Skip to content

Commit

Permalink
add space before all DeltaV comments
Browse files Browse the repository at this point in the history
  • Loading branch information
deltanedas committed Jan 1, 2025
1 parent fdc0257 commit 3590924
Show file tree
Hide file tree
Showing 62 changed files with 159 additions and 160 deletions.
17 changes: 8 additions & 9 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,16 @@ Upstream is the [space-wizards/space-station-14](https://github.com/space-wizard

# Content specific to Delta-V

In general anything you create from scratch (not modifying something that exists from upstream) should go in a DeltaV subfolder.
In general anything you create from scratch (not modifying something that exists from upstream) should go in a DeltaV subfolder, `_DV`.

Examples:
- `Content.Server/DeltaV/Chapel/SacrificialAltarSystem.cs`
- `Resources/Prototypes/DeltaV/ai_factions.yml`
- `Resources/Audio/DeltaV/Items/gavel.ogg`
- `Resources/Textures/DeltaV/Icons/cri.rsi`
- `Resources/Locale/en-US/deltav/shipyard/shipyard-console.ftl`
The locale subfolder is lowercase `deltav` instead of `DeltaV`.
- `Resources/ServerInfo/Guidebook/DeltaV/AlertProcedure.xml`
Note that guidebooks go in `ServerInfo/Guidebook/DeltaV` and not `ServerInfo/DeltaV`!
- `Content.Server/_DV/Chapel/SacrificialAltarSystem.cs`
- `Resources/Prototypes/_DV/ai_factions.yml`
- `Resources/Audio/_DV/Items/gavel.ogg`
- `Resources/Textures/_DV/Icons/cri.rsi`
- `Resources/Locale/en-US/_DV/shipyard/shipyard-console.ftl`
- `Resources/ServerInfo/Guidebook/_DV/AlertProcedure.xml`
Note that guidebooks go in `ServerInfo/Guidebook/_DV` and not `ServerInfo/_DV`!

# Changes to upstream files

Expand Down
4 changes: 2 additions & 2 deletions Resources/Migrations/migration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ SpeedLoaderPistolHighVelocity: SpeedLoaderPistol
# 2023-08-07
#If the name is anything to go off of, these are presumably just CEV-Eris versions of the snow rock (which we already have.)
#They are practically never used in this way however, so they're migrated to the basic rock type.
#MountainRock: AsteroidRock #DeltaV
#MountainRockMining: AsteroidRockMining #DeltaV
#MountainRock: AsteroidRock # DeltaV
#MountainRockMining: AsteroidRockMining # DeltaV

# 2023-08-08
#WindowTintedDirectional: WindowFrostedDirectional # DeltaV
Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/Catalog/Fills/Crates/medical.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
- id: UniformScrubsColorGreen
- id: UniformScrubsColorPurple
- id: UniformScrubsColorBlue
#DeltaV adds cyan through white scrubs
# DeltaV adds cyan through white scrubs
- id: UniformScrubsColorCyan
- id: UniformScrubsColorBlack
- id: UniformScrubsColorPink
Expand All @@ -89,14 +89,14 @@
- id: ClothingHeadHatSurgcapBlue
- id: ClothingHeadHatSurgcapPurple
- id: ClothingHeadHatSurgcapGreen
#DeltaV adds cyan through white surgcaps
# DeltaV adds cyan through white surgcaps
- id: ClothingHeadHatSurgcapCyan
- id: ClothingHeadHatSurgcapBlack
- id: ClothingHeadHatSurgcapPink
- id: ClothingHeadHatSurgcapRainbow
- id: ClothingHeadHatSurgcapWhite
- id: ClothingMaskSterile
#DeltaV nerfs amount from 3 to 1(more items)
# DeltaV nerfs amount from 3 to 1(more items)
amount: 1

- type: entity
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Catalog/uplink_catalog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1383,10 +1383,10 @@
icon: { sprite: /Textures/Objects/Magic/magicactions.rsi, state: gib }
productEntity: DeathAcidifierImplanter
cost:
Telecrystal: 5 #DeltaV- Was 4, now 5
Telecrystal: 5 # DeltaV- Was 4, now 5
categories:
- UplinkImplants
# conditions: #DeltaV- Allows Death Acidifer for our Syndibros
# conditions: # DeltaV- Allows Death Acidifer for our Syndibros
# - !type:StoreWhitelistCondition
# whitelist:
# tags:
Expand Down
36 changes: 18 additions & 18 deletions Resources/Prototypes/Decals/Overlays/grayscale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
tags: ["station", "overlay"]
defaultCustomColor: true
sprite:
sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency
sprite: DeltaV/Decals/Overlays/greyscale.rsi # DeltaV - Artstyle consistency
state: fulltile_overlay

- type: decal
Expand Down Expand Up @@ -115,95 +115,95 @@
tags: ["station", "overlay"]
defaultCustomColor: true
sprite:
sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle Consistency
sprite: DeltaV/Decals/Overlays/greyscale.rsi # DeltaV - Artstyle Consistency
state: halftile_overlay

- type: decal
id: HalfTileOverlayGreyscale90
tags: ["station", "overlay"]
defaultCustomColor: true
sprite:
sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle Consistency
sprite: DeltaV/Decals/Overlays/greyscale.rsi # DeltaV - Artstyle Consistency
state: halftile_overlay_90

- type: decal
id: HalfTileOverlayGreyscale180
tags: ["station", "overlay"]
defaultCustomColor: true
sprite:
sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency
sprite: DeltaV/Decals/Overlays/greyscale.rsi # DeltaV - Artstyle consistency
state: halftile_overlay_180

- type: decal
id: HalfTileOverlayGreyscale270
tags: ["station", "overlay"]
defaultCustomColor: true
sprite:
sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency
sprite: DeltaV/Decals/Overlays/greyscale.rsi # DeltaV - Artstyle consistency
state: halftile_overlay_270

- type: decal
id: QuarterTileOverlayGreyscale
tags: ["station", "overlay"]
defaultCustomColor: true
sprite:
sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency
sprite: DeltaV/Decals/Overlays/greyscale.rsi # DeltaV - Artstyle consistency
state: quartertile_overlay

- type: decal
id: QuarterTileOverlayGreyscale90
tags: ["station", "overlay"]
defaultCustomColor: true
sprite:
sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency
sprite: DeltaV/Decals/Overlays/greyscale.rsi # DeltaV - Artstyle consistency
state: quartertile_overlay_90

- type: decal
id: QuarterTileOverlayGreyscale180
tags: ["station", "overlay"]
defaultCustomColor: true
sprite:
sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency
sprite: DeltaV/Decals/Overlays/greyscale.rsi # DeltaV - Artstyle consistency
state: quartertile_overlay_180

- type: decal
id: QuarterTileOverlayGreyscale270
tags: ["station", "overlay"]
defaultCustomColor: true
sprite:
sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency
sprite: DeltaV/Decals/Overlays/greyscale.rsi # DeltaV - Artstyle consistency
state: quartertile_overlay_270

- type: decal
id: ThreeQuarterTileOverlayGreyscale
tags: ["station", "overlay"]
defaultCustomColor: true
sprite:
sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency
sprite: DeltaV/Decals/Overlays/greyscale.rsi # DeltaV - Artstyle consistency
state: threequartertile_overlay

- type: decal
id: ThreeQuarterTileOverlayGreyscale90
tags: ["station", "overlay"]
defaultCustomColor: true
sprite:
sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency
sprite: DeltaV/Decals/Overlays/greyscale.rsi # DeltaV - Artstyle consistency
state: threequartertile_overlay_90

- type: decal
id: ThreeQuarterTileOverlayGreyscale180
tags: ["station", "overlay"]
defaultCustomColor: true
sprite:
sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency
sprite: DeltaV/Decals/Overlays/greyscale.rsi # DeltaV - Artstyle consistency
state: threequartertile_overlay_180

- type: decal
id: ThreeQuarterTileOverlayGreyscale270
tags: ["station", "overlay"]
defaultCustomColor: true
sprite:
sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency
sprite: DeltaV/Decals/Overlays/greyscale.rsi # DeltaV - Artstyle consistency
state: threequartertile_overlay_270

- type: decal
Expand All @@ -219,39 +219,39 @@
tags: ["station", "overlay"]
defaultCustomColor: true
sprite:
sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency
sprite: DeltaV/Decals/Overlays/greyscale.rsi # DeltaV - Artstyle consistency
state: checkerNESW

- type: decal
id: CheckerNWSE
tags: ["station", "overlay"]
defaultCustomColor: true
sprite:
sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency
sprite: DeltaV/Decals/Overlays/greyscale.rsi # DeltaV - Artstyle consistency
state: checkerNWSE

- type: decal
id: DiagonalOverlay
tags: ["station", "overlay"]
defaultCustomColor: true
sprite:
sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency
sprite: DeltaV/Decals/Overlays/greyscale.rsi # DeltaV - Artstyle consistency
state: diagonal

- type: decal
id: DiagonalCheckerAOverlay
tags: ["station", "overlay"]
defaultCustomColor: true
sprite:
sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency
sprite: DeltaV/Decals/Overlays/greyscale.rsi # DeltaV - Artstyle consistency
state: diagonal_checker_a

- type: decal
id: DiagonalCheckerBOverlay
tags: ["station", "overlay"]
defaultCustomColor: true
sprite:
sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency
sprite: DeltaV/Decals/Overlays/greyscale.rsi # DeltaV - Artstyle consistency
state: diagonal_checker_b

- type: decal
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
tags:
- Hardsuit
- WhitelistChameleon
- HidesHarpyWings #DeltaV: Used by harpies to help render their hardsuit sprites
- HidesHarpyWings # DeltaV: Used by harpies to help render their hardsuit sprites
- type: ProtectedFromStepTriggers
slots: WITHOUT_POCKET
- type: DamageOnInteractProtection
Expand Down Expand Up @@ -167,7 +167,7 @@
size: Huge
- type: Tag
tags:
- HidesHarpyWings #DeltaV: Used by harpies to help render their hardsuit sprites
- HidesHarpyWings # DeltaV: Used by harpies to help render their hardsuit sprites
- type: ProtectedFromStepTriggers
slots: WITHOUT_POCKET
- type: DamageOnInteractProtection
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@
tags:
- WhitelistChameleon
- HighRiskItem
- HidesHarpyWings #DeltaV: Couldn't see the wings for their species-specific sprite because of a lack of this.
- HidesHarpyWings # DeltaV: Couldn't see the wings for their species-specific sprite because of a lack of this.
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitRd
- type: StaticPrice
Expand Down Expand Up @@ -857,7 +857,7 @@
tags:
- Hardsuit
- WhitelistChameleon
- HidesHarpyWings #DeltaV - Harpy ERT hardsuits
- HidesHarpyWings # DeltaV - Harpy ERT hardsuits

#ERT Janitor Hardsuit
- type: entity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
- FoodMealRibs
- FoodMealEggsbenedict
- FoodMealOmelette
- FoodMealScrambledEggs #DeltaV
- FoodMealScrambledEggs # DeltaV
- FoodMealFriedegg
- FoodMealQueso
- FoodMealSashimi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
bodyPart: Chest
markingCategory: Chest
speciesRestriction: [Human, Dwarf, Felinid, Oni] #Einstein Engines - Felinid, Oni
sexRestriction: [Male] #DeltaV: Splitting the scars and tattoos
sexRestriction: [Male] # DeltaV: Splitting the scars and tattoos
followSkinColor: true
sprites:
- sprite: Mobs/Customization/scars.rsi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
bodyPart: Chest
markingCategory: Chest
speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni
sexRestriction: [Male] #DeltaV: Splitting the scars and tattoos
sexRestriction: [Male] # DeltaV: Splitting the scars and tattoos
coloring:
default:
type:
Expand All @@ -18,14 +18,14 @@
bodyPart: Chest
markingCategory: Chest
speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni
sexRestriction: [Male] #DeltaV: Splitting the scars and tattoos
sexRestriction: [Male] # DeltaV: Splitting the scars and tattoos
coloring:
default:
type:
!type:TattooColoring
fallbackColor: "#666666"
sprites:
- sprite: DeltaV/Mobs/Customization/tattoos.rsi #DeltaV: Splitting the scars and tattoos
- sprite: DeltaV/Mobs/Customization/tattoos.rsi # DeltaV: Splitting the scars and tattoos
state: tattoo_nightling

- type: marking
Expand Down
Loading

0 comments on commit 3590924

Please sign in to comment.