Make Projectiles Only Hit a Variety of Station Objects Unless Clicked on (#28571)

2024-06-05 15:47:27 -05:00
parent 729e67af7f
commit c368d5d36f
23 changed files with 57 additions and 19 deletions
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml
@@ -1,4 +1,4 @@
- type: entity
+- type: entity
  abstract: true
  parent: BaseItem
  id: BaseHandheldInstrument
@@ -71,6 +71,7 @@
        - BulletImpassable
  - type: StaticPrice
    price: 300
+  - type: RequireProjectileTarget

 - type: entity
  parent: BasePlaceableInstrument
--- a/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
@@ -1,7 +1,7 @@
 - type: entity
  abstract: true
  id: ReagentDispenserBase
-  parent: ConstructibleMachine
+  parent: SmallConstructibleMachine
  placement:
    mode: SnapgridCenter
  components:
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml
@@ -60,3 +60,4 @@
        ents: []
  - type: LightningTarget
    priority: 1
+  - type: RequireProjectileTarget
--- a/Resources/Prototypes/Entities/Structures/Machines/Medical/chemistry_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Medical/chemistry_machines.yml
@@ -1,6 +1,6 @@
 - type: entity
  id: BaseTabletopChemicalMachine
-  parent: [ BaseMachinePowered, ConstructibleMachine ]
+  parent: [ BaseMachinePowered, SmallConstructibleMachine ]
  abstract: true
  components:
  - type: Transform
--- a/Resources/Prototypes/Entities/Structures/Machines/Medical/disease_diagnoser.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Medical/disease_diagnoser.yml
@@ -1,6 +1,6 @@
 - type: entity
  id: DiseaseDiagnoser
-  parent: [ BaseMachinePowered, ConstructibleMachine ]
+  parent: [ BaseMachinePowered, SmallConstructibleMachine ]
  name: Disease Diagnoser Delta Extreme
  description: A machine that analyzes disease samples.
  placement:
@@ -43,5 +43,3 @@
    contentMargin: 12.0, 0.0, 12.0, 0.0
    # This is a narrow piece of paper
    maxWritableArea: 128.0, 0.0
-
-
--- a/Resources/Prototypes/Entities/Structures/Machines/Medical/vaccinator.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Medical/vaccinator.yml
@@ -24,3 +24,4 @@
    containers:
      machine_board: !type:Container
      machine_parts: !type:Container
+  - type: RequireProjectileTarget
--- a/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml
@@ -1,6 +1,6 @@
 - type: entity
  id: MachineArtifactAnalyzer
-  parent: [ BaseMachinePowered, ConstructibleMachine ]
+  parent: [ BaseMachinePowered, SmallConstructibleMachine ]
  name: artifact analyzer
  description: A platform capable of performing analysis on various types of artifacts.
  components:
@@ -35,6 +35,7 @@
        - Impassable
        - MidImpassable
        - LowImpassable
+        - BulletImpassable
        hard: False
  - type: Transform
    anchored: true
--- a/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml
@@ -70,3 +70,10 @@
    - machine_board
  - type: LightningTarget
    priority: 1
+
+- type: entity
+  abstract: true
+  parent: ConstructibleMachine
+  id: SmallConstructibleMachine
+  components:
+    - type: RequireProjectileTarget
--- a/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml
@@ -66,6 +66,7 @@
    deviceNetId: Wireless
    receiveFrequencyId: Fax
    transmitFrequencyId: Fax
+  - type: RequireProjectileTarget

 # Special
 - type: entity
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -508,6 +508,7 @@
        - Sheet
        - RawMaterial
        - Ingot
+  - type: RequireProjectileTarget

 - type: entity
  id: CircuitImprinterHyperConvection
--- a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
@@ -1,6 +1,6 @@
- type: entity
+- type: entity
  id: KitchenMicrowave
-  parent: [ BaseMachinePowered, ConstructibleMachine ]
+  parent: [ BaseMachinePowered, SmallConstructibleMachine ]
  name: microwave
  description: It's magic.
  components:
--- a/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
@@ -1,6 +1,6 @@
 - type: entity
  id: KitchenReagentGrinder
-  parent: [ BaseMachinePowered, ConstructibleMachine ]
+  parent: [ BaseMachinePowered, SmallConstructibleMachine ]
  name: reagent grinder
  description: From BlenderTech. Will It Blend? Let's find out!
  suffix: grinder/juicer
--- a/Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml
@@ -1,6 +1,6 @@
 - type: entity
  abstract: true
-  parent: [ BaseStructureDynamic, ConstructibleMachine ]
+  parent: [ BaseStructureDynamic, SmallConstructibleMachine ]
  id: SurveillanceWirelessCameraBase
  name: wireless camera
  description: A camera. It's watching you. Kinda.
@@ -23,6 +23,8 @@
          density: 80
          mask:
            - MachineMask
+          layer:
+            - BulletImpassable
    - type: SurveillanceCameraMicrophone
      blacklist:
        components:
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml
@@ -1,6 +1,6 @@
 - type: entity
  id: PortableScrubber
-  parent: [BaseMachinePowered, ConstructibleMachine, StructureWheeled]
+  parent: [BaseMachinePowered, SmallConstructibleMachine, StructureWheeled]
  name: portable scrubber
  description: It scrubs, portably!
  components:
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
@@ -383,7 +383,7 @@
    board: HellfireHeaterMachineCircuitBoard

 - type: entity
-  parent: [ BaseMachinePowered, ConstructibleMachine ]
+  parent: [ BaseMachinePowered, SmallConstructibleMachine ]
  id: BaseGasCondenser
  name: condenser
  description: Condenses gases into liquids. Now we just need some plumbing.
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
@@ -84,6 +84,7 @@
      enum.DisposalUnitUiKey.Key:
        type: DisposalUnitBoundUserInterface
  - type: RatKingRummageable
+  - type: RequireProjectileTarget

 - type: entity
  id: MailingUnit
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
@@ -1,7 +1,7 @@
 - type: entity
  id: Emitter
  name: emitter
-  parent: ConstructibleMachine
+  parent: SmallConstructibleMachine
  description: A heavy duty industrial laser. Shoots non-stop when turned on.
  placement:
    mode: SnapgridCenter
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml
@@ -1,4 +1,4 @@
-#
+#
 # You can use this Desmos sheet to calculate fuel burn rate values:
 # https://www.desmos.com/calculator/qcektq5dqs
 #
@@ -6,7 +6,7 @@
 - type: entity
  abstract: true
  id: PortableGeneratorBase
-  parent: [ BaseMachine, ConstructibleMachine, StructureWheeled]
+  parent: [ BaseMachine, SmallConstructibleMachine, StructureWheeled]
  components:
    # Basic properties
    - type: Transform
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
@@ -49,6 +49,7 @@
    onBump: false
    requirePower: true
    highVoltageNode: output
+  - type: RequireProjectileTarget 

 - type: entity
  id: SolarPanel
@@ -157,6 +158,7 @@
    graph: SolarPanel
    node: solarassembly
    defaultTarget: solarpanel
+  - type: RequireProjectileTarget 

 - type: entity
  id: SolarTracker
@@ -201,3 +203,4 @@
  - type: Construction
    graph: SolarPanel
    node: solartracker
+  - type: RequireProjectileTarget 
--- a/Resources/Prototypes/Entities/Structures/Power/chargers.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/chargers.yml
@@ -58,12 +58,15 @@
        density: 500
        mask:
        - TabletopMachineMask
+        layer:
+        - BulletImpassable
  - type: PowerChargerVisuals
  - type: ContainerContainer
    containers:
      charger_slot: !type:ContainerSlot
      machine_board: !type:Container
      machine_parts: !type:Container
+  - type: RequireProjectileTarget

 - type: entity
  parent: BaseItemRecharger
--- a/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml
@@ -156,6 +156,7 @@
    node: chestDrawer
  - type: StaticPrice
    price: 15
+  - type: RequireProjectileTarget

 - type: entity
  abstract: true
--- a/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml
@@ -72,7 +72,7 @@
        acts: [ "Destruction" ]
  - type: Climbable
    delay: 2.5
-
+  - type: RequireProjectileTarget

 #High
 - type: entity
@@ -96,8 +96,10 @@
        mask:
        - FullTileMask
        layer:
+        - Opaque
        - MidImpassable
        - LowImpassable
+        - BulletImpassable
  - type: Construction
    graph: FenceWood
    node: straight
@@ -123,8 +125,10 @@
        mask:
        - FullTileMask
        layer:
+        - Opaque
        - MidImpassable
        - LowImpassable
+        - BulletImpassable
  - type: Construction
    graph: FenceWood
    node: end
@@ -159,8 +163,10 @@
        mask:
        - TableMask
        layer:
+        - Opaque
        - MidImpassable
        - LowImpassable
+        - BulletImpassable
  - type: Construction
    graph: FenceWood
    node: corner
@@ -195,8 +201,10 @@
        mask:
        - TableMask
        layer:
+        - Opaque
        - MidImpassable
        - LowImpassable
+        - BulletImpassable
  - type: Construction
    graph: FenceWood
    node: tjunction
@@ -221,8 +229,10 @@
        mask:
        - FullTileMask
        layer:
+        - Opaque
        - MidImpassable
        - LowImpassable
+        - BulletImpassable
  - type: InteractionOutline
  - type: Door
    openSpriteState: door_opened
@@ -271,6 +281,7 @@
        layer:
        - MidImpassable
        - LowImpassable
+        - BulletImpassable
  - type: Construction
    graph: FenceWood
    node: straight_small
@@ -298,6 +309,7 @@
        layer:
        - MidImpassable
        - LowImpassable
+        - BulletImpassable
  - type: Construction
    graph: FenceWood
    node: end_small
@@ -334,6 +346,7 @@
        layer:
        - MidImpassable
        - LowImpassable
+        - BulletImpassable
  - type: Construction
    graph: FenceWood
    node: corner_small
@@ -370,6 +383,7 @@
        layer:
        - MidImpassable
        - LowImpassable
+        - BulletImpassable
  - type: Construction
    graph: FenceWood
    node: tjunction_small
@@ -396,6 +410,7 @@
        layer:
        - MidImpassable
        - LowImpassable
+        - BulletImpassable
  - type: InteractionOutline
  - type: Door
    openSpriteState: door_opened_small
@@ -418,4 +433,4 @@
      path: /Audio/Effects/door_close.ogg
  - type: Construction
    graph: FenceWood
-    node: gate_small
+    node: gate_small
--- a/Resources/Prototypes/Entities/Structures/hydro_tray.yml
+++ b/Resources/Prototypes/Entities/Structures/hydro_tray.yml
@@ -1,6 +1,6 @@
 - type: entity
  name: hydroponics tray
-  parent: [ hydroponicsSoil, ConstructibleMachine]
+  parent: [ hydroponicsSoil, SmallConstructibleMachine]
  id: hydroponicsTray
  description: An interstellar-grade space farmplot allowing for rapid growth and selective breeding of crops. Just... keep in mind the space weeds.
  components:
@@ -14,6 +14,8 @@
        hard: true
        mask:
        - MachineMask
+        layer:
+        - BulletImpassable
  - type: Anchorable
  - type: Pullable
  - type: Sprite