]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Add justice helm (#31905)
authorthemias <89101928+themias@users.noreply.github.com>
Sat, 7 Sep 2024 03:04:31 +0000 (23:04 -0400)
committerGitHub <noreply@github.com>
Sat, 7 Sep 2024 03:04:31 +0000 (21:04 -0600)
* Add justice helm

* backslash moment

* spinny light

* remove power cell from recipe

14 files changed:
Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
Resources/Prototypes/Entities/Clothing/Head/helmets.yml
Resources/Prototypes/Entities/Objects/Power/lights.yml
Resources/Prototypes/Recipes/Construction/Graphs/clothing/helmet_justice.yml [new file with mode: 0644]
Resources/Prototypes/Recipes/Construction/clothing.yml
Resources/Prototypes/tags.yml
Resources/Textures/Clothing/Head/Helmets/justice.rsi/icon-light.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Helmets/justice.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Helmets/justice.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Helmets/justice.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Helmets/justice.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/Head/Helmets/justice.rsi/off-equipped-HELMET-vox.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Helmets/justice.rsi/off-equipped-HELMET.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Helmets/justice.rsi/on-equipped-HELMET.png [new file with mode: 0644]

index 622dbf9561de35ffe6ac7f6443f4610f0f920a29..f81f5854cb4c353dadab474527b66106d85bbc90 100644 (file)
@@ -24,5 +24,6 @@
     ClothingEyesBlindfold: 1
     ClothingShoesBootsCombat: 1
     ClothingShoesBootsWinterSec: 2
+    ClothingHeadHelmetJustice: 1
   contrabandInventory:
     ClothingMaskClownSecurity: 1
index a6663b31ec850443813265c77850d219a591faac..e8415c3801ff2a119379e52452fefdc2bb227cc0 100644 (file)
@@ -22,6 +22,7 @@
   - type: Tag
     tags:
     - WhitelistChameleon
+    - SecurityHelmet
   - type: HideLayerClothing
     slots:
     - HeadTop
     sprite: Clothing/Head/Helmets/podwars_helmet.rsi
   - type: Clothing
     sprite: Clothing/Head/Helmets/podwars_helmet.rsi
+
+#Justice Helmet
+- type: entity
+  parent: ClothingHeadHelmetBasic
+  id: ClothingHeadHelmetJustice
+  name: justice helm
+  description: Advanced security gear. Protects the station from ne'er-do-wells.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Helmets/justice.rsi
+    layers:
+      - state: icon
+      - state: icon-light
+        visible: false
+        shader: unshaded
+        map: [ "light" ]
+  - type: Appearance
+  - type: Clothing
+    sprite: Clothing/Head/Helmets/justice.rsi
+    equippedPrefix: off
+  - type: ItemToggle
+    predictable: false # issues between ToggleCellDraw and ItemToggleActiveSound
+    onUse: false
+    soundActivate:
+      path: /Audio/Items/flashlight_on.ogg
+    soundDeactivate:
+      path: /Audio/Items/flashlight_off.ogg
+  - type: ItemToggleActiveSound
+    activeSound:
+      path: /Audio/Effects/Vehicle/policesiren.ogg
+      params:
+        volume: -4
+  - type: UseDelay
+    delay: 1.0
+  - type: ToggleClothing
+    action: ActionToggleJusticeHelm
+  - type: ItemTogglePointLight
+  - type: ToggleableLightVisuals
+    clothingVisuals:
+      head:
+      - state: on-equipped-HELMET
+        shader: unshaded
+  - type: PointLight
+    enabled: false
+    radius: 1.4
+    energy: 1.4
+    color: red
+    netsync: false
+    mask: /Textures/Effects/LightMasks/double_cone.png
+  - type: RotatingLight
+    speed: 360
+  - type: PowerCellSlot
+    cellSlotId: cell_slot
+  - type: ContainerContainer
+    containers:
+      cell_slot: !type:ContainerSlot
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellSmall
+  - type: PowerCellDraw
+    drawRate: 2
+  - type: ToggleCellDraw
+  - type: Construction
+    graph: HelmetJustice
+    node: helmet
+
+- type: entity
+  parent: ClothingHeadHelmetJustice
+  id: ClothingHeadHelmetJusticeEmpty
+  suffix: Empty
+  components:
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+
+- type: entity
+  id: ActionToggleJusticeHelm
+  name: Toggle Justice Helm
+  description: Toggles the justice helm on and off.
+  components:
+  - type: InstantAction
+    useDelay: 1
+    itemIconStyle: BigItem
+    event: !type:ToggleActionEvent
\ No newline at end of file
index 3f7da1efab3556ae5c31740a27f7d5a2934099d8..22573669ede645db7c10b81a475d30799f2f8a31 100644 (file)
     lightEnergy: 1.0
     lightRadius: 6
     lightSoftness: 1.1
+  - type: Tag
+    tags:
+    - LightBulb
 
 - type: entity
   parent: BaseLightbulb
     lightSoftness: 1
     BurningTemperature: 350 #LEDs are colder than incandescent bulbs
     PowerUse: 6 #LEDs are more power efficient than incandescent bulbs
+  - type: Tag
+    tags:
+    - LightBulb
 
 - type: entity
   parent: LightBulb
     lightEnergy: 0.3 # old incandescents just arent as bright
     lightRadius: 6
     lightSoftness: 1.1
+  - type: Tag
+    tags:
+    - LightBulb
 
 - type: entity
   suffix: Broken
     lightEnergy: 0.45
     lightRadius: 1.5
     lightSoftness: 3
+  - type: Tag
+    tags:
+    - LightBulb
 
 - type: entity
   parent: BaseLightTube
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/helmet_justice.yml b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/helmet_justice.yml
new file mode 100644 (file)
index 0000000..0ea6cf4
--- /dev/null
@@ -0,0 +1,25 @@
+- type: constructionGraph
+  id: HelmetJustice
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: helmet
+      steps:
+      - tag: SecurityHelmet
+        name: security helmet
+        icon:
+          sprite: Clothing/Head/Helmets/security.rsi
+          state: icon
+      - material: Cable
+        amount: 2
+      - material: Glass
+        amount: 1
+      - tag: LightBulb
+        name: light bulb
+        icon:
+          sprite: Objects/Power/light_bulb.rsi
+          state: normal
+        doAfter: 5
+  - node: helmet
+    entity: ClothingHeadHelmetJusticeEmpty
\ No newline at end of file
index 420f38aab843dc722e9cc3fded9e816f27c3b6cc..dc4eb3d2787d903c20c4da051f3afefb490cf715 100644 (file)
   description: Can hold up to 15 arrows, and fits snug around your waist.
   icon: { sprite: Clothing/Belt/quiver.rsi, state: icon }
   objectType: Item
+
+- type: construction
+  name: justice helm
+  id: ClothingHeadHelmetJustice
+  graph: HelmetJustice
+  startNode: start
+  targetNode: helmet
+  category: construction-category-clothing
+  description: Advanced security gear. Protects the station from ne'er-do-wells.
+  icon: { sprite: Clothing/Head/Helmets/justice.rsi, state: icon }
+  objectType: Item
\ No newline at end of file
index d823f93d9daf89f69e7c0587c4cb0a849f8673b6..7daf090b46adc1418564cf47cb5a1c2b343da5c8 100644 (file)
 - type: Tag
   id: Lemon
 
+- type: Tag
+  id: LightBulb
+
 - type: Tag
   id: Lime
 
 - type: Tag
   id: SecBeltEquip
 
+- type: Tag
+  id: SecurityHelmet
+
 - type: Tag
   id: SecwayKeys
 
diff --git a/Resources/Textures/Clothing/Head/Helmets/justice.rsi/icon-light.png b/Resources/Textures/Clothing/Head/Helmets/justice.rsi/icon-light.png
new file mode 100644 (file)
index 0000000..13bd7c0
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/justice.rsi/icon-light.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/justice.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/justice.rsi/icon.png
new file mode 100644 (file)
index 0000000..d62faca
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/justice.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/justice.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/justice.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..d028c4a
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/justice.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/justice.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/justice.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..0dbc144
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/justice.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/justice.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/justice.rsi/meta.json
new file mode 100644 (file)
index 0000000..55f0b43
--- /dev/null
@@ -0,0 +1,71 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Base sprite by DieselMohawk for use in SS14, combined with justice2 from tgstation at b8c63da48c8445fcec96491970b9316d0f8684b8",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+       {
+      "name": "icon-light",
+         "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+         ]
+    },
+    {
+      "name": "off-equipped-HELMET",
+      "directions": 4
+    },
+       {
+      "name": "on-equipped-HELMET",
+      "directions": 4,
+         "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+               [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+               [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+               [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+         ]
+    },
+    {
+      "name": "off-equipped-HELMET-vox",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Head/Helmets/justice.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/justice.rsi/off-equipped-HELMET-vox.png
new file mode 100644 (file)
index 0000000..ffdf84d
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/justice.rsi/off-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/justice.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/justice.rsi/off-equipped-HELMET.png
new file mode 100644 (file)
index 0000000..fbe120c
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/justice.rsi/off-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/justice.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/justice.rsi/on-equipped-HELMET.png
new file mode 100644 (file)
index 0000000..464ff6d
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/justice.rsi/on-equipped-HELMET.png differ