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.

Sign up for GitHub

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

Remove shitcurity and cargonia references #836

Merged
merged 4 commits into from
Jan 8, 2024
Merged

Remove shitcurity and cargonia references #836

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a01a19a
Remove description references to shitcurity and cargonia
mnemosynium Jan 6, 2024
2492300
Update comments
mnemosynium Jan 6, 2024
3ab35ff
Update banners.yml
dvir001 Jan 6, 2024
af5dd3a
Undo removal from Praeda
mnemosynium Jan 6, 2024
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
6 changes: 3 additions & 3 deletions Resources/Maps/Shuttles/praeda.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1763,23 +1763,23 @@ entities:
entities:
- uid: 160
components:
- desc: A banner displaying the colors of the cargo department. Hail Cargonia!
- desc: A banner displaying the colors of the cargo department.
name: Cargo banner
type: MetaData
- pos: 0.5,-4.5
parent: 1
type: Transform
- uid: 161
components:
- desc: A banner displaying the colors of the cargo department. Hail Cargonia!
- desc: A banner displaying the colors of the cargo department.
name: Cargo banner
type: MetaData
- pos: -4.5,-19.5
parent: 1
type: Transform
- uid: 162
components:
- desc: A banner displaying the colors of the cargo department. Hail Cargonia!
- desc: A banner displaying the colors of the cargo department.
dvir001 marked this conversation as resolved.
Show resolved Hide resolved
name: Cargo banner
type: MetaData
- pos: 5.5,-19.5
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
parent: ClothingEyesBase
id: ClothingEyesGlassesSunglasses
name: sun glasses
description: Useful both for security and cargonia.
description: Useful for security. # Frontier - description change
components:
- type: Sprite
sprite: Clothing/Eyes/Glasses/sunglasses.rsi
Expand Down
3 changes: 1 addition & 2 deletions Resources/Prototypes/Entities/Clothing/Eyes/specific.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
parent: ClothingEyesBase
id: ClothingEyesChameleon # no flash immunity, sorry
name: sun glasses
description: Useful both for security and cargonia.
description: Useful for security. # Frontier - description change
suffix: Chameleon
components:
- type: Tag
Expand All @@ -18,4 +18,3 @@
interfaces:
- key: enum.ChameleonUiKey.Key
type: ChameleonBoundUserInterface

2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
parent: DrinkBottleBaseFull
id: DrinkCognacBottleFull
name: cognac bottle
description: A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. You might as well not scream 'SHITCURITY' this time.
description: A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. # Frontier - description change
components:
- type: SolutionContainerManager
solutions:
Expand Down
6 changes: 2 additions & 4 deletions Resources/Prototypes/Entities/Structures/Decoration/banners.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
id: BannerCargo
parent: BannerBase
name: cargo banner
description: A banner displaying the colors of the cargo department. Not. Cargonia.
description: A banner displaying the colors of the cargo department. # Frontier - description change
components:
- type: Sprite
sprite: Structures/Decoration/banner.rsi
Expand Down Expand Up @@ -101,7 +101,7 @@
id: BannerSecurity
parent: BannerBase
name: security banner
description: A banner displaying the colors of the shitcurity department. Security, my bad.
description: A banner displaying the colors of the security department. # Frontier - description change
components:
- type: Sprite
sprite: Structures/Decoration/banner.rsi
Expand Down Expand Up @@ -146,5 +146,3 @@
- type: Sprite
sprite: Structures/Decoration/banner.rsi
state: banner-green


Loading