From: themias <89101928+themias@users.noreply.github.com> Date: Sat, 7 Sep 2024 03:04:31 +0000 (-0400) Subject: Add justice helm (#31905) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=f49d83ac8168784388991bb76eb121c6a24d8654;p=space-station-14.git Add justice helm (#31905) * Add justice helm * backslash moment * spinny light * remove power cell from recipe --- diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml index 622dbf9561..f81f5854cb 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml @@ -24,5 +24,6 @@ ClothingEyesBlindfold: 1 ClothingShoesBootsCombat: 1 ClothingShoesBootsWinterSec: 2 + ClothingHeadHelmetJustice: 1 contrabandInventory: ClothingMaskClownSecurity: 1 diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index a6663b31ec..e8415c3801 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -22,6 +22,7 @@ - type: Tag tags: - WhitelistChameleon + - SecurityHelmet - type: HideLayerClothing slots: - HeadTop @@ -400,3 +401,90 @@ 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 diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml index 3f7da1efab..22573669ed 100644 --- a/Resources/Prototypes/Entities/Objects/Power/lights.yml +++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml @@ -126,6 +126,9 @@ lightEnergy: 1.0 lightRadius: 6 lightSoftness: 1.1 + - type: Tag + tags: + - LightBulb - type: entity parent: BaseLightbulb @@ -141,6 +144,9 @@ 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 @@ -154,6 +160,9 @@ lightEnergy: 0.3 # old incandescents just arent as bright lightRadius: 6 lightSoftness: 1.1 + - type: Tag + tags: + - LightBulb - type: entity suffix: Broken @@ -178,6 +187,9 @@ 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 index 0000000000..0ea6cf404f --- /dev/null +++ b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/helmet_justice.yml @@ -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 diff --git a/Resources/Prototypes/Recipes/Construction/clothing.yml b/Resources/Prototypes/Recipes/Construction/clothing.yml index 420f38aab8..dc4eb3d278 100644 --- a/Resources/Prototypes/Recipes/Construction/clothing.yml +++ b/Resources/Prototypes/Recipes/Construction/clothing.yml @@ -118,3 +118,14 @@ 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 diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index d823f93d9d..7daf090b46 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -821,6 +821,9 @@ - type: Tag id: Lemon +- type: Tag + id: LightBulb + - type: Tag id: Lime @@ -1135,6 +1138,9 @@ - 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 index 0000000000..13bd7c0da1 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 index 0000000000..d62facad8c 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 index 0000000000..d028c4a87e 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 index 0000000000..0dbc144702 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 index 0000000000..55f0b4329b --- /dev/null +++ b/Resources/Textures/Clothing/Head/Helmets/justice.rsi/meta.json @@ -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 index 0000000000..ffdf84de7f 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 index 0000000000..fbe120c1b3 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 index 0000000000..464ff6dba3 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/justice.rsi/on-equipped-HELMET.png differ