cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Conflict Resolution

Browse Source
This commit is contained in:
Unknown
2019-10-06 13:12:11 -04:00
parent 89aad128cf
commit dade2aa80b
8 changed files with 6 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/planet/sif.dm
View File

@@ -555,8 +555,4 @@ var/datum/planet/sif/planet_sif = null
if(!istype(T))
return
if(T.outdoors)
<<<<<<< HEAD
radiation_repository.radiate(T, rand(fallout_rad_low, fallout_rad_high))
=======
SSradiation.radiate(T, rand(fallout_rad_low, fallout_rad_high))
>>>>>>> b193761... Merge pull request #6471 from Novacat/nova-runtimes

2
code/modules/planet/virgo3b_vr.dm
View File

@@ -531,5 +531,5 @@ var/datum/planet/virgo3b/planet_virgo3b = null
if(!istype(T))
return
if(T.outdoors)
radiation_repository.radiate(T, rand(fallout_rad_low, fallout_rad_high))
SSradiation.radiate(T, rand(fallout_rad_low, fallout_rad_high))