Skip to content

Commit

Permalink
Merge pull request DopplerShift13#264 from She-Is-Trying-To-Form-Her-…
Browse files Browse the repository at this point in the history 
…First-Thought/thats-it

Significantly Reduces Lag Caused by Icecats Bathing
  • Loading branch information
@carpotoxin
carpotoxin authored Dec 3, 2024
2 parents 75e9f37 + 7e0190d commit cf475fe
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 100 deletions.
62 changes: 31 additions & 31 deletions _maps/RandomRuins/IceRuins/doppler/icemoon_underground_icewalker_lower.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
dir = 1
},
/obj/structure/chair/sofa/bamboo/left,
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"dj" = (
/obj/structure/flora/bush/snow/style_random,
Expand Down Expand Up @@ -275,7 +275,7 @@
"fK" = (
/obj/effect/turf_decal/siding/wood,
/obj/structure/wall_torch/spawns_lit/directional/north,
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"fV" = (
/obj/effect/turf_decal/siding/wood{
Expand All @@ -302,7 +302,7 @@
/obj/effect/turf_decal/weather/dirt{
dir = 4
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"gz" = (
/obj/effect/turf_decal/weather/snow/corner{
Expand All @@ -317,7 +317,7 @@
/obj/effect/turf_decal/weather/dirt{
dir = 9
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"gU" = (
/obj/structure/rack/wooden,
Expand Down Expand Up @@ -589,7 +589,7 @@
/obj/effect/turf_decal/siding/wood/corner{
dir = 1
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"mr" = (
/obj/structure/wall_torch/spawns_lit/directional/west,
Expand Down Expand Up @@ -646,7 +646,7 @@
/obj/effect/turf_decal/weather/dirt{
dir = 1
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"nG" = (
/obj/machinery/griddle/stone,
Expand Down Expand Up @@ -704,7 +704,7 @@
/obj/effect/turf_decal/weather/dirt{
dir = 8
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"ol" = (
/obj/structure/railing/wooden_fencing{
Expand Down Expand Up @@ -740,7 +740,7 @@
/area/ruin/unpowered/primitive_genemod_den)
"oJ" = (
/obj/effect/turf_decal/weather/dirt,
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"oL" = (
/obj/machinery/smartfridge/wooden/seed_shelf,
Expand Down Expand Up @@ -788,7 +788,7 @@
/obj/effect/turf_decal/weather/dirt{
dir = 6
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"po" = (
/obj/effect/turf_decal/siding/wood/corner{
Expand All @@ -804,7 +804,7 @@
/area/ruin/unpowered/primitive_genemod_den)
"pW" = (
/obj/effect/turf_decal/weather/snow/corner,
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"qb" = (
/obj/effect/turf_decal/siding/wood{
Expand All @@ -816,7 +816,7 @@
/obj/effect/turf_decal/weather/dirt{
dir = 8
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"qr" = (
/obj/structure/rack/wooden,
Expand Down Expand Up @@ -877,7 +877,7 @@
/obj/structure/chair/sofa/bamboo{
dir = 1
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"sj" = (
/obj/structure/spacevine{
Expand Down Expand Up @@ -1010,7 +1010,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 6
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"vy" = (
/obj/effect/turf_decal/siding/wood{
Expand Down Expand Up @@ -1063,7 +1063,7 @@
/area/ruin/unpowered/primitive_genemod_den)
"wU" = (
/obj/structure/wall_torch/spawns_lit/directional/south,
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"xc" = (
/obj/structure/wall_torch/spawns_lit/directional/west,
Expand Down Expand Up @@ -1149,22 +1149,22 @@
/obj/structure/chair/sofa/bamboo/right{
dir = 1
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"yx" = (
/obj/effect/turf_decal/weather/dirt{
dir = 9
},
/obj/structure/wall_torch/spawns_lit/directional/south,
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"yy" = (
/obj/effect/mob_spawn/ghost_role/human/primitive_genemod,
/turf/open/misc/dirt/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"yE" = (
/obj/effect/turf_decal/siding/wood,
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"yN" = (
/obj/structure/rack/wooden,
Expand All @@ -1182,7 +1182,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 1
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"yU" = (
/obj/structure/window/green_glass_pane,
Expand All @@ -1193,7 +1193,7 @@
/obj/effect/turf_decal/weather/snow/corner{
dir = 8
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"zu" = (
/obj/effect/turf_decal/siding/wood{
Expand Down Expand Up @@ -1543,7 +1543,7 @@
dir = 1
},
/obj/structure/chair/sofa/bamboo/right,
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"Fj" = (
/obj/structure/chair/wood,
Expand Down Expand Up @@ -1631,7 +1631,7 @@
/turf/open/floor/wood/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"Hd" = (
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"Hv" = (
/obj/structure/rack/wooden,
Expand Down Expand Up @@ -1690,7 +1690,7 @@
/obj/effect/turf_decal/weather/dirt{
dir = 1
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"IJ" = (
/obj/structure/wall_torch/spawns_lit/directional/east,
Expand Down Expand Up @@ -1746,7 +1746,7 @@
name = "thick vines";
opacity = 1
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"Jn" = (
/obj/effect/turf_decal/weather/snow/corner{
Expand All @@ -1755,7 +1755,7 @@
/obj/effect/turf_decal/weather/snow/corner{
dir = 8
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"Jq" = (
/turf/open/misc/hay/icemoon,
Expand Down Expand Up @@ -1845,7 +1845,7 @@
dir = 1
},
/obj/structure/chair/sofa/bamboo,
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"Ku" = (
/obj/effect/turf_decal/siding/wood{
Expand Down Expand Up @@ -1960,7 +1960,7 @@
/obj/effect/turf_decal/weather/dirt{
dir = 8
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"Mr" = (
/obj/structure/wall_torch/spawns_lit/directional/north,
Expand Down Expand Up @@ -2000,7 +2000,7 @@
/obj/effect/turf_decal/weather/snow/corner{
dir = 1
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"Nr" = (
/obj/effect/turf_decal/siding/wood{
Expand Down Expand Up @@ -2165,7 +2165,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 4
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"RZ" = (
/obj/structure/closet/crate/wooden/storage_barrel,
Expand Down Expand Up @@ -2229,7 +2229,7 @@
/obj/effect/turf_decal/weather/snow/corner{
dir = 4
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"TW" = (
/obj/effect/turf_decal/weather/dirt{
Expand Down Expand Up @@ -2277,7 +2277,7 @@
/area/ruin/unpowered/primitive_genemod_den)
"Vc" = (
/obj/structure/fluff/minepost,
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"Vp" = (
/obj/structure/table/wood,
Expand Down Expand Up @@ -2402,7 +2402,7 @@
/obj/effect/turf_decal/weather/dirt{
dir = 10
},
/turf/open/water/hot_spring,
/turf/open/water/hot_spring/icemoon,
/area/ruin/unpowered/primitive_genemod_den)
"YO" = (
/obj/structure/wall_torch/spawns_lit/directional/north,
Expand Down
71 changes: 2 additions & 69 deletions modular_doppler/hearthkin/primitive_genemod/code/map_items.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,77 +18,10 @@
. = ..()
AddComponent(/datum/component/simple_farm, set_plant = TRUE)

// Water that can be fished out of
// Hotspring water with icebox air

/turf/open/water/hot_spring
desc = "Water kept warm through some unknown heat source, possibly a geothermal heat source far underground. \
Whatever it is, it feels pretty damn nice to swim in given the rest of the environment around here, and you \
can even catch a glimpse of the odd fish darting through the water."
baseturfs = /turf/open/openspace/icemoon
/turf/open/water/hot_spring/icemoon
initial_gas_mix = "ICEMOON_ATMOS"
fishing_datum = /datum/fish_source/icecat_hot_spring
/// Holder for the steam particles that show up sometimes
var/obj/effect/abstract/particle_holder/particle_effect

/turf/open/water/hot_spring/Initialize(mapload)
. = ..()
if(prob(60))
particle_effect = new(src, /particles/hotspring_steam)

/turf/open/water/hot_spring/Destroy()
QDEL_NULL(particle_effect)
return ..()

/turf/open/water/hot_spring/Entered(atom/movable/arrived)
..()
wash_atom(arrived)
wash_atom(loc)

/// Cleans the given atom of whatever dirties it
/turf/open/water/hot_spring/proc/wash_atom(atom/nasty)
nasty.wash(CLEAN_WASH)

/turf/open/water/hot_spring/Entered(atom/movable/arrived)
..()
if(istype(arrived, /mob/living))
hotspring_mood(arrived)

/// Applies the hot water mood buff on the passed mob
/turf/open/water/hot_spring/proc/hotspring_mood(mob/living/swimmer)
swimmer.add_mood_event("hotspring", /datum/mood_event/hotspring/nerfed)

// Steam particles for pairing with the hotsprings above

/particles/hotspring_steam
icon = 'icons/effects/particles/smoke.dmi'
icon_state = list(
"steam_1" = 2,
"steam_2" = 2,
"steam_3" = 1,
)
width = 64
height = 64
count = 5
spawning = 0.2
lifespan = 1 SECONDS
fade = 0.5 SECONDS
color = "#ffffff"
position = generator(GEN_BOX, list(-32,-32,0), list(32,32,0), NORMAL_RAND)
scale = generator(GEN_VECTOR, list(0.9,0.9), list(1.1,1.1), NORMAL_RAND)
drift = generator(GEN_VECTOR, list(-0.1,0), list(0.1,0.025), UNIFORM_RAND)
spin = generator(GEN_NUM, list(-15,15), NORMAL_RAND)

// Fishing source for the above water turfs

/datum/fish_source/icecat_hot_spring
fish_table = list(
/obj/item/fish/moonfish/dwarf = 5,
/obj/item/fish/needlefish = 10,
/obj/item/fish/armorfish = 10,
/obj/item/fish/chasm_crab/ice = 5,
/obj/item/stack/sheet/bone = 5,
)
catalog_description = "Hot Springs"

// The area

Expand Down

0 comments on commit cf475fe

Please sign in to comment.