From 80fa1d58a216d9d5e8f102bbb20dd5efbaedab1e Mon Sep 17 00:00:00 2001 From: Aylong <69762909+AyIong@users.noreply.github.com> Date: Fri, 20 Sep 2024 04:40:45 +0300 Subject: [PATCH] Clean dirt under walls (#1533) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Что этот PR делает Пора наконец убрать нахуй это болото на стенах, которое в редакторе под ними ## Почему это хорошо для игры Меньше уродства ## Изображения изменений MapDiff ## Тестирование? А? ## Changelog :cl: tweak: Мы наняли уборщика, дабы он очистил стены от грязи, правда с плесенью и ржавчиной он не справился. /:cl: --- .../SpaceRuins/mechtransport_new.dmm | 14 +-- .../RandomZLevels/blackmarketpackers.dmm | 51 ++++------- _maps/map_files220/RandomZLevels/wildwest.dmm | 26 ++---- _maps/map_files220/generic/centcomm.dmm | 20 +---- _maps/map_files220/stations/boxstation.dmm | 86 ++++--------------- _maps/map_files220/stations/deltastation.dmm | 34 ++------ _maps/map_files220/stations/metastation.dmm | 18 +--- 7 files changed, 51 insertions(+), 198 deletions(-) diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/mechtransport_new.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/mechtransport_new.dmm index a8f6f7470443..08824a7ac412 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/mechtransport_new.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/mechtransport_new.dmm @@ -156,10 +156,6 @@ /obj/machinery/light_construct/directional/east, /turf/simulated/floor/mineral/titanium, /area/ruin/space/powered) -"cJ" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/wall/indestructible/whiteshuttle/nodiagonal, -/area/ruin/space/powered) "cK" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/scavengers/gun/spacegun, @@ -556,11 +552,8 @@ /area/ruin/space/powered) "ng" = ( /obj/structure/table/wood, +/obj/item/clothing/mask/cigarette/rollie, /obj/item/clothing/mask/cigarette/rollie{ - list_reagents = list("thc" = 40, "cbd" = 20) - }, -/obj/item/clothing/mask/cigarette/rollie{ - list_reagents = list("thc" = 40, "cbd" = 20); pixel_y = 3 }, /obj/item/storage/fancy/rollingpapers{ @@ -568,7 +561,6 @@ pixel_x = 6 }, /obj/item/clothing/mask/cigarette/rollie{ - list_reagents = list("thc" = 40, "cbd" = 20); pixel_y = 3; pixel_x = -4 }, @@ -1032,7 +1024,6 @@ amount = 1 }, /obj/item/shard{ - icon_state = "large"; pixel_y = 9 }, /obj/effect/decal/cleanable/dirt, @@ -1933,7 +1924,6 @@ "Nm" = ( /obj/structure/computerframe, /obj/item/shard{ - icon_state = "large"; pixel_y = 9 }, /obj/effect/decal/cleanable/glass, @@ -3060,7 +3050,7 @@ Kb PT PT PT -cJ +Kb Cm Jr sD diff --git a/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm b/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm index 805cb18ea0fc..c8dfbbc1471a 100644 --- a/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm +++ b/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm @@ -1329,10 +1329,6 @@ /obj/structure/spider/stickyweb, /turf/simulated/floor/plating, /area/awaymission/BMPship/Engines) -"ea" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/wall/indestructible/whiteshuttle/nodiagonal, -/area/awaymission/BMPship/Kitchen) "eb" = ( /obj/machinery/door/window/classic/reversed{ color = "green" @@ -1552,11 +1548,6 @@ icon_state = "cafeteria" }, /area/awaymission/BMPship/CommonArea) -"eK" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/wall/r_wall, -/area/awaymission/BMPship/Containment) "eL" = ( /obj/structure/shuttle/engine/heater{ dir = 4 @@ -1566,10 +1557,6 @@ }, /turf/simulated/floor/plating/airless, /area/awaymission/BMPship/Engines) -"eM" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/wall/r_wall, -/area/awaymission/BMPship/Containment) "eN" = ( /obj/structure/window/reinforced{ color = "yellow"; @@ -5734,13 +5721,6 @@ "HV" = ( /turf/simulated/wall/indestructible/whiteshuttle, /area/awaymission/BMPship/TurretsSouth) -"HW" = ( -/obj/effect/decal/cleanable/blood/drip{ - pixel_y = 10; - pixel_x = -13 - }, -/turf/simulated/wall/indestructible/whiteshuttle, -/area/awaymission/BMPship/MedBay) "HZ" = ( /obj/structure/alien/weeds, /obj/item/shard{ @@ -6828,7 +6808,6 @@ "Vn" = ( /obj/structure/closet/secure_closet{ color = "gold"; - layer = 2.9; req_access = list(111) }, /obj/item/tank/internals/oxygen, @@ -15000,7 +14979,7 @@ LT cU Pu Yh -eM +er zX LC CJ @@ -15387,7 +15366,7 @@ XJ ch Gy Dy -eM +er Ds BI er @@ -15647,7 +15626,7 @@ fE WO Gy Dy -eK +er Dp pV er @@ -15767,7 +15746,7 @@ vr ZB dw Rn -eM +er er er er @@ -15777,7 +15756,7 @@ Ll BL NZ gH -eM +er er er TJ @@ -15907,7 +15886,7 @@ Lu FT Gs LT -eM +er fD lK er @@ -16297,7 +16276,7 @@ MN MN kn nO -eM +er er er er @@ -16427,7 +16406,7 @@ bU LT kn kn -eM +er At MY er @@ -16673,7 +16652,7 @@ aa ve aT Si -HW +ve Xb ZN ve @@ -16817,7 +16796,7 @@ Ll ks kn fx -eM +er er er er @@ -16947,7 +16926,7 @@ Ue ku kn kn -eM +er fD fP er @@ -17197,7 +17176,7 @@ Si Si ji ve -eM +er el xW er @@ -17207,7 +17186,7 @@ Ck Ue ej Qk -eM +er Zg fP er @@ -19408,9 +19387,9 @@ cs TU aN aQ -ea +EL hw -ea +EL tA kK EL diff --git a/_maps/map_files220/RandomZLevels/wildwest.dmm b/_maps/map_files220/RandomZLevels/wildwest.dmm index cd8a9700a2f2..dd8dacd5c122 100644 --- a/_maps/map_files220/RandomZLevels/wildwest.dmm +++ b/_maps/map_files220/RandomZLevels/wildwest.dmm @@ -2350,12 +2350,6 @@ /obj/machinery/light/small/directional/west, /turf/simulated/floor/wood/oak, /area/awaymission/wildwest/wildwest_mines) -"wi" = ( -/obj/effect/decal/cleanable/blood/drip{ - icon_state = "5" - }, -/turf/simulated/wall/mineral/sandstone, -/area/awaymission/wildwest/wildwest_mines) "wk" = ( /obj/item/reagent_containers/drinks/oilcan, /obj/effect/decal/cleanable/blood/oil, @@ -2862,10 +2856,6 @@ icon_state = "cultdamage3" }, /area/awaymission/wildwest/wildwest_vault) -"Bd" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/wall/mineral/sandstone, -/area/awaymission/wildwest/wildwest_mines) "Be" = ( /obj/effect/turf_decal/loading_area{ dir = 8 @@ -4120,10 +4110,6 @@ }, /turf/simulated/floor/mineral/plastitanium/red, /area/awaymission/wildwest/wildwest_refine) -"Oh" = ( -/obj/effect/decal/cleanable/blood/old, -/turf/simulated/wall/mineral/sandstone, -/area/awaymission/wildwest/wildwest_mines) "Oi" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/mob_spawn/human/corpse/miner, @@ -10429,7 +10415,7 @@ xy mW to oy -wi +hk hk hk hk @@ -10566,8 +10552,8 @@ hk ED hk hk -Oh -Oh +hk +hk Os JS wK @@ -13688,7 +13674,7 @@ CG hk Pt JS -Bd +hk xo rN hk @@ -14246,7 +14232,7 @@ JS wK hk hk -Bd +hk hk JS JS @@ -15243,7 +15229,7 @@ Kb kO hk ld -Bd +hk YK hk Ff diff --git a/_maps/map_files220/generic/centcomm.dmm b/_maps/map_files220/generic/centcomm.dmm index b75d908b2aa7..4fda99dc3723 100644 --- a/_maps/map_files220/generic/centcomm.dmm +++ b/_maps/map_files220/generic/centcomm.dmm @@ -4617,10 +4617,6 @@ icon_state = "darkbluealt" }, /area/centcom/ss220/admin1) -"cTi" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/wall/indestructible/riveted, -/area/centcom/ss220/supply) "cTP" = ( /obj/structure/light_fake/small, /turf/simulated/floor/plasteel{ @@ -5284,10 +5280,6 @@ icon_state = "darkblue" }, /area/centcom/ss220/bar) -"dnp" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/wall/indestructible/opsglass, -/area/syndicate_mothership) "dnK" = ( /obj/structure/flora/ausbushes/ywflowers, /turf/simulated/floor/beach/away/water{ @@ -8285,12 +8277,6 @@ }, /turf/simulated/floor/plating/airless, /area/shuttle/syndicate_sit) -"eZe" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/wall/indestructible/syndicate{ - smoothing_flags = 2 - }, -/area/syndicate_mothership) "eZF" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -51106,7 +51092,7 @@ fnU ios nrC fnU -eZe +fnU fnU bnr bnr @@ -52725,7 +52711,7 @@ adJ adJ rzI rzI -cTi +rzI rzI syo rzI @@ -59322,7 +59308,7 @@ fnU fnU fnU pUk -dnp +pUk mUz ovP mzs diff --git a/_maps/map_files220/stations/boxstation.dmm b/_maps/map_files220/stations/boxstation.dmm index 0746ddbdf9c1..c95c3adfbe80 100644 --- a/_maps/map_files220/stations/boxstation.dmm +++ b/_maps/map_files220/stations/boxstation.dmm @@ -9007,10 +9007,6 @@ /obj/effect/landmark/damageturf, /turf/simulated/floor/wood/oak, /area/station/maintenance/fpmaint2) -"aHn" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/wall, -/area/station/maintenance/fpmaint2) "aHq" = ( /obj/effect/spawner/window/reinforced/polarized/grilled{ id = "HoS" @@ -34437,11 +34433,6 @@ /obj/structure/table_frame, /turf/simulated/floor/plating, /area/station/maintenance/aft) -"cHe" = ( -/obj/effect/decal/cleanable/generic, -/obj/effect/spawner/random_spawners/wall_rusted_maybe, -/turf/simulated/wall, -/area/station/maintenance/aft) "cHf" = ( /obj/machinery/space_heater, /turf/simulated/floor/plating, @@ -44480,10 +44471,6 @@ "drP" = ( /turf/simulated/floor/plating, /area/station/aisat/service) -"drQ" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/wall, -/area/station/maintenance/aft) "drR" = ( /obj/machinery/status_display/directional/west, /obj/machinery/porta_turret{ @@ -46836,10 +46823,6 @@ }, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) -"ecZ" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/wall/r_wall, -/area/station/maintenance/asmaint) "edf" = ( /obj/structure/table, /obj/item/clothing/head/welding, @@ -47852,10 +47835,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/solar_maintenance/fore_port) -"eui" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/wall/r_wall, -/area/station/engineering/control) "eup" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable{ @@ -47985,10 +47964,6 @@ icon_state = "dark" }, /area/station/science/robotics/chargebay) -"ewz" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/wall, -/area/station/service/library) "ewS" = ( /obj/structure/chair/comfy/brown{ dir = 4 @@ -50783,10 +50758,6 @@ icon_state = "whiteblue" }, /area/station/medical/surgery/secondary) -"fys" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/wall, -/area/station/maintenance/fsmaint) "fyM" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -53748,10 +53719,6 @@ icon_state = "browncorner" }, /area/station/hallway/primary/central/nw) -"gzz" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/wall, -/area/station/maintenance/asmaint) "gzN" = ( /obj/effect/spawner/random_spawners/wall_rusted_maybe, /turf/simulated/wall, @@ -56695,10 +56662,6 @@ icon_state = "darkyellow" }, /area/station/engineering/control) -"hwC" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/wall, -/area/station/maintenance/asmaint2) "hwE" = ( /obj/effect/turf_decal/siding/wood/cherry{ dir = 10 @@ -67172,10 +67135,6 @@ /obj/machinery/light/small/directional/south, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) -"lrO" = ( -/obj/effect/decal/cleanable/dust, -/turf/simulated/wall, -/area/station/maintenance/fsmaint) "lrQ" = ( /mob/living/simple_animal/pet/dog/fox/Renault, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -73782,11 +73741,6 @@ icon_state = "dark" }, /area/station/turret_protected/ai) -"nFx" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/wall_rusted_maybe, -/turf/simulated/wall, -/area/station/maintenance/fsmaint) "nFG" = ( /turf/simulated/floor/plasteel{ dir = 1; @@ -75169,10 +75123,6 @@ icon_state = "whitehall" }, /area/station/maintenance/aft) -"ogy" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/wall, -/area/station/engineering/atmos) "ogH" = ( /obj/effect/spawner/random_spawners/wall_rusted_maybe, /turf/simulated/wall, @@ -83404,10 +83354,6 @@ icon_state = "grimy" }, /area/station/command/office/hop) -"qSO" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/wall, -/area/station/maintenance/fore) "qTl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -120716,7 +120662,7 @@ aGn aGn aKW neo -aHn +aGn aLn aGn aLu @@ -128768,7 +128714,7 @@ cSU cSU cSU cSU -eui +cSU fsI fbn cSU @@ -135940,7 +135886,7 @@ ttq xLF cnL bkr -drQ +chf chf qJK cmR @@ -135990,7 +135936,7 @@ dop gru oWM dgi -ogy +nVh cQg ctJ cHS @@ -138966,7 +138912,7 @@ aGO aIp aWL aKI -qSO +awl aTa aFH aIc @@ -144869,7 +144815,7 @@ aaa aaa aHN aHN -lrO +aGX aGX aGX bmH @@ -145984,7 +145930,7 @@ chf cED xmj tAb -cHe +cAB cAB cAB cAB @@ -147192,7 +147138,7 @@ aOC sCE lCk ohp -nFx +aOC kPK aPK xRy @@ -147249,7 +147195,7 @@ crM qZN nGG pPw -hwC +cuQ dHU sQt kuL @@ -147449,7 +147395,7 @@ aOC egR aGY egR -fys +aGX xQd ksx fIf @@ -147460,7 +147406,7 @@ uXm hkN eLj tfk -ewz +bau bau btl bih @@ -150109,7 +150055,7 @@ cBR vIW fET vIW -ecZ +oJr kMc uAg csL @@ -151137,7 +151083,7 @@ cBR vIW nIF vIW -ecZ +oJr bUx ayQ csL @@ -153178,7 +153124,7 @@ cLb cLb eKC mhW -gzz +ciY ciY ciY csL @@ -154206,8 +154152,8 @@ cLb cLb ePp jPx -gzz -gzz +ciY +ciY dSu inc mtx diff --git a/_maps/map_files220/stations/deltastation.dmm b/_maps/map_files220/stations/deltastation.dmm index d8be8cff50bc..e5c7a72d544c 100644 --- a/_maps/map_files220/stations/deltastation.dmm +++ b/_maps/map_files220/stations/deltastation.dmm @@ -3805,11 +3805,6 @@ icon_state = "freezerfloor" }, /area/station/maintenance/fore) -"atq" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/wall_rusted_maybe, -/turf/simulated/wall, -/area/station/maintenance/fore) "atr" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/damageturf, @@ -4273,10 +4268,6 @@ /obj/effect/landmark/damageturf, /turf/simulated/floor/wood/oak, /area/station/maintenance/fore) -"auO" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/wall, -/area/station/maintenance/fore2) "auP" = ( /obj/structure/rack, /obj/machinery/light/small/directional/north, @@ -26519,7 +26510,6 @@ /area/space/nearstation) "cbB" = ( /obj/structure/sign/poster/official/random/north, -/obj/effect/decal/cleanable/dirt, /turf/simulated/wall, /area/station/maintenance/port) "cbE" = ( @@ -44214,10 +44204,6 @@ /obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/aft) -"dBo" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/wall, -/area/station/maintenance/starboard) "dBp" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 @@ -66978,10 +66964,6 @@ icon_state = "yellow" }, /area/station/engineering/control) -"joi" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/wall, -/area/station/security/permabrig) "jol" = ( /obj/structure/cable{ d2 = 2; @@ -68810,10 +68792,6 @@ icon_state = "darkredcorners" }, /area/station/security/permabrig) -"jRa" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/wall, -/area/station/maintenance/fsmaint) "jRf" = ( /obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/dirt, @@ -149072,7 +149050,7 @@ apM aqJ arB aoo -atq +aVK aVK azb hGO @@ -157544,7 +157522,7 @@ axm auu cnx auu -auO +axm jvC auu rPv @@ -162199,7 +162177,7 @@ eNt eNt wyT bwA -jRa +eNt rDp rDp rDp @@ -167931,7 +167909,7 @@ gnn kVr ixf ixf -dBo +ixf ixf itT hhF @@ -168184,7 +168162,7 @@ rTt tyI tOf oNd -dBo +ixf ixf ixf oRB @@ -175310,7 +175288,7 @@ eoX eoX rlS wJO -joi +rRb bNH ioR qzZ diff --git a/_maps/map_files220/stations/metastation.dmm b/_maps/map_files220/stations/metastation.dmm index 8cc7672c7a3d..c5bdea3b762f 100644 --- a/_maps/map_files220/stations/metastation.dmm +++ b/_maps/map_files220/stations/metastation.dmm @@ -9880,10 +9880,6 @@ }, /turf/simulated/floor/carpet, /area/station/legal/courtroom) -"aTc" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/wall, -/area/station/maintenance/fsmaint) "aTd" = ( /turf/simulated/floor/carpet, /area/station/legal/courtroom) @@ -32448,10 +32444,6 @@ /obj/effect/landmark/damageturf, /turf/simulated/floor/plating, /area/station/maintenance/port) -"cli" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/wall, -/area/station/supply/qm) "cll" = ( /obj/structure/sign/poster/random{ pixel_y = -32 @@ -87824,10 +87816,6 @@ icon_state = "white" }, /area/station/science/explab) -"xPL" = ( -/obj/effect/decal/snow, -/turf/simulated/wall, -/area/station/maintenance/apmaint) "xPO" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 4; @@ -106174,7 +106162,7 @@ cCk dbA crG bZP -xPL +bZP dtE kMZ bUY @@ -107905,7 +107893,7 @@ atk adY fuy fuy -cli +aVl aLQ aNY dmr @@ -127189,7 +127177,7 @@ rIT aXr ucy fUf -aTc +aLl dCJ aLl aqM