tweaks n fixes

- buffed lipolicide weight loss
- buffed punching bag weight loss
- made chocolate slimes much more beefier
- added modular bra (WIP)
- readded radstorm (admin only)
- added fattening vent clog into event pool
This commit is contained in:
evilew
2024-06-03 19:51:01 +02:00
parent 06d72f983b
commit c1f082982e
11 changed files with 99 additions and 89 deletions
@@ -1,68 +1,68 @@
// //Radiation storms occur when the station passes through an irradiated area, and irradiate anyone not standing in protected areas (maintenance, emergency storage, etc.)
// /datum/weather/rad_storm
// name = "radiation storm"
// desc = "A cloud of intense radiation passes through the area dealing rad damage to those who are unprotected."
//Radiation storms occur when the station passes through an irradiated area, and irradiate anyone not standing in protected areas (maintenance, emergency storage, etc.)
/datum/weather/rad_storm
name = "radiation storm"
desc = "A cloud of intense radiation passes through the area dealing rad damage to those who are unprotected."
// telegraph_duration = 400
// telegraph_message = "<span class='danger'>The air begins to grow warm.</span>"
telegraph_duration = 400
telegraph_message = "<span class='danger'>The air begins to grow warm.</span>"
// weather_message = "<span class='userdanger'><i>You feel waves of heat wash over you! Find shelter!</i></span>"
// weather_overlay = "ash_storm"
// weather_duration_lower = 600
// weather_duration_upper = 1500
// weather_color = "green"
// weather_sound = 'sound/misc/bloblarm.ogg'
weather_message = "<span class='userdanger'><i>You feel waves of heat wash over you! Find shelter!</i></span>"
weather_overlay = "ash_storm"
weather_duration_lower = 600
weather_duration_upper = 1500
weather_color = "green"
weather_sound = 'sound/misc/bloblarm.ogg'
// end_duration = 100
// end_message = "<span class='notice'>The air seems to be cooling off again.</span>"
end_duration = 100
end_message = "<span class='notice'>The air seems to be cooling off again.</span>"
// area_type = /area
// protected_areas = list(/area/maintenance, /area/ai_monitored/turret_protected/ai_upload, /area/ai_monitored/turret_protected/ai_upload_foyer,
// /area/ai_monitored/turret_protected/ai, /area/storage/emergency/starboard, /area/storage/emergency/port, /area/shuttle, /area/survivalpod, /area/crew_quarters/dorms, /area/security/prison, /area/ruin, /area/space/nearstation)
// target_trait = ZTRAIT_STATION
area_type = /area
protected_areas = list(/area/maintenance, /area/ai_monitored/turret_protected/ai_upload, /area/ai_monitored/turret_protected/ai_upload_foyer,
/area/ai_monitored/turret_protected/ai, /area/storage/emergency/starboard, /area/storage/emergency/port, /area/shuttle, /area/survivalpod, /area/crew_quarters/dorms, /area/security/prison, /area/ruin, /area/space/nearstation)
target_trait = ZTRAIT_STATION
// immunity_type = "rad"
immunity_type = "rad"
// /datum/weather/rad_storm/telegraph()
// ..()
// status_alarm(TRUE)
/datum/weather/rad_storm/telegraph()
..()
status_alarm(TRUE)
// /datum/weather/rad_storm/weather_act(mob/living/L)
// var/resist = L.getarmor(null, "rad")
// if(prob(40))
// if(ishuman(L))
// var/mob/living/carbon/human/H = L
// if(H.dna && !HAS_TRAIT(H, TRAIT_RADIMMUNE))
// if(prob(max(0,100-resist)))
// H.randmuti()
// if(prob(50))
// if(prob(90))
// H.easy_randmut(NEGATIVE+MINOR_NEGATIVE)
// else
// H.easy_randmut(POSITIVE)
// H.domutcheck()
// L.rad_act(20)
/datum/weather/rad_storm/weather_act(mob/living/L)
var/resist = L.getarmor(null, "rad")
if(prob(40))
if(ishuman(L))
var/mob/living/carbon/human/H = L
if(H.dna && !HAS_TRAIT(H, TRAIT_RADIMMUNE))
if(prob(max(0,100-resist)))
H.randmuti()
if(prob(50))
if(prob(90))
H.easy_randmut(NEGATIVE+MINOR_NEGATIVE)
else
H.easy_randmut(POSITIVE)
H.domutcheck()
L.rad_act(20)
// /datum/weather/rad_storm/end()
// if(..())
// return
// priority_announce("The radiation threat has passed. Please return to your workplaces.", "Anomaly Alert")
// status_alarm(FALSE)
/datum/weather/rad_storm/end()
if(..())
return
priority_announce("The radiation threat has passed. Please return to your workplaces.", "Anomaly Alert")
status_alarm(FALSE)
// /datum/weather/rad_storm/proc/status_alarm(active) //Makes the status displays show the radiation warning for those who missed the announcement.
// var/datum/radio_frequency/frequency = SSradio.return_frequency(FREQ_STATUS_DISPLAYS)
// if(!frequency)
// return
/datum/weather/rad_storm/proc/status_alarm(active) //Makes the status displays show the radiation warning for those who missed the announcement.
var/datum/radio_frequency/frequency = SSradio.return_frequency(FREQ_STATUS_DISPLAYS)
if(!frequency)
return
// var/datum/signal/signal = new
// if (active)
// signal.data["command"] = "alert"
// signal.data["picture_state"] = "radiation"
// else
// signal.data["command"] = "shuttle"
var/datum/signal/signal = new
if (active)
signal.data["command"] = "alert"
signal.data["picture_state"] = "radiation"
else
signal.data["command"] = "shuttle"
// var/atom/movable/virtualspeaker/virt = new(null)
// frequency.post_signal(virt, signal)
var/atom/movable/virtualspeaker/virt = new(null)
frequency.post_signal(virt, signal)