mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-15 00:53:23 +01:00
Lavaland weather types: Dying is Fun edition (#28600)
* ddsadsa ddsadsa * beginning * more progress * oops saved * radar workin now * bugfixing and tweaks * working on volcano * tweaking * ill figure this out later * testing still * MORE testing * gunna cry * PROGRESS!!! * volcano DONE * starting the acid rain * acid rain code complete * starting windstorm * more bugfixing... * its finished! need to bugtest * bugfixing * bugfixing * forgot prob values * spacing fix for linter * linter fix * undefining things * Update code/datums/weather/weather_types/lavaland_weather.dm Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/datums/weather/weather_types/lavaland_weather.dm Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/game/machinery/radar.dm Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/datums/weather/weather_types/lavaland_weather.dm Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/game/machinery/radar.dm Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/game/machinery/radar.dm Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * misc fixes/changes * updated the doppler tower * small tweaks * still trying to get pods to work * better support for sound transition to newly placed shelters * minor fixes * this didnt take oops * nudged the probabilities * deconflicting * Update code/datums/weather/weather_types/lavaland_weather.dm Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/game/machinery/radar.dm Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/game/machinery/radar.dm Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/game/machinery/radar.dm Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * applied requested fixes * master update * updates * this should be here * Apply suggestions from code review Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * requested fixes * sound tweaks * remove debug message * turned down ash storm sound * fix gulag weather and attempt to fix sound overlap * blackbox weather and title-case ash storms * change up probabilities and bump acid rain melt chance * another title case * starting on issues * revert some changes * tiny tweak * reworked acid rain a bit * small tweaks to sleepers * moderate again * revert * ups the rocks * bug fixes --------- Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
This commit is contained in:
@@ -73,14 +73,19 @@
|
||||
log_admin("[key_name(usr)] activated a bluespace capsule away from the mining level at [T.x], [T.y], [T.z]")
|
||||
template.load(deploy_location, centered = TRUE)
|
||||
new /obj/effect/particle_effect/smoke(get_turf(src))
|
||||
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_SHELTER_PLACED, T)
|
||||
qdel(src)
|
||||
|
||||
/obj/item/survivalcapsule/luxury
|
||||
name = "luxury bluespace shelter capsule"
|
||||
desc = "An exorbitantly expensive luxury suite stored within a pocket of bluespace."
|
||||
desc = "An exorbitantly expensive luxury suite stored within a pocket of bluespace. It is made of durable materials more capable of withstanding harsh weather over standard capsules."
|
||||
origin_tech = "engineering=3;bluespace=4"
|
||||
template_id = "shelter_beta"
|
||||
|
||||
// for things that shouldnt affect specifically the luxury pods
|
||||
/area/survivalpod/luxurypod
|
||||
name = "\improper Luxury Shelter"
|
||||
|
||||
//Pod turfs and objects
|
||||
|
||||
//Window
|
||||
|
||||
@@ -71,7 +71,7 @@
|
||||
var/datum/weather/A
|
||||
for(var/V in SSweather.processing)
|
||||
var/datum/weather/W = V
|
||||
if((user_turf.z in W.impacted_z_levels) && W.area_type == user_area.type)
|
||||
if((user_turf.z in W.impacted_z_levels) && is_type_in_list(user_area, W.area_types))
|
||||
A = W
|
||||
break
|
||||
|
||||
@@ -119,7 +119,7 @@
|
||||
var/power_boosted = FALSE
|
||||
for(var/V in SSweather.processing)
|
||||
var/datum/weather/W = V
|
||||
if((target_turf.z in W.impacted_z_levels) && W.area_type == target_area.type)
|
||||
if((target_turf.z in W.impacted_z_levels) && is_type_in_list(target_area, W.area_types))
|
||||
power_boosted = TRUE
|
||||
break
|
||||
playsound(src, 'sound/magic/lightningshock.ogg', 10, TRUE, extrarange = SILENCED_SOUND_EXTRARANGE, falloff_distance = 0)
|
||||
|
||||
Reference in New Issue
Block a user