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

Paramedic Void Suit update #34657

Open
wants to merge 31 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
1ef15f0
Made paramedic void suit into proper hardsuit (was softsuit before)
Velken Jan 26, 2025
7ef8d01
Merge branch 'space-wizards:master' into paramedic-wee-woo
Velken Jan 26, 2025
4bc658d
Changed paramed helmet flashlight icon and textures
Velken Jan 26, 2025
d65711d
Merge branch 'paramedic-wee-woo' of https://github.com/Velken/space-s…
Velken Jan 26, 2025
8680b32
Merge branch 'space-wizards:master' into paramedic-wee-woo
Velken Jan 26, 2025
b2e04e9
fixed siren action icon
Velken Jan 27, 2025
1a782bc
Merge branch 'paramedic-wee-woo' of https://github.com/Velken/space-s…
Velken Jan 27, 2025
fd352b1
BigAction
Velken Jan 27, 2025
9828c73
updated icon-siren.png
Velken Jan 27, 2025
7dc0c92
fixed not being able to add it to containers (like when it parented o…
Velken Jan 27, 2025
3dfb08c
Merge branch 'space-wizards:master' into paramedic-wee-woo
Velken Jan 28, 2025
be193fb
changed light to cyan, made it less brighter and reduced siren volume
Velken Jan 28, 2025
2d25094
Merge branch 'space-wizards:master' into paramedic-wee-woo
Velken Jan 28, 2025
4f821bb
changed ambulancesiren.ogg to a different one (hopefully less hard on…
Velken Jan 28, 2025
5668f88
created ClothingHeadEVAHelmetWithLightBase in base_clothinghead.yml
Velken Jan 29, 2025
344e78c
final final siren sound change (for real this time?)
Velken Jan 29, 2025
4107740
Merge branch 'space-wizards:master' into paramedic-wee-woo
Velken Jan 29, 2025
ea45589
Merge branch 'paramedic-wee-woo' of https://github.com/Velken/space-s…
Velken Jan 29, 2025
34e381e
fixed license type
Velken Jan 29, 2025
3fa0e6a
final FINAL final (for real this time, please?) ambulancesiren.ogg ch…
Velken Jan 29, 2025
f88671c
ContainerContainerContainerContainerContainerContainerContainerContai…
Velken Jan 29, 2025
d99c3a6
attributions updated (turns out, i have to give myself credit when i …
Velken Jan 29, 2025
dfa8ff5
Merge branch 'space-wizards:master' into paramedic-wee-woo
Velken Feb 1, 2025
2821bec
hopefully fixed everything this time
Velken Feb 1, 2025
57934c6
sync shenanigans
Velken Feb 1, 2025
df4c508
final final final final final for real final ambulancesiren.ogg chang…
Velken Feb 2, 2025
62662dc
typo
Velken Feb 2, 2025
6c5fb1a
done the suggested changes
Velken Feb 3, 2025
f6288dd
cleaning up some forgotten stuff :p
Velken Feb 4, 2025
7c157d9
oops, cleaned up a bit too much
Velken Feb 4, 2025
b6a9d0d
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
Velken Feb 4, 2025
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
Binary file not shown.
5 changes: 5 additions & 0 deletions Resources/Audio/Effects/Vehicle/attributions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,8 @@
source: "https://freesound.org/people/13gkopeckak/sounds/378911/"
license: "CC0-1.0"
copyright: "13gkopeckak on freesound.org"

- files: ["ambulancesiren.ogg"]
Velken marked this conversation as resolved.
Show resolved Hide resolved
source: "https://freesound.org/people/Lalks/sounds/336894/"
license: "CC-BY-3.0"
copyright: "Lalks on freesound.org, small edit by Velken"
13 changes: 13 additions & 0 deletions Resources/Prototypes/Actions/types.yml
Original file line number Diff line number Diff line change
Expand Up @@ -340,3 +340,16 @@
itemIconStyle: NoItem
useDelay: 1
event: !type:FakeMindShieldToggleEvent

- type: entity
id: ActionToggleParamedicSiren
name: Toggle Paramedic Siren
description: Toggles the paramedic siren on and off.
components:
- type: InstantAction
icon:
sprite: Clothing/OuterClothing/Hardsuits/paramed.rsi
state: icon-siren
useDelay: 1
itemIconStyle: BigAction
event: !type:ToggleActionEvent
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,9 @@

- type: entity
abstract: true
parent: ClothingHeadHardsuitBase
id: ClothingHeadHardsuitWithLightBase
# No parent since it isn't an item
# must parent both this and the desired helmet base when using
id: ClothingHeadSuitWithLightBase
name: base hardsuit helmet with light
categories: [ HideSpawnMenu ]
components:
Expand Down
44 changes: 29 additions & 15 deletions Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,39 @@
- type: Clothing
sprite: Clothing/Head/Helmets/cosmonaut.rsi

#Paramedic Void Helmet
#Ancient Void Helmet
- type: entity
parent: ClothingHeadEVAHelmetBase
id: ClothingHeadHelmetAncient
name: NTSRA void helmet
description: An ancient space helmet, designed by the NTSRA branch of CentComm.
components:
- type: Sprite
sprite: Clothing/Head/Helmets/ancientvoidsuit.rsi
- type: Clothing
sprite: Clothing/Head/Helmets/ancientvoidsuit.rsi

#Paramedic Void Helmet
- type: entity
parent: [ ClothingHeadSuitWithLightBase, ClothingHeadEVAHelmetBase ] #Despite acting like a hardsuit helmet, since it inherits from EVA Helmet, it goes here.
id: ClothingHeadHelmetVoidParamed
Velken marked this conversation as resolved.
Show resolved Hide resolved
name: paramedic void helmet
description: A void helmet made for paramedics.
categories: [ HideSpawnMenu ]
components:
- type: Sprite
sprite: Clothing/Head/Helmets/paramedhelm.rsi
sprite: Clothing/Head/Hardsuits/paramedhelm.rsi
- type: HandheldLight
addPrefix: false
- type: ToggleableLightVisuals
spriteLayer: light
clothingVisuals:
head:
- state: equipped-head-light
- type: Clothing
sprite: Clothing/Head/Helmets/paramedhelm.rsi
clothingVisuals:
head:
- state: equipped-head
- type: TemperatureProtection
heatingCoefficient: 0.1
coolingCoefficient: 0.1
Expand All @@ -69,15 +91,7 @@
coefficients:
Heat: 0.90
Radiation: 0.75

#Ancient Void Helmet
- type: entity
parent: ClothingHeadEVAHelmetBase
id: ClothingHeadHelmetAncient
name: NTSRA void helmet
description: An ancient space helmet, designed by the NTSRA branch of CentComm.
components:
- type: Sprite
sprite: Clothing/Head/Helmets/ancientvoidsuit.rsi
- type: Clothing
sprite: Clothing/Head/Helmets/ancientvoidsuit.rsi
- type: PointLight
radius: 5
energy: 2
color: "#00ffff"
40 changes: 20 additions & 20 deletions Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

#Atmospherics Hardsuit
- type: entity
parent: ClothingHeadHardsuitWithLightBase
parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
id: ClothingHeadHelmetHardsuitAtmos
name: atmos hardsuit helmet
description: A special hardsuit helmet designed for working in low-pressure, high thermal environments.
Expand Down Expand Up @@ -67,7 +67,7 @@

#Engineering Hardsuit
- type: entity
parent: ClothingHeadHardsuitWithLightBase
parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
id: ClothingHeadHelmetHardsuitEngineering
name: engineering hardsuit helmet
description: An engineering hardsuit helmet designed for working in low-pressure, high radioactive environments.
Expand All @@ -84,7 +84,7 @@

#Spationaut Hardsuit
- type: entity
parent: ClothingHeadHardsuitWithLightBase
parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
id: ClothingHeadHelmetHardsuitSpatio
name: spationaut hardsuit helmet
description: A sturdy helmet designed for complex industrial operations in space.
Expand Down Expand Up @@ -120,7 +120,7 @@

#Salvage Hardsuit
- type: entity
parent: ClothingHeadHardsuitWithLightBase
parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
id: ClothingHeadHelmetHardsuitSalvage
name: salvage hardsuit helmet
description: A special helmet designed for work in a hazardous, low pressure environment. Has reinforced plating for wildlife encounters and dual floodlights.
Expand All @@ -137,7 +137,7 @@
energy: 3

- type: entity
parent: ClothingHeadHardsuitWithLightBase
parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
id: ClothingHeadHelmetHardsuitGoliath
name: goliath hardsuit helmet
description: A sturdy hardsuit helmet, infused with a goliath's hide and an eerie, unblinking eye cut from its mass.
Expand Down Expand Up @@ -195,7 +195,7 @@

#Security Hardsuit
- type: entity
parent: ClothingHeadHardsuitWithLightBase
parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
id: ClothingHeadHelmetHardsuitSecurity
name: security hardsuit helmet
description: Armored hardsuit helmet for security needs.
Expand All @@ -219,7 +219,7 @@

#Brigmedic Hardsuit
- type: entity
parent: ClothingHeadHardsuitWithLightBase
parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
id: ClothingHeadHelmetHardsuitBrigmedic
name: brigmedic hardsuit helmet
description: The lightweight helmet of the brigmedic hardsuit. Protects against viruses, and clowns.
Expand All @@ -245,7 +245,7 @@

#Warden's Hardsuit
- type: entity
parent: ClothingHeadHardsuitWithLightBase
parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
id: ClothingHeadHelmetHardsuitWarden
name: warden's hardsuit helmet
description: A modified riot helmet. Oddly comfortable.
Expand All @@ -269,7 +269,7 @@

#Captain's Hardsuit
- type: entity
parent: ClothingHeadHardsuitWithLightBase
parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
id: ClothingHeadHelmetHardsuitCap
name: captain's hardsuit helmet
description: Special hardsuit helmet, made for the captain of the station.
Expand All @@ -284,7 +284,7 @@

#Chief Engineer's Hardsuit
- type: entity
parent: ClothingHeadHardsuitWithLightBase
parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
id: ClothingHeadHelmetHardsuitEngineeringWhite
name: chief engineer's hardsuit helmet
description: Special hardsuit helmet, made for the chief engineer of the station.
Expand All @@ -303,7 +303,7 @@

#Chief Medical Officer's Hardsuit
- type: entity
parent: ClothingHeadHardsuitWithLightBase
parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
id: ClothingHeadHelmetHardsuitMedical
name: chief medical officer's hardsuit helmet
description: Lightweight medical hardsuit helmet that doesn't restrict your head movements.
Expand All @@ -320,7 +320,7 @@

#Research Director's Hardsuit
- type: entity
parent: ClothingHeadHardsuitWithLightBase
parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
id: ClothingHeadHelmetHardsuitRd
name: experimental research hardsuit helmet
description: Lightweight hardsuit helmet that doesn't restrict your head movements.
Expand All @@ -337,7 +337,7 @@

#Head of Security's hardsuit
- type: entity
parent: ClothingHeadHardsuitWithLightBase
parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
id: ClothingHeadHelmetHardsuitSecurityRed
name: head of security's hardsuit helmet
description: Security hardsuit helmet with the latest top secret NT-HUD software. Belongs to the HoS.
Expand All @@ -361,7 +361,7 @@

#Luxury Mining Hardsuit
- type: entity
parent: ClothingHeadHardsuitWithLightBase
parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
id: ClothingHeadHelmetHardsuitLuxury #DO NOT MAP - https://github.com/space-wizards/space-station-14/pull/19738#issuecomment-1703486738
name: luxury mining hardsuit helmet
description: A refurbished mining hardsuit helmet, fitted with satin cushioning and an extra (non-functioning) antenna, because you're that extra.
Expand All @@ -380,7 +380,7 @@
#ANTAG HARDSUITS
#Blood-red Hardsuit
- type: entity
parent: ClothingHeadHardsuitWithLightBase
parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
id: ClothingHeadHelmetHardsuitSyndie
name: blood-red hardsuit helmet
description: A heavily armored helmet designed for work in special operations. Property of Gorlex Marauders.
Expand All @@ -404,7 +404,7 @@

#Blood-red Medic Hardsuit
- type: entity
parent: ClothingHeadHardsuitWithLightBase
parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
id: ClothingHeadHelmetHardsuitSyndieMedic
name: blood-red medic hardsuit helmet
description: An advanced red hardsuit helmet specifically designed for field medic operations.
Expand All @@ -428,7 +428,7 @@

#Syndicate Elite Hardsuit
- type: entity
parent: ClothingHeadHardsuitWithLightBase
parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
id: ClothingHeadHelmetHardsuitSyndieElite
name: syndicate elite helmet
description: An elite version of the blood-red hardsuit's helmet, with improved armor and fireproofing. Property of Gorlex Marauders.
Expand Down Expand Up @@ -457,7 +457,7 @@

#Syndicate Commander Hardsuit
- type: entity
parent: ClothingHeadHardsuitWithLightBase
parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
id: ClothingHeadHelmetHardsuitSyndieCommander
name: syndicate commander helmet
description: A bulked up version of the blood-red hardsuit's helmet, purpose-built for the commander of a syndicate operative squad. Has significantly improved armor for those deadly front-lines firefights.
Expand Down Expand Up @@ -503,7 +503,7 @@

#Wizard Hardsuit
- type: entity
parent: ClothingHeadHardsuitWithLightBase
parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
id: ClothingHeadHelmetHardsuitWizard
name: wizard hardsuit helmet
description: A bizarre gem-encrusted helmet that radiates magical energies.
Expand Down Expand Up @@ -680,7 +680,7 @@

#CBURN Hardsuit
- type: entity
parent: [ BaseCentcommContraband, ClothingHeadHardsuitWithLightBase ]
parent: [ BaseCentcommContraband, ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
id: ClothingHeadHelmetCBURN
name: CBURN exosuit helmet
description: A pressure resistant and fireproof hood worn by special cleanup units.
Expand Down
32 changes: 29 additions & 3 deletions Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,17 @@
- type: HeldSpeedModifier

#Paramedic Voidsuit
#Despite having resistances and looking like a hardsuit, this parents off the EVA suit so it goes here.
Velken marked this conversation as resolved.
Show resolved Hide resolved
- type: entity
parent: ClothingOuterEVASuitBase
parent: [ClothingOuterEVASuitBase, BaseMedicalContraband] #Despite "Voidsuits are light hardsuits", since it parents of EVA Suits, it goes with the other softsuits
id: ClothingOuterHardsuitVoidParamed
name: paramedic void suit
description: A void suit made for paramedics.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Hardsuits/paramed.rsi
layers:
- state: icon
- type: Appearance
- type: Clothing
sprite: Clothing/OuterClothing/Hardsuits/paramed.rsi
- type: PressureProtection
Expand All @@ -123,7 +125,31 @@
stealGroup: ClothingOuterHardsuitVoidParamed
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetVoidParamed
slot: head
- type: ItemToggle
onUse: false
soundActivate:
path: /Audio/Items/flashlight_on.ogg
soundDeactivate:
path: /Audio/Items/flashlight_off.ogg
- type: ItemToggleActiveSound
activeSound:
path: /Audio/Effects/Vehicle/ambulancesiren.ogg #not the best sound, but after looking through all of current freesound regarding sirens and ambulance, this was the best compromise
params:
volume: -4
- type: UseDelay
delay: 1.0
- type: ToggleClothing
action: ActionToggleParamedicSiren
- type: ItemTogglePointLight
- type: PointLight
enabled: false
radius: 2
energy: 2
color: blue
netsync: false
mask: /Textures/Effects/LightMasks/double_cone.png
- type: RotatingLight
speed: 360
- type: ContainerContainer
containers:
toggleable-clothing: !type:ContainerSlot {}
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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365, redrawn by Ubaser. vox state by Flareguy",
"copyright": "Taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365, redrawn by Ubaser. vox state by Flareguy, icon-flash and light-overlay states by Velken",
"size": {
"x": 32,
"y": 32
Expand All @@ -11,19 +11,25 @@
"name": "icon"
},
{
"name": "equipped-HELMET",
"name": "icon-flash"
},
{
"name": "light-overlay"
},
{
"name": "equipped-head",
"directions": 4
},
{
"name": "equipped-HELMET-vox",
"name": "equipped-head-light",
"directions": 4
},
{
"name": "inhand-left",
"name": "equipped-head-vox",
"directions": 4
},
{
"name": "inhand-right",
"name": "equipped-head-light-vox",
"directions": 4
}
]
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from paradise station git at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365, redrawn by Ubaser. Vox state made by Flareguy for SS14",
"copyright": "Taken from paradise station git at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365, redrawn by Ubaser. Vox state made by Flareguy for SS14. Siren Icon made by Velen based of the helmet's colours",
"size": {
"x": 32,
"y": 32
Expand All @@ -10,6 +10,9 @@
{
"name": "icon"
},
{
"name": "icon-siren"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
Expand Down
Loading