From 676d91b225c0c79639db1f88b7f73291d899902d Mon Sep 17 00:00:00 2001 From: Addust <80979251+Addust@users.noreply.github.com> Date: Thu, 9 Jan 2025 21:40:35 +0000 Subject: [PATCH 01/11] jackary's admin office (#4794) * Update CentCom.dmm * gibbed my fucking avast antivirus you bitch --- _maps/map_files/generic/CentCom.dmm | 559 ++++++++++++++++++++++------ 1 file changed, 448 insertions(+), 111 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 90000d8078fd..8c55d4f637d0 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -347,8 +347,18 @@ /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) "aaW" = ( -/obj/machinery/light/directional/west, -/turf/open/floor/carpet/donk, +/obj/structure/sign{ + name = "wall"; + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood_wall-3"; + desc = "Effectively impervious to conventional methods of destruction."; + pixel_x = -32 + }, +/obj/structure/chair/office{ + dir = 4 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/wood, /area/centcom/central_command_areas/adminroom) "aaX" = ( /obj/effect/turf_decal/trimline/green/line, @@ -13341,8 +13351,14 @@ /turf/open/floor/grass, /area/centcom/central_command_areas/hall) "aKc" = ( -/obj/machinery/computer/camera_advanced/syndie, -/turf/open/floor/carpet/donk, +/obj/structure/sign{ + name = "wall"; + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood_wall-12"; + pixel_y = 32; + layer = 2.8 + }, +/turf/open/floor/wood, /area/centcom/central_command_areas/adminroom) "aKd" = ( /obj/effect/turf_decal/trimline/green/corner{ @@ -20046,6 +20062,13 @@ }, /turf/open/floor/plating, /area/cruiser_dock) +"cIl" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/carpet/red, +/area/centcom/central_command_areas/adminroom) "cKo" = ( /obj/effect/turf_decal/siding/thinplating{ dir = 1 @@ -20149,15 +20172,52 @@ /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/admin) "cQL" = ( -/obj/machinery/computer/communications/syndicate, -/turf/open/floor/carpet/donk, +/obj/structure/sign{ + name = "wall"; + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood_wall-6"; + pixel_y = 32; + layer = 2.8; + pixel_x = -32 + }, +/obj/structure/sign{ + name = "wall"; + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood_wall-12"; + pixel_y = 32; + layer = 2.8 + }, +/obj/structure/table/wood, +/obj/machinery/fax/messageadmins{ + fax_name = "Wolf's Office" + }, +/turf/open/floor/wood, /area/centcom/central_command_areas/adminroom) "cSL" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/machinery/fax{ - name = "Pooba's Fax Machine" +/obj/structure/sign{ + name = "wall"; + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood_wall-12"; + pixel_y = -32; + layer = 2.8 + }, +/obj/structure/sign{ + name = "wall"; + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood_wall-5"; + pixel_y = -32; + layer = 2.8; + pixel_x = -32 }, -/turf/open/floor/carpet/donk, +/obj/structure/sign{ + name = "wall"; + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood_wall-3"; + desc = "Effectively impervious to conventional methods of destruction."; + pixel_x = -32 + }, +/obj/machinery/photocopier/gratis, +/turf/open/floor/wood, /area/centcom/central_command_areas/adminroom) "cTr" = ( /obj/effect/turf_decal/siding/thinplating_new/dark{ @@ -20488,17 +20548,19 @@ /turf/open/floor/lowered/iron/pool/cobble, /area/centcom/central_command_areas/adminroom) "dQc" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/machinery/coffeemaker/impressa, -/obj/item/storage/box/coffeepack/robusta{ - pixel_y = -2; - pixel_x = -6 +/obj/structure/sign{ + name = "wall"; + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood_wall-12"; + pixel_y = 32; + layer = 2.8 }, -/obj/item/reagent_containers/cup/coffeepot/bluespace{ - pixel_y = 9; - pixel_x = 5 +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_x = -2; + pixel_y = 12 }, -/turf/open/floor/carpet/donk, +/turf/open/floor/wood, /area/centcom/central_command_areas/adminroom) "dQy" = ( /obj/machinery/light/directional/west, @@ -20840,9 +20902,21 @@ }, /area/centcom/central_command_areas/adminroom) "eNq" = ( -/obj/machinery/door/airlock/vault, -/obj/effect/mapping_helpers/airlock/access/any/admin/captain, -/turf/open/floor/iron/dark/herringbone, +/obj/structure/sign{ + name = "wall"; + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood_wall-3"; + desc = "Effectively impervious to conventional methods of destruction."; + pixel_x = 32 + }, +/obj/machinery/light/small/directional/east, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/turf/open/floor/carpet/green, /area/centcom/central_command_areas/adminroom) "eNY" = ( /turf/open/floor/lowered/iron/pool/cobble/side{ @@ -20936,8 +21010,29 @@ /turf/open/floor/mineral/titanium/tiled/white, /area/centcom/central_command_areas/kitchen) "fan" = ( -/obj/machinery/light/floor/has_bulb, -/turf/open/floor/iron/dark/herringbone, +/obj/structure/sign{ + name = "wall"; + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood_wall-3"; + desc = "Effectively impervious to conventional methods of destruction."; + pixel_x = 32 + }, +/obj/structure/sign{ + name = "wall"; + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood_wall-9"; + pixel_y = -32; + layer = 2.8; + pixel_x = 32 + }, +/obj/structure/sign{ + name = "wall"; + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood_wall-12"; + pixel_y = -32; + layer = 2.8 + }, +/turf/open/floor/wood, /area/centcom/central_command_areas/adminroom) "faY" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner{ @@ -21507,6 +21602,16 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/centcom/syndicate_mothership/expansion_bioterrorism) +"gwm" = ( +/obj/structure/mineral_door/wood{ + name = "Bedroom" + }, +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/carpet/red, +/area/centcom/central_command_areas/adminroom) "gxv" = ( /obj/effect/turf_decal/siding/wood{ pixel_x = -5 @@ -21927,12 +22032,15 @@ /turf/open/floor/wood/tile, /area/centcom/central_command_areas/adminroom) "hlg" = ( -/obj/machinery/button/door/directional/north{ - name = "Emergency Assistants Fuck Off Button"; - id = "donutstealthisid"; - req_access = "cent_captain" +/obj/structure/sign{ + name = "wall"; + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood_wall-12"; + pixel_y = 32; + layer = 2.8 }, -/turf/open/floor/carpet/orange, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood, /area/centcom/central_command_areas/adminroom) "hln" = ( /obj/effect/turf_decal/siding/blue{ @@ -21965,8 +22073,38 @@ /turf/open/water/arena, /area/centcom/central_command_areas/admin) "hol" = ( -/obj/item/kirbyplants/synthetic, -/turf/open/floor/carpet/orange, +/obj/structure/sign{ + name = "wall"; + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood_wall-12"; + pixel_y = -32; + layer = 2.8 + }, +/obj/structure/sign{ + name = "wall"; + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood_wall-3"; + desc = "Effectively impervious to conventional methods of destruction."; + pixel_x = 32 + }, +/obj/structure/sign{ + name = "wall"; + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood_wall-9"; + pixel_y = -32; + layer = 2.8; + pixel_x = 32 + }, +/mob/living/basic/bee{ + faction = list("hostile","hive","neutral"); + name = "The Poobee"; + desc = "Somehow, you feel this bee is the only thing keeping the world intertwined." + }, +/obj/structure/bed/dogbed{ + name = "The Poobee's bed"; + desc = "I'm just saying, it looks a little bit oversized for what lives in it." + }, +/turf/open/floor/wood, /area/centcom/central_command_areas/adminroom) "hor" = ( /mob/living/basic/ggg/glerm{ @@ -22100,15 +22238,19 @@ /turf/open/floor/iron/dark/textured_large, /area/cruiser_dock) "hAP" = ( -/obj/machinery/light/directional/west, -/obj/structure/closet/secure_closet/freezer/fridge/all_access, -/obj/item/food/burger/cheese, -/obj/item/food/cheese/firm_cheese, -/obj/item/food/ready_donk/mac_n_cheese, -/obj/item/reagent_containers/cup/glass/drinkingglass/filled/sunset_sarsaparilla, -/obj/item/reagent_containers/cup/glass/drinkingglass/filled/sunset_sarsaparilla, -/obj/item/reagent_containers/cup/glass/drinkingglass/filled/sunset_sarsaparilla, -/turf/open/floor/carpet/orange, +/obj/structure/sign{ + name = "wall"; + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood_wall-3"; + desc = "Effectively impervious to conventional methods of destruction."; + pixel_x = -32 + }, +/obj/machinery/light/small/directional/west, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/carpet/red, /area/centcom/central_command_areas/adminroom) "hAS" = ( /obj/machinery/door/poddoor/shutters/indestructible/preopen{ @@ -22406,10 +22548,32 @@ /turf/open/floor/wood/tile, /area/centcom/central_command_areas/adminroom) "iew" = ( +/obj/structure/sign{ + name = "wall"; + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood_wall-12"; + pixel_y = 32; + layer = 2.8 + }, +/obj/structure/sign{ + name = "wall"; + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood_wall-10"; + pixel_y = 32; + layer = 2.8; + pixel_x = 32 + }, +/obj/structure/sign{ + name = "wall"; + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood_wall-3"; + desc = "Effectively impervious to conventional methods of destruction."; + pixel_x = 32 + }, /obj/structure/bed/double, -/obj/item/bedsheet/syndie/double, -/obj/item/toy/plush/pooba_bee_plush, -/turf/open/floor/carpet/orange, +/obj/item/bedsheet/centcom/double, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood, /area/centcom/central_command_areas/adminroom) "ifF" = ( /obj/effect/landmark/start/assaultop, @@ -22844,8 +23008,13 @@ /turf/open/misc/grass, /area/centcom) "jth" = ( -/obj/machinery/light/directional/east, -/turf/open/floor/carpet/donk, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/carpet/green, /area/centcom/central_command_areas/adminroom) "jui" = ( /obj/structure/window/reinforced/survival_pod/spawner/directional/west, @@ -22913,7 +23082,26 @@ /turf/open/floor/iron/white/textured, /area/centcom/central_command_areas/admin) "jAA" = ( -/turf/open/floor/carpet/donk, +/obj/structure/sign{ + name = "wall"; + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood_wall-12"; + pixel_y = -32; + layer = 2.8 + }, +/obj/structure/closet/crate/bin, +/obj/item/paper/crumpled{ + desc = "Some sort of notification of contract completion."; + default_raw_text = "TO THE ACCOUNT OF 'WOLF': You are billed the sum of 10,000 MK$ for the services of Johnson and Co in installing an office in Central Command. Itemised tally: Design: MK$ 1000, Installation: MK$ 2000, Getting Past Security: MK$ 7000. Sincerely, Addust Johnson - Johnson and Co Architecture"; + pixel_x = 3; + pixel_y = -2 + }, +/obj/item/paper/crumpled{ + default_raw_text = "TO THE ACCOUNT OF CENTRAL COMMAND: A bill of MK$ 1000 is expected to be paid to the account of JOHNSON AND CO ARCHITECTURE LTD for the re-plating of one office door."; + pixel_x = -5; + pixel_y = 0 + }, +/turf/open/floor/wood, /area/centcom/central_command_areas/adminroom) "jCt" = ( /obj/effect/rune/apocalypse, @@ -23144,18 +23332,31 @@ /turf/open/misc/dirt/jungle/dark/arena, /area/centcom/central_command_areas/admin) "kch" = ( -/obj/structure/closet/cabinet{ - name = "Pooba's Storage Cabinet of Intrigue" +/obj/structure/sign{ + name = "wall"; + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood_wall-3"; + desc = "Effectively impervious to conventional methods of destruction."; + pixel_x = 32 }, -/obj/item/toy/balloon/syndicate, -/obj/item/storage/fancy/cigarettes/cigpack_syndicate, -/obj/item/lighter/skull, -/obj/item/storage/box/donkpockets/donkpocketteriyaki, -/obj/item/clothing/under/costume/syndie_pajamas, -/obj/item/storage/backpack/duffelbag/syndie, -/obj/item/clothing/mask/breath/poob_mask, -/obj/item/mod/control/pre_equipped/elite/flamethrower, -/turf/open/floor/carpet/orange, +/obj/machinery/light/small/directional/east, +/obj/item/ammo_casing/caseless/rocket/heap, +/obj/structure/closet/cabinet, +/obj/item/ammo_casing/caseless/rocket, +/obj/item/ammo_casing/caseless/rocket, +/obj/item/gun/ballistic/rocketlauncher/nobackblast{ + pin = /obj/item/firing_pin + }, +/obj/item/ammo_casing/caseless/rocket, +/obj/item/ammo_casing/caseless/rocket, +/obj/item/ammo_casing/caseless/rocket/heap, +/obj/item/ammo_casing/caseless/rocket/weak, +/obj/item/ammo_casing/caseless/rocket/weak, +/obj/item/clothing/under/rank/centcom/official, +/obj/item/clothing/glasses/sunglasses, +/obj/item/radio/headset/headset_cent/alt, +/obj/item/clothing/shoes/jackboots, +/turf/open/floor/wood, /area/centcom/central_command_areas/adminroom) "kcm" = ( /obj/effect/turf_decal/tile/dark/opposingcorners, @@ -23422,7 +23623,10 @@ /turf/open/water/arena, /area/centcom/central_command_areas/admin) "kSK" = ( -/obj/structure/mineral_door/wood, +/obj/structure/mineral_door/wood{ + name = "TheProfit's Shithole"; + desc = "This thing stinks." + }, /turf/open/floor/plating/rust, /area/centcom/central_command_areas/adminroom) "kSU" = ( @@ -23503,6 +23707,13 @@ }, /turf/open/floor/iron/dark/small, /area/centcom/central_command_areas/prison) +"ldv" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/carpet/red, +/area/centcom/central_command_areas/adminroom) "ldR" = ( /obj/structure/flora/bush/fullgrass/style_random, /mob/living/basic/cow, @@ -24018,6 +24229,32 @@ }, /turf/open/floor/plastic, /area/centcom/central_command_areas/admin) +"mTh" = ( +/obj/structure/sign{ + name = "wall"; + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood_wall-3"; + desc = "Effectively impervious to conventional methods of destruction."; + pixel_x = -32 + }, +/obj/structure/sign{ + name = "wall"; + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood_wall-5"; + pixel_y = -32; + layer = 2.8; + pixel_x = -32 + }, +/obj/structure/sign{ + name = "wall"; + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood_wall-12"; + pixel_y = -32; + layer = 2.8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/wood, +/area/centcom/central_command_areas/adminroom) "mUj" = ( /obj/structure/flora/bush/stalky, /turf/open/floor/sandy_dirt, @@ -24052,7 +24289,11 @@ /turf/open/misc/sandy_dirt, /area/centcom/central_command_areas/admin) "nbv" = ( -/turf/open/floor/iron/dark/herringbone, +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/turf/open/floor/carpet/green, /area/centcom/central_command_areas/adminroom) "ncQ" = ( /obj/effect/turf_decal/siding/thinplating_new/dark/corner, @@ -24421,10 +24662,16 @@ /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/evacuation) "odD" = ( -/obj/structure/chair/office/tactical{ - dir = 1 +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_x = -4; + pixel_y = 7 }, -/turf/open/floor/carpet/donk, +/obj/item/pen/fourcolor{ + pixel_x = -4; + pixel_y = 9 + }, +/turf/open/floor/wood, /area/centcom/central_command_areas/adminroom) "ofy" = ( /obj/effect/turf_decal/box/corners{ @@ -24645,12 +24892,11 @@ /turf/open/floor/mineral/titanium/tiled/yellow, /area/centcom/syndicate_mothership/expansion_bioterrorism) "oMX" = ( -/obj/machinery/door/poddoor/shutters/indestructible/preopen{ - id = "donutstealthisid"; - dir = 1 +/obj/effect/turf_decal/siding/wood{ + dir = 10 }, -/turf/open/floor/iron/dark/smooth_large, -/area/centcom/central_command_areas/admin) +/turf/open/floor/carpet/green, +/area/centcom/central_command_areas/adminroom) "oNH" = ( /obj/machinery/light/neon_lining{ dir = 1; @@ -24713,9 +24959,12 @@ /turf/open/floor/wood/large, /area/centcom/central_command_areas/adminroom) "oYA" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/machinery/microwave, -/turf/open/floor/carpet/orange, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/carpet/red, /area/centcom/central_command_areas/adminroom) "oYE" = ( /obj/effect/turf_decal/tile/hot_pink/full, @@ -25307,10 +25556,31 @@ /area/centcom/central_command_areas/adminroom) "qzu" = ( /obj/machinery/door/airlock/vault{ - name = "Pooba's Office" + name = "Wolf's Office" }, /obj/effect/mapping_helpers/airlock/access/any/admin/captain, -/turf/open/floor/iron/dark/herringbone, +/obj/machinery/door/poddoor/shutters/indestructible/preopen{ + id = "donutstealthisid"; + dir = 1 + }, +/obj/effect/turf_decal/siding/wood/end{ + dir = 1 + }, +/turf/open/floor/carpet/green, +/area/centcom/central_command_areas/adminroom) +"qAI" = ( +/obj/structure/sign{ + name = "wall"; + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood_wall-12"; + pixel_y = -32; + layer = 2.8 + }, +/obj/machinery/bomb_actualizer{ + desc = "An advanced machine capable of releasing the normally bluespace-inhibited destructive potential of a bomb assembly... or so the sticker says. You can see burn marks and ash around its exhaust ports." + }, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/wood, /area/centcom/central_command_areas/adminroom) "qBw" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -25880,10 +26150,33 @@ /turf/open/floor/iron/white/textured, /area/centcom/central_command_areas/admin) "rYm" = ( -/obj/machinery/telecomms/relay/preset/ruskie{ - use_power = 0 +/obj/structure/sign{ + name = "wall"; + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood_wall-6"; + pixel_y = 32; + layer = 2.8; + pixel_x = -32 }, -/turf/open/floor/carpet/orange, +/obj/structure/sign{ + name = "wall"; + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood_wall-3"; + desc = "Effectively impervious to conventional methods of destruction."; + pixel_x = -32 + }, +/obj/structure/sign{ + name = "wall"; + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood_wall-12"; + pixel_y = 32; + layer = 2.8 + }, +/obj/machinery/computer/security/wooden_tv{ + name = "old television"; + desc = "An old television jury-rigged into Nanotrasen's security network. The dial seems to be set to 'STATION 13'." + }, +/turf/open/floor/wood, /area/centcom/central_command_areas/adminroom) "rYI" = ( /obj/machinery/button/door/directional/north{ @@ -26020,12 +26313,19 @@ /turf/open/floor/wood/parquet, /area/centcom/central_command_areas/admin) "sxY" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/item/paper/monitorkey, -/obj/item/card/id/advanced/chameleon, -/obj/item/clothing/mask/chameleon, -/obj/item/radio/headset/syndicate/alt/leader, -/turf/open/floor/carpet/donk, +/obj/structure/sign{ + name = "wall"; + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood_wall-12"; + pixel_y = 32; + layer = 2.8 + }, +/obj/machinery/button/door/directional/north{ + name = "Emergency Assistants Fuck Off Button"; + id = "donutstealthisid"; + req_access = "cent_captain" + }, +/turf/open/floor/wood, /area/centcom/central_command_areas/adminroom) "syU" = ( /obj/effect/turf_decal/sand/plating, @@ -26227,9 +26527,19 @@ /turf/open/floor/wood/parquet, /area/centcom/central_command_areas/admin) "tiz" = ( -/obj/structure/table/reinforced/plastitaniumglass, -/obj/machinery/light/directional/east, -/turf/open/floor/carpet/orange, +/obj/structure/sign{ + name = "wall"; + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood_wall-3"; + desc = "Effectively impervious to conventional methods of destruction."; + pixel_x = 32 + }, +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_x = -2; + pixel_y = 12 + }, +/turf/open/floor/wood, /area/centcom/central_command_areas/adminroom) "tlQ" = ( /obj/structure/flora/bush/fullgrass/style_random, @@ -26601,11 +26911,8 @@ /turf/open/misc/grass, /area/centcom) "tYn" = ( -/obj/effect/mapping_helpers/airlock/access/any/admin/captain, -/obj/machinery/door/airlock/hatch{ - name = "Pooba's Observatory" - }, -/turf/open/floor/iron/dark/herringbone, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/carpet/green, /area/centcom/central_command_areas/adminroom) "tYo" = ( /obj/structure/table/wood/fancy/black, @@ -27972,10 +28279,7 @@ /turf/open/floor/mineral/titanium/tiled/yellow, /area/centcom/syndicate_mothership/expansion_bioterrorism) "xkv" = ( -/obj/machinery/computer/message_monitor{ - dir = 1 - }, -/turf/open/floor/carpet/donk, +/turf/open/floor/wood, /area/centcom/central_command_areas/adminroom) "xno" = ( /obj/structure/window/reinforced/tinted/frosted, @@ -28111,6 +28415,16 @@ /obj/effect/decal/cleanable/piss_stain, /turf/open/misc/sandy_dirt, /area/centcom/central_command_areas/admin) +"xHG" = ( +/obj/structure/sign{ + name = "wall"; + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood_wall-12"; + pixel_y = -32; + layer = 2.8 + }, +/turf/open/floor/wood, +/area/centcom/central_command_areas/adminroom) "xJC" = ( /obj/structure/closet/cardboard, /mob/living/basic/bot/medbot/nukie/assop{ @@ -28125,6 +28439,12 @@ /obj/machinery/grill, /turf/open/misc/sandy_dirt, /area/centcom/central_command_areas/adminroom) +"xKs" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/carpet/green, +/area/centcom/central_command_areas/adminroom) "xMe" = ( /obj/machinery/light/neon_lining{ dir = 1; @@ -28231,11 +28551,28 @@ /turf/open/floor/iron/dark/small, /area/centcom/central_command_areas/admin) "xUt" = ( -/obj/machinery/light/floor/has_bulb, -/obj/machinery/door/poddoor/shutters/indestructible/preopen{ - id = "donutstealthisid" +/obj/structure/sign{ + name = "wall"; + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood_wall-3"; + desc = "Effectively impervious to conventional methods of destruction."; + pixel_x = 32 }, -/turf/open/floor/iron/dark/herringbone, +/obj/structure/sign{ + name = "wall"; + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood_wall-6"; + pixel_y = 32; + layer = 2.8; + pixel_x = 32 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/carpet/green, /area/centcom/central_command_areas/adminroom) "xVl" = ( /obj/effect/turf_decal/siding/purple{ @@ -55437,7 +55774,7 @@ aDM kpH dQc odD -sxY +xkv jAA kpH aaa @@ -55694,8 +56031,8 @@ iOc kpH aKc jth -jAA -jAA +oMX +qAI kpH aaa aiF @@ -55947,12 +56284,12 @@ yhF yhF mUv yhF -oMX -kpH -kpH +yhF kpH +sxY +xKs tYn -kpH +xHG kpH aaa aiF @@ -56204,7 +56541,7 @@ yhF yhF mUv yhF -oMX +yhF qzu xUt eNq @@ -56461,12 +56798,12 @@ yhF yhF mUv yhF -oMX +yhF kpH kpH kpH +gwm kpH -tYn kpH aaa aiF @@ -56723,7 +57060,7 @@ kpH rYm hAP oYA -ayR +mTh kpH aaa aiF @@ -56978,9 +57315,9 @@ yhF dtE kpH hlg -ayR -ayR -ayR +cIl +ldv +xHG kpH aaa aiF From eb67e287abe52c60cde27d7d7ce9839c062b95eb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 9 Jan 2025 21:40:55 +0000 Subject: [PATCH 02/11] Automatic changelog for PR #4794 [ci skip] --- html/changelogs/AutoChangeLog-pr-4794.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4794.yml diff --git a/html/changelogs/AutoChangeLog-pr-4794.yml b/html/changelogs/AutoChangeLog-pr-4794.yml new file mode 100644 index 000000000000..e38e31a52b93 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4794.yml @@ -0,0 +1,4 @@ +author: "Addust" +delete-after: True +changes: + - rscadd: "Johnson and Co Architecture's elite reconstruction team has broken into CentCom and replaced Pooba's office with Wolf's office, per Wolf's request." \ No newline at end of file From f134d6b0d56d346cec66d2a68fc605decfc0bb9d Mon Sep 17 00:00:00 2001 From: Lucy Date: Thu, 9 Jan 2025 17:18:51 -0500 Subject: [PATCH 03/11] Adds a .NET 9 SDK setup action to linters (#88988) (#4802) OpenDream was recently bumped to .NET 9, which is not on our runner image. I added an action which installs the required .NET version for DMCompiler to function. Adding this action is not only good as a quick hack fix, but also for posterity. I also considered the impact this has on our runner execution time, but my hope is that it should not matter if we have .NET installed already. Co-authored-by: Ivory --- .github/workflows/ci_suite.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml index c71cd3890928..f3119852d4dd 100644 --- a/.github/workflows/ci_suite.yml +++ b/.github/workflows/ci_suite.yml @@ -70,6 +70,10 @@ jobs: key: ${{ runner.os }}-rust-${{ hashFiles('tools/ci/ci_dependencies.sh')}} restore-keys: | ${{ runner.os }}-rust- + - name: Setup .NET SDK + uses: actions/setup-dotnet@v4.2.0 + with: + dotnet-version: 9.x - name: Install OpenDream uses: robinraju/release-downloader@v1.9 with: From 833a7e1a5306969d86aa896761b8222101982849 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Fri, 10 Jan 2025 01:42:58 +0000 Subject: [PATCH 04/11] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-4794.yml | 4 ---- html/changelogs/archive/2025-01.yml | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-4794.yml diff --git a/html/changelogs/AutoChangeLog-pr-4794.yml b/html/changelogs/AutoChangeLog-pr-4794.yml deleted file mode 100644 index e38e31a52b93..000000000000 --- a/html/changelogs/AutoChangeLog-pr-4794.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Addust" -delete-after: True -changes: - - rscadd: "Johnson and Co Architecture's elite reconstruction team has broken into CentCom and replaced Pooba's office with Wolf's office, per Wolf's request." \ No newline at end of file diff --git a/html/changelogs/archive/2025-01.yml b/html/changelogs/archive/2025-01.yml index 689c78f5d66a..c72c195c09c4 100644 --- a/html/changelogs/archive/2025-01.yml +++ b/html/changelogs/archive/2025-01.yml @@ -176,3 +176,7 @@ 2025-01-09: Siro: - code_imp: Walter dogs now speak again and their chance to speak increased 1->5 +2025-01-10: + Addust: + - rscadd: Johnson and Co Architecture's elite reconstruction team has broken into + CentCom and replaced Pooba's office with Wolf's office, per Wolf's request. From 0cf3b15f21b3a66c9407bf971d2d46b9d908ccab Mon Sep 17 00:00:00 2001 From: NightKnight <88754494+SirNightKnight@users.noreply.github.com> Date: Fri, 10 Jan 2025 15:38:06 -0500 Subject: [PATCH 05/11] Shotgun Ammo Box Nerf (#4774) * tis done * 8 to 16 --------- Co-authored-by: SirNightKnight <=> --- .../code/modules/blueshift/items/ammo.dm | 101 +++++++++++------- 1 file changed, 63 insertions(+), 38 deletions(-) diff --git a/monkestation/code/modules/blueshift/items/ammo.dm b/monkestation/code/modules/blueshift/items/ammo.dm index 716e5c9e2dfa..630d7d2bfa46 100644 --- a/monkestation/code/modules/blueshift/items/ammo.dm +++ b/monkestation/code/modules/blueshift/items/ammo.dm @@ -1011,98 +1011,123 @@ ammo_type = /obj/item/ammo_casing/c46x30mm/rubber /obj/item/ammo_box/advanced/s12gauge - name = "Slug ammo box" - desc = "A box of 15 slug shells. Large, singular shots that pack a punch." + name = "slug ammo box" + desc = "A box of slug shells. Large, singular shots that pack a punch." icon = 'monkestation/code/modules/blueshift/icons/shotbox.dmi' icon_state = "slug" ammo_type = /obj/item/ammo_casing/shotgun - max_ammo = 15 + max_ammo = 16 multitype = FALSE // if you enable this and set the box's caliber var to CALIBER_SHOTGUN (at time of writing, "shotgun"), then you can have the fabled any-ammo shellbox + var/old_ammo_count + //var for how long it takes to reload from this ammo box + var/reload_delay = 1 SECONDS + +/obj/item/ammo_box/advanced/s12gauge/pre_attack(atom/target, mob/living/user) + if(DOING_INTERACTION(user, "doafter_reloading")) + return COMPONENT_CANCEL_ATTACK_CHAIN + if(length(stored_ammo) == 0) + return COMPONENT_CANCEL_ATTACK_CHAIN + if(istype(target, /obj/item/gun/ballistic)) + var/obj/item/gun/ballistic/gun = target + if(length(gun.magazine.stored_ammo) >= gun.magazine.max_ammo) + return COMPONENT_CANCEL_ATTACK_CHAIN + to_chat(user, span_notice("You start unloading a shell from the [src]...")) + old_ammo_count = length(stored_ammo) + if(do_after(user, reload_delay, src, timed_action_flags = IGNORE_USER_LOC_CHANGE, interaction_key = "doafter_reloading")) + return FALSE + +/obj/item/ammo_box/advanced/s12gauge/afterattack(atom/target, mob/user, proximity_flag, click_parameters) //why did i do this, i guess it's funny? + . = ..() + if(istype(target, /obj/item/gun/ballistic)) + if(old_ammo_count == length(stored_ammo)) + to_chat(user, span_notice("You pause for a moment, something isn't right...")) + /obj/item/ammo_box/advanced/s12gauge/buckshot - name = "Buckshot ammo box" - desc = "A box of 15 buckshot shells. These have a modest spread of weaker projectiles." + name = "buckshot ammo box" + desc = "A box of buckshot shells. These have a modest spread of weaker projectiles." icon_state = "buckshot" ammo_type = /obj/item/ammo_casing/shotgun/buckshot - max_ammo = 15 + max_ammo = 16 /obj/item/ammo_box/advanced/s12gauge/rubber - name = "Rubbershot ammo box" - desc = "A box of 15 rubbershot shells. These have a modest spread of weaker, less-lethal projectiles." + name = "rubbershot ammo box" + desc = "A box of rubbershot shells. These have a modest spread of weaker, less-lethal projectiles." icon_state = "rubber" ammo_type = /obj/item/ammo_casing/shotgun/rubbershot - max_ammo = 15 + max_ammo = 16 /obj/item/ammo_box/advanced/s12gauge/bean - name = "Beanbag Slug ammo box" - desc = "A box of 15 beanbag slug shells. These are large, singular beanbags that pack a less-lethal punch." + name = "beanbag Slug ammo box" + desc = "A box of beanbag slug shells. These are large, singular beanbags that pack a less-lethal punch." icon_state = "bean" ammo_type = /obj/item/ammo_casing/shotgun/beanbag - max_ammo = 15 + max_ammo = 16 /obj/item/ammo_box/advanced/s12gauge/magnum - name = "Magnum blockshot ammo box" - desc = "A box of 15 magnum blockshot shells. The size of the pellet is larger in diameter than the typical shot, but there are less of them inside each shell." + name = "magnum blockshot ammo box" + desc = "A box of magnum blockshot shells. The size of the pellet is larger in diameter than the typical shot, but there are less of them inside each shell." icon_state = "magnum" ammo_type = /obj/item/ammo_casing/shotgun/magnum - max_ammo = 15 + max_ammo = 16 /obj/item/ammo_box/advanced/s12gauge/express - name = "Express pelletshot ammo box" - desc = "A box of 15 express pelletshot shells. The size of the pellet is smaller in diameter than the typical shot, but there are more of them inside each shell." + name = "express pelletshot ammo box" + desc = "A box of express pelletshot shells. The size of the pellet is smaller in diameter than the typical shot, but there are more of them inside each shell." icon_state = "express" ammo_type = /obj/item/ammo_casing/shotgun/express - max_ammo = 15 + max_ammo = 16 /obj/item/ammo_box/advanced/s12gauge/hunter - name = "Hunter slug ammo box" - desc = "A box of 15 hunter slug shells. These shotgun slugs excel at damaging the local fauna." + name = "hunter slug ammo box" + desc = "A box of hunter slug shells. These shotgun slugs excel at damaging the local fauna." icon_state = "hunter" ammo_type = /obj/item/ammo_casing/shotgun/hunter - max_ammo = 15 + max_ammo = 16 /obj/item/ammo_box/advanced/s12gauge/apds name = "AP sabot-slug ammo box" - desc = "A box of 15 tungsten sabot-slugs. A vastly higher velocity combined with greater sectional density renders most armor irrelevant." + desc = "A box of tungsten sabot-slugs. A vastly higher velocity combined with greater sectional density renders most armor irrelevant." icon_state = "apshell" ammo_type = /obj/item/ammo_casing/shotgun/apds - max_ammo = 15 + max_ammo = 16 /obj/item/ammo_box/advanced/s12gauge/flechette - name = "Flechette ammo box" - desc = "A box of 15 flechette shells. Each shell contains a small group of tumbling blades that excel at causing terrible wounds." + name = "flechette ammo box" + desc = "A box of flechette shells. Each shell contains a small group of tumbling blades that excel at causing terrible wounds." icon_state = "flechette" ammo_type = /obj/item/ammo_casing/shotgun/flechette - max_ammo = 15 + max_ammo = 16 /obj/item/ammo_box/advanced/s12gauge/beehive - name = "Hornet's nest ammo box" - desc = "A box of 15 hornet's nest shells. These are less-lethal shells that will bounce off walls and direct themselves toward nearby targets." + name = "hornet's nest ammo box" + desc = "A box of hornet's nest shells. These are less-lethal shells that will bounce off walls and direct themselves toward nearby targets." icon_state = "beehive" ammo_type = /obj/item/ammo_casing/shotgun/beehive - max_ammo = 15 + max_ammo = 16 /obj/item/ammo_box/advanced/s12gauge/antitide - name = "Stardust ammo box" - desc = "A box of 15 express pelletshot shells. These are less-lethal and will embed in targets, causing pain on movement." + name = "stardust ammo box" + desc = "A box of express pelletshot shells. These are less-lethal and will embed in targets, causing pain on movement." icon_state = "antitide" ammo_type = /obj/item/ammo_casing/shotgun/antitide - max_ammo = 15 + max_ammo = 16 /obj/item/ammo_box/advanced/s12gauge/incendiary - name = "Incendiary Slug ammo box" - desc = "A box of 15 incendiary slug shells. These will ignite targets and leave a trail of fire behind them." + name = "incendiary Slug ammo box" + desc = "A box of incendiary slug shells. These will ignite targets and leave a trail of fire behind them." icon_state = "incendiary" ammo_type = /obj/item/ammo_casing/shotgun/incendiary - max_ammo = 15 + max_ammo = 16 /obj/item/ammo_box/advanced/s12gauge/honkshot - name = "Confetti Honkshot ammo box" - desc = "A box of 35 shotgun shells." + name = "confetti Honkshot ammo box" + desc = "A box of 35 Honkshot TM shells." icon_state = "honk" ammo_type = /obj/item/ammo_casing/shotgun/honkshot - max_ammo = 35 + max_ammo = 40 + reload_delay = 0.1 SECONDS #define AMMO_MATS_SHOTGUN list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 4) // not quite as thick as a half-sheet From df258b3058bf618e31120e8055784bd04b796d2c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 10 Jan 2025 20:38:25 +0000 Subject: [PATCH 06/11] Automatic changelog for PR #4774 [ci skip] --- html/changelogs/AutoChangeLog-pr-4774.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4774.yml diff --git a/html/changelogs/AutoChangeLog-pr-4774.yml b/html/changelogs/AutoChangeLog-pr-4774.yml new file mode 100644 index 000000000000..580a3b7c4c4c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4774.yml @@ -0,0 +1,5 @@ +author: "SirNightKnight" +delete-after: True +changes: + - balance: "Reloading from shotgun ammo boxes has a 1 second do after. Except for honkshot ammo boxes." + - balance: "Shotgun ammo boxes have 16 shells instead of 15, except honkshot ammo boxes. Honkshot ammo boxes have 40 shells, used to be 35." \ No newline at end of file From 3e38d3450cf795d513443a52e7e2326ecc2ab1ab Mon Sep 17 00:00:00 2001 From: Momo <136583113+MomoBerri@users.noreply.github.com> Date: Fri, 10 Jan 2025 15:39:31 -0500 Subject: [PATCH 07/11] recycler needs more directions (#4804) --- _maps/map_files/Theseus/Theseus.dmm | 3870 ++++++++++++++------------- 1 file changed, 2035 insertions(+), 1835 deletions(-) diff --git a/_maps/map_files/Theseus/Theseus.dmm b/_maps/map_files/Theseus/Theseus.dmm index ea02840cf0c9..d1dc7b3f0816 100644 --- a/_maps/map_files/Theseus/Theseus.dmm +++ b/_maps/map_files/Theseus/Theseus.dmm @@ -122,6 +122,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/maintenance/port/fore) +"abx" = ( +/obj/machinery/power/tracker, +/obj/structure/cable, +/turf/open/floor/plating/airless, +/area/station/solars/port/aft) "abA" = ( /obj/structure/bookcase/random/fiction, /turf/open/floor/wood, @@ -609,6 +614,22 @@ /obj/machinery/light/directional/east, /turf/open/floor/grass, /area/station/service/hydroponics) +"ajm" = ( +/obj/structure/rack{ + pixel_x = -5; + pixel_y = 0 + }, +/obj/item/weldingtool/electric/raynewelder{ + pixel_y = 6; + pixel_x = -2 + }, +/obj/item/weldingtool/electric/raynewelder{ + pixel_y = -5; + pixel_x = -2 + }, +/obj/structure/window/reinforced/spawner/directional/east, +/turf/open/floor/plating/airless, +/area/station/engineering/shipbreaker_hut) "ajt" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -1628,8 +1649,10 @@ /turf/open/floor/plating, /area/station/maintenance/department/medical) "aAP" = ( -/obj/effect/spawner/random/structure/grille, -/turf/open/floor/plating, +/obj/structure/chair{ + dir = 1 + }, +/turf/open/floor/iron, /area/station/maintenance/solars/port/aft) "aAS" = ( /obj/machinery/door/airlock/maintenance{ @@ -2088,6 +2111,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/command/bridge) +"aIs" = ( +/obj/machinery/light/directional/west, +/obj/machinery/conveyor_switch/oneway{ + id = "shitbreaker" + }, +/turf/open/floor/plating, +/area/station/engineering/shipbreaker_hut) "aIt" = ( /obj/machinery/light/small, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -3372,6 +3402,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/science/robotics/lab) +"bag" = ( +/obj/machinery/shipbreaker{ + pixel_x = 1; + pixel_y = 4 + }, +/obj/machinery/conveyor{ + dir = 9; + id = "shitbreaker" + }, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/plating, +/area/station/engineering/shipbreaker_hut) "ban" = ( /obj/effect/turf_decal/trimline/purple/filled/line, /obj/effect/turf_decal/bot, @@ -3698,10 +3741,8 @@ /turf/open/floor/iron/white, /area/station/science/circuits) "beu" = ( -/obj/structure/railing{ - dir = 1 - }, /obj/effect/turf_decal/stripes/line, +/obj/structure/railing, /turf/open/floor/plating, /area/space/nearstation) "bew" = ( @@ -4617,6 +4658,18 @@ /obj/effect/turf_decal/stripes/white/line, /turf/open/floor/iron/dark, /area/station/science/ordnance/testlab) +"bsJ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/plating, +/area/space/nearstation) "bsS" = ( /obj/machinery/light/small/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -6555,6 +6608,10 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/science/robotics/mechbay) +"bZt" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/plating, +/area/station/engineering/shipbreaker_hut) "bZz" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -6884,14 +6941,27 @@ /turf/open/floor/plating, /area/station/maintenance/port/lesser) "cdK" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/mapping_helpers/broken_floor, -/obj/machinery/power/smes{ - charge = 2.5e+006 - }, -/obj/structure/cable, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/stack/sheet/glass/fifty, +/obj/structure/closet/crate/engineering/electrical, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, -/area/station/maintenance/solars/port/aft) +/area/station/maintenance/port/lesser) "cdM" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -7411,12 +7481,7 @@ /turf/open/floor/iron, /area/station/engineering/hallway) "clq" = ( -/obj/machinery/power/solar{ - id = "aftport"; - name = "Aft-Port Solar Array" - }, -/obj/structure/cable, -/turf/open/floor/iron/solarpanel/airless, +/turf/open/floor/plating/airless, /area/station/solars/port/aft) "clx" = ( /obj/effect/turf_decal/stripes/corner, @@ -7957,6 +8022,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/science/robotics/mechbay) +"cus" = ( +/obj/structure/fans/tiny, +/turf/open/floor/plating, +/area/station/engineering/shipbreaker_hut) "cux" = ( /obj/structure/table, /obj/item/clothing/glasses/meson, @@ -9046,6 +9115,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/science/research) +"cJY" = ( +/obj/item/chair/plastic, +/turf/open/floor/plating, +/area/station/engineering/shipbreaker_hut) "cKg" = ( /obj/structure/cable, /obj/effect/turf_decal/plaque{ @@ -11322,10 +11395,9 @@ /turf/open/floor/iron, /area/station/commons/fitness/recreation) "dtY" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/port/lesser) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/closed/wall/r_wall, +/area/station/science/ordnance/testlab) "dtZ" = ( /obj/machinery/firealarm{ dir = 8; @@ -11795,13 +11867,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/command) -"dzz" = ( -/obj/structure/rack, -/obj/item/stack/cable_coil, -/obj/item/stack/sheet/iron/twenty, -/obj/item/stack/sheet/glass/fifty, -/turf/open/floor/plating, -/area/station/maintenance/solars/port/aft) "dzN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash/food_packaging, @@ -12023,7 +12088,8 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) "dEb" = ( -/turf/closed/wall, +/obj/structure/cable, +/turf/open/floor/plating, /area/station/maintenance/solars/port/aft) "dEp" = ( /obj/effect/decal/cleanable/dirt, @@ -13324,7 +13390,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, -/area/station/maintenance/solars/port/aft) +/area/station/maintenance/port/lesser) "dYe" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -14377,6 +14443,12 @@ /obj/machinery/newscaster/directional/east, /turf/open/floor/iron/cafeteria, /area/station/security/prison/mess) +"ema" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, +/turf/open/space/basic, +/area/space/nearstation) "emk" = ( /obj/machinery/power/shuttle_engine/propulsion/burst{ dir = 4 @@ -15505,12 +15577,12 @@ /turf/open/floor/plating, /area/station/medical/abandoned) "eEL" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/east, +/obj/structure/rack, +/obj/effect/spawner/random/engineering/toolbox, /turf/open/floor/plating, -/area/station/maintenance/solars/port/aft) +/area/station/maintenance/port/lesser) "eEN" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -17700,9 +17772,8 @@ /area/station/command/bridge) "fok" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/item/assembly/mousetrap/armed, /turf/open/floor/plating, -/area/station/maintenance/solars/port/aft) +/area/station/maintenance/port/lesser) "foq" = ( /obj/item/stack/tile/material{ pixel_y = 7; @@ -20494,6 +20565,14 @@ /obj/item/shard, /turf/open/floor/plating, /area/station/maintenance/port/lesser) +"gha" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "chapel" + }, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/plating, +/area/station/engineering/shipbreaker_hut) "ghc" = ( /obj/structure/chair{ dir = 1 @@ -20963,6 +21042,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/grass, /area/station/service/hydroponics/upper) +"gov" = ( +/obj/machinery/door/airlock/external{ + name = "Solar Maintenance" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "sci-solars" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/solars/port/aft) "goD" = ( /obj/machinery/disposal/bin, /obj/structure/cable, @@ -21733,6 +21822,10 @@ /obj/machinery/atmospherics/pipe/layer_manifold/cyan/visible, /turf/open/floor/iron/dark, /area/station/engineering/atmos) +"gAM" = ( +/obj/effect/spawner/random/structure/grille, +/turf/open/space/basic, +/area/space/nearstation) "gAN" = ( /obj/item/stack/tile/material, /obj/effect/decal/cleanable/dirt, @@ -22377,6 +22470,10 @@ /obj/effect/spawner/random/structure/closet_maintenance, /obj/item/paint/paint_remover, /obj/effect/spawner/random/engineering/material, +/obj/machinery/power/smes{ + charge = 2.5e+006 + }, +/obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/solars/port/aft) "gKf" = ( @@ -23356,6 +23453,12 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/command) +"gZc" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 8 + }, +/turf/open/space/basic, +/area/space/nearstation) "gZe" = ( /obj/effect/turf_decal/tile/brown/half/contrasted, /obj/machinery/camera/directional/south, @@ -24338,17 +24441,13 @@ /turf/open/floor/iron/white/textured_large, /area/station/medical/medbay/central) "hnI" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "Sci-maint-lock" - }, -/obj/effect/turf_decal/stripes/full, -/obj/structure/cable, -/obj/effect/decal/cleanable/oil/slippery, -/obj/machinery/door/airlock/external{ - name = "Solar Maintenance" +/obj/effect/turf_decal/stripes/line, +/obj/structure/railing{ + dir = 8 }, +/obj/structure/railing, /turf/open/floor/plating, -/area/station/maintenance/solars/port/aft) +/area/space/nearstation) "hnU" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, @@ -25195,14 +25294,9 @@ /turf/open/floor/iron/white, /area/station/medical/pathology) "hBJ" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/power/terminal{ - dir = 4 - }, /obj/structure/cable, -/obj/machinery/camera/directional/south, -/turf/open/floor/plating, -/area/station/maintenance/solars/port/aft) +/turf/open/floor/plating/airless, +/area/station/solars/port/aft) "hBU" = ( /obj/effect/landmark/secequipment, /obj/effect/turf_decal/bot, @@ -28372,6 +28466,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/security/checkpoint/science) +"ixP" = ( +/obj/machinery/computer/shipbreaker, +/turf/open/floor/plating, +/area/station/engineering/shipbreaker_hut) "ixS" = ( /turf/closed/wall/r_wall, /area/station/service/hydroponics/garden) @@ -28810,6 +28908,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/pathology) +"iEs" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plating, +/area/space/nearstation) "iEy" = ( /obj/effect/turf_decal/trimline/white/filled/line{ dir = 8 @@ -29391,6 +29495,8 @@ /area/station/command/heads_quarters/hop) "iNt" = ( /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable, +/obj/effect/spawner/random/structure/tank_holder, /turf/open/floor/plating, /area/station/maintenance/solars/port/aft) "iNu" = ( @@ -29428,6 +29534,14 @@ /obj/machinery/duct, /turf/open/floor/iron/dark, /area/station/science/xenobiology) +"iOd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/maintenance/solars/port/aft) "iOf" = ( /obj/item/shovel/spade, /obj/machinery/growing/tray, @@ -29462,6 +29576,10 @@ /obj/structure/cable, /turf/open/floor/iron/grimy, /area/station/security/office) +"iOD" = ( +/obj/effect/spawner/random/structure/grille, +/turf/open/floor/plating, +/area/space) "iOH" = ( /obj/effect/turf_decal/tile/blue/half, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -32341,6 +32459,7 @@ /obj/machinery/door/airlock/maintenance{ name = "Lesser Science Maintenance" }, +/obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/solars/port/aft) "jHj" = ( @@ -33091,10 +33210,12 @@ /turf/open/floor/iron, /area/station/hallway/primary/central/fore) "jTp" = ( -/obj/structure/railing, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/structure/railing{ + dir = 1 + }, /turf/open/floor/plating, /area/space/nearstation) "jTr" = ( @@ -34274,6 +34395,10 @@ "klk" = ( /obj/effect/spawner/random/maintenance/three, /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/structure/rack, +/obj/item/stack/cable_coil, /turf/open/floor/plating, /area/station/maintenance/solars/port/aft) "klC" = ( @@ -35203,25 +35328,11 @@ /turf/open/floor/iron, /area/station/security/range) "kAa" = ( -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/stack/sheet/glass/fifty, -/obj/structure/closet/crate/engineering/electrical, /obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/power/solar_control{ + id = "aftport"; + name = "Port Quarter Solar Control" + }, /turf/open/floor/plating, /area/station/maintenance/solars/port/aft) "kAc" = ( @@ -37022,11 +37133,10 @@ /turf/open/floor/iron, /area/station/hallway/primary/central/fore) "kYz" = ( -/obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /turf/open/floor/plating, -/area/station/maintenance/solars/port/aft) +/area/space/nearstation) "kYD" = ( /obj/effect/spawner/random/trash/cigbutt, /turf/open/floor/iron, @@ -39346,11 +39456,14 @@ /turf/open/floor/iron/dark, /area/station/commons/fitness) "lEc" = ( -/obj/structure/cable, /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm/directional/east, +/obj/structure/rack, +/obj/item/stack/cable_coil, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/iron/twenty, /turf/open/floor/plating, -/area/station/maintenance/solars/port/aft) +/area/station/maintenance/port/lesser) "lEd" = ( /obj/effect/turf_decal/siding/purple{ dir = 1 @@ -45011,9 +45124,8 @@ /turf/closed/wall/r_wall, /area/station/command/gateway) "npG" = ( -/obj/structure/cable, -/obj/structure/lattice/catwalk, -/turf/open/space/basic, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating/airless, /area/station/solars/port/aft) "npO" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -46719,6 +46831,8 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "Sci-maint-lock" }, +/obj/structure/cable, +/obj/structure/fans/tiny, /turf/open/floor/plating, /area/station/maintenance/solars/port/aft) "nQM" = ( @@ -48592,6 +48706,16 @@ }, /turf/open/floor/iron, /area/station/service/cafeteria) +"otv" = ( +/obj/machinery/conveyor{ + dir = 8; + id = "shitbreaker" + }, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/plasticflaps, +/turf/open/floor/plating, +/area/station/engineering/shipbreaker_hut) "otE" = ( /obj/machinery/light{ dir = 4 @@ -48796,7 +48920,7 @@ unlocked = 1 }, /turf/open/floor/plating, -/area/station/maintenance/solars/port/aft) +/area/space/nearstation) "owt" = ( /obj/structure/flora/bush/large/style_random, /turf/open/floor/grass/lavaland{ @@ -49183,6 +49307,7 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) "oBI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/closed/wall, /area/station/science/ordnance/testlab) "oBK" = ( @@ -50459,6 +50584,10 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/plating, /area/station/maintenance/department/medical) +"oYw" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, +/area/space/nearstation) "oYE" = ( /turf/open/floor/plating, /area/station/maintenance/starboard/central) @@ -51788,6 +51917,10 @@ }, /turf/open/floor/iron/dark, /area/station/science/lab) +"ptk" = ( +/obj/effect/spawner/structure/window/hollow/reinforced/middle, +/turf/open/space/basic, +/area/space/nearstation) "ptm" = ( /obj/effect/decal/cleanable/confetti, /obj/effect/landmark/start/assistant, @@ -54773,11 +54906,7 @@ /turf/open/floor/grass, /area/station/service/hydroponics/upper) "qlq" = ( -/obj/machinery/power/solar_control{ - id = "aftport"; - name = "Port Quarter Solar Control" - }, -/turf/open/floor/plating, +/turf/open/floor/iron, /area/station/maintenance/solars/port/aft) "qlz" = ( /obj/machinery/button/ignition/incinerator/atmos, @@ -56212,8 +56341,8 @@ /area/station/hallway/primary/central/fore) "qGo" = ( /obj/machinery/asteroid_magnet{ - center_y = 117; - center_x = 046; + center_y = 096; + center_x = 044; area_size = 7 }, /obj/effect/turf_decal/stripes/line{ @@ -59614,10 +59743,11 @@ /area/station/security/prison/garden) "rEX" = ( /obj/structure/lattice/catwalk, -/obj/structure/cable, -/obj/machinery/power/tracker, +/obj/structure/railing{ + dir = 8 + }, /turf/open/space/basic, -/area/station/solars/port/aft) +/area/space/nearstation) "rEZ" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 @@ -61887,8 +62017,8 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "soy" = ( +/obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/solars/port/aft) "soN" = ( @@ -63325,6 +63455,9 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/plating, /area/station/service/kitchen/kitchen_backroom) +"sJW" = ( +/turf/closed/wall/r_wall, +/area/station/engineering/shipbreaker_hut) "sKa" = ( /obj/machinery/door/airlock/external, /obj/structure/cable, @@ -66348,6 +66481,9 @@ }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) +"tBz" = ( +/turf/open/space/basic, +/area/shipbreak) "tBA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -68188,8 +68324,9 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable, /turf/open/floor/plating, -/area/station/maintenance/solars/port/aft) +/area/station/maintenance/port/lesser) "udj" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -69188,6 +69325,14 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/prison) +"usl" = ( +/obj/machinery/conveyor{ + id = "garbage"; + dir = 5 + }, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/plating, +/area/station/engineering/shipbreaker_hut) "usn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -69250,6 +69395,10 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/engineering/main) +"utN" = ( +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating/airless, +/area/station/solars/port/aft) "utQ" = ( /obj/effect/decal/cleanable/food/tomato_smudge, /obj/machinery/food_cart, @@ -72367,6 +72516,12 @@ }, /turf/closed/wall/r_wall, /area/station/engineering/atmos) +"vlx" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/open/floor/plating, +/area/station/engineering/shipbreaker_hut) "vlB" = ( /obj/effect/turf_decal/box/white, /obj/effect/turf_decal/arrows/white{ @@ -73108,10 +73263,8 @@ /turf/open/floor/iron, /area/station/command/bridge) "vwE" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/turf/open/floor/plating, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron, /area/station/maintenance/solars/port/aft) "vwU" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -73470,7 +73623,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating, -/area/station/maintenance/solars/port/aft) +/area/space/nearstation) "vCd" = ( /obj/effect/landmark/blobstart, /turf/open/floor/iron/white, @@ -74556,6 +74709,9 @@ }, /turf/open/floor/iron, /area/station/security/brig/entrance) +"vTc" = ( +/turf/open/floor/plating, +/area/station/engineering/shipbreaker_hut) "vTj" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ @@ -75747,8 +75903,9 @@ /obj/machinery/door/airlock/external{ name = "Solar Maintenance" }, +/obj/structure/fans/tiny, /turf/open/floor/plating, -/area/station/maintenance/solars/port/aft) +/area/station/maintenance/port/lesser) "wow" = ( /obj/effect/spawner/random/structure/crate, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -77037,6 +77194,12 @@ /obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/stairs/right, /area/station/hallway/secondary/entry) +"wJv" = ( +/obj/structure/chair/plastic{ + dir = 1 + }, +/turf/open/floor/plating, +/area/station/engineering/shipbreaker_hut) "wJE" = ( /obj/machinery/stasis{ dir = 8 @@ -77085,6 +77248,14 @@ }, /turf/open/floor/plating, /area/station/maintenance/disposal) +"wKe" = ( +/obj/machinery/conveyor{ + id = "cargosort"; + dir = 1 + }, +/obj/structure/window/reinforced/spawner/directional/west, +/turf/open/floor/plating, +/area/station/engineering/shipbreaker_hut) "wKh" = ( /obj/structure/dresser, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -78129,9 +78300,11 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) "wVU" = ( -/obj/structure/rack, -/obj/effect/spawner/random/engineering/toolbox, -/turf/open/floor/plating, +/obj/structure/cable, +/obj/machinery/power/terminal{ + dir = 4 + }, +/turf/open/floor/iron, /area/station/maintenance/solars/port/aft) "wVW" = ( /obj/structure/disposalpipe/segment{ @@ -78754,10 +78927,9 @@ /turf/open/floor/iron/white/textured, /area/station/medical/treatment_center) "xgG" = ( -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/decal/cleanable/dirt/dust, /obj/item/kirbyplants/random/dead, +/obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/maintenance/port/lesser) "xgK" = ( @@ -79929,6 +80101,34 @@ /obj/effect/spawner/random/engineering/atmospherics_portable, /turf/open/floor/plating, /area/station/maintenance/department/medical) +"xwU" = ( +/obj/structure/table/reinforced/rglass, +/obj/item/reagent_containers/cup/soda_cans/tonic{ + pixel_x = -8; + pixel_y = 5 + }, +/obj/item/reagent_containers/cup/soda_cans/sol_dry{ + pixel_x = -8; + pixel_y = 1 + }, +/obj/item/reagent_containers/cup/soda_cans/thirteenloko{ + pixel_x = 1; + pixel_y = 5 + }, +/obj/item/reagent_containers/cup/soda_cans/space_up{ + pixel_x = 1; + pixel_y = 1 + }, +/obj/item/reagent_containers/cup/soda_cans/starkist{ + pixel_x = 10; + pixel_y = 5 + }, +/obj/item/reagent_containers/cup/soda_cans/wellcheers{ + pixel_x = 10; + pixel_y = 1 + }, +/turf/open/floor/plating, +/area/station/engineering/shipbreaker_hut) "xxl" = ( /obj/effect/turf_decal/plaque{ icon_state = "L11" @@ -90174,6 +90374,11 @@ nhC nhC nhC nhC +nVB +nVB +nVB +nVB +nVB nhC nhC nhC @@ -90193,16 +90398,11 @@ nhC nhC nhC nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC +nVB +nVB +nVB +nVB +nVB nhC nhC nhC @@ -90431,6 +90631,35 @@ nhC nhC nhC nhC +nVB +lXw +lXw +lXw +lXw +lXw +lXw +lXw +lXw +lXw +lXw +lXw +lXw +lXw +lXw +lXw +lXw +lXw +lXw +lXw +lXw +lXw +lXw +lXw +lXw +lXw +lXw +lXw +nVB nhC nhC nhC @@ -90441,6 +90670,7 @@ nhC nhC nhC nhC +wDM nhC nhC nhC @@ -90470,12 +90700,6 @@ nhC nhC nhC nhC -wDM -nhC -nhC -nhC -nhC -nhC nhC nhC nhC @@ -90550,6 +90774,8 @@ nhC nhC nhC nhC +"} +(32,1,1) = {" nhC nhC nhC @@ -90574,8 +90800,6 @@ nhC nhC nhC nhC -"} -(32,1,1) = {" nhC nhC nhC @@ -90664,6 +90888,35 @@ nhC nhC nhC nhC +nVB +lXw +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +lXw +nVB nhC nhC nhC @@ -90778,6 +91031,8 @@ nhC nhC nhC nhC +"} +(33,1,1) = {" nhC nhC nhC @@ -90831,8 +91086,6 @@ nhC nhC nhC nhC -"} -(33,1,1) = {" nhC nhC nhC @@ -90892,6 +91145,35 @@ nhC nhC nhC nhC +nVB +lXw +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +lXw +nVB nhC nhC nhC @@ -90923,10 +91205,12 @@ nhC nhC nhC nhC +abx nhC nhC nhC nhC +lXw nhC nhC nhC @@ -90993,18 +91277,6 @@ nhC nhC nhC nhC -lXw -lXw -lXw -lXw -lXw -euv -euv -euv -euv -euv -euv -lXw nhC nhC nhC @@ -91016,6 +91288,8 @@ nhC nhC nhC nhC +"} +(34,1,1) = {" nhC nhC nhC @@ -91088,8 +91362,6 @@ nhC nhC nhC nhC -"} -(34,1,1) = {" nhC nhC nhC @@ -91130,6 +91402,35 @@ nhC nhC nhC nhC +nVB +lXw +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +lXw +nVB nhC nhC nhC @@ -91159,12 +91460,19 @@ nhC nhC nhC nhC +lXw +lXw +clq nhC nhC nhC nhC +lXw +lXw nhC nhC +lXw +lXw nhC nhC nhC @@ -91237,6 +91545,8 @@ nhC nhC nhC nhC +"} +(35,1,1) = {" nhC nhC nhC @@ -91250,18 +91560,15 @@ nhC nhC nhC nhC -lXw nhC nhC nhC -lXw nhC nhC nhC nhC nhC nhC -lXw nhC nhC nhC @@ -91345,8 +91652,6 @@ nhC nhC nhC nhC -"} -(35,1,1) = {" nhC nhC nhC @@ -91355,6 +91660,36 @@ nhC nhC nhC nhC +lXw +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +lXw +iOD +iOD +iOD nhC nhC nhC @@ -91363,12 +91698,40 @@ nhC nhC nhC nhC +lXw +euv +euv +euv +euv +euv +euv +euv +euv +euv +euv +euv +euv +euv +euv +euv +lXw nhC nhC nhC nhC +clq nhC +lXw +lXw +lXw +lXw +lXw nhC +lXw +lXw +lXw +lXw +lXw nhC nhC nhC @@ -91439,6 +91802,8 @@ nhC nhC nhC nhC +"} +(36,1,1) = {" nhC nhC nhC @@ -91507,18 +91872,14 @@ nhC nhC nhC nhC -lXw nhC -rEX nhC -lXw nhC nhC nhC nhC nhC nhC -euv nhC nhC nhC @@ -91556,6 +91917,36 @@ nhC nhC nhC nhC +lXw +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +plQ +usl +wKe +bag nhC nhC nhC @@ -91563,8 +91954,43 @@ nhC nhC nhC nhC +lXw +vvY +iCs +iCs +iCs +iCs +iCs +iCs +vvY +iCs +vvY +iCs +iCs +iCs +iCs +iCs +iCs +vvY +lXw nhC +lXw +jHe +hBJ +jHe +jHe +jHe +jHe +jHe +jHe nhC +jHe +jHe +jHe +jHe +jHe +jHe +lXw nhC nhC nhC @@ -91602,8 +92028,6 @@ nhC nhC nhC nhC -"} -(36,1,1) = {" nhC nhC nhC @@ -91635,6 +92059,8 @@ nhC nhC nhC nhC +"} +(37,1,1) = {" nhC nhC nhC @@ -91748,6 +92174,36 @@ nhC nhC nhC nhC +lXw +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +gZc +gha +sJW +otv nhC nhC nhC @@ -91755,28 +92211,49 @@ nhC nhC nhC nhC +gAM +iCs +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +iCs +gAM nhC +jHe +nAj +hBJ +nAj +nAj +nAj +nAj +nAj +nAj +nAj +nAj +nAj +nAj +nAj +nAj +nAj +jHe nhC nhC nhC nhC -lXw -lXw -lXw -lXw -lXw -lXw -nAj -lXw -lXw -lXw -lXw -lXw -lXw nhC nhC -euv -euv nhC nhC nhC @@ -91839,6 +92316,8 @@ nhC nhC nhC nhC +"} +(38,1,1) = {" nhC nhC nhC @@ -91859,8 +92338,6 @@ nhC nhC nhC nhC -"} -(37,1,1) = {" nhC nhC nhC @@ -91954,6 +92431,36 @@ nhC nhC nhC nhC +lXw +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +ptk +cJY +aIs +bZt nhC nhC nhC @@ -91961,7 +92468,43 @@ nhC nhC nhC nhC +gAM +iCs +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +iCs +gAM nhC +lXw +jHe +hBJ +jHe +jHe +jHe +jHe +jHe +jHe +nhC +jHe +jHe +jHe +jHe +jHe +jHe +lXw nhC nhC nhC @@ -91970,7 +92513,6 @@ nhC nhC nhC nhC -wDM nhC nhC nhC @@ -91990,25 +92532,6 @@ nhC nhC nhC nhC -euv -euv -euv -euv -euv -euv -euv -euv -euv -euv -euv -euv -euv -euv -euv -euv -euv -euv -euv nhC nhC nhC @@ -92017,23 +92540,19 @@ nhC nhC nhC nhC -lXw nhC nhC nhC nhC nhC -nAj nhC nhC nhC nhC nhC -lXw nhC nhC nhC -euv nhC nhC nhC @@ -92054,6 +92573,20 @@ nhC nhC nhC nhC +"} +(39,1,1) = {" +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC nhC nhC nhC @@ -92116,8 +92649,6 @@ nhC nhC nhC nhC -"} -(38,1,1) = {" nhC nhC nhC @@ -92157,6 +92688,36 @@ nhC nhC nhC nhC +lXw +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +ptk +ixP +wJv +bZt nhC nhC nhC @@ -92164,19 +92725,43 @@ nhC nhC nhC nhC +gAM +iCs +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +iCs +gAM nhC +lXw nhC +npG nhC nhC nhC nhC nhC +lXw nhC nhC nhC nhC nhC nhC +lXw +lXw nhC nhC nhC @@ -92245,52 +92830,17 @@ nhC nhC nhC nhC +"} +(40,1,1) = {" nhC nhC -euv -vvY -iCs -iCs -iCs -iCs -iCs -iCs -vvY -iCs -vvY -iCs -iCs -iCs -iCs -iCs -iCs -vvY -euv nhC nhC nhC nhC nhC nhC -lXw -lXw -clq -clq -clq -clq -clq -jHe -npG -jHe -jHe -jHe -jHe -jHe -jHe -lXw -lXw nhC -euv nhC nhC nhC @@ -92373,8 +92923,6 @@ nhC nhC nhC nhC -"} -(39,1,1) = {" nhC nhC nhC @@ -92397,6 +92945,86 @@ nhC nhC nhC nhC +lXw +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +ema +xwU +vTc +bZt +nhC +nhC +nhC +nhC +nhC +nhC +nhC +gAM +iCs +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +iCs +gAM +nhC +lXw +jHe +clq +jHe +jHe +jHe +jHe +jHe +jHe +nhC +jHe +jHe +jHe +jHe +jHe +jHe +lXw +nhC +nhC +nhC +nhC +nhC +nhC nhC nhC nhC @@ -92459,6 +93087,22 @@ nhC nhC nhC nhC +"} +(41,1,1) = {" +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC nhC nhC nhC @@ -92504,25 +93148,6 @@ nhC nhC nhC nhC -euv -iCs -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -iCs -euv nhC nhC nhC @@ -92531,25 +93156,6 @@ nhC nhC nhC nhC -nAj -nAj -rNX -rNX -rNX -nAj -npG -nAj -nAj -nAj -nAj -nAj -nAj -jHe -nhC -nhC -euv -nhC -nhC nhC nhC nhC @@ -92596,6 +93202,36 @@ nhC nhC nhC nhC +lXw +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +plQ +ajm +cus +vlx nhC nhC nhC @@ -92603,7 +93239,43 @@ nhC nhC nhC nhC +gAM +iCs +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +iCs +gAM nhC +jHe +nAj +hBJ +nAj +rNX +nAj +nAj +nAj +nAj +nAj +nAj +nAj +nAj +nAj +nAj +nAj +jHe nhC nhC nhC @@ -92630,8 +93302,6 @@ nhC nhC nhC nhC -"} -(40,1,1) = {" nhC nhC nhC @@ -92674,6 +93344,8 @@ nhC nhC nhC nhC +"} +(42,1,1) = {" nhC nhC nhC @@ -92723,6 +93395,7 @@ nhC nhC nhC nhC +wDM nhC nhC nhC @@ -92744,6 +93417,7 @@ nhC nhC nhC nhC +wDM nhC nhC nhC @@ -92761,50 +93435,13 @@ nhC nhC nhC nhC -euv -iCs -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -iCs -euv nhC nhC nhC nhC nhC nhC -lXw -lXw -clq -clq -clq -clq -clq -jHe -npG -jHe -jHe -jHe -jHe -jHe -jHe -lXw -lXw nhC -euv nhC nhC nhC @@ -92822,15 +93459,80 @@ nhC nhC nhC nhC +lXw +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +lXw nhC +iCs +lXw +lXw nhC nhC nhC nhC nhC nhC +gAM +iCs +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +dKS +iCs +gAM nhC +lXw +jHe +clq +jHe +jHe +jHe +jHe +jHe +jHe nhC +jHe +jHe +jHe +jHe +jHe +jHe +lXw nhC nhC nhC @@ -92887,8 +93589,6 @@ nhC nhC nhC nhC -"} -(41,1,1) = {" nhC nhC nhC @@ -92901,6 +93601,8 @@ nhC nhC nhC nhC +"} +(43,1,1) = {" nhC nhC nhC @@ -93014,12 +93716,45 @@ nhC nhC nhC nhC +lXw +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +lXw nhC +iCs +lXw +bsJ +rEX +rEX +hnI nhC nhC nhC -euv -iCs +gAM +vvY dKS dKS dKS @@ -93035,24 +93770,21 @@ dKS dKS dKS dKS -iCs -euv -nhC +vvY +gAM nhC +lXw nhC +npG nhC nhC nhC nhC nhC lXw -lXw nhC nhC nhC -lXw -rNX -lXw nhC nhC nhC @@ -93061,24 +93793,6 @@ lXw nhC nhC nhC -euv -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC nhC nhC nhC @@ -93145,21 +93859,7 @@ nhC nhC nhC "} -(42,1,1) = {" -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC +(44,1,1) = {" nhC nhC nhC @@ -93195,7 +93895,6 @@ nhC nhC nhC nhC -wDM nhC nhC nhC @@ -93217,7 +93916,6 @@ nhC nhC nhC nhC -wDM nhC nhC nhC @@ -93275,7 +93973,44 @@ nhC nhC nhC nhC -euv +lXw +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +lXw +iCs +iCs +iCs +iEs +iCs +iCs +oYw +iCs +iCs +iCs +iCs iCs dKS dKS @@ -93293,22 +94028,18 @@ dKS dKS dKS iCs -euv -nhC -nhC -nhC -nhC +gAM nhC -nhC -lXw lXw -clq -clq -clq -clq +jHe clq jHe -rNX +jHe +jHe +jHe +jHe +jHe +nhC jHe jHe jHe @@ -93316,23 +94047,6 @@ jHe jHe jHe lXw -lXw -nhC -euv -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC nhC nhC nhC @@ -93402,17 +94116,7 @@ nhC nhC nhC "} -(43,1,1) = {" -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC +(45,1,1) = {" nhC nhC nhC @@ -93526,14 +94230,45 @@ nhC nhC nhC nhC +lXw +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +lXw nhC nhC nhC +jTp +iCs +iCs +beu nhC nhC nhC -euv -iCs +gAM +vvY dKS dKS dKS @@ -93549,25 +94284,21 @@ dKS dKS dKS dKS -iCs -euv -nhC -nhC -nhC -nhC -nhC -nhC -nhC +vvY +gAM nhC +jHe rNX +clq nAj nAj nAj rNX nAj -npG nAj -rNX +nAj +nAj +nAj nAj nAj nAj @@ -93575,23 +94306,6 @@ nAj jHe nhC nhC -euv -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC nhC nhC nhC @@ -93659,17 +94373,7 @@ nhC nhC nhC "} -(44,1,1) = {" -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC +(46,1,1) = {" nhC nhC nhC @@ -93783,13 +94487,44 @@ nhC nhC nhC nhC +lXw +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +lXw nhC nhC nhC +jTp +iCs +iCs +beu nhC nhC nhC -euv +gAM iCs dKS dKS @@ -93807,31 +94542,24 @@ dKS dKS dKS iCs -euv +gAM nhC -nhC -nhC -nhC -nhC -nhC -lXw lXw -clq -clq -clq -clq -clq jHe -rNX +utN jHe jHe jHe jHe jHe jHe -lXw -lXw nhC +jHe +jHe +jHe +jHe +jHe +jHe lXw nhC nhC @@ -93901,32 +94629,8 @@ nhC nhC nhC nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC "} -(45,1,1) = {" -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC +(47,1,1) = {" nhC nhC nhC @@ -94040,14 +94744,45 @@ nhC nhC nhC nhC +lXw +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +lXw nhC nhC nhC +jTp +iCs +iCs +beu nhC nhC nhC -euv -vvY +gAM +iCs dKS dKS dKS @@ -94063,24 +94798,21 @@ dKS dKS dKS dKS -vvY -euv -nhC +iCs +gAM nhC +lXw nhC +hBJ nhC nhC nhC nhC nhC lXw -lXw nhC nhC nhC -lXw -rNX -lXw nhC nhC nhC @@ -94089,25 +94821,6 @@ lXw nhC nhC nhC -euv -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC nhC nhC nhC @@ -94128,6 +94841,7 @@ nhC nhC nhC nhC +wDM nhC nhC nhC @@ -94173,17 +94887,7 @@ nhC nhC nhC "} -(46,1,1) = {" -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC +(48,1,1) = {" nhC nhC nhC @@ -94297,13 +95001,44 @@ nhC nhC nhC nhC +lXw +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +lXw nhC nhC nhC +jTp +iCs +iCs +beu nhC nhC nhC -euv +gAM iCs dKS dKS @@ -94321,46 +95056,25 @@ dKS dKS dKS iCs -euv +gAM nhC -nhC -nhC -nhC -nhC -nhC -lXw lXw -clq -clq -clq -clq -clq jHe -nAj +hBJ jHe jHe jHe jHe jHe jHe -lXw -lXw -nhC -euv -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC nhC +jHe +jHe +jHe +jHe +jHe +jHe +lXw nhC nhC nhC @@ -94430,17 +95144,7 @@ nhC nhC nhC "} -(47,1,1) = {" -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC +(49,1,1) = {" nhC nhC nhC @@ -94554,14 +95258,45 @@ nhC nhC nhC nhC +lXw +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +lXw nhC nhC nhC +jTp +iCs +iCs +beu nhC nhC nhC -euv -vvY +gAM +iCs dKS dKS dKS @@ -94577,33 +95312,28 @@ dKS dKS dKS dKS -vvY -euv -nhC -nhC -nhC -nhC -nhC -nhC -nhC +iCs +gAM nhC +jHe nAj -nAj -nAj -rNX +hBJ rNX rNX nAj nAj nAj nAj -rNX +nAj +nAj +nAj +nAj +nAj nAj nAj jHe nhC nhC -euv nhC nhC nhC @@ -94641,22 +95371,6 @@ nhC nhC nhC nhC -wDM -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC nhC nhC nhC @@ -94687,17 +95401,7 @@ nhC nhC nhC "} -(48,1,1) = {" -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC +(50,1,1) = {" nhC nhC nhC @@ -94811,13 +95515,44 @@ nhC nhC nhC nhC +lXw +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +lXw nhC nhC nhC +jTp +iCs +iCs +beu nhC nhC nhC -euv +gAM iCs dKS dKS @@ -94835,46 +95570,25 @@ dKS dKS dKS iCs -euv -nhC -nhC -nhC -nhC -nhC +gAM nhC lXw -lXw -clq -clq -clq -clq -clq jHe -nAj +hBJ jHe jHe jHe jHe jHe jHe -lXw -lXw -nhC -euv -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC nhC +jHe +jHe +jHe +jHe +jHe +jHe +lXw nhC nhC nhC @@ -94944,17 +95658,7 @@ nhC nhC nhC "} -(49,1,1) = {" -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC +(51,1,1) = {" nhC nhC nhC @@ -95068,13 +95772,44 @@ nhC nhC nhC nhC +lXw +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +lXw nhC nhC nhC +jTp +iCs +iCs +beu nhC nhC nhC -euv +gAM iCs dKS dKS @@ -95092,34 +95827,25 @@ dKS dKS dKS iCs -euv -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC +gAM +lXw +lXw +lXw +hBJ +lXw +lXw +lXw +lXw +lXw +lXw +lXw +lXw lXw lXw -nhC -nhC -nhC lXw -npG lXw -nhC -nhC -nhC lXw lXw -nhC -nhC -nhC -euv -nhC -nhC nhC nhC nhC @@ -95188,6 +95914,8 @@ nhC nhC nhC nhC +"} +(52,1,1) = {" nhC nhC nhC @@ -95200,8 +95928,6 @@ nhC nhC nhC nhC -"} -(50,1,1) = {" nhC nhC nhC @@ -95303,15 +96029,73 @@ nhC nhC nhC nhC +lXw +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +lXw nhC nhC nhC +jTp +iCs +iCs +beu nhC nhC nhC +lXw +vvY +iCs +iCs +iCs +iCs +iCs +iCs +vvY +iCs +vvY +iCs +iCs +iCs +iCs +iCs +iCs +vvY +lXw +lXw +lXw +sJw +gov +sJw +lXw nhC nhC +lXw nhC +lXw nhC nhC nhC @@ -95331,50 +96115,13 @@ nhC nhC nhC nhC -euv -iCs -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -iCs -euv nhC nhC nhC nhC nhC nhC -lXw -lXw -clq -clq -clq -clq -clq -jHe -npG -jHe -jHe -jHe -jHe -jHe -jHe -lXw -lXw nhC -euv nhC nhC nhC @@ -95424,6 +96171,8 @@ nhC nhC nhC nhC +"} +(53,1,1) = {" nhC nhC nhC @@ -95457,13 +96206,12 @@ nhC nhC nhC nhC -"} -(51,1,1) = {" nhC nhC nhC nhC nhC +wDM nhC nhC nhC @@ -95538,17 +96286,73 @@ nhC nhC nhC nhC +lXw +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +lXw nhC nhC nhC +jTp +iCs +iCs +beu nhC nhC nhC +lXw +lXw +gAM +gAM +gAM +gAM +gAM +gAM +gAM +gAM +gAM +gAM +gAM +gAM +gAM +gAM +gAM +lXw +lXw nhC nhC +sJw +pma +sJw +lXw nhC nhC +lXw nhC +lXw nhC nhC nhC @@ -95588,25 +96392,6 @@ nhC nhC nhC nhC -euv -iCs -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -iCs -euv nhC nhC nhC @@ -95615,23 +96400,8 @@ nhC nhC nhC nhC -nAj -nAj -rNX -nAj -nAj -nAj -npG -rNX -rNX -nAj -nAj -nAj -nAj -jHe nhC nhC -lXw nhC nhC nhC @@ -95658,6 +96428,8 @@ nhC nhC nhC nhC +"} +(54,1,1) = {" nhC nhC nhC @@ -95714,8 +96486,6 @@ nhC nhC nhC nhC -"} -(52,1,1) = {" nhC nhC nhC @@ -95772,14 +96542,74 @@ nhC nhC nhC nhC +nVB +lXw +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +lXw +nVB nhC nhC +jTp +iCs +iCs +beu nhC nhC nhC +lXw +lXw +lXw +lXw +lXw +lXw +lXw +lXw +lXw +lXw +lXw +lXw +lXw +lXw +lXw +lXw +lXw +lXw +sJw +lcu +lcu +sJw +gov +sJw +lXw nhC nhC +lXw nhC +lXw nhC nhC nhC @@ -95845,54 +96675,18 @@ nhC nhC nhC nhC -euv -iCs -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -iCs -euv nhC nhC nhC nhC nhC nhC -lXw -lXw -clq -clq -clq -clq -clq -jHe -npG -jHe -jHe -jHe -jHe -jHe -jHe -lXw -lXw -lXw -lXw nhC nhC nhC nhC +"} +(55,1,1) = {" nhC nhC nhC @@ -95971,8 +96765,6 @@ nhC nhC nhC nhC -"} -(53,1,1) = {" nhC nhC nhC @@ -96007,29 +96799,82 @@ nhC nhC nhC nhC +nVB +lXw +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +lXw +nVB nhC nhC +jTp +iCs +iCs +beu nhC nhC -wDM nhC nhC +lXw +lXw +lXw nhC nhC nhC nhC +lXw +lXw nhC nhC nhC nhC nhC +lXw +lXw +lXw +sJw +kAa +aAP +vwE +pma +sJw +lXw nhC nhC +lXw +hbP +lXw nhC nhC nhC nhC nhC +lXw +lXw +lXw nhC nhC nhC @@ -96060,6 +96905,9 @@ nhC nhC nhC nhC +csj +pOm +csj nhC nhC nhC @@ -96094,6 +96942,8 @@ nhC nhC nhC nhC +"} +(56,1,1) = {" nhC nhC nhC @@ -96102,25 +96952,6 @@ nhC nhC nhC nhC -euv -iCs -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -dKS -iCs -euv nhC nhC nhC @@ -96131,21 +96962,11 @@ nhC nhC nhC nhC -lXw -lXw -lXw -lXw -npG -lXw -lXw -lXw -lXw nhC nhC nhC nhC nhC -euv nhC nhC nhC @@ -96199,6 +97020,7 @@ nhC nhC nhC nhC +lXw nhC nhC nhC @@ -96228,31 +97050,122 @@ nhC nhC nhC nhC -"} -(54,1,1) = {" nhC nhC nhC nhC nhC nhC +nVB +lXw +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +tBz +lXw +nVB nhC nhC +jTp +iCs +iCs +beu +lXw +lXw +lXw +lXw +plQ +rzL +rzL +rzL +xAd +xAd +rzL +rzL +rzL +rzL +rzL nhC +sJw +sJw +sJw +sJw +sJw +sJw +klk +sLv +qlq +wVU +sJw +lXw nhC +lXw +lXw +lXw +lXw +lXw nhC nhC nhC +lXw +lXw +euv +lXw +lXw nhC nhC nhC +lXw +lXw +lXw +lXw +lXw nhC nhC nhC +euv +euv +lXw +lXw +lXw nhC nhC nhC +lXw +lXw +lXw +lXw +lXw nhC +lXw +vUL +vUL +csj +csj +qor +csj +csj nhC nhC nhC @@ -96286,6 +97199,8 @@ nhC nhC nhC nhC +"} +(57,1,1) = {" nhC nhC nhC @@ -96359,433 +97274,11 @@ nhC nhC nhC nhC -euv -vvY -iCs -iCs -iCs -iCs -iCs -iCs -vvY -iCs -vvY -iCs -iCs -iCs -iCs -iCs -iCs -vvY -euv -lXw -lXw -lXw -ayW -lXw -lXw -lXw -lXw -lXw -lXw -lXw -lXw -lXw nhC -rNX nhC lXw lXw -nhC -sJw -sJw -lcu -lcu -sJw -sJw -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -"} -(55,1,1) = {" -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -lXw -lXw -lXw -lXw -lXw -lXw -lXw -lXw -lXw -iCs -iCs -iCs -iCs -iCs -iCs -iCs -iCs -iCs -iCs -iCs -iCs -iCs -iCs -iCs -iCs -iCs -iCs -iCs -iCs -iCs -iCs -iCs -iCs -nAj -mzG -iCs -lXw -lXw -sJw -kAa -aAP -kAa -dzz -sJw -nhC -nhC -nhC -nhC -lXw -hbP -lXw -nhC -nhC -nhC -nhC -nhC -lXw -lXw -lXw -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -csj -pOm -csj -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -"} -(56,1,1) = {" -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC +lXw nhC nhC nhC @@ -96820,330 +97313,37 @@ nhC nhC nhC nhC +nVB lXw -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC lXw -iCs lXw lXw lXw -jTp -iCs -iCs -beu lXw lXw lXw lXw -plQ -rzL -rzL -xAd -xAd -dtY -lcu -sJw -sJw -sJw -sJw -hnI -sJw -sJw -sJw -sJw -sJw -klk -vCc -pma -wVU -sJw -nhC -nhC -nhC lXw lXw lXw lXw lXw -nhC -nhC -nhC lXw lXw -euv lXw lXw -nhC -nhC -nhC lXw lXw lXw lXw lXw -nhC -nhC -nhC -euv -euv -lXw -lXw -lXw -nhC -nhC -nhC -lXw -lXw lXw lXw lXw -nhC lXw -vUL -vUL -csj -csj -qor -csj -csj -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -"} -(57,1,1) = {" -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -lXw -lXw -lXw -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -lXw -iCs +nVB nhC nhC -lXw jTp iCs iCs @@ -97158,23 +97358,23 @@ dHI aaV tQt xgG -dEb -qlq +ePW fok -vwE +fok +ndj wol kYz nQH -pma -pma -pma +dEb +dEb +dEb +dEb jHi -sLv -sLv +iOd +soy iNt gKe sJw -lXw ual lXw lXw @@ -97370,14 +97570,21 @@ nhC nhC nhC nhC +nVB +nVB +nVB +nVB +nVB nhC nhC nhC nhC nhC +lXw nhC nhC nhC +lXw nhC nhC nhC @@ -97387,19 +97594,12 @@ nhC nhC nhC nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC +euv +euv +euv +euv +euv lXw -iCs -nhC -nhC lXw jTp iCs @@ -97416,17 +97616,17 @@ ePW hnt cMx dYa -soy +jVj udi -hBJ -sJw +ndj +rzL vCc -sJw -jli +rzL jli jli jli jli +dtY jli jli jli @@ -97637,9 +97837,11 @@ nhC nhC nhC nhC +lXw nhC nhC nhC +lXw nhC nhC nhC @@ -97649,13 +97851,11 @@ nhC nhC nhC nhC +lXw nhC nhC nhC nhC -lXw -iCs -nhC nhC lXw jTp @@ -97672,13 +97872,13 @@ pwU ePW hHu oxa -dEb +ePW eEL lEc cdK -sJw +rzL owm -sJw +rzL jli vCn uzr @@ -97894,9 +98094,11 @@ nhC nhC nhC nhC +lXw nhC nhC nhC +lXw nhC nhC nhC @@ -97906,13 +98108,11 @@ nhC nhC nhC nhC +lXw nhC nhC nhC nhC -lXw -iCs -nhC nhC lXw jTp @@ -97929,13 +98129,13 @@ rzL rzL ePW cYZ -dEb -dEb -dEb -dEb -sJw -sJw -sJw +ePW +ePW +ePW +ePW +rzL +rzL +rzL jli kzU iFB @@ -98151,12 +98351,11 @@ nhC nhC nhC nhC +lXw nhC nhC nhC -nhC -nhC -nhC +lXw nhC nhC nhC @@ -98168,9 +98367,10 @@ nhC nhC lXw lXw -iCs -nhC -nhC +lXw +lXw +lXw +lXw lXw nmm yem @@ -98408,267 +98608,157 @@ nhC nhC nhC nhC +lXw +lXw +lXw +lXw +lXw +euv +euv +lXw +lXw +euv +euv +euv +euv +lXw +lXw +lXw +iCs +iCs +iCs +lXw +lXw +yem +qGo +tsN +kta +nmm +iMU +eMx +iNu +nmm +lXw +lXw +rzL +bkp +hTL +hTL +ndj +faW +qdP +hEd +fPJ +vMg +udw +eqP +cTf +pwx +vJE +fhi +fhi +mSn +gOS nhC nhC nhC -euv -euv -euv -euv -lXw -lXw -euv -euv -euv -euv -lXw -lXw -lXw -iCs -iCs -iCs -lXw -lXw -yem -qGo -tsN -kta -nmm -iMU -eMx -iNu -nmm -lXw -lXw -rzL -bkp -hTL -hTL -ndj -faW -qdP -hEd -fPJ -vMg -udw -eqP -cTf -pwx -vJE -fhi -fhi -mSn -gOS -nhC -nhC -nhC -lXw -lXw -lXw -lXw -lXw -nhC -nhC -nhC -lXw -euv -lXw -lXw -lXw -nhC -nhC -nhC -lXw -lXw -lXw -lXw -lXw -nhC -nhC -nhC -lXw -lXw -lXw -lXw -lXw -nhC -nhC -nhC -lXw -lXw -lXw -lXw -lXw -nhC -euv -vUL -vUL -csj -csj -aOO -csj -csj -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -"} -(63,1,1) = {" -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -lXw -nhC -nhC -nhC -nhC -nhC -nhC -lXw -hmB -qKh -qKh -hmB -qKh -qKh -hmB -hmB -hmB -hmB -nhC -dJY -hMZ -dJY -nhC -nhC -dJY -hMZ -dJY -nhC -nhC -dJY -hMZ -dJY -nhC -lXw -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC -nhC +lXw +lXw +lXw +lXw +lXw nhC nhC nhC +lXw +euv +lXw +lXw +lXw nhC nhC nhC +lXw +lXw +lXw +lXw +lXw nhC nhC nhC +lXw +lXw +lXw +lXw +lXw nhC nhC nhC +lXw +lXw +lXw +lXw +lXw nhC euv +vUL +vUL +csj +csj +aOO +csj +csj +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +"} +(63,1,1) = {" +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC nhC nhC nhC @@ -98680,6 +98770,116 @@ nhC nhC nhC nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +lXw +nhC +nhC +nhC +nhC +nhC +nhC +lXw +hmB +qKh +qKh +hmB +qKh +qKh +hmB +hmB +hmB +hmB +nhC +dJY +hMZ +dJY +nhC +nhC +dJY +hMZ +dJY +nhC +nhC +dJY +hMZ +dJY +nhC +lXw +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +lXw +nhC +nhC +nhC +lXw +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC +nhC lXw rzL iMC @@ -98922,10 +99122,10 @@ nhC nhC nhC nhC -nhC -nhC -nhC -euv +lXw +lXw +lXw +lXw lXw lXw lXw @@ -99179,12 +99379,12 @@ nhC nhC nhC nhC +lXw nhC nhC nhC lXw nhC -nhC rzL rzL rzL @@ -99436,12 +99636,12 @@ nhC nhC nhC nhC +lXw nhC nhC nhC lXw nhC -nhC xAd cAg kxP @@ -99692,13 +99892,13 @@ nhC nhC nhC nhC +nhC lXw -lXw -lXw -lXw -lXw nhC nhC +nhC +lXw +lXw xAd jXU kxP @@ -99950,11 +100150,11 @@ nhC nhC nhC lXw +lXw nhC nhC nhC -nhC -nhC +lXw rzL rzL gNy From 1ad879bf24dfbfa2378c4b33cfd96c08821408a3 Mon Sep 17 00:00:00 2001 From: Lucy Date: Fri, 10 Jan 2025 15:39:56 -0500 Subject: [PATCH 08/11] Better trash piles! (#4806) * Ports Bubber's improved trash piles * some better checks * don't lowercase the name * add a reminder comment for later --- _maps/map_files/BoxStation/BoxStation.dmm | 328 ++++++++++-------- .../map_files/Deltastation/DeltaStation2.dmm | 158 +++++---- .../map_files/IceBoxStation/IceBoxStation.dmm | 193 +++++++---- _maps/map_files/KiloStation/KiloStation.dmm | 78 +++-- _maps/map_files/MetaStation/MetaStation.dmm | 124 +++++-- _maps/map_files/tramstation/tramstation.dmm | 236 +++++++++---- code/__DEFINES/~monkestation/do_afters.dm | 1 + code/_globalvars/lists/maintenance_loot.dm | 9 +- .../game/objects/structures/trash_pile.dm | 194 +++++++++++ .../blueshift/structures/trash_pile.dm | 139 -------- .../icons => icons/obj}/trash_piles.dmi | Bin tgstation.dme | 2 +- 12 files changed, 928 insertions(+), 534 deletions(-) create mode 100644 monkestation/code/game/objects/structures/trash_pile.dm delete mode 100644 monkestation/code/modules/blueshift/structures/trash_pile.dm rename monkestation/{code/modules/blueshift/icons => icons/obj}/trash_piles.dmi (100%) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index c49ff8f8fab3..ee1a649d9306 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -122,7 +122,7 @@ "aco" = ( /obj/machinery/light/small/directional/west, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/garbage, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) "acw" = ( @@ -1643,11 +1643,6 @@ /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"aAQ" = ( -/obj/effect/decal/cleanable/cobweb, -/obj/effect/spawner/random/trash/garbage, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) "aAY" = ( /obj/effect/turf_decal/box, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -2471,11 +2466,6 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/primary/fore) -"aQR" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/food_packaging, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) "aRd" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -3560,7 +3550,7 @@ /area/station/service/kitchen/coldroom) "bid" = ( /obj/effect/mapping_helpers/broken_floor, -/obj/effect/spawner/random/trash/garbage, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "bio" = ( @@ -6014,6 +6004,11 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) +"bTd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "bTe" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 10 @@ -8640,7 +8635,7 @@ /area/station/maintenance/starboard/aft) "cNm" = ( /obj/effect/decal/cleanable/cobweb, -/obj/effect/spawner/random/trash/grille_or_waste, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/port/aft) "cNp" = ( @@ -10655,11 +10650,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/science/ordnance/testlab) -"dwh" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/cigbutt, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "dws" = ( /obj/effect/turf_decal/trimline/brown/filled/warning, /obj/effect/turf_decal/trimline/brown/warning{ @@ -10932,6 +10922,7 @@ "dAR" = ( /obj/machinery/light/small/directional/west, /obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/department/cargo) "dAS" = ( @@ -12068,6 +12059,11 @@ /obj/effect/landmark/generic_maintenance_landmark, /turf/open/floor/iron, /area/station/maintenance/starboard/aft) +"dSY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "dTj" = ( /obj/structure/reagent_dispensers/plumbed{ dir = 8 @@ -12792,6 +12788,7 @@ "eeb" = ( /obj/effect/decal/cleanable/dirt, /obj/item/bot_assembly/floorbot, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/port/aft) "eed" = ( @@ -16514,11 +16511,6 @@ /obj/effect/spawner/random/clothing/gloves, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"frw" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/grille_or_waste, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) "frx" = ( /obj/structure/chair/stool/directional/east, /obj/effect/landmark/start/assistant, @@ -16613,6 +16605,10 @@ /obj/effect/mapping_helpers/airlock/welded, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"fty" = ( +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "fuc" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 6 @@ -17624,6 +17620,11 @@ /obj/structure/drain, /turf/open/floor/iron/showroomfloor, /area/station/engineering/main) +"fLM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/department/cargo) "fLO" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 4 @@ -22351,6 +22352,7 @@ "hjc" = ( /obj/effect/decal/cleanable/dirt, /obj/item/trash/can/food/chap, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/port/fore) "hjd" = ( @@ -23343,6 +23345,10 @@ }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) +"hyi" = ( +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/port) "hyj" = ( /obj/structure/table/wood, /obj/effect/spawner/random/bureaucracy/folder, @@ -26678,6 +26684,11 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"iFo" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) "iFw" = ( /obj/machinery/light/directional/north, /obj/effect/turf_decal/siding/wood{ @@ -28393,8 +28404,8 @@ /area/station/hallway/secondary/service) "jiS" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/structure/grille, /obj/machinery/duct, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/port/fore) "jiW" = ( @@ -29114,11 +29125,6 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) -"jwC" = ( -/obj/machinery/light/small/directional/north, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) "jwD" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 10 @@ -33577,6 +33583,12 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) +"kRT" = ( +/obj/structure/sign/warning/vacuum/external/directional/north, +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) "kSi" = ( /obj/effect/turf_decal/box, /obj/machinery/holopad, @@ -36467,7 +36479,7 @@ /turf/open/floor/iron/large, /area/station/commons/storage/primary) "lKO" = ( -/obj/effect/spawner/random/trash/garbage, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "lKY" = ( @@ -42230,7 +42242,7 @@ "nIw" = ( /obj/effect/mapping_helpers/burnt_floor, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/garbage, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "nIx" = ( @@ -42681,7 +42693,7 @@ "nPt" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/garbage, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) "nPx" = ( @@ -43466,6 +43478,7 @@ /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, /obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/department/cargo) "obE" = ( @@ -44041,11 +44054,6 @@ /obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"omC" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/cigbutt, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) "omI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -46795,7 +46803,7 @@ /obj/machinery/light/small/directional/north, /obj/structure/sign/poster/random/directional/north, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/garbage, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) "pjT" = ( @@ -49911,7 +49919,7 @@ "qkB" = ( /obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/cigbutt, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/port/fore) "qkP" = ( @@ -52336,6 +52344,11 @@ "rbY" = ( /turf/open/floor/plastic, /area/station/security/prison/safe) +"rcm" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) "rcp" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -56711,7 +56724,7 @@ "sCb" = ( /obj/structure/sign/poster/contraband/free_drone/directional/south, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/grille_or_waste, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/port/fore) "sCj" = ( @@ -60744,6 +60757,11 @@ }, /turf/open/floor/iron/white, /area/station/science/explab) +"tPp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "tPs" = ( /obj/effect/turf_decal/trimline/brown/filled/warning, /obj/machinery/conveyor/inverted{ @@ -61044,7 +61062,7 @@ "tUl" = ( /obj/machinery/light/small/directional/north, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/garbage, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "tUu" = ( @@ -62317,7 +62335,7 @@ "uqh" = ( /obj/machinery/light/small/built/directional/east, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/garbage, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "uql" = ( @@ -62675,6 +62693,11 @@ }, /turf/open/floor/iron/dark/side, /area/station/command/heads_quarters/cmo) +"uvA" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/trash_pile, +/turf/open/floor/catwalk_floor, +/area/station/maintenance/department/security/brig) "uvI" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /obj/structure/table/reinforced/rglass, @@ -67143,6 +67166,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/stone, /area/station/smithing) +"vNO" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/department/science) "vOj" = ( /obj/effect/turf_decal/box, /obj/machinery/portable_atmospherics/pump, @@ -67899,7 +67927,7 @@ "vZd" = ( /obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/garbage, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "vZe" = ( @@ -68143,6 +68171,10 @@ "wcU" = ( /turf/closed/wall/r_wall, /area/station/command/heads_quarters/nt_rep) +"wdh" = ( +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "wdv" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -70324,6 +70356,11 @@ /obj/structure/cable, /turf/open/floor/iron/dark/textured, /area/station/security/prison/safe) +"wNp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/port) "wNr" = ( /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 8 @@ -73646,6 +73683,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/ai) +"xTc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/department/engine/atmos) "xTe" = ( /obj/effect/turf_decal/bot, /obj/machinery/light/small/directional/north, @@ -84263,7 +84305,7 @@ xmp iuN uFU xMz -tRg +fLM cRp lMG hMw @@ -84511,7 +84553,7 @@ xIW cRp cJB bOH -tRg +fLM cRp cRp hsC @@ -84964,7 +85006,7 @@ bvR fPN vKc wRs -fhe +dSY fPN qPR wfE @@ -85448,7 +85490,7 @@ ksa fEP xXP nGn -fhe +dSY wfE esE bgY @@ -85472,7 +85514,7 @@ gWL nZL qPR iHO -fhe +dSY wfE vKc fPN @@ -85484,14 +85526,14 @@ vKc qPR wRs fPN -fhe +dSY wRs vKc fPN eJq wfE iHO -fhe +dSY fPN qAk qem @@ -85552,7 +85594,7 @@ ksa ksa ksa hsC -tRg +fLM cRl xIX hsC @@ -86223,9 +86265,9 @@ xnz vyb bgY fhe -eJq +dSY fPN -fhe +dSY wfE bJN bvR @@ -86748,7 +86790,7 @@ fBi fPN qPR iCB -fhe +dSY fPN fhe fBi @@ -87610,7 +87652,7 @@ ksa hsC xIX cRl -tRg +fLM hsC ksa ksa @@ -87772,7 +87814,7 @@ wfE bvR vKc dwJ -fhe +dSY fPN rpe ldX @@ -87803,7 +87845,7 @@ cBe fPN cwL mYW -fhe +dSY fPN etC aKB @@ -88640,7 +88682,7 @@ fqI cRl xMz xMz -tRg +fLM hsC ksa xXP @@ -89925,7 +89967,7 @@ ksa hsC cKF cRl -tRg +fLM cRp vrf nwz @@ -90441,7 +90483,7 @@ rFQ nkU cJB cRp -nwz +bTd tuu vrf wEB @@ -91985,7 +92027,7 @@ ksa wEB tcw tuu -cuU +bTd wEB uoo uoo @@ -94453,7 +94495,7 @@ xXP ksa nGn hjI -dwh +dSY fhe fPN fhe @@ -94816,7 +94858,7 @@ nwz xUa llR bsX -xzN +iFo lhN ksa vcG @@ -94986,7 +95028,7 @@ nGn nGn nGn fPN -fhe +dSY ydN nVu dUu @@ -95300,7 +95342,7 @@ tei vjs bOO cLZ -cmW +hyi bnl tcw tuu @@ -95484,7 +95526,7 @@ ksa xXP ksa fPN -fhe +dSY fBi qPR fNF @@ -96330,7 +96372,7 @@ uKO gAb uKO bnl -aAQ +cNm tuu lnS wEB @@ -96348,7 +96390,7 @@ tcw xUa hSc xUa -ghA +iFo bsX bsX kwg @@ -96576,7 +96618,7 @@ ksa nfj mbi uHf -tei +wNp uKO cLZ gAb @@ -96589,7 +96631,7 @@ eTW bnl nwz tuu -mxZ +fty wEB nwz feW @@ -96870,7 +96912,7 @@ orM bsX dbt xUa -xzN +iFo vHk pIs mDv @@ -97887,7 +97929,7 @@ bsX pIs xYn bsX -frw +iFo pIs bsX bsX @@ -98129,7 +98171,7 @@ kYL cHc wiI wEB -cuU +bTd rrq nwz jwW @@ -98315,7 +98357,7 @@ pSA nZL xkQ bvR -fhe +dSY iHO nZL udB @@ -98331,7 +98373,7 @@ cou rTA nZL wfb -wfE +dSY iYK nGn ksa @@ -98391,7 +98433,7 @@ rrq kVX wEB wBF -cuU +bTd vrf nwz kVX @@ -99416,11 +99458,11 @@ dsU cXJ cuU nwz -mxZ +fty tcw uov wEB -cuU +bTd lXL vrf xUa @@ -99872,11 +99914,11 @@ jGX jVY wOd fPN -fhe +dSY bvR vKc fPN -fhe +dSY wfE wfE eJq @@ -100452,7 +100494,7 @@ xXP xXP xXP lhN -xzN +iFo bsX bsX vHk @@ -101478,7 +101520,7 @@ uKE sRZ xXP lhN -xzN +iFo pIs bsX ijn @@ -102709,7 +102751,7 @@ hPT jUt hPT fPN -wfE +dSY dwJ nZL slt @@ -102765,7 +102807,7 @@ ksa xUa hiz vHk -omC +iFo xUa xzN vHk @@ -104768,7 +104810,7 @@ mZc lTB oxz wEA -ogk +vNO mZc jXu wEA @@ -105031,7 +105073,7 @@ wEA cMA wEA mZc -ogk +lTB diA wEA mZc @@ -105534,7 +105576,7 @@ mZc klX wEA oxz -wEA +vNO mZc pME wEA @@ -105547,7 +105589,7 @@ wxP mZc fTi fjv -lTB +vNO mZc qMU gbD @@ -105585,7 +105627,7 @@ tgG ewK cNO cNO -pZj +xTc lku oqK vYd @@ -106873,7 +106915,7 @@ mAB tgG lku cNO -pZj +xTc tgG fpJ lku @@ -107646,7 +107688,7 @@ cNO pZj alM tgG -pZj +xTc lku xOq oqK @@ -108109,7 +108151,7 @@ wEA mZc sPR wEA -ogk +vNO pME klX mZc @@ -108419,7 +108461,7 @@ cWF tgG fEa lku -cNO +xTc pZj alM pZj @@ -108688,7 +108730,7 @@ xmk oqK yce lku -pZj +xTc oqK dzR kjV @@ -108864,7 +108906,7 @@ rjQ iyI sZN sZN -orE +uvA sZN azD fTu @@ -108935,7 +108977,7 @@ uLZ xOq pZj pVH -cNO +xTc lku elt oqK @@ -109133,7 +109175,7 @@ nZW nZW czt wEA -cMA +vNO mZc xZd tTk @@ -109453,7 +109495,7 @@ uAC lku cNO xOq -pZj +xTc cNO cNO tgG @@ -110734,7 +110776,7 @@ lMZ alB eBQ tgG -pZj +xTc flV cNO gIF @@ -112284,7 +112326,7 @@ lyy dun uGL tgG -pZj +xTc lku cNO oqK @@ -113057,7 +113099,7 @@ cjZ tgG fEa lku -pZj +xTc uAC pYA tgG @@ -114617,7 +114659,7 @@ alP tgG dzZ cNO -pZj +xTc oqK rHp hyb @@ -115118,12 +115160,12 @@ alM cNO nbg cNO -pZj +xTc cNO tgG fpJ cNO -pZj +xTc tgG dbl vBP @@ -115642,7 +115684,7 @@ nBE aAL vBP mhc -tpC +tPp mhc mhc rUL @@ -116616,7 +116658,7 @@ bbO wxL mOH nBE -tpC +tPp kIt tLM mhc @@ -116673,7 +116715,7 @@ mhc mhc mhc mhc -tpC +tPp nBE mhc mhc @@ -116926,7 +116968,7 @@ ewP dLZ ewP lxy -raC +tPp xcO tpC mhc @@ -117612,7 +117654,7 @@ uyw ffx tKX jxy -nNJ +rcm iLB xXC jxy @@ -117620,7 +117662,7 @@ ybe xXC oed xXC -nNJ +rcm jxy ffx tzc @@ -117653,12 +117695,12 @@ laj mhc gjV nBE -tpC +tPp tLM nep nBE aAL -tpC +tPp nep mhc kIt @@ -117668,7 +117710,7 @@ mhc aAL nBE rUL -tpC +tPp nep tpC rUL @@ -117901,7 +117943,7 @@ eWw qkx cgP nBE -wuf +tPp tLM tLM tLM @@ -118704,7 +118746,7 @@ aAL nep nBE rUL -tpC +tPp nxW jOx byX @@ -118951,7 +118993,7 @@ nBE mhc tLM kIt -tpC +tPp raC nBE raC @@ -118966,7 +119008,7 @@ mhc jOx mhc kIt -tpC +tPp nBE kIt mhc @@ -118980,7 +119022,7 @@ jOx mhc woy nBE -tpC +tPp vBP mhc kIt @@ -119486,7 +119528,7 @@ mhc woy mhc mhc -tpC +tPp nBE nep xTL @@ -119741,7 +119783,7 @@ ojw nBE nep aAL -tpC +tPp mhc nep nBE @@ -119754,7 +119796,7 @@ nBE dbl vBP tpC -xcO +wdh nep mhc mhc @@ -119929,7 +119971,7 @@ iLB iLB iLB nnv -aQR +rcm iLB eGM wiD @@ -120510,11 +120552,11 @@ qhp xTL woy nBE -tpC +tPp mhc woy mhc -tpC +tPp nBE cnU mhc @@ -121033,7 +121075,7 @@ nBE aAL woy mhc -tpC +tPp gjV nBE miz @@ -121299,7 +121341,7 @@ nBE nBE mhc tpC -xcO +wdh nBE ksa ksa @@ -121548,7 +121590,7 @@ iYW tpC mhc nep -woy +tPp nBE byX vYg @@ -121725,7 +121767,7 @@ daY jxy sKo tvo -nNJ +rcm iLB iLB dUM @@ -122229,7 +122271,7 @@ doR xWh iLB aij -nNJ +rcm jxy vMC daY @@ -122998,7 +123040,7 @@ uoo jxy jxy jxy -qNL +kRT aij xXC jxy @@ -123008,7 +123050,7 @@ aij aOz bbG jxy -nNJ +rcm iLB iLB jxy @@ -123016,7 +123058,7 @@ iLB iJp uFo jxy -nNJ +rcm iLB iLB jxy @@ -123090,7 +123132,7 @@ dbl mhc tpC woy -tpC +tPp nBE nep vYg @@ -123267,7 +123309,7 @@ gxY jxy qtL iLB -nNJ +rcm jxy oed cYz @@ -123827,7 +123869,7 @@ nep tpC nep nBE -mhc +tPp lus tpC nBE @@ -124331,8 +124373,8 @@ mbx bms vdT nBE -jwC -tpC +tUl +mhc xcO gvm mhc @@ -124539,7 +124581,7 @@ uoo ksa xWh iLB -nNJ +rcm iLB aij hsf @@ -125329,7 +125371,7 @@ nNJ iLB iJp iLB -iLB +rcm jxy ksa ksa @@ -125371,7 +125413,7 @@ dbl tpC pxW hur -tpC +tPp nBE dbl hur @@ -126341,19 +126383,19 @@ kjj dWS cEM ybe -nNJ +rcm jxy jJh iUf fVV cEn -nNJ +rcm jxy lKO tzc xXC jxy -iLB +rcm iLB nNJ iLB diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 37467164a3b1..a124b0ea9867 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -1144,6 +1144,7 @@ "amS" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/insectguts, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "amW" = ( @@ -3324,8 +3325,8 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/effect/spawner/random/trash/food_packaging, /obj/machinery/light/small/directional/south, +/obj/structure/trash_pile, /turf/open/floor/iron/white, /area/station/maintenance/fore) "aKU" = ( @@ -4332,6 +4333,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/herringbone, /area/station/security/prison/workout) +"aYr" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "aYs" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 9 @@ -7447,6 +7453,10 @@ /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) +"bJd" = ( +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) "bJf" = ( /obj/structure/chair/sofa/bench/right{ dir = 8 @@ -8912,6 +8922,11 @@ }, /turf/open/floor/wood, /area/station/service/library/abandoned) +"bZE" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/trash_pile, +/turf/open/floor/iron, +/area/station/maintenance/port) "bZG" = ( /obj/machinery/door/firedoor, /obj/effect/decal/cleanable/dirt, @@ -11411,8 +11426,7 @@ /turf/open/floor/iron, /area/station/hallway/secondary/entry) "cEa" = ( -/obj/effect/spawner/random/structure/girder, -/obj/effect/spawner/random/trash/grille_or_waste, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/department/chapel) "cEn" = ( @@ -12975,7 +12989,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/obj/effect/spawner/random/structure/girder, +/obj/structure/trash_pile, /turf/open/floor/iron, /area/station/maintenance/port/aft) "cYD" = ( @@ -14847,6 +14861,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/science/robotics/mechbay) +"dxL" = ( +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "dxT" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -16145,7 +16163,7 @@ /area/station/service/library) "dOA" = ( /obj/machinery/airalarm/directional/north, -/obj/effect/spawner/random/trash/caution_sign, +/obj/structure/trash_pile, /turf/open/floor/plating{ icon_state = "foam_plating" }, @@ -17887,7 +17905,7 @@ "ekM" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/item/kirbyplants/random, +/obj/structure/trash_pile, /turf/open/floor/iron, /area/station/maintenance/port) "ekR" = ( @@ -20465,6 +20483,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/structure/trash_pile, /turf/open/floor/iron, /area/station/maintenance/department/security) "ePF" = ( @@ -20609,6 +20628,7 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 }, +/obj/structure/trash_pile, /turf/open/floor/iron, /area/station/maintenance/department/chapel) "eQO" = ( @@ -20760,6 +20780,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, /turf/open/floor/iron, /area/station/maintenance/department/science) "eTU" = ( @@ -22325,6 +22346,12 @@ }, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) +"flt" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/open/floor/iron, +/area/station/maintenance/department/chapel) "flw" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -26202,6 +26229,10 @@ /obj/effect/turf_decal/siding/white, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"ggT" = ( +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "ggY" = ( /obj/structure/table/optable{ desc = "A cold, hard place for your final rest."; @@ -29370,7 +29401,7 @@ /turf/open/floor/iron/dark, /area/station/medical/morgue) "gUa" = ( -/obj/effect/spawner/random/trash/grille_or_waste, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/fore) "gUb" = ( @@ -29656,6 +29687,7 @@ "gWF" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "gWJ" = ( @@ -32906,6 +32938,10 @@ }, /turf/open/floor/iron, /area/station/engineering/main) +"hOj" = ( +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/department/science) "hOw" = ( /obj/structure/chair/office{ dir = 4 @@ -33145,6 +33181,13 @@ }, /turf/open/floor/iron/white, /area/station/science/research) +"hQB" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/structure/trash_pile, +/turf/open/floor/iron, +/area/station/maintenance/port/aft) "hQF" = ( /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron/dark/corner, @@ -35223,8 +35266,8 @@ /area/station/maintenance/department/science) "inq" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/trash_pile, /turf/open/floor/iron/dark, /area/station/service/kitchen/abandoned) "inv" = ( @@ -35696,10 +35739,10 @@ "itV" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/glass, -/obj/effect/spawner/random/structure/grille, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/structure/trash_pile, /turf/open/floor/iron, /area/station/maintenance/department/crew_quarters/bar) "itY" = ( @@ -35925,10 +35968,6 @@ }, /turf/open/floor/iron/white, /area/station/science/robotics/lab) -"iwC" = ( -/obj/effect/spawner/random/structure/grille, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "iwO" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/trimline/hot_pink/filled/line{ @@ -45373,7 +45412,7 @@ "kGj" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/caution_sign, +/obj/structure/trash_pile, /turf/open/floor/iron, /area/station/maintenance/port) "kGo" = ( @@ -45556,6 +45595,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, /obj/structure/extinguisher_cabinet/directional/south, +/obj/structure/trash_pile, /turf/open/floor/iron, /area/station/service/kitchen/abandoned) "kIe" = ( @@ -47400,14 +47440,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/engineering/atmos/project) -"lfm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/duct, -/obj/effect/spawner/random/trash/grille_or_waste, -/turf/open/floor/plating, -/area/station/maintenance/department/security) "lfn" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -50517,6 +50549,7 @@ /obj/effect/turf_decal/tile/neutral/anticorner{ dir = 1 }, +/obj/structure/trash_pile, /turf/open/floor/iron, /area/station/maintenance/port) "lPM" = ( @@ -55498,8 +55531,7 @@ /area/station/command/bridge) "nal" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/girder, -/obj/structure/grille, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/bar) "nav" = ( @@ -56852,7 +56884,7 @@ /area/station/medical/medbay) "ntZ" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/kirbyplants/random, +/obj/structure/trash_pile, /turf/open/floor/iron/dark, /area/station/service/library/abandoned) "nua" = ( @@ -58430,8 +58462,8 @@ /area/station/maintenance/port/fore) "nMP" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/kirbyplants/random, /obj/machinery/newscaster/directional/south, +/obj/structure/trash_pile, /turf/open/floor/wood, /area/station/service/library/abandoned) "nMT" = ( @@ -62659,7 +62691,7 @@ /turf/open/floor/iron/checker, /area/station/service/bar/backroom) "oQa" = ( -/obj/effect/spawner/random/trash/grille_or_waste, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) "oQd" = ( @@ -63547,8 +63579,8 @@ /turf/open/floor/plating, /area/station/service/theater/abandoned) "pcp" = ( -/obj/item/kirbyplants/random, /obj/machinery/light/small/directional/north, +/obj/structure/trash_pile, /turf/open/floor/iron, /area/station/science/research/abandoned) "pct" = ( @@ -68186,9 +68218,9 @@ /turf/open/floor/iron, /area/station/science/research/abandoned) "qer" = ( -/obj/item/kirbyplants/random, /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/contraband/arc_slimes/directional/north, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/service/abandoned_gambling_den) "qev" = ( @@ -74181,10 +74213,6 @@ }, /turf/open/floor/iron, /area/station/security/office) -"rCN" = ( -/obj/effect/spawner/random/structure/girder, -/turf/open/floor/plating, -/area/station/maintenance/fore) "rDd" = ( /obj/machinery/cryopod{ dir = 1 @@ -77835,7 +77863,6 @@ /turf/open/floor/iron/dark/herringbone, /area/station/security/prison) "sxk" = ( -/obj/structure/barricade/wooden, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -77853,6 +77880,7 @@ }, /obj/effect/mapping_helpers/airlock/access/any/science/maintenance, /obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/obj/structure/trash_pile, /turf/open/floor/iron, /area/station/service/abandoned_gambling_den) "sxn" = ( @@ -78619,8 +78647,7 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, -/obj/effect/spawner/random/structure/girder, -/obj/effect/spawner/random/structure/grille, +/obj/structure/trash_pile, /turf/open/floor/iron, /area/station/maintenance/port/aft) "sGJ" = ( @@ -80318,6 +80345,7 @@ }, /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, +/obj/structure/trash_pile, /turf/open/floor/iron, /area/station/medical/abandoned) "sZB" = ( @@ -84576,6 +84604,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, /turf/open/floor/iron, /area/station/medical/abandoned) "ubM" = ( @@ -85648,7 +85677,7 @@ /turf/open/floor/iron/white, /area/station/medical/pathology) "uoV" = ( -/obj/effect/spawner/random/structure/girder, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/port/fore) "upe" = ( @@ -89358,7 +89387,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/grille_or_waste, +/obj/structure/trash_pile, /turf/open/floor/iron, /area/station/maintenance/port/aft) "vka" = ( @@ -91174,6 +91203,7 @@ /area/station/science/ordnance) "vEY" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/structure/trash_pile, /turf/open/floor/iron, /area/station/maintenance/department/medical/morgue) "vFa" = ( @@ -91905,6 +91935,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, +/obj/structure/trash_pile, /turf/open/floor/iron, /area/station/hallway/secondary/construction) "vPL" = ( @@ -92316,7 +92347,7 @@ /area/station/maintenance/port/fore) "vVm" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/effect/spawner/random/trash/grille_or_waste, +/obj/structure/trash_pile, /turf/open/floor/iron, /area/station/maintenance/department/chapel) "vVt" = ( @@ -93661,12 +93692,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/medical/chemistry) -"wly" = ( -/obj/structure/girder, -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/structure/grille, -/turf/open/floor/plating, -/area/station/maintenance/department/security) "wlD" = ( /obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /obj/effect/turf_decal/stripes/line{ @@ -96780,6 +96805,11 @@ /obj/item/radio/intercom/directional/west, /turf/open/floor/iron/white, /area/station/medical/chemistry) +"wWM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/port) "wWS" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/door/firedoor, @@ -98659,6 +98689,11 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/medbay) +"xvI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/department/security) "xvM" = ( /obj/machinery/computer/prisoner/gulag_teleporter_computer{ dir = 1 @@ -99731,6 +99766,7 @@ dir = 9 }, /obj/effect/mapping_helpers/burnt_floor, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/bar) "xGF" = ( @@ -128763,7 +128799,7 @@ aLx pTC sNd iQF -qcM +wWM qXx kQr jDd @@ -129816,7 +129852,7 @@ inm jxT kod hdx -jUx +hOj wEI aaa aaa @@ -129985,7 +130021,7 @@ sOi wzD nmw rUp -iwC +uoV ufO jxB oYs @@ -131126,7 +131162,7 @@ fBX fBX fBX igg -tTg +aYr dzF dzF frM @@ -132342,7 +132378,7 @@ aqF iPb hYi fdB -lbX +bZE pps xtB vHu @@ -132396,7 +132432,7 @@ aZz kui wEI oGr -uYH +dxL ejx qQM wVd @@ -132903,7 +132939,7 @@ afp exM jUx jzZ -jUx +hOj wEI wXH bvd @@ -135233,7 +135269,7 @@ pUi bsN joB qQM -qBk +hQB jFp vkM jjU @@ -139598,7 +139634,7 @@ eug eug mDU swY -uYH +dxL ejE qQM qYo @@ -143077,7 +143113,7 @@ jdL jdL ogK qQp -rCN +gUa jdL deG ukR @@ -146446,7 +146482,7 @@ stf llj rer tpZ -fbu +bJd fbu fbu tpZ @@ -147029,7 +147065,7 @@ jfW gUF ltg fhl -qkj +flt qMf vaE rKL @@ -151874,8 +151910,8 @@ jCb kHZ myc dth -wly -lfm +xvI +icD vHY rYA pgX @@ -152947,7 +152983,7 @@ jyS bLx nXH yiT -ckP +ggT nXH ffY aii @@ -154448,7 +154484,7 @@ dth fws mmy rYA -vHY +xvI hie qbZ riK diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index c24644de3e3c..39f0f14c61c3 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -1730,6 +1730,10 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"aDG" = ( +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) "aDJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -2039,10 +2043,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"aJi" = ( -/obj/item/paper/fluff/jobs/security/beepsky_mom, -/turf/open/floor/plating, -/area/station/maintenance/fore) "aJm" = ( /obj/structure/cable, /obj/machinery/door/window/left/directional/east{ @@ -4471,6 +4471,7 @@ dir = 4; name = "Scrubbers multi deck pipe adapter" }, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "buC" = ( @@ -4628,10 +4629,6 @@ /obj/effect/landmark/blobstart, /turf/open/floor/wood, /area/station/hallway/secondary/service) -"bxJ" = ( -/obj/structure/closet/crate, -/turf/open/floor/plating, -/area/station/maintenance/department/chapel) "bxP" = ( /obj/effect/turf_decal/siding/purple{ dir = 1 @@ -8296,11 +8293,6 @@ }, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/surface/outdoors/nospawn) -"cAe" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/spawner/random/trash/grille_or_waste, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) "cAi" = ( /obj/effect/turf_decal/tile/purple/anticorner, /turf/open/floor/iron/corner{ @@ -8841,6 +8833,7 @@ /obj/structure/disposalpipe/trunk/multiz{ dir = 8 }, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) "cHY" = ( @@ -11115,6 +11108,7 @@ /area/station/engineering/atmos/pumproom) "drm" = ( /obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, /turf/open/floor/iron, /area/station/maintenance/starboard/upper) "drr" = ( @@ -11485,9 +11479,7 @@ /turf/open/floor/iron, /area/station/commons/locker) "dxm" = ( -/obj/structure/rack, -/obj/item/clothing/suit/toggle/labcoat, -/obj/effect/spawner/random/clothing/gloves, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/starboard/upper) "dxn" = ( @@ -11554,10 +11546,10 @@ /turf/open/floor/iron, /area/station/hallway/primary/aft) "dxV" = ( -/obj/structure/rack, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/port/greater) "dyf" = ( @@ -11882,6 +11874,11 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +"dDF" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "dDQ" = ( /obj/structure/table, /obj/machinery/cell_charger{ @@ -12134,7 +12131,7 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos/project) "dIx" = ( -/obj/effect/spawner/random/structure/grille, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/port/fore) "dIy" = ( @@ -12581,7 +12578,7 @@ /turf/open/floor/iron, /area/station/service/hydroponics/garden) "dQN" = ( -/obj/effect/spawner/random/trash/grille_or_waste, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) "dQO" = ( @@ -15695,6 +15692,10 @@ }, /turf/open/floor/iron/grimy, /area/station/ai_monitored/turret_protected/aisat_interior) +"eRJ" = ( +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) "eRK" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -18551,6 +18552,7 @@ /area/station/cargo/warehouse) "fPM" = ( /obj/structure/sign/poster/contraband/random/directional/west, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/port/greater) "fPP" = ( @@ -19014,6 +19016,10 @@ "fYS" = ( /turf/closed/wall, /area/station/commons/storage/primary) +"fYU" = ( +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) "fZb" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "miner-passthrough" @@ -21981,6 +21987,14 @@ /obj/structure/sign/warning/cold_temp, /turf/open/floor/plating, /area/station/maintenance/solars/port/fore) +"gWB" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/structure/cable, +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) "gWX" = ( /obj/structure/chair{ dir = 4 @@ -23857,7 +23871,7 @@ /turf/closed/wall/r_wall, /area/station/command/gateway) "hEl" = ( -/obj/machinery/portable_atmospherics/canister/air, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/bar) "hEm" = ( @@ -24876,6 +24890,10 @@ }, /turf/open/floor/engine, /area/station/science/xenobiology) +"hWL" = ( +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/fore) "hWP" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -25203,8 +25221,8 @@ /turf/open/floor/iron/dark, /area/station/medical/cryo) "ick" = ( -/obj/effect/spawner/random/trash/grille_or_waste, /obj/effect/mapping_helpers/broken_floor, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/port/aft) "icu" = ( @@ -29070,6 +29088,10 @@ /obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) +"joy" = ( +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "joB" = ( /obj/item/beacon, /obj/effect/turf_decal/stripes/line{ @@ -30803,9 +30825,7 @@ /area/station/service/bar/atrium) "jRB" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/table_frame, -/obj/item/wirerod, -/obj/effect/spawner/random/maintenance, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "jRC" = ( @@ -39798,6 +39818,10 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron/dark/textured_edge, /area/station/security/evidence) +"mKD" = ( +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) "mKS" = ( /obj/machinery/light/small/directional/south, /turf/open/floor/plating, @@ -40198,6 +40222,7 @@ color = "#0000ff"; name = "Supply multi deck pipe adapter" }, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) "mRG" = ( @@ -40706,6 +40731,7 @@ /obj/machinery/light/small/directional/north, /obj/structure/sign/poster/contraband/random/directional/north, /obj/effect/mapping_helpers/burnt_floor, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "naq" = ( @@ -45643,6 +45669,10 @@ /obj/machinery/computer/security/qm, /turf/open/floor/iron, /area/station/cargo/quartermaster) +"ovc" = ( +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) "ovm" = ( /obj/structure/cable, /turf/closed/wall/r_wall, @@ -48046,6 +48076,12 @@ }, /turf/open/floor/iron/white, /area/station/science/ordnance/office) +"piO" = ( +/obj/structure/cable, +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/spawner/random/trash/moisture_trap, +/turf/open/floor/wood, +/area/station/maintenance/fore) "piU" = ( /obj/machinery/camera/directional/north{ c_tag = "Armory - Internal - Lower" @@ -50246,11 +50282,11 @@ /turf/open/floor/iron/textured, /area/station/medical/medbay/central) "pQs" = ( -/obj/machinery/space_heater, /obj/effect/spawner/random/trash/graffiti{ pixel_y = -32; spawn_loot_chance = 50 }, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/port/greater) "pQv" = ( @@ -51489,6 +51525,7 @@ /obj/structure/cable, /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/random/directional/south, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/construction) "qoM" = ( @@ -58446,6 +58483,11 @@ /obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/dark/textured, /area/station/engineering/atmos/storage/gas) +"sBM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "sBS" = ( /obj/machinery/camera/directional/west{ c_tag = "Aft Primary Hallway North" @@ -64237,6 +64279,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, +/obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, /area/station/maintenance/fore/lesser) "uyq" = ( @@ -65076,7 +65119,7 @@ /area/station/engineering/storage) "uNw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/item/trash/raisins, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/aft/greater) "uNA" = ( @@ -65225,8 +65268,8 @@ /turf/open/floor/iron/dark, /area/mine/eva/lower) "uPx" = ( -/obj/effect/spawner/random/structure/crate, /obj/effect/mapping_helpers/burnt_floor, +/obj/structure/trash_pile, /turf/open/floor/iron/smooth, /area/station/maintenance/fore/lesser) "uPE" = ( @@ -66847,6 +66890,10 @@ /obj/structure/sign/poster/official/safety_eye_protection/directional/east, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"vsd" = ( +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "vsj" = ( /obj/effect/turf_decal/tile/neutral/diagonal_edge, /obj/structure/table, @@ -66923,7 +66970,7 @@ }, /area/station/science/research) "vtD" = ( -/obj/effect/spawner/random/trash/mess, +/obj/structure/trash_pile, /turf/open/floor/iron, /area/station/maintenance/port/fore) "vuh" = ( @@ -67991,6 +68038,11 @@ /obj/effect/mapping_helpers/mail_sorting/medbay/virology, /turf/open/floor/iron/white, /area/station/medical/pathology) +"vJE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/central) "vJI" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -68204,8 +68256,8 @@ /area/station/ai_monitored/turret_protected/ai_upload) "vOI" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/grille_or_waste, /obj/machinery/duct, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) "vPi" = ( @@ -68515,6 +68567,7 @@ /area/station/security/checkpoint/science) "vUj" = ( /obj/machinery/light/dim/directional/north, +/obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/bar) "vUr" = ( @@ -70734,8 +70787,8 @@ /turf/open/floor/plating, /area/mine/storage) "wDI" = ( -/obj/effect/spawner/random/trash/moisture_trap, /obj/effect/mapping_helpers/broken_floor, +/obj/structure/trash_pile, /turf/open/floor/wood, /area/station/maintenance/fore) "wDK" = ( @@ -71247,6 +71300,12 @@ }, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/surface/outdoors/nospawn) +"wMh" = ( +/obj/structure/cable, +/obj/effect/mapping_helpers/broken_floor, +/obj/item/paper/fluff/jobs/security/beepsky_mom, +/turf/open/floor/plating, +/area/station/maintenance/fore) "wMi" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -72010,7 +72069,7 @@ /area/icemoon/underground/explored) "wXW" = ( /obj/structure/sign/warning/gas_mask/directional/south, -/obj/effect/spawner/random/trash/grille_or_waste, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) "wYf" = ( @@ -75764,6 +75823,10 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) +"yjL" = ( +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) "yjV" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -157493,7 +157556,7 @@ thA thA tKI lSC -kcE +cUy tKI szG thA @@ -173452,7 +173515,7 @@ thA thA nxM imi -nJd +yjL lQi qck eJI @@ -179120,7 +179183,7 @@ jtD rBv owG yjK -oiT +yjL mco hjM gzd @@ -186256,7 +186319,7 @@ thA thA thA tBs -bxJ +fYU mSI tBs eTa @@ -189087,7 +189150,7 @@ nou tBs wMj fbX -wMj +fYU tBs lry oTA @@ -191700,7 +191763,7 @@ vzD vzD jdd xEt -jCl +joy jCl jCl qXY @@ -225569,7 +225632,7 @@ lJO lJO uPS lJO -ndz +sBM whv jhf uyH @@ -226093,7 +226156,7 @@ ovt bZV hjI eUf -uPS +dDF lJO lJO lJO @@ -226117,7 +226180,7 @@ ykG xVL tKI cWn -gJM +ovc lAr tKI tKI @@ -226887,7 +226950,7 @@ tKI tKI tKI tKI -kcE +pdf pdf lAr tKI @@ -228214,7 +228277,7 @@ kNZ pRj bxV uKP -iaT +vsd qfw lLm mLa @@ -229197,7 +229260,7 @@ tKI afz wiA kfe -pdf +ovc tgu jJX tKI @@ -231031,7 +231094,7 @@ daS pRj pRj eQz -blO +vsd wMU pRj pRj @@ -231043,7 +231106,7 @@ ptf ptf pRj bLA -eQz +vsd blO xHe pRj @@ -231560,7 +231623,7 @@ mNY mNY pRj sCw -eQz +daS rAO daS wOB @@ -231817,7 +231880,7 @@ csT mNY gob hwn -cAe +mXa mXa fzA mXa @@ -238731,7 +238794,7 @@ cvS ewi cvS eUI -kwX +eRJ gDp egp kRP @@ -239188,7 +239251,7 @@ sDl sDl sDl tOq -bLq +piO bLq bLq jOQ @@ -240017,7 +240080,7 @@ cvS sDU fgs hnd -pNq +vJE gDp kRP bBW @@ -240473,7 +240536,7 @@ bUx vzf jOQ ykA -ykA +wMh skl iHz jOQ @@ -240727,7 +240790,7 @@ bUx bUx bUx bUx -aJi +hWL dqv cKn ykA @@ -240989,7 +241052,7 @@ skl skl ycc skl -byP +hWL emX eNz rjs @@ -241493,7 +241556,7 @@ hSJ ykw erK foI -deY +hWL deY deY deY @@ -247742,7 +247805,7 @@ kCo ezf asL sZF -sKf +aDG wRr npD npD @@ -247932,7 +247995,7 @@ oBQ mHB gUY lli -lli +mKD kKL kKL lRZ @@ -247941,7 +248004,7 @@ gHm uDW uDW cHy -lli +mKD pub xWM kKL @@ -248465,7 +248528,7 @@ tlH tlH bln kKL -lqh +gWB sEE uKr uKr @@ -248483,7 +248546,7 @@ sZF sZF eZi wEV -sKf +aDG sZF sZF sZF @@ -248970,7 +249033,7 @@ jhS tOX kKL wZZ -lli +mKD iin kKL cSQ @@ -249015,7 +249078,7 @@ wUA wUA sKf sKf -sKf +aDG ktf dPP sKf @@ -251528,7 +251591,7 @@ bln mMb lIC aQe -tml +mKD lli lli lli @@ -251795,7 +251858,7 @@ tMY hVo hJx lIC -lli +mKD unu kKL hno @@ -253407,7 +253470,7 @@ vzD lXi vzD vzD -fxT +joy jOj pGM mvf @@ -257758,7 +257821,7 @@ gti tsJ jCl xWo -axu +joy bFq jCl jCl diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 448b8b510060..f194f875ca48 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -1041,6 +1041,11 @@ }, /turf/open/floor/stone, /area/station/science/xenobiology) +"alQ" = ( +/obj/structure/cable, +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/department/security) "alV" = ( /turf/closed/wall/r_wall/rust, /area/station/ai_monitored/turret_protected/aisat_interior) @@ -1084,8 +1089,8 @@ /area/station/security/prison) "amG" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/structure/girder, /obj/effect/mapping_helpers/burnt_floor, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/fore) "amR" = ( @@ -1892,8 +1897,8 @@ /turf/open/floor/plating, /area/station/maintenance/port/greater) "aAU" = ( -/obj/structure/grille, /obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "aBa" = ( @@ -5355,6 +5360,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/starboard) "bLf" = ( @@ -12968,6 +12974,12 @@ /obj/structure/sign/warning/secure_area, /turf/closed/wall, /area/station/commons/toilet/restrooms) +"ece" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/burnt_floor, +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/port/greater) "eck" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral{ @@ -16316,6 +16328,7 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/landmark/event_spawn, /obj/effect/mapping_helpers/burnt_floor, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/fore) "fgb" = ( @@ -17218,8 +17231,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/obj/effect/spawner/random/trash/grille_or_waste, /obj/effect/mapping_helpers/broken_floor, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "fve" = ( @@ -17245,12 +17258,12 @@ "fvr" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/abandoned, -/obj/structure/barricade/wooden/crude, /obj/structure/cable, /obj/effect/mapping_helpers/airlock/unres{ dir = 1 }, /obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, +/obj/structure/trash_pile, /turf/open/floor/iron/dark, /area/station/maintenance/port/greater) "fvt" = ( @@ -18790,7 +18803,7 @@ /area/station/maintenance/port/greater) "fRS" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/grille, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "fSa" = ( @@ -25246,6 +25259,7 @@ /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, /obj/effect/mapping_helpers/broken_floor, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/port/fore) "hQa" = ( @@ -29842,10 +29856,10 @@ /turf/open/floor/iron/showroomfloor, /area/station/security/office) "jes" = ( -/obj/structure/girder, /obj/effect/turf_decal/stripes/corner, /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/burnt_floor, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/port/lesser) "jet" = ( @@ -34248,6 +34262,12 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) +"kDo" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/burnt_floor, +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "kDy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, @@ -34443,7 +34463,6 @@ /area/station/maintenance/port/greater) "kFG" = ( /obj/effect/mapping_helpers/airlock/abandoned, -/obj/structure/barricade/wooden/crude, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -34454,6 +34473,7 @@ /obj/machinery/door/airlock/medical{ name = "Abandoned Medbay" }, +/obj/structure/trash_pile, /turf/open/floor/iron/dark, /area/station/medical/abandoned) "kFR" = ( @@ -35905,8 +35925,8 @@ /area/station/tcommsat/server) "leD" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/girder, /obj/structure/grille/broken, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/port/greater) "leF" = ( @@ -38204,6 +38224,7 @@ /obj/structure/grille/broken, /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/contraband/random/directional/south, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/starboard) "lPJ" = ( @@ -38455,6 +38476,7 @@ /area/station/service/kitchen/abandoned) "lUZ" = ( /obj/effect/decal/cleanable/blood/old, +/obj/structure/trash_pile, /turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/starboard) "lVe" = ( @@ -43008,6 +43030,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/decoration/glowstick, /obj/effect/mapping_helpers/broken_floor, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "nrS" = ( @@ -43829,12 +43852,12 @@ /turf/open/floor/iron, /area/station/hallway/primary/central/fore) "nGl" = ( -/obj/structure/girder, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/corner{ dir = 4 }, /obj/effect/mapping_helpers/burnt_floor, +/obj/structure/trash_pile, /turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/starboard) "nGt" = ( @@ -47290,6 +47313,7 @@ "oQk" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/broken_floor, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "oQl" = ( @@ -49179,9 +49203,9 @@ /area/station/engineering/storage/tech) "prY" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/grille_or_waste, /obj/structure/cable, /obj/effect/mapping_helpers/broken_floor, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "psh" = ( @@ -52792,7 +52816,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/structure/girder/displaced, /obj/structure/grille/broken, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -55834,9 +55857,9 @@ /area/station/science/lab) "rwW" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/girder/displaced, /obj/structure/grille/broken, /obj/effect/mapping_helpers/broken_floor, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/port/fore) "rxo" = ( @@ -56455,11 +56478,11 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "rHs" = ( -/obj/structure/table, /obj/effect/turf_decal/stripes/corner{ dir = 4 }, /obj/item/clothing/under/rank/security/officer, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/port/lesser) "rHz" = ( @@ -60441,6 +60464,7 @@ dir = 4 }, /obj/effect/mapping_helpers/broken_floor, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/fore) "sTU" = ( @@ -63892,6 +63916,7 @@ /obj/effect/decal/cleanable/cobweb, /obj/effect/spawner/random/maintenance, /obj/effect/mapping_helpers/broken_floor, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/starboard) "ucP" = ( @@ -66025,7 +66050,6 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot_white, /obj/machinery/light/small/directional/west, -/obj/structure/rack, /obj/item/storage/toolbox/emergency{ pixel_y = 5 }, @@ -66035,6 +66059,7 @@ dir = 4 }, /obj/machinery/light_switch/directional/north, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/abandon_wrestle) "uMb" = ( @@ -70183,9 +70208,9 @@ /turf/open/floor/iron, /area/station/hallway/primary/aft) "vWU" = ( -/obj/structure/girder, /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/burnt_floor, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/port/lesser) "vXa" = ( @@ -70869,8 +70894,8 @@ /turf/open/floor/carpet/neon/simple/green, /area/station/science/xenobiology) "whj" = ( -/obj/structure/girder, /obj/effect/decal/cleanable/cobweb, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/port/greater) "whm" = ( @@ -71212,6 +71237,15 @@ /obj/machinery/light/directional/east, /turf/open/floor/carpet/green, /area/station/service/lawoffice) +"wmS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/structure/sign/poster/contraband/random/directional/east, +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) "wmZ" = ( /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/transit_tube/crossing, @@ -72465,8 +72499,8 @@ "wHu" = ( /obj/effect/turf_decal/stripes/corner, /obj/effect/decal/cleanable/dirt, -/obj/structure/girder, /obj/effect/mapping_helpers/broken_floor, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/disposal) "wHF" = ( @@ -75252,8 +75286,8 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, /obj/structure/cable, -/obj/effect/spawner/random/trash/grille_or_waste, /obj/effect/mapping_helpers/broken_floor, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "xBw" = ( @@ -89033,7 +89067,7 @@ hah rTS fvB ycx -oVz +ece aiI ycx pqD @@ -91108,7 +91142,7 @@ rKK hZL iVj ivU -lBQ +alQ iVj iVj iVj @@ -113145,7 +113179,7 @@ vJc vJc vJc uWJ -pAx +wmS olL ikH pAx @@ -116064,7 +116098,7 @@ fuB hiQ vGu cuV -gDM +kDo mrQ bnX vHF diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 37db730a9365..4ce25a5c1357 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -2983,6 +2983,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/prison) +"aYf" = ( +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "aYt" = ( /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters/preopen{ @@ -5272,6 +5276,7 @@ "bQK" = ( /obj/effect/mapping_helpers/broken_floor, /obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) "bQM" = ( @@ -6289,6 +6294,10 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/foyer) +"cox" = ( +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/fore) "coJ" = ( /obj/structure/chair/stool/directional/north, /obj/effect/decal/cleanable/blood/old, @@ -8579,6 +8588,10 @@ /obj/structure/chair/stool/bar/directional/west, /turf/open/floor/plating, /area/station/maintenance/port) +"dfQ" = ( +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "dfS" = ( /obj/effect/turf_decal/box/corners, /turf/open/floor/iron, @@ -10233,6 +10246,11 @@ /obj/machinery/bluespace_vendor/directional/south, /turf/open/floor/iron, /area/station/commons/locker) +"dLX" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/trash_pile, +/turf/open/floor/iron, +/area/station/maintenance/port/aft) "dMb" = ( /obj/structure/table, /obj/item/analyzer, @@ -16243,7 +16261,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/spawner/random/structure/grille, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/fore) "fRZ" = ( @@ -17566,6 +17584,7 @@ /area/station/engineering/main) "gpO" = ( /obj/machinery/light/small/directional/south, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) "gpQ" = ( @@ -24132,6 +24151,7 @@ /area/station/hallway/secondary/exit/departure_lounge) "iym" = ( /obj/machinery/light/small/directional/north, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) "iyy" = ( @@ -27978,9 +27998,7 @@ /area/station/science/research) "jJY" = ( /obj/structure/cable, -/obj/effect/spawner/random/trash/garbage{ - spawn_scatter_radius = 1 - }, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/aft/greater) "jKa" = ( @@ -30629,6 +30647,10 @@ }, /turf/open/floor/iron/dark, /area/station/medical/morgue) +"kFY" = ( +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/port) "kGc" = ( /obj/machinery/computer/rdconsole, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ @@ -31272,8 +31294,8 @@ /turf/open/floor/iron, /area/station/hallway/secondary/entry) "kRA" = ( -/obj/effect/spawner/random/engineering/atmospherics_portable, /obj/effect/mapping_helpers/broken_floor, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/port) "kRS" = ( @@ -37327,6 +37349,7 @@ /area/station/science/robotics/mechbay) "mTB" = ( /obj/effect/landmark/blobstart, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) "mTI" = ( @@ -40179,8 +40202,8 @@ /area/station/hallway/primary/port) "nQz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/spawner/random/trash/janitor_supplies, /obj/effect/mapping_helpers/broken_floor, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/port) "nQA" = ( @@ -40302,12 +40325,12 @@ /turf/open/floor/iron, /area/station/command/gateway) "nTd" = ( -/obj/structure/rack, /obj/effect/spawner/random/food_or_drink/seed, /obj/item/seeds/cannabis, /obj/item/seeds/cannabis, /obj/item/seeds/cannabis, /obj/item/food/grown/mushroom/glowshroom, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "nTm" = ( @@ -44678,6 +44701,7 @@ /area/station/hallway/primary/central) "puI" = ( /obj/effect/mapping_helpers/broken_floor, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) "puQ" = ( @@ -46459,8 +46483,8 @@ /turf/open/floor/iron, /area/station/hallway/primary/central) "qcP" = ( -/obj/effect/landmark/blobstart, /obj/effect/mapping_helpers/burnt_floor, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "qdm" = ( @@ -48895,6 +48919,7 @@ dir = 6 }, /obj/effect/decal/cleanable/cobweb, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/fore) "qRM" = ( @@ -52286,8 +52311,8 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) "rYH" = ( -/obj/structure/rack, /obj/item/clothing/suit/hazardvest, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/fore) "rYI" = ( @@ -52956,6 +52981,7 @@ /area/station/medical/storage) "sjc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/trash_pile, /turf/open/floor/iron/dark, /area/station/maintenance/aft/lesser) "sjx" = ( @@ -54482,6 +54508,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/aft/greater) +"sMN" = ( +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) "sMS" = ( /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, @@ -55347,7 +55377,7 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) "tbd" = ( -/obj/effect/spawner/random/structure/grille, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "tbp" = ( @@ -55818,6 +55848,7 @@ /area/station/security/prison/garden) "tiU" = ( /obj/machinery/light/small/directional/east, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "tja" = ( @@ -56922,6 +56953,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/security/interrogation) +"tDP" = ( +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "tDR" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/mix_output{ dir = 1 @@ -58000,6 +58035,7 @@ /area/station/maintenance/port) "tZo" = ( /obj/machinery/light/small/directional/south, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "tZz" = ( @@ -58667,6 +58703,10 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/service) +"ukM" = ( +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/starboard/greater) "ukN" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -61706,6 +61746,11 @@ /obj/item/wrench/medical, /turf/open/floor/iron/dark, /area/station/medical/storage) +"vot" = ( +/obj/effect/mapping_helpers/burnt_floor, +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/port) "voZ" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -65403,6 +65448,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"wGm" = ( +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) "wGz" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/light_construct/directional/east, @@ -66755,10 +66804,10 @@ /turf/open/floor/iron, /area/station/maintenance/starboard/greater) "xcR" = ( -/obj/structure/rack, /obj/effect/spawner/random/maintenance, /obj/effect/mapping_helpers/broken_floor, /obj/item/clothing/suit/hazardvest, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "xdm" = ( @@ -67895,6 +67944,7 @@ /area/station/medical/medbay/central) "xwP" = ( /obj/effect/decal/cleanable/cobweb, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) "xwV" = ( @@ -84194,7 +84244,7 @@ jmJ pOa uEO ayH -vXH +kFY gDZ uOH vXH @@ -84713,7 +84763,7 @@ vXH aDl pOa vZE -tYi +kFY wRK jUb ebG @@ -85761,7 +85811,7 @@ jUb jUb jUb jUb -qHK +tDP shK jUb kvS @@ -86008,7 +86058,7 @@ pAe rzB pAe jUb -cBc +dLX aFf byW eNV @@ -86529,7 +86579,7 @@ bOH dqN mec cNS -dqN +tDP jUb sMS dqN @@ -87278,7 +87328,7 @@ pOa fSN rwB tYi -vXH +kFY pOa tak jUb @@ -88083,7 +88133,7 @@ ryQ rab iTH bhS -drm +wGm drm cIP vkr @@ -88567,7 +88617,7 @@ qgw uOH uOH uOH -vXH +kFY uOH jUb jvf @@ -88606,7 +88656,7 @@ tSw wxF tSw fYC -drm +wGm tSw mnN kNV @@ -88765,14 +88815,14 @@ pgJ fRZ hZQ ybi -twr +aYf dOS xxp twr sxn aiW vpU -twr +aYf rSa jXu jXu @@ -88809,7 +88859,7 @@ pqc rkM pOa hKp -rpE +vot vXH usi sNM @@ -89100,7 +89150,7 @@ vSI oZO pXQ jUb -dqN +tDP kym jUb iOf @@ -89291,7 +89341,7 @@ jXu jXu jFk xgB -sHu +aYf twr twr jXu @@ -90324,7 +90374,7 @@ aaf aaa aaa jXu -twr +aYf gkS mxh kod @@ -91081,7 +91131,7 @@ aaa jXu fTT sOP -twr +aYf kwi jXu xVc @@ -99403,7 +99453,7 @@ oHO mGI oEx rFX -gma +sMN gvI dKC iUm @@ -99660,7 +99710,7 @@ svS svS svS svS -oEx +gma hlF dKC iJD @@ -103506,7 +103556,7 @@ uvh uvh svS oGn -nFa +sMN svS svS svS @@ -103925,7 +103975,7 @@ aaa aaa aaa ilh -cur +cox cur eNH cur @@ -106585,7 +106635,7 @@ hEV bLd uGX vBw -fPD +dfQ bLd rhe bLd @@ -107872,7 +107922,7 @@ mEL sCM clj uGX -fPD +dfQ deD clj vBw @@ -108821,7 +108871,7 @@ mXk oPZ qXB gVx -oPZ +tbd tCS tCS tCS @@ -108873,7 +108923,7 @@ aXE tXk itW kGv -izp +ukM hcP vIm mhl @@ -110100,7 +110150,7 @@ afD afD afD qXB -oPZ +tbd wha jRz rtu @@ -114985,7 +115035,7 @@ qSh qSh qSh tCS -kYn +tbd wrn tCS xVV diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 8c12bb1f32cf..f3a8124b26c5 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -2242,6 +2242,7 @@ name = "Tram Maintenance Dock Access"; pixel_x = 8 }, +/obj/structure/trash_pile, /turf/open/floor/iron, /area/station/maintenance/port/central) "ahS" = ( @@ -2572,6 +2573,11 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/construction/engineering) +"aku" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/open/floor/iron/smooth, +/area/station/maintenance/central/lesser) "akC" = ( /obj/structure/industrial_lift/public, /obj/effect/turf_decal/caution/stand_clear/red, @@ -2862,6 +2868,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/fitness/recreation) +"anl" = ( +/obj/structure/trash_pile, +/turf/open/floor/iron/smooth, +/area/station/maintenance/department/science) "anq" = ( /obj/machinery/light/dim/directional/south, /obj/machinery/duct, @@ -4483,9 +4493,15 @@ }, /turf/open/floor/iron/white, /area/station/security/medical) +"aDn" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/open/floor/iron/smooth, +/area/station/maintenance/department/science) "aDq" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/north, +/obj/structure/trash_pile, /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/greater) "aDu" = ( @@ -6938,6 +6954,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/trash_pile, /turf/open/floor/catwalk_floor, /area/station/maintenance/port/aft) "beP" = ( @@ -10235,6 +10252,7 @@ id = "freevbucks4u"; name = "Blast Door Toggle" }, +/obj/structure/trash_pile, /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/greater) "cdV" = ( @@ -10524,6 +10542,11 @@ }, /turf/open/floor/wood, /area/station/command/meeting_room) +"cgQ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/open/floor/iron/smooth, +/area/station/maintenance/central/greater) "cgR" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 @@ -11589,11 +11612,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"czY" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/cigbutt, -/turf/open/floor/iron/smooth, -/area/station/maintenance/starboard/greater) "cAd" = ( /obj/structure/marker_beacon/burgundy, /turf/open/floor/plating/airless, @@ -18127,6 +18145,11 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/atmos/pumproom) +"eEv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/open/floor/iron/smooth, +/area/station/maintenance/port/central) "eEx" = ( /obj/structure/cable, /obj/structure/extinguisher_cabinet/directional/north, @@ -18426,7 +18449,7 @@ /area/ruin/powered/clownplanet) "eKH" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/girder, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/maintenance/department/cargo) "eLb" = ( @@ -18743,6 +18766,7 @@ /obj/structure/cable, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, +/obj/structure/trash_pile, /turf/open/floor/catwalk_floor, /area/station/maintenance/department/crew_quarters/dorms) "eQn" = ( @@ -20720,6 +20744,11 @@ /obj/machinery/growing/tray, /turf/open/floor/iron/dark, /area/station/security/prison/garden) +"fwu" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/open/floor/iron/smooth, +/area/station/maintenance/department/cargo) "fwA" = ( /obj/effect/turf_decal/trimline/neutral/filled/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -23750,8 +23779,8 @@ /area/station/cargo/miningdock) "gxy" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/cigbutt, /obj/structure/sign/poster/contraband/random/directional/east, +/obj/structure/trash_pile, /turf/open/floor/plating, /area/station/asteroid) "gxY" = ( @@ -24095,6 +24124,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/central) +"gDE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/open/floor/iron/smooth, +/area/station/maintenance/department/eva) "gDU" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -27718,6 +27752,11 @@ /obj/structure/sink/directional/south, /turf/open/floor/iron/dark, /area/station/security/prison/garden) +"hOa" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/open/floor/iron/smooth, +/area/station/maintenance/department/crew_quarters/dorms) "hOd" = ( /obj/effect/turf_decal/trimline/brown/filled/corner{ dir = 1 @@ -28131,6 +28170,11 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/maint) +"hUS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/open/floor/iron/smooth, +/area/station/maintenance/starboard/central) "hUY" = ( /obj/machinery/door/airlock/external{ autoclose = 0; @@ -28494,6 +28538,11 @@ }, /turf/open/floor/iron, /area/station/command/bridge) +"ibq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/open/floor/iron/smooth, +/area/station/maintenance/department/security) "ibs" = ( /obj/machinery/recharge_station, /obj/effect/turf_decal/box, @@ -35861,6 +35910,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/lesser) "knD" = ( @@ -38889,6 +38939,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/trash_pile, /turf/open/floor/catwalk_floor, /area/station/maintenance/port/central) "lhi" = ( @@ -40374,6 +40425,10 @@ /obj/effect/turf_decal/loading_area, /turf/open/floor/iron, /area/station/cargo/storage) +"lGW" = ( +/obj/structure/trash_pile, +/turf/open/floor/iron/smooth, +/area/station/maintenance/starboard/greater) "lHa" = ( /obj/structure/chair/office{ dir = 4 @@ -42132,6 +42187,10 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron/smooth, /area/station/maintenance/tram/mid) +"mjy" = ( +/obj/structure/trash_pile, +/turf/open/floor/iron/smooth, +/area/station/maintenance/department/medical) "mjD" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot_white, @@ -48925,6 +48984,11 @@ /obj/structure/disposalpipe/junction/flip, /turf/open/floor/iron, /area/station/cargo/office) +"ouF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/open/floor/iron/smooth, +/area/station/maintenance/port/aft) "ouG" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -49297,6 +49361,19 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/catwalk_floor, /area/station/solars/starboard/fore) +"oAh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/trash_pile, +/turf/open/floor/catwalk_floor, +/area/station/maintenance/department/science) +"oAl" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/open/floor/iron/smooth, +/area/station/maintenance/starboard/lesser) "oAn" = ( /obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ dir = 4 @@ -53158,6 +53235,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/security/brig) +"pLh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/maintenance/central/lesser) "pLH" = ( /turf/closed/wall, /area/station/engineering/engine_smes) @@ -54675,6 +54760,10 @@ }, /turf/open/openspace, /area/station/security/brig) +"qkC" = ( +/obj/structure/trash_pile, +/turf/open/floor/iron/smooth, +/area/station/asteroid) "qkG" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -56748,6 +56837,11 @@ /obj/structure/cable, /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/greater) +"qRD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/open/floor/iron/white, +/area/station/maintenance/department/science) "qRO" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -60612,6 +60706,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"sek" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/open/floor/iron/smooth, +/area/station/maintenance/starboard/greater) "sem" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -67750,6 +67849,10 @@ }, /turf/open/floor/iron/dark, /area/station/science/ordnance/storage) +"urg" = ( +/obj/structure/trash_pile, +/turf/open/floor/plating, +/area/station/asteroid) "urm" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1 @@ -67971,6 +68074,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 5 }, +/obj/structure/trash_pile, /turf/open/floor/iron/smooth, /area/station/maintenance/central/lesser) "utL" = ( @@ -69063,6 +69167,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/trash_pile, /turf/open/floor/catwalk_floor, /area/station/maintenance/department/crew_quarters/dorms) "uJk" = ( @@ -70794,6 +70899,11 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plating, /area/station/service/chapel/monastery) +"vkf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/trash_pile, +/turf/open/floor/iron/smooth, +/area/station/maintenance/department/medical) "vkm" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, @@ -71390,11 +71500,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/medical/pathology) -"vrM" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/cigbutt, -/turf/open/floor/iron/smooth, -/area/station/maintenance/department/crew_quarters/dorms) "vrN" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ @@ -78440,6 +78545,7 @@ /obj/machinery/light/directional/north, /obj/item/screwdriver, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/trash_pile, /turf/open/floor/iron, /area/station/maintenance/port/central) "xIj" = ( @@ -91579,7 +91685,7 @@ wRg vNP rqB oBJ -lgu +hOa lgu uQR kXS @@ -91826,7 +91932,7 @@ aac aac aac apC -lgu +hOa eCE eCE eCE @@ -94420,7 +94526,7 @@ kkk lgu lgu lgu -lgu +hOa apC aaa aaa @@ -94657,7 +94763,7 @@ aaa apC lZP lgu -vNP +hOa apC oGY iCe @@ -94670,7 +94776,7 @@ hAD qYx fhB apC -vNP +hOa lgu cAY apC @@ -96191,7 +96297,7 @@ lQM kcA owM lQM -jAk +eEv pZW elr elr @@ -97248,7 +97354,7 @@ apC elD xAV jXf -lgu +hOa apC aac aac @@ -99561,7 +99667,7 @@ aqY apC lgu jXf -lgu +hOa nTT aac aac @@ -100337,7 +100443,7 @@ jnq lgu lgu lgu -lgu +hOa apC aac aac @@ -100541,7 +100647,7 @@ eVG gpp pZW dBd -jAk +eEv pZW pZW fef @@ -106232,7 +106338,7 @@ jnq sAK sAK gQr -dmp +pLh hxz jIG iDB @@ -106437,7 +106543,7 @@ dCw nMu nMu nMu -nMu +cgQ hFr vXM vXM @@ -106928,7 +107034,7 @@ toD nMu mdS hFr -nMu +cgQ nMu xwB eSk @@ -107183,7 +107289,7 @@ hFr nMu nMu nMu -nMu +cgQ hFr nMu nMu @@ -107961,7 +108067,7 @@ hFr uDa uDa hFr -uDa +cgQ wdh hFr hFr @@ -107994,7 +108100,7 @@ tGv rjL dCh fSI -nMu +cgQ hFr aaa aaa @@ -111096,7 +111202,7 @@ pOI tmC jnq jnq -sAK +aku hxz jnq nsy @@ -114672,7 +114778,7 @@ sSU ykX sSU sSU -sSU +lGW mGw vNM aFb @@ -116725,7 +116831,7 @@ iRL qws quF quF -czY +sek iRL aWQ ykX @@ -117020,7 +117126,7 @@ wQP wQP wQP wQP -psP +oAl psP psP pgS @@ -117753,7 +117859,7 @@ kvl quF quF quF -quF +sek hjJ quF ykX @@ -118563,7 +118669,7 @@ aaa aaa wQP lYD -psP +oAl psP pgS knC @@ -119088,7 +119194,7 @@ wQP dxA wZb wxN -wZb +urg qWU qEw kbw @@ -119560,7 +119666,7 @@ quF quF lYV quF -quF +sek iRL aaa aaa @@ -120842,7 +120948,7 @@ iRL aCF pWy quF -quF +sek wOp bXk bXk @@ -120877,7 +120983,7 @@ oPQ hmf fdG bWN -psP +oAl qwy hXn pFS @@ -122635,7 +122741,7 @@ aaa aaa aaa iRL -czY +sek quF quF lYV @@ -122644,7 +122750,7 @@ iRL gJo iCY gJo -quF +sek aaS aaa aaa @@ -124704,7 +124810,7 @@ arE arE arE cpW -quF +sek iRL aaa mbJ @@ -126006,7 +126112,7 @@ qxm tkC xyK gju -gDw +hUS rZu qxm icR @@ -127031,7 +127137,7 @@ hly qxm gDw icR -gDw +hUS iix ljE jNA @@ -130104,7 +130210,7 @@ aaa aaa aaa qxm -gDw +hUS gDw wZZ gDw @@ -130112,7 +130218,7 @@ gDw gDw qPe gDw -gDw +hUS qxm ecO oys @@ -157069,7 +157175,7 @@ gYB qQs qbB wWq -gKX +gDE osk aaa osk @@ -158610,7 +158716,7 @@ osk jta iZl iZl -iZl +qkC ayR ayR ayR @@ -158925,7 +159031,7 @@ mQa kgM aZT cTY -mQa +ouF tdx tdx mQa @@ -160212,7 +160318,7 @@ apO tdx gLI mQa -tdx +ouF mQa tdx aaa @@ -167914,7 +168020,7 @@ lpu cvI hbg apC -lgu +hOa jPK bpr orr @@ -168947,7 +169053,7 @@ jPK bpr lgu iRm -lgu +hOa apC aaa aaa @@ -169455,7 +169561,7 @@ fsC mOm lgu lgu -lgu +hOa apC jPK anX @@ -170484,7 +170590,7 @@ cYh wqe aSU aSU -vrM +hOa jPK apC aaa @@ -170944,7 +171050,7 @@ etQ omm vdh omm -oeY +ibq saa omm aaa @@ -172226,7 +172332,7 @@ wyX rQX jel oeY -saa +ibq vdh omm gFp @@ -172545,7 +172651,7 @@ jPK apC gRD vze -lgu +hOa apC abM bxJ @@ -172728,7 +172834,7 @@ abM aaa aaa omm -oeY +ibq oeY oeY vQt @@ -183317,7 +183423,7 @@ kgL afy afy whz -srC +mjy vNN whz whz @@ -183848,7 +183954,7 @@ kSi cyX iLn srC -iLn +vkf rNg ela mFG @@ -184315,7 +184421,7 @@ aaa aaa aaa lZW -sAO +fwu qHl qHl sVA @@ -186657,7 +186763,7 @@ soY kgL afy lVi -mHE +aDn mHE mHE mHE @@ -187442,7 +187548,7 @@ soq soq soq soq -kNS +anl kCF lVi jey @@ -188993,7 +189099,7 @@ lVi lVi lVi mHE -mHE +aDn mHE lVi lVi @@ -190033,7 +190139,7 @@ qVr bfH bfH soq -rsL +oAh rsL rsL soq @@ -190294,7 +190400,7 @@ soq soq rsL soq -nNX +qRD cLZ xCS lVi diff --git a/code/__DEFINES/~monkestation/do_afters.dm b/code/__DEFINES/~monkestation/do_afters.dm index d874131ac265..6e5bd483cde3 100644 --- a/code/__DEFINES/~monkestation/do_afters.dm +++ b/code/__DEFINES/~monkestation/do_afters.dm @@ -1 +1,2 @@ #define DOAFTER_SOURCE_CLIMBING "doafter_climbing" +#define DOAFTER_SOURCE_TRASH_PILE "doafter_trash_pile" diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index 1a1a7d3468ff..8ddb6fa39892 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -71,6 +71,13 @@ GLOBAL_LIST_INIT(trash_loot, list(//junk: useless, very easy to get, or ghetto c )) +// monkestation addition: just trash_loot with a chance of banana peels +GLOBAL_LIST_INIT(trash_pile_loot, list( + GLOB.trash_loot = 150, + /obj/item/grown/bananapeel = 20, + /obj/item/grown/bananapeel/bluespace = 1, // I am SO going to regret this later ~Lucy +)) +// monkestation end GLOBAL_LIST_INIT(common_loot, list( //common: basic items list(//tools @@ -369,7 +376,7 @@ GLOBAL_LIST_INIT(rarity_loot, list(//rare: really good items GLOBAL_LIST_INIT(oddity_loot, list(//oddity: strange or crazy items - /obj/effect/rune/teleport = 1, + /* /obj/effect/rune/teleport = 1, */ // monkestation removal: this should really only have /obj/items /obj/item/clothing/head/helmet/abductor = 1, /obj/item/clothing/shoes/jackboots/fast = 1, /obj/item/clothing/suit/armor/reactive/table = 1, diff --git a/monkestation/code/game/objects/structures/trash_pile.dm b/monkestation/code/game/objects/structures/trash_pile.dm new file mode 100644 index 000000000000..bcfb69a1c145 --- /dev/null +++ b/monkestation/code/game/objects/structures/trash_pile.dm @@ -0,0 +1,194 @@ +/obj/structure/trash_pile + name = "trash pile" + desc = "A heap of dense garbage. Perhaps there is something interesting inside?" + icon = 'monkestation/icons/obj/trash_piles.dmi' + icon_state = "randompile" + density = TRUE + anchored = TRUE + layer = TABLE_LAYER + obj_flags = CAN_BE_HIT + pass_flags_self = LETPASSTHROW | LETPASSCLICKS + + max_integrity = 50 + + var/hide_person_time = 3 SECONDS + var/hide_item_time = 1 SECONDS + + /// Lazy associative list of ckeys to TRUE if they have searched it. + var/list/searched_by_ckeys + + var/trash_delay = 0.5 SECONDS + var/funny_sound_delay = 0.2 SECONDS + + COOLDOWN_DECLARE(trash_cooldown) + COOLDOWN_DECLARE(funny_sound_cooldown) + + var/static/list/funny_sounds = list( //Assoc list of funny sounds (funny sound to weight) + 'sound/effects/adminhelp.ogg' = 1, + 'sound/effects/footstep/clownstep1.ogg' = 5, + 'sound/effects/footstep/clownstep2.ogg' = 5, + 'sound/effects/footstep/meowstep1.ogg' = 1, + 'sound/effects/attackblob.ogg' = 10, + 'sound/effects/bang.ogg' = 10, + 'sound/effects/bin_close.ogg' = 20, + 'sound/effects/bin_open.ogg' = 20, + 'sound/effects/boing.ogg' = 5, + 'sound/effects/cartoon_splat.ogg' = 1, + 'sound/effects/cashregister.ogg' = 1, + 'sound/effects/glassbash.ogg' = 50, + 'sound/effects/glassbr1.ogg' = 20, + 'sound/effects/glassbr2.ogg' = 20, + 'sound/effects/glassbr3.ogg' = 20, + 'sound/effects/grillehit.ogg' = 20, + 'sound/effects/hit_on_shattered_glass.ogg' = 20, + 'monkestation/sound/effects/jingle.ogg' = 50, + 'sound/effects/meatslap.ogg' = 50, + 'sound/effects/quack.ogg' = 20, + 'sound/effects/rustle1.ogg' = 100, + 'sound/effects/rustle2.ogg' = 100, + 'sound/effects/rustle3.ogg' = 100, + 'sound/effects/rustle4.ogg' = 100, + 'sound/effects/rustle5.ogg' = 100, + ) + +/obj/structure/trash_pile/Destroy() + var/drop_loc = drop_location() + if(drop_loc) + for(var/atom/movable/thing in contents) + thing.forceMove(drop_loc) + return ..() + +/obj/structure/trash_pile/Initialize(mapload) + . = ..() + AddElement(/datum/element/climbable) + AddElement(/datum/element/elevation, pixel_shift = 12) + icon_state = pick( + "pile1", + "pile2", + "pilechair", + "piletable", + "pilevending", + "brtrashpile", + "microwavepile", + "rackpile", + "boxfort", + "trashbag", + "brokecomp", + ) + +/obj/structure/trash_pile/attack_hand(mob/living/user) + if(user in contents) + eject_mob(user) + return + if(DOING_INTERACTION(user, DOAFTER_SOURCE_TRASH_PILE)) + return + if(!ishuman(user) || (user.istate & ISTATE_HARM) || !user.ckey) + return ..() + + user.balloon_alert_to_viewers("digs through trash...") + playsound(get_turf(src), pick('sound/effects/rustle1.ogg', 'sound/effects/rustle2.ogg', 'sound/effects/rustle3.ogg', 'sound/effects/rustle4.ogg', 'sound/effects/rustle5.ogg'), 50) + + if(!do_after(user, 3 SECONDS, src, extra_checks = CALLBACK(src, PROC_REF(throw_trash), user), interaction_key = DOAFTER_SOURCE_TRASH_PILE)) + return + + var/content_length = length(contents) + if(content_length) //Something hidden inside (mob/item) + var/atom/movable/hidden = contents[content_length] // Get the most recent hidden thing + if(isliving(hidden)) + balloon_alert(user, "someone is inside!") + eject_mob(hidden) + else + balloon_alert(user, "found something!") + hidden.forceMove(drop_location()) + return + if(LAZYACCESS(searched_by_ckeys, user.ckey)) + balloon_alert(user, "empty...") + return + var/item_to_spawn = pick_weight_recursive(GLOB.maintenance_loot) + var/obj/item/spawned_item = new item_to_spawn(drop_location()) + if(!QDELETED(spawned_item)) + balloon_alert(user, "found [spawned_item]!") + else + balloon_alert(user, "found nothing...") + LAZYSET(searched_by_ckeys, user.ckey, TRUE) + +/obj/structure/trash_pile/attackby(obj/item/attacking_item, mob/living/user, params) + if(user in contents) + eject_mob(user) + return + if((user.istate & ISTATE_HARM) || DOING_INTERACTION(user, DOAFTER_SOURCE_TRASH_PILE)) + return ..() + if(length(contents) >= 10) + balloon_alert(user, "it's full!") + return + balloon_alert(user, "hiding item...") + if(!do_after(user, hide_item_time, user, interaction_key = DOAFTER_SOURCE_TRASH_PILE)) + return + if(QDELETED(src) || QDELETED(attacking_item)) + return + if(user.transferItemToLoc(attacking_item, src)) + balloon_alert(user, "item hidden!") + +/obj/structure/trash_pile/MouseDrop_T(mob/living/carbon/dropped_mob, mob/user, params) + if(user != dropped_mob || !iscarbon(dropped_mob)) + return ..() + if(DOING_INTERACTION(user, DOAFTER_SOURCE_TRASH_PILE) || !(dropped_mob.mobility_flags & MOBILITY_MOVE)) + return + + user.visible_message( + span_warning("[user] starts diving into [src]."), + span_notice("You start diving into [src]...") + ) + + var/adjusted_dive_time = hide_person_time + if(HAS_TRAIT(user, TRAIT_RESTRAINED)) // hiding takes twice as long when restrained. + adjusted_dive_time *= 2 + + if(!do_after(user, adjusted_dive_time, user, interaction_key = DOAFTER_SOURCE_TRASH_PILE)) + return + + if(QDELETED(src)) + return + + for(var/mob/hidden_mob in contents) + balloon_alert(user, "someone is inside!") + eject_mob(hidden_mob) + return + + user.forceMove(src) + +/obj/structure/trash_pile/container_resist_act(mob/user) + user.forceMove(drop_location()) + +/obj/structure/trash_pile/relaymove(mob/user) + container_resist_act(user) + +/obj/structure/trash_pile/proc/throw_trash(mob/user) + if(QDELETED(src) || QDELETED(user)) //Check if valid. + return FALSE + + if(LAZYACCESS(searched_by_ckeys, user.ckey)) //Don't spawn trash! + return TRUE + + if(!user.CanReach(src)) //Distance check for TK fuckery + return FALSE + + if(COOLDOWN_FINISHED(src, trash_cooldown)) + COOLDOWN_START(src, trash_cooldown, trash_delay * 0.5 + rand() * trash_delay) // x0.5 to x1.5 + var/item_to_spawn = prob(0.1) ? pick(GLOB.oddity_loot) : pick_weight_recursive(GLOB.trash_pile_loot) + var/obj/item/spawned_item = new item_to_spawn(drop_location()) + var/turf/throw_at = get_ranged_target_turf_direct(src, user, 7, rand(-60, 60)) + // this can totally be changed to use /datum/component/movable_physics to make it way more fun and expressive, but i can't be bothered to figure out good velocity/friction values right now + if(spawned_item.safe_throw_at(throw_at, rand(2, 4), rand(1, 3), user, spin = TRUE)) + playsound(src, 'sound/weapons/punchmiss.ogg', 10) + + if(COOLDOWN_FINISHED(src, funny_sound_cooldown)) + COOLDOWN_START(src, funny_sound_cooldown, funny_sound_delay * 0.5 + rand() * funny_sound_delay) // x0.5 to x1.5 + playsound(src, pick_weight(funny_sounds), 25) + + return TRUE + +/obj/structure/trash_pile/proc/eject_mob(mob/living/hidden_mob) + playsound(src, 'sound/machines/chime.ogg', 50, FALSE, -5) + hidden_mob.do_alert_animation(hidden_mob) + return TRUE diff --git a/monkestation/code/modules/blueshift/structures/trash_pile.dm b/monkestation/code/modules/blueshift/structures/trash_pile.dm deleted file mode 100644 index 652e18067a82..000000000000 --- a/monkestation/code/modules/blueshift/structures/trash_pile.dm +++ /dev/null @@ -1,139 +0,0 @@ -/obj/structure/trash_pile - name = "trash pile" - desc = "A heap of garbage, but maybe there's something interesting inside?" - icon = 'monkestation/code/modules/blueshift/icons/trash_piles.dmi' - icon_state = "randompile" - density = TRUE - anchored = TRUE - layer = TABLE_LAYER - obj_flags = CAN_BE_HIT - pass_flags = LETPASSTHROW - - max_integrity = 50 - - var/hide_person_time = 30 - var/hide_item_time = 15 - - var/list/searchedby = list()// Characters that have searched this trashpile, with values of searched time. - -/obj/structure/trash_pile/Initialize(mapload) - . = ..() - AddElement(/datum/element/climbable) - icon_state = pick( - "pile1", - "pile2", - "pilechair", - "piletable", - "pilevending", - "brtrashpile", - "microwavepile", - "rackpile", - "boxfort", - "trashbag", - "brokecomp", - ) - -/obj/structure/trash_pile/proc/do_search(mob/user) - if(contents.len) // There's something hidden - var/atom/hidden_atom = contents[contents.len] // Get the most recent hidden thing - if(istype(hidden_atom, /mob/living)) - var/mob/living/hidden_mob = hidden_atom - balloon_alert(user, "someone is inside!") - eject_mob(hidden_mob) - else if (istype(hidden_atom, /obj/item)) - var/obj/item/hidden_item = hidden_atom - balloon_alert(user, "found something!") - hidden_item.forceMove(src.loc) - else - // You already searched this one bruh - if(user.ckey in searchedby) - balloon_alert(user, "already searched!") - // You found an item! - else - produce_alpha_item() - balloon_alert(user, "found something!") - searchedby += user.ckey - -/obj/structure/trash_pile/attack_hand(mob/user) - // Human mob - if(ishuman(user)) - var/mob/living/carbon/human/human_user = user - human_user.visible_message("[user] searches through \the [src].", span_notice("You search through \the [src].")) - // Do the searching - if(do_after(user, rand(4 SECONDS, 6 SECONDS), target = src)) - if(src.loc) // Let's check if the pile still exists - do_search(user) - else - return ..() - -// Random lists -/obj/structure/trash_pile/proc/produce_alpha_item() - var/lootspawn = pick_weight(GLOB.maintenance_loot) - while(islist(lootspawn)) - lootspawn = pick_weight(lootspawn) - var/obj/item/hidden_item = new lootspawn(get_turf(src)) - return hidden_item - -/obj/structure/trash_pile/MouseDrop_T(atom/dropping, mob/user) - if(user == dropping && iscarbon(dropping)) - var/mob/living/dropped_mob = dropping - if(dropped_mob.mobility_flags & MOBILITY_MOVE) - dive_in_pile(user) - return - -/obj/structure/trash_pile/proc/eject_mob(mob/living/hidden_mob) - hidden_mob.forceMove(src.loc) - playsound(hidden_mob.loc, 'sound/machines/chime.ogg', 50, FALSE, -5) - hidden_mob.do_alert_animation(hidden_mob) - -/obj/structure/trash_pile/proc/do_dive(mob/user) - if(contents.len) - for(var/mob/hidden_mob in contents) - balloon_alert(user, "already someone inside!") - eject_mob(hidden_mob) - return FALSE - return TRUE - -/obj/structure/trash_pile/proc/dive_in_pile(mob/user) - user.visible_message(span_warning("[user] starts diving into [src]."), \ - span_notice("You start diving into [src]...")) - var/adjusted_dive_time = hide_person_time - if(HAS_TRAIT(user, TRAIT_RESTRAINED)) // hiding takes twice as long when restrained. - adjusted_dive_time *= 2 - - if(do_after(user, adjusted_dive_time, user)) - if(src.loc) // Checking if structure has been destroyed - if(do_dive(user)) - user.forceMove(src) - -/obj/structure/trash_pile/proc/can_hide_item(obj/item/hidden_item) - if(contents.len > 10) - return FALSE - return TRUE - -/obj/structure/trash_pile/attackby(obj/item/hidden_item, mob/living/user, params) - if(!(user.istate & ISTATE_HARM)) - if(can_hide_item(hidden_item)) - balloon_alert(user, "hiding item...") - if(do_after(user, hide_item_time, user)) - if(src.loc) - if(user.transferItemToLoc(hidden_item, src)) - balloon_alert(user, "item hidden") - else - balloon_alert(user, "it's stuck to your hand!") - else - balloon_alert(user, "it's full!") - return - - . = ..() - -/obj/structure/trash_pile/Destroy() - for(var/atom/movable/pile_contents in src) - pile_contents.forceMove(src.loc) - return ..() - -/obj/structure/trash_pile/container_resist_act(mob/user) - user.forceMove(src.loc) - -/obj/structure/trash_pile/relaymove(mob/user) - container_resist_act(user) diff --git a/monkestation/code/modules/blueshift/icons/trash_piles.dmi b/monkestation/icons/obj/trash_piles.dmi similarity index 100% rename from monkestation/code/modules/blueshift/icons/trash_piles.dmi rename to monkestation/icons/obj/trash_piles.dmi diff --git a/tgstation.dme b/tgstation.dme index 154c696ea91d..9f12f9af55c1 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6186,6 +6186,7 @@ #include "monkestation\code\game\objects\structures\elevation.dm" #include "monkestation\code\game\objects\structures\gravestones.dm" #include "monkestation\code\game\objects\structures\tables_racks.dm" +#include "monkestation\code\game\objects\structures\trash_pile.dm" #include "monkestation\code\game\objects\structures\window.dm" #include "monkestation\code\game\objects\structures\beds_chairs\chair.dm" #include "monkestation\code\game\objects\structures\crates_lockers\closets.dm" @@ -6927,7 +6928,6 @@ #include "monkestation\code\modules\blueshift\structures\primative.dm" #include "monkestation\code\modules\blueshift\structures\sauna_oven.dm" #include "monkestation\code\modules\blueshift\structures\shelf.dm" -#include "monkestation\code\modules\blueshift\structures\trash_pile.dm" #include "monkestation\code\modules\blueshift\structures\veins.dm" #include "monkestation\code\modules\blueshift\structures\wall_torch.dm" #include "monkestation\code\modules\blueshift\structures\windows.dm" From 7ff74555e0a650e8c5baaacab7145a2dce97b871 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 10 Jan 2025 20:40:03 +0000 Subject: [PATCH 09/11] Automatic changelog for PR #4804 [ci skip] --- html/changelogs/AutoChangeLog-pr-4804.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4804.yml diff --git a/html/changelogs/AutoChangeLog-pr-4804.yml b/html/changelogs/AutoChangeLog-pr-4804.yml new file mode 100644 index 000000000000..8e8caadf6023 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4804.yml @@ -0,0 +1,4 @@ +author: "MomoBerri" +delete-after: True +changes: + - rscadd: "Theseus Shipbreaking" \ No newline at end of file From 2ae2b16dad3efc1cb51743b1f0d3ec4faaa6eee3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 10 Jan 2025 20:40:22 +0000 Subject: [PATCH 10/11] Automatic changelog for PR #4806 [ci skip] --- html/changelogs/AutoChangeLog-pr-4806.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4806.yml diff --git a/html/changelogs/AutoChangeLog-pr-4806.yml b/html/changelogs/AutoChangeLog-pr-4806.yml new file mode 100644 index 000000000000..5c1573fa5d38 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4806.yml @@ -0,0 +1,5 @@ +author: "Absolucy" +delete-after: True +changes: + - rscadd: "Searching through trash piles now throws trash around you and makes sound as you dig through it!" + - rscadd: "Mapped maints trash piles into all maps that didn't already have them." \ No newline at end of file From 3353b59ef97282bf72ccb697c1ffb15df529a712 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sat, 11 Jan 2025 01:40:47 +0000 Subject: [PATCH 11/11] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-4774.yml | 5 ----- html/changelogs/AutoChangeLog-pr-4804.yml | 4 ---- html/changelogs/AutoChangeLog-pr-4806.yml | 5 ----- html/changelogs/archive/2025-01.yml | 12 ++++++++++++ 4 files changed, 12 insertions(+), 14 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-4774.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-4804.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-4806.yml diff --git a/html/changelogs/AutoChangeLog-pr-4774.yml b/html/changelogs/AutoChangeLog-pr-4774.yml deleted file mode 100644 index 580a3b7c4c4c..000000000000 --- a/html/changelogs/AutoChangeLog-pr-4774.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "SirNightKnight" -delete-after: True -changes: - - balance: "Reloading from shotgun ammo boxes has a 1 second do after. Except for honkshot ammo boxes." - - balance: "Shotgun ammo boxes have 16 shells instead of 15, except honkshot ammo boxes. Honkshot ammo boxes have 40 shells, used to be 35." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4804.yml b/html/changelogs/AutoChangeLog-pr-4804.yml deleted file mode 100644 index 8e8caadf6023..000000000000 --- a/html/changelogs/AutoChangeLog-pr-4804.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "MomoBerri" -delete-after: True -changes: - - rscadd: "Theseus Shipbreaking" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4806.yml b/html/changelogs/AutoChangeLog-pr-4806.yml deleted file mode 100644 index 5c1573fa5d38..000000000000 --- a/html/changelogs/AutoChangeLog-pr-4806.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Absolucy" -delete-after: True -changes: - - rscadd: "Searching through trash piles now throws trash around you and makes sound as you dig through it!" - - rscadd: "Mapped maints trash piles into all maps that didn't already have them." \ No newline at end of file diff --git a/html/changelogs/archive/2025-01.yml b/html/changelogs/archive/2025-01.yml index c72c195c09c4..6009b4d59db1 100644 --- a/html/changelogs/archive/2025-01.yml +++ b/html/changelogs/archive/2025-01.yml @@ -180,3 +180,15 @@ Addust: - rscadd: Johnson and Co Architecture's elite reconstruction team has broken into CentCom and replaced Pooba's office with Wolf's office, per Wolf's request. +2025-01-11: + Absolucy: + - rscadd: Searching through trash piles now throws trash around you and makes sound + as you dig through it! + - rscadd: Mapped maints trash piles into all maps that didn't already have them. + MomoBerri: + - rscadd: Theseus Shipbreaking + SirNightKnight: + - balance: Reloading from shotgun ammo boxes has a 1 second do after. Except for + honkshot ammo boxes. + - balance: Shotgun ammo boxes have 16 shells instead of 15, except honkshot ammo + boxes. Honkshot ammo boxes have 40 shells, used to be 35.