Flashlight sprites

Resources/Prototypes/Entities/Objects/Tools/flashlights.yml

@@ -4,75 +4,75 @@
   id: FlashlightLantern
   description: It lights the way to freedom.
   components:
-  - type: Tag
-    tags:
-    - Flashlight
-  - type: HandheldLight
-    addPrefix: false
-    blinkingBehaviourId: blinking
-    radiatingBehaviourId: radiating
-  - type: LightBehaviour
-    behaviours:
-      - !type:FadeBehaviour
-        id: radiating
-        maxDuration: 2.0
-        startValue: 3.0
-        endValue: 2.0
-        isLooped: true
-        reverseWhenFinished: true
-      - !type:PulseBehaviour
-        id: blinking
-        interpolate: Nearest
-        maxDuration: 1.0
-        minValue: 0.1
-        maxValue: 2.0
-        isLooped: true
-  - type: ToggleableLightVisuals
-    spriteLayer: light
-    inhandVisuals:
-      left:
-      - state: inhand-left-light
-        shader: unshaded
-      right:
-      - state: inhand-right-light
-        shader: unshaded
-  - 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: PowerCellMedium
-  - type: Sprite
-    sprite: Objects/Tools/flashlight.rsi
-    layers:
-      - state: flashlight
-      - state: flashlight-overlay
-        shader: unshaded
-        visible: false
-        map: [ "light" ]
-  - type: Item
-    sprite: Objects/Tools/flashlight.rsi
-    storedRotation: -90
-  - type: PointLight
-    enabled: false
-    mask: /Textures/Effects/LightMasks/cone.png
-    autoRot: true
-    radius: 6
-    netsync: false
-  - type: Appearance
-  - type: StaticPrice
-    price: 40
-  - type: StealTarget
-    stealGroup: LAMP
-  - type: Clothing
-    sprite: Objects/Tools/flashlight.rsi
-    quickEquip: false
-    slots:
-      - Belt
+    - type: Tag
+      tags:
+        - Flashlight
+    - type: HandheldLight
+      addPrefix: false
+      blinkingBehaviourId: blinking
+      radiatingBehaviourId: radiating
+    - type: LightBehaviour
+      behaviours:
+        - !type:FadeBehaviour
+          id: radiating
+          maxDuration: 2.0
+          startValue: 3.0
+          endValue: 2.0
+          isLooped: true
+          reverseWhenFinished: true
+        - !type:PulseBehaviour
+          id: blinking
+          interpolate: Nearest
+          maxDuration: 1.0
+          minValue: 0.1
+          maxValue: 2.0
+          isLooped: true
+    - type: ToggleableLightVisuals
+      spriteLayer: light
+      inhandVisuals:
+        left:
+          - state: inhand-left-light
+            shader: unshaded
+        right:
+          - state: inhand-right-light
+            shader: unshaded
+    - 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: PowerCellMedium
+    - type: Sprite
+      sprite: Civ14/Objects/Flashlights/flashlight.rsi
+      layers:
+        - state: flashlight
+        - state: flashlight-overlay
+          shader: unshaded
+          visible: false
+          map: ["light"]
+    - type: Item
+      sprite: Civ14/Objects/Flashlights/flashlight.rsi
+      storedRotation: -90
+    - type: PointLight
+      enabled: false
+      mask: /Textures/Effects/LightMasks/cone.png
+      autoRot: true
+      radius: 6
+      netsync: false
+    - type: Appearance
+    - type: StaticPrice
+      price: 40
+    - type: StealTarget
+      stealGroup: LAMP
+    - type: Clothing
+      sprite: Objects/Tools/flashlight.rsi
+      quickEquip: false
+      slots:
+        - Belt
 
 - type: entity
   name: seclite
@@ -80,57 +80,57 @@
   id: FlashlightSeclite
   description: A robust flashlight used by security.
   components:
-  - type: Tag
-    tags:
-      - SecBeltEquip
-  - type: ItemSlots
-    slots:
-      cell_slot:
-        name: power-cell-slot-component-slot-name-default
-        startingItem: PowerCellMedium
-  - type: HandheldLight
-    addPrefix: false
-    wattage: 0.5
-  - type: ToggleableLightVisuals
-    inhandVisuals:
-      left:
-      - state: inhand-left-light
-        shader: unshaded
-      right:
-      - state: inhand-right-light
-        shader: unshaded
-  - type: Sprite
-    sprite: Objects/Tools/seclite.rsi
-    layers:
-      - state: seclite
-      - state: seclite-overlay
-        shader: unshaded
-        visible: false
-        map: [ "light" ]
-  - type: MeleeWeapon
-    wideAnimationRotation: 90
-    damage:
-      types:
-        Blunt: 10
-    soundHit:
-      collection: MetalThud
-  - type: Item
-    sprite: Objects/Tools/seclite.rsi
-  - type: PointLight
-    enabled: false
-    radius: 8
-  - type: Clothing
-    sprite: Objects/Tools/seclite.rsi
-    quickEquip: false
-    slots:
-      - Belt
+    - type: Tag
+      tags:
+        - SecBeltEquip
+    - type: ItemSlots
+      slots:
+        cell_slot:
+          name: power-cell-slot-component-slot-name-default
+          startingItem: PowerCellMedium
+    - type: HandheldLight
+      addPrefix: false
+      wattage: 0.5
+    - type: ToggleableLightVisuals
+      inhandVisuals:
+        left:
+          - state: inhand-left-light
+            shader: unshaded
+        right:
+          - state: inhand-right-light
+            shader: unshaded
+    - type: Sprite
+      sprite: Objects/Tools/seclite.rsi
+      layers:
+        - state: seclite
+        - state: seclite-overlay
+          shader: unshaded
+          visible: false
+          map: ["light"]
+    - type: MeleeWeapon
+      wideAnimationRotation: 90
+      damage:
+        types:
+          Blunt: 10
+      soundHit:
+        collection: MetalThud
+    - type: Item
+      sprite: Objects/Tools/seclite.rsi
+    - type: PointLight
+      enabled: false
+      radius: 8
+    - type: Clothing
+      sprite: Objects/Tools/seclite.rsi
+      quickEquip: false
+      slots:
+        - Belt
 
 - type: entity
   parent: FlashlightLantern
   id: EmptyFlashlightLantern
   suffix: Empty
   components:
-  - type: ItemSlots
-    slots:
-      cell_slot:
-        name: power-cell-slot-component-slot-name-default
+    - type: ItemSlots
+      slots:
+        cell_slot:
+          name: power-cell-slot-component-slot-name-default

Resources/Textures/Civ14/Objects/Flashlights/flashlight.rsi/meta.json

@@ -0,0 +1,40 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from vgstation and modified by Swept at https://github.com/vgstation-coders/vgstation13/blob/Bleeding-Edge/icons/obj/lighting.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "flashlight"
+    },
+    {
+      "name": "flashlight-on"
+    },
+    {
+      "name": "flashlight-overlay"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left-light",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right-light",
+      "directions": 4
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Civ14/Objects/Flashlights/militarylight.rsi/meta.json

@@ -0,0 +1,66 @@
+{
+    "version": 1,
+    "license": "AGPL-3.0",
+    "copyright": "Exported from https://github.com/civ13/civ13",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "flashlight"
+        },
+        {
+            "name": "flashlight-on"
+        },
+        {
+            "name": "flashlight-on-red"
+        },
+        {
+            "name": "flashlight-on-green"
+        },
+        {
+            "name": "militarylightalt"
+        },
+        {
+            "name": "militarylightalt-on"
+        },
+        {
+            "name": "militarylightalt-on-red"
+        },
+        {
+            "name": "militarylightalt-on-green"
+        },
+        {
+            "name": "flashlight-overlay"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-light",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-light",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "flashlightjap",
+            "directions": 1
+        },
+        {
+            "name": "flashlightjap-on",
+            "directions": 1
+        },
+    ]
+}

Resources/Textures/Civ14/Objects/lighting.rsi/meta.json

@@ -66,12 +66,6 @@
             "name": "bulb",
             "directions": 4
         },
-        {
-            "name": "flashlight_off"
-        },
-        {
-            "name": "flashlight_on"
-        },
         {
             "name": "tube_empty",
             "directions": 4
@@ -148,33 +142,6 @@
         {
             "name": "militarylight_off"
         },
-        {
-            "name": "militarylight_on"
-        },
-        {
-            "name": "militarylight_on_red"
-        },
-        {
-            "name": "militarylight_on_green"
-        },
-        {
-            "name": "militarylightalt_off"
-        },
-        {
-            "name": "militarylightalt_on"
-        },
-        {
-            "name": "militarylightalt_on_red"
-        },
-        {
-            "name": "militarylightalt_on_green"
-        },
-        {
-            "name": "flashlightjap_off"
-        },
-        {
-            "name": "flashlightjap_on"
-        },
         {
             "name": "floodlight"
         },
@@ -248,4 +215,4 @@
             "name": "flareW-empty"
         }
     ]
-}
+}