-
Notifications
You must be signed in to change notification settings - Fork 168
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Soft-Refactor Geiger Counters (#615)
# Description This refactors Geiger Counters so that their behavior of "Only making sound to a person holding them" is no longer hardcoded. The GeigerCounterComponent now can define how loud it ticks, how far away people can hear the ticks, and whether it plays only for the person holding it or for anyone nearby. This PR partially fulfills one of the "Nice To Have" features requested for #341 by making it possible to create stationary radiation alarm objects. It also serves as a substantial quality of life improvement for Engineering and Science crew, since it's now possible to place an active Geiger counter in the artifact lab, and then be able to audibly hear if the lab becomes radioactive due to an artifact. <details><summary><h1>Media</h1></summary> <p> https://github.com/user-attachments/assets/74122135-7345-4995-bb0e-d1216e1d53b6 https://github.com/user-attachments/assets/de79db6f-e1c1-471f-88b5-0a47ff4bfa16 </p> </details> # Changelog :cl: - add: Geiger Counters other than ones installed in Hardsuits now generate an audible sound when active and exposed to radiation. - add: Wall mounted geiger counters have been added to the game. --------- Signed-off-by: VMSolidus <[email protected]>
- Loading branch information
Showing
11 changed files
with
117 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
51 changes: 51 additions & 0 deletions
51
Resources/Prototypes/Entities/Structures/Wallmounts/radalarm.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
- type: entity | ||
id: GeigerCounterWallMount | ||
name: wall-mounted Geiger counter | ||
description: A stationary device that emits a warning tone when it detects radiation pulses. | ||
placement: | ||
mode: SnapgridCenter | ||
snap: | ||
- Wallmount | ||
components: | ||
- type: InteractionOutline | ||
- type: Clickable | ||
- type: Rotatable | ||
rotateWhileAnchored: false | ||
rotateWhilePulling: true | ||
- type: WallMount | ||
- type: Transform | ||
noRot: false | ||
anchored: true | ||
- type: Sprite | ||
noRot: true | ||
drawdepth: WallMountedItems | ||
sprite: Structures/Wallmounts/radalarm.rsi | ||
layers: | ||
- state: geiger_base | ||
- state: geiger_on_idle | ||
map: ["enum.GeigerLayers.Screen"] | ||
shader: unshaded | ||
visible: false | ||
- type: Geiger | ||
showControl: true | ||
showExamine: true | ||
localSoundOnly: false | ||
audioParameters: | ||
volume: -4 | ||
maxDistance: 10 | ||
rolloffFactor: 4 | ||
- type: Appearance | ||
- type: GenericVisualizer | ||
visuals: | ||
enum.GeigerVisuals.IsEnabled: | ||
GeigerLayers.Screen: | ||
True: { visible: True } | ||
False: { visible: False } | ||
enum.GeigerVisuals.DangerLevel: | ||
GeigerLayers.Screen: | ||
None: {state: geiger_on_idle} | ||
Low: {state: geiger_on_low} | ||
Med: {state: geiger_on_med} | ||
High: {state: geiger_on_high} | ||
Extreme: {state: geiger_on_ext} | ||
|
Binary file added
BIN
+1.25 KB
Resources/Textures/Structures/Wallmounts/radalarm.rsi/geiger_base.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+375 Bytes
Resources/Textures/Structures/Wallmounts/radalarm.rsi/geiger_on_ext.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+375 Bytes
Resources/Textures/Structures/Wallmounts/radalarm.rsi/geiger_on_high.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+326 Bytes
Resources/Textures/Structures/Wallmounts/radalarm.rsi/geiger_on_idle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+363 Bytes
Resources/Textures/Structures/Wallmounts/radalarm.rsi/geiger_on_low.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+368 Bytes
Resources/Textures/Structures/Wallmounts/radalarm.rsi/geiger_on_med.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions
35
Resources/Textures/Structures/Wallmounts/radalarm.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
{ | ||
"version": 1, | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Made by @dootythefrooty (Discord)", | ||
"states": [ | ||
{ | ||
"name": "geiger_base", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "geiger_on_idle", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "geiger_on_low", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "geiger_on_med", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "geiger_on_high", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "geiger_on_ext", | ||
"directions": 4 | ||
} | ||
] | ||
} |