cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-25 04:57:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some more radiation fixes (#19378)

Browse Source 
* Some more rad fixes

* Minor fix

* fixes vox ghost goggles
This commit is contained in:
Cameron Lennox
2026-04-08 18:07:02 +02:00
committed by GitHub
parent 4de5a42f2a
commit 0c295af6e7
5 changed files with 70 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/geiger_sound.dm
+36 -3
View File
@@ -3,6 +3,7 @@
var/datum/looping_sound/geiger/sound
var/last_parent = null
var/wall_mounted = FALSE
/datum/component/geiger_sound/Initialize(...)
if (!isatom(parent))
@@ -19,7 +20,8 @@
return ..()
/datum/component/geiger_sound/RegisterWithParent()
sound = new(list(parent), TRUE)
if(!wall_mounted)
sound = new(list(parent), TRUE)
RegisterSignal(parent, COMSIG_IN_RANGE_OF_IRRADIATION, PROC_REF(on_pre_potential_irradiation))
@@ -76,15 +78,20 @@
var/datum/radiation_pulse_information/last_radiation_pulse
var/last_insulation_to_target
var/wall_mounted = FALSE
/datum/looping_sound/geiger/Destroy()
last_radiation_pulse = null
return ..()
/datum/looping_sound/geiger/get_sound(starttime, _mid_sounds)
/datum/looping_sound/geiger/get_sound(starttime, _mid_sounds, danger)
if(wall_mounted) //Child does all the work.
return ..(starttime, mid_sounds[danger])
if (isnull(last_radiation_pulse))
return null
var/danger = get_perceived_radiation_danger(last_radiation_pulse, last_insulation_to_target)
danger = get_perceived_radiation_danger(last_radiation_pulse, last_insulation_to_target)
if(danger >= PERCEIVED_RADIATION_DANGER_HIGH)
chance = 100
else
@@ -97,3 +104,29 @@
. = ..()
last_radiation_pulse = null
/datum/component/geiger_sound/wall
wall_mounted = TRUE
/datum/component/geiger_sound/wall/RegisterWithParent()
sound = new /datum/looping_sound/geiger/wall(list(parent), TRUE)
..()
//Subtype for wall mounted geiger counters, which should be quieter and not have the chance to play when radiation is low.
/datum/looping_sound/geiger/wall
wall_mounted = TRUE
/datum/looping_sound/geiger/wall/get_sound(starttime, _mid_sounds)
if (isnull(last_radiation_pulse))
return null
var/danger = get_perceived_radiation_danger(last_radiation_pulse, last_insulation_to_target)
if(danger >= PERCEIVED_RADIATION_DANGER_HIGH)
chance = 100
volume = (danger * 5)
else
chance = 0
volume = 0
return ..(starttime, mid_sounds[danger], danger)