From a381ec6d414db6fb04ac05f9c7a85a723c670944 Mon Sep 17 00:00:00 2001 From: Burbonchik Date: Fri, 29 Nov 2024 21:04:35 +0300 Subject: [PATCH] Fixes and qol MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Фиксы ошибок карты (офовский маппер ещё тот дровокол), добавлена парочка приятных предметов --- mod_celadon/__maps/maps/site53/site53.dmm | 193 +++++++++++++++------- 1 file changed, 136 insertions(+), 57 deletions(-) diff --git a/mod_celadon/__maps/maps/site53/site53.dmm b/mod_celadon/__maps/maps/site53/site53.dmm index c9a913ae41..e98251a1a2 100644 --- a/mod_celadon/__maps/maps/site53/site53.dmm +++ b/mod_celadon/__maps/maps/site53/site53.dmm @@ -4930,6 +4930,9 @@ /obj/item/clothing/head/helmet/scp/hczsecurityguard, /obj/item/clothing/head/helmet/scp/hczsecurityguard, /obj/effect/floor_decal/corner/red/mono, +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = -32 + }, /turf/simulated/floor/tiled/dark/monotile, /area/site53/lhcz/hczguardgear) "baL" = ( @@ -5476,6 +5479,12 @@ "bhd" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/machinery/camera/network/entrance, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/reagent_containers/food/drinks/milk, +/obj/item/reagent_containers/food/drinks/soymilk, +/obj/item/reagent_containers/food/drinks/milk, /turf/simulated/floor/tiled/freezer, /area/site53/lowertrams/restaurantkitchenarea) "bhe" = ( @@ -11872,11 +11881,6 @@ /obj/effect/floor_decal/corner/yellow/diagonal, /turf/simulated/floor/tiled, /area/site53/ulcz/hallways) -"cxh" = ( -/obj/effect/paint_stripe/red, -/obj/structure/reagent_dispensers/peppertank, -/turf/simulated/wall/r_titanium, -/area/site53/llcz/checkequip) "cxl" = ( /obj/effect/floor_decal/corner/b_green/border{ dir = 1 @@ -32605,9 +32609,6 @@ "gHP" = ( /obj/structure/table/rack, /obj/machinery/door/window/brigdoor/westright, -/obj/item/rig_module/device/anomaly_scanner, -/obj/item/rig_module/device/drill, -/obj/item/rig_module/mounted/plasmacutter, /obj/item/rig_module/vision/meson, /turf/simulated/floor/tiled/white/monotile, /area/site53/reswing/lowres/xenoarchaeology) @@ -38000,6 +38001,13 @@ /obj/effect/floor_decal/corner/red/bordercorner, /turf/simulated/floor/tiled/horizontal, /area/site53/lowertrams/hub) +"hLD" = ( +/obj/effect/floor_decal/corner/yellow/bordercorner{ + dir = 4 + }, +/obj/machinery/door/airlock, +/turf/simulated/floor/tiled/monotile, +/area/site53/upper_surface/entrancehallway) "hLF" = ( /obj/effect/floor_decal/corner/orange/border, /obj/machinery/camera/network/lcz{ @@ -39814,6 +39822,15 @@ }, /turf/simulated/floor/tiled/dark/monotile, /area/site53/ulcz/scp914) +"ihm" = ( +/obj/effect/floor_decal/corner/red/border{ + dir = 6 + }, +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled/dark/monotile, +/area/site53/upper_surface/breachshelter) "ihq" = ( /obj/effect/floor_decal/corner/blue/bordercorner{ dir = 8 @@ -40223,6 +40240,9 @@ /obj/item/ammo_magazine/scp/p90_mag/rubber, /obj/item/ammo_magazine/scp/p90_mag/rubber, /obj/item/ammo_magazine/scp/p90_mag/rubber, +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = -32 + }, /turf/simulated/floor/tiled/dark, /area/site53/llcz/checkequip) "imk" = ( @@ -41523,7 +41543,7 @@ /area/site53/llcz/entrance_checkpoint) "iAL" = ( /obj/structure/closet/secure_closet/freezer/meat, -/turf/simulated/floor/tiled/dark/monotile, +/turf/simulated/floor/tiled/white/monotile, /area/site53/ulcz/humanoidcontainment) "iAM" = ( /obj/effect/floor_decal/corner/paleblue/border{ @@ -41943,6 +41963,9 @@ dir = 1 }, /obj/effect/floor_decal/corner/red/border, +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = 27 + }, /turf/simulated/floor/tiled/dark/horizontal, /area/site53/ulcz/hallways) "iGg" = ( @@ -42553,6 +42576,16 @@ }, /turf/simulated/floor/tiled/dark/monotile, /area/site53/lowertrams/restaurantkitchenarea) +"iLN" = ( +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = 0; + pixel_x = 32 + }, +/turf/simulated/floor/tiled/white/monotile, +/area/site53/llcz/checkequip) "iLQ" = ( /obj/effect/floor_decal/corner/green/bordercorner{ dir = 1 @@ -64787,6 +64820,9 @@ dir = 4; pixel_x = -32 }, +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = -32 + }, /turf/simulated/floor/tiled/dark/monotile, /area/site53/ulcz/scp914) "nlC" = ( @@ -65339,8 +65375,7 @@ /area/site53/surface/bunker) "nqI" = ( /obj/structure/closet/secure_closet/personal/empty{ - name = "Representative's Locker"; - req_access = null + name = "Representative's Locker" }, /turf/simulated/floor/wood/walnut, /area/site53/uez/goirepoffice) @@ -66346,6 +66381,9 @@ pixel_y = 4 }, /obj/item/device/toner, +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = -32 + }, /turf/simulated/floor/tiled/dark, /area/site53/entrancezone/securitypost) "nBi" = ( @@ -75821,10 +75859,14 @@ /turf/simulated/floor/tiled/white/horizontal, /area/site53/medical/infirmary) "pER" = ( -/obj/effect/paint_stripe/red, -/obj/structure/reagent_dispensers/peppertank, -/turf/simulated/wall/r_titanium, -/area/site53/lhcz/hczguardgear) +/obj/effect/floor_decal/corner/red/border{ + dir = 10 + }, +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled/dark/monotile, +/area/site53/upper_surface/breachshelter) "pES" = ( /obj/structure/cable/green{ d1 = 2; @@ -76028,6 +76070,13 @@ }, /turf/simulated/floor/tiled/dark/small, /area/site53/uez/commandpanicbunker) +"pGh" = ( +/obj/effect/floor_decal/corner/red/border, +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled/dark/horizontal, +/area/site53/llcz/dclass/checkpointoverlook) "pGj" = ( /obj/effect/floor_decal/corner/paleblue/mono, /obj/machinery/atmospherics/unary/cryo_cell, @@ -82576,6 +82625,9 @@ text = null }, /obj/effect/floor_decal/corner/red/mono, +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = -32 + }, /turf/simulated/floor/tiled/dark/monotile, /area/site53/lhcz/hczguardgear) "qWz" = ( @@ -83499,6 +83551,12 @@ /area/site53/reswing/lowres/researchmaint2) "reJ" = ( /obj/structure/closet/secure_closet/freezer/fridge, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/reagent_containers/food/drinks/milk, +/obj/item/reagent_containers/food/drinks/soymilk, +/obj/item/reagent_containers/food/drinks/milk, /turf/simulated/floor/tiled/freezer, /area/site53/lowertrams/restaurantkitchenarea) "reQ" = ( @@ -84341,6 +84399,10 @@ dir = 4 }, /area/site53/uhcz/scp457containment) +"rlX" = ( +/obj/structure/closet/secure_closet/freezer/fridge, +/turf/simulated/floor/tiled/dark/monotile, +/area/site53/ulcz/humanoidcontainment) "rmd" = ( /obj/effect/floor_decal/corner/yellow{ dir = 10 @@ -89213,7 +89275,7 @@ /area/site53/engineering/atmos) "sle" = ( /obj/machinery/power/smes/buildable/preset/ds90/substation_full{ - RCon_tag = "Self-Destruct Substation" + RCon_tag = "Upper Light Containment Auxiliary Storage Substation" }, /turf/simulated/floor, /area/site53/llcz/checkequip) @@ -89748,6 +89810,10 @@ req_access = list("ACCESS_SECURITY_LEVEL1") }, /obj/structure/table/reinforced, +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = 0; + pixel_x = -32 + }, /turf/simulated/floor/tiled/white/monotile, /area/site53/llcz/entrance_checkpoint) "sqN" = ( @@ -90932,19 +90998,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/site53/uez/commandpanicbunker) -"sDt" = ( -/obj/effect/wallframe_spawn/reinforced/titanium, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/door/blast/shutters{ - dir = 4; - id_tag = "CDCZAssignments"; - name = "CDCZ Assignments Post Window Shutters" - }, -/turf/simulated/floor, -/area/site53/llcz/dclass/assignment) "sDv" = ( /obj/effect/floor_decal/corner/brown/border{ dir = 5 @@ -93759,6 +93812,9 @@ pixel_y = 2; req_access = list("ACCESS_SECURITY_LEVEL2") }, +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = -32 + }, /turf/simulated/floor/tiled/dark/corner, /area/site53/uhcz/securitypost) "tfK" = ( @@ -94273,7 +94329,7 @@ /obj/machinery/door/airlock/multi_tile/glass/security{ icon_state = "closed"; name = "EZ Agent Locker Room"; - req_access = list("ACCESS_SECURITY_LEVEL3","ACCESS_ADMIN_LEVEL2") + req_access = list("ACCESS_SECURITY_LEVEL2","ACCESS_ADMIN_LEVEL2") }, /turf/simulated/floor/tiled/dark/small, /area/site53/uez/equipmentroom) @@ -95522,7 +95578,7 @@ /area/site53/engineering/engine_smes) "tyh" = ( /obj/machinery/power/breakerbox/activated{ - RCon_tag = "Self-Destruct Bypass" + RCon_tag = "Upper Light Containment Auxiliary Storage Breaker" }, /obj/machinery/light/small{ dir = 8 @@ -96758,6 +96814,9 @@ dir = 4; network = list("Entrance Zone Network") }, +/obj/structure/reagent_dispensers/peppertank{ + pixel_x = -32 + }, /turf/simulated/floor/tiled/dark, /area/site53/entrancezone/hallway) "tKZ" = ( @@ -98941,6 +99000,13 @@ }, /turf/simulated/floor/tiled/monotile, /area/site53/engineering/storage) +"uhG" = ( +/obj/machinery/door/airlock/glass/security{ + name = "EZ Lower Hall"; + req_access = list("ACCESS_SECURITY_LEVEL2") + }, +/turf/simulated/open, +/area/site53/surface/surface/upper) "uhK" = ( /obj/machinery/vending/cigarette, /obj/effect/floor_decal/corner/red/mono, @@ -99074,6 +99140,9 @@ /obj/effect/floor_decal/spline/fancy/black{ dir = 1 }, +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = -32 + }, /turf/simulated/floor/tiled/dark, /area/site53/llcz/checkequip) "ujO" = ( @@ -99470,6 +99539,9 @@ /obj/machinery/photocopier{ pixel_y = 4 }, +/obj/structure/reagent_dispensers/peppertank{ + pixel_x = 32 + }, /turf/simulated/floor/tiled/dark, /area/site53/upper_surface/entrancehallway2) "unf" = ( @@ -105707,6 +105779,9 @@ c_tag = "Gate B Security Office"; dir = 1 }, +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = -32 + }, /turf/simulated/floor/tiled/dark, /area/site53/upper_surface/entrancehallway) "vGd" = ( @@ -107058,6 +107133,9 @@ /obj/item/material/knife/combat, /obj/item/material/knife/combat, /obj/effect/floor_decal/corner/red/mono, +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = -32 + }, /turf/simulated/floor/tiled/dark/monotile, /area/site53/lhcz/hczguardgear) "vUg" = ( @@ -111699,6 +111777,9 @@ /obj/effect/floor_decal/spline/fancy/black{ dir = 1 }, +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = -32 + }, /turf/simulated/floor/tiled/dark, /area/site53/llcz/checkequip) "wTs" = ( @@ -116033,13 +116114,11 @@ /turf/simulated/floor/tiled/monotile, /area/site53/logistics/logistics) "xNF" = ( -/obj/structure/closet/secure_closet/freezer/meat, -/obj/item/reagent_containers/food/snacks/meat/chicken, -/obj/item/reagent_containers/food/snacks/meat/chicken, -/obj/item/reagent_containers/food/snacks/meat/chicken, -/obj/item/reagent_containers/food/snacks/meat/chicken, -/turf/simulated/floor/tiled/freezer, -/area/site53/lowertrams/restaurantkitchenarea) +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/site53/ulcz/humanoidcontainment) "xNI" = ( /obj/structure/table/reinforced, /obj/item/storage/pill_bottle/inaprovaline, @@ -120432,7 +120511,7 @@ mpg eby ahM eby -sDt +bcd ewp eby pVK @@ -124805,8 +124884,8 @@ mFO iro iro iro -sNV -sNV +mFO +mFO cvb elm elm @@ -125063,7 +125142,7 @@ wdW eoR rtO uch -sNV +mFO epC elm elm @@ -191345,7 +191424,7 @@ wnv jcu wzt jcu -ugu +pGh cjg cjg cjg @@ -203687,7 +203766,7 @@ mcm dJE xjF imd -cxh +iNN mpg mpg mpg @@ -203944,7 +204023,7 @@ mcm dJE xjF wTq -cxh +iNN mpg mpg mpg @@ -204201,7 +204280,7 @@ pNf wZR cKD ujK -cxh +iNN mpg mpg mpg @@ -204445,7 +204524,7 @@ xyD nKY obj qma -cXk +iLN cXk cXk cXk @@ -215438,7 +215517,7 @@ frd tXp voO fMU -xNF +reJ grF nkh fMU @@ -226293,7 +226372,7 @@ noT noT wvr vUa -pER +rav mpg ydq bQk @@ -226550,7 +226629,7 @@ noT noT wvr baG -pER +rav mpg mpg mpg @@ -226807,7 +226886,7 @@ hqL wmd nYk qWy -pER +rav mpg mpg mpg @@ -229836,7 +229915,7 @@ lVm lVm lVm lVm -lVm +xNF hYO lVm lVm @@ -231631,7 +231710,7 @@ bQS hKH hbe hKH -psP +rlX hYO hYO hYO @@ -277142,7 +277221,7 @@ ugl drV jLo tkA -xCC +ihm adQ uOI uOI @@ -278177,7 +278256,7 @@ mpo mpo mpo pVA -qjV +pER adQ lFu mpo @@ -283530,7 +283609,7 @@ hLH jPJ xvy xvy -crC +hLD auq gPY nBt @@ -353177,7 +353256,7 @@ gDo gDo gDo gDo -gDo +uhG gDo gDo gDo