From ffa554b1ed965d03c93aaeb0d0f8b647c1bd37bd Mon Sep 17 00:00:00 2001 From: Time-Green <7501474+Time-Green@users.noreply.github.com> Date: Sat, 25 Nov 2023 06:39:40 +0100 Subject: [PATCH] Babyproofs rad nebula against ADMINS! (#79904) Fixes #79845 Honestly this whole thing is awkward. I really don't want to block being able to force traits under any conditions, but admins keep forcing it on icebox which just kills everyone. This blocks nebula's storm specificaly from running on planetary maps :cl: fix: Fixes nebula killing everyone when forced by an admin on icebox /:cl: --- code/datums/station_traits/negative_traits.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/station_traits/negative_traits.dm b/code/datums/station_traits/negative_traits.dm index 901ec0ca115..3731ee66749 100644 --- a/code/datums/station_traits/negative_traits.dm +++ b/code/datums/station_traits/negative_traits.dm @@ -594,7 +594,7 @@ /datum/station_trait/nebula/hostile/radiation/apply_nebula_effect(effect_strength = 0) //big bombad now - if(effect_strength > 0) + if(effect_strength > 0 && !SSmapping.is_planetary()) //admins can force this if(!SSweather.get_weather_by_type(/datum/weather/rad_storm/nebula)) COOLDOWN_START(src, send_care_package_at, send_care_package_time) SSweather.run_weather(/datum/weather/rad_storm/nebula)