Merge branch 'master' into powerhud

2024-11-22 19:38:55 +01:00
parent 3758715bdc 09ca45a621
commit 5a9a2d463b
154 changed files with 10514 additions and 1108 deletions
--- a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
@@ -18,6 +18,16 @@
  category: cargoproduct-category-name-armory
  group: market

+- type: cargoProduct
+  id: SecurityRiot
+  icon:
+    sprite: Clothing/OuterClothing/Armor/riot.rsi
+    state: icon
+  product: CrateSecurityRiot
+  cost: 7500
+  category: cargoproduct-category-name-armory
+  group: market
+
 - type: cargoProduct
  id: TrackingImplant
  icon:
--- a/Resources/Prototypes/Catalog/Cargo/cargo_circuitboards.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_circuitboards.yml
@@ -1,9 +0,0 @@
- type: cargoProduct
-  id: CrewMonitoringBoards
-  icon:
-    sprite: Objects/Misc/module.rsi
-    state: cpuboard
-  product: CrateCrewMonitoringBoards
-  cost: 2000
-  category: cargoproduct-category-name-circuitboards
-  group: market
--- a/Resources/Prototypes/Catalog/Cargo/cargo_science.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_science.yml
@@ -27,3 +27,13 @@
  cost: 800
  category: cargoproduct-category-name-science
  group: market
+
+- type: cargoProduct
+  id: CrewMonitoring
+  icon:
+    sprite: Structures/Machines/server.rsi
+    state: server
+  product: CrateCrewMonitoring
+  cost: 2000
+  category: cargoproduct-category-name-science
+  group: market
--- a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml
@@ -28,16 +28,6 @@
  category: cargoproduct-category-name-security
  group: market

- type: cargoProduct
-  id: SecurityRiot
-  icon:
-    sprite: Clothing/OuterClothing/Armor/riot.rsi
-    state: icon
-  product: CrateSecurityRiot
-  cost: 7500
-  category: cargoproduct-category-name-security
-  group: market
-
 - type: cargoProduct
  id: SecuritySupplies
  icon:
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -159,7 +159,7 @@
  parent: ClothingBackpackDuffelSyndicateBundle
  id: ClothingBackpackDuffelSyndicatePyjamaBundle
  name: syndicate pyjama duffel bag
-  description: Contains 3 pairs of syndicate pyjamas and 3 plushies for the ultimate sleepover.
+  description: Contains 3 pairs of syndicate pyjamas and 4 plushies for the ultimate sleepover.
  components:
  - type: Storage
    grid:
--- a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
@@ -69,3 +69,22 @@
      amount: 2
    - id: MagazinePistol
      amount: 4
+
+- type: entity
+  id: CrateSecurityRiot
+  parent: [ CrateWeaponSecure, BaseRestrictedContraband ]
+  name: swat crate
+  description: Contains two sets of riot armor, helmets, shields, and enforcers loaded with beanbags. Extra ammo is included. Requires Armory access to open.
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingOuterArmorRiot
+      amount: 2
+    - id: ClothingHeadHelmetRiot
+      amount: 2
+    - id: WeaponShotgunEnforcerRubber
+      amount: 2
+    - id: BoxBeanbag
+      amount: 2
+    - id: RiotShield
+      amount: 2
--- a/Resources/Prototypes/Catalog/Fills/Crates/circuitboards.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/circuitboards.yml
@@ -1,12 +0,0 @@
- type: entity
-  id: CrateCrewMonitoringBoards
-  parent: CrateEngineeringSecure
-  name: crew monitoring boards
-  description: Has two crew monitoring console and server replacements. Requires engineering access to open.
-  components:
-    - type: StorageFill
-      contents:
-        - id: CrewMonitoringComputerCircuitboard
-          amount: 2
-        - id: CrewMonitoringServerMachineCircuitboard
-          amount: 2
--- a/Resources/Prototypes/Catalog/Fills/Crates/science.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/science.yml
@@ -12,3 +12,15 @@
        amount: 2
      - id: ClothingMaskSterile
        amount: 2
+
+- type: entity
+  id: CrateCrewMonitoring
+  parent: CrateScienceSecure
+  name: crew monitoring crate
+  description: Contains a flatpack of a crew monitoring server and a few crew monitoring computers. Requires Science access to open.
+  components:
+  - type: StorageFill
+    contents:
+    - id: CrewMonitoringServerFlatpack
+    - id: CrewMonitoringComputerFlatpack
+      amount: 3
--- a/Resources/Prototypes/Catalog/Fills/Crates/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/security.yml
@@ -38,26 +38,6 @@
 #      - Pepperspray
 #      - GrenadeTeargas

- type: entity
-  id: CrateSecurityRiot
-  parent: CrateSecgear
-  name: swat crate
-  description: Contains two sets of riot armor, helmets, shields, and enforcers loaded with beanbags. Extra ammo is included. Requires Armory access to open.
-  components:
-  - type: StorageFill
-    contents:
-      - id: ClothingOuterArmorRiot
-        amount: 2
-      - id: ClothingHeadHelmetRiot
-        amount: 2
-      - id: WeaponShotgunEnforcerRubber
-        amount: 2
-      - id: BoxBeanbag
-        amount: 2
-      - id: RiotShield
-        amount: 2
-#      - SecGasmask
-
 - type: entity
  id: CrateSecuritySupplies
  parent: CrateSecgear
--- a/Resources/Prototypes/Datasets/Names/borer.yml
+++ b/Resources/Prototypes/Datasets/Names/borer.yml
@@ -1,72 +1,5 @@
- type: dataset
-  id: names_borer
+- type: localizedDataset
+  id: NamesBorer
  values:
-  - Alcyonium
-  - Anomia
-  - Aphrodita
-  - Arca
-  - Argonauta
-  - Ascaris
-  - Asterias
-  - Buccinum
-  - Bulla
-  - Cardium
-  - Chama
-  - Chiton
-  - Conus
-  - Corallina
-  - Cypraea
-  - Dentalium
-  - Donax
-  - Doris
-  - Echinus
-  - Eschara
-  - Fasciola
-  - Furia
-  - Gordius
-  - Gorgonia
-  - Haliotis
-  - Helix
-  - Hirudo
-  - Holothuria
-  - Hydra
-  - Isis
-  - Lepas
-  - Lernaea
-  - Limax
-  - Lumbricus
-  - Madrepora
-  - Medusa
-  - Millepora
-  - Murex
-  - Myes
-  - Mytilus
-  - Myxine
-  - Nautilus
-  - Nereis
-  - Neritha
-  - Ostrea
-  - Patella
-  - Pennatula
-  - Pholas
-  - Pinna
-  - Priapus
-  - Scyllaea
-  - Sepia
-  - Serpula
-  - Sertularia
-  - Solen
-  - Spondylus
-  - Strombus
-  - Taenia
-  - Tellina
-  - Teredo
-  - Tethys
-  - Triton
-  - Trochus
-  - Tubipora
-  - Tubularia
-  - Turbo
-  - Venus
-  - Voluta
-  - Volvox
+    prefix: names-borer-dataset-
+    count: 69
--- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
@@ -15,8 +15,6 @@
  - type: ToggleClothing
    action: ActionToggleMagboots
    mustEquip: false
-  - type: ToggleVerb
-    text: toggle-magboots-verb-get-data-text
  - type: ComponentToggler
    components:
    - type: NoSlip
--- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
@@ -252,7 +252,7 @@

 - type: entity
  id: AntimovCircuitBoard
-  parent: BaseElectronics
+  parent: [BaseElectronics, BaseSyndicateContraband]
  name: law board (Antimov)
  description: An electronics board containing the Antimov lawset.
  components:
--- a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
@@ -463,7 +463,7 @@
 - type: entity
  parent: BaseTreeConifer
  id: FloraTreeChristmas02
-  suffix: PresentsGiver
+  suffix: Safe Presents
  name: christmas tree
  components:
  - type: Sprite
@@ -481,16 +481,33 @@
    spawnEntries:
      - id: PresentRandom
        orGroup: present
-      - id: PresentRandomCash
-        prob: 0.20
+      - id: PresentRandomCash # buy your own.
+        prob: 0.1
        orGroup: present
-      - id: PresentRandomAsh
+      - id: PresentRandomCoal # naughty
        prob: 0.05
        orGroup: present
    receivedPopup: christmas-tree-got-gift
    deniedPopup: christmas-tree-no-gift
    requiredHoliday: FestiveSeason

+- type: entity
+  parent: FloraTreeChristmas02
+  id: FloraTreeChristmas03
+  suffix: Insane Presents
+  name: christmas tree
+  components:
+  - type: LimitedItemGiver
+    spawnEntries:
+      - id: PresentRandom
+        orGroup: present
+      - id: PresentRandomUnsafe
+        prob: 0.5
+        orGroup: present
+      - id: PresentRandomInsane
+        prob: 0.2
+        orGroup: present
+
 - type: entity
  parent: BaseTreeConifer
  id: FloraTreeStumpConifer
--- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
@@ -374,14 +374,23 @@
      path: /Audio/Effects/unwrap.ogg

 - type: entity
-  id: PresentRandomAsh
+  id: PresentRandomCoal
  parent: [PresentBase, BaseItem]
-  suffix: Filled Ash
+  suffix: Filled Coal
  components:
  - type: SpawnItemsOnUse
    items:
      - id: PresentTrash
-      - id: Ash # No coal yet!
+      - id: Coal1
+        orGroup: GiftPool
+      - id: Coal5
+        prob: .4
+        orGroup: GiftPool
+      - id: Coal10
+        prob: .2
+        orGroup: GiftPool
+      - id: Coal15
+        prob: .1
        orGroup: GiftPool
    sound:
      path: /Audio/Effects/unwrap.ogg
--- a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
@@ -215,4 +215,22 @@
    layers:
    - state: fax-machine
  - type: Flatpack
-    entity: FaxMachineBase
+    entity: FaxMachineBase
+
+- type: entity
+  parent: BaseFlatpack
+  id: CrewMonitoringServerFlatpack
+  name: crew monitoring server flatpack
+  description: A flatpack used for constructing a crew monitoring server.
+  components:
+  - type: Flatpack
+    entity: CrewMonitoringServer
+
+- type: entity
+  parent: BaseFlatpack
+  id: CrewMonitoringComputerFlatpack
+  name: crew monitoring computer flatpack
+  description: A flatpack used for constructing a crew monitoring console.
+  components:
+  - type: Flatpack
+    entity: ComputerCrewMonitoring
--- a/Resources/Prototypes/Entities/Objects/Fun/darts.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/darts.yml
@@ -195,7 +195,7 @@
  id: HypoDartBox
  name: hypodart box
  suffix: HypoDart
-  description: A small box containing an hypodart. Packaging disintegrates when opened, leaving no evidence behind.
+  description: A small box containing a hypodart. Packaging disintegrates when opened, leaving no evidence behind.
  components:
  - type: Sprite
    sprite: Objects/Fun/Darts/dartbox.rsi
--- a/Resources/Prototypes/Entities/Objects/Materials/ore.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/ore.yml
@@ -333,6 +333,30 @@
  - type: Stack
    count: 1

+- type: entity
+  parent: Coal
+  id: Coal5
+  suffix: Five
+  components:
+  - type: Stack
+    count: 5
+
+- type: entity
+  parent: Coal
+  id: Coal10
+  suffix: Ten
+  components:
+  - type: Stack
+    count: 10
+
+- type: entity
+  parent: Coal
+  id: Coal15
+  suffix: Fifteen
+  components:
+  - type: Stack
+    count: 15
+
 - type: entity
  parent: OreBase
  id: SaltOre
--- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
@@ -47,8 +47,8 @@
      params:
        variation: 0.125
        volume: -4
-  - type: ToggleVerb
-    text: fire-extinguisher-component-verb-text
+    verbToggleOn: fire-extinguisher-component-verb-remove
+    verbToggleOff: fire-extinguisher-component-verb-engage
  - type: SpraySafety
  - type: MeleeWeapon
    wideAnimationRotation: 180
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -448,7 +448,7 @@
  name: hyperzine microinjector
  parent: [ChemicalMedipen, BaseSyndicateContraband]
  id: StimpackMini
-  description: A microinjector of hyperzine that give you about fifteen seconds of the chemical's effects.
+  description: A microinjector of hyperzine that give you about 15 seconds of the chemical's effects.
  components:
  - type: Sprite
    sprite: Objects/Specific/Medical/medipen.rsi
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -568,7 +568,7 @@

 - type: entity
  id: BorgModuleOperative
-  parent: [ BaseBorgModuleSyndicate, BaseProviderBorgModule ]
+  parent: [ BaseBorgModuleSyndicate, BaseProviderBorgModule, BaseSyndicateContraband ]
  name: operative cyborg module
  description: A module that comes with a crowbar, an Emag and a syndicate pinpointer.
  components:
@@ -586,7 +586,7 @@

 - type: entity
  id: BorgModuleEsword
-  parent: [ BaseBorgModuleSyndicate, BaseProviderBorgModule ]
+  parent: [ BaseBorgModuleSyndicate, BaseProviderBorgModule, BaseSyndicateContraband ]
  name: energy sword cyborg module
  description: A module that comes with a double energy sword.
  components:
@@ -603,7 +603,7 @@

 - type: entity
  id: BorgModuleL6C
-  parent: [ BaseBorgModuleSyndicateAssault, BaseProviderBorgModule ]
+  parent: [ BaseBorgModuleSyndicateAssault, BaseProviderBorgModule, BaseSyndicateContraband ]
  name: L6C ROW cyborg module
  description: A module that comes with a L6C.
  components:
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -82,7 +82,7 @@
  - type: Appearance

 - type: entity
-  name: C-20r sub machine gun
+  name: C-20r submachine gun
  parent: [BaseWeaponSubMachineGun, BaseSyndicateContraband]
  id: WeaponSubMachineGunC20r
  description: A firearm that is often used by the infamous nuclear operatives. Uses .35 auto ammo.
--- a/Resources/Prototypes/Entities/Stations/base.yml
+++ b/Resources/Prototypes/Entities/Stations/base.yml
@@ -73,7 +73,7 @@
        vgroid: !type:DungeonSpawnGroup
          minimumDistance: 300
          maximumDistance: 350
-          nameDataset: names_borer
+          nameDataset: NamesBorer
          stationGrid: false
          addComponents:
          - type: Gravity
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
@@ -20,6 +20,7 @@
    - state: closed_unlit
      shader: unshaded
      map: ["enum.DoorVisualLayers.BaseUnlit"]
+      visible: false
    - state: welded
      map: ["enum.WeldableLayers.BaseWelded"]
    - state: bolted_unlit
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
@@ -16,6 +16,7 @@
    - state: closed_unlit
      shader: unshaded
      map: ["enum.DoorVisualLayers.BaseUnlit"]
+      visible: false
    - state: welded
      map: ["enum.WeldableLayers.BaseWelded"]
    - state: bolted_unlit
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
@@ -37,6 +37,7 @@
    - state: closed_unlit
      shader: unshaded
      map: ["enum.DoorVisualLayers.BaseUnlit"]
+      visible: false
    - state: welded
      map: ["enum.WeldableLayers.BaseWelded"]
    - state: bolted_unlit
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
@@ -32,6 +32,7 @@
    - state: closed_unlit
      shader: unshaded
      map: ["enum.DoorVisualLayers.BaseUnlit"]
+      visible: false
    - state: welded
      map: ["enum.WeldableLayers.BaseWelded"]
    - state: bolted_unlit
@@ -164,6 +165,7 @@
    - state: closed_unlit
      shader: unshaded
      map: [ "enum.DoorVisualLayers.BaseUnlit" ]
+      visible: false
    - state: welded
      map: [ "enum.WeldableLayers.BaseWelded" ]
    - state: bolted_unlit
@@ -224,6 +226,7 @@
    - state: closed_unlit
      shader: unshaded
      map: [ "enum.DoorVisualLayers.BaseUnlit" ]
+      visible: false
    - state: welded
      map: [ "enum.WeldableLayers.BaseWelded" ]
    - state: bolted_unlit
@@ -279,6 +282,7 @@
    - state: closed_unlit
      shader: unshaded
      map: [ "enum.DoorVisualLayers.BaseUnlit" ]
+      visible: false
    - state: welded
      map: [ "enum.WeldableLayers.BaseWelded" ]
    - state: bolted_unlit
@@ -339,6 +343,7 @@
    - state: closed_unlit
      shader: unshaded
      map: [ "enum.DoorVisualLayers.BaseUnlit" ]
+      visible: false
    - state: welded
      map: [ "enum.WeldableLayers.BaseWelded" ]
    - state: bolted_unlit
@@ -394,6 +399,7 @@
    - state: closed_unlit
      shader: unshaded
      map: [ "enum.DoorVisualLayers.BaseUnlit" ]
+      visible: false
    - state: welded
      map: [ "enum.WeldableLayers.BaseWelded" ]
    - state: bolted_unlit
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/gas_pipe_sensor.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/gas_pipe_sensor.yml
@@ -0,0 +1,84 @@
+- type: entity
+  parent: [AirSensorBase, GasPipeBase]
+  id: GasPipeSensor
+  name: gas pipe sensor
+  description: Reports on the status of the gas in the attached pipe network. 
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Sprite
+    sprite: Structures/Piping/Atmospherics/gas_pipe_sensor.rsi
+    drawdepth: BelowFloor
+    layers:
+    - sprite: Structures/Piping/Atmospherics/pipe.rsi
+      map: [ "enum.PipeVisualLayers.Pipe" ]
+      state: pipeStraight
+    - map: ["base"]
+      state: base
+    - map: [ "enum.PowerDeviceVisualLayers.Powered" ]
+      state: lights 
+      shader: unshaded      
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.PowerDeviceVisuals.Powered:
+        enum.PowerDeviceVisualLayers.Powered:
+          False: { state: blank }
+          True: { state: lights }
+  - type: AtmosMonitor
+    monitorsPipeNet: true
+  - type: ApcPowerReceiver
+  - type: ExtensionCableReceiver
+  - type: Construction
+    graph: GasPipeSensor
+    node: sensor 
+  - type: NodeContainer
+    nodes:
+      monitored:
+        !type:PipeNode
+        nodeGroupID: Pipe
+        pipeDirection: Longitudinal
+  - type: Tag
+    tags:
+    - AirSensor
+    - Unstackable    
+
+- type: entity
+  parent: GasPipeSensor 
+  id: GasPipeSensorDistribution 
+  suffix: Distribution
+  components:
+  - type: Label
+    currentLabel: gas-pipe-sensor-distribution-loop
+
+- type: entity
+  parent: GasPipeSensor 
+  id: GasPipeSensorWaste  
+  suffix: Waste
+  components:
+  - type: Label
+    currentLabel: gas-pipe-sensor-waste-loop
+
+- type: entity
+  parent: GasPipeSensor 
+  id: GasPipeSensorMixedAir 
+  suffix: Mixed air
+  components:
+  - type: Label
+    currentLabel: gas-pipe-sensor-mixed-air
+
+- type: entity
+  parent: GasPipeSensor 
+  id: GasPipeSensorTEGHot
+  suffix: TEG hot
+  components:
+  - type: Label
+    currentLabel: gas-pipe-sensor-teg-hot-loop
+
+- type: entity
+  parent: GasPipeSensor  
+  id: GasPipeSensorTEGCold
+  suffix: TEG cold
+  components:
+  - type: Label
+    currentLabel: gas-pipe-sensor-teg-cold-loop
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/generator.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/generator.yml
@@ -1,7 +1,7 @@
 - type: entity
  id: SingularityGenerator
  name: gravitational singularity generator
-  description: An Odd Device which produces a Gravitational Singularity when set up.
+  description: An Odd Device which produces a Gravitational Singularity when set up. Comes with a temporary shutdown containment failsafe.
  placement:
    mode: SnapgridCenter
  components:
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/generator.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/generator.yml
@@ -2,12 +2,12 @@
  id: TeslaGenerator
  name: tesla generator
  parent: BaseStructureDynamic
-  description: An Odd Device which produces a powerful Tesla ball when set up.
+  description: An Odd Device which produces a powerful Tesla ball when set up. Comes with a temporary shutdown containment failsafe.
  components:
  - type: Sprite
    noRot: true
    sprite: Structures/Power/Generation/Tesla/generator.rsi
-    state: icon 
+    state: icon
  - type: SingularityGenerator # TODO: rename the generator
    spawnId: TeslaEnergyBall
  - type: InteractionOutline
--- a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/medsec_hud.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/medsec_hud.yml
@@ -27,17 +27,8 @@
                sprite: Objects/Devices/communication.rsi
                state: walkietalkie
              doAfter: 5
-            - tag: CapacitorStockPart
-              name: capacitor
-              icon:
-                sprite: Objects/Misc/stock_parts.rsi
-                state: capacitor
-              doAfter: 5
-            - tag: CapacitorStockPart
-              name: capacitor
-              icon:
-                sprite: Objects/Misc/stock_parts.rsi
-                state: capacitor
+            - material: Capacitor
+              amount: 2
              doAfter: 5
    - node: medsecHud
      entity: ClothingEyesHudMedSec
--- a/Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml
@@ -46,11 +46,8 @@
        doAfter: 1
    - to: memory_cell
      steps:
-      - tag: CapacitorStockPart
-        icon:
-          sprite: Objects/Misc/stock_parts.rsi
-          state: capacitor
-        name: a capacitor
+      - material: Capacitor
+        amount: 1
      - material: Cable
        amount: 2
        doAfter: 1
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/gas_pipe_sensor.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/gas_pipe_sensor.yml
@@ -0,0 +1,29 @@
+- type: constructionGraph
+  id: GasPipeSensor
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: sensor
+      steps:
+      - material: Steel
+        amount: 2
+        doAfter: 1
+
+  - node: sensor   
+    entity: GasPipeSensor
+    actions:
+    - !type:SetAnchor
+    edges:
+    - to: start
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetSteel1
+        amount: 2
+      - !type:DeleteEntity
+      conditions:
+      - !type:EntityAnchored
+        anchored: false
+      steps:
+      - tool: Welding
+        doAfter: 1
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/lighting.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/lighting.yml
@@ -28,7 +28,7 @@
        - to: icon
          steps:
            - material: Glass
-              amount: 2
+              amount: 1
              doAfter: 1
            - tag: CrystalBlue
              name: blue crystal shard
@@ -48,7 +48,7 @@
        - to: icon
          steps:
            - material: Glass
-              amount: 2
+              amount: 1
              doAfter: 1
            - tag: CrystalPink
              name: pink crystal shard
@@ -68,7 +68,7 @@
        - to: icon
          steps:
            - material: Glass
-              amount: 2
+              amount: 1
              doAfter: 1
            - tag: CrystalOrange
              name: orange crystal shard
@@ -88,7 +88,7 @@
        - to: icon
          steps:
            - material: Glass
-              amount: 2
+              amount: 1
              doAfter: 1
            - tag: CrystalRed
              name: red crystal shard
@@ -108,7 +108,7 @@
        - to: icon
          steps:
            - material: Glass
-              amount: 2
+              amount: 1
              doAfter: 1
            - tag: CrystalGreen
              name: green crystal shard
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml
@@ -57,12 +57,8 @@
            sprite: "Objects/Power/power_cells.rsi"
            state: "medium"
          doAfter: 0.5
-        - tag: CapacitorStockPart
-          name: a capacitor
-          store: capacitor
-          icon:
-            sprite: "Objects/Misc/stock_parts.rsi"
-            state: "capacitor"
+        - material: Capacitor
+          amount: 1
          doAfter: 0.5
      - to: frame
        completed:
--- a/Resources/Prototypes/Recipes/Construction/utilities.yml
+++ b/Resources/Prototypes/Recipes/Construction/utilities.yml
@@ -366,6 +366,21 @@
  objectType: Structure
  canRotate: true

+- type: construction
+  name: gas pipe sensor
+  id: GasPipeSensor
+  graph: GasPipeSensor
+  startNode: start
+  targetNode: sensor
+  category: construction-category-structures
+  description: Reports on the status of the gas within the attached pipe network. 
+  icon:
+    sprite: Structures/Piping/Atmospherics/gas_pipe_sensor.rsi
+    state: icon
+  placementMode: SnapgridCenter
+  objectType: Structure
+  canRotate: true
+
 # ATMOS PIPES
 - type: construction
  name: gas pipe half
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/potato.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/potato.yml
@@ -60,15 +60,7 @@
            - material: Cable
              amount: 2
              doAfter: 1
-            - tag: CapacitorStockPart
-              name: capacitor
-              icon:
-                sprite: Objects/Misc/stock_parts.rsi
-                state: capacitor
-            - tag: CapacitorStockPart
-              name: capacitor
-              icon:
-                sprite: Objects/Misc/stock_parts.rsi
-                state: capacitor
+            - material: Capacitor
+              amount: 2
    - node: potatoaichip
      entity: PotatoAIChip
--- a/Resources/Prototypes/Stacks/science_stacks.yml
+++ b/Resources/Prototypes/Stacks/science_stacks.yml
@@ -7,6 +7,7 @@
 - type: stack
  id: Capacitor
  name: capacitor
+  icon: { sprite: /Textures/Objects/Misc/stock_parts.rsi, state: capacitor }
  spawn: CapacitorStockPart
  maxCount: 10