From f96d5f7a760adedf141d733a4d80702827c059d8 Mon Sep 17 00:00:00 2001 From: konushi Date: Wed, 1 Nov 2023 18:59:05 +0300 Subject: [PATCH 1/6] fix --- _maps/map_files220/RandomZLevels/caves.dmm | 1031 ++++++++++---------- modular_ss220/maps220/code/mobs.dm | 14 +- modular_ss220/maps220/code/objects.dm | 93 +- 3 files changed, 619 insertions(+), 519 deletions(-) diff --git a/_maps/map_files220/RandomZLevels/caves.dmm b/_maps/map_files220/RandomZLevels/caves.dmm index 8a9d83f6b517..851a584f571a 100644 --- a/_maps/map_files220/RandomZLevels/caves.dmm +++ b/_maps/map_files220/RandomZLevels/caves.dmm @@ -95,9 +95,9 @@ /area/awaymission/caves/build/reqpower_build) "au" = ( /obj/effect/decal/cleanable/glass/plasma, -/obj/item/shard/plasma, /obj/effect/landmark/damageturf, /obj/effect/landmark/burnturf, +/obj/item/shard, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "av" = ( @@ -321,7 +321,7 @@ }, /area/awaymission/caves/build/reqpower_build) "bq" = ( -/obj/effect/spawner/window/reinforced/plasma/grilled, +/obj/effect/spawner/window/reinforced/grilled, /obj/structure/fans/tiny/invisible, /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) @@ -431,6 +431,7 @@ "bS" = ( /obj/item/reagent_containers/iv_bag/salglu, /obj/effect/spawner/random_spawners/dirt_often, +/obj/item/stack/rods, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -775,8 +776,8 @@ /area/awaymission/caves/build/reqpower_build) "ds" = ( /obj/effect/decal/cleanable/glass/plasma, -/obj/item/shard/plasma{ - icon_state = "plasmasmall" +/obj/item/shard{ + icon_state = "medium" }, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) @@ -916,9 +917,9 @@ /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "ef" = ( -/obj/structure/railing, /obj/structure/sink/directional/west, /obj/effect/spawner/random_spawners/dirt_often, +/obj/item/stack/rods, /turf/simulated/floor/plasteel/dark{ icon_state = "darkredalt" }, @@ -1565,7 +1566,7 @@ }, /area/awaymission/caves) "hD" = ( -/obj/effect/spawner/window/reinforced/plasma/grilled, +/obj/effect/spawner/window/reinforced/grilled, /obj/structure/fans/tiny/invisible, /obj/effect/mapping_helpers/damaged_window, /turf/simulated/floor/plating, @@ -1961,6 +1962,7 @@ }, /obj/item/reagent_containers/syringe/insulin, /obj/effect/spawner/random_spawners/dirt_often, +/obj/item/dnascrambler, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -2702,7 +2704,7 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves) "ns" = ( -/obj/effect/spawner/window/reinforced/plasma/grilled, +/obj/effect/spawner/window/reinforced/grilled, /obj/structure/fans/tiny/invisible, /obj/effect/mapping_helpers/damaged_window, /turf/simulated/floor/plating/lavaland_air, @@ -2870,7 +2872,12 @@ /turf/simulated/floor/wood/oak, /area/awaymission/caves/build/reqpower_build) "oc" = ( -/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, +/obj/effect/spawner/random_spawners/blood_often, +/obj/effect/spawner/random_spawners/dirt_often, +/obj/item/stack/rods, +/turf/simulated/floor/plasteel/dark{ + icon_state = "darkredalt" + }, /area/awaymission/caves/build/reqpower_build) "oi" = ( /obj/mecha/working/ripley{ @@ -3401,14 +3408,12 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves) "rm" = ( -/mob/living/simple_animal/hostile/skeleton/deadwizard{ - wander = 0 - }, -/obj/structure/stone_tile/slab, -/turf/simulated/floor/engine/cult/lavaland_air{ - planetary_atmos = 1 +/obj/item/bonegel, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "dark" }, -/area/awaymission/caves) +/area/awaymission/caves/build/reqpower_build) "ro" = ( /obj/machinery/door/airlock/survival_pod/glass, /obj/effect/mapping_helpers/machinery/destroyed, @@ -4081,8 +4086,14 @@ }, /area/awaymission/caves/build/reqpower_build) "uO" = ( -/obj/effect/spawner/window/reinforced/plasma/grilled, -/turf/simulated/floor/plating/lavaland_air, +/mob/living/simple_animal/hostile/skeleton/deadwizard{ + wander = 0 + }, +/obj/structure/stone_tile/slab, +/obj/structure/stone_tile/slab, +/turf/simulated/floor/engine/cult/lavaland_air{ + planetary_atmos = 1 + }, /area/awaymission/caves) "uP" = ( /obj/effect/decal/cleanable/blood/old, @@ -5675,10 +5686,11 @@ /area/awaymission/caves/build) "Do" = ( /obj/effect/decal/cleanable/glass/plasma, -/obj/item/shard/plasma{ - icon_state = "plasmamedium" - }, /obj/effect/landmark/damageturf, +/obj/item/shard{ + icon_state = "small"; + pixel_x = 10 + }, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "Dt" = ( @@ -6945,9 +6957,6 @@ }, /area/awaymission/caves) "JU" = ( -/obj/structure/railing/cap{ - dir = 6 - }, /obj/structure/railing/cap{ dir = 8 }, @@ -7368,14 +7377,6 @@ planetary_atmos = 1 }, /area/awaymission/caves) -"LP" = ( -/obj/structure/railing, -/obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random_spawners/dirt_often, -/turf/simulated/floor/plasteel/dark{ - icon_state = "darkredalt" - }, -/area/awaymission/caves/build/reqpower_build) "LR" = ( /obj/machinery/door/airlock/hatch, /obj/machinery/atmospherics/pipe/simple/hidden/universal, @@ -7629,7 +7630,7 @@ }, /area/awaymission/caves/build/reqpower_build) "NN" = ( -/obj/effect/spawner/window/reinforced/plasma/grilled, +/obj/effect/spawner/window/reinforced/grilled, /obj/effect/mapping_helpers/damaged_window, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) @@ -7728,7 +7729,7 @@ }, /area/awaymission/caves/build/reqpower_build) "Or" = ( -/obj/effect/spawner/window/reinforced/plasma/grilled, +/obj/effect/spawner/window/reinforced/grilled, /obj/effect/mapping_helpers/damaged_window, /turf/simulated/floor/plating, /area/awaymission/caves) @@ -7748,7 +7749,7 @@ }, /area/awaymission/caves) "Ox" = ( -/obj/effect/spawner/window/reinforced/plasma/grilled, +/obj/effect/spawner/window/reinforced/grilled, /obj/structure/fans/tiny/invisible, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves/build/reqpower_build) @@ -8060,11 +8061,13 @@ }, /area/awaymission/caves/build/reqpower_build) "Qg" = ( -/obj/item/shard/plasma{ - icon_state = "plasmasmall" - }, /obj/effect/decal/cleanable/glass/plasma, /obj/effect/landmark/damageturf, +/obj/item/shard{ + icon_state = "medium"; + pixel_x = -7; + pixel_y = -10 + }, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "Qm" = ( @@ -8555,6 +8558,7 @@ /obj/structure/table/glass, /obj/item/surgicaldrill, /obj/effect/spawner/random_spawners/dirt_often, +/obj/item/bonesetter, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -9053,7 +9057,9 @@ /turf/simulated/floor/plating, /area/awaymission/caves/build/reqpower_build) "Vd" = ( -/obj/effect/baseturf_helper/asteroid/basalt, +/obj/effect/baseturf_helper/asteroid/basalt{ + baseturf = /turf/simulated/floor/plating + }, /turf/simulated/wall/indestructible/rock/mineral, /area/awaymission/caves/build/reqpower_build) "Vi" = ( @@ -9260,6 +9266,7 @@ list_reagents = list("methamphetamine" = 30) }, /obj/effect/spawner/random_spawners/dirt_often, +/obj/item/dnascrambler, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -9539,17 +9546,6 @@ planetary_atmos = 1 }, /area/awaymission/caves) -"Xu" = ( -/obj/structure/railing/cap{ - dir = 6 - }, -/obj/effect/spawner/random_spawners/blood_often, -/obj/effect/spawner/random_spawners/dirt_often, -/turf/simulated/floor/plasteel/dark{ - dir = 2; - icon_state = "darkredaltstrip" - }, -/area/awaymission/caves/build/reqpower_build) "Xv" = ( /obj/structure/bonfire, /obj/structure{ @@ -9651,6 +9647,7 @@ /area/awaymission/caves) "XN" = ( /obj/machinery/optable, +/obj/item/FixOVein/alien, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" @@ -9801,7 +9798,7 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves) "Yx" = ( -/obj/effect/spawner/window/reinforced/plasma/grilled, +/obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/awaymission/caves) "YC" = ( @@ -18168,12 +18165,12 @@ LU LU LU LU -LU -LU -LU -LU -LU -LU +mz +mz +mz +mz +mz +mz mz mz mz @@ -18400,18 +18397,18 @@ LU LU LU LU -LU -LU -LU -LU -LU -LU mz UN Dv -Dv +Xq +Xq +Xq +Xq +Xq mz mz +mz +Xq Xq Dv UI @@ -18632,19 +18629,19 @@ LU LU LU LU -LU -LU -LU -LU -LU -LU mz UN Dv Dv +Xq +Xq +Xq +Xq +Dv mz Xq Xq +Xq Dv Yk PP @@ -18864,19 +18861,19 @@ LU LU LU LU -LU -LU -LU -LU -LU -LU mz mz -Xq Dv -Xq -Xq -Xq +Dv +Dv +Dv +Dv +Dv +Dv +Dv +Dv +Dv +Dv Dv Dv Xq @@ -19096,22 +19093,22 @@ LU LU LU LU -LU -LU -LU -LU -LU -LU mz mz mz +Xq +Xq +Xq Dv -mz Xq -mz +Xq +Dv +Xq +Xq +Xq Dv GJ -mz +Xq wQ mz TK @@ -19327,15 +19324,15 @@ LU LU LU LU -LU -LU -LU -LU -LU -LU mz mz mz +Dv +Xq +Xq +Dv +Xq +Xq Xq Dv Xq @@ -19559,14 +19556,14 @@ LU LU LU LU -LU -LU -LU -LU -LU -LU mz Bz +Dv +Dv +Xq +Dv +Xq +Xq Xq Xq Dv @@ -19791,16 +19788,16 @@ LU LU LU LU -LU -LU -LU -LU -LU -LU mz mz -Xq -Xq +Dv +Dv +Dv +Dv +Dv +Dv +Dv +Dv Dv Dv Dv @@ -20023,15 +20020,15 @@ LU LU LU LU -LU -LU -LU -LU -LU -LU mz WF -rm +uO +Dv +Dv +Dv +Dv +Dv +Dv Dv Dv Dv @@ -20255,16 +20252,16 @@ LU LU LU LU -LU -LU -LU -LU -LU -LU mz mz -Xq -Xq +Dv +Dv +Dv +Dv +Dv +Dv +Dv +Dv Dv Dv Dv @@ -20487,14 +20484,14 @@ LU LU LU LU -LU -LU -LU -LU -LU -LU mz Bz +Dv +Dv +Xq +Dv +Xq +Xq Xq Xq Dv @@ -20719,15 +20716,15 @@ LU LU LU LU -LU -LU -LU -LU -LU -LU mz mz mz +Dv +Xq +Xq +Dv +Xq +Xq Xq Dv Xq @@ -20952,22 +20949,22 @@ LU LU LU LU -LU -LU -LU -LU -LU -LU mz mz mz +Xq +Xq +Xq Dv -mz Xq -mz +Xq +Dv +Xq +Xq +Xq Dv Dv -mz +Xq Xq mz TK @@ -21184,19 +21181,19 @@ LU LU LU LU -LU -LU -LU -LU -LU -LU mz mz -Xq Dv -Xq -Xq -Xq +Dv +Dv +Dv +Dv +Dv +Dv +Dv +Dv +Dv +Dv Dv Dv Xq @@ -21416,19 +21413,19 @@ LU LU LU LU -LU -LU -LU -LU -LU -LU mz UN Dv Dv +Xq +Xq +Xq +Xq +Dv mz Xq Xq +Xq Dv Dv Xq @@ -21648,18 +21645,18 @@ LU LU LU LU -LU -LU -LU -LU -LU -LU mz UN Dv -Dv +Xq +Xq +Xq +Xq +Xq mz mz +mz +Xq Xq Dv Dv @@ -21880,12 +21877,12 @@ LU LU LU LU -LU -LU -LU -LU -LU -LU +mz +mz +mz +mz +mz +mz mz mz mz @@ -29178,43 +29175,43 @@ LU LU LU LU -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU as as as as -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU LU LU LU @@ -29410,43 +29407,91 @@ LU LU LU LU -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -as -as -mX -tU -as -as -as -as -as -as -lD -lD -lD -lD -lD -lD +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +as +as +mX +tU +as +as +as +as +as +as +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU LU LU LU @@ -29479,6 +29524,8 @@ LU LU LU LU +"} +(85,1,1) = {" LU LU LU @@ -29527,8 +29574,6 @@ LU LU LU LU -"} -(85,1,1) = {" LU LU LU @@ -29615,6 +29660,16 @@ LU LU LU LU +as +dV +pk +pk +qf +as +Mp +Tk +SU +as LU LU LU @@ -29642,43 +29697,6 @@ LU LU LU LU -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -as -dV -pk -pk -qf -as -Mp -Tk -SU -as -lD -lD -lD -lD -lD -lD LU LU LU @@ -29738,6 +29756,8 @@ LU LU LU LU +"} +(86,1,1) = {" LU LU LU @@ -29759,8 +29779,6 @@ LU LU LU LU -"} -(86,1,1) = {" LU LU LU @@ -29874,27 +29892,6 @@ LU LU LU LU -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD as gk pk @@ -29905,12 +29902,12 @@ GN XT ae as -lD -lD -lD -lD -lD -lD +LU +LU +LU +LU +LU +LU LU LU LU @@ -30106,27 +30103,27 @@ LU LU LU LU -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU as as as as as as -lD +LU as vh pk @@ -30138,11 +30135,11 @@ XT Mp as Ol -lD -lD -lD -lD -lD +LU +LU +LU +LU +LU LU LU LU @@ -30338,27 +30335,27 @@ LU LU LU LU -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU as Ri Ry Ri Rg as -lD +LU as QF pk @@ -30374,7 +30371,7 @@ as as as as -lD +LU LU LU LU @@ -30570,27 +30567,27 @@ LU LU LU LU -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU as Ri Ri Ri Ri as -lD +LU as fq xQ @@ -30606,7 +30603,7 @@ ah zx vE as -lD +LU LU LU LU @@ -30802,27 +30799,27 @@ LU LU LU LU -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD -lD +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU +LU as Rg xE nb Ri as -lD +LU as as Fp @@ -30838,7 +30835,7 @@ dP Ei iR as -lD +LU LU LU LU @@ -31034,27 +31031,27 @@ LU LU LU LU -lD -lD -lD -lD +LU +LU +LU +LU as as as as as -lD -lD -lD -lD -lD +LU +LU +LU +LU +LU as OL TG IY ro as -lD +LU as eW Rk @@ -31070,7 +31067,7 @@ bY as vl as -lD +LU LU LU LU @@ -31275,8 +31272,8 @@ iu Dw iu as -lD -lD +LU +LU as as as @@ -31286,7 +31283,7 @@ hG PA Vc as -lD +LU as Uj vg @@ -31302,7 +31299,7 @@ vC as as as -lD +LU LU LU LU @@ -31508,7 +31505,7 @@ XH dP as as -lD +LU as Tl Tl @@ -31518,7 +31515,7 @@ xS aa or as -lD +LU as as as @@ -31532,9 +31529,9 @@ dj uI ud as -lD -lD -lD +LU +LU +LU LU LU LU @@ -31740,7 +31737,7 @@ yY Xz vY as -lD +LU as Az dr @@ -31750,8 +31747,8 @@ xS xS Pq as -lD -lD +LU +LU as Ol Uv @@ -31765,8 +31762,8 @@ as as as as -lD -lD +LU +LU LU LU LU @@ -31972,7 +31969,7 @@ aa EJ Mo as -lD +LU as aF zG @@ -31982,8 +31979,8 @@ bb Fo aa as -lD -lD +LU +LU as QO xS @@ -31998,7 +31995,7 @@ XN AK as as -lD +LU LU LU LU @@ -32215,7 +32212,7 @@ as ot as as -lD +LU as as ON @@ -32230,7 +32227,7 @@ iv ZU oK as -lD +LU LU LU LU @@ -32447,8 +32444,8 @@ Hd Vn di as -lD -lD +LU +LU as Rn Rn @@ -32462,7 +32459,7 @@ yW Ug as as -lD +LU LU LU LU @@ -32679,7 +32676,7 @@ qX ff pB as -lD +LU as as We @@ -32690,11 +32687,11 @@ iQ as as pV -yW +rm MC Zr as -lD +LU LU LU LU @@ -32911,12 +32908,12 @@ jM OZ zY as -lD +LU as lv aa JU -Xu +nl bS Zn FL @@ -32926,7 +32923,7 @@ bQ DT as as -lD +LU LU LU LU @@ -33148,7 +33145,7 @@ as as hk ef -LP +Wb vL Nh as @@ -33158,7 +33155,7 @@ as as as as -lD +LU LU LU LU @@ -34317,8 +34314,8 @@ as as as as -lD -lD +LU +LU LU LU LU @@ -34550,7 +34547,7 @@ kp PO as as -lD +LU LU LU LU @@ -34782,7 +34779,7 @@ RR Zn fW as -lD +LU LU LU LU @@ -35014,7 +35011,7 @@ Md YI as as -lD +LU LU LU LU @@ -35246,7 +35243,7 @@ Rk GH gj as -lD +LU LU LU LU @@ -35468,7 +35465,7 @@ as QO so JU -Xu +nl Gg Ke rM @@ -35478,7 +35475,7 @@ aD SY as as -lD +LU LU LU LU @@ -35700,7 +35697,7 @@ as as Jt ef -lW +oc ZE nm as @@ -35709,8 +35706,8 @@ as as as as -lD -lD +LU +LU LU LU LU @@ -35936,13 +35933,13 @@ KF as as as -lD -lD -lD -lD -lD -lD -lD +LU +LU +LU +LU +LU +LU +LU LU LU LU @@ -36168,13 +36165,13 @@ oG as Wz as -lD -lD -lD -lD -lD -lD -lD +LU +LU +LU +LU +LU +LU +LU LU LU LU @@ -36400,13 +36397,13 @@ nl Ce PY as -lD -lD -lD -lD -lD -lD -lD +LU +LU +LU +LU +LU +LU +LU LU LU LU @@ -36632,13 +36629,13 @@ vr as SR as -lD -lD -lD -lD -lD -lD -lD +LU +LU +LU +LU +LU +LU +LU LU LU LU @@ -36864,13 +36861,13 @@ zF as as as -lD -lD -lD -lD -lD -lD -lD +LU +LU +LU +LU +LU +LU +LU LU LU LU @@ -37095,14 +37092,14 @@ lE Rg lD lD -lD -lD -lD -lD -lD -lD -lD -lD +LU +LU +LU +LU +LU +LU +LU +LU LU LU LU @@ -37327,14 +37324,14 @@ HZ gs jy lD -lD -lD -lD -lD -lD -lD -lD -lD +LU +LU +LU +LU +LU +LU +LU +LU LU LU LU @@ -37559,14 +37556,14 @@ dP lD lD lD -lD -lD -lD -lD -lD -lD -lD -lD +LU +LU +LU +LU +LU +LU +LU +LU LU LU LU @@ -37791,14 +37788,14 @@ lD lD lD lD -lD -lD -lD -lD -lD -lD -lD -lD +LU +LU +LU +LU +LU +LU +LU +LU LU LU LU @@ -38023,14 +38020,14 @@ lD lD lD lD -lD -lD -lD -lD -lD -lD -lD -lD +LU +LU +LU +LU +LU +LU +LU +LU LU LU LU @@ -38255,14 +38252,14 @@ xf xf oY xi -oc -lD -lD -lD -lD -lD -lD -lD +ZJ +LU +LU +LU +LU +LU +LU +LU LU LU LU @@ -41264,7 +41261,7 @@ BH BH BH BH -uO +pZ aV Or BH @@ -41496,7 +41493,7 @@ BH BH Th BH -uO +pZ vZ Or BH diff --git a/modular_ss220/maps220/code/mobs.dm b/modular_ss220/maps220/code/mobs.dm index bfdadf3f253d..9aa739dfade3 100644 --- a/modular_ss220/maps220/code/mobs.dm +++ b/modular_ss220/maps220/code/mobs.dm @@ -209,7 +209,19 @@ /obj/item/clothing/head/crown, /obj/item/clothing/suit/imperium_monk, /obj/effect/particle_effect/smoke/bad, - /obj/item/necromantic_stone) + /obj/item/emerald_stone) + +/mob/living/simple_animal/hostile/skeleton/deadwizard/Shoot(atom/targeted_atom) + ..() + if (get_dist(src, targeted_atom) > 9) + rapid = 1 + ranged_cooldown_time = 15 + projectiletype = /obj/item/projectile/magic/fireball/infernal + else + projectiletype = /obj/item/projectile/magic/arcane_barrage + rapid = 4 + rapid_fire_delay = 1 + ranged_cooldown_time = 15 /* Vox Raiders */ /mob/living/simple_animal/hostile/vox diff --git a/modular_ss220/maps220/code/objects.dm b/modular_ss220/maps220/code/objects.dm index 426dd121b42d..9f08e4c9b3ea 100644 --- a/modular_ss220/maps220/code/objects.dm +++ b/modular_ss220/maps220/code/objects.dm @@ -248,7 +248,7 @@ fire_sound = 'sound/weapons/gunshots/gunshot_smg.ogg' projectile_energy_cost = 14 -//Immortality ring +/* Caves awaymission */ /obj/item/clothing/gloves/ring/immortality_ring name = "старое кольцо" icon_state = "shadowring" @@ -301,3 +301,94 @@ flags = NODROP to_chat(user, span_danger("[name] туго обвивается вокруг твоего пальца!")) SEND_SOUND (user, sound('modular_ss220/aesthetics_sounds/sound/creepy/demon2.ogg')) + +/obj/item/emerald_stone + name = "изумрудный камень" + desc = "Маленькая серебряная побрякушка, инкрустированная ярким изумрудом бриллиантовой огранки. На верхушечной площадке камня мелко выгравирован череп ." + icon = 'icons/obj/wizard.dmi' + icon_state = "necrostone" + item_state = "electronic" + origin_tech = "bluespace=4;materials=4" + w_class = WEIGHT_CLASS_TINY + var/list/skeletons = list() + +/obj/item/emerald_stone/attack(mob/living/carbon/human/M as mob, mob/living/carbon/human/user as mob) + + if(!istype(M)) + return ..() + + if(!istype(user)) + return + + if(M.skeleton) + to_chat(user, span_warning("Этот воин уже отслужил свое.")) + return + + if(M.stat != DEAD) + to_chat(user, span_warning("Этот артефакт подействует лишь на мертвеца!")) + return + + if((!M.mind || !M.client) && !M.grab_ghost()) + to_chat(user, span_warning("Это тело никогда не было обременено душой...")) + return + + check_skeletons()//clean out/refresh the list + + if(skeletons.len >= 1) + to_chat(user, span_warning("Этот артефакт может поддерживать только одного мертвеца!")) + return + + else + M.set_species(/datum/species/skeleton) // OP skellybones + M.visible_message(span_warning ("[M] отторгает бренную оболочку и предстает в виде скелета!")) + M.grab_ghost() // yoinks the ghost if its not in the body + M.revive() + equip_undead(M) + skeletons |= M + to_chat(M, span_danger("Вас возродил [user.real_name]!")) + to_chat(M, span_danger("[user.p_theyre(TRUE)] теперь ваш хозяин, служите ему, чего бы это вам не стоило!")) + +/obj/item/emerald_stone/proc/check_skeletons() + for(var/X in skeletons) + if(!ishuman(X)) + skeletons.Remove(X) + continue + var/mob/living/carbon/human/H = X + if(H.stat == DEAD) + skeletons.Remove(X) + continue + listclearnulls(skeletons) + +/obj/item/emerald_stone/proc/equip_undead(mob/living/carbon/human/H as mob) + for(var/obj/item/I in H) + H.unEquip(I) + var/randomUndead = "roman"//defualt + randomUndead = pick("roman","pirate","clown") + + switch(randomUndead) + if("roman") + var/hat = pick(/obj/item/clothing/head/helmet/roman, /obj/item/clothing/head/helmet/roman/legionaire) + H.equip_to_slot_or_del(new hat(H), SLOT_HUD_HEAD) + H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(H), SLOT_HUD_JUMPSUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(H), SLOT_HUD_SHOES) + H.equip_to_slot_or_del(new /obj/item/shield/riot/roman(H), SLOT_HUD_LEFT_HAND) + H.equip_to_slot_or_del(new /obj/item/claymore(H), SLOT_HUD_RIGHT_HAND) + H.equip_to_slot_or_del(new /obj/item/spear(H), SLOT_HUD_BACK) + if("pirate") + H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/pirate(H), SLOT_HUD_JUMPSUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/pirate_brown(H), SLOT_HUD_OUTER_SUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(H), SLOT_HUD_HEAD) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), SLOT_HUD_SHOES) + H.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(H), SLOT_HUD_GLASSES) + H.equip_to_slot_or_del(new /obj/item/claymore/ceremonial(H), SLOT_HUD_RIGHT_HAND) + H.equip_to_slot_or_del(new /obj/item/spear(H), SLOT_HUD_BACK) + H.equip_to_slot_or_del(new /obj/item/shield/riot/roman(H), SLOT_HUD_LEFT_HAND) + if("clown") + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/civilian/clown(H), SLOT_HUD_JUMPSUIT) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(H), SLOT_HUD_SHOES) + H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(H), SLOT_HUD_WEAR_MASK) + H.equip_to_slot_or_del(new /obj/item/clothing/head/stalhelm(H), SLOT_HUD_HEAD) + H.equip_to_slot_or_del(new /obj/item/bikehorn(H), SLOT_HUD_LEFT_STORE) + H.equip_to_slot_or_del(new /obj/item/claymore/ceremonial(H), SLOT_HUD_RIGHT_HAND) + H.equip_to_slot_or_del(new /obj/item/shield/riot/roman(H), SLOT_HUD_LEFT_HAND) + H.equip_to_slot_or_del(new /obj/item/spear(H), SLOT_HUD_BACK) From 2fb0bd21cb308068e0b9f73deb2d86a7b0bccd8c Mon Sep 17 00:00:00 2001 From: konushi Date: Wed, 1 Nov 2023 19:14:36 +0300 Subject: [PATCH 2/6] =?UTF-8?q?=D0=B7=D0=B0=D0=B1=D1=8B=D0=BB=20=D1=81?= =?UTF-8?q?=D1=82=D0=B0=D1=82=D1=8B=20=D0=BC=D0=B0=D0=B3=D1=83=20=D0=B8=20?= =?UTF-8?q?=D1=83=D0=B1=D1=80=D0=B0=D1=82=D1=8C=20=D0=BF=D1=80=D0=BE=D0=B6?= =?UTF-8?q?=D0=B5=D0=BA=D1=82=D0=B0=D0=B9=D0=BB=20=D1=82=D0=B8=D0=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modular_ss220/maps220/code/mobs.dm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/modular_ss220/maps220/code/mobs.dm b/modular_ss220/maps220/code/mobs.dm index 9aa739dfade3..5db3b128e8b2 100644 --- a/modular_ss220/maps220/code/mobs.dm +++ b/modular_ss220/maps220/code/mobs.dm @@ -194,15 +194,16 @@ icon = 'modular_ss220/maps220/icons/simple_human.dmi' icon_living = "deadwizard" icon_state = "deadwizard" - maxHealth = 300 - health = 300 + maxHealth = 400 + health = 400 ranged = 1 - rapid = 4 - rapid_fire_delay = 1 - retreat_distance = 4 - minimum_distance = 4 + retreat_distance = 7 + minimum_distance = 5 + ranged_cooldown_time = 5 + ranged_ignores_vision = TRUE + aggro_vision_range = 12 + vision_range = 12 del_on_death = 1 - projectiletype = /obj/item/projectile/magic/arcane_barrage projectilesound = 'sound/magic/blind.ogg' loot = list( /obj/effect/decal/remains/human, From 561a501cea60d7a1f12bb6f9193d8c79916f1676 Mon Sep 17 00:00:00 2001 From: konushi Date: Tue, 7 Nov 2023 06:20:32 +0300 Subject: [PATCH 3/6] =?UTF-8?q?=D0=BD=D0=B5=D0=BD=D1=83=D0=B6=D0=BD=D1=8B?= =?UTF-8?q?=D0=B5=20=D0=BF=D1=80=D0=BE=D0=BF=D1=83=D1=81=D0=BA=D0=B8,=20as?= =?UTF-8?q?=20mob'=D1=8B=20=D0=B8=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=BD=D1=8B=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modular_ss220/maps220/code/objects.dm | 93 ++++++++++++++------------- 1 file changed, 47 insertions(+), 46 deletions(-) diff --git a/modular_ss220/maps220/code/objects.dm b/modular_ss220/maps220/code/objects.dm index 9f08e4c9b3ea..4cc2554f19a3 100644 --- a/modular_ss220/maps220/code/objects.dm +++ b/modular_ss220/maps220/code/objects.dm @@ -311,84 +311,85 @@ origin_tech = "bluespace=4;materials=4" w_class = WEIGHT_CLASS_TINY var/list/skeletons = list() + var/number = 2 // можно менять в игре -/obj/item/emerald_stone/attack(mob/living/carbon/human/M as mob, mob/living/carbon/human/user as mob) +/obj/item/emerald_stone/attack(mob/living/carbon/human/undead, mob/living/carbon/human/user) - if(!istype(M)) + if(!istype(undead)) return ..() if(!istype(user)) return - if(M.skeleton) + if(undead.skeleton) to_chat(user, span_warning("Этот воин уже отслужил свое.")) return - if(M.stat != DEAD) + if(undead.stat != DEAD) to_chat(user, span_warning("Этот артефакт подействует лишь на мертвеца!")) return - if((!M.mind || !M.client) && !M.grab_ghost()) + if((!undead.mind || !undead.client) && !undead.grab_ghost()) to_chat(user, span_warning("Это тело никогда не было обременено душой...")) return - check_skeletons()//clean out/refresh the list + check_skeletons() //clean out/refresh the list - if(skeletons.len >= 1) + if(length(skeletons) >= number) to_chat(user, span_warning("Этот артефакт может поддерживать только одного мертвеца!")) return else - M.set_species(/datum/species/skeleton) // OP skellybones - M.visible_message(span_warning ("[M] отторгает бренную оболочку и предстает в виде скелета!")) - M.grab_ghost() // yoinks the ghost if its not in the body - M.revive() - equip_undead(M) - skeletons |= M - to_chat(M, span_danger("Вас возродил [user.real_name]!")) - to_chat(M, span_danger("[user.p_theyre(TRUE)] теперь ваш хозяин, служите ему, чего бы это вам не стоило!")) + undead.set_species(/datum/species/skeleton) // OP skellybones + undead.visible_message(span_warning ("[undead] отторгает бренную оболочку и предстает в виде скелета!")) + undead.grab_ghost() // yoinks the ghost if its not in the body + undead.revive() + equip_undead(undead) + skeletons |= undead + to_chat(undead, span_danger("Вас возродил [user.real_name]!")) + to_chat(undead, span_danger("[user.p_theyre(TRUE)] теперь ваш хозяин, служите ему, чего бы это вам не стоило!")) /obj/item/emerald_stone/proc/check_skeletons() - for(var/X in skeletons) - if(!ishuman(X)) - skeletons.Remove(X) + for(var/count in skeletons) + if(!ishuman(count)) + skeletons.Remove(count) continue - var/mob/living/carbon/human/H = X - if(H.stat == DEAD) - skeletons.Remove(X) + var/mob/living/carbon/human/undead = count + if(undead.stat == DEAD) + skeletons.Remove(count) continue listclearnulls(skeletons) -/obj/item/emerald_stone/proc/equip_undead(mob/living/carbon/human/H as mob) - for(var/obj/item/I in H) - H.unEquip(I) +/obj/item/emerald_stone/proc/equip_undead(mob/living/carbon/human/raised) + for(var/obj/item/I in raised) + raised.unEquip(I) var/randomUndead = "roman"//defualt randomUndead = pick("roman","pirate","clown") switch(randomUndead) if("roman") var/hat = pick(/obj/item/clothing/head/helmet/roman, /obj/item/clothing/head/helmet/roman/legionaire) - H.equip_to_slot_or_del(new hat(H), SLOT_HUD_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(H), SLOT_HUD_JUMPSUIT) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(H), SLOT_HUD_SHOES) - H.equip_to_slot_or_del(new /obj/item/shield/riot/roman(H), SLOT_HUD_LEFT_HAND) - H.equip_to_slot_or_del(new /obj/item/claymore(H), SLOT_HUD_RIGHT_HAND) - H.equip_to_slot_or_del(new /obj/item/spear(H), SLOT_HUD_BACK) + raised.equip_to_slot_or_del(new hat(raised), SLOT_HUD_HEAD) + raised.equip_to_slot_or_del(new /obj/item/clothing/under/costume/roman(raised), SLOT_HUD_JUMPSUIT) + raised.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(raised), SLOT_HUD_SHOES) + raised.equip_to_slot_or_del(new /obj/item/shield/riot/roman(raised), SLOT_HUD_LEFT_HAND) + raised.equip_to_slot_or_del(new /obj/item/claymore/ceremonial(raised), SLOT_HUD_RIGHT_HAND) + raised.equip_to_slot_or_del(new /obj/item/spear(raised), SLOT_HUD_BACK) if("pirate") - H.equip_to_slot_or_del(new /obj/item/clothing/under/costume/pirate(H), SLOT_HUD_JUMPSUIT) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/pirate_brown(H), SLOT_HUD_OUTER_SUIT) - H.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(H), SLOT_HUD_HEAD) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), SLOT_HUD_SHOES) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(H), SLOT_HUD_GLASSES) - H.equip_to_slot_or_del(new /obj/item/claymore/ceremonial(H), SLOT_HUD_RIGHT_HAND) - H.equip_to_slot_or_del(new /obj/item/spear(H), SLOT_HUD_BACK) - H.equip_to_slot_or_del(new /obj/item/shield/riot/roman(H), SLOT_HUD_LEFT_HAND) + raised.equip_to_slot_or_del(new /obj/item/clothing/under/costume/pirate(raised), SLOT_HUD_JUMPSUIT) + raised.equip_to_slot_or_del(new /obj/item/clothing/suit/pirate_brown(raised), SLOT_HUD_OUTER_SUIT) + raised.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(raised), SLOT_HUD_HEAD) + raised.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(raised), SLOT_HUD_SHOES) + raised.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(raised), SLOT_HUD_GLASSES) + raised.equip_to_slot_or_del(new /obj/item/claymore/ceremonial(raised), SLOT_HUD_RIGHT_HAND) + raised.equip_to_slot_or_del(new /obj/item/spear(raised), SLOT_HUD_BACK) + raised.equip_to_slot_or_del(new /obj/item/shield/riot/roman(raised), SLOT_HUD_LEFT_HAND) if("clown") - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/civilian/clown(H), SLOT_HUD_JUMPSUIT) - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(H), SLOT_HUD_SHOES) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(H), SLOT_HUD_WEAR_MASK) - H.equip_to_slot_or_del(new /obj/item/clothing/head/stalhelm(H), SLOT_HUD_HEAD) - H.equip_to_slot_or_del(new /obj/item/bikehorn(H), SLOT_HUD_LEFT_STORE) - H.equip_to_slot_or_del(new /obj/item/claymore/ceremonial(H), SLOT_HUD_RIGHT_HAND) - H.equip_to_slot_or_del(new /obj/item/shield/riot/roman(H), SLOT_HUD_LEFT_HAND) - H.equip_to_slot_or_del(new /obj/item/spear(H), SLOT_HUD_BACK) + raised.equip_to_slot_or_del(new /obj/item/clothing/under/rank/civilian/clown(raised), SLOT_HUD_JUMPSUIT) + raised.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(raised), SLOT_HUD_SHOES) + raised.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(raised), SLOT_HUD_WEAR_MASK) + raised.equip_to_slot_or_del(new /obj/item/clothing/head/stalhelm(raised), SLOT_HUD_HEAD) + raised.equip_to_slot_or_del(new /obj/item/bikehorn(raised), SLOT_HUD_LEFT_STORE) + raised.equip_to_slot_or_del(new /obj/item/claymore/ceremonial(raised), SLOT_HUD_RIGHT_HAND) + raised.equip_to_slot_or_del(new /obj/item/shield/riot/roman(raised), SLOT_HUD_LEFT_HAND) + raised.equip_to_slot_or_del(new /obj/item/spear(raised), SLOT_HUD_BACK) From 930e61601a9a43a42fef0fddea672fce936c648a Mon Sep 17 00:00:00 2001 From: konushi Date: Tue, 7 Nov 2023 06:49:39 +0300 Subject: [PATCH 4/6] =?UTF-8?q?=D0=B5=D1=89=D0=B5=20=D0=B0=D0=BF=D0=B4?= =?UTF-8?q?=D0=B5=D0=B9=D1=82=20=D0=BA=D0=B0=D1=80=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _maps/map_files220/RandomZLevels/caves.dmm | 310 ++++++++++++--------- 1 file changed, 175 insertions(+), 135 deletions(-) diff --git a/_maps/map_files220/RandomZLevels/caves.dmm b/_maps/map_files220/RandomZLevels/caves.dmm index 2627f5cee929..3dd4c48794bf 100644 --- a/_maps/map_files220/RandomZLevels/caves.dmm +++ b/_maps/map_files220/RandomZLevels/caves.dmm @@ -57,6 +57,10 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) +"aj" = ( +/obj/item/wisp_lantern, +/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, +/area/awaymission/caves) "al" = ( /obj/structure/stone_tile/slab/cracked{ dir = 4 @@ -890,9 +894,7 @@ /turf/simulated/floor/carpet/purple, /area/awaymission/caves/build/reqpower_build) "dX" = ( -/turf/simulated/floor/plating/asteroid/airless/cave/volcanic{ - planetary_atmos = 1 - }, +/turf/simulated/floor/plating/asteroid/airless/cave/volcanic, /area/awaymission/caves) "ea" = ( /mob/living/simple_animal/hostile/asteroid/hivelord{ @@ -1025,9 +1027,11 @@ }, /area/awaymission/caves/build/reqpower_build) "eL" = ( -/obj/effect/spawner/random_spawners/grille_often, -/obj/effect/spawner/random_spawners/grille_maybe, -/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, +/obj/structure/mineral_door/iron, +/obj/effect/decal/cleanable/dust, +/turf/simulated/floor/engine/cult/lavaland_air{ + planetary_atmos = 1 + }, /area/awaymission/caves) "eM" = ( /mob/living/simple_animal/hostile/abomination/altform1{ @@ -1652,6 +1656,14 @@ icon_state = "bcircuit" }, /area/awaymission/caves/build/reqpower_build) +"hW" = ( +/obj/effect/spawner/random_spawners/dirt_often, +/obj/item/card/id/away/old{ + name = "Miner's Personal ID"; + pixel_x = -5 + }, +/turf/simulated/floor/plasteel/lavaland_air, +/area/awaymission/caves/build) "hY" = ( /obj/structure/stone_tile/slab/cracked{ dir = 10 @@ -2184,8 +2196,9 @@ /turf/simulated/floor/plasteel, /area/awaymission/caves/build) "kC" = ( -/obj/item/clothing/suit/armor/riot/knight/red, /obj/effect/decal/remains/human, +/obj/item/reagent_containers/food/snacks/grown/harebell, +/obj/item/clothing/suit/armor/riot/knight/red, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves) "kD" = ( @@ -2704,11 +2717,9 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves) "ns" = ( -/obj/effect/spawner/window/reinforced/grilled, -/obj/structure/fans/tiny/invisible, -/obj/effect/mapping_helpers/damaged_window, -/turf/simulated/floor/plating/lavaland_air, -/area/awaymission/caves/build/reqpower_build) +/obj/structure/spacevine, +/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, +/area/awaymission/caves) "nt" = ( /obj/effect/spawner/random_spawners/blood_often, /obj/effect/gibspawner/human, @@ -2879,6 +2890,11 @@ icon_state = "darkredalt" }, /area/awaymission/caves/build/reqpower_build) +"og" = ( +/obj/structure/flora/ash/stem_shroom, +/obj/structure/spacevine, +/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, +/area/awaymission/caves) "oi" = ( /obj/mecha/working/ripley{ obj_integrity = 40 @@ -5693,6 +5709,15 @@ }, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) +"Dp" = ( +/obj/structure/stone_tile/slab/cracked{ + dir = 9 + }, +/obj/effect/decal/cleanable/dust, +/turf/simulated/floor/engine/cult/lavaland_air{ + planetary_atmos = 1 + }, +/area/awaymission/caves) "Dt" = ( /obj/structure/stone_tile/slab/cracked{ dir = 8 @@ -6510,6 +6535,7 @@ /obj/structure/stone_tile/slab, /obj/item/toy/character/lich, /obj/effect/decal/cleanable/dust, +/obj/item/clothing/shoes/sandal/magic, /turf/simulated/floor/engine/cult/lavaland_air{ planetary_atmos = 1 }, @@ -7189,6 +7215,11 @@ icon_state = "darkredalt" }, /area/awaymission/caves/build/reqpower_build) +"KS" = ( +/obj/structure/flora/ash/tall_shroom, +/obj/structure/spacevine, +/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, +/area/awaymission/caves) "KT" = ( /obj/effect/rune/narsie{ used = 1 @@ -7722,16 +7753,16 @@ /area/awaymission/caves) "Oo" = ( /obj/machinery/door/airlock/survival_pod, -/obj/structure/fans/tiny/invisible, +/obj/structure/fans/tiny, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "dark" }, /area/awaymission/caves/build/reqpower_build) "Or" = ( -/obj/effect/spawner/window/reinforced/grilled, -/obj/effect/mapping_helpers/damaged_window, -/turf/simulated/floor/plating, +/obj/structure/flora/ash/rock/style_random, +/obj/structure/spacevine, +/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves) "Os" = ( /obj/structure/table/wood, @@ -7749,10 +7780,14 @@ }, /area/awaymission/caves) "Ox" = ( -/obj/effect/spawner/window/reinforced/grilled, -/obj/structure/fans/tiny/invisible, -/turf/simulated/floor/plating/lavaland_air, -/area/awaymission/caves/build/reqpower_build) +/obj/structure/stone_tile/slab/cracked{ + dir = 2 + }, +/obj/structure/flora/rock, +/turf/simulated/floor/engine/cult/lavaland_air{ + planetary_atmos = 1 + }, +/area/awaymission/caves) "OA" = ( /obj/machinery/atmospherics/unary/tank/air, /obj/effect/spawner/random_spawners/dirt_often, @@ -8368,9 +8403,7 @@ /area/awaymission/caves) "RX" = ( /obj/machinery/hydroponics/soil, -/turf/simulated/floor/plating/asteroid/airless/cave/volcanic{ - planetary_atmos = 1 - }, +/turf/simulated/floor/plating/asteroid/airless/cave/volcanic, /area/awaymission/caves) "RY" = ( /turf/simulated/floor/plasteel/lavaland_air, @@ -8541,9 +8574,7 @@ "SV" = ( /obj/structure/sink/puddle, /obj/item/reagent_containers/glass/bucket/wooden, -/turf/simulated/floor/plating/asteroid/airless/cave/volcanic{ - planetary_atmos = 1 - }, +/turf/simulated/floor/plating/asteroid/airless/cave/volcanic, /area/awaymission/caves) "SX" = ( /obj/machinery/power/smes, @@ -9314,9 +9345,6 @@ name = "Miner's Personal ID"; pixel_x = -5 }, -/obj/item/card/id/away/old{ - name = "Miner's Personal ID" - }, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) "Wq" = ( @@ -9441,6 +9469,15 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves/build) +"WQ" = ( +/obj/structure/stone_tile/slab/cracked{ + dir = 5 + }, +/obj/structure/flora/rock, +/turf/simulated/floor/engine/cult/lavaland_air{ + planetary_atmos = 1 + }, +/area/awaymission/caves) "WR" = ( /obj/effect/spawner/random_spawners/wall_rusted_probably, /turf/simulated/wall, @@ -9951,7 +9988,10 @@ /obj/structure/closet/crate/wooden/wooden_crate, /obj/structure/stone_tile/slab, /obj/item/reagent_containers/food/drinks/trophy/bronze_cup, -/obj/item/reagent_containers/food/drinks/bottle/wine, +/obj/item/reagent_containers/food/drinks/bottle/wine{ + name = "Thousand-year-old wine"; + icon_state = "patronbottle" + }, /obj/effect/decal/cleanable/dust, /turf/simulated/floor/engine/cult/lavaland_air{ planetary_atmos = 1 @@ -16734,10 +16774,10 @@ Lr kD VD ZJ -eL -eL -eL -eL +Pb +Pb +Pb +Pb TK TK TK @@ -16969,8 +17009,8 @@ ZJ ZJ ZJ ZJ -eL -eL +Pb +Pb TK TK TK @@ -17473,7 +17513,7 @@ LU LU LU LU -LU +Ox LU LU LU @@ -17705,9 +17745,9 @@ LU LU LU LU -LU -LU -LU +iE +WQ +mz LU LU LU @@ -17904,8 +17944,8 @@ NJ tW gq kG -eL -TK +Pb +ZJ TK TK TK @@ -17936,10 +17976,10 @@ LU LU LU LU -LU -LU -LU -LU +mz +wC +Dp +mz LU LU LU @@ -18136,7 +18176,7 @@ ts tW tW kG -eL +Pb ZJ ZJ ZJ @@ -18169,8 +18209,8 @@ mz mz mz mz -mz -mz +eL +eL mz mz mz @@ -18368,7 +18408,7 @@ NJ NJ Kl kG -eL +Pb ZJ ZJ ZJ @@ -18402,7 +18442,7 @@ UN Dv Xq Xq -Xq +ET Xq Xq mz @@ -19513,7 +19553,7 @@ ZJ bO Uh jA -NS +hW hw ew wh @@ -24473,10 +24513,10 @@ TK TK TK TK -ZJ -va -ZJ -ZJ +ns +KS +ns +ns TK TK TK @@ -24704,10 +24744,10 @@ TK TK TK TK -ZJ -ZJ -ZJ -ZJ +ns +ns +ns +ns TK TK TK @@ -24938,9 +24978,9 @@ TK TK ZJ Aq -ZJ -ZJ -CO +ns +ns +og TK TK TK @@ -25165,10 +25205,10 @@ TK ZJ TK ZJ -ZJ +ns TK TK -ZJ +ns ZJ ZJ ZJ @@ -25395,17 +25435,17 @@ TK TK TK TK -ZJ -va -ZJ +ns +KS +ns TK TK ZJ TK TK ZJ -ZJ -ZJ +ns +ns TK TK TK @@ -25637,8 +25677,8 @@ TK TK TK TK -ZJ -ZJ +ns +ns TK TK BH @@ -25863,14 +25903,14 @@ ZJ ZJ ZJ TK -ZJ -ZJ +ns +ns TK Aq TK TK -ZJ -Aq +ns +Or TK TK BH @@ -26094,14 +26134,14 @@ TK TK TK Aq -ZJ -ZJ -ZJ +ns +ns +ns TK -ZJ +aj bV va -ZJ +ns TK TK TK @@ -26326,10 +26366,10 @@ TK TK TK ZJ -ZJ +ns hu -ZJ -ZJ +ns +ns ZJ kC TK @@ -37201,7 +37241,7 @@ OK OK GF FF -GF +AE GF GF mz @@ -37620,9 +37660,9 @@ bO bO bO ZJ -ZJ -TK -TK +bO +bO +bO TK TK TK @@ -37630,7 +37670,7 @@ bO bO bO bO -TK +bO bO bO bO @@ -37852,20 +37892,20 @@ bO bO bO bO -TK -TK -TK -TK +bO +bO +bO +bO +bO +bO bO bO bO bO TK TK -TK -TK -TK -Pb +bO +bO aV ZJ nx @@ -37897,7 +37937,7 @@ FF GF GF GF -AE +GF GF Vt GF @@ -38091,13 +38131,13 @@ bO bO bO bO +bO +bO TK TK TK TK -TK -TK -TK +aV kD ZJ TK @@ -38321,16 +38361,16 @@ bO bO bO bO -TK -TK -TK +bO +bO +bO TK TK TK TK TK Aq -ZJ +Ge TK TK LU @@ -38553,9 +38593,9 @@ bO bO bO bO -TK -TK -TK +bO +bO +bO TK TK TK @@ -38785,8 +38825,8 @@ bO bO bO bO -ZJ -TK +bO +bO TK TK ZJ @@ -39632,7 +39672,7 @@ GA Ce dP dP -dP +Rg dP as sn @@ -39859,8 +39899,8 @@ xf xf xf xf -Ox -ns +bq +hD xf xf xf @@ -40404,7 +40444,7 @@ TK TK TK TK -TK +bO bO bO TK @@ -40634,9 +40674,9 @@ TK TK TK TK -TK -TK -TK +bO +bO +bO bO TK TK @@ -40799,7 +40839,7 @@ BH Og dU zm -Yx +pZ BH BH BH @@ -41031,7 +41071,7 @@ BH BH NN vZ -Or +NN BH BH BH @@ -41263,7 +41303,7 @@ BH BH pZ aV -Or +NN BH BH BH @@ -41495,7 +41535,7 @@ Th BH pZ vZ -Or +NN BH BH BH @@ -41727,7 +41767,7 @@ oB Yx nu aV -Yx +pZ BH BH BH @@ -44096,10 +44136,10 @@ bO bO bO bO -bO -bO -bO -bO +ZJ +TK +TK +TK ZJ ZJ ZJ @@ -44328,10 +44368,10 @@ bO bO bO bO -bO -bO -bO -bO +ZJ +ZJ +TK +TK bO bO bO @@ -44561,9 +44601,9 @@ bO bO bO bO -bO -bO -bO +ZJ +ZJ +ZJ bO bO bO @@ -44798,8 +44838,8 @@ bO bO bO bO -bO -bO +ZJ +ZJ TK TK TK From 921d91d70e25e6ed541571e810b357f5d69d7ae8 Mon Sep 17 00:00:00 2001 From: konushi Date: Tue, 7 Nov 2023 06:59:19 +0300 Subject: [PATCH 5/6] Update caves.dmm --- _maps/map_files220/RandomZLevels/caves.dmm | 124 ++++++++++----------- 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/_maps/map_files220/RandomZLevels/caves.dmm b/_maps/map_files220/RandomZLevels/caves.dmm index 3dd4c48794bf..71be2a7f813c 100644 --- a/_maps/map_files220/RandomZLevels/caves.dmm +++ b/_maps/map_files220/RandomZLevels/caves.dmm @@ -57,10 +57,6 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/wood/lavaland_air, /area/awaymission/caves) -"aj" = ( -/obj/item/wisp_lantern, -/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, -/area/awaymission/caves) "al" = ( /obj/structure/stone_tile/slab/cracked{ dir = 4 @@ -477,6 +473,11 @@ /obj/effect/landmark/damageturf, /turf/simulated/floor/wood/oak, /area/awaymission/caves/build/reqpower_build) +"ca" = ( +/obj/structure/flora/ash/stem_shroom, +/obj/structure/spacevine, +/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, +/area/awaymission/caves) "cc" = ( /obj/structure/flora/rock/pile, /obj/effect/landmark/burnturf, @@ -1027,11 +1028,9 @@ }, /area/awaymission/caves/build/reqpower_build) "eL" = ( -/obj/structure/mineral_door/iron, -/obj/effect/decal/cleanable/dust, -/turf/simulated/floor/engine/cult/lavaland_air{ - planetary_atmos = 1 - }, +/obj/structure/flora/ash/rock/style_random, +/obj/structure/spacevine, +/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/awaymission/caves) "eM" = ( /mob/living/simple_animal/hostile/abomination/altform1{ @@ -1656,14 +1655,6 @@ icon_state = "bcircuit" }, /area/awaymission/caves/build/reqpower_build) -"hW" = ( -/obj/effect/spawner/random_spawners/dirt_often, -/obj/item/card/id/away/old{ - name = "Miner's Personal ID"; - pixel_x = -5 - }, -/turf/simulated/floor/plasteel/lavaland_air, -/area/awaymission/caves/build) "hY" = ( /obj/structure/stone_tile/slab/cracked{ dir = 10 @@ -2380,6 +2371,14 @@ /obj/structure/closet/emcloset, /turf/simulated/floor/plasteel/lavaland_air, /area/awaymission/caves/build) +"ly" = ( +/obj/effect/spawner/random_spawners/dirt_often, +/obj/item/card/id/away/old{ + name = "Miner's Personal ID"; + pixel_x = -5 + }, +/turf/simulated/floor/plasteel/lavaland_air, +/area/awaymission/caves/build) "lD" = ( /turf/simulated/wall/indestructible/rock/mineral, /area/awaymission/caves/build/reqpower_build) @@ -2890,11 +2889,6 @@ icon_state = "darkredalt" }, /area/awaymission/caves/build/reqpower_build) -"og" = ( -/obj/structure/flora/ash/stem_shroom, -/obj/structure/spacevine, -/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, -/area/awaymission/caves) "oi" = ( /obj/mecha/working/ripley{ obj_integrity = 40 @@ -3569,6 +3563,11 @@ icon_state = "white" }, /area/awaymission/caves/build) +"sf" = ( +/obj/structure/flora/ash/tall_shroom, +/obj/structure/spacevine, +/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, +/area/awaymission/caves) "sh" = ( /obj/effect/landmark/damageturf, /turf/simulated/floor/wood/lavaland_air, @@ -5039,6 +5038,15 @@ /obj/effect/decal/cleanable/blood/oil, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) +"zK" = ( +/obj/structure/stone_tile/slab/cracked{ + dir = 9 + }, +/obj/effect/decal/cleanable/dust, +/turf/simulated/floor/engine/cult/lavaland_air{ + planetary_atmos = 1 + }, +/area/awaymission/caves) "zO" = ( /obj/structure/stone_tile/slab, /mob/living/simple_animal/hostile/skeleton, @@ -5709,15 +5717,6 @@ }, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves) -"Dp" = ( -/obj/structure/stone_tile/slab/cracked{ - dir = 9 - }, -/obj/effect/decal/cleanable/dust, -/turf/simulated/floor/engine/cult/lavaland_air{ - planetary_atmos = 1 - }, -/area/awaymission/caves) "Dt" = ( /obj/structure/stone_tile/slab/cracked{ dir = 8 @@ -7215,11 +7214,6 @@ icon_state = "darkredalt" }, /area/awaymission/caves/build/reqpower_build) -"KS" = ( -/obj/structure/flora/ash/tall_shroom, -/obj/structure/spacevine, -/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, -/area/awaymission/caves) "KT" = ( /obj/effect/rune/narsie{ used = 1 @@ -7570,6 +7564,13 @@ icon_state = "darkredalt" }, /area/awaymission/caves/build/reqpower_build) +"No" = ( +/obj/structure/mineral_door/iron, +/obj/effect/decal/cleanable/dust, +/turf/simulated/floor/engine/cult/lavaland_air{ + planetary_atmos = 1 + }, +/area/awaymission/caves) "Np" = ( /obj/machinery/door/airlock/hatch, /turf/simulated/floor/plasteel/lavaland_air, @@ -7760,9 +7761,13 @@ }, /area/awaymission/caves/build/reqpower_build) "Or" = ( -/obj/structure/flora/ash/rock/style_random, -/obj/structure/spacevine, -/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, +/obj/structure/stone_tile/slab/cracked{ + dir = 2 + }, +/obj/structure/flora/rock, +/turf/simulated/floor/engine/cult/lavaland_air{ + planetary_atmos = 1 + }, /area/awaymission/caves) "Os" = ( /obj/structure/table/wood, @@ -7781,7 +7786,7 @@ /area/awaymission/caves) "Ox" = ( /obj/structure/stone_tile/slab/cracked{ - dir = 2 + dir = 5 }, /obj/structure/flora/rock, /turf/simulated/floor/engine/cult/lavaland_air{ @@ -8281,9 +8286,9 @@ /area/awaymission/caves/build/reqpower_build) "Rw" = ( /obj/structure/fence/door{ - dir = 4 + dir = 4; + open = 1 }, -/obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel/lavaland_air{ icon_state = "dark" }, @@ -9469,15 +9474,6 @@ /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plating/lavaland_air, /area/awaymission/caves/build) -"WQ" = ( -/obj/structure/stone_tile/slab/cracked{ - dir = 5 - }, -/obj/structure/flora/rock, -/turf/simulated/floor/engine/cult/lavaland_air{ - planetary_atmos = 1 - }, -/area/awaymission/caves) "WR" = ( /obj/effect/spawner/random_spawners/wall_rusted_probably, /turf/simulated/wall, @@ -9646,6 +9642,10 @@ icon_state = "dark" }, /area/awaymission/caves) +"XG" = ( +/obj/item/wisp_lantern, +/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, +/area/awaymission/caves) "XH" = ( /obj/effect/turf_decal/miscellaneous/goldensiding/corner, /obj/effect/spawner/random_spawners/dirt_often, @@ -17513,7 +17513,7 @@ LU LU LU LU -Ox +Or LU LU LU @@ -17746,7 +17746,7 @@ LU LU LU iE -WQ +Ox mz LU LU @@ -17978,7 +17978,7 @@ LU LU mz wC -Dp +zK mz LU LU @@ -18209,8 +18209,8 @@ mz mz mz mz -eL -eL +No +No mz mz mz @@ -19553,7 +19553,7 @@ ZJ bO Uh jA -hW +ly hw ew wh @@ -24514,7 +24514,7 @@ TK TK TK ns -KS +sf ns ns TK @@ -24980,7 +24980,7 @@ ZJ Aq ns ns -og +ca TK TK TK @@ -25436,7 +25436,7 @@ TK TK TK ns -KS +sf ns TK TK @@ -25910,7 +25910,7 @@ Aq TK TK ns -Or +eL TK TK BH @@ -26138,7 +26138,7 @@ ns ns ns TK -aj +XG bV va ns From fd92b515343ff9ada29c64eba0aa30a0c3011f1e Mon Sep 17 00:00:00 2001 From: konushi Date: Tue, 7 Nov 2023 14:22:57 +0300 Subject: [PATCH 6/6] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B1=D0=B5=D0=BB=D1=8B?= =?UTF-8?q?=20=D0=B8=20=D1=82=D0=BE=D1=87=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modular_ss220/maps220/code/objects.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modular_ss220/maps220/code/objects.dm b/modular_ss220/maps220/code/objects.dm index 4cc2554f19a3..8eb81b5023fe 100644 --- a/modular_ss220/maps220/code/objects.dm +++ b/modular_ss220/maps220/code/objects.dm @@ -304,14 +304,14 @@ /obj/item/emerald_stone name = "изумрудный камень" - desc = "Маленькая серебряная побрякушка, инкрустированная ярким изумрудом бриллиантовой огранки. На верхушечной площадке камня мелко выгравирован череп ." + desc = "Маленькая серебряная побрякушка, инкрустированная ярким изумрудом бриллиантовой огранки. На верхушечной площадке камня выгравирован череп." icon = 'icons/obj/wizard.dmi' icon_state = "necrostone" item_state = "electronic" origin_tech = "bluespace=4;materials=4" w_class = WEIGHT_CLASS_TINY var/list/skeletons = list() - var/number = 2 // можно менять в игре + var/number = 2 // for ingame VV change /obj/item/emerald_stone/attack(mob/living/carbon/human/undead, mob/living/carbon/human/user) @@ -333,7 +333,7 @@ to_chat(user, span_warning("Это тело никогда не было обременено душой...")) return - check_skeletons() //clean out/refresh the list + check_skeletons() // clean out/refresh the list if(length(skeletons) >= number) to_chat(user, span_warning("Этот артефакт может поддерживать только одного мертвеца!")) @@ -363,7 +363,7 @@ /obj/item/emerald_stone/proc/equip_undead(mob/living/carbon/human/raised) for(var/obj/item/I in raised) raised.unEquip(I) - var/randomUndead = "roman"//defualt + var/randomUndead = "roman" // defualt randomUndead = pick("roman","pirate","clown") switch(randomUndead)