cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-29 16:18:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into woodrat_map

Browse Source
This commit is contained in:
Neerti
2021-07-06 21:28:41 -04:00
parent 7c0d44a00c 1e5aceeb01
commit 2e17bbc468
187 changed files with 806 additions and 775 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/planet/sif.dm
+6 -6
View File
@@ -299,7 +299,7 @@ var/datum/planet/sif/planet_sif = null
for(var/mob/living/L as anything in living_mob_list)
if(L.z in holder.our_planet.expected_z_levels)
var/turf/T = get_turf(L)
if(!T.outdoors == OUTDOORS_YES)
if(T.outdoors == OUTDOORS_NO)
continue // They're indoors, so no need to rain on them.
// If they have an open umbrella, it'll guard from rain
@@ -352,7 +352,7 @@ var/datum/planet/sif/planet_sif = null
for(var/mob/living/L as anything in living_mob_list)
if(L.z in holder.our_planet.expected_z_levels)
var/turf/T = get_turf(L)
if(!T.outdoors == OUTDOORS_YES)
if(T.outdoors == OUTDOORS_NO)
continue // They're indoors, so no need to rain on them.
// If they have an open umbrella, it'll guard from rain
@@ -410,7 +410,7 @@ var/datum/planet/sif/planet_sif = null
for(var/mob/living/carbon/H as anything in human_mob_list)
if(H.z in holder.our_planet.expected_z_levels)
var/turf/T = get_turf(H)
if(!T.outdoors == OUTDOORS_YES)
if(T.outdoors == OUTDOORS_NO)
continue // They're indoors, so no need to pelt them with ice.
// If they have an open umbrella, it'll guard from hail
@@ -506,7 +506,7 @@ var/datum/planet/sif/planet_sif = null
var/mob/living/L = thing
if(L.z in holder.our_planet.expected_z_levels)
var/turf/T = get_turf(L)
if(!T.outdoors == OUTDOORS_YES)
if(T.outdoors == OUTDOORS_NO)
continue // They're indoors, so no need to burn them with ash.
L.inflict_heat_damage(rand(1, 3))
@@ -544,7 +544,7 @@ var/datum/planet/sif/planet_sif = null
if(L.z in holder.our_planet.expected_z_levels)
irradiate_nearby_turf(L)
var/turf/T = get_turf(L)
if(!T.outdoors == OUTDOORS_YES)
if(T.outdoors == OUTDOORS_NO)
continue // They're indoors, so no need to irradiate them with fallout.
L.rad_act(rand(direct_rad_low, direct_rad_high))
@@ -559,4 +559,4 @@ var/datum/planet/sif/planet_sif = null
if(!istype(T))
return
if(T.outdoors == OUTDOORS_YES)
SSradiation.radiate(T, rand(fallout_rad_low, fallout_rad_high))
SSradiation.radiate(T, rand(fallout_rad_low, fallout_rad_high))