Skip to content

Commit

Permalink
Open Market Tacsuits (#845)
Browse files Browse the repository at this point in the history
# Description

I've spoken with this subject with quite a few people so far, that
there's some inherent issues with the game's setting as regards to
corporations, and people readily identifying certain companies as being
"Syndicate Companies". It makes absolutely no sense for things like that
to be completely public knowledge that X-Company is explicitly
antagonistic, when publicly they would just be companies that sell
products to an open market-- an open market that NanoTrasen buys from.
And while we've been doing this lately with adding non-NT company names
to the names and descriptions of hardsuits, one thing has been bugging
me and other people for awhile.

"If the Cybersun tacsuits are meant to be something that the Nukies
literally bought on the open market and painted red. Why can't the
station also purchase these suits from the same market? If a
manufacturer of these suits notably declined to sell its products to
another company, it would be an extremely obvious tell that they were
overtly hostile to that corporation. It makes more sense if they openly
sell said products at an inflated cost, so that they can put up public
appearances of neutrality".

This also brings to mind that the Reverse Engineering Machine, in it's
current rendition, is extremely problematic for establishing the game as
a serious setting, given that it currently functions as what is
essentially "Press button to commit industrial espionage". Having talked
with its original creator, Rane also agreed that- especially in the
context of the "Blukie Suits", this presents an issue for the game's
setting presentation. It's a plot hole that makes very little sense.

So, what this PR does, is make it so that station Logistics can purchase
crates containing CSA branded Tacsuits, painted in the blue, at a
massively overinflated cost. These crates come with Security locks,
meaning that they would be bought for use solely by the station's
security. Additionally, this removes the ability for the Reverse
Engineering machine to violate the intellectual property of other
corporations, which in-universe would be something highly illegal under
a truly neutral space law.

I actually also believe that other hardsuits and tacsuits, including
ones purchased from Five-Points-Armory, Hephaeustus, etc, should all be
purchasable from cargo. Technically, any weapon, hardsuit, or armor,
should also be purchasable, but making it so that cargo can order a
Sec-Crate with a C-20r in it would be extremely controversial, and is
best left to a separate PR.

# Changelog

:cl:
- add: CSA-51a "Shanlin" and CSA-80UA "Guan-Yu" Tacsuits can now be
purchased from Logistics for use by station security personnel, at an
extremely overinflated price. These suits come prepainted in blue.
- remove: Reverse Engineering machines can no longer violate the
intellectual property rights of publicly traded corporations. This means
that Cybersun Tacsuits; regardless of where they were obtained from or
what color they were painted, can no longer be reverse engineered.

---------

Signed-off-by: VMSolidus <[email protected]>
Co-authored-by: DEATHB4DEFEAT <[email protected]>
  • Loading branch information
VMSolidus and DEATHB4DEFEAT committed Sep 17, 2024
1 parent f5275e2 commit 3dd57ca
Show file tree
Hide file tree
Showing 9 changed files with 50 additions and 39 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ ent-ClothingHeadHelmetHardsuitLuxury = HpI-20c helmet
.desc = A modified helmet for the Minos hardsuit, fashioned after the Logistics Officer's colors. It's been modified for greater mobility at the expense of physical trauma protection.
ent-ClothingHeadHelmetHardsuitSyndie = CSA-51a helmet
.desc = An armored helmet deployed over a Shanlin tacsuit. This one has been painted blood red.
ent-ClothingHeadHelmetHardsuitSyndieReverseEngineered = CSA-51a helmet
.desc = An armored helmet deployed over a Shanlin tacsuit. This one has been painted blue.
ent-ClothingHeadHelmetHardsuitSyndieMedic = CSA-51m helmet
.desc = An armored helmet deployed over a Zhongyao tacsuit. features optic integrations for nearly every medical hud on the market.
Designed to enable the survival of combat medics in the most dangerous of environments.
Expand All @@ -64,6 +66,8 @@ ent-ClothingHeadHelmetHardsuitSyndieCommander = CSA-54c helmet
.desc = A bulked up version of the Shanlin tacsuit's helmet, purpose-built for commanders of special operation squads. This one has been painted blood-red.
ent-ClothingHeadHelmetHardsuitCybersun = CSA-80UA helmet
.desc = An incredibly sturdy looking helmet designed for the Guan Yu tacsuit.
ent-ClothingHeadHelmetHardsuitJuggernautReverseEngineered = CSA-80UA helmet
.desc = An incredibly sturdy looking helmet designed for the Guan Yu tacsuit. This one has been painted blue.
ent-ClothingHeadHelmetHardsuitWizard = WZD-84 helmet
.desc = A bizarre, gem-encrusted helmet from unknown origins. It provides some protection to its wearer without restricting their movements.
ent-ClothingHeadHelmetHardsuitLing = organic space helmet
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ ent-ClothingOuterHardsuitLuxury = HpI-20c - "Minos" hardsuit
ent-ClothingOuterHardsuitSyndie = CSA-51a - "Shanlin" tacsuit
.desc = A tactical combat hardsuit produced by the Cybersun-Armaments Corporation, the suit's tags indicate it provides moderate protection against most forms of damage.
This one has been painted blood red. It feels incredibly light.
ent-ClothingOuterHardsuitSyndieReverseEngineered = CSA-51a - "Shanlin" tacsuit
.desc = A tactical combat hardsuit produced by the Cybersun-Armaments Corporation, the suit's tags indicate it provides moderate protection against most forms of damage.
This one has been painted blue. It feels incredibly light.
ent-ClothingOuterHardsuitSyndieMedic = CSA-51m - "Zhongyao" tacsuit
.desc = A tactical combat hardsuit produced by the Cybersun-Armaments Corporation, the suit's tags indicate it provides moderate protection against most forms of damage.
Half of the suit is painted blood red, the rest bears galactic-standard medical markings. It feels incredibly light.
Expand All @@ -87,6 +90,9 @@ ent-ClothingOuterHardsuitSyndieCommander = CSA-54c - "Tianming" tacsuit
ent-ClothingOuterHardsuitJuggernaut = CSA-80UA - "Guan Yu" tacsuit
.desc = The pride and joy of the Cybersun-Armaments Corporation, named after an ancient Sol' War God. Commonly known throughout the galaxy as a "Juggernaut".
Matching its bulky appearance, it protects against all forms of damage. It feels VERY heavy.
end-ClothingOuterHardsuitJuggernautReverseEngineered = CSA-80UA - "Guan Yu" tacsuit
.desc = The pride and joy of the Cybersun-Armaments Corporation, named after an ancient Sol' War God. Commonly known throughout the galaxy as a "Juggernaut".
Matching its bulky appearance, it protects against all forms of damage. It feels VERY heavy.
ent-ClothingOuterHardsuitWizard = WZD-84 - "Mana" tacsuit
.desc = A bizarre gem-encrusted hardsuit. Famously used by members of the Wizard Federation in their operations.
Contrary to it's appearance, it can protect its wearer from space and considerable amounts of physical trauma, it feels somewhat light.
Expand Down
2 changes: 0 additions & 2 deletions Resources/Maps/glacier.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52876,8 +52876,6 @@ entities:
- HamtrLLeg
- HamtrRLeg
- VimHarness
- ClothingOuterHardsuitJuggernautReverseEngineered
- ClothingOuterHardsuitSyndieReverseEngineered
- JetpackBlue
- JetpackMini
- proto: ExtinguisherCabinetFilled
Expand Down
20 changes: 20 additions & 0 deletions Resources/Prototypes/Catalog/Cargo/cargo_security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,23 @@
cost: 1000
category: cargoproduct-category-name-security
group: market

- type: cargoProduct
id: SecurityShanlinTacsuit
icon:
sprite: Nyanotrasen/Clothing/OuterClothing/ReverseEngineering/syndicate.rsi
state: icon
product: CrateSecurityShanlinTacsuit
cost: 17500
category: cargoproduct-category-name-security
group: market

- type: cargoProduct
id: SecurityGuanYuTacsuit
icon:
sprite: Nyanotrasen/Clothing/OuterClothing/ReverseEngineering/juggernaut.rsi
state: icon
product: CrateSecurityGuanYuTacsuit
cost: 30000
category: cargoproduct-category-name-security
group: market
20 changes: 20 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Crates/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,4 +113,24 @@
- id: TrackingImplanter
amount: 4

- type: entity
id: CrateSecurityShanlinTacsuit
parent: CrateSecgear
name: shanlin tacsuit crate
description: Contains a single CSA-51a Shanlin tacsuit. Requires Security access to open.
components:
- type: StorageFill
contents:
- id: ClothingOuterHardsuitSyndieReverseEngineered

- type: entity
id: CrateSecurityGuanYuTacsuit
parent: CrateSecgear
name: shanlin tacsuit crate
description: Contains a single CSA-80UA Guan-Yu tacsuit. Requires Security access to open.
components:
- type: StorageFill
contents:
- id: ClothingOuterHardsuitJuggernautReverseEngineered

# Cosmetic Crates
10 changes: 0 additions & 10 deletions Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,6 @@
- type: HeldSpeedModifier
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitAtmos
- type: ReverseEngineering # Nyano
difficulty: 5
newItem: ClothingOuterHardsuitJuggernautReverseEngineered
recipes:
- ClothingOuterHardsuitJuggernautReverseEngineered

#Engineering Hardsuit
- type: entity
Expand Down Expand Up @@ -557,11 +552,6 @@
- type: HeldSpeedModifier
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitSyndie
- type: ReverseEngineering # Nyano
difficulty: 5
newItem: ClothingOuterHardsuitSyndieReverseEngineered
recipes:
- ClothingOuterHardsuitSyndieReverseEngineered
- type: Tag
tags:
- MonkeyWearable
Expand Down
2 changes: 0 additions & 2 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -628,8 +628,6 @@
- HamtrRLeg
- VimHarness
# Begin Nyano additions
- ClothingOuterHardsuitJuggernautReverseEngineered
- ClothingOuterHardsuitSyndieReverseEngineered
- JetpackBlue
- JetpackMini
# End Nyano additions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
sprite: Nyanotrasen/Clothing/OuterClothing/ReverseEngineering/syndicate.rsi
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitSyndieReverseEngineered
- type: ReverseEngineering
newItem: null

- type: entity
parent: ClothingOuterHardsuitJuggernaut
Expand All @@ -35,8 +33,6 @@
sprite: Nyanotrasen/Clothing/OuterClothing/ReverseEngineering/juggernaut.rsi
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitJuggernautReverseEngineered
- type: ReverseEngineering
newItem: null

- type: entity
parent: ClothingOuterHardsuitERTLeader
Expand Down
21 changes: 0 additions & 21 deletions Resources/Prototypes/Nyanotrasen/Recipes/Lathes/hardsuits.yml

This file was deleted.

0 comments on commit 3dd57ca

Please sign in to comment.