]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Adds holobarrier projector to warden and HOS lockers (#15091)
authorLei Yunxing <lyx2020@sjtu.edu.cn>
Mon, 3 Apr 2023 06:20:15 +0000 (14:20 +0800)
committerGitHub <noreply@github.com>
Mon, 3 Apr 2023 06:20:15 +0000 (00:20 -0600)
* adds holobarrier projector and adds it to warden&hos locker

* a

Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
Resources/Prototypes/Catalog/Fills/Lockers/security.yml
Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
Resources/Prototypes/Entities/Structures/Holographic/projections.yml
Resources/Textures/Objects/Devices/Holoprojectors/security.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Devices/Holoprojectors/security.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Holo/security.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Structures/Holo/security.rsi/meta.json [new file with mode: 0644]

index e711f1b3a6ccd18886a136c64ca023c65130c116..1c90a21593aa569d5aff4f2d4ae8856de1b3b16f 100644 (file)
       - id: SecurityTechFabCircuitboard
       - id: JetpackSecurityFilled
       - id: BoxEncryptionKeySecurity
+      - id: HoloprojectorSecurity
index 144f6119a70461e77fddbeadc7ee2b877d001f7d..65f2427cb757a5923614d97d1f655a6b2b09c092 100644 (file)
@@ -21,6 +21,7 @@
       - id: RubberStampWarden
       - id: DoorRemoteArmory
       - id: ClothingOuterHardsuitWarden
+      - id: HoloprojectorSecurity
 
 - type: entity
   id: LockerSecurityFilled
index b1005afbc07b77c6b1e7bb1731e973734d7854f6..fa2b13638c1d9767566d714b96b64a457cf4ec58 100644 (file)
       - HolofanProjector
   - type: StaticPrice
     price: 80
+
+
+- type: entity
+  parent: Holoprojector
+  id: HoloprojectorSecurity
+  name: holobarrier projector
+  description: Creates a solid but fragile holographic barrier.
+  components:
+    - type: HolosignProjector
+      signProto: HolosignSecurity
+      chargeUse: 120
+    - type: Sprite
+      sprite: Objects/Devices/Holoprojectors/security.rsi
+      state: icon
+      netsync: false
+    - type: Tag
+      tags:
+        - HolofanProjector
+    - type: StaticPrice
+      price: 80
index b633484c196797f56c4b85f058a9b1df8212211a..2d07cac1b606023a3dcc26c0755f12b2fd20c855 100644 (file)
     lifetime: 180\r
   - type: Airtight\r
     noAirWhenFullyAirBlocked: false\r
+\r
+- type: entity\r
+  id: HolosignSecurity\r
+  parent: HolosignWetFloor\r
+  name: holographic barrier\r
+  description: A barrier of hard light that blocks movenment, but pretty weak.\r
+  components:\r
+    - type: Physics\r
+      bodyType: Static\r
+      canCollide: true\r
+    - type: Sprite\r
+      sprite: Structures/Holo/security.rsi\r
+      state: icon\r
+      netsync: false\r
+    - type: Fixtures\r
+      fixtures:\r
+        - shape:\r
+            !type:PhysShapeAabb\r
+            bounds: "-0.3,-0.3,0.3,0.3"\r
+          mask:\r
+            - TableMask\r
+          layer:\r
+            - TableLayer\r
+    - type: Damageable\r
+      damageContainer: Inorganic\r
+      damageModifierSet: Metallic\r
+    - type: Destructible\r
+      thresholds:\r
+        - trigger:\r
+            !type:DamageTrigger\r
+            damage: 30\r
+    - type: TimedDespawn\r
+      lifetime: 60\r
+    - type: PointLight\r
+      enabled: true\r
+      radius: 3\r
+      color: red\r
+    - type: Climbable\r
diff --git a/Resources/Textures/Objects/Devices/Holoprojectors/security.rsi/icon.png b/Resources/Textures/Objects/Devices/Holoprojectors/security.rsi/icon.png
new file mode 100644 (file)
index 0000000..857d779
Binary files /dev/null and b/Resources/Textures/Objects/Devices/Holoprojectors/security.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Devices/Holoprojectors/security.rsi/meta.json b/Resources/Textures/Objects/Devices/Holoprojectors/security.rsi/meta.json
new file mode 100644 (file)
index 0000000..c5d03f5
--- /dev/null
@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+     "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/f4017da82ae4de7bfaf8ebdbba33d0de81c15587",
+    "states": [
+        {
+            "name": "icon",
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Holo/security.rsi/icon.png b/Resources/Textures/Structures/Holo/security.rsi/icon.png
new file mode 100644 (file)
index 0000000..6b45e90
Binary files /dev/null and b/Resources/Textures/Structures/Holo/security.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Holo/security.rsi/meta.json b/Resources/Textures/Structures/Holo/security.rsi/meta.json
new file mode 100644 (file)
index 0000000..4a964bd
--- /dev/null
@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/f4017da82ae4de7bfaf8ebdbba33d0de81c15587",
+    "states": [
+        {
+            "name": "icon",
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        }
+    ]
+}
\ No newline at end of file