Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add justice helm #31905

Merged
merged 4 commits into from
Sep 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@
ClothingEyesBlindfold: 1
ClothingShoesBootsCombat: 1
ClothingShoesBootsWinterSec: 2
ClothingHeadHelmetJustice: 1
contrabandInventory:
ClothingMaskClownSecurity: 1
88 changes: 88 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Head/helmets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
- type: Tag
tags:
- WhitelistChameleon
- SecurityHelmet
- type: HideLayerClothing
slots:
- HeadTop
Expand Down Expand Up @@ -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
12 changes: 12 additions & 0 deletions Resources/Prototypes/Entities/Objects/Power/lights.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,9 @@
lightEnergy: 1.0
lightRadius: 6
lightSoftness: 1.1
- type: Tag
tags:
- LightBulb

- type: entity
parent: BaseLightbulb
Expand All @@ -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
Expand All @@ -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
Expand All @@ -178,6 +187,9 @@
lightEnergy: 0.45
lightRadius: 1.5
lightSoftness: 3
- type: Tag
tags:
- LightBulb

- type: entity
parent: BaseLightTube
Expand Down
Original file line number Diff line number Diff line change
@@ -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
11 changes: 11 additions & 0 deletions Resources/Prototypes/Recipes/Construction/clothing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 6 additions & 0 deletions Resources/Prototypes/tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -821,6 +821,9 @@
- type: Tag
id: Lemon

- type: Tag
id: LightBulb

- type: Tag
id: Lime

Expand Down Expand Up @@ -1135,6 +1138,9 @@
- type: Tag
id: SecBeltEquip

- type: Tag
id: SecurityHelmet

- type: Tag
id: SecwayKeys

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
71 changes: 71 additions & 0 deletions Resources/Textures/Clothing/Head/Helmets/justice.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading