cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-29 23:17:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1738 from VOREStation/polaris-sync-20170614

Browse Source 
Polaris Sync 2017.06.14
This commit is contained in:
Arokha Sieyes
2017-06-15 19:12:01 -04:00
committed by GitHub
parent 79bebfb794 aa8723b724
commit 39ce8cfe27
29 changed files with 701 additions and 652 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/repositories/radiation.dm
+9 -4
View File
@@ -23,11 +23,14 @@ var/global/repository/radiation/radiation_repository = new()
. = ..()
/datum/radiation_source/proc/update_rad_power(var/new_power = null)
if(new_power != null && new_power != rad_power)
if(new_power == null || new_power == rad_power)
return // No change
else if(new_power <= 0)
qdel(src) // Decayed to nothing
else
rad_power = new_power
. = 1
if(. && !flat)
range = min(round(sqrt(rad_power / config.radiation_lower_limit)), 31) // R = rad_power / dist**2 - Solve for dist
if(!flat)
range = min(round(sqrt(rad_power / config.radiation_lower_limit)), 31) // R = rad_power / dist**2 - Solve for dist
// Ray trace from all active radiation sources to T and return the strongest effect.
/repository/radiation/proc/get_rads_at_turf(var/turf/T)
@@ -65,6 +68,8 @@ var/global/repository/radiation/radiation_repository = new()
// Add a radiation source instance to the repository. It will override any existing source on the same turf.
/repository/radiation/proc/add_source(var/datum/radiation_source/S)
if(!isturf(S.source_turf))
return
var/datum/radiation_source/existing = sources_assoc[S.source_turf]
if(existing)
qdel(existing)