From 320c482f5122da31afbb748151e4ca1f834d3baa Mon Sep 17 00:00:00 2001 From: "Wowzewow (Wezzy)" <42310821+alsoandanswer@users.noreply.github.com> Date: Fri, 16 Feb 2024 19:16:22 +0800 Subject: [PATCH] Event/Away Site Sprite Spring Cleaning (#18318) * Event/Away Site Sprite Spring Cleaning * whoops * fixes * news * Update code/game/objects/structures/decorative.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> Signed-off-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com> * Update code/game/objects/structures/decorative.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> Signed-off-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com> * Update code/game/objects/structures/decorative.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> Signed-off-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com> * Update code/game/objects/structures/light_pole.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> Signed-off-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com> * Update code/game/objects/structures/decorative.dm Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> Signed-off-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com> * prop hunt * Gamers * merge conflict again * really * signs --------- Signed-off-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com> Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> --- aurorastation.dme | 1 + code/game/machinery/mech_recharger.dm | 6 - code/game/objects/structures/coastal.dm | 23 +- code/game/objects/structures/decorative.dm | 89 +++ code/game/objects/structures/light_pole.dm | 76 +- code/game/objects/structures/signs.dm | 56 ++ code/game/objects/structures/urban.dm | 203 +++--- .../reagent_containers/food/drinks/trophy.dm | 2 +- html/changelogs/wezzy_springcleaning.yml | 41 ++ icons/effects/city.dmi | Bin 6377 -> 0 bytes icons/mecha/mech_bay.dmi | Bin 4831 -> 5924 bytes icons/obj/signs.dmi | Bin 26220 -> 27196 bytes icons/obj/structure/64x32_signs.dmi | Bin 0 -> 4360 bytes icons/obj/structure/64x64_machinery.dmi | Bin 0 -> 994 bytes icons/obj/structure/64x64_misc.dmi | Bin 0 -> 839 bytes icons/obj/structure/industrial/docks.dmi | Bin 1091 -> 1312 bytes .../obj/structure/industrial/fencing_tall.dmi | Bin 492 -> 0 bytes .../structure/industrial/infrastructure.dmi | Bin 446 -> 776 bytes icons/obj/structure/miscellaneous.dmi | Bin 0 -> 1489 bytes icons/obj/structure/obstacles/obstacles.dmi | Bin 0 -> 16097 bytes icons/obj/structure/urban/infrastructure.dmi | Bin 3443 -> 2290 bytes icons/obj/structure/urban/konyang_signs.dmi | Bin 3628 -> 0 bytes icons/obj/structure/urban/misc_64x64.dmi | Bin 1514 -> 0 bytes icons/obj/structure/urban/poles.dmi | Bin 13764 -> 0 bytes icons/obj/structure/urban/restaurant.dmi | Bin 1607 -> 1623 bytes icons/obj/structure/urban/road_edges.dmi | Bin 1077 -> 1120 bytes icons/obj/structure/urban/road_signs.dmi | Bin 2243 -> 0 bytes icons/obj/structure/urban/street_signs.dmi | Bin 0 -> 5092 bytes icons/obj/structure/urban/streetpoles.dmi | Bin 0 -> 15258 bytes .../konyang/point_verdant/point_verdant-1.dmm | 176 +++-- .../konyang/point_verdant/point_verdant-2.dmm | 576 +++++++++------ .../konyang/point_verdant/point_verdant-3.dmm | 207 ++++-- maps/event/halloween/halloween.dmm | 135 +--- maps/event/idris_cruise/idris_cruise-1.dmm | 55 +- maps/event/rooftop/rooftop-1.dmm | 688 +++++------------- .../konyang/abandoned/factory_arms.dmm | 4 +- .../konyang/abandoned/factory_robotics.dmm | 6 +- .../konyang/abandoned/house_small.dmm | 13 +- .../konyang/abandoned/landing_zone.dmm | 16 +- .../exoplanets/konyang/fireoutpost.dmm | 34 +- .../exoplanets/konyang/hivebot_burrows_1.dmm | 26 +- .../exoplanets/konyang/hivebot_burrows_2.dmm | 10 +- .../exoplanets/konyang/homestead.dmm | 79 +- .../exoplanets/konyang/landing_zone.dmm | 262 ++++--- .../konyang/ocean/naval_landing_zone.dmm | 294 ++++---- .../exoplanets/konyang/telecomms_outpost.dmm | 26 +- .../exoplanets/konyang/village.dmm | 180 ++--- .../exoplanets/konyang/zombie_outpost.dmm | 19 +- maps/sccv_horizon/sccv_horizon-4_centcomm.dmm | 31 +- 49 files changed, 1682 insertions(+), 1652 deletions(-) create mode 100644 code/game/objects/structures/decorative.dm create mode 100644 html/changelogs/wezzy_springcleaning.yml delete mode 100644 icons/effects/city.dmi create mode 100644 icons/obj/structure/64x32_signs.dmi create mode 100644 icons/obj/structure/64x64_machinery.dmi create mode 100644 icons/obj/structure/64x64_misc.dmi delete mode 100644 icons/obj/structure/industrial/fencing_tall.dmi create mode 100644 icons/obj/structure/miscellaneous.dmi create mode 100644 icons/obj/structure/obstacles/obstacles.dmi delete mode 100644 icons/obj/structure/urban/konyang_signs.dmi delete mode 100644 icons/obj/structure/urban/misc_64x64.dmi delete mode 100644 icons/obj/structure/urban/poles.dmi delete mode 100644 icons/obj/structure/urban/road_signs.dmi create mode 100644 icons/obj/structure/urban/street_signs.dmi create mode 100644 icons/obj/structure/urban/streetpoles.dmi diff --git a/aurorastation.dme b/aurorastation.dme index 7c9fbb29894..ab73e507855 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1257,6 +1257,7 @@ #include "code\game\objects\structures\coatrack.dm" #include "code\game\objects\structures\crystals.dm" #include "code\game\objects\structures\curtains.dm" +#include "code\game\objects\structures\decorative.dm" #include "code\game\objects\structures\displaycase.dm" #include "code\game\objects\structures\door_assembly.dm" #include "code\game\objects\structures\ECD.dm" diff --git a/code/game/machinery/mech_recharger.dm b/code/game/machinery/mech_recharger.dm index 2eb32bc5525..7ddec13dd16 100644 --- a/code/game/machinery/mech_recharger.dm +++ b/code/game/machinery/mech_recharger.dm @@ -129,9 +129,3 @@ /obj/item/stock_parts/scanning_module = 2, /obj/item/stock_parts/manipulator = 3 ) - -/obj/machinery/mech_recharger/automobile - name = "vehicle charging port" - desc = "A vehicle battery recharger, built into the ground." - icon = 'icons/obj/structure/urban/infrastructure.dmi' - icon_state = "chargeport" diff --git a/code/game/objects/structures/coastal.dm b/code/game/objects/structures/coastal.dm index 688bc0e8aa5..0276543a71c 100644 --- a/code/game/objects/structures/coastal.dm +++ b/code/game/objects/structures/coastal.dm @@ -1,14 +1,3 @@ -/obj/structure/beach_umbrella - name = "overhead beach umbrella" - desc = "A tightly secured beach umbrella which looks pretty elegant against the sun." - icon = 'icons/obj/structure/urban/misc_64x64.dmi' - icon_state = "umbrella" - anchored = TRUE - layer = 9 - -/obj/structure/beach_umbrella/alt - icon_state = "umbrella_alt" - /obj/structure/dock_structure name = "docking tie" desc = "A large, very secure tie-off point for a dock." @@ -34,14 +23,4 @@ icon_state = "radio_ship" anchored = TRUE density = TRUE - layer = 9 - -/obj/structure/crane - name = "overhead guiding crane" - desc = "A towering crane for lifting industrial sized cargo." - icon = 'icons/obj/structure/industrial/cranes.dmi' - icon_state = "crane" - anchored = TRUE - density = TRUE - layer = 9 - pixel_x = -16 + layer = ABOVE_ALL_MOB_LAYER diff --git a/code/game/objects/structures/decorative.dm b/code/game/objects/structures/decorative.dm new file mode 100644 index 00000000000..3c8b83f4230 --- /dev/null +++ b/code/game/objects/structures/decorative.dm @@ -0,0 +1,89 @@ +/obj/structure/ac_unit + name = "AC unit" + desc = "A bland air conditioning unit." + icon = 'icons/obj/structure/miscellaneous.dmi' + icon_state = "ac" + layer = BELOW_OBJ_LAYER + density = TRUE + +/obj/structure/television + name = "wide-screen television" + desc = "A fancy wide-screen television with a wide selection of channels." + icon = 'icons/obj/structure/miscellaneous.dmi' + icon_state = "television" + anchored = TRUE + +/obj/structure/console + name = "\improper Game-Box" + desc = "A generic video-games console. For *Gamers*." + icon = 'icons/obj/structure/miscellaneous.dmi' + icon_state = "games_console" + anchored = TRUE + +/obj/structure/pylon + name = "charging pylon" + desc = "A charging pylon attached to a nearby port." + icon = 'icons/mecha/mech_bay.dmi' + icon_state = "recharge_port" + density = TRUE + anchored = TRUE + +/obj/structure/shelf + name = "shelf" + desc = "A nondescript decorative shelf." + icon = 'icons/obj/structure/miscellaneous.dmi' + icon_state = "shelf1" + +/obj/structure/shelf/Initialize(mapload) + . = ..() + icon_state = "shelf[pick(1,2,3)]" + +/obj/structure/outlet + name = "power outlets" + desc = "The *other* kind of power-point." + icon = 'icons/obj/structure/miscellaneous.dmi' + icon_state = "outlet" + layer = LAYER_UNDER_TABLE + +/obj/structure/vent + name = "wall vent" + desc = "A nondescript vent." + icon = 'icons/obj/structure/miscellaneous.dmi' + icon_state = "vent" + layer = LAYER_UNDER_TABLE + +/obj/structure/window + name = "window" + desc = "Lets the light in and keeps the bugs out." + icon = 'icons/obj/structure/miscellaneous.dmi' + icon_state = "window" + +// 64x64 stuff + +/obj/structure/beach_umbrella + name = "overhead beach umbrella" + desc = "A tightly secured beach umbrella which looks pretty elegant against the sun." + icon = 'icons/obj/structure/64x64_misc.dmi' + icon_state = "umbrella" + anchored = TRUE + layer = ABOVE_ALL_MOB_LAYER + +/obj/structure/beach_umbrella/alt + icon_state = "umbrella_alt" + +/obj/structure/crane + name = "overhead guiding crane" + desc = "A towering crane for lifting industrial sized cargo." + icon = 'icons/obj/structure/64x64_machinery.dmi' + icon_state = "crane" + anchored = TRUE + density = TRUE + layer = ABOVE_ALL_MOB_LAYER + +/obj/structure/crane/body + icon_state = "crane_body" + density = FALSE + +/obj/structure/crane/arm + icon_state = "crane_arm" + density = FALSE diff --git a/code/game/objects/structures/light_pole.dm b/code/game/objects/structures/light_pole.dm index dfbd2a05b9e..07eb045ab9a 100644 --- a/code/game/objects/structures/light_pole.dm +++ b/code/game/objects/structures/light_pole.dm @@ -16,26 +16,30 @@ /obj/structure/light_pole/konyang name = "dangling lamp" desc = "A flame-lit lamp dangling precariously from a tall pole." - icon = 'icons/obj/structure/urban/poles.dmi' - icon_state = "right_lamp" - layer = 9.1 + icon = 'icons/obj/structure/urban/streetpoles.dmi' + icon_state = "lamp" + layer = ABOVE_ALL_MOB_LAYER anchored = TRUE density = FALSE light_color = "#FA644B" light_wedge = LIGHT_OMNI light_range = 6 light_power = 1 + pixel_x = -32 + pixel_y = 8 /obj/structure/light_pole/konyang/left - icon_state = "left_lamp" + dir = NORTH /obj/structure/utility_pole name = "tall pole" desc = "A very tall utility pole for urban infrastructure." - icon = 'icons/obj/structure/urban/poles.dmi' + icon = 'icons/obj/structure/urban/streetpoles.dmi' icon_state = "junction" - layer = 9 + layer = ABOVE_ALL_MOB_LAYER anchored = TRUE + pixel_x = -32 + pixel_y = 8 /obj/structure/utility_pole/gwok name = "Go Go Gwok street sign" @@ -43,38 +47,52 @@ icon = 'icons/obj/structure/urban/konyang64x96.dmi' icon_state = "nice_gwok" +// street lights + /obj/structure/utility_pole/street - desc = "A tall light source. This one seems to be off." - icon = 'icons/obj/structure/urban/poles.dmi' - icon_state = "street" - -/obj/effect/overlay/street_light - icon = 'icons/obj/structure/urban/poles.dmi' - icon_state = "street_light" - layer = EFFECTS_ABOVE_LIGHTING_LAYER - -/obj/effect/overlay/street_light/classic - icon_state = "classic_lamp_light" - density = 1 + name = "\improper street lamp" + desc = "A tall light source. What more is there to say?" + icon = 'icons/obj/structure/urban/streetpoles.dmi' + icon_state = "streetlight" /obj/structure/utility_pole/street/on - desc = "A tall light source. This one shines brightly." light_wedge = LIGHT_OMNI light_color = "#e8ffeb" light_range = 8 light_power = 1.9 -/obj/structure/utility_pole/street/on/Initialize(mapload) - . = ..() - cut_overlays() - overlays += /obj/effect/overlay/street_light - return +/obj/structure/utility_pole/street/corner + name = "\improper street lamp" + desc = "A tall light source. What more is there to say?" + icon_state = "streetlightcorner" + +/obj/structure/utility_pole/street/corner/on + light_wedge = LIGHT_OMNI + light_color = "#e8ffeb" + light_range = 8 + light_power = 1.9 + +/obj/structure/utility_pole/street/double + name = "\improper street lamp" + desc = "A tall light source. What more is there to say?" + icon_state = "streetlightduo" + +/obj/structure/utility_pole/street/double/on + light_wedge = LIGHT_OMNI + light_color = "#e8ffeb" + light_range = 8 + light_power = 1.9 /obj/structure/utility_pole/street/classic + name = "\improper stone lamp" + desc = "A stone lamp commonly found in Konyang." icon_state = "classic_lamp" +/obj/effect/overlay/street_light/classic + icon_state = "classic_lamp_light" + density = TRUE + /obj/structure/utility_pole/street/classic/on - desc = "A tall light source. This one shines brightly." light_wedge = LIGHT_OMNI light_color = LIGHT_COLOR_TUNGSTEN light_range = 8 @@ -112,7 +130,7 @@ /obj/structure/utility_pole/street/traffic name = "traffic indicator" desc = "A very tall crosswalk indicator which can be used to better run red lights." - icon_state = "traffic" + icon_state = "trafficlight" light_color = LIGHT_COLOR_HALOGEN light_range = 3.1 light_power = 2.6 @@ -139,9 +157,11 @@ /obj/effect/overlay/overhead_line name = "overhead utility line" - icon = 'icons/obj/structure/urban/poles.dmi' + icon = 'icons/obj/structure/urban/streetpoles.dmi' icon_state = "line" - layer = 9.1 + layer = ABOVE_ALL_MOB_LAYER + pixel_x = -32 + pixel_y = 8 /obj/effect/overlay/overhead_line/end icon_state = "line_end" diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index 429419916eb..a158d74a4f4 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -625,3 +625,59 @@ door to the tent with her body as the insurgents attempted to shoot through it. While she ultimately perished to gunfire, her sacrifice allowed the medical tent to be evacuated and let \ the 23rd capture all insurgents involved in the attack. Formerly a frontierswoman with no nation to call her own, she was buried with military honors and became the first Holy Martyr of \ Sun Reach in 2426. She is commonly venerated on Sun Reach and by Ma’zals throughout the Empire." + +// Urban + +/obj/structure/sign/exit + name = "exit sign" + desc = "A sign indicating where you should probably go in a hurry." + icon_state = "exit" + layer = ABOVE_ALL_MOB_LAYER + +/obj/structure/sign/restroom + name = "restroom sign" + desc = "A sign indicating where you can find a restroom." + icon_state = "restroom" + +/obj/structure/sign/staff + name = "staff only sign" + desc = "A sign that warns of this entry being barred to the public." + icon_state = "staff" + +/obj/structure/sign/double + icon = 'icons/obj/structure/64x32_signs.dmi' + +/obj/structure/sign/double/hotel_montparnasse + name = "glamorous sign" + desc = "A beautiful sign denoting you as being in the Hotel Montparnasse!" + icon_state = "hotel_montparnasse" + +/obj/structure/sign/double/convenience + name = "convenience store sign" + desc = "A sign labeling the structure as a 24-7 MINI MART. Convenient!" + icon_state = "shop_sign" + +/obj/structure/sign/double/police + name = "police station sign" + desc = "A sign labeling the structure as a Konyang police department building." + icon_state = "police_sign" + +/obj/structure/sign/double/robotics + name = "robotics clinic sign" + desc = "A sign labeling the structure as a robotics and clinical support building." + icon_state = "krc_sign" + +/obj/structure/sign/double/bar + name = "club and bar sign" + desc = "A sign labeling the structure as the Resting Tiger nightclub and bar." + icon_state = "bar_sign" + +/obj/structure/sign/double/arcade + name = "arcade sign" + desc = "A sign labeling the structure as a very cool arcade." + icon_state = "arcade_sign" + +/obj/structure/sign/double/pharmacy + name = "pharmacy sign" + desc = "A sign labeling the structure as a Konyang health and supply pharmacy." + icon_state = "pharmacy_sign" diff --git a/code/game/objects/structures/urban.dm b/code/game/objects/structures/urban.dm index 959111ca8fd..cd8fcac5b36 100644 --- a/code/game/objects/structures/urban.dm +++ b/code/game/objects/structures/urban.dm @@ -5,7 +5,7 @@ icon_state = "car" anchored = TRUE density = TRUE - layer = 7 + layer = ABOVE_ALL_MOB_LAYER /obj/structure/automobile/random/Initialize(mapload) . = ..() @@ -28,44 +28,105 @@ anchored = TRUE density = TRUE -/obj/structure/road_sign +// Street Signs + +/obj/structure/street_sign name = "stop sign" desc = "A stop sign to direct traffic. Sometimes a demand." - icon = 'icons/obj/structure/urban/road_signs.dmi' + icon = 'icons/obj/structure/urban/street_signs.dmi' icon_state = "stop" - layer = 9 + layer = ABOVE_ALL_MOB_LAYER anchored = TRUE -/obj/structure/road_sign/yield +/obj/structure/street_sign/stop_konyang + icon_state = "stop_konyang" + desc = "A stop sign. You can't be really sure unless you speak Konyang." + +/obj/structure/street_sign/yield name = "yield sign" desc = "A yield sign which tells you to slow down, rather politely. Let's hope you listen." icon_state = "yield" -/obj/structure/road_sign/pedestrian - name = "pedestrian passing sign" - desc = "A yellow sign which alerts you of bonus points ahead." - icon_state = "pedestrian" +/obj/structure/street_sign/warnings + name = "warning sign" + desc = "A sign. You think it's trying to warn you of something." + icon_state = "warnings" -/obj/structure/road_sign/turn +/obj/structure/street_sign/directional name = "turn ahead sign" - desc = "A sign which warns of an approaching turn to the right. Is it the right choice?" - icon_state = "right" + desc = "A directional sign. How the turntables..." + icon_state = "directional" -/obj/structure/road_sign/turn/left - desc = "A sign which warns of an approaching turn to the left. Is anything left?" - icon_state = "left" +/obj/structure/street_sign/directional/yellow + icon_state = "directional_yellow" -/obj/structure/road_sign/street +/obj/structure/street_sign/street name = "street sign" - desc = "A green, wide street sign with words telling you that you are indeed on a street." - icon_state = "street_big" + desc = "A street sign. As common as they are, sometimes people still get lost." + icon_state = "street" var/street_name = null -/obj/structure/road_sign/street/Initialize(mapload) +/obj/structure/street_sign/street/Initialize(mapload) . = ..() name = "[street_name]" - desc = "This sign indicates this crossing street is called [street_name]." + desc = "A street sign for [street_name]. As common as they are, sometimes people still get lost." + +/obj/structure/street_sign/street/both + dir = NORTH + +/obj/structure/street_sign/street/right + dir = WEST + +/obj/structure/street_sign/street/left + dir = EAST + +/obj/structure/ms13/street_sign/turning + desc = "A stop sign. Looks like you've passed the point of no return." + icon_state = "noturn" + +/obj/structure/street_sign/parking + desc = "A sign. No parking allowed." + icon_state = "noparking" + +/obj/structure/street_sign/one_way + desc = "A sign. Apparently you can only go one direction..." + icon_state = "direction" + +/obj/structure/street_sign/bus + desc = "A bus sign. If you had to guess, you have to wait for a bus here." + icon_state = "busstop" + +/obj/structure/street_sign/railroad + desc = "A sign. This one is a big white X. Wonder what that entails?" + icon_state = "railcrossing" + +/obj/structure/street_sign/only_direction + desc = "A sign. It's telling you to only go this way." + icon_state = "onlydir" + +/obj/structure/street_sign/speed + desc = "A sign. Always trying to slow you down." + icon_state = "speed" + +/obj/structure/street_sign/turn + desc = "A sign. It's pointing a direction with arrows on it. Cool." + icon_state = "turn" + +/obj/structure/street_sign/exit + desc = "A sign. It's showing you to an exit." + icon_state = "exit" + +/obj/structure/street_sign/nopedestrian + desc = "A sign. Only operators of heavy machinery allowed!" + icon_state = "nopedestrian" + +/obj/structure/street_sign/drive_thru + name = "drive thru sign" + desc = "A drive-thru sign." + icon_state = "drivethru" + +// infrastructure /obj/structure/stairs/urban icon = 'icons/obj/structure/urban/ledges.dmi' @@ -113,16 +174,6 @@ /obj/structure/structural_support/side icon_state = "truss_side" -/obj/structure/urban/pylon - name = "vehicle charging pylon" - desc = "A vehicle-grade charging pylon attached to a nearby port." - icon = 'icons/obj/structure/urban/infrastructure.dmi' - icon_state = "chargepylon" - light_color = LIGHT_COLOR_CYAN - light_range = 1.2 - density = TRUE - anchored = TRUE - /obj/structure/manhole name = "sewer access manhole" desc = "Probably a bad idea to open this." @@ -176,13 +227,6 @@ layer = ABOVE_ALL_MOB_LAYER anchored = TRUE -/obj/structure/television - name = "wide-screen television" - desc = "A fancy wide-screen television with a wide selection of channels." - icon = 'icons/obj/structure/urban/infrastructure.dmi' - icon_state = "television" - anchored = TRUE - /obj/structure/dressing_divider name = "wardrobe dressing divider" desc = "A divider for an environment where you're probably swapping clothes, made with your privacy in mind." @@ -197,7 +241,7 @@ icon = 'icons/obj/structure/urban/konyang_neon.dmi' icon_state = "sign1" anchored = TRUE - layer = 7 + layer = ABOVE_ALL_MOB_LAYER /obj/structure/shipping_container name = "freight container" @@ -206,13 +250,13 @@ icon_state = "blue1" anchored = TRUE density = TRUE - layer = 7 + layer = ABOVE_ALL_MOB_LAYER /obj/effect/overlay/container_logo name = "Hephaestus Industries emblem" icon = 'icons/obj/structure/industrial/shipping_containers.dmi' icon_state = "heph1" - layer = 7.01 + layer = 4.6 /obj/effect/overlay/container_logo/einstein name = "Einstein Engines emblem" @@ -231,7 +275,7 @@ density = TRUE throwpass = TRUE climbable = TRUE - layer = 4.01 + layer = ABOVE_MOB_LAYER anchored = TRUE /obj/structure/rod_railing/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) @@ -262,7 +306,7 @@ density = TRUE throwpass = TRUE anchored = TRUE - layer = 4.01 + layer = ABOVE_MOB_LAYER /obj/structure/road_barrier name = "roadway barrier" @@ -273,7 +317,7 @@ throwpass = TRUE climbable = TRUE anchored = TRUE - layer = 4.01 + layer = ABOVE_MOB_LAYER //smoothing these things would suck so here you go. i have no idea why you would want these buildable. map them manually /obj/structure/road_barrier/bot_in @@ -309,16 +353,28 @@ return TRUE /obj/structure/chainlink_fence - name = "chainlink industrial fencing" + name = "chainlink fence" desc = "A tall, imposing metal fence. Not to be confused with the slightly more popular Chainlink of recent years." - icon = 'icons/obj/structure/industrial/fencing_tall.dmi' + icon = 'icons/obj/structure/obstacles/obstacles.dmi' density = TRUE - icon_state = "fence" + icon_state = "normal_fence" color = null anchored = TRUE can_be_unanchored = FALSE layer = ABOVE_ALL_MOB_LAYER +/obj/structure/chainlink_fence/corner + icon_state = "fence_corner" + +/obj/structure/chainlink_fence/intersect_bottom + icon_state = "fence_intersect_bottom" + +/obj/structure/chainlink_fence/intersect_middle + icon_state = "fence_intersect_middle" + +/obj/structure/chainlink_fence/intersect_corner + icon_state = "fence_intersect_corner" + /obj/structure/chainlink_fence/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) if(istype(mover,/obj/item/projectile)) return TRUE @@ -393,13 +449,6 @@ desc = "A bronze statue of the Amitabha Buddha, the Buddha of Limitless Light." icon_state = "buddha" -/obj/structure/sign/urban - name = "exit sign" - desc = "A sign indicating where you should probably go in a hurry." - icon = 'icons/obj/structure/urban/infrastructure.dmi' - icon_state = "exit" - layer = ABOVE_ALL_MOB_LAYER - /obj/structure/sign/billboard name = "commercial billboard" desc = "A large and typically roadside billboard rented out for advertisement space." @@ -421,23 +470,6 @@ icon_state = "sign[rand(1, 14)]" return -/obj/structure/sign/urban/drive_thru - name = "drive thru sign" - desc = "A drive-thru sign." - icon = 'icons/obj/structure/urban/restaurant.dmi' - icon_state = "drivethru" - density = 1 - -/obj/structure/sign/urban/restroom - name = "restroom sign" - desc = "A sign indicating where you can find a restroom." - icon_state = "restroom" - -/obj/structure/sign/urban/staff - name = "staff only sign" - desc = "A sign that warns of this entry being barred to the public." - icon_state = "staff" - /obj/structure/restaurant_menu name = "restaurant menu" desc = "A sign displaying a variety of delectable meals." @@ -466,37 +498,6 @@ return TRUE return ..() -/obj/structure/sign/urban/konyang - name = "convenience store sign" - desc = "A sign labeling the structure as a 24-7 MINI MART. Convenient!" - icon = 'icons/obj/structure/urban/konyang_signs.dmi' - icon_state = "shop_sign" - -/obj/structure/sign/urban/konyang/police - name = "police station sign" - desc = "A sign labeling the structure as a Konyang police department building." - icon_state = "police_sign" - -/obj/structure/sign/urban/konyang/robotics - name = "robotics clinic sign" - desc = "A sign labeling the structure as a robotics and clinical support building." - icon_state = "krc_sign" - -/obj/structure/sign/urban/konyang/bar - name = "club and bar sign" - desc = "A sign labeling the structure as the Resting Tiger nightclub and bar." - icon_state = "bar_sign" - -/obj/structure/sign/urban/konyang/arcade - name = "arcade sign" - desc = "A sign labeling the structure as a very cool arcade." - icon_state = "arcade_sign" - -/obj/structure/sign/urban/konyang/pharmacy - name = "pharmacy sign" - desc = "A sign labeling the structure as a Konyang health and supply pharmacy." - icon_state = "pharmacy_sign" - /obj/structure/window/urban icon = 'icons/obj/structure/urban/windows_tall.dmi' icon_state = "wood" diff --git a/code/modules/reagents/reagent_containers/food/drinks/trophy.dm b/code/modules/reagents/reagent_containers/food/drinks/trophy.dm index 8b55de835f5..23c0f6229e6 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/trophy.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/trophy.dm @@ -1,7 +1,7 @@ /obj/item/reagent_containers/food/drinks/trophy name = "pewter cup" desc = "Everyone gets a trophy." - icon = 'icons/obj/item/reagent_containers/food/drinks/bottle.dmi' + icon = 'icons/obj/item/reagent_containers/food/drinks/trophy.dmi' icon_state = "pewter_cup" w_class = ITEMSIZE_TINY force = 1 diff --git a/html/changelogs/wezzy_springcleaning.yml b/html/changelogs/wezzy_springcleaning.yml new file mode 100644 index 00000000000..d79d0defc86 --- /dev/null +++ b/html/changelogs/wezzy_springcleaning.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Wowzewow (Wezzy) + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - imageadd: "Tidies up away site and old event sprites." diff --git a/icons/effects/city.dmi b/icons/effects/city.dmi deleted file mode 100644 index c880af006fc343e86697d96ef5d06214627ce0ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6377 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 diff --git a/icons/mecha/mech_bay.dmi b/icons/mecha/mech_bay.dmi index 88eb2324dd2ab4c6d10e301fa74ef36a767a04d8..bd63bffc89f647a5bcb069236010c682029525b3 100644 GIT binary patch literal 5924 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%0Du_Wp3i0q9{FseG zpU*KG;y2%WjXZVqaaxKk?l%8)VM-tEWBPP&M+g0sB^LSJ&Hu~%9KICkuq<8OLf z8~_es9K}+1W|^`uc3AaHm85Ih!WGCQ-=rcbmVG zuza+Sd5Ekr$z)P<>6v|f?AS5rJ7I4}2R#r9X}{^W0sMZyC4Vkdn&0gs$-JJhzVS|r zn;!bS6z^?K7QF!UlRl{!{uln|k-I1UfZt%Np1(kd#UkLIYitF>b z#eYKxKp&ZA4&Nw8WEucNy(}_~b%LAxZVSK?8K(tC32JDd{(cEg2XSuz-o z`n-bR#dZ@(bl447+s!0U@a_4LvN$R(_b0K-RMx_KYRK<9dF^M8S=7IU1%iKwh+s(< zR>&^9aP-~c3lw4YZ<7=OE&)H2Ljf^=XGDU*i0g>w-}ad&c&V`=bPW53#szf-xozaW z`lF(t%p<;#xdHw~fAp}U8qoQy{Ews{8r6ARn5y4E-W)VdL*qSY8kJ^$gCX4qLwy~= zsBra@`T;yp-@;E4IRc()%C=Z0}qK)a#aBbn|SCadETRWZjq;k|(a$6Zc7U#V5GxV|+AgVxFMJ z_~bGgkE}tiC>|UG0>d%LG0fRB(=$DNA62z~Oa@_`f$5np=6XNR!!vYMb-mRC{d?%Y=map-h3`XlbsA$0pMvvQtn zCgR>|7k$kN&$jLYzrWkFt-EmV`B0c{*(&tK*dYl(^s1twLK*Cny#9WkLA}4f!$41W z{Ah5xrk&nu0g?|w6cg6%T z)CGXVAKLhlgE0a#+gS6$-^f!Y_3J%Bvz9w=Sx)3&Y|!zC`twWtu^oT3J7WSE>HRpegt6qE)0C)Sl)~G)`!GDhvtbOo-zsV+!?qug}jnt(nsnjoIjV~hdc1ioQ#&|C6&@qRFyq1zn%39%~K}fJQl@m zw-Ze!i4;0$ZVm!4Z^lH-#t05g!vrYKUIBD+{8@A7;z_k*(_`$bIZP~RpsET*`97vk znSV&o@DNu$?BAR9@Z>3z2s_7d=`0Ulo>N9tOR@5Yez`D71ziua`Ll3eZZ0>mvGx1-+$$qR}N58?n6~{P^|0M5BnphygnBv^H
g;lC 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 diff --git a/icons/obj/structure/64x32_signs.dmi b/icons/obj/structure/64x32_signs.dmi new file mode 100644 index 0000000000000000000000000000000000000000..72e2378555e73ec0d6460cf7d0a9dc3ae0751bb8 GIT binary patch literal 4360 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 QQUCw|07*qoM6N<$f+jk$jsO4v literal 0 HcmV?d00001 diff --git a/icons/obj/structure/64x64_misc.dmi b/icons/obj/structure/64x64_misc.dmi new file mode 100644 index 0000000000000000000000000000000000000000..8cb9e203c7504a714b75ddbd46590aa6258d16bb GIT binary patch literal 839 zcmV-N1GxN&P)fWC6+_CBO)%~|K zTEFe+0Cu!4FEpB=sYRX>`~Uy|0d!JMQvg8b*k%9#0Caj(Sad{Xb7OL8aCB*JZU6vy zoKseCa&`CgQ*iP1oH!Cnr&fi!&v&s2C_@$ie63 z=UkKoz=q-Ze3tuBz!-om3C2kQW@}gi^nGvcfhY*n^$&WqVF|$W?l=X( zSdjEJVXbcjQepw_Pt&*#(Afx30^C=RnRS59Mt~NKSdcys^1dn}fqEzd7NpOEyswH# zU?0kefDR-9m}CNQ?*v3Z2a*6xG6BSQLL}e=f%^WUy&!odMFKt$sP8Y@3-Bw+6Ud2( zfVk@xK;DR+Ku$yi#9g-lmc0!Oft(1NSACI8E6~*=0yz;j4@1m5L09~8qzLp#nEWgR z1}uFa07j35$q!Ou!18yJkpl93@#^VD#6QU_Pxn42&}r$cEpH&3j?U`(Y}EJquVX9z zc6|j@Km}C52LQg$uK`|MUjY?R0ToaI6;J^cPyrQC0Uz*x!Mg#?yVw8w`~V)3aNaxg RAhrMi002ovPDHLkV1k`Nd#3;Z literal 0 HcmV?d00001 diff --git a/icons/obj/structure/industrial/docks.dmi b/icons/obj/structure/industrial/docks.dmi index 1e4303000056b436c984c54e3cbdfd8dda6716aa..21d751006c2a15d7cb9df6287180b82e1f1021d2 100644 GIT binary patch delta 1144 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 delta 384 zcmV-`0e}982EGH37&rt20000`vtzda000tDOjJd{z`#&gU6GiYtFf~&I6WZ~B1_0F zA^-pY0d!JMQvg8b*k%9#0CJHfGk*YbjE%TBGg33tGfE(w;*!LYR3KBSq^PvGSc!`> zC9|j)$T#HTOe;#vO@**gRmB%)rljIhs;uDZ=K^*C00hk^FVwuSHvj+t+(|@1R5*=& zk%0-sAP@v?A#YN^hcqCG1*k~@V(h<__gvvsJQofW26x>PB55fSoIYpPmwyMYJ;}`g zGMEB7#xMn>4r&T`sWt#hrvk*FBY?eA0fLem0Hvv?0BZ9R0Hvu1Kvfi_sRsb;GSC|6 zDC*>NZVjZ)fQ7|D=hnbW0C!df&Q1UvvDd-&U>|aOGjMk*0Ofrr86LU-82`f1Wj)v) ztfLD;4x3CFl3+31g*97@9z7PrZPq<7-~9J5ltB+G3)DS~UqBC&7pfk(4AcYvf^oF@ eiwBxNclrSwEpFE0ofsAX0000qC%J{qtE!bL4M=uEiZU-1PKzy$R->Y*7dU<|Mr;{000001bW%=J06^y0 zW&i*HvwBombVOxyV{&P5bZKvH004NLjnT0VgCGzF;2EBR=-L=jJ9cR_jYEBfhUh6I z6cV^<`u4?kutOUhNdEuw!40JB++5m@)z_BJ;JmViomiFSlq_mM8A@4DB0)_OKgFX! z2r&_TLdl?<4~0`QI&p_JS78cTJVVU097XAdT}M000CqNklTpeD&jFy^pWdcx8P zVJVBH!vUnRSo$Rbmk1=B0-U5gmJSC1qX4t`7>}jH0U%HC4FX4FsaXM@EI)e8id^?O=5oak%iP(AaWuPSi$0{x(9M+@An zU|byzAaezerC%P!mq+pCQG9t6e}G3ZJQtaYG9w?QBkKuwSS|*Ra0PKlX zd;n`S1LK=P0m|ANvDW|{8xo)_+?yQ%=nA;KIRZ1V`Fy@uEDV4WUj@Cl0gR6~0$g9u z=AY(^&jvtQ_+DYRprVY@H9)IpUjLiduNPXi$9jKeeeCI_X>ofq=!836N@8G*)1G?|9fx8uvyKBaq$ zARJ&ea{!b$3@-C&UesT09eba%7!CloTCLV=C%_dA0C|Yp|AR4$;NVx+IsksX1t^MX zK>~1Q&$sPja!*9y-Z;HaM}Q0o;O@(PW&_CeCEUm&IH1e~=+PwrjJ`6Q4q_hw5*q-V z38n$8B3`0h->K!K=>^(s6}z48dz~UwSalqnSU%r65$y)JS3kqJ(9&4j0S)XH9%X81F+j|Hgel20J9hc!1{k}rx*iZ>})s?z$4gxzlZ7j z-~eIi`0?rKasPWiyB+}`ARSkg2B7Bmg8=x_ado2ssHxQu0N!+5-8{d%JRklXmbc51 z0Q~6~0A61a;BF*!bX)`cJ1l2?0H-e6hoxfx06QEGFn#X=IYv!TZaJ2b*-}L-Hh#}09bSgxO00000NkvXXu0mjfxfG9j literal 0 HcmV?d00001 diff --git a/icons/obj/structure/obstacles/obstacles.dmi b/icons/obj/structure/obstacles/obstacles.dmi new file mode 100644 index 0000000000000000000000000000000000000000..d80c53dd47f3cf95f2ede3c2059463bb489791a4 GIT binary patch literal 16097 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 IM6N<$g6yOC+5i9m literal 3443 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 QBme*a07*qoM6N<$g34X4bpQYW diff --git a/icons/obj/structure/urban/poles.dmi b/icons/obj/structure/urban/poles.dmi deleted file mode 100644 index a3c7854c725179729d254db51bfd2ffec0597b32..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13764 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 L?#|=ylrBYN?z^4U14`)J=)*3pgQDFC}am$vG@k zZ|sO)99BBJ#sPClI=8-!8^oHos}};)U-2ul4Rn0Uv!g!nip8BvLDp0YXB0Q8LllD& zQ#@ahVO*E^D-+K4tSae_7^48OPFJ? z*BI5yZ`LQZlT>b+P<35gl}G!ZaKPZ9?C;n4!l0Lt*7E)q<@Y)C3}jhBrJ7}qAen0) zi8(zT&lhnh0#w9z@oQy_ghQ-hY7$$t2$d=wG|$0!Knixf2emE)sZ7?tY#JzH3_F$@ z57Uz#T0Pmr3r4!I{bi_s4pfn6{V@txWMr8WZk5^cJ60OAg4)H3x%u(@(nr=H?d+At z`_=*>8Yq-!AT;m(b1a=`de19F1Pt4iy7O9aV+&B(uMx>H9JP#^sD#(cu79FH)iopy z>Q8|9(aL&?yE4SB)%M`O-?-3z3b_JaY%hqUYk zjFy20sAE@T>pGsYs>r$zy3j>r-ZlyKQ~{Mc+JNRf%+NZJCb!UX8*s>Tx*t&nNaw&n zQh@yyb0li@09V7Gf$2m$FCEY~&Vtp{CgoowXV_`4dUou|5j8O|QYYU@=+CF0du4{G zf7A3iG%M*O=6_F72@5g!TaJ_t=oZG2Yf(Odxd5y4gSTZI)smNU`L*+YuD^5e=(Foa zuI#pe9IHF1<3ieQe$WzU?CvWLRsP3?B3d(cprZdzA&B-F3>c`2g)g+KF@q%Di|ZO& z?6M=&&u$gX21#bE2@|(tiBmkx3e1cpuD`u31#&!kUY8D8txx`!Rbl`1lu<7xD%X7% zq-<$-1C_gd0RiYi*>1EIeIWk7HD8m-4la|hG04YRM#umyG2z;y2rU#2v3PaCk8;g2x<`E+ZxGuvu~@qa{uiKH1L_zgyZ2B zeULK-nhY0Y*PfM=Wn((>%G$8u1}Y`{ZV={FR;Xmv$FxO!5eTSzL>Q$QW}F$uEkMXc zP^lVsM))X-f45IHwJ)GV;ZMcCSAqgr9DT4&dx^$<{WmUv-uq~IDZ1ura`2-lhmAir zCDshXQWFn&O3oV#^h;0o7HjIAd@=P>SH$GwB*~=!!HqHQCYsLwEr-Bf{NJ(H?(|e(w%yZvcWNIscs=chEOs}-szf2`|Rc7 op<-ZQP?K)Qs7a3VQitfU_Ub56K4z(62>gL-8(uBFVi)nh06VcQ6951J diff --git a/icons/obj/structure/urban/restaurant.dmi b/icons/obj/structure/urban/restaurant.dmi index 5b7001b811874a9793cb62224955f74ee617aeca..aea3e91b41a82bd47131c8d9fd92989251fc57ea 100644 GIT binary patch delta 1381 zcmV-r1)BQD4A%^hBPRidP)t-sz`(#zS6MVSJTW*ub$Wci#J^BjUD4FgZgX?9xU*DR zT#+~=1C5Q1kz7cB>g?z!b8|d6ZU6s)FEV2?lzmx0YWVo`FETbDGLJPtu`fEI#Cuxa zw4$&RAfOW_iV`sL*l+XBIva-5rE#R{@|Mt{-8vvbSNcYXdw@pp}pXFbFUtjCu$Hy!zwTE#3Ga{&h?04iW$)a$1A#{d8W=Sf6C zRA_|~qgj=sYN`A`ZGWgT z0p+_|9L=pz%?`J_a>-DXbgIWtl7sbS0HX*3G)sn}+uFRoHY0(reLfoJ;{iTd9)12E z<$D_E;{heL>!c5;IvtYAJ|5tyimjo53y1zWaLD01yE^@W4z}dWfNn()pjny&$gveb zhrg>6$j@=CjQ~w~{2=;y2@v2}JAVL9B?BPv2gK(tNE!J30gmGV0r+@;69drt9URB` z{h&Tl{GOmWfSDf134jb(p5p@2=OWMd_6E(B$Vvtwmgkkr=X-mC;c^D3M}^5A$Tv}6 z|0Nb6dgRLw4n)Ewfad8Y0klh82A;|cqWzbzus}f&ejswSTq3(NXpcqv2Y;_!4~0VE zNF*{;YI5rhRjqD!<1cW85vb6}1@1Y7amT>?qI2;!=|pUvMEMNEzIzDJ6r-@9qMPjg3KH5Ez66831=E zHAs2Sk^x9xaJgYQ3?yX$w|^9{sg&jQdQ004jq?QtRUt+I+cxcU%7@P@Z-mkZhNLO1 zZvp`N?2!(S&sTY^G_4F3NZ$+qN-cr$gk|Vk0l@jkN!5^%|91f>{m58FsP+YnY6ojb z6>h#K^l|e&sgIrS6@Oe3!bfbG@(B}(L^6@Q2Tw?esZ>f7)d1s@Q-70F_s5|>{a`ws zPCr!rnVDH|Jc52^Ztn4uxp@sBnM_V3l1X@iC}y9EVon2C0EC4_=s!!Rr>CE50WSbz zwhVZg$;@Xm84Y0RRU)~xvp@{%*Mkiy{Ne^WgBe5y*hj^$`xI`zC-r|v2I%>o)TeOsJ*iLO=6h0~!p--j zK82g_Nqq`8-;?^-(T~(`0R9U=o%Kh@?lU7Z@Bay8>is_v0Dt@b-wwd$*7nxU=63nz zcCom-x6jxJ_`LIF`{3X!1nd=yhlfYsYy=#ieBavoegXme#iJj)jGY<$n zO4Kcv$WFl7FA>8WpPn8w^(#@m9~H>?{tRS*neWK~nE9Sm*!iAR*!i9qfSd2hGr-LE n!~jdLh8utez#0%x=lT98Y;3?{Om%R)00000NkvXXu0mjf5b~sQ delta 1382 zcmV-s1)2KS495(RBNYJBP)t-sz`(#UI6Y8UUB$}Gk(ip1N+gkSNPj4Eb38b0|Nnt6 zGGj87eOW(hATp0NK(Q}6p)u@zm+Ud#f;o#5((<4w$$}f|@+q#fGf#yOZm}QUIejVe z>;QBBbE*IUf&ak3z^)KKvm40}uA9jlobK%DS^xk50d!JMQvg8b*k%9#0GE1HSad{X zb7OL8aCB*JZU6vyoRil9Zhr`>ODO_+wj`sd6qib61y?^8aIgaaRpxC^HSZz6000Dl zNklf0C(wNe1oqUJ!&p0DnILI3mCi0hR)g_BVqdXt$w0B>sMf0VCIA`uVG!(*^-CBY z9CTQT)|bJdABOby!-M@!SFc2ReSlx0qvNkWAolV0J14zv^*(5b8T608efPmS5dNh1 zL$5>z8Eg;w$EQDk9UdNbd%fOS(#hfr&PshU?E`;s-aq~Q=YObsadFl^NC4tXmN!>; z(1ydy!LZ*w@1GC*{6Q-;<34~K{L3&L3`r+%Gk{_|XxO7dqZx?D{(@ayT`|8^7C#2C zlJOwPn1z5+zd8dpq`;t(nCrUnaAT|dQV+|cDjBzJ&%(uXaUdis3u)Jser1VB1gk-o zhUba*YTHy)lz;j)GDwUc&sR^meiH!GKjJ}!zZgKWUI#!{2ck)_=<`<;Ki6OU7^{MP z*v3rNNmWg$@2mQi`o5~arW%oq{f_9bsr0?BKR!$}h4}kGCBJq3@nHlA@*PhYkFS$8 zZr)sv3jw#(WI!~T&Jd8ko&xUf?~|1@=kVd-jt3BHTz`Lj!bR{Cz%-g7AbmXrT;Gjx zox_$l3jt5JxX6GB5D<{Q9sv&IH0LF9#t+b(^AgF@@b>Zc5lryIHk!;Z1L6Ao65ZdB z&*mkX(LP9DPcvX8B2{9|o9n_1X#A&a2DC)N^+}16Dv{G#1V z-lmn__v-PW%ufPT^lu;og?O#%-$04pJcIWGP<>z3uhjQd{ckTFKkWTYzmrz%I`#ZN zG5pG10v> zU|nqjAXcRB8K6oh$0~#FWPL9KS}Oq5Z_`l<5EDlF0FCirG-9>KKiZM_+5nY!MS#br z_FFBw_tu#K5ZnZSTUR%}=H#}`Cih)BWIwX0|8{hD0f=nj)(D4|egFUf07*qoM6N<$f^z$g=>Px# diff --git a/icons/obj/structure/urban/road_edges.dmi b/icons/obj/structure/urban/road_edges.dmi index b4686ef9227ad0da3d65e90a3170b23ffbb803f1..a719b0ec88904f9580e98eab331ab25121a6a25b 100644 GIT binary patch delta 921 zcmV;K17`fS2;c~iBqttFOjJd{z`!mqGNJPNEz*&o) zjgd&Se@sb4K~#90?V3w++b|42Z%j7Ku^(ickZ&g`qIX<=vjH+d^H^oSmBrp3;h5NXuLdYPzyduU-~coWy^IMy!b7R} zAY=|sV}f0HC>6gF09mH11DY{G6CO&%NkBa&e^^*1RD2M!OwE|Ugoje`LC7S(jtRbp zhf?vC0Pr_&RnI?}0ApZ0aK-iK7iyS@wu*gYVLULY0zj|z0Ck^X=f(r(mJT?z3HFT} zXUqZVmS#xdJ_c9?10ubqsJjfu(xoCbma?u>qTfX<%dfOX8%qq}ryT zHXxXSC2>+$km@7VzGK?>ksVk|~mfC=z z0KDp%agviCwO~n{^g04C)5OgR?`*>R1CT*tRuLstXjWvskeU?ZW$KdP2~d=-7!Vw?H_Oe$E=F3SXGt> zV9Y_gf7q3UzkkREh1W_01N$pMnJg#&jwiP z|FZ#-y65KtB=!FsKvMtD0VMVR96(a{{9J&f<~BP3wvyQauo=ERz#AaBXTtVx@B8Zm z;H-f;WCG4-5AX{%=yUyH0=`@>zpoA;6391s3Q&Lo6rcbFC_n-K34mxVjsZ>uR?eyZsab zng-gDJ9hsra3|n_PZeF?K|2yu4ZtgmaY=w1J?z$d0(bNtTxb`>fX$Z8bOVY>fR@CowmwEZw*aApmc*-kL2?JKeW!$$#1Jq} z<7@z05=#Qml6X}=1IPskCA1`7<$p_RyWculkq)C&CAvtmw`L zUmpMunq-wwQkBVytryy4#R9a+iUX*V6$el!s}z7LmpmMxPFCz9QJbtdfI3-mfTU!l z1#rnq4an;MQvvGc)&P1yj-q{nDtYH1P2nngs8ud`-JPazBclGlh)CF)cz;HKFXyf> zVD%WR4hSb@9qn+v7@+mDs4(CSW|1~oHNlqLI6mB>EAWVLJ1G1VYm>Vkk#B42f$XcH~==oj|W5p zG5on{JuMYaiCx18NdJrFh76+3}65Qd=UWC zTIvCe9uF{?OeT}bWHOoFM$uMqpwH;9CSpC=fwNqH0Yhg}u{YA9_W%F@07*qoM6N<$ Ef~x_CcK`qY diff --git a/icons/obj/structure/urban/road_signs.dmi b/icons/obj/structure/urban/road_signs.dmi deleted file mode 100644 index f9e73d20dc3559e0bc4b06eb723fda2d30b32d75..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2243 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�C z6sN@-RqmqjR-+Vc(6=?ey@y!LeR%%Zm|=~7%24EOuHdr zdwdi6PY~|@YFm)hhR{H2*dX>8Dh8t5-hZcvmph=Q!zQ0X_dOL${snI8pVs7{ZFw>H zJ00st)HSE>qxwrLl?SJmZ6;9HxHlFDU?ig6%&3$aqi)4>^B_YPrxR0;if{uu^Sx{g z77zdE^~YE*WyRMWWO)7(=D6=)`&nj_c-s0hS!d^>>LZ(=Q{-i z&m#f7ic+Ka^o8-;vr&DlFW}A-IeCjG#?4ZLtl=E#RT~Y7P9D}+EvTrn&xFzW=z_9A zwfHuj{zW}yPhoeU+`M^5xcoW3RX8KT%2|O=>q+)lz8JnN@5@&Cpii>DN8+m5>Z$0U z7+NN95L^j9{qboPl!)4$ZOt=4{Wy~@8B*e#H#eI1sK*Y@K}HI(r)E%EYhUb+iZIn3 zWEPUZa#3_-YbqcF+|st?#ynP3IhRPBQEB@2h59AkASIbvLw-rO=gc=AE{6{&FQ4DL&8oSr%E9Z#fZ&_mwW`lQ zQeahJ)A?ZNv>{X3p>ylZF>TMX-Waw4a~^t+>b=kJ1d(%V+IN4;61t1YN8fI@1@x%C znkeiHI-^{Yse`ZImS=PsJ$}q`z-4P~lNy`xD9g;&myTRd$TLPwWw~n=Ix#fNZ#y40 z-XacAmn6tcgkOGEq|>+&?TJj_0bhBPSNp+jFCVz*h(121?Y~l1|IY0Hl5mHY@{iS8 zlZ5MJ17 zZE9TFam|^i<`~t#%P69Iv|WVin|$2t8<-*Ullw%`pgh;AHydT&F}icD@7t4x0RDns zjhkA5xlHutRzLc?bsd{IRiz8%f&Ggp7tx*3-wAc$rl2_9lhQ=ueW(I9RP06DX~kW$WOY4}{{lOo z!H#+v_#5<&CYExuQ-sMMqJTB;TuMwV>Nd{%UVy<54jP$usuY-IP|t^f|} zdeG=8PT*Q--1%c8$Uo1B>X`ILY2n4%@jJz!A4cR+&@H|rU$i#QktMn#w0mk!r~Sye z!vZ{JqpY(Teei1n1JO}CmqyM>-GX_30=rMsfvG80_?8XJe(x?wTI4LkF4hTiQi{{o ziJ;K7rE}dtFh&7U)TRPTECORCpThYFE8R^g9Nmk9kUJgXPeLy4vPT6{ABnPXb#jxJ z)?vH)rA~zG^+7R2h>D3GKBo~5$K-TM5R_)~$5RxxUx&H=&IHjj_W%Aq|9bXZKBw(q zX?B?VdM0Qf>@E2-uyOI{JgvQCkI@6&|BYH0p~hszz!;QagK?Y~gQfh@o>&URr|5XF O23$0|Y+7UN5%+%+5YE5= literal 0 HcmV?d00001 diff --git a/icons/obj/structure/urban/streetpoles.dmi b/icons/obj/structure/urban/streetpoles.dmi new file mode 100644 index 0000000000000000000000000000000000000000..5775fea2441ce84b1c7f08851420b43a37f63583 GIT binary patch literal 15258 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 literal 0 HcmV?d00001 diff --git a/maps/away/away_site/konyang/point_verdant/point_verdant-1.dmm b/maps/away/away_site/konyang/point_verdant/point_verdant-1.dmm index 8656245c6ff..c0d79d3a71c 100644 --- a/maps/away/away_site/konyang/point_verdant/point_verdant-1.dmm +++ b/maps/away/away_site/konyang/point_verdant/point_verdant-1.dmm @@ -14,6 +14,11 @@ /obj/item/mop, /turf/simulated/floor/tiled/full, /area/point_verdant/interior/pharmacy) +"ag" = ( +/obj/random/dirt_75, +/obj/structure/crane/body, +/turf/simulated/floor/concrete, +/area/point_verdant/outdoors) "ai" = ( /obj/machinery/door/urban, /turf/simulated/floor/tiled, @@ -40,7 +45,7 @@ }, /obj/structure/utility_pole/street/on{ dir = 8; - pixel_x = -6 + pixel_x = -18 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -77,7 +82,8 @@ /obj/random/dirt_75, /obj/random/dirt_75, /obj/structure/utility_pole/street/on{ - dir = 1 + dir = 1; + pixel_y = -8 }, /turf/simulated/floor/sidewalk/blocks, /area/point_verdant/outdoors) @@ -563,7 +569,8 @@ "bL" = ( /obj/random/dirt_75, /obj/structure/utility_pole/street/on{ - dir = 1 + dir = 1; + pixel_y = -8 }, /turf/simulated/floor/sidewalk/blocks, /area/point_verdant/outdoors) @@ -589,7 +596,7 @@ /turf/simulated/floor/lino/diamond, /area/point_verdant/interior/hotel) "bQ" = ( -/obj/structure/road_sign/yield{ +/obj/structure/street_sign/yield{ pixel_x = -16; name = "cavern warning sign"; desc = "A warning sign which declares the area ahead as off-limits. It details it as a dangerous, unregulated cave." @@ -600,7 +607,7 @@ "bR" = ( /obj/structure/utility_pole/street/on{ dir = 8; - pixel_x = -6 + pixel_x = -18 }, /obj/effect/decal/road_marking{ dir = 4 @@ -654,7 +661,8 @@ /turf/simulated/floor/sidewalk/flat, /area/point_verdant/interior) "bX" = ( -/obj/structure/road_sign/pedestrian{ +/obj/structure/street_sign/warnings{ + dir = 4; pixel_x = -16 }, /turf/simulated/floor/sidewalk, @@ -2058,7 +2066,8 @@ /area/point_verdant/interior/tunnels) "gt" = ( /obj/structure/chainlink_fence{ - dir = 8 + dir = 8; + pixel_x = -16 }, /obj/structure/ledge{ dir = 1 @@ -2625,6 +2634,13 @@ }, /turf/simulated/floor/wood, /area/point_verdant/interior/hotel) +"id" = ( +/obj/effect/decal/curb{ + dir = 4 + }, +/obj/structure/crane/arm, +/turf/simulated/floor/asphalt, +/area/point_verdant/outdoors) "ie" = ( /obj/structure/filingcabinet/filingcabinet{ pixel_x = 10; @@ -2851,6 +2867,10 @@ /obj/random/dirt_75, /turf/simulated/floor/tiled/white, /area/point_verdant/interior/pharmacy) +"iI" = ( +/obj/structure/crane/arm, +/turf/simulated/floor/asphalt, +/area/point_verdant/outdoors) "iK" = ( /obj/structure/flora/rock/konyang/small, /turf/simulated/floor/exoplanet/konyang, @@ -3094,7 +3114,7 @@ /obj/effect/decal/exterior_stairs/half{ dir = 1 }, -/obj/structure/sign/urban/staff{ +/obj/structure/sign/staff{ pixel_y = 19; pixel_x = -1; layer = 9 @@ -3161,7 +3181,8 @@ dir = 1 }, /obj/structure/utility_pole/street/on{ - dir = 1 + dir = 1; + pixel_y = -8 }, /obj/structure/road_barrier/bot_end{ dir = 1; @@ -3847,7 +3868,7 @@ /turf/simulated/floor/sidewalk/blocks, /area/point_verdant/outdoors) "lz" = ( -/obj/structure/sign/urban/restroom, +/obj/structure/sign/restroom, /turf/simulated/wall, /area/point_verdant/interior/bar) "lA" = ( @@ -4780,7 +4801,7 @@ }, /obj/structure/utility_pole/street/on{ dir = 8; - pixel_x = -6 + pixel_x = -18 }, /obj/random/dirt_75, /turf/simulated/floor/asphalt, @@ -5223,7 +5244,8 @@ dir = 1 }, /obj/structure/utility_pole/street/on{ - dir = 1 + dir = 1; + pixel_y = -8 }, /turf/simulated/floor/asphalt, /area/point_verdant/interior/tunnels) @@ -5252,7 +5274,8 @@ dir = 1 }, /obj/structure/utility_pole/street/on{ - dir = 1 + dir = 1; + pixel_y = -8 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -5522,7 +5545,8 @@ layer = 9.1 }, /obj/structure/utility_pole/street/on{ - dir = 1 + dir = 1; + pixel_y = -8 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -6225,6 +6249,10 @@ /obj/random/dirt_75, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) +"sQ" = ( +/obj/structure/crane/body, +/turf/simulated/floor/asphalt, +/area/point_verdant/outdoors) "sR" = ( /obj/structure/reagent_dispensers/extinguisher, /obj/machinery/light{ @@ -6433,7 +6461,8 @@ pixel_y = -16 }, /obj/structure/utility_pole/street/on{ - dir = 8 + dir = 8; + pixel_x = -18 }, /turf/simulated/floor/concrete, /area/point_verdant/outdoors) @@ -6793,10 +6822,11 @@ dir = 1 }, /obj/structure/utility_pole/street/on{ - dir = 1 + dir = 1; + pixel_y = -8 }, /obj/structure/chainlink_fence{ - layer = 9.1 + pixel_y = -32 }, /turf/simulated/floor/asphalt, /area/point_verdant/interior/tunnels) @@ -7033,7 +7063,9 @@ /obj/effect/decal/curb{ dir = 1 }, -/obj/structure/chainlink_fence, +/obj/structure/chainlink_fence{ + pixel_y = -32 + }, /turf/simulated/floor/asphalt, /area/point_verdant/interior/tunnels) "vz" = ( @@ -8856,7 +8888,8 @@ dir = 8 }, /obj/structure/utility_pole/street/on{ - dir = 8 + dir = 8; + pixel_x = -18 }, /turf/simulated/floor/asphalt, /area/point_verdant/interior/tunnels) @@ -9434,7 +9467,8 @@ dir = 1 }, /obj/structure/utility_pole/street/on{ - dir = 1 + dir = 1; + pixel_y = -8 }, /obj/random/dirt_75, /turf/simulated/floor/asphalt, @@ -9511,7 +9545,8 @@ dir = 1 }, /obj/structure/utility_pole/street/on{ - dir = 1 + dir = 1; + pixel_y = -8 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -10289,6 +10324,10 @@ }, /turf/simulated/floor/tiled/white, /area/point_verdant/interior/pharmacy) +"FF" = ( +/obj/structure/crane/arm, +/turf/simulated/floor/concrete, +/area/point_verdant/outdoors) "FH" = ( /obj/structure/table/standard, /obj/item/storage/box/folders{ @@ -10560,7 +10599,7 @@ /turf/simulated/floor/sidewalk/flat, /area/point_verdant/interior/tunnels) "GB" = ( -/obj/structure/road_sign/yield{ +/obj/structure/street_sign/yield{ pixel_x = -16; name = "cavern warning sign"; desc = "A warning sign which declares the area ahead as off-limits. It details it as a dangerous, unregulated cave." @@ -11294,18 +11333,16 @@ /turf/simulated/floor/exoplanet/water/konyang, /area/point_verdant/water/deep) "Iq" = ( -/obj/effect/decal/road_marking{ - dir = 4 - }, /obj/effect/decal/curb{ - dir = 8 + dir = 1 }, /obj/structure/utility_pole/street/on{ - dir = 8; - pixel_x = -6 + dir = 1; + pixel_y = -8; + layer = 4.6 }, /turf/simulated/floor/asphalt, -/area/point_verdant/interior/tunnels) +/area/point_verdant/outdoors) "Ir" = ( /turf/simulated/wall/r_wall, /area/point_verdant/interior/police) @@ -11896,6 +11933,13 @@ "Kp" = ( /turf/simulated/wall/wood, /area/point_verdant/interior/hotel) +"Kq" = ( +/obj/structure/ledge{ + dir = 1 + }, +/obj/structure/crane/body, +/turf/simulated/floor/concrete, +/area/point_verdant/outdoors) "Kr" = ( /turf/simulated/floor/tiled/white, /area/point_verdant/interior/police) @@ -13018,7 +13062,8 @@ /area/point_verdant/interior/hotel) "Nw" = ( /obj/structure/chainlink_fence{ - dir = 8 + dir = 8; + pixel_x = -16 }, /obj/effect/decal/curb{ dir = 4 @@ -13275,7 +13320,7 @@ dir = 5 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/sign/urban/staff{ +/obj/structure/sign/staff{ pixel_y = 40; layer = 9 }, @@ -13589,7 +13634,7 @@ "Po" = ( /obj/structure/utility_pole/street/on{ dir = 8; - pixel_x = -6 + pixel_x = -18 }, /obj/effect/decal/road_marking{ dir = 4 @@ -13661,7 +13706,8 @@ /area/point_verdant/outdoors) "Pz" = ( /obj/structure/utility_pole/street/on{ - dir = 1 + dir = 1; + pixel_y = -8 }, /turf/simulated/floor/sidewalk/blocks, /area/point_verdant/outdoors) @@ -13917,7 +13963,7 @@ /obj/structure/rod_railing{ dir = 8 }, -/obj/structure/sign/urban/staff{ +/obj/structure/sign/staff{ pixel_y = 42; pixel_x = -29; layer = 9 @@ -14167,8 +14213,7 @@ /obj/effect/decal/curb/corner{ dir = 1 }, -/obj/structure/sign/urban{ - dir = 8; +/obj/structure/sign/exit{ pixel_x = -6; pixel_y = 7 }, @@ -14196,7 +14241,8 @@ "QT" = ( /obj/structure/dock_structure, /obj/structure/utility_pole/street/on{ - dir = 8 + dir = 8; + pixel_x = -18 }, /turf/simulated/floor/concrete, /area/point_verdant/outdoors) @@ -14345,6 +14391,10 @@ /obj/structure/flora/bush/konyang_reeds, /turf/simulated/floor/foundation, /area/point_verdant/interior/decrepit) +"Re" = ( +/obj/structure/crane/body, +/turf/simulated/floor/concrete, +/area/point_verdant/outdoors) "Rf" = ( /obj/effect/step_trigger/thrower{ icon_state = "dir_arrow"; @@ -15250,7 +15300,8 @@ dir = 8 }, /obj/structure/utility_pole/street/on{ - dir = 8 + dir = 8; + pixel_x = -18 }, /obj/random/dirt_75, /turf/simulated/floor/asphalt, @@ -15645,6 +15696,12 @@ /obj/effect/floor_decal/corner/blue/diagonal, /turf/simulated/floor/tiled, /area/point_verdant/interior/police) +"UZ" = ( +/obj/structure/crane{ + layer = 4.4 + }, +/turf/simulated/floor/concrete, +/area/point_verdant/outdoors) "Va" = ( /obj/structure/ledge/quarter, /obj/structure/rod_railing, @@ -16221,7 +16278,8 @@ "Ww" = ( /obj/structure/dock_structure, /obj/structure/utility_pole/street/on{ - dir = 8 + dir = 8; + pixel_x = -18 }, /obj/item/reagent_containers/glass/bucket/wood{ pixel_y = -2; @@ -16332,7 +16390,8 @@ /area/point_verdant/outdoors) "WM" = ( /obj/structure/utility_pole/street/on{ - dir = 8 + dir = 8; + pixel_x = -18 }, /turf/simulated/floor/concrete, /area/point_verdant/outdoors) @@ -16489,7 +16548,9 @@ /area/point_verdant/interior/police) "Xm" = ( /obj/structure/lattice/catwalk/indoor/urban, -/obj/structure/chainlink_fence, +/obj/structure/chainlink_fence{ + pixel_y = -32 + }, /turf/simulated/floor/exoplanet/water/shallow/konyang, /area/point_verdant/interior/tunnels) "Xn" = ( @@ -17358,13 +17419,20 @@ /obj/effect/decal/exterior_stairs/half{ dir = 1 }, -/obj/structure/sign/urban/staff{ +/obj/structure/sign/staff{ pixel_y = 19; pixel_x = -1; layer = 9 }, /turf/simulated/floor/lino/diamond, /area/point_verdant/interior/bar) +"ZQ" = ( +/obj/structure/ledge{ + dir = 1 + }, +/obj/structure/crane/arm, +/turf/simulated/floor/concrete, +/area/point_verdant/outdoors) "ZS" = ( /obj/machinery/door/airlock/command, /turf/simulated/floor/tiled, @@ -57605,10 +57673,10 @@ Ga dN QV As -oJ +Kq yv -dK -GK +UZ +ag yv dK yv @@ -58119,10 +58187,10 @@ Ga dN QV As -oJ +ZQ Ps qZ -qZ +id qZ lW yv @@ -59448,7 +59516,7 @@ qB qB qB qB -Iq +Bq qB qB qB @@ -66364,7 +66432,7 @@ IK Gl Rv fn -pZ +Iq yv ew hm @@ -67371,7 +67439,7 @@ Ga Qo yv yv -yv +Re yv dK IK @@ -67380,7 +67448,7 @@ sP Gl Rv Jc -Rv +sQ nI dK yv @@ -67885,7 +67953,7 @@ Ga Qo yv yv -yv +FF yv yv IK @@ -67894,7 +67962,7 @@ Jc Rv Rv Jc -Rv +iI nI yv yv @@ -68420,7 +68488,7 @@ IK Rv Rv fZ -pZ +Iq yv ew hm diff --git a/maps/away/away_site/konyang/point_verdant/point_verdant-2.dmm b/maps/away/away_site/konyang/point_verdant/point_verdant-2.dmm index 0e306a91b87..14986721151 100644 --- a/maps/away/away_site/konyang/point_verdant/point_verdant-2.dmm +++ b/maps/away/away_site/konyang/point_verdant/point_verdant-2.dmm @@ -77,12 +77,13 @@ }, /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1 + dir = 1; + pixel_y = 32 }, /turf/simulated/floor/sidewalk/flat, /area/point_verdant/outdoors) "am" = ( -/obj/structure/sign/urban{ +/obj/structure/sign/exit{ dir = 8; pixel_x = -6; pixel_y = 7 @@ -111,7 +112,7 @@ /area/point_verdant/outdoors) "as" = ( /obj/structure/utility_pole/street/on{ - pixel_y = -3 + pixel_y = -8 }, /obj/random/dirt_75, /turf/simulated/floor/sidewalk/blocks, @@ -195,7 +196,8 @@ "aB" = ( /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1 + dir = 1; + pixel_y = 32 }, /obj/effect/step_trigger/thrower{ icon_state = "dir_arrow"; @@ -245,7 +247,8 @@ dir = 4 }, /obj/structure/chainlink_fence{ - dir = 4 + dir = 4; + pixel_x = 16 }, /obj/effect/decal/road_marking{ dir = 4 @@ -372,7 +375,8 @@ dir = 4 }, /obj/structure/chainlink_fence{ - dir = 4 + dir = 4; + pixel_x = 16 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -578,7 +582,8 @@ dir = 4 }, /obj/structure/chainlink_fence{ - dir = 4 + dir = 4; + pixel_x = 16 }, /obj/structure/konyang_cliff{ icon_state = "cliff-west"; @@ -653,7 +658,8 @@ dir = 10 }, /obj/structure/utility_pole/street/on{ - dir = 8 + dir = 8; + pixel_x = -24 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -714,7 +720,7 @@ /area/point_verdant/outdoors) "bV" = ( /obj/structure/utility_pole/street/on{ - pixel_y = -3 + pixel_y = -8 }, /turf/simulated/floor/sidewalk/blocks, /area/point_verdant/outdoors) @@ -876,7 +882,8 @@ }, /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1 + dir = 1; + pixel_y = 32 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -993,7 +1000,7 @@ /turf/simulated/floor/tiled, /area/point_verdant/interior/robotics) "cP" = ( -/obj/structure/sign/urban/restroom{ +/obj/structure/sign/restroom{ pixel_x = 22; pixel_y = -15 }, @@ -1063,7 +1070,8 @@ dir = 1 }, /obj/structure/utility_pole/street/on{ - dir = 1 + dir = 1; + pixel_y = -8 }, /obj/structure/chainlink_fence{ layer = 9.1 @@ -1497,14 +1505,16 @@ /area/point_verdant/outdoors) "eg" = ( /obj/structure/chainlink_fence{ - dir = 8 + dir = 8; + pixel_x = -16 }, /obj/structure/rod_railing, /turf/simulated/floor/concrete, /area/point_verdant/outdoors) "eh" = ( /obj/structure/chainlink_fence{ - dir = 8 + dir = 8; + pixel_x = -16 }, /obj/structure/konyang_cliff{ icon_state = "cliff-east" @@ -1530,7 +1540,8 @@ "ek" = ( /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1 + dir = 1; + pixel_y = 32 }, /obj/effect/step_trigger/thrower{ icon_state = "dir_arrow"; @@ -1856,7 +1867,8 @@ /area/point_verdant/outdoors) "ff" = ( /obj/structure/utility_pole/street/on{ - dir = 8 + dir = 8; + pixel_x = -24 }, /obj/structure/ledge/corner{ dir = 8 @@ -1933,7 +1945,8 @@ /area/point_verdant/interior/shallow) "ft" = ( /obj/structure/utility_pole/street/on{ - dir = 8 + dir = 8; + pixel_x = -24 }, /turf/simulated/floor/sidewalk/flat, /area/point_verdant/outdoors) @@ -2106,7 +2119,8 @@ icon_state = "cliff-west" }, /obj/structure/utility_pole/street/on{ - dir = 8 + dir = 8; + pixel_x = -24 }, /turf/simulated/floor/exoplanet/water/shallow/konyang, /area/point_verdant/outdoors) @@ -2152,7 +2166,7 @@ /turf/simulated/floor/asphalt, /area/point_verdant/water) "fY" = ( -/obj/structure/sign/urban/staff{ +/obj/structure/sign/staff{ pixel_y = 36; layer = 9; pixel_x = -33 @@ -2178,7 +2192,7 @@ /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) "gc" = ( -/obj/structure/sign/urban/restroom{ +/obj/structure/sign/restroom{ pixel_x = 31; pixel_y = 10 }, @@ -2267,14 +2281,16 @@ /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) "gr" = ( -/obj/structure/konyang_cliff{ - icon_state = "cliff-top1" +/obj/structure/chainlink_fence{ + layer = 9.1; + dir = 1; + pixel_y = 32 }, -/obj/structure/chainlink_fence, +/obj/effect/decal/curb, /obj/structure/utility_pole/street/on{ layer = 9.2 }, -/turf/simulated/floor/exoplanet/water/shallow/konyang, +/turf/simulated/floor/asphalt, /area/point_verdant/outdoors) "gt" = ( /obj/structure/konyang_cliff{ @@ -2752,7 +2768,8 @@ /area/point_verdant/interior/offices) "hG" = ( /obj/structure/utility_pole/street/on{ - dir = 4 + dir = 4; + pixel_x = -40 }, /obj/effect/decal/road_marking{ dir = 8 @@ -2899,7 +2916,9 @@ /turf/simulated/floor/asphalt, /area/point_verdant/interior/offices) "ie" = ( -/obj/structure/utility_pole/street/on, +/obj/structure/utility_pole/street/on{ + pixel_y = -16 + }, /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) "if" = ( @@ -3106,7 +3125,8 @@ dir = 10 }, /obj/structure/utility_pole/street/on{ - dir = 8 + dir = 8; + pixel_x = -24 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -3175,7 +3195,8 @@ /area/point_verdant/outdoors) "iS" = ( /obj/structure/chainlink_fence{ - dir = 8 + dir = 8; + pixel_x = -16 }, /turf/simulated/floor/concrete, /area/point_verdant/outdoors) @@ -3199,7 +3220,8 @@ "iV" = ( /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1 + dir = 1; + pixel_y = 32 }, /obj/structure/closet/crate/bin/urban/dumpster, /obj/effect/step_trigger/thrower{ @@ -3326,7 +3348,8 @@ }, /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1 + dir = 1; + pixel_y = 32 }, /obj/structure/flora/bush/konyang_reeds, /turf/simulated/floor/exoplanet/konyang, @@ -3455,7 +3478,7 @@ /obj/effect/decal/curb{ dir = 1 }, -/obj/structure/road_sign/turn{ +/obj/structure/street_sign/turn{ dir = 8; pixel_x = 15; pixel_y = -7 @@ -3537,7 +3560,8 @@ dir = 4 }, /obj/structure/utility_pole/street/on{ - dir = 8 + dir = 8; + pixel_x = -24 }, /turf/simulated/floor/concrete, /area/point_verdant/outdoors) @@ -3653,7 +3677,7 @@ /turf/simulated/floor/tiled/white, /area/point_verdant/interior/pharmacy) "kf" = ( -/obj/structure/sign/urban/konyang/arcade{ +/obj/structure/sign/double/arcade{ pixel_y = 32; layer = 4.6 }, @@ -3944,11 +3968,11 @@ /turf/simulated/floor/carpet/lightblue, /area/point_verdant/interior/hotel) "kU" = ( -/obj/structure/road_sign{ +/obj/structure/street_sign/stop_konyang{ pixel_x = -12; pixel_y = 30 }, -/obj/structure/road_sign/street{ +/obj/structure/street_sign/street{ pixel_x = 15; street_name = "Spaceport Avenue"; pixel_y = 30 @@ -4065,7 +4089,8 @@ dir = 4 }, /obj/structure/utility_pole/street/on{ - dir = 4 + dir = 4; + pixel_x = -40 }, /turf/simulated/floor/asphalt, /area/point_verdant/interior/shallow) @@ -4098,7 +4123,7 @@ /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) "lm" = ( -/obj/structure/sign/urban/drive_thru, +/obj/structure/street_sign/drive_thru, /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) "ln" = ( @@ -4121,7 +4146,8 @@ dir = 8 }, /obj/structure/utility_pole/street/on{ - dir = 4 + dir = 4; + pixel_x = -40 }, /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) @@ -4357,10 +4383,9 @@ /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) "lW" = ( -/obj/structure/road_sign/street{ +/obj/structure/street_sign/street{ pixel_x = -16; pixel_y = 28; - icon_state = "street_right"; street_name = "Chainlink Boulevard" }, /turf/simulated/floor/sidewalk/blocks, @@ -4383,7 +4408,9 @@ /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) "lZ" = ( -/obj/structure/utility_pole/street/on, +/obj/structure/utility_pole/street/on{ + pixel_y = -16 + }, /turf/simulated/floor/sidewalk/detail, /area/point_verdant/interior/shallow) "ma" = ( @@ -4646,7 +4673,9 @@ /obj/structure/ledge{ dir = 1 }, -/obj/structure/utility_pole/street/on, +/obj/structure/utility_pole/street/on{ + pixel_y = -16 + }, /turf/simulated/floor/concrete, /area/point_verdant/outdoors) "mM" = ( @@ -4658,7 +4687,8 @@ "mN" = ( /obj/structure/rod_railing, /obj/structure/chainlink_fence{ - dir = 4 + dir = 4; + pixel_x = 16 }, /obj/structure/konyang_cliff{ icon_state = "innercorner5" @@ -4797,7 +4827,7 @@ /obj/effect/decal/exterior_stairs/half/center{ dir = 4 }, -/obj/structure/sign/urban/staff{ +/obj/structure/sign/staff{ pixel_y = 37; pixel_x = -1; layer = 9 @@ -5317,7 +5347,8 @@ dir = 4 }, /obj/structure/chainlink_fence{ - dir = 4 + dir = 4; + pixel_x = 16 }, /obj/structure/utility_pole/street/on{ dir = 8; @@ -5571,7 +5602,8 @@ "oX" = ( /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1 + dir = 1; + pixel_y = 32 }, /obj/item/material/stool/chair/folding, /obj/item/material/stool/chair/folding{ @@ -5581,7 +5613,8 @@ pixel_y = 10 }, /obj/structure/chainlink_fence{ - dir = 8 + dir = 8; + pixel_x = -16 }, /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) @@ -5662,11 +5695,15 @@ "pj" = ( /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1 + dir = 1; + pixel_y = 32 }, /obj/effect/decal/curb{ dir = 6 }, +/obj/structure/utility_pole/street/on{ + layer = 9.2 + }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) "pk" = ( @@ -5690,7 +5727,7 @@ /area/point_verdant/outdoors) "pn" = ( /obj/effect/decal/curb, -/obj/structure/sign/urban/konyang/bar{ +/obj/structure/sign/double/bar{ pixel_y = 32; pixel_x = 1 }, @@ -5931,7 +5968,8 @@ /turf/simulated/floor/lino, /area/point_verdant/interior/restaurant) "pU" = ( -/obj/structure/road_sign/turn/left{ +/obj/structure/street_sign/turn{ + dir = 1; pixel_x = -14; layer = 9.1 }, @@ -5939,7 +5977,8 @@ /area/point_verdant/outdoors) "pV" = ( /obj/structure/utility_pole/street/on{ - dir = 8 + dir = 8; + pixel_x = -24 }, /obj/structure/ledge/corner{ dir = 8 @@ -6105,7 +6144,8 @@ dir = 4 }, /obj/structure/chainlink_fence{ - dir = 4 + dir = 4; + pixel_x = 16 }, /obj/effect/decal/road_marking/thin{ dir = 1 @@ -6163,7 +6203,8 @@ icon_state = "innercorner6" }, /obj/structure/chainlink_fence{ - dir = 8 + dir = 8; + pixel_x = -16 }, /turf/simulated/floor/exoplanet/water/shallow/konyang, /area/point_verdant/outdoors) @@ -6179,7 +6220,8 @@ }, /obj/structure/automobile_filler, /obj/structure/chainlink_fence{ - dir = 4 + dir = 4; + pixel_x = 16 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -6199,7 +6241,8 @@ /obj/structure/hydrant{ pixel_x = -15 }, -/obj/structure/road_sign/pedestrian{ +/obj/structure/street_sign/warnings{ + dir = 4; pixel_y = 30; pixel_x = -16 }, @@ -6315,7 +6358,8 @@ "re" = ( /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1 + dir = 1; + pixel_y = 32 }, /obj/structure/bed/stool/chair/plastic, /turf/simulated/floor/sidewalk, @@ -6389,7 +6433,7 @@ /obj/effect/decal/road_marking{ dir = 8 }, -/obj/structure/road_sign/turn{ +/obj/structure/street_sign/turn{ dir = 1; pixel_x = -11 }, @@ -6405,7 +6449,8 @@ "rp" = ( /obj/structure/chainlink_fence, /obj/structure/chainlink_fence{ - dir = 8 + dir = 8; + pixel_x = -16 }, /obj/structure/konyang_cliff{ icon_state = "topcorner_east" @@ -6438,7 +6483,7 @@ /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) "ru" = ( -/obj/structure/sign/urban/staff{ +/obj/structure/sign/staff{ pixel_y = 40; layer = 9 }, @@ -6509,7 +6554,8 @@ dir = 8 }, /obj/structure/utility_pole/street/on{ - dir = 4 + dir = 4; + pixel_x = -40 }, /turf/simulated/floor/sidewalk/flat, /area/point_verdant/outdoors) @@ -6518,7 +6564,8 @@ dir = 4 }, /obj/structure/chainlink_fence{ - dir = 4 + dir = 4; + pixel_x = 16 }, /obj/structure/konyang_cliff{ icon_state = "innercorner3" @@ -6676,7 +6723,8 @@ icon_state = "innercorner2" }, /obj/structure/chainlink_fence{ - dir = 8 + dir = 8; + pixel_x = -16 }, /turf/simulated/floor/exoplanet/water/konyang, /area/point_verdant/outdoors) @@ -6787,15 +6835,13 @@ /obj/structure/hydrant{ pixel_x = 15 }, -/obj/structure/road_sign{ +/obj/structure/street_sign/stop_konyang{ pixel_y = 30; - pixel_x = -10; - dir = 8 + pixel_x = -10 }, -/obj/structure/road_sign/street{ +/obj/structure/street_sign/street{ pixel_x = 1; pixel_y = 30; - icon_state = "street_right"; street_name = "Spaceport Avenue" }, /turf/simulated/floor/sidewalk, @@ -6851,14 +6897,16 @@ /obj/effect/decal/curb/corner, /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1 + dir = 1; + pixel_y = 32 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) "sA" = ( /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1 + dir = 1; + pixel_y = 32 }, /turf/simulated/floor/sidewalk/flat, /area/point_verdant/outdoors) @@ -6990,7 +7038,8 @@ dir = 8 }, /obj/structure/chainlink_fence{ - dir = 4 + dir = 4; + pixel_x = 16 }, /obj/structure/konyang_cliff{ icon_state = "cliff-west"; @@ -7220,7 +7269,8 @@ dir = 8 }, /obj/structure/utility_pole/street/on{ - dir = 4 + dir = 4; + pixel_x = -40 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -7354,7 +7404,8 @@ "tP" = ( /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1 + dir = 1; + pixel_y = 32 }, /obj/effect/step_trigger/thrower{ icon_state = "dir_arrow"; @@ -7481,7 +7532,8 @@ dir = 9 }, /obj/structure/utility_pole/street/on{ - dir = 8 + dir = 8; + pixel_x = -24 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -7554,7 +7606,7 @@ /turf/simulated/floor/exoplanet/water/shallow/konyang, /area/point_verdant/water) "uo" = ( -/obj/structure/sign/urban/staff{ +/obj/structure/sign/staff{ pixel_y = 40; layer = 9 }, @@ -7595,7 +7647,8 @@ layer = 9.1 }, /obj/structure/utility_pole/street/on{ - dir = 1 + dir = 1; + pixel_y = -8 }, /turf/simulated/floor/exoplanet/konyang, /area/point_verdant/outdoors) @@ -7628,7 +7681,7 @@ /area/point_verdant/interior/offices) "ux" = ( /obj/structure/utility_pole/street/on{ - pixel_y = -3 + pixel_y = -8 }, /turf/simulated/floor/sidewalk/detail, /area/point_verdant/outdoors) @@ -7798,7 +7851,7 @@ }, /obj/structure/utility_pole/street/on{ dir = 8; - pixel_x = -6 + pixel_x = -24 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -7966,14 +8019,17 @@ /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) "vu" = ( -/obj/effect/decal/road_marking{ - dir = 4 +/obj/structure/chainlink_fence{ + layer = 9.1; + dir = 1; + pixel_y = 32 }, -/obj/effect/decal/curb{ +/obj/effect/decal/road_marking/thin{ dir = 8 }, +/obj/effect/decal/curb, /obj/structure/utility_pole/street/on{ - dir = 8 + layer = 9.2 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -8030,13 +8086,15 @@ /turf/simulated/floor/exoplanet/water/shallow/konyang, /area/point_verdant/water) "vF" = ( -/obj/structure/konyang_cliff{ - icon_state = "cliff-top1" +/obj/structure/chainlink_fence{ + layer = 9.1; + dir = 1; + pixel_y = 32 }, /obj/structure/utility_pole/street/on{ layer = 9.2 }, -/turf/simulated/floor/exoplanet/water/shallow/konyang/no_smooth, +/turf/simulated/floor/sidewalk/flat, /area/point_verdant/outdoors) "vG" = ( /obj/structure/table/rack/retail_shelf, @@ -8238,7 +8296,8 @@ dir = 4 }, /obj/structure/utility_pole/street/on{ - dir = 4 + dir = 4; + pixel_x = -40 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -8272,9 +8331,9 @@ /turf/simulated/floor/tiled/white, /area/point_verdant/interior/hotel) "wf" = ( -/obj/structure/road_sign/turn/left{ - pixel_x = -16; +/obj/structure/street_sign/turn{ dir = 8; + pixel_x = -16; pixel_y = -9 }, /obj/effect/decal/road_marking{ @@ -8455,7 +8514,8 @@ dir = 8 }, /obj/structure/utility_pole/street/on{ - dir = 4 + dir = 4; + pixel_x = -40 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -8778,7 +8838,8 @@ dir = 6 }, /obj/structure/utility_pole/street/on{ - dir = 4 + dir = 4; + pixel_x = -40 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -8802,7 +8863,8 @@ icon_state = "cliff-top1" }, /obj/structure/chainlink_fence{ - dir = 8 + dir = 8; + pixel_x = -16 }, /obj/structure/konyang_cliff{ icon_state = "cliff-east" @@ -8812,7 +8874,7 @@ "xF" = ( /obj/structure/lattice/catwalk/indoor/planks, /obj/machinery/door/window/northright, -/obj/structure/sign/urban/staff{ +/obj/structure/sign/staff{ pixel_y = 35; pixel_x = 25; layer = 9 @@ -8820,16 +8882,12 @@ /turf/simulated/floor/wood, /area/point_verdant/interior/hotel) "xG" = ( -/obj/structure/konyang_cliff{ - icon_state = "cliff-top1" - }, -/obj/structure/ledge{ - dir = 4 - }, +/obj/structure/road_barrier, /obj/structure/utility_pole/street/on{ - layer = 9.2 + pixel_y = -16; + layer = 4.6 }, -/turf/simulated/floor/exoplanet/water/shallow/konyang/no_smooth, +/turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) "xH" = ( /obj/effect/decal/road_marking/center{ @@ -9122,9 +9180,8 @@ pixel_y = -1; pixel_x = 1 }, -/obj/structure/road_sign/street{ +/obj/structure/street_sign/street{ pixel_x = 3; - icon_state = "street_left"; street_name = "Spaceport Avenue" }, /turf/simulated/floor/sidewalk/detail, @@ -9145,7 +9202,9 @@ /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) "yt" = ( -/obj/structure/utility_pole/street/on, +/obj/structure/utility_pole/street/on{ + pixel_y = -16 + }, /obj/structure/hydrant{ pixel_x = -15 }, @@ -9168,7 +9227,7 @@ /turf/simulated/open, /area/point_verdant/outdoors) "yx" = ( -/obj/machinery/mech_recharger/automobile, +/obj/machinery/mech_recharger, /turf/simulated/floor/concrete, /area/point_verdant/interior/shallow) "yy" = ( @@ -9195,7 +9254,7 @@ /turf/simulated/floor/tiled, /area/point_verdant/interior/offices) "yC" = ( -/obj/structure/sign/urban/staff{ +/obj/structure/sign/staff{ pixel_y = 5; pixel_x = -11; layer = 9 @@ -9349,7 +9408,7 @@ /obj/structure/ledge/quarter{ dir = 1 }, -/obj/structure/sign/urban{ +/obj/structure/sign/exit{ pixel_x = 6; pixel_y = 1 }, @@ -9496,7 +9555,9 @@ /turf/simulated/floor/tiled, /area/point_verdant/interior/police) "zp" = ( -/obj/structure/utility_pole/street/on, +/obj/structure/utility_pole/street/on{ + pixel_y = -16 + }, /obj/structure/ledge{ dir = 1 }, @@ -9512,7 +9573,8 @@ "zr" = ( /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1 + dir = 1; + pixel_y = 32 }, /obj/effect/decal/road_marking/thin{ dir = 8 @@ -9684,7 +9746,8 @@ "zI" = ( /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1 + dir = 1; + pixel_y = 32 }, /obj/effect/decal/curb, /turf/simulated/floor/asphalt, @@ -9879,7 +9942,8 @@ "Ag" = ( /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1 + dir = 1; + pixel_y = 32 }, /obj/effect/step_trigger/thrower{ icon_state = "dir_arrow"; @@ -10169,7 +10233,7 @@ /obj/structure/road_barrier/bot_end{ dir = 1 }, -/obj/structure/road_sign/yield{ +/obj/structure/street_sign/yield{ pixel_x = -16 }, /obj/effect/decal/road_marking/thin{ @@ -10296,7 +10360,7 @@ /area/point_verdant/interior/minimart) "Bh" = ( /obj/structure/utility_pole/street/on{ - pixel_y = -3 + pixel_y = -8 }, /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) @@ -10698,7 +10762,8 @@ /area/point_verdant/outdoors) "Cq" = ( /obj/structure/chainlink_fence{ - dir = 8 + dir = 8; + pixel_x = -16 }, /obj/random/dirt_75, /turf/simulated/floor/sidewalk/blocks, @@ -10836,7 +10901,9 @@ /turf/simulated/floor/exoplanet/water/shallow/konyang, /area/point_verdant/water) "CL" = ( -/obj/structure/utility_pole/street/on, +/obj/structure/utility_pole/street/on{ + pixel_y = -16 + }, /turf/simulated/floor/sidewalk, /area/point_verdant/water) "CM" = ( @@ -10847,7 +10914,8 @@ /area/point_verdant/outdoors) "CN" = ( /obj/structure/utility_pole/street/on{ - dir = 1 + dir = 1; + pixel_y = -8 }, /obj/effect/decal/road_marking{ dir = 1 @@ -10943,7 +11011,8 @@ dir = 5 }, /obj/structure/utility_pole/street/on{ - dir = 4 + dir = 4; + pixel_x = -40 }, /obj/effect/decal/road_marking/reflector, /turf/simulated/floor/asphalt, @@ -10951,7 +11020,8 @@ "Db" = ( /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1 + dir = 1; + pixel_y = 32 }, /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) @@ -10998,7 +11068,8 @@ /area/point_verdant/outdoors) "Dh" = ( /obj/structure/utility_pole/street/on{ - dir = 4 + dir = 4; + pixel_x = -40 }, /obj/structure/rod_railing{ dir = 8 @@ -11044,9 +11115,8 @@ /turf/simulated/floor/lino/diamond, /area/point_verdant/interior/minimart) "Dl" = ( -/obj/structure/road_sign/street{ +/obj/structure/street_sign/street{ pixel_x = -12; - icon_state = "street_left"; street_name = "Spaceport Avenue" }, /turf/simulated/floor/sidewalk/blocks, @@ -11245,7 +11315,8 @@ "DM" = ( /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1 + dir = 1; + pixel_y = 32 }, /obj/effect/decal/curb{ dir = 10 @@ -11439,7 +11510,8 @@ dir = 6 }, /obj/structure/chainlink_fence{ - dir = 4 + dir = 4; + pixel_x = 16 }, /obj/structure/chainlink_fence, /turf/simulated/floor/asphalt, @@ -11458,7 +11530,7 @@ /turf/simulated/floor/sidewalk, /area/point_verdant/interior/laundromat) "Er" = ( -/obj/structure/sign/urban/konyang/pharmacy, +/obj/structure/sign/double/pharmacy, /turf/simulated/wall, /area/point_verdant/interior/pharmacy) "Et" = ( @@ -11527,7 +11599,8 @@ /area/point_verdant/outdoors) "EC" = ( /obj/structure/utility_pole/street/on{ - dir = 4 + dir = 4; + pixel_x = -40 }, /obj/structure/ledge{ dir = 8 @@ -11637,7 +11710,8 @@ "EL" = ( /obj/effect/decal/road_marking, /obj/effect/decal/curb, -/obj/structure/road_sign/pedestrian{ +/obj/structure/street_sign/warnings{ + dir = 4; pixel_y = 28; pixel_x = -10 }, @@ -11691,7 +11765,8 @@ dir = 8 }, /obj/structure/utility_pole/street/on{ - dir = 8 + dir = 8; + pixel_x = -24 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -11743,8 +11818,7 @@ dir = 4 }, /obj/structure/utility_pole/street/on{ - dir = 4; - pixel_x = 19 + dir = 4 }, /turf/simulated/floor/concrete, /area/point_verdant/outdoors) @@ -11930,7 +12004,8 @@ "FD" = ( /obj/structure/trash_pile, /obj/structure/chainlink_fence{ - dir = 4 + dir = 4; + pixel_x = 16 }, /turf/simulated/floor/sidewalk/flat, /area/point_verdant/outdoors) @@ -12085,7 +12160,8 @@ dir = 4 }, /obj/structure/chainlink_fence{ - dir = 4 + dir = 4; + pixel_x = 16 }, /obj/structure/konyang_cliff{ icon_state = "cliff-west"; @@ -12266,7 +12342,8 @@ layer = 9.1 }, /obj/structure/utility_pole/street/on{ - dir = 1 + dir = 1; + pixel_y = -8 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -12331,7 +12408,7 @@ /turf/simulated/floor/reinforced, /area/point_verdant/interior/robotics) "GD" = ( -/obj/structure/sign/urban/konyang/robotics, +/obj/structure/sign/double/robotics, /turf/simulated/wall, /area/point_verdant/interior/robotics) "GE" = ( @@ -12409,7 +12486,10 @@ /area/point_verdant/outdoors) "GO" = ( /obj/structure/road_barrier, -/obj/structure/utility_pole/street/on, +/obj/structure/utility_pole/street/on{ + pixel_y = -16; + layer = 4.6 + }, /turf/simulated/floor/sidewalk/detail, /area/point_verdant/outdoors) "GP" = ( @@ -12439,7 +12519,8 @@ dir = 4 }, /obj/structure/utility_pole/street/on{ - dir = 4 + dir = 4; + pixel_x = -40 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -12556,7 +12637,8 @@ /area/point_verdant/interior/pharmacy) "Hi" = ( /obj/structure/chainlink_fence{ - dir = 8 + dir = 8; + pixel_x = -16 }, /turf/simulated/floor/sidewalk/blocks, /area/point_verdant/outdoors) @@ -12604,8 +12686,7 @@ dir = 4 }, /obj/structure/utility_pole/street/on{ - dir = 4; - pixel_x = 19 + dir = 4 }, /obj/structure/rod_railing{ name = "imposing rod railing"; @@ -12784,7 +12865,8 @@ "HL" = ( /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1 + dir = 1; + pixel_y = 32 }, /obj/effect/decal/curb, /obj/effect/decal/road_marking/turn_left, @@ -12798,7 +12880,8 @@ dir = 1 }, /obj/structure/utility_pole/street/on{ - dir = 1 + dir = 1; + pixel_y = -8 }, /obj/structure/road_barrier{ layer = 9.1 @@ -12833,7 +12916,8 @@ /area/point_verdant/interior/police) "HR" = ( /obj/structure/utility_pole/street/on{ - dir = 8 + dir = 8; + pixel_x = -24 }, /obj/effect/decal/road_marking{ dir = 4 @@ -12913,7 +12997,8 @@ /area/point_verdant/outdoors) "Ie" = ( /obj/structure/utility_pole/street/on{ - dir = 4 + dir = 4; + pixel_x = -40 }, /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) @@ -13069,9 +13154,9 @@ /turf/simulated/floor/tiled, /area/point_verdant/interior/offices) "ID" = ( -/obj/structure/road_sign/pedestrian{ - pixel_x = -1; +/obj/structure/street_sign/warnings{ dir = 8; + pixel_x = -1; pixel_y = 7 }, /obj/structure/ledge/quarter{ @@ -13172,7 +13257,8 @@ /area/point_verdant/interior/bar) "IT" = ( /obj/structure/utility_pole/street/on{ - dir = 4 + dir = 4; + pixel_x = -40 }, /obj/structure/rod_railing{ dir = 8 @@ -13185,7 +13271,7 @@ /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) "IU" = ( -/obj/structure/road_sign/turn, +/obj/structure/street_sign/turn, /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) "IV" = ( @@ -13200,7 +13286,8 @@ dir = 8 }, /obj/structure/utility_pole/street/on{ - dir = 4 + dir = 4; + pixel_x = -40 }, /obj/random/dirt_75, /turf/simulated/floor/concrete, @@ -13280,7 +13367,7 @@ /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) "Jq" = ( -/obj/structure/sign/urban{ +/obj/structure/sign/exit{ dir = 8; pixel_x = -6; pixel_y = 7 @@ -13311,8 +13398,7 @@ /turf/simulated/floor/exoplanet/water/shallow/konyang/no_smooth, /area/point_verdant/outdoors) "Jt" = ( -/obj/structure/road_sign{ - dir = 4; +/obj/structure/street_sign/stop_konyang{ pixel_y = -4; pixel_x = -13 }, @@ -13508,7 +13594,7 @@ /turf/simulated/floor/lino, /area/point_verdant/interior/restaurant) "JW" = ( -/obj/structure/road_sign/yield{ +/obj/structure/street_sign/yield{ pixel_x = -16 }, /turf/simulated/floor/sidewalk, @@ -13708,7 +13794,7 @@ "Kv" = ( /obj/machinery/door/urban, /obj/effect/decal/exterior_stairs/half, -/obj/structure/sign/urban/restroom{ +/obj/structure/sign/restroom{ pixel_x = 31; pixel_y = 10 }, @@ -13780,7 +13866,7 @@ /area/point_verdant/outdoors) "KB" = ( /obj/machinery/door/urban, -/obj/structure/sign/urban/staff{ +/obj/structure/sign/staff{ pixel_y = 19; pixel_x = -1; layer = 9 @@ -13890,7 +13976,8 @@ icon_state = "cliff-west" }, /obj/structure/utility_pole/street/on{ - dir = 8 + dir = 8; + pixel_x = -24 }, /turf/simulated/floor/exoplanet/water/shallow/konyang/no_smooth, /area/point_verdant/outdoors) @@ -14005,7 +14092,8 @@ }, /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1 + dir = 1; + pixel_y = 32 }, /turf/simulated/floor/sidewalk/flat, /area/point_verdant/outdoors) @@ -14105,7 +14193,8 @@ /area/point_verdant/outdoors) "Lz" = ( /obj/structure/utility_pole/street/on{ - dir = 1 + dir = 1; + pixel_y = -8 }, /obj/effect/decal/curb{ dir = 1 @@ -14140,7 +14229,8 @@ /area/point_verdant/outdoors) "LF" = ( /obj/structure/chainlink_fence{ - dir = 8 + dir = 8; + pixel_x = -16 }, /turf/simulated/floor/sidewalk/flat, /area/point_verdant/outdoors) @@ -14428,7 +14518,8 @@ /area/point_verdant/outdoors) "Mz" = ( /obj/structure/utility_pole/street/on{ - dir = 4 + dir = 4; + pixel_x = -40 }, /obj/structure/rod_railing{ dir = 8 @@ -14543,7 +14634,7 @@ "MO" = ( /obj/structure/lattice/catwalk/indoor/planks/opaque, /obj/machinery/door/urban, -/obj/structure/sign/urban/staff{ +/obj/structure/sign/staff{ pixel_y = 19; pixel_x = -1; layer = 9 @@ -14602,7 +14693,8 @@ /area/point_verdant/interior/police) "MU" = ( /obj/structure/road_barrier/bot_in, -/obj/structure/road_sign/pedestrian{ +/obj/structure/street_sign/warnings{ + dir = 4; pixel_x = -16 }, /turf/simulated/floor/sidewalk, @@ -14811,7 +14903,8 @@ dir = 4 }, /obj/structure/chainlink_fence{ - dir = 4 + dir = 4; + pixel_x = 16 }, /obj/structure/konyang_cliff{ icon_state = "innercorner4" @@ -15009,14 +15102,16 @@ /obj/structure/closet/crate/bin/urban/dumpster, /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1 + dir = 1; + pixel_y = 32 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) "NW" = ( /obj/structure/chainlink_fence, /obj/structure/chainlink_fence{ - dir = 4 + dir = 4; + pixel_x = 16 }, /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) @@ -15288,7 +15383,8 @@ dir = 4 }, /obj/structure/chainlink_fence{ - dir = 4 + dir = 4; + pixel_x = 16 }, /obj/structure/automobile_filler, /turf/simulated/floor/asphalt, @@ -15336,7 +15432,7 @@ /turf/simulated/floor/tiled, /area/point_verdant/interior/spaceport) "OE" = ( -/obj/structure/sign/urban/staff{ +/obj/structure/sign/staff{ pixel_y = 40; layer = 9 }, @@ -15406,7 +15502,7 @@ /turf/simulated/floor/tiled/white, /area/point_verdant/interior/robotics) "OQ" = ( -/obj/structure/sign/urban/konyang{ +/obj/structure/sign/double/convenience{ layer = 4.6; pixel_y = 32 }, @@ -15481,10 +15577,9 @@ dir = 8; pixel_y = 12 }, -/obj/structure/road_sign/street{ +/obj/structure/street_sign/street{ pixel_x = -11; pixel_y = 28; - icon_state = "street_right"; street_name = "Spaceport Avenue" }, /turf/simulated/floor/sidewalk/blocks, @@ -15509,7 +15604,7 @@ /turf/simulated/floor/exoplanet/konyang, /area/point_verdant/outdoors) "Pd" = ( -/obj/structure/sign/urban/restroom{ +/obj/structure/sign/restroom{ pixel_x = 31; pixel_y = 6 }, @@ -15558,7 +15653,8 @@ dir = 4 }, /obj/structure/chainlink_fence{ - dir = 4 + dir = 4; + pixel_x = 16 }, /obj/effect/decal/road_marking/thin, /turf/simulated/floor/asphalt, @@ -15783,7 +15879,9 @@ /obj/structure/ledge{ dir = 1 }, -/obj/structure/utility_pole/street/on, +/obj/structure/utility_pole/street/on{ + pixel_y = -16 + }, /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) "PG" = ( @@ -15831,7 +15929,9 @@ /area/point_verdant/interior/streetvendor) "PN" = ( /obj/structure/road_barrier, -/obj/structure/utility_pole/street/on, +/obj/structure/utility_pole/street/on{ + pixel_y = -16 + }, /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) "PO" = ( @@ -15907,7 +16007,8 @@ }, /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1 + dir = 1; + pixel_y = 32 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -15932,7 +16033,8 @@ /area/point_verdant/outdoors) "Qa" = ( /obj/structure/utility_pole/street/on{ - dir = 8 + dir = 8; + pixel_x = -24 }, /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) @@ -16080,7 +16182,8 @@ dir = 8 }, /obj/structure/utility_pole/street/on{ - dir = 8 + dir = 8; + pixel_x = -24 }, /obj/random/dirt_75, /turf/simulated/floor/asphalt, @@ -16201,7 +16304,8 @@ "QK" = ( /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1 + dir = 1; + pixel_y = 32 }, /obj/structure/bed/stool/chair/plastic{ dir = 8 @@ -16252,7 +16356,8 @@ /area/point_verdant/interior/bar) "QQ" = ( /obj/structure/chainlink_fence{ - dir = 8 + dir = 8; + pixel_x = -16 }, /obj/structure/konyang_cliff{ icon_state = "topcorner_east" @@ -16399,9 +16504,7 @@ /obj/effect/decal/curb{ dir = 1 }, -/obj/structure/road_sign{ - dir = 4 - }, +/obj/structure/street_sign/stop_konyang, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) "Ru" = ( @@ -16464,7 +16567,8 @@ /area/point_verdant/outdoors) "RB" = ( /obj/structure/utility_pole/street/on{ - dir = 8 + dir = 8; + pixel_x = -24 }, /obj/structure/ledge{ dir = 4 @@ -16514,8 +16618,7 @@ /turf/simulated/floor/lino, /area/point_verdant/interior/cafe) "RH" = ( -/obj/structure/road_sign{ - dir = 4; +/obj/structure/street_sign/stop_konyang{ pixel_y = -4; pixel_x = -13 }, @@ -16586,9 +16689,8 @@ /turf/simulated/floor/wood, /area/point_verdant/interior/police) "RR" = ( -/obj/structure/road_sign/street{ +/obj/structure/street_sign/street{ pixel_x = 3; - icon_state = "street_left"; street_name = "Noella-Brookes Road" }, /turf/simulated/floor/sidewalk, @@ -16731,7 +16833,8 @@ /area/point_verdant/interior/offices) "Sn" = ( /obj/structure/utility_pole/street/on{ - dir = 4 + dir = 4; + pixel_x = -40 }, /obj/structure/ledge{ dir = 8 @@ -16746,9 +16849,8 @@ /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) "So" = ( -/obj/structure/road_sign/street{ +/obj/structure/street_sign/street{ pixel_x = -15; - icon_state = "street_left"; street_name = "Listor Bend Street"; pixel_y = -1; layer = 9.1 @@ -16872,14 +16974,16 @@ }, /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1 + dir = 1; + pixel_y = 32 }, /obj/effect/floor_decal/konyang_flowers, /turf/simulated/floor/exoplanet/konyang, /area/point_verdant/outdoors) "SJ" = ( /obj/structure/utility_pole/street/on{ - dir = 8 + dir = 8; + pixel_x = -24 }, /turf/simulated/floor/sidewalk/blocks, /area/point_verdant/outdoors) @@ -17041,7 +17145,7 @@ /turf/simulated/floor/exoplanet/konyang/pink, /area/point_verdant/outdoors) "Ti" = ( -/obj/structure/sign/urban/konyang/police{ +/obj/structure/sign/double/police{ pixel_y = 40 }, /turf/simulated/floor/sidewalk, @@ -17053,7 +17157,7 @@ /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 4 }, -/obj/structure/sign/urban{ +/obj/structure/sign/exit{ dir = 4; pixel_x = 6; pixel_y = 7 @@ -17067,7 +17171,7 @@ /turf/simulated/floor/asphalt, /area/point_verdant/interior/offices) "Tm" = ( -/obj/structure/sign/urban/staff{ +/obj/structure/sign/staff{ pixel_y = 40; layer = 9 }, @@ -17376,13 +17480,15 @@ layer = 9.1 }, /obj/structure/utility_pole/street/on{ - dir = 1 + dir = 1; + pixel_y = -8 }, /turf/simulated/floor/sidewalk/flat, /area/point_verdant/outdoors) "Ua" = ( /obj/structure/utility_pole/street/on{ - dir = 8 + dir = 8; + pixel_x = -24 }, /obj/effect/decal/cleanable/generic/beet_tree_petals, /turf/simulated/floor/sidewalk, @@ -17946,7 +18052,8 @@ /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) "VM" = ( -/obj/structure/road_sign/pedestrian{ +/obj/structure/street_sign/warnings{ + dir = 4; pixel_y = 30; pixel_x = -16 }, @@ -17967,9 +18074,7 @@ /obj/structure/road_barrier/bot_end{ layer = 9.1 }, -/obj/structure/utility_pole/street/crosswalk{ - pixel_x = 10 - }, +/obj/structure/utility_pole/street/crosswalk, /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) "VP" = ( @@ -18052,7 +18157,7 @@ /obj/effect/decal/exterior_stairs/half/center{ dir = 4 }, -/obj/structure/sign/urban/staff{ +/obj/structure/sign/staff{ pixel_y = 37; pixel_x = -1; layer = 9 @@ -18145,7 +18250,7 @@ /turf/simulated/floor/tiled/freezer, /area/point_verdant/interior/police) "Wo" = ( -/obj/structure/urban/pylon, +/obj/structure/pylon, /obj/effect/decal/road_marking/no_pass{ dir = 8 }, @@ -18391,7 +18496,8 @@ dir = 1 }, /obj/structure/utility_pole/street/on{ - dir = 1 + dir = 1; + pixel_y = -8 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -18522,7 +18628,8 @@ icon_state = "topcorner_east" }, /obj/structure/chainlink_fence{ - dir = 8 + dir = 8; + pixel_x = -16 }, /turf/simulated/floor/exoplanet/water/konyang, /area/point_verdant/water) @@ -18626,7 +18733,8 @@ layer = 9.1 }, /obj/structure/utility_pole/street/on{ - dir = 1 + dir = 1; + pixel_y = -8 }, /turf/simulated/floor/asphalt, /area/point_verdant/water) @@ -18866,7 +18974,7 @@ /turf/simulated/floor/sidewalk/flat, /area/point_verdant/interior/shallow) "XY" = ( -/obj/structure/road_sign/turn{ +/obj/structure/street_sign/turn{ pixel_x = 13 }, /turf/simulated/floor/sidewalk/paved, @@ -18974,7 +19082,8 @@ "Yt" = ( /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1 + dir = 1; + pixel_y = 32 }, /obj/effect/step_trigger/thrower{ icon_state = "dir_arrow"; @@ -18990,14 +19099,11 @@ /turf/simulated/floor/lino/diamond, /area/point_verdant/interior/minimart) "Yy" = ( -/obj/structure/road_sign/street{ +/obj/structure/street_sign/street{ pixel_x = -12; - icon_state = "street_left"; street_name = "Spaceport Avenue" }, -/obj/structure/road_sign{ - dir = 4 - }, +/obj/structure/street_sign/stop_konyang, /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) "Yz" = ( @@ -19010,9 +19116,8 @@ /turf/simulated/floor/lino/diamond, /area/point_verdant/interior/restaurant) "YA" = ( -/obj/structure/road_sign/street{ +/obj/structure/street_sign/street{ pixel_x = -15; - icon_state = "street_right"; street_name = "Listor Bend Street"; pixel_y = 30; layer = 9.1 @@ -19116,7 +19221,8 @@ icon_state = "innercorner2" }, /obj/structure/chainlink_fence{ - dir = 8 + dir = 8; + pixel_x = -16 }, /turf/simulated/floor/exoplanet/water/shallow/konyang, /area/point_verdant/outdoors) @@ -19199,7 +19305,8 @@ }, /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1 + dir = 1; + pixel_y = 32 }, /turf/simulated/floor/exoplanet/konyang, /area/point_verdant/outdoors) @@ -19322,7 +19429,7 @@ /area/point_verdant/interior/minimart) "Zs" = ( /obj/machinery/door/urban, -/obj/structure/sign/urban/staff{ +/obj/structure/sign/staff{ pixel_y = 19; pixel_x = -1; layer = 9 @@ -19518,7 +19625,8 @@ dir = 4 }, /obj/structure/chainlink_fence{ - dir = 4 + dir = 4; + pixel_x = 16 }, /obj/structure/utility_pole/street/on{ dir = 8; @@ -35619,7 +35727,7 @@ bb Qf bu bu -vu +uU bu bu bu @@ -38220,7 +38328,7 @@ CY HX oy BT -PN +xG LN iL vX @@ -39505,7 +39613,7 @@ CY HX oy BT -PN +xG LN bb Cp @@ -40790,7 +40898,7 @@ lN HX oy BT -PN +xG LN iL PQ @@ -43826,12 +43934,12 @@ kn bu bu bu -vu +uU bu bu bu bu -vu +uU bu bu xs @@ -44549,7 +44657,7 @@ Dz MA Mw az -gr +Zp pj kM iL @@ -46091,8 +46199,8 @@ Dz MA wK az +Zp gr -zI iL up zc @@ -47890,8 +47998,8 @@ Dz MA az eT +Zp gr -zI ui JY Wq @@ -47921,24 +48029,24 @@ bu bu bu bu -vu +uU bu bu bu -vu +uU bu bu bu bu bu bu -vu +uU iY iL iL Wf bu -vu +uU bu bu bu @@ -47946,7 +48054,7 @@ bu bu bu bu -vu +uU cC iY iL @@ -49689,8 +49797,8 @@ Dz MA MA az -DC -zr +wL +vu ui kO Ha @@ -53588,8 +53696,8 @@ az lL wK wK +YD vF -sA od xb SS @@ -54873,8 +54981,8 @@ az wK wK wK -xG -sA +iK +vF WR WR BJ diff --git a/maps/away/away_site/konyang/point_verdant/point_verdant-3.dmm b/maps/away/away_site/konyang/point_verdant/point_verdant-3.dmm index b4ff71146b5..dfb64a629ec 100644 --- a/maps/away/away_site/konyang/point_verdant/point_verdant-3.dmm +++ b/maps/away/away_site/konyang/point_verdant/point_verdant-3.dmm @@ -20,7 +20,8 @@ dir = 10 }, /obj/structure/utility_pole/street/on{ - dir = 1 + dir = 1; + pixel_y = 0 }, /obj/structure/rod_railing{ name = "imposing rod railing"; @@ -150,7 +151,8 @@ /area/point_verdant/interior/arcade) "bc" = ( /obj/structure/chainlink_fence{ - dir = 8 + dir = 8; + pixel_x = -16 }, /obj/structure/ledge/quarter/corner{ dir = 8 @@ -244,7 +246,9 @@ /obj/structure/ledge{ dir = 1 }, -/obj/structure/utility_pole/street/on, +/obj/structure/utility_pole/street/on{ + pixel_y = 0 + }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) "bF" = ( @@ -402,7 +406,7 @@ "cC" = ( /obj/machinery/door/urban, /obj/effect/decal/exterior_stairs/half, -/obj/structure/sign/urban/restroom{ +/obj/structure/sign/restroom{ pixel_x = 31; pixel_y = 10 }, @@ -566,7 +570,8 @@ /area/point_verdant/interior/restaurant) "eg" = ( /obj/structure/chainlink_fence{ - dir = 4 + dir = 4; + pixel_x = 16 }, /obj/structure/rod_railing{ dir = 8 @@ -615,7 +620,8 @@ dir = 4 }, /obj/structure/utility_pole/street/on{ - dir = 8 + dir = 8; + pixel_x = -24 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -997,7 +1003,8 @@ "gS" = ( /obj/structure/ledge, /obj/structure/utility_pole/street/on{ - dir = 1 + dir = 1; + pixel_y = 0 }, /obj/structure/rod_railing{ name = "imposing rod railing"; @@ -1321,7 +1328,7 @@ "jK" = ( /obj/machinery/door/urban, /obj/effect/decal/exterior_stairs/half, -/obj/structure/sign/urban/restroom{ +/obj/structure/sign/restroom{ pixel_x = 31; pixel_y = 10 }, @@ -1387,6 +1394,19 @@ /obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/asphalt, /area/point_verdant/interior/shallow) +"ko" = ( +/obj/structure/ledge{ + dir = 9 + }, +/obj/item/hullbeacon/red, +/obj/structure/utility_pole/street/on{ + dir = 4; + pixel_x = -40; + pixel_y = 0; + layer = 4.6 + }, +/turf/simulated/floor/asphalt, +/area/point_verdant/outdoors) "kv" = ( /obj/effect/decal/curb{ dir = 4 @@ -1417,6 +1437,19 @@ }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) +"kD" = ( +/obj/structure/ledge{ + dir = 5 + }, +/obj/item/hullbeacon/red, +/obj/structure/utility_pole/street/on{ + dir = 8; + pixel_x = -24; + pixel_y = 0; + layer = 4.6 + }, +/turf/simulated/floor/asphalt, +/area/point_verdant/outdoors) "kF" = ( /obj/structure/rod_railing{ dir = 4 @@ -1696,7 +1729,8 @@ /area/point_verdant/interior/offices) "nd" = ( /obj/structure/chainlink_fence{ - dir = 8 + dir = 8; + pixel_x = -16 }, /turf/simulated/floor/concrete/square, /area/point_verdant/outdoors) @@ -1953,6 +1987,17 @@ }, /turf/simulated/floor/concrete, /area/point_verdant/outdoors) +"px" = ( +/obj/structure/ledge{ + dir = 5 + }, +/obj/structure/utility_pole/street/on{ + dir = 8; + pixel_x = -24 + }, +/obj/item/hullbeacon/red, +/turf/simulated/floor/asphalt, +/area/point_verdant/outdoors) "pC" = ( /obj/structure/window/urban/full, /obj/structure/window_frame/urban/full, @@ -2032,10 +2077,12 @@ /obj/structure/ledge{ dir = 5 }, -/obj/structure/utility_pole/street/on{ - dir = 8 - }, /obj/item/hullbeacon/red, +/obj/structure/utility_pole/street/on{ + dir = 8; + pixel_x = -24; + pixel_y = 0 + }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) "qq" = ( @@ -2251,7 +2298,8 @@ /area/point_verdant/outdoors) "rE" = ( /obj/structure/chainlink_fence{ - dir = 8 + dir = 8; + pixel_x = -16 }, /obj/structure/ledge/quarter{ dir = 4 @@ -2298,6 +2346,18 @@ /obj/random/dirt_75, /turf/simulated/floor/tiled, /area/point_verdant/interior/robotics) +"rZ" = ( +/obj/structure/ledge, +/obj/structure/rod_railing{ + name = "imposing rod railing"; + layer = 9.1 + }, +/obj/structure/utility_pole/street/on{ + dir = 1; + pixel_y = 0 + }, +/turf/simulated/floor/asphalt, +/area/point_verdant/outdoors) "sa" = ( /turf/simulated/floor/carpet/aquablue, /area/point_verdant/interior/hotel) @@ -2332,7 +2392,8 @@ "sk" = ( /obj/structure/chainlink_fence, /obj/structure/chainlink_fence{ - dir = 4 + dir = 4; + pixel_x = 16 }, /turf/simulated/floor/concrete/square, /area/point_verdant/outdoors) @@ -2496,7 +2557,8 @@ /area/point_verdant/outdoors) "tR" = ( /obj/structure/chainlink_fence{ - dir = 4 + dir = 4; + pixel_x = 16 }, /turf/simulated/floor/concrete, /area/point_verdant/outdoors) @@ -2542,6 +2604,18 @@ }, /turf/simulated/floor/roofing_tiles, /area/point_verdant/outdoors) +"ua" = ( +/obj/structure/ledge{ + dir = 9 + }, +/obj/structure/utility_pole/street/on{ + dir = 4; + pixel_x = -40; + pixel_y = 0 + }, +/obj/item/hullbeacon/red, +/turf/simulated/floor/asphalt, +/area/point_verdant/outdoors) "ub" = ( /obj/structure/rod_railing, /turf/simulated/open, @@ -2749,7 +2823,8 @@ dir = 9 }, /obj/structure/utility_pole/street/on{ - dir = 4 + dir = 4; + pixel_x = -40 }, /obj/item/hullbeacon/red, /turf/simulated/floor/asphalt, @@ -2888,7 +2963,9 @@ /turf/simulated/floor/tiled, /area/point_verdant/interior/offices) "wZ" = ( -/obj/structure/utility_pole/street/on, +/obj/structure/utility_pole/street/on{ + pixel_y = 0 + }, /turf/simulated/floor/concrete, /area/point_verdant/outdoors) "xa" = ( @@ -3016,7 +3093,8 @@ /area/point_verdant/interior/offices) "yk" = ( /obj/structure/chainlink_fence{ - dir = 4 + dir = 4; + pixel_x = 16 }, /turf/simulated/floor/concrete/square, /area/point_verdant/outdoors) @@ -3029,7 +3107,8 @@ dir = 8 }, /obj/structure/utility_pole/street/on{ - dir = 4 + dir = 4; + pixel_x = -40 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -3246,7 +3325,7 @@ /obj/structure/ledge/quarter{ dir = 9 }, -/obj/structure/sign/urban/staff{ +/obj/structure/sign/staff{ pixel_y = 40; layer = 9 }, @@ -3962,7 +4041,8 @@ /area/point_verdant/interior/hotel) "EF" = ( /obj/structure/chainlink_fence{ - dir = 8 + dir = 8; + pixel_x = -16 }, /turf/simulated/floor/concrete, /area/point_verdant/outdoors) @@ -4092,14 +4172,7 @@ /turf/simulated/open, /area/point_verdant/interior/laundromat) "FO" = ( -/obj/effect/decal/fake_object{ - density = 1; - desc = "A bland air conditioning unit."; - icon = 'icons/effects/city.dmi'; - icon_state = "ac"; - layer = 2.7; - name = "AC unit" - }, +/obj/structure/ac_unit, /obj/structure/rod_railing{ dir = 4 }, @@ -4943,7 +5016,8 @@ /area/point_verdant/interior/minimart) "Mx" = ( /obj/structure/chainlink_fence{ - dir = 8 + dir = 8; + pixel_x = -16 }, /obj/structure/chainlink_fence, /turf/simulated/floor/concrete/square, @@ -5009,7 +5083,8 @@ dir = 1 }, /obj/structure/utility_pole/street/on{ - dir = 1 + dir = 1; + pixel_y = 0 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -5110,7 +5185,6 @@ /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) "NJ" = ( -/obj/structure/urban/pylon, /obj/effect/decal/road_marking/no_pass{ dir = 8 }, @@ -5151,7 +5225,8 @@ /area/point_verdant/outdoors) "NR" = ( /obj/structure/utility_pole/street/on{ - dir = 4 + dir = 4; + pixel_x = -40 }, /obj/structure/ledge/quarter{ dir = 8 @@ -5187,13 +5262,14 @@ /obj/structure/ledge{ dir = 6 }, -/obj/structure/utility_pole/street/on{ - dir = 1 - }, /obj/structure/rod_railing{ name = "imposing rod railing"; layer = 9.1 }, +/obj/structure/utility_pole/street/on{ + dir = 1; + pixel_y = 0 + }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) "Oc" = ( @@ -5570,7 +5646,6 @@ /turf/simulated/floor/wood, /area/point_verdant/interior/hotel) "RA" = ( -/obj/machinery/mech_recharger/automobile, /turf/simulated/floor/concrete, /area/point_verdant/interior/shallow) "RG" = ( @@ -5703,6 +5778,20 @@ /obj/structure/rod_railing, /turf/simulated/floor/beach/water/pool, /area/point_verdant/outdoors) +"SG" = ( +/obj/structure/ledge{ + dir = 6 + }, +/obj/structure/utility_pole/street/on{ + dir = 1; + pixel_y = 0 + }, +/obj/structure/rod_railing{ + name = "imposing rod railing"; + layer = 9.1 + }, +/turf/simulated/floor/asphalt, +/area/point_verdant/outdoors) "SH" = ( /obj/effect/decal/road_marking{ dir = 8 @@ -6271,14 +6360,7 @@ /turf/simulated/floor/carpet/darkblue, /area/point_verdant/interior/hotel) "Xn" = ( -/obj/effect/decal/fake_object{ - density = 1; - desc = "A bland air conditioning unit."; - icon = 'icons/effects/city.dmi'; - icon_state = "ac"; - layer = 2.7; - name = "AC unit" - }, +/obj/structure/ac_unit, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) "Xr" = ( @@ -6420,14 +6502,7 @@ /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) "Yc" = ( -/obj/effect/decal/fake_object{ - density = 1; - desc = "A bland air conditioning unit."; - icon = 'icons/effects/city.dmi'; - icon_state = "ac"; - layer = 2.7; - name = "AC unit" - }, +/obj/structure/ac_unit, /obj/machinery/light/small/floor, /turf/simulated/floor/roofing_tiles, /area/point_verdant/outdoors) @@ -6505,14 +6580,7 @@ /turf/simulated/floor/carpet/aquablue, /area/point_verdant/interior/hotel) "Yv" = ( -/obj/effect/decal/fake_object{ - density = 1; - desc = "A bland air conditioning unit."; - icon = 'icons/effects/city.dmi'; - icon_state = "ac"; - layer = 2.7; - name = "AC unit" - }, +/obj/structure/ac_unit, /turf/simulated/floor/roofing_tiles, /area/point_verdant/outdoors) "Yy" = ( @@ -6529,7 +6597,8 @@ /area/point_verdant/interior/spaceport) "YG" = ( /obj/structure/chainlink_fence{ - dir = 8 + dir = 8; + pixel_x = -16 }, /obj/effect/decal/exterior_stairs/half/center{ dir = 1 @@ -36401,7 +36470,7 @@ yS DC DC tP -wt +ko PP PP PP @@ -43083,7 +43152,7 @@ Il DC DC tP -qi +kD Ym Ym Ym @@ -46435,7 +46504,7 @@ ac DC DC oa -wt +ua PP PP PP @@ -47995,7 +48064,7 @@ DD DD DD DD -gS +rZ DC DC DC @@ -49023,7 +49092,7 @@ DD DD DD DD -gS +rZ DC DC DC @@ -50528,7 +50597,7 @@ pN DC DC oa -qi +px Ym Ym Ym @@ -50543,7 +50612,7 @@ ew Ym Ym Ym -Ob +SG DC DC oa diff --git a/maps/event/halloween/halloween.dmm b/maps/event/halloween/halloween.dmm index 8b1d21e2f0f..a49be3ad96c 100644 --- a/maps/event/halloween/halloween.dmm +++ b/maps/event/halloween/halloween.dmm @@ -945,13 +945,6 @@ /area/city/kitchen) "cD" = ( /obj/effect/decal/cleanable/floor_damage/random_wood_broken, -/obj/effect/decal/fake_object{ - desc = "A beautiful sign denoting you as being in the Hotel Montparnasse!"; - icon = 'icons/effects/city.dmi'; - icon_state = "sign1"; - name = "glamorous sign"; - pixel_y = 33 - }, /obj/structure/closet/lasertag, /obj/item/gun/energy/lasertag/red, /obj/item/gun/energy/lasertag/red, @@ -1248,12 +1241,7 @@ /turf/simulated/floor/tiled/white, /area/city/horrorhouse) "dN" = ( -/obj/effect/decal/fake_object{ - density = 1; - desc = "A bland air conditioning unit."; - icon = 'icons/effects/city.dmi'; - icon_state = "ac"; - name = "AC unit"; +/obj/structure/ac_unit{ layer = 3.3 }, /obj/structure/railing/mapped{ @@ -1274,19 +1262,10 @@ /area/city/hallway) "dQ" = ( /obj/structure/table/wood, -/obj/effect/decal/fake_object{ - desc = "An expensive flatscreen holo-television. This one's connection to the extranet seems to be severed."; - icon = 'icons/effects/city.dmi'; - icon_state = "flatscreen"; - name = "expensive flatscreen holovision"; +/obj/structure/television{ pixel_y = 25 }, -/obj/effect/decal/fake_object{ - desc = "A Hephaestus Industries Z-Cube! This state-of-the-art gaming console is the premium of the premium. It's almost VR!"; - icon = 'icons/effects/city.dmi'; - icon_state = "gamer_console"; - name = "gaming console" - }, +/obj/structure/console, /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, @@ -5273,14 +5252,7 @@ /turf/simulated/floor/wood, /area/city/bar) "vO" = ( -/obj/effect/decal/fake_object{ - density = 1; - desc = "A bland air conditioning unit."; - icon = 'icons/effects/city.dmi'; - icon_state = "ac"; - layer = 2.7; - name = "AC unit" - }, +/obj/structure/ac_unit, /turf/simulated/floor/marble/dark, /area/city/costumeroom) "vP" = ( @@ -5921,12 +5893,7 @@ /turf/simulated/floor/carpet/rubber, /area/city/medical) "xk" = ( -/obj/effect/decal/fake_object{ - desc = "A nondescript decorative shelf."; - icon = 'icons/effects/city.dmi'; - icon_state = "shelf"; - layer = 2.7; - name = "shelf"; +/obj/structure/shelf{ pixel_y = 29 }, /obj/effect/floor_decal/spline/fancy/wood/corner{ @@ -6167,14 +6134,7 @@ /turf/simulated/floor/wood, /area/city/dining) "yG" = ( -/obj/effect/decal/fake_object{ - density = 1; - desc = "A bland air conditioning unit."; - icon = 'icons/effects/city.dmi'; - icon_state = "ac"; - layer = 2.7; - name = "AC unit" - }, +/obj/structure/ac_unit, /obj/effect/map_effect/perma_light/brighter{ color = "#FFA500"; light_color = "#FFA500" @@ -7201,12 +7161,7 @@ /turf/simulated/floor/wood, /area/city/horrorhouse) "Dp" = ( -/obj/effect/decal/fake_object{ - density = 1; - desc = "A bland air conditioning unit."; - icon = 'icons/effects/city.dmi'; - icon_state = "ac"; - name = "AC unit"; +/obj/structure/ac_unit{ layer = 3.3 }, /obj/structure/railing/mapped{ @@ -8353,14 +8308,7 @@ dir = 4 }, /obj/structure/lattice/catwalk, -/obj/effect/decal/fake_object{ - density = 1; - desc = "A bland air conditioning unit."; - icon = 'icons/effects/city.dmi'; - icon_state = "ac"; - layer = 2.7; - name = "AC unit" - }, +/obj/structure/ac_unit, /turf/simulated/floor/plating, /area/city/pool) "GI" = ( @@ -9411,13 +9359,6 @@ /turf/simulated/floor/marble/dark, /area/city/bar) "KW" = ( -/obj/effect/decal/fake_object{ - desc = "A beautiful sign denoting you as being in the Hotel Montparnasse!"; - icon = 'icons/effects/city.dmi'; - icon_state = "sign2"; - name = "glamorous sign"; - pixel_y = 33 - }, /obj/structure/closet/lasertag/blue, /obj/item/gun/energy/lasertag/blue, /obj/item/gun/energy/lasertag/blue, @@ -10295,16 +10236,6 @@ /obj/structure/simple_door/sandstone, /turf/simulated/floor/gold, /area/city/horrorhouse) -"OR" = ( -/obj/effect/decal/fake_object{ - desc = "A beautiful sign denoting you as being in the Hotel Montparnasse!"; - icon = 'icons/effects/city.dmi'; - icon_state = "sign2"; - name = "glamorous sign"; - pixel_y = 33 - }, -/turf/simulated/floor/wood, -/area/city/horrorhouse) "OT" = ( /obj/effect/floor_decal/corner/dark_green{ dir = 5 @@ -12103,12 +12034,7 @@ /turf/simulated/floor/wood/mahogany, /area/city/dining) "Ub" = ( -/obj/effect/decal/fake_object{ - desc = "A nondescript decorative shelf."; - icon = 'icons/effects/city.dmi'; - icon_state = "shelf2"; - layer = 2.7; - name = "shelf"; +/obj/structure/shelf{ pixel_y = 31 }, /obj/structure/flora/pottedplant/dead, @@ -12548,11 +12474,7 @@ /turf/simulated/floor/tiled/full, /area/city/hallway) "VI" = ( -/obj/effect/decal/fake_object{ - desc = "An expensive flatscreen holo-television. This one's connection to the extranet seems to be severed."; - icon = 'icons/effects/city.dmi'; - icon_state = "flatscreen"; - name = "expensive flatscreen holovision"; +/obj/structure/television{ pixel_y = 15 }, /obj/structure/table/wood, @@ -13576,15 +13498,8 @@ /turf/simulated/floor/beach/water/alt, /area/city/hallway) "Zf" = ( -/obj/effect/decal/cleanable/floor_damage/random_wood_broken, -/obj/effect/decal/fake_object{ - desc = "A beautiful sign denoting you as being in the Hotel Montparnasse!"; - icon = 'icons/effects/city.dmi'; - icon_state = "sign1"; - name = "glamorous sign"; - pixel_y = 33 - }, -/turf/simulated/floor/wood, +/obj/structure/sign/double/hotel_montparnasse, +/turf/simulated/wall/wood, /area/city/horrorhouse) "Zg" = ( /obj/structure/railing/mapped{ @@ -13605,12 +13520,7 @@ /turf/simulated/floor/grass, /area/city/hallway) "Zj" = ( -/obj/effect/decal/fake_object{ - density = 1; - desc = "A bland air conditioning unit."; - icon = 'icons/effects/city.dmi'; - icon_state = "ac"; - name = "AC unit"; +/obj/structure/ac_unit{ layer = 3.3; pixel_x = -2 }, @@ -13637,20 +13547,11 @@ /area/city/outside) "Zl" = ( /obj/structure/table/wood, -/obj/effect/decal/fake_object{ - desc = "An expensive flatscreen holo-television. This one's connection to the extranet seems to be severed."; - icon = 'icons/effects/city.dmi'; - icon_state = "flatscreen"; - name = "expensive flatscreen holovision"; +/obj/structure/television{ pixel_y = 25; layer = 3.5 }, -/obj/effect/decal/fake_object{ - desc = "A Hephaestus Industries Z-Cube! This state-of-the-art gaming console is the premium of the premium. It's almost VR!"; - icon = 'icons/effects/city.dmi'; - icon_state = "gamer_console"; - name = "gaming console" - }, +/obj/structure/console, /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, @@ -16938,7 +16839,7 @@ Ub Rq XM eo -rn +Zf cD Gq xN @@ -17262,8 +17163,8 @@ xk Xp eB hu -rn Zf +yu aQ Am dk @@ -17344,7 +17245,7 @@ WA WA WA rn -OR +WA Vd qC zb diff --git a/maps/event/idris_cruise/idris_cruise-1.dmm b/maps/event/idris_cruise/idris_cruise-1.dmm index 7d192b46ed1..3998accd05e 100644 --- a/maps/event/idris_cruise/idris_cruise-1.dmm +++ b/maps/event/idris_cruise/idris_cruise-1.dmm @@ -6552,12 +6552,7 @@ /obj/machinery/shower{ dir = 4 }, -/obj/effect/decal/fake_object{ - desc = "A nondescript shower drain."; - icon = 'icons/effects/city.dmi'; - icon_state = "vent"; - layer = 2.7; - name = "shower drain"; +/obj/structure/vent{ pixel_x = 9; pixel_y = -14 }, @@ -7309,12 +7304,7 @@ }, /area/cruise/beach) "fLx" = ( -/obj/effect/decal/fake_object{ - desc = "A nondescript shower drain."; - icon = 'icons/effects/city.dmi'; - icon_state = "vent"; - layer = 2.7; - name = "shower drain"; +/obj/structure/vent{ pixel_x = 9; pixel_y = -14 }, @@ -9780,12 +9770,7 @@ /obj/machinery/shower{ dir = 8 }, -/obj/effect/decal/fake_object{ - desc = "A nondescript shower drain."; - icon = 'icons/effects/city.dmi'; - icon_state = "vent"; - layer = 2.7; - name = "shower drain"; +/obj/structure/vent{ pixel_x = 9; pixel_y = -14 }, @@ -10026,12 +10011,7 @@ }, /area/cruise/security) "hTz" = ( -/obj/effect/decal/fake_object{ - desc = "An expensive flatscreen holo-television. This one's connection to the extranet seems to be severed."; - dir = 4; - icon = 'icons/effects/city.dmi'; - icon_state = "flatscreen"; - name = "expensive flatscreen holovision"; +/obj/structure/television{ pixel_y = 15 }, /obj/structure/table/wood, @@ -10595,12 +10575,7 @@ /area/cruise/tcomms_sat) "ipv" = ( /obj/structure/table/standard, -/obj/effect/decal/fake_object{ - desc = "An expensive flatscreen holo-television. This one's connection to the extranet seems to be severed."; - dir = 4; - icon = 'icons/effects/city.dmi'; - icon_state = "flatscreen"; - name = "expensive flatscreen holovision"; +/obj/structure/television{ pixel_y = 15 }, /turf/unsimulated/floor{ @@ -14331,12 +14306,7 @@ }, /area/cruise/fore) "lsd" = ( -/obj/effect/decal/fake_object{ - desc = "An expensive flatscreen holo-television. This one's connection to the extranet seems to be severed."; - dir = 4; - icon = 'icons/effects/city.dmi'; - icon_state = "flatscreen"; - name = "expensive flatscreen holovision"; +/obj/structure/television{ pixel_y = 15 }, /obj/structure/table/wood, @@ -14570,11 +14540,7 @@ /area/cruise/main_bar) "lAa" = ( /obj/structure/table/wood, -/obj/effect/decal/fake_object{ - desc = "An expensive flatscreen holo-television. This one's connection to the extranet seems to be severed."; - icon = 'icons/effects/city.dmi'; - icon_state = "flatscreen"; - name = "expensive flatscreen holovision"; +/obj/structure/television{ pixel_y = 15 }, /obj/effect/floor_decal/spline/fancy/wood/corner{ @@ -30201,12 +30167,7 @@ /obj/machinery/shower{ dir = 4 }, -/obj/effect/decal/fake_object{ - desc = "A nondescript shower drain."; - icon = 'icons/effects/city.dmi'; - icon_state = "vent"; - layer = 2.7; - name = "shower drain"; +/obj/structure/vent{ pixel_x = 9; pixel_y = -14 }, diff --git a/maps/event/rooftop/rooftop-1.dmm b/maps/event/rooftop/rooftop-1.dmm index 7f67283a481..ef7f1a1b31b 100644 --- a/maps/event/rooftop/rooftop-1.dmm +++ b/maps/event/rooftop/rooftop-1.dmm @@ -44,22 +44,6 @@ }, /turf/simulated/floor/tiled/white, /area/city/mendell/interior) -"af" = ( -/obj/machinery/door/airlock/centcom{ - name = "Administrative Wing"; - req_access = list(101); - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/city/mendell/interior) -"ag" = ( -/obj/machinery/door/airlock/glass_centcom{ - name = "Kitchen"; - req_access = list(101); - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/city/mendell/interior) "ah" = ( /obj/machinery/door/airlock/glass_centcom{ name = "Kitchen"; @@ -78,13 +62,6 @@ }, /turf/simulated/floor/marble/dark, /area/city/mendell/interior) -"aj" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/door/airlock/external{ - dir = 1 - }, -/turf/simulated/floor/reinforced, -/area/city/mendell) "ak" = ( /obj/structure/railing/mapped{ dir = 8 @@ -121,12 +98,9 @@ }, /area/city/mendell) "ao" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/door/airlock/glass_security{ - dir = 1 - }, -/turf/simulated/floor/reinforced, -/area/city/mendell) +/obj/structure/sign/double/hotel_montparnasse, +/turf/unsimulated/wall/steel, +/area/city/mendell/interior) "ap" = ( /obj/effect/floor_decal/corner/blue{ dir = 10 @@ -394,12 +368,7 @@ }, /area/city/mendell/interior) "bR" = ( -/obj/effect/decal/fake_object{ - desc = "A nondescript decorative shelf."; - icon = 'icons/effects/city.dmi'; - icon_state = "shelf1"; - layer = 2.7; - name = "shelf"; +/obj/structure/shelf{ pixel_y = 35 }, /turf/unsimulated/floor{ @@ -552,10 +521,6 @@ }, /turf/simulated/floor/beach/water/pool, /area/city/mendell/interior) -"cL" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/indestructible, -/turf/simulated/floor/marble/dark, -/area/city/mendell/interior) "cN" = ( /obj/structure/table/rack, /obj/item/rfd/construction, @@ -587,11 +552,7 @@ }, /area/city/mendell/interior) "cX" = ( -/obj/effect/decal/fake_object{ - desc = "A window overlooking the pristine Mendell City."; - icon = 'icons/effects/city.dmi'; - icon_state = "win2"; - name = "window"; +/obj/structure/window{ pixel_y = 33 }, /turf/simulated/floor/tiled/ramp{ @@ -636,19 +597,6 @@ name = "small tiles" }, /area/city/mendell/interior) -"df" = ( -/obj/effect/decal/fake_object{ - desc = "A beautiful sign denoting you as being in the Hotel Montparnasse!"; - icon = 'icons/effects/city.dmi'; - icon_state = "sign1"; - name = "glamorous sign"; - pixel_y = 33 - }, -/obj/structure/bed/stool/chair/wood{ - dir = 8 - }, -/turf/simulated/floor/lino, -/area/city/mendell/interior) "dh" = ( /obj/machinery/smartfridge/foodheater, /turf/unsimulated/floor{ @@ -720,11 +668,7 @@ "dp" = ( /obj/structure/bed/padded, /obj/item/bedsheet/black, -/obj/effect/decal/fake_object{ - desc = "A window overlooking the pristine Mendell City."; - icon = 'icons/effects/city.dmi'; - icon_state = "win1"; - name = "window"; +/obj/structure/window{ pixel_y = 33 }, /turf/simulated/floor/carpet, @@ -1102,11 +1046,7 @@ /obj/item/clothing/under/suit_jacket/white, /obj/effect/floor_decal/industrial/hatch, /obj/structure/table/rack, -/obj/effect/decal/fake_object{ - desc = "A window overlooking the pristine Mendell City."; - icon = 'icons/effects/city.dmi'; - icon_state = "win3"; - name = "window"; +/obj/structure/window{ pixel_y = 33 }, /turf/simulated/floor/marble/dark, @@ -1241,11 +1181,7 @@ /obj/item/clothing/under/suit_jacket/checkered, /obj/effect/floor_decal/industrial/hatch, /obj/structure/table/rack, -/obj/effect/decal/fake_object{ - desc = "A window overlooking the pristine Mendell City."; - icon = 'icons/effects/city.dmi'; - icon_state = "win1"; - name = "window"; +/obj/structure/window{ pixel_y = 33 }, /turf/simulated/floor/marble/dark, @@ -1313,11 +1249,7 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen, -/obj/effect/decal/fake_object{ - desc = "A window overlooking the pristine Mendell City."; - icon = 'icons/effects/city.dmi'; - icon_state = "win3"; - name = "window"; +/obj/structure/window{ pixel_y = 33 }, /turf/unsimulated/floor{ @@ -1378,12 +1310,7 @@ }, /area/city/mendell) "gF" = ( -/obj/effect/decal/fake_object{ - desc = "A nondescript decorative shelf."; - icon = 'icons/effects/city.dmi'; - icon_state = "shelf"; - layer = 2.7; - name = "shelf"; +/obj/structure/shelf{ pixel_y = 35 }, /obj/structure/filingcabinet/chestdrawer, @@ -1613,11 +1540,7 @@ /turf/simulated/floor/carpet/rubber, /area/city/mendell/interior) "hO" = ( -/obj/effect/decal/fake_object{ - desc = "A window overlooking the pristine Mendell City."; - icon = 'icons/effects/city.dmi'; - icon_state = "win1"; - name = "window"; +/obj/structure/window{ pixel_y = -32 }, /turf/unsimulated/floor{ @@ -1640,12 +1563,8 @@ /area/city/mendell/interior) "hW" = ( /obj/structure/table/wood, -/obj/effect/decal/fake_object{ - desc = "An expensive flatscreen holo-television. This one's connection to the extranet seems to be severed."; - icon = 'icons/effects/city.dmi'; - icon_state = "flatscreen"; +/obj/structure/television{ layer = 9; - name = "expensive flatscreen holovision"; pixel_y = 15 }, /obj/structure/window/reinforced{ @@ -1685,11 +1604,7 @@ }, /area/city/mendell) "ih" = ( -/obj/effect/decal/fake_object{ - desc = "A window overlooking the pristine Mendell City."; - icon = 'icons/effects/city.dmi'; - icon_state = "win1"; - name = "window"; +/obj/structure/window{ pixel_y = -32 }, /turf/simulated/floor/carpet, @@ -1743,12 +1658,7 @@ /turf/simulated/floor/carpet, /area/city/mendell/interior) "iO" = ( -/obj/effect/decal/fake_object{ - desc = "An expensive flatscreen holo-television. This one's connection to the extranet seems to be severed."; - dir = 8; - icon = 'icons/effects/city.dmi'; - icon_state = "flatscreen"; - name = "expensive flatscreen holovision"; +/obj/structure/television{ pixel_y = 15 }, /obj/structure/table/wood, @@ -1936,12 +1846,6 @@ }, /turf/simulated/floor/tiled/dark, /area/city/mendell/interior) -"jy" = ( -/obj/machinery/door/airlock/glass_centcom{ - dir = 1 - }, -/turf/simulated/floor/marble/dark, -/area/city/mendell/interior) "jB" = ( /obj/machinery/floor_light/dance, /turf/simulated/floor/marble/dark, @@ -2048,12 +1952,7 @@ /turf/simulated/floor/shuttle/black, /area/city/mendell) "kx" = ( -/obj/effect/decal/fake_object{ - desc = "A nondescript vent."; - icon = 'icons/effects/city.dmi'; - icon_state = "vent"; - layer = 2.7; - name = "wall vent"; +/obj/structure/vent{ pixel_x = 6; pixel_y = 25 }, @@ -2285,12 +2184,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/effect/decal/fake_object{ - desc = "A nondescript vent."; - icon = 'icons/effects/city.dmi'; - icon_state = "vent"; - layer = 2.7; - name = "wall vent"; +/obj/structure/vent{ pixel_x = 6; pixel_y = 25 }, @@ -2299,19 +2193,6 @@ icon_state = "wood_birch" }, /area/city/mendell/interior) -"lR" = ( -/obj/structure/bed/stool/chair/wood{ - dir = 8 - }, -/obj/effect/decal/fake_object{ - desc = "A beautiful sign denoting you as being in the Hotel Montparnasse!"; - icon = 'icons/effects/city.dmi'; - icon_state = "sign2"; - name = "glamorous sign"; - pixel_y = 33 - }, -/turf/simulated/floor/lino, -/area/city/mendell/interior) "lV" = ( /obj/structure/closet/secure_closet/cabinet/bar, /turf/simulated/floor/tiled/white, @@ -2365,29 +2246,14 @@ /turf/simulated/floor/tiled/dark, /area/city/mendell) "mo" = ( -/obj/effect/decal/fake_object{ - desc = "A nondescript decorative shelf."; - icon = 'icons/effects/city.dmi'; - icon_state = "shelf"; - layer = 2.7; - name = "shelf"; +/obj/structure/shelf{ pixel_y = 35 }, /obj/structure/table/wood, -/obj/effect/decal/fake_object{ - desc = "An expensive flatscreen holo-television. This one's connection to the extranet seems to be severed."; - dir = 4; - icon = 'icons/effects/city.dmi'; - icon_state = "flatscreen"; - name = "expensive flatscreen holovision"; +/obj/structure/television{ pixel_y = 15 }, -/obj/effect/decal/fake_object{ - desc = "A nondescript vent."; - icon = 'icons/effects/city.dmi'; - icon_state = "vent"; - layer = 2.7; - name = "wall vent"; +/obj/structure/vent{ pixel_x = 6; pixel_y = 25 }, @@ -2421,11 +2287,7 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen, -/obj/effect/decal/fake_object{ - desc = "A window overlooking the pristine Mendell City."; - icon = 'icons/effects/city.dmi'; - icon_state = "win3"; - name = "window"; +/obj/structure/window{ pixel_y = 32 }, /turf/unsimulated/floor{ @@ -3287,12 +3149,7 @@ /area/city/mendell) "rH" = ( /obj/structure/table/wood, -/obj/effect/decal/fake_object{ - desc = "An expensive flatscreen holo-television. This one's connection to the extranet seems to be severed."; - dir = 8; - icon = 'icons/effects/city.dmi'; - icon_state = "flatscreen"; - name = "expensive flatscreen holovision"; +/obj/structure/television{ pixel_y = 15 }, /turf/unsimulated/floor{ @@ -3410,11 +3267,7 @@ "st" = ( /obj/structure/bed/padded, /obj/item/bedsheet/black, -/obj/effect/decal/fake_object{ - desc = "A window overlooking the pristine Mendell City."; - icon = 'icons/effects/city.dmi'; - icon_state = "win1"; - name = "window"; +/obj/structure/window{ pixel_y = 32 }, /turf/simulated/floor/carpet, @@ -3507,12 +3360,7 @@ /turf/simulated/floor/beach/water/pool, /area/city/mendell/interior) "tn" = ( -/obj/effect/decal/fake_object{ - desc = "Power outlets, in space!"; - icon = 'icons/effects/city.dmi'; - icon_state = "outlet"; - layer = 2.7; - name = "power outlets"; +/obj/structure/outlet{ pixel_x = 21; pixel_y = 9 }, @@ -3567,12 +3415,7 @@ /turf/simulated/floor/tiled, /area/city/mendell/interior) "tM" = ( -/obj/effect/decal/fake_object{ - desc = "A nondescript decorative shelf."; - icon = 'icons/effects/city.dmi'; - icon_state = "shelf2"; - layer = 2.7; - name = "shelf"; +/obj/structure/shelf{ pixel_y = 35 }, /turf/unsimulated/floor{ @@ -3719,11 +3562,7 @@ /turf/simulated/floor/tiled/ramp, /area/city/mendell/interior) "uL" = ( -/obj/effect/decal/fake_object{ - desc = "A window overlooking the pristine Mendell City."; - icon = 'icons/effects/city.dmi'; - icon_state = "win1"; - name = "window"; +/obj/structure/window{ pixel_y = 33 }, /turf/simulated/floor/marble/dark, @@ -4427,14 +4266,7 @@ }, /area/city/mendell/interior) "yj" = ( -/obj/effect/decal/fake_object{ - density = 1; - desc = "A bland air conditioning unit."; - icon = 'icons/effects/city.dmi'; - icon_state = "ac"; - layer = 2.7; - name = "AC unit" - }, +/obj/structure/ac_unit, /turf/simulated/floor/tiled, /area/city/mendell/interior) "yk" = ( @@ -4460,17 +4292,6 @@ icon_state = "wood_cherry" }, /area/city/mendell/interior) -"ys" = ( -/obj/structure/table/stone/marble, -/obj/effect/decal/fake_object{ - desc = "A beautiful sign denoting you as being in the Hotel Montparnasse!"; - icon = 'icons/effects/city.dmi'; - icon_state = "sign1"; - name = "glamorous sign"; - pixel_y = 33 - }, -/turf/simulated/floor/lino, -/area/city/mendell/interior) "yu" = ( /obj/machinery/light/small{ dir = 4 @@ -4573,12 +4394,7 @@ /turf/simulated/floor/marble/dark, /area/city/mendell/interior) "zi" = ( -/obj/effect/decal/fake_object{ - desc = "Power outlets, in space!"; - icon = 'icons/effects/city.dmi'; - icon_state = "outlet"; - layer = 2.7; - name = "power outlets"; +/obj/structure/outlet{ pixel_y = -12 }, /turf/unsimulated/floor{ @@ -4589,12 +4405,7 @@ /turf/simulated/floor/carpet/art, /area/city/mendell/interior) "zl" = ( -/obj/effect/decal/fake_object{ - desc = "Power outlets, in space!"; - icon = 'icons/effects/city.dmi'; - icon_state = "outlet"; - layer = 2.7; - name = "power outlets"; +/obj/structure/outlet{ pixel_y = -12 }, /turf/simulated/floor/carpet, @@ -4758,12 +4569,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/effect/decal/fake_object{ - desc = "A nondescript decorative shelf."; - icon = 'icons/effects/city.dmi'; - icon_state = "shelf1"; - layer = 2.7; - name = "shelf"; +/obj/structure/shelf{ pixel_y = 35 }, /obj/structure/table/wood, @@ -4772,11 +4578,7 @@ /area/city/mendell/interior) "At" = ( /obj/machinery/recharge_station, -/obj/effect/decal/fake_object{ - desc = "A window overlooking the pristine Mendell City."; - icon = 'icons/effects/city.dmi'; - icon_state = "win2"; - name = "window"; +/obj/structure/window{ pixel_y = 33 }, /turf/unsimulated/floor{ @@ -4991,13 +4793,6 @@ }, /area/city/mendell/interior) "BQ" = ( -/obj/effect/decal/fake_object{ - desc = "A beautiful sign denoting you as being in the Hotel Montparnasse!"; - icon = 'icons/effects/city.dmi'; - icon_state = "sign1"; - name = "glamorous sign"; - pixel_y = 33 - }, /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen, @@ -5119,11 +4914,7 @@ /turf/simulated/floor/tiled/white, /area/city/mendell/interior) "CF" = ( -/obj/effect/decal/fake_object{ - desc = "A window overlooking the pristine Mendell City."; - icon = 'icons/effects/city.dmi'; - icon_state = "win1"; - name = "window"; +/obj/structure/window{ pixel_y = 33 }, /turf/simulated/floor/tiled/ramp/bottom{ @@ -5137,11 +4928,7 @@ /area/city/mendell/interior) "CI" = ( /obj/machinery/recharge_station, -/obj/effect/decal/fake_object{ - desc = "A window overlooking the pristine Mendell City."; - icon = 'icons/effects/city.dmi'; - icon_state = "win2"; - name = "window"; +/obj/structure/window{ pixel_y = 32 }, /turf/unsimulated/floor{ @@ -5343,12 +5130,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/effect/decal/fake_object{ - desc = "A nondescript decorative shelf."; - icon = 'icons/effects/city.dmi'; - icon_state = "shelf1"; - layer = 2.7; - name = "shelf"; +/obj/structure/shelf{ pixel_y = 35 }, /turf/unsimulated/floor{ @@ -5481,11 +5263,7 @@ /turf/simulated/floor/tiled, /area/city/mendell/interior) "Eh" = ( -/obj/effect/decal/fake_object{ - desc = "A window overlooking the pristine Mendell City."; - icon = 'icons/effects/city.dmi'; - icon_state = "win1"; - name = "window"; +/obj/structure/window{ pixel_y = 33 }, /turf/simulated/floor/tiled/ramp{ @@ -5519,12 +5297,8 @@ /turf/simulated/floor/tiled/dark, /area/city/mendell/interior) "Ez" = ( -/obj/effect/decal/fake_object{ - desc = "A Hephaestus Industries Z-Cube! This state-of-the-art gaming console is the premium of the premium. It's almost VR!"; - icon = 'icons/effects/city.dmi'; - icon_state = "gamer_console"; - layer = 2.7; - name = "gaming console" +/obj/structure/console{ + layer = 2.7 }, /turf/simulated/floor/carpet, /area/city/mendell/interior) @@ -5614,12 +5388,7 @@ /obj/structure/bed/stool/chair/padded/blue{ dir = 8 }, -/obj/effect/decal/fake_object{ - desc = "A nondescript decorative shelf."; - icon = 'icons/effects/city.dmi'; - icon_state = "shelf1"; - layer = 2.7; - name = "shelf"; +/obj/structure/shelf{ pixel_y = 35 }, /turf/unsimulated/floor{ @@ -5627,13 +5396,6 @@ }, /area/city/mendell/interior) "Fz" = ( -/obj/effect/decal/fake_object{ - desc = "A beautiful sign denoting you as being in the Hotel Montparnasse!"; - icon = 'icons/effects/city.dmi'; - icon_state = "sign2"; - name = "glamorous sign"; - pixel_y = 33 - }, /obj/structure/table/wood, /obj/item/device/camera, /obj/item/device/camera, @@ -5892,12 +5654,7 @@ }, /area/city/mendell/interior) "HD" = ( -/obj/effect/decal/fake_object{ - desc = "A nondescript decorative shelf."; - icon = 'icons/effects/city.dmi'; - icon_state = "shelf"; - layer = 2.7; - name = "shelf"; +/obj/structure/shelf{ pixel_y = 35 }, /turf/simulated/floor/carpet, @@ -5927,12 +5684,7 @@ /obj/item/towel, /obj/item/towel, /obj/item/towel, -/obj/effect/decal/fake_object{ - desc = "A nondescript decorative shelf."; - icon = 'icons/effects/city.dmi'; - icon_state = "shelf"; - layer = 2.7; - name = "shelf"; +/obj/structure/shelf{ pixel_y = 35 }, /turf/unsimulated/floor{ @@ -5940,11 +5692,7 @@ }, /area/city/mendell/interior) "HN" = ( -/obj/effect/decal/fake_object{ - desc = "A window overlooking the pristine Mendell City."; - icon = 'icons/effects/city.dmi'; - icon_state = "win3"; - name = "window"; +/obj/structure/window{ pixel_y = -32 }, /turf/unsimulated/floor{ @@ -6037,10 +5785,6 @@ /obj/machinery/light/small, /turf/simulated/floor/tiled/dark, /area/city/mendell/interior) -"IA" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/indestructible, -/turf/simulated/floor/marble/dark, -/area/city/mendell/interior) "IC" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/hatch, @@ -6089,12 +5833,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/effect/decal/fake_object{ - desc = "Power outlets, in space!"; - icon = 'icons/effects/city.dmi'; - icon_state = "outlet"; - layer = 2.7; - name = "power outlets"; +/obj/structure/outlet{ pixel_x = -3; pixel_y = 35 }, @@ -6185,13 +5924,6 @@ }, /area/city/mendell) "Js" = ( -/obj/effect/decal/fake_object{ - desc = "A beautiful sign denoting you as being in the Hotel Montparnasse!"; - icon = 'icons/effects/city.dmi'; - icon_state = "sign2"; - name = "glamorous sign"; - pixel_y = 33 - }, /obj/structure/bed/stool/chair/wood{ dir = 4 }, @@ -6879,20 +6611,10 @@ /area/city/mendell/interior) "MP" = ( /obj/structure/table/wood, -/obj/effect/decal/fake_object{ - desc = "An expensive flatscreen holo-television. This one's connection to the extranet seems to be severed."; - dir = 4; - icon = 'icons/effects/city.dmi'; - icon_state = "flatscreen"; - name = "expensive flatscreen holovision"; +/obj/structure/television{ pixel_y = 15 }, -/obj/effect/decal/fake_object{ - desc = "A nondescript vent."; - icon = 'icons/effects/city.dmi'; - icon_state = "vent"; - layer = 2.7; - name = "wall vent"; +/obj/structure/vent{ pixel_x = 6; pixel_y = 25 }, @@ -6936,12 +6658,7 @@ /area/city/mendell) "Nb" = ( /obj/machinery/door/window/eastleft, -/obj/effect/decal/fake_object{ - desc = "Power outlets, in space!"; - icon = 'icons/effects/city.dmi'; - icon_state = "outlet"; - layer = 2.7; - name = "power outlets"; +/obj/structure/outlet{ pixel_y = -12 }, /turf/simulated/floor/wood, @@ -6959,11 +6676,7 @@ /area/city/mendell) "Nh" = ( /obj/structure/table/wood, -/obj/effect/decal/fake_object{ - desc = "An expensive flatscreen holo-television. This one's connection to the extranet seems to be severed."; - icon = 'icons/effects/city.dmi'; - icon_state = "flatscreen"; - name = "expensive flatscreen holovision"; +/obj/structure/television{ pixel_y = 15 }, /turf/simulated/floor/wood, @@ -7027,12 +6740,7 @@ /turf/simulated/floor/carpet, /area/city/mendell/interior) "NM" = ( -/obj/effect/decal/fake_object{ - desc = "A nondescript decorative shelf."; - icon = 'icons/effects/city.dmi'; - icon_state = "shelf"; - layer = 2.7; - name = "shelf"; +/obj/structure/shelf{ pixel_y = 35 }, /obj/random/pottedplant, @@ -7546,11 +7254,7 @@ }, /area/city/mendell) "Ql" = ( -/obj/effect/decal/fake_object{ - desc = "A window overlooking the pristine Mendell City."; - icon = 'icons/effects/city.dmi'; - icon_state = "win3"; - name = "window"; +/obj/structure/window{ pixel_y = 33 }, /turf/simulated/floor/tiled/ramp{ @@ -7903,17 +7607,6 @@ icon_state = "wood_willow" }, /area/city/mendell/interior) -"Sf" = ( -/obj/effect/decal/fake_object{ - desc = "A beautiful sign denoting you as being in the Hotel Montparnasse!"; - icon = 'icons/effects/city.dmi'; - icon_state = "sign1"; - name = "glamorous sign"; - pixel_y = 33 - }, -/obj/effect/decal/fake_object/light_source/invisible, -/turf/simulated/floor/tiled/dark, -/area/city/mendell/interior) "Sl" = ( /obj/structure/window/reinforced{ dir = 1 @@ -8386,12 +8079,7 @@ }, /area/city/mendell/interior) "Vf" = ( -/obj/effect/decal/fake_object{ - desc = "A nondescript decorative shelf."; - icon = 'icons/effects/city.dmi'; - icon_state = "shelf"; - layer = 2.7; - name = "shelf"; +/obj/structure/shelf{ pixel_y = 35 }, /turf/unsimulated/floor{ @@ -8411,14 +8099,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/effect/decal/fake_object{ - density = 1; - desc = "A bland air conditioning unit."; - icon = 'icons/effects/city.dmi'; - icon_state = "ac"; - layer = 2.7; - name = "AC unit" - }, +/obj/structure/ac_unit, /turf/simulated/floor/tiled, /area/city/mendell/interior) "Vl" = ( @@ -8456,11 +8137,7 @@ }, /area/city/mendell/interior) "Vz" = ( -/obj/effect/decal/fake_object{ - desc = "A window overlooking the pristine Mendell City."; - icon = 'icons/effects/city.dmi'; - icon_state = "win3"; - name = "window"; +/obj/structure/window{ pixel_y = 33 }, /turf/simulated/floor/tiled/ramp/bottom{ @@ -8545,12 +8222,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/effect/decal/fake_object{ - desc = "Power outlets, in space!"; - icon = 'icons/effects/city.dmi'; - icon_state = "outlet"; - layer = 2.7; - name = "power outlets"; +/obj/structure/outlet{ pixel_y = -12 }, /turf/simulated/floor/carpet, @@ -8775,17 +8447,6 @@ icon_state = "wood_birch" }, /area/city/mendell/interior) -"WZ" = ( -/obj/effect/decal/fake_object{ - desc = "A beautiful sign denoting you as being in the Hotel Montparnasse!"; - icon = 'icons/effects/city.dmi'; - icon_state = "sign2"; - name = "glamorous sign"; - pixel_y = 33 - }, -/obj/effect/decal/fake_object/light_source/invisible, -/turf/simulated/floor/tiled/dark, -/area/city/mendell/interior) "Xb" = ( /obj/machinery/door/window/northleft, /obj/structure/window/reinforced{ @@ -8957,24 +8618,14 @@ /area/city/mendell/interior) "Yz" = ( /obj/structure/table/wood, -/obj/effect/decal/fake_object{ - desc = "An expensive flatscreen holo-television. This one's connection to the extranet seems to be severed."; - dir = 8; - icon = 'icons/effects/city.dmi'; - icon_state = "flatscreen"; - name = "expensive flatscreen holovision"; +/obj/structure/television{ pixel_y = 15 }, /turf/simulated/floor/carpet, /area/city/mendell/interior) "YD" = ( /obj/random/pottedplant, -/obj/effect/decal/fake_object{ - desc = "A nondescript vent."; - icon = 'icons/effects/city.dmi'; - icon_state = "vent"; - layer = 2.7; - name = "wall vent"; +/obj/structure/vent{ pixel_x = 6; pixel_y = 25 }, @@ -9240,12 +8891,7 @@ /turf/simulated/floor/shuttle/dark_blue, /area/shuttle/city) "ZY" = ( -/obj/effect/decal/fake_object{ - desc = "A nondescript vent."; - icon = 'icons/effects/city.dmi'; - icon_state = "vent"; - layer = 2.7; - name = "wall vent"; +/obj/structure/vent{ pixel_x = 6; pixel_y = 25 }, @@ -17113,8 +16759,8 @@ ZL CP CP CP -CP -Sf +ao +pK ny ny ny @@ -17201,7 +16847,7 @@ CP CP CP CP -WZ +pK ny ny CP @@ -19166,7 +18812,7 @@ hx rz CP CP -IA +cF CP js nn @@ -19374,7 +19020,7 @@ ZL ZL bo ZG -jy +ac ZG ZG ZG @@ -19548,7 +19194,7 @@ ZL ZL bk ZG -jy +ac ZG ZG ZG @@ -19750,8 +19396,8 @@ zU Eq AN CP -IA -IA +cF +cF CP fa Hn @@ -19815,8 +19461,8 @@ QK Uk pc pc -CP -df +ao +sm ZG Dt DI @@ -19918,7 +19564,7 @@ CP CP CP ae -af +ae CP Eq Eq @@ -20203,7 +19849,7 @@ Rb Iw jq tj -IA +cF ZL ZL ZL @@ -20265,7 +19911,7 @@ UZ UZ ob CP -ag +ah ah CP Eq @@ -20377,7 +20023,7 @@ fg WA EA Lz -IA +cF ZL ZL ZL @@ -20616,7 +20262,7 @@ GI Dt Dt Xs -IA +cF Eq Eq Eq @@ -20703,7 +20349,7 @@ CP CP Dt Dt -IA +cF Eq Eq Eq @@ -20778,8 +20424,8 @@ CP CP CP CP -CP -ys +ao +JQ JQ Af Af @@ -20794,7 +20440,7 @@ CP ug ug CP -IA +cF CP CP yA @@ -20866,7 +20512,7 @@ Dt OU av CP -lR +sm sm eV eV @@ -20969,7 +20615,7 @@ ZG ZG ZG ZG -IA +cF CY yU yU @@ -21030,7 +20676,7 @@ ZG ZG ZG lc -IA +cF JQ Dt Dt @@ -21056,7 +20702,7 @@ Dt Dt ZG ZG -IA +cF Dt Dt Dt @@ -21117,7 +20763,7 @@ ZG ZG ZG ZG -IA +cF JQ sm Ph @@ -21143,7 +20789,7 @@ KX Dt ZG ZG -IA +cF Dt Dt Dt @@ -21204,41 +20850,41 @@ ZG ZG ZG tQ -IA -IA -IA +cF +cF +cF CP -IA -IA -IA +cF +cF +cF CP CP CP -IA -IA -IA +cF +cF +cF CP -IA -IA -IA +cF +cF +cF CP CP CP Dt -CP +ao BQ Dt ZG tQ CP -IA +cF yY yY -IA +cF CP GX jH -IA +cF Vi yj CP @@ -21246,8 +20892,8 @@ YX qT xY kZ -IA -IA +cF +cF ZL ZL ZL @@ -21325,7 +20971,7 @@ kY jH GX GX -IA +cF GX GX CP @@ -21334,7 +20980,7 @@ ny ny QI JF -IA +cF ZL ZL ZL @@ -21412,7 +21058,7 @@ GX GX GX GX -IA +cF GX GX CP @@ -21421,7 +21067,7 @@ Lw ny ny oE -IA +cF ZL ZL ZL @@ -21508,7 +21154,7 @@ CP zk zk zk -IA +cF ZL ZL ZL @@ -21595,7 +21241,7 @@ CP jX zk zk -IA +cF ZL ZL ZL @@ -21682,7 +21328,7 @@ CP zk zO zO -IA +cF ZL ZL ZL @@ -21818,7 +21464,7 @@ jB jB hd oT -IA +cF Bl Df Df @@ -21905,7 +21551,7 @@ jB jB hd UZ -IA +cF Bn Eq Go @@ -21992,7 +21638,7 @@ jB jB hd oT -IA +cF Bx Eq Go @@ -22014,7 +21660,7 @@ kd GX kd GX -IA +cF kd GX gZ @@ -22079,7 +21725,7 @@ jB jB hd UZ -IA +cF Bn Eq Go @@ -22105,8 +21751,8 @@ OQ kd GX gZ -IA -IA +cF +cF CP CU CU @@ -22166,7 +21812,7 @@ jB jB hd oT -IA +cF BD yY yY @@ -22192,12 +21838,12 @@ cF kd GX GX -IA +cF fh gG ny ny -IA +cF GX wS ZG @@ -22271,20 +21917,20 @@ CP Dt Dt Ix -IA +cF Ee -IA +cF BL WG GX GX GX -IA +cF kd ny ny ny -IA +cF GX wS ZG @@ -22366,12 +22012,12 @@ Vh vJ GX GX -IA +cF fh Gf ny ny -IA +cF GX wS ZG @@ -22449,12 +22095,12 @@ vJ GX vJ GX -cL +cF vJ GX gZ -IA -IA +cF +cF CP CU CU @@ -22536,7 +22182,7 @@ vJ GX vJ GX -IA +cF vJ GX gZ @@ -22710,7 +22356,7 @@ vJ GX vJ wP -cL +cF vJ GX Ln @@ -22961,11 +22607,11 @@ ZG ZG ZG tQ -IA +cF sj Df Qx -IA +cF Rs ZG ZG @@ -23126,9 +22772,9 @@ nH VY VY yz -IA +cF Tp -IA +cF CP Uc eX @@ -23146,9 +22792,9 @@ CX eX jp CP -IA +cF Tp -IA +cF nH VY VY @@ -23213,7 +22859,7 @@ VY VY VY VY -IA +cF ZL ZL ZL @@ -23235,7 +22881,7 @@ ZL ZL ZL Ju -IA +cF VY VY VY @@ -23300,7 +22946,7 @@ VY VY VY VY -IA +cF ZL ZL ZL @@ -23322,7 +22968,7 @@ ZL ZL ZL ZL -IA +cF VY VY VY @@ -23409,7 +23055,7 @@ ZL ZL ZL ZL -IA +cF Df Df Df @@ -23418,7 +23064,7 @@ CP Hp EO Yu -IA +cF vk EO yL @@ -23465,7 +23111,7 @@ bL Ga EO Yu -IA +cF vk EO EO @@ -23474,7 +23120,7 @@ Df Df Df Df -IA +cF ZL ZL ZL @@ -23561,7 +23207,7 @@ sj Df Df Qx -IA +cF ZL ZL ZL @@ -23583,7 +23229,7 @@ ZL ZL ZL ZL -IA +cF sj Df Df @@ -24006,7 +23652,7 @@ FM Lo Rj uO -IA +cF FM yQ yQ @@ -24091,9 +23737,9 @@ FM FM FM Yu -IA +cF vk -IA +cF FM yQ GJ @@ -24180,7 +23826,7 @@ Po ZS po vr -IA +cF FM yQ cW @@ -24335,7 +23981,7 @@ cK ho ho ls -IA +cF rk ho oZ @@ -24354,7 +24000,7 @@ EO sF EO EO -IA +cF FM yQ GJ @@ -24425,7 +24071,7 @@ ho oD ho ls -IA +cF vk Px UZ @@ -24441,7 +24087,7 @@ yL CP EO EO -IA +cF FM yQ yQ @@ -24528,7 +24174,7 @@ EO EO EO EO -IA +cF Hk yQ yQ @@ -24789,11 +24435,11 @@ wp CG CA ho -IA +cF ho -IA +cF ho -IA +cF FM yQ CP @@ -24947,7 +24593,7 @@ ho oZ ho ls -IA +cF vk wo UZ @@ -25031,7 +24677,7 @@ cK ho ho ls -IA +cF rk ho oD @@ -25050,7 +24696,7 @@ EO EO EO EO -IA +cF FM yQ EO @@ -25075,7 +24721,7 @@ GJ rl CG CG -IA +cF ZL ZL ZL @@ -25137,7 +24783,7 @@ EO EO EO EO -IA +cF FM yQ EO @@ -25224,7 +24870,7 @@ EO cW EO EO -IA +cF FM yQ EO @@ -25249,7 +24895,7 @@ EO rl CG Sp -IA +cF ZL ZL ZL @@ -25336,7 +24982,7 @@ EO rl CG rc -IA +cF ZL ZL ZL @@ -25400,9 +25046,9 @@ PF PF CP CP -IA +cF Tp -IA +cF CP CP CP @@ -25421,8 +25067,8 @@ nr yZ CP Tp -IA -IA +cF +cF CP ZL ZL @@ -29313,7 +28959,7 @@ Kg xD xD xD -aj +tY xD xD hM @@ -30705,7 +30351,7 @@ Kg xD xD xD -ao +aN xD xD hM diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/factory_arms.dmm b/maps/random_ruins/exoplanets/konyang/abandoned/factory_arms.dmm index 4838afd0d15..3413be842af 100644 --- a/maps/random_ruins/exoplanets/konyang/abandoned/factory_arms.dmm +++ b/maps/random_ruins/exoplanets/konyang/abandoned/factory_arms.dmm @@ -683,7 +683,7 @@ /turf/simulated/floor/foundation, /area/konyang/arms_factory) "zb" = ( -/obj/structure/road_sign/yield{ +/obj/structure/street_sign/yield{ pixel_x = -16 }, /turf/simulated/floor/sidewalk/flat, @@ -990,7 +990,7 @@ /turf/simulated/floor/exoplanet/dirt_konyang, /area/exoplanet/grass/konyang) "Om" = ( -/obj/structure/sign/urban{ +/obj/structure/sign/exit{ dir = 4; pixel_x = 6; pixel_y = 7 diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/factory_robotics.dmm b/maps/random_ruins/exoplanets/konyang/abandoned/factory_robotics.dmm index 46cfdbb79de..c2e3f0334e0 100644 --- a/maps/random_ruins/exoplanets/konyang/abandoned/factory_robotics.dmm +++ b/maps/random_ruins/exoplanets/konyang/abandoned/factory_robotics.dmm @@ -103,7 +103,7 @@ /turf/simulated/floor/sidewalk/flat, /area/exoplanet/grass/konyang) "gH" = ( -/obj/machinery/mech_recharger/automobile, +/obj/machinery/mech_recharger, /turf/simulated/floor/asphalt, /area/exoplanet/grass/konyang) "gZ" = ( @@ -111,7 +111,7 @@ /turf/simulated/floor/foundation, /area/exoplanet/grass/konyang) "hm" = ( -/obj/structure/road_sign/yield{ +/obj/structure/street_sign/yield{ pixel_x = -16 }, /obj/structure/hydrant, @@ -365,7 +365,7 @@ /turf/simulated/floor/sidewalk/dark/grid, /area/konyang/robotics_factory) "sY" = ( -/obj/structure/urban/pylon, +/obj/structure/pylon, /turf/simulated/floor/asphalt, /area/exoplanet/grass/konyang) "tf" = ( diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/house_small.dmm b/maps/random_ruins/exoplanets/konyang/abandoned/house_small.dmm index 1419df0a1b5..01f509d2610 100644 --- a/maps/random_ruins/exoplanets/konyang/abandoned/house_small.dmm +++ b/maps/random_ruins/exoplanets/konyang/abandoned/house_small.dmm @@ -40,7 +40,7 @@ /turf/simulated/floor/exoplanet/wood/bamboo, /area/konyang/house_small) "cL" = ( -/obj/machinery/mech_recharger/automobile, +/obj/machinery/mech_recharger, /obj/effect/decal/curb{ dir = 10 }, @@ -204,7 +204,7 @@ /turf/simulated/floor/exoplanet/concrete, /area/exoplanet/grass/konyang) "ki" = ( -/obj/machinery/mech_recharger/automobile, +/obj/machinery/mech_recharger, /obj/effect/decal/curb{ dir = 6 }, @@ -915,14 +915,7 @@ /turf/simulated/floor/exoplanet/tiled/white, /area/konyang/house_small) "Vx" = ( -/obj/effect/decal/fake_object{ - density = 1; - desc = "A bland air conditioning unit."; - icon = 'icons/effects/city.dmi'; - icon_state = "ac"; - layer = 2.7; - name = "AC unit" - }, +/obj/structure/ac_unit, /turf/simulated/floor/exoplanet/concrete, /area/exoplanet/grass/konyang) "Wv" = ( diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/landing_zone.dmm b/maps/random_ruins/exoplanets/konyang/abandoned/landing_zone.dmm index 224314ee611..31a8efa2e07 100644 --- a/maps/random_ruins/exoplanets/konyang/abandoned/landing_zone.dmm +++ b/maps/random_ruins/exoplanets/konyang/abandoned/landing_zone.dmm @@ -254,7 +254,7 @@ /turf/simulated/floor/exoplanet/konyang, /area/konyang_landing_zone/command_center_abandoned/garage) "dt" = ( -/obj/structure/road_sign/yield{ +/obj/structure/street_sign/yield{ name = "NO TRESPASSING sign"; desc = "A sign which declares this area as SCC property and staunchly declines any thought of trespassing." }, @@ -488,7 +488,7 @@ /obj/structure/ledge/quarter{ dir = 4 }, -/obj/structure/road_sign/yield{ +/obj/structure/street_sign/yield{ name = "NO TRESPASSING sign"; desc = "A sign which declares this area as SCC property and staunchly declines any thought of trespassing." }, @@ -1062,7 +1062,7 @@ /obj/structure/chainlink_fence{ dir = 4 }, -/obj/structure/road_sign/yield{ +/obj/structure/street_sign/yield{ name = "NO TRESPASSING sign"; desc = "A sign which declares this area as SCC property and staunchly declines any thought of trespassing." }, @@ -1346,7 +1346,7 @@ /turf/simulated/floor/reinforced, /area/konyang_landing_zone/command_center_abandoned/garage) "rz" = ( -/obj/structure/road_sign/yield{ +/obj/structure/street_sign/yield{ name = "NO TRESPASSING sign"; desc = "A sign which declares this area as SCC property and staunchly declines any thought of trespassing." }, @@ -2516,7 +2516,7 @@ dir = 8 }, /obj/structure/flora/bush/konyang_reeds, -/obj/structure/road_sign/yield{ +/obj/structure/street_sign/yield{ name = "NO TRESPASSING sign"; desc = "A sign which declares this area as SCC property and staunchly declines any thought of trespassing." }, @@ -3018,7 +3018,7 @@ dir = 4 }, /obj/effect/floor_decal/konyang_flowers, -/obj/structure/road_sign/yield{ +/obj/structure/street_sign/yield{ name = "NO TRESPASSING sign"; desc = "A sign which declares this area as SCC property and staunchly declines any thought of trespassing." }, @@ -3187,7 +3187,7 @@ /obj/structure/ledge/quarter{ dir = 8 }, -/obj/structure/road_sign/yield{ +/obj/structure/street_sign/yield{ name = "NO TRESPASSING sign"; desc = "A sign which declares this area as SCC property and staunchly declines any thought of trespassing." }, @@ -3334,7 +3334,7 @@ /obj/structure/chainlink_fence{ dir = 4 }, -/obj/structure/road_sign/yield{ +/obj/structure/street_sign/yield{ name = "NO TRESPASSING sign"; desc = "A sign which declares this area as SCC property and staunchly declines any thought of trespassing." }, diff --git a/maps/random_ruins/exoplanets/konyang/fireoutpost.dmm b/maps/random_ruins/exoplanets/konyang/fireoutpost.dmm index ebf7f9e63d6..8eb13b2df44 100644 --- a/maps/random_ruins/exoplanets/konyang/fireoutpost.dmm +++ b/maps/random_ruins/exoplanets/konyang/fireoutpost.dmm @@ -118,7 +118,7 @@ /obj/structure/chainlink_fence{ dir = 4 }, -/obj/structure/chainlink_fence, +/obj/structure/chainlink_fence/corner, /turf/simulated/floor/exoplanet/konyang, /area/konyang_fireoutpost) "eQ" = ( @@ -461,7 +461,8 @@ /area/konyang_fireoutpost) "qV" = ( /obj/structure/chainlink_fence{ - dir = 8 + dir = 8; + pixel_x = -16 }, /turf/simulated/floor/concrete, /area/konyang_fireoutpost) @@ -714,11 +715,12 @@ /turf/simulated/floor/exoplanet/konyang/wilting, /area/exoplanet/grass/konyang) "Fq" = ( -/obj/structure/chainlink_fence{ - dir = 8 - }, /obj/effect/decal/exterior_stairs/half, /obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/chainlink_fence{ + dir = 8; + pixel_x = -16 + }, /turf/simulated/floor/exoplanet/konyang/no_edge, /area/konyang_fireoutpost) "Fy" = ( @@ -996,6 +998,13 @@ /obj/effect/decal/curb, /turf/simulated/floor/exoplanet/konyang/no_edge, /area/konyang_fireoutpost) +"Qj" = ( +/obj/structure/chainlink_fence/corner, +/obj/structure/chainlink_fence{ + dir = 4 + }, +/turf/simulated/floor/exoplanet/konyang, +/area/konyang_fireoutpost) "QE" = ( /obj/structure/flora/bush/konyang_reeds, /obj/effect/decal/curb{ @@ -1009,7 +1018,8 @@ /area/exoplanet/grass/konyang) "QS" = ( /obj/structure/chainlink_fence{ - dir = 8 + dir = 8; + pixel_x = -16 }, /obj/structure/closet/outhouse, /turf/simulated/floor/concrete, @@ -1088,7 +1098,8 @@ /area/exoplanet/grass/konyang) "TI" = ( /obj/structure/chainlink_fence{ - dir = 8 + dir = 8; + pixel_x = -16 }, /turf/simulated/floor/exoplanet/konyang, /area/konyang_fireoutpost) @@ -1236,10 +1247,7 @@ "ZQ" = ( /obj/structure/chainlink_fence{ dir = 8; - pixel_y = -19 - }, -/obj/structure/chainlink_fence{ - dir = 8 + pixel_x = -16 }, /turf/simulated/floor/exoplanet/konyang/wilting, /area/konyang_fireoutpost) @@ -1572,7 +1580,7 @@ qV Fq TI ZQ -mh +ZQ Pp fO BY @@ -2142,7 +2150,7 @@ zS "} (29,1,1) = {" yn -sK +Qj pU JU mw diff --git a/maps/random_ruins/exoplanets/konyang/hivebot_burrows_1.dmm b/maps/random_ruins/exoplanets/konyang/hivebot_burrows_1.dmm index 27835d97c03..9ef7097bb49 100644 --- a/maps/random_ruins/exoplanets/konyang/hivebot_burrows_1.dmm +++ b/maps/random_ruins/exoplanets/konyang/hivebot_burrows_1.dmm @@ -455,11 +455,11 @@ /turf/simulated/floor/exoplanet/konyang, /area/space) "im" = ( -/obj/structure/chainlink_fence{ - dir = 1 - }, /obj/random/dirt_75, -/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/rock/konyang/small, +/obj/structure/chainlink_fence{ + dir = 8 + }, /turf/simulated/floor/exoplanet/dirt_konyang, /area/space) "iq" = ( @@ -1262,6 +1262,12 @@ }, /turf/simulated/floor/exoplanet/konyang, /area/space) +"yI" = ( +/obj/structure/chainlink_fence{ + dir = 1 + }, +/turf/simulated/floor/exoplanet/konyang, +/area/space) "yQ" = ( /obj/structure/ore_box, /obj/random/dirt_75, @@ -2525,10 +2531,10 @@ /turf/simulated/floor/exoplanet/dirt_konyang/cave, /area/hivebot_burrows_1) "WC" = ( +/obj/random/dirt_75, /obj/structure/chainlink_fence{ dir = 8 }, -/obj/random/dirt_75, /turf/simulated/floor/exoplanet/dirt_konyang, /area/space) "WE" = ( @@ -3071,8 +3077,8 @@ Fo TI iq Om -bn -ft +WC +im xf xf xf @@ -3121,9 +3127,9 @@ Om pu il iq -TI -im -WC +yI +aD +bn xf xf xf diff --git a/maps/random_ruins/exoplanets/konyang/hivebot_burrows_2.dmm b/maps/random_ruins/exoplanets/konyang/hivebot_burrows_2.dmm index d93fa73e544..9a40058ea27 100644 --- a/maps/random_ruins/exoplanets/konyang/hivebot_burrows_2.dmm +++ b/maps/random_ruins/exoplanets/konyang/hivebot_burrows_2.dmm @@ -386,9 +386,6 @@ /obj/structure/chainlink_fence{ dir = 1 }, -/obj/random/junk, -/obj/random/dirt_75, -/obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/exoplanet/dirt_konyang, /area/space) "fg" = ( @@ -3839,9 +3836,6 @@ /turf/simulated/floor/exoplanet/carpet/rubber, /area/hivebot_burrows_2) "Zq" = ( -/obj/structure/chainlink_fence{ - dir = 1 - }, /obj/random/junk, /obj/random/junk, /obj/random/dirt_75, @@ -5491,7 +5485,7 @@ iq eO XM Xi -Oh +fc Zq XQ XQ @@ -5543,8 +5537,8 @@ Rp eO XM rJ -Oh fc +Np pt XQ XQ diff --git a/maps/random_ruins/exoplanets/konyang/homestead.dmm b/maps/random_ruins/exoplanets/konyang/homestead.dmm index 94353de1aa2..0af73e13ca4 100644 --- a/maps/random_ruins/exoplanets/konyang/homestead.dmm +++ b/maps/random_ruins/exoplanets/konyang/homestead.dmm @@ -47,9 +47,6 @@ /turf/simulated/floor/exoplanet/dirt_konyang, /area/konyang_homestead) "cj" = ( -/obj/structure/chainlink_fence{ - dir = 1 - }, /obj/random/dirt_75, /obj/random/junk, /obj/random/junk, @@ -68,6 +65,13 @@ }, /turf/simulated/floor/exoplanet/dirt_konyang, /area/konyang_homestead) +"dT" = ( +/obj/effect/floor_decal/konyang_flowers, +/obj/structure/chainlink_fence{ + dir = 1 + }, +/turf/simulated/floor/exoplanet/konyang, +/area/exoplanet/grass/konyang) "ee" = ( /obj/machinery/portable_atmospherics/hydroponics/soil, /obj/machinery/portable_atmospherics/hydroponics/soil{ @@ -188,13 +192,11 @@ /turf/simulated/floor/wood, /area/konyang_homestead) "iJ" = ( +/obj/structure/flora/bush/konyang_reeds, +/obj/structure/chainlink_fence/corner, /obj/structure/chainlink_fence{ dir = 4 }, -/obj/structure/chainlink_fence{ - dir = 1 - }, -/obj/structure/flora/bush/konyang_reeds, /turf/simulated/floor/exoplanet/konyang, /area/konyang_homestead) "iZ" = ( @@ -219,9 +221,7 @@ /turf/simulated/floor/wood, /area/konyang_homestead) "jN" = ( -/obj/structure/chainlink_fence{ - layer = 9.1 - }, +/obj/structure/chainlink_fence/corner, /obj/structure/chainlink_fence{ dir = 4 }, @@ -319,9 +319,6 @@ /turf/simulated/floor/wood, /area/konyang_homestead) "nZ" = ( -/obj/structure/chainlink_fence{ - dir = 1 - }, /obj/random/dirt_75, /obj/random/junk, /turf/simulated/floor/exoplanet/dirt_konyang, @@ -367,12 +364,10 @@ /turf/simulated/floor/lino/diamond, /area/konyang_homestead) "pC" = ( -/obj/structure/chainlink_fence{ - dir = 8 - }, -/obj/structure/flora/ausbushes/sparsegrass, -/turf/simulated/floor/exoplanet/dirt_konyang, -/area/exoplanet/grass/konyang) +/obj/structure/flora/bush/konyang_reeds, +/obj/structure/reagent_dispensers/watertank, +/turf/simulated/floor/exoplanet/konyang, +/area/konyang_homestead) "pT" = ( /obj/structure/lattice/catwalk/indoor/tatami{ dir = 8 @@ -466,6 +461,13 @@ }, /turf/simulated/floor/exoplanet/dirt_konyang, /area/konyang_homestead) +"tj" = ( +/obj/structure/flora/bush/konyang_reeds, +/obj/structure/chainlink_fence{ + dir = 8 + }, +/turf/simulated/floor/exoplanet/konyang, +/area/exoplanet/grass/konyang) "tn" = ( /obj/structure/table/rack/clothing{ layer = 3.1 @@ -576,6 +578,13 @@ }, /turf/simulated/floor/exoplanet/dirt_konyang, /area/konyang_homestead) +"xf" = ( +/obj/structure/chainlink_fence{ + dir = 4 + }, +/obj/structure/chainlink_fence/corner, +/turf/simulated/floor/exoplanet/konyang, +/area/exoplanet/grass/konyang) "xu" = ( /obj/random/dirt_75, /obj/structure/flora/rock/konyang/small, @@ -733,9 +742,6 @@ /turf/simulated/floor/wood, /area/konyang_homestead) "Fe" = ( -/obj/structure/chainlink_fence{ - dir = 8 - }, /obj/random/dirt_75, /obj/random/junk, /obj/effect/decal/fake_object/light_source/invisible{ @@ -743,6 +749,14 @@ }, /turf/simulated/floor/exoplanet/dirt_konyang, /area/exoplanet/grass/konyang) +"Gm" = ( +/obj/random/dirt_75, +/obj/structure/flora/rock/konyang/small, +/obj/structure/chainlink_fence{ + dir = 8 + }, +/turf/simulated/floor/exoplanet/dirt_konyang, +/area/exoplanet/grass/konyang) "GI" = ( /obj/structure/lattice/catwalk/indoor/planks/opaque, /obj/effect/decal/fake_object/light_source/invisible{ @@ -861,7 +875,6 @@ dir = 1 }, /obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/exoplanet/konyang, /area/konyang_homestead) "Kn" = ( @@ -1108,6 +1121,12 @@ /obj/structure/railing/fence, /turf/simulated/floor/exoplanet/dirt_konyang, /area/exoplanet/grass/konyang) +"ZM" = ( +/obj/structure/chainlink_fence{ + dir = 1 + }, +/turf/simulated/floor/exoplanet/konyang, +/area/exoplanet/grass/konyang) (1,1,1) = {" Uz @@ -1531,8 +1550,8 @@ gR gR bz rw -bz -xu +tj +Gm UU Nh tp @@ -1563,7 +1582,7 @@ vJ bz bz oT -pC +xW Fe UU ki @@ -1594,7 +1613,7 @@ bz gR oT bz -oT +ZM nZ cV UU @@ -1626,7 +1645,7 @@ bz xF kG bz -kG +dT cj va Qn @@ -1658,7 +1677,7 @@ QY QY SW gR -oT +xf Qn Qn Qn @@ -1791,7 +1810,7 @@ Qn Qn Qn Qn -No +pC Qv nn hG diff --git a/maps/random_ruins/exoplanets/konyang/landing_zone.dmm b/maps/random_ruins/exoplanets/konyang/landing_zone.dmm index 597a4599eab..1b01eb70eb6 100644 --- a/maps/random_ruins/exoplanets/konyang/landing_zone.dmm +++ b/maps/random_ruins/exoplanets/konyang/landing_zone.dmm @@ -191,7 +191,8 @@ dir = 4 }, /obj/structure/utility_pole/street/on{ - dir = 8 + dir = 8; + pixel_x = -26 }, /turf/simulated/floor/asphalt, /area/konyang_landing_zone) @@ -214,7 +215,8 @@ /area/konyang_landing_zone) "cN" = ( /obj/structure/utility_pole/street/on{ - dir = 8 + dir = 8; + pixel_x = -14 }, /obj/structure/ledge/quarter{ dir = 4 @@ -270,10 +272,11 @@ /area/konyang_landing_zone/command_center/greenhouse) "dJ" = ( /obj/structure/chainlink_fence{ - dir = 4 + layer = 9.1 }, /obj/structure/chainlink_fence{ - layer = 9.1 + dir = 4; + pixel_x = 16 }, /turf/simulated/floor/exoplanet/konyang, /area/konyang_landing_zone) @@ -484,7 +487,7 @@ /obj/structure/ledge/quarter{ dir = 4 }, -/obj/structure/road_sign/yield{ +/obj/structure/street_sign/yield{ name = "NO TRESPASSING sign"; desc = "A sign which declares this area as SCC property and staunchly declines any thought of trespassing." }, @@ -503,10 +506,11 @@ /turf/simulated/floor/exoplanet/konyang, /area/konyang_landing_zone) "gB" = ( -/obj/structure/chainlink_fence{ - dir = 8 - }, /obj/effect/decal/road_marking/reflector, +/obj/structure/chainlink_fence{ + dir = 8; + pixel_x = -16 + }, /turf/simulated/floor/concrete, /area/konyang_landing_zone) "gL" = ( @@ -606,7 +610,7 @@ }, /obj/machinery/computer/general_air_control/large_tank_control{ name = "LZ Air Supply Monitor"; - sensors = list("lz_air_sensor"="Site Tank"); + sensors = list("lz_air_sensor"="Site Tank"); dir = 8 }, /obj/effect/floor_decal/spline/fancy/wood{ @@ -671,6 +675,14 @@ }, /turf/simulated/floor/wood, /area/konyang_landing_zone/command_center) +"iM" = ( +/obj/effect/decal/curb{ + dir = 1; + layer = 2.02 + }, +/obj/structure/crane/arm, +/turf/simulated/floor/asphalt, +/area/konyang_landing_zone) "iT" = ( /obj/structure/cable{ icon_state = "4-8" @@ -789,7 +801,9 @@ /obj/structure/ledge{ dir = 1 }, -/obj/structure/utility_pole/street/on, +/obj/structure/utility_pole/street/on{ + pixel_y = 0 + }, /turf/simulated/floor/asphalt, /area/konyang_landing_zone) "jZ" = ( @@ -811,7 +825,8 @@ /area/konyang_landing_zone) "ke" = ( /obj/structure/utility_pole/street/on{ - dir = 4 + dir = 4; + pixel_x = -50 }, /obj/structure/ledge/quarter{ dir = 9 @@ -897,10 +912,11 @@ /turf/simulated/floor/airless, /area/konyang_landing_zone/command_center/landing_pads) "lp" = ( -/obj/structure/chainlink_fence{ - dir = 4 - }, /obj/effect/floor_decal/konyang_flowers, +/obj/structure/chainlink_fence{ + dir = 4; + pixel_x = 16 + }, /turf/simulated/floor/exoplanet/konyang, /area/konyang_landing_zone) "lr" = ( @@ -952,7 +968,8 @@ dir = 8 }, /obj/structure/utility_pole/street/on{ - dir = 4 + dir = 4; + pixel_x = -40 }, /turf/simulated/floor/asphalt, /area/konyang_landing_zone) @@ -1013,7 +1030,8 @@ /area/konyang_landing_zone/command_center/landing_pads) "mF" = ( /obj/structure/chainlink_fence{ - dir = 8 + dir = 8; + pixel_x = -16 }, /turf/simulated/floor/concrete, /area/konyang_landing_zone) @@ -1032,9 +1050,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/chainlink_fence{ - dir = 4 - }, /obj/structure/railing/mapped{ dir = 4 }, @@ -1226,12 +1241,13 @@ /obj/structure/ledge{ dir = 4 }, -/obj/structure/utility_pole/street/on{ - dir = 8 - }, /obj/structure/chainlink_fence{ layer = 9.1 }, +/obj/structure/utility_pole/street/on{ + dir = 8; + pixel_x = -26 + }, /turf/simulated/floor/asphalt, /area/konyang_landing_zone) "pU" = ( @@ -1338,7 +1354,7 @@ /turf/simulated/floor/reinforced, /area/konyang_landing_zone/command_center/garage) "rz" = ( -/obj/structure/road_sign/yield{ +/obj/structure/street_sign/yield{ name = "NO TRESPASSING sign"; desc = "A sign which declares this area as SCC property and staunchly declines any thought of trespassing." }, @@ -1359,7 +1375,8 @@ dir = 1 }, /obj/structure/chainlink_fence{ - dir = 4 + dir = 4; + pixel_x = 16 }, /turf/simulated/floor/exoplanet/konyang, /area/konyang_landing_zone) @@ -1370,11 +1387,12 @@ /turf/simulated/floor/concrete, /area/konyang_landing_zone/command_center/landing_pads) "rM" = ( -/obj/structure/chainlink_fence{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/visible/black, /obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/structure/chainlink_fence{ + dir = 8; + pixel_x = -16 + }, /turf/simulated/floor/concrete, /area/konyang_landing_zone/command_center/landing_pads) "rP" = ( @@ -1538,7 +1556,8 @@ layer = 9.1 }, /obj/structure/chainlink_fence{ - dir = 4 + dir = 4; + pixel_x = 16 }, /turf/simulated/floor/concrete, /area/konyang_landing_zone) @@ -1548,6 +1567,14 @@ }, /turf/simulated/floor/exoplanet/dirt_konyang, /area/konyang_landing_zone) +"tv" = ( +/obj/structure/chainlink_fence{ + dir = 8; + pixel_x = -16 + }, +/obj/effect/decal/road_marking/reflector, +/turf/simulated/floor/concrete, +/area/konyang_landing_zone) "tz" = ( /obj/machinery/light_switch{ pixel_x = -12; @@ -1567,6 +1594,19 @@ /obj/structure/lattice/catwalk/indoor/urban, /turf/simulated/floor/plating, /area/konyang_landing_zone/command_center/landing_pads) +"tI" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/chainlink_fence{ + dir = 8; + pixel_x = -16 + }, +/turf/simulated/floor/concrete, +/area/konyang_landing_zone/command_center/landing_pads) "uc" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -1696,12 +1736,13 @@ /turf/simulated/floor/plating, /area/konyang_landing_zone/command_center/landing_pads) "wr" = ( -/obj/structure/chainlink_fence{ - dir = 4 - }, /obj/machinery/light/small{ dir = 8 }, +/obj/structure/chainlink_fence{ + dir = 4; + pixel_x = 16 + }, /turf/simulated/floor/exoplanet/konyang, /area/konyang_landing_zone/command_center/landing_pads) "ww" = ( @@ -1716,7 +1757,7 @@ "wx" = ( /obj/machinery/computer/general_air_control/large_tank_control{ name = "LZ Carbon Dioxide Supply Monitor"; - sensors = list("lz_co2_sensor"="Site Tank"); + sensors = list("lz_co2_sensor"="Site Tank"); dir = 8 }, /obj/effect/floor_decal/spline/fancy/wood{ @@ -1726,10 +1767,12 @@ /area/konyang_landing_zone/command_center) "wz" = ( /obj/structure/chainlink_fence{ - dir = 8 + dir = 4; + pixel_x = 16 }, /obj/structure/chainlink_fence{ - dir = 4 + dir = 8; + pixel_x = -16 }, /turf/simulated/floor/concrete, /area/konyang_landing_zone) @@ -2071,7 +2114,7 @@ dir = 5 }, /obj/structure/utility_pole/street/on{ - dir = 8 + pixel_y = 0 }, /turf/simulated/floor/asphalt, /area/konyang_landing_zone) @@ -2300,13 +2343,16 @@ /turf/simulated/floor/asphalt, /area/konyang_landing_zone) "Dv" = ( -/obj/machinery/atmospherics/pipe/simple/visible/black, /obj/structure/chainlink_fence{ - dir = 8 + dir = 8; + pixel_x = -16 + }, +/obj/structure/chainlink_fence{ + dir = 4; + pixel_x = 16 }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/concrete, -/area/konyang_landing_zone/command_center/landing_pads) +/area/konyang_landing_zone) "DP" = ( /obj/effect/decal/curb{ dir = 8 @@ -2314,10 +2360,11 @@ /turf/simulated/floor/asphalt, /area/konyang_landing_zone) "DQ" = ( -/obj/structure/chainlink_fence{ - dir = 4 - }, /obj/structure/flora/bush/konyang_reeds, +/obj/structure/chainlink_fence{ + dir = 4; + pixel_x = 16 + }, /turf/simulated/floor/exoplanet/konyang, /area/konyang_landing_zone) "DS" = ( @@ -2349,12 +2396,13 @@ /turf/simulated/floor/wood, /area/konyang_landing_zone/command_center/living) "Ed" = ( -/obj/structure/chainlink_fence{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/visible/black, /obj/structure/lattice/catwalk/indoor/urban, /obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/structure/chainlink_fence{ + dir = 8; + pixel_x = -16 + }, /turf/simulated/floor/plating, /area/konyang_landing_zone/command_center/landing_pads) "Eg" = ( @@ -2464,7 +2512,8 @@ /area/konyang_landing_zone/command_center/landing_pads) "Fz" = ( /obj/structure/chainlink_fence{ - dir = 4 + dir = 4; + pixel_x = 16 }, /turf/simulated/floor/exoplanet/konyang, /area/konyang_landing_zone) @@ -2504,7 +2553,7 @@ dir = 8 }, /obj/structure/flora/bush/konyang_reeds, -/obj/structure/road_sign/yield{ +/obj/structure/street_sign/yield{ name = "NO TRESPASSING sign"; desc = "A sign which declares this area as SCC property and staunchly declines any thought of trespassing." }, @@ -2868,9 +2917,6 @@ /turf/simulated/floor/exoplanet/konyang/no_edge, /area/konyang_landing_zone) "Ju" = ( -/obj/structure/chainlink_fence{ - dir = 8 - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; @@ -2911,7 +2957,8 @@ dir = 9 }, /obj/structure/utility_pole/street/on{ - dir = 4 + dir = 4; + pixel_y = 0 }, /turf/simulated/floor/asphalt, /area/konyang_landing_zone) @@ -3005,14 +3052,15 @@ /turf/simulated/floor/exoplanet/konyang/no_edge, /area/konyang_landing_zone) "Lf" = ( -/obj/structure/chainlink_fence{ - dir = 4 - }, /obj/effect/floor_decal/konyang_flowers, -/obj/structure/road_sign/yield{ +/obj/structure/street_sign/yield{ name = "NO TRESPASSING sign"; desc = "A sign which declares this area as SCC property and staunchly declines any thought of trespassing." }, +/obj/structure/chainlink_fence{ + dir = 4; + pixel_x = 16 + }, /turf/simulated/floor/exoplanet/konyang, /area/konyang_landing_zone) "Ll" = ( @@ -3021,6 +3069,10 @@ /obj/structure/ledge/quarter{ dir = 8 }, +/obj/structure/chainlink_fence{ + dir = 8; + pixel_x = -16 + }, /turf/simulated/floor/exoplanet/konyang/no_edge, /area/konyang_landing_zone) "Ln" = ( @@ -3184,7 +3236,7 @@ /obj/structure/ledge/quarter{ dir = 8 }, -/obj/structure/road_sign/yield{ +/obj/structure/street_sign/yield{ name = "NO TRESPASSING sign"; desc = "A sign which declares this area as SCC property and staunchly declines any thought of trespassing." }, @@ -3232,12 +3284,7 @@ /turf/simulated/floor/plating, /area/konyang_landing_zone/command_center/landing_pads) "Oa" = ( -/obj/structure/chainlink_fence{ - dir = 4 - }, -/obj/structure/chainlink_fence{ - layer = 9.1 - }, +/obj/effect/decal/road_marking/reflector, /turf/simulated/floor/concrete, /area/konyang_landing_zone) "Ob" = ( @@ -3280,10 +3327,11 @@ /turf/simulated/floor/exoplanet/konyang, /area/konyang_landing_zone/command_center/landing_pads) "Oz" = ( -/obj/structure/chainlink_fence{ - dir = 4 - }, /obj/effect/decal/road_marking/reflector, +/obj/structure/chainlink_fence{ + dir = 4; + pixel_x = 16 + }, /turf/simulated/floor/concrete, /area/konyang_landing_zone) "OA" = ( @@ -3332,13 +3380,14 @@ /turf/simulated/floor/plating, /area/konyang_landing_zone/command_center/landing_pads) "OW" = ( -/obj/structure/chainlink_fence{ - dir = 4 - }, -/obj/structure/road_sign/yield{ +/obj/structure/street_sign/yield{ name = "NO TRESPASSING sign"; desc = "A sign which declares this area as SCC property and staunchly declines any thought of trespassing." }, +/obj/structure/chainlink_fence{ + dir = 4; + pixel_x = 16 + }, /turf/simulated/floor/exoplanet/konyang, /area/konyang_landing_zone) "OZ" = ( @@ -3506,7 +3555,8 @@ "QM" = ( /obj/structure/chainlink_fence, /obj/structure/chainlink_fence{ - dir = 8 + dir = 8; + pixel_x = -16 }, /turf/simulated/floor/concrete, /area/konyang_landing_zone) @@ -3710,6 +3760,16 @@ /obj/structure/flora/bush/konyang_reeds, /turf/simulated/floor/exoplanet/konyang, /area/konyang_landing_zone) +"Tc" = ( +/obj/effect/decal/curb{ + dir = 5 + }, +/obj/effect/decal/road_marking/reflector{ + dir = 8 + }, +/obj/structure/crane/body, +/turf/simulated/floor/asphalt, +/area/konyang_landing_zone) "Th" = ( /obj/machinery/door/urban, /obj/effect/decal/exterior_stairs/half/center{ @@ -3741,18 +3801,20 @@ /turf/simulated/floor/wood, /area/konyang_landing_zone/command_center) "TB" = ( -/obj/structure/chainlink_fence{ - dir = 8 - }, -/obj/structure/chainlink_fence{ - dir = 4 - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 }, +/obj/structure/chainlink_fence{ + dir = 8; + pixel_x = -16 + }, +/obj/structure/chainlink_fence{ + dir = 4; + pixel_x = 16 + }, /turf/simulated/floor/concrete, /area/konyang_landing_zone/command_center/landing_pads) "TD" = ( @@ -3971,7 +4033,8 @@ /area/konyang_landing_zone) "WF" = ( /obj/structure/utility_pole/street/on{ - dir = 4 + dir = 4; + pixel_x = -50 }, /obj/structure/ledge/quarter{ dir = 9 @@ -4015,7 +4078,8 @@ /area/konyang_landing_zone/command_center/garage) "Xv" = ( /obj/structure/chainlink_fence{ - dir = 4 + dir = 4; + pixel_x = 16 }, /turf/simulated/floor/concrete, /area/konyang_landing_zone) @@ -4787,7 +4851,7 @@ YV Jp Lb Ll -lX +tI dK dK mF @@ -4850,7 +4914,7 @@ tm CU CU CU -EV +Tc dK aG dK @@ -4964,7 +5028,7 @@ jn xo bJ sK -pz +iM dK dK dK @@ -5206,7 +5270,7 @@ EO jL jL Pl -Dv +rM rM rM rM @@ -5272,10 +5336,10 @@ Xv Xv Xv Xv -Xv -Oz -Oz -Oz +dK +Oa +Oa +Oa dK dK Gc @@ -6688,9 +6752,9 @@ Ly pT dK dK -dK -dK -dK +Xv +Xv +Xv Xv Xv Xv @@ -6727,24 +6791,24 @@ fe TD Zi dK -gB +tv gB gB wz -wz -wz -wz -wz -wz -wz +Dv +Dv +Dv +Dv +Dv +Dv mF mF mF TB -wz -wz +Dv Xv -Oa +Xv +tp Vt xI gZ diff --git a/maps/random_ruins/exoplanets/konyang/ocean/naval_landing_zone.dmm b/maps/random_ruins/exoplanets/konyang/ocean/naval_landing_zone.dmm index 78417b34b0d..04d0f690064 100644 --- a/maps/random_ruins/exoplanets/konyang/ocean/naval_landing_zone.dmm +++ b/maps/random_ruins/exoplanets/konyang/ocean/naval_landing_zone.dmm @@ -26,13 +26,14 @@ /turf/simulated/floor/reinforced/carbon_dioxide, /area/konyang_landing_zone/command_center/landing_pads) "as" = ( -/obj/structure/ledge{ +/obj/structure/railing/mapped{ dir = 8 }, +/obj/effect/floor_decal/industrial/outline/engineering, /obj/structure/utility_pole/street/on{ - dir = 4 + dir = 8 }, -/turf/simulated/floor/asphalt, +/turf/simulated/floor/tiled, /area/konyang_landing_zone) "av" = ( /turf/simulated/wall, @@ -209,7 +210,7 @@ }, /obj/machinery/computer/general_air_control/large_tank_control{ name = "LZ Air Supply Monitor"; - sensors = list("lz_air_sensor"="Site Tank"); + sensors = list("lz_air_sensor"="Site Tank"); dir = 8 }, /obj/effect/floor_decal/spline/fancy/wood{ @@ -277,6 +278,9 @@ /obj/structure/tank_wall/carbon_dioxide{ icon_state = "co2-9" }, +/obj/structure/utility_pole/street/on{ + dir = 4 + }, /turf/simulated/floor/airless, /area/konyang_landing_zone/command_center/landing_pads) "cu" = ( @@ -535,13 +539,14 @@ /turf/simulated/floor/asphalt, /area/konyang_landing_zone) "fI" = ( +/obj/effect/decal/road_marking/reflector, +/obj/structure/railing/mapped{ + dir = 8 + }, /obj/structure/utility_pole/street/on{ dir = 8 }, -/obj/structure/ledge/quarter{ - dir = 4 - }, -/turf/simulated/floor/exoplanet/water/konyang, +/turf/simulated/floor/tiled, /area/konyang_landing_zone) "fP" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ @@ -742,13 +747,13 @@ /turf/simulated/floor/tiled/full, /area/konyang_landing_zone/command_center/reactor) "hW" = ( -/obj/structure/ledge/quarter{ - dir = 8 +/obj/structure/railing/mapped{ + layer = 9.1 }, /obj/structure/utility_pole/street/on{ - dir = 4 + dir = 1 }, -/turf/simulated/floor/asphalt, +/turf/simulated/floor/tiled, /area/konyang_landing_zone) "ir" = ( /obj/effect/decal/curb{ @@ -1099,6 +1104,14 @@ /obj/effect/map_effect/window_spawner/full/reinforced, /turf/simulated/floor/reinforced, /area/konyang_landing_zone/command_center) +"nD" = ( +/obj/effect/decal/curb{ + dir = 1; + layer = 2.02 + }, +/obj/structure/crane/arm, +/turf/simulated/floor/asphalt, +/area/konyang_landing_zone) "nH" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -1144,6 +1157,9 @@ /obj/structure/tank_wall/carbon_dioxide{ icon_state = "co2-8" }, +/obj/structure/utility_pole/street/on{ + dir = 8 + }, /turf/simulated/floor/airless, /area/konyang_landing_zone/command_center/landing_pads) "om" = ( @@ -1516,6 +1532,15 @@ }, /turf/simulated/floor/sidewalk/flat, /area/konyang_landing_zone/command_center/landing_pads) +"ug" = ( +/obj/structure/utility_pole/street/on{ + dir = 1 + }, +/obj/structure/railing/mapped{ + layer = 9.1 + }, +/turf/simulated/floor/tiled, +/area/konyang_landing_zone) "ur" = ( /obj/effect/floor_decal/corner/white/diagonal, /obj/effect/floor_decal/industrial/outline/grey, @@ -1993,13 +2018,13 @@ /turf/simulated/floor/plating, /area/konyang_landing_zone/command_center/landing_pads) "Bh" = ( +/obj/structure/railing/mapped{ + dir = 8 + }, /obj/structure/utility_pole/street/on{ - dir = 4 + dir = 8 }, -/obj/structure/ledge/quarter{ - dir = 9 - }, -/turf/simulated/floor/exoplanet/water/konyang, +/turf/simulated/floor/tiled, /area/konyang_landing_zone) "Bt" = ( /obj/structure/tank_wall/air{ @@ -2239,9 +2264,6 @@ /obj/structure/ledge{ dir = 5 }, -/obj/structure/utility_pole/street/on{ - dir = 8 - }, /turf/simulated/floor/asphalt, /area/konyang_landing_zone) "Fr" = ( @@ -2263,7 +2285,7 @@ "Fu" = ( /obj/machinery/computer/general_air_control/large_tank_control{ name = "LZ Carbon Dioxide Supply Monitor"; - sensors = list("lz_co2_sensor"="Site Tank"); + sensors = list("lz_co2_sensor"="Site Tank"); dir = 8 }, /obj/effect/floor_decal/spline/fancy/wood{ @@ -2357,11 +2379,13 @@ /turf/simulated/floor/tiled/full, /area/konyang_landing_zone/command_center/reactor) "GE" = ( -/obj/structure/ledge{ - dir = 1 +/obj/structure/chainlink_fence{ + dir = 4 }, -/obj/structure/utility_pole/street/on, -/turf/simulated/floor/asphalt, +/obj/structure/utility_pole/street/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/konyang_landing_zone) "GG" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ @@ -2375,16 +2399,16 @@ /turf/simulated/floor/plating, /area/konyang_landing_zone/command_center/landing_pads) "GL" = ( -/obj/structure/ledge/quarter{ +/obj/structure/railing/mapped{ dir = 8 }, +/obj/structure/railing/mapped{ + dir = 4 + }, /obj/structure/utility_pole/street/on{ - dir = 4 + dir = 8 }, -/obj/effect/decal/road_marking{ - dir = 4 - }, -/turf/simulated/floor/asphalt, +/turf/simulated/floor/tiled, /area/konyang_landing_zone) "GM" = ( /obj/effect/floor_decal/industrial/warning, @@ -2398,13 +2422,11 @@ /turf/simulated/floor/asphalt, /area/konyang_landing_zone) "GQ" = ( -/obj/structure/ledge{ - dir = 4 +/obj/structure/utility_pole/street/on, +/obj/structure/railing/mapped{ + layer = 9.1 }, -/obj/structure/utility_pole/street/on{ - dir = 8 - }, -/turf/simulated/floor/asphalt, +/turf/simulated/floor/tiled, /area/konyang_landing_zone) "GR" = ( /obj/structure/cable/yellow{ @@ -2446,9 +2468,6 @@ /obj/structure/ledge{ dir = 4 }, -/obj/structure/utility_pole/street/on{ - dir = 8 - }, /obj/structure/railing/mapped{ layer = 9.1 }, @@ -2516,6 +2535,9 @@ /obj/structure/tank_wall/air{ icon_state = "air8" }, +/obj/structure/utility_pole/street/on{ + dir = 8 + }, /turf/simulated/floor/plating, /area/konyang_landing_zone/command_center/landing_pads) "Ju" = ( @@ -2997,6 +3019,9 @@ /obj/structure/tank_wall/air{ icon_state = "air9" }, +/obj/structure/utility_pole/street/on{ + dir = 4 + }, /turf/simulated/floor/plating, /area/konyang_landing_zone/command_center/landing_pads) "Qy" = ( @@ -3085,6 +3110,19 @@ /obj/structure/railing/mapped, /turf/simulated/floor/tiled, /area/konyang_landing_zone/command_center/landing_pads) +"Rs" = ( +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/structure/railing/mapped{ + layer = 9.1; + dir = 4 + }, +/obj/structure/utility_pole/street/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/konyang_landing_zone) "RC" = ( /obj/structure/ledge{ dir = 4 @@ -3112,6 +3150,16 @@ "RH" = ( /turf/simulated/floor/carpet/magenta, /area/konyang_landing_zone/command_center/living) +"RT" = ( +/obj/effect/decal/road_marking/reflector, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/structure/utility_pole/street/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/konyang_landing_zone) "Sc" = ( /obj/item/reagent_containers/glass/bucket, /obj/machinery/light{ @@ -3247,6 +3295,15 @@ }, /turf/simulated/floor/tiled/white, /area/konyang_landing_zone/command_center/greenhouse) +"Tp" = ( +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/structure/utility_pole/street/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/konyang_landing_zone) "Tq" = ( /obj/effect/floor_decal/corner/pink/diagonal, /obj/machinery/chemical_dispenser, @@ -3261,6 +3318,9 @@ /obj/structure/railing/mapped{ dir = 8 }, +/obj/structure/utility_pole/street/on{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/konyang_landing_zone) "Tz" = ( @@ -3351,9 +3411,6 @@ /obj/structure/ledge{ dir = 9 }, -/obj/structure/utility_pole/street/on{ - dir = 4 - }, /turf/simulated/floor/asphalt, /area/konyang_landing_zone) "UD" = ( @@ -3477,9 +3534,6 @@ /obj/structure/ledge/quarter{ dir = 1 }, -/obj/structure/utility_pole/street/on{ - dir = 8 - }, /turf/simulated/floor/exoplanet/water/konyang, /area/konyang_landing_zone) "WA" = ( @@ -3589,12 +3643,7 @@ /area/konyang_landing_zone/command_center) "XW" = ( /obj/structure/ledge, -/obj/structure/utility_pole/street/on{ - dir = 1 - }, -/obj/structure/railing/mapped{ - layer = 9.1 - }, +/obj/structure/railing/mapped, /turf/simulated/floor/asphalt, /area/konyang_landing_zone) "Yd" = ( @@ -3705,13 +3754,14 @@ /turf/simulated/floor/asphalt, /area/konyang_landing_zone) "ZR" = ( -/obj/structure/ledge/quarter{ - dir = 4 +/obj/effect/decal/curb{ + dir = 5 }, -/obj/structure/utility_pole/street/on{ +/obj/effect/decal/road_marking/reflector{ dir = 8 }, -/turf/simulated/floor/exoplanet/water/konyang, +/obj/structure/crane/body, +/turf/simulated/floor/asphalt, /area/konyang_landing_zone) "ZW" = ( /turf/simulated/wall, @@ -4268,7 +4318,7 @@ Wz VD VD VD -ZR +VD mW rS rS @@ -4321,7 +4371,7 @@ gF gF gF gF -gF +Bh gF gF gF @@ -4368,7 +4418,7 @@ On Og Og Og -gj +ZR ae By ae @@ -4482,7 +4532,7 @@ Jh Zy lM vX -Ua +nD ae ae ae @@ -4763,9 +4813,22 @@ uy vy HZ TY +RT FR FR -FR +jH +jH +Tp +jH +jH +jH +jH +Tp +jH +jH +jH +jH +Tp jH jH jH @@ -4773,25 +4836,12 @@ jH jH jH jH +Tp jH jH jH jH -jH -jH -jH -jH -jH -jH -jH -jH -jH -jH -jH -jH -jH -jH -FR +RT FR FR ae @@ -4825,17 +4875,6 @@ Ha Ha Ha Ha -as -Ha -Ha -Ha -Ha -as -Ha -Ha -Ha -Ha -as Ha Ha Ha @@ -4843,12 +4882,23 @@ Ha Ha Ha Ha -as Ha Ha Ha Ha -as +Ha +Ha +Ha +Ha +Ha +Ha +Ha +Ha +Ha +Ha +Ha +Ha +Ha Ha EB ae @@ -4858,7 +4908,7 @@ ae Xr fV ta -fI +VD VD VD mW @@ -5022,7 +5072,7 @@ FU FU FU XW -RG +ug uy Oz ae @@ -5047,8 +5097,8 @@ xd aa tR ae -RG -GE +GQ +mI FU lb Pq @@ -5200,7 +5250,7 @@ ae YY VP fn -Bh +sL jG jG iX @@ -5250,7 +5300,7 @@ FU FU FU XW -RG +ug uy Oz ae @@ -5275,8 +5325,8 @@ aa vO JG rJ -RG -GE +GQ +mI FU lb Pq @@ -5542,7 +5592,7 @@ ae YY ta VD -fI +VD VD VD mW @@ -5617,8 +5667,8 @@ wR av sp rJ -RG -GE +GQ +mI FU lb Pq @@ -5706,7 +5756,7 @@ FU FU FU XW -RG +hW uy Oz ae @@ -5884,7 +5934,7 @@ ae od VP od -Bh +sL jG jG iX @@ -5934,7 +5984,7 @@ DZ FU FU XW -RG +ug ta xR Ni @@ -5959,8 +6009,8 @@ kj bZ zG rJ -RG -GE +GQ +mI FU Bf mA @@ -6097,12 +6147,12 @@ wE wE wE wE -GQ wE wE wE wE -GQ +wE +wE wE vn ae @@ -6154,12 +6204,12 @@ gF gF gF gF +Bh gF gF gF gF -gF -Lr +fI Lr Lr ae @@ -6193,12 +6243,12 @@ wE wE wE wE -GQ wE wE wE wE -GQ +wE +wE wE wE RC @@ -6211,12 +6261,12 @@ ae ae Xs Xs +GE Xs Xs Xs Xs -Xs -Xs +GE Xs Xs Xs @@ -6245,22 +6295,22 @@ ac di rJ ae +fI Lr Lr -Lr +Dy +Dy +Rs Dy Dy Dy Dy -Dy -Dy -Dy -eS +as eS eS dC MH -MH +GL jH JD yn @@ -6268,12 +6318,12 @@ LY dw cm Tz -GL -Tz cm Tz cm -hW +Tz +cm +Tz cm Tz cm diff --git a/maps/random_ruins/exoplanets/konyang/telecomms_outpost.dmm b/maps/random_ruins/exoplanets/konyang/telecomms_outpost.dmm index ac8b3696aae..13ce5aa91e2 100644 --- a/maps/random_ruins/exoplanets/konyang/telecomms_outpost.dmm +++ b/maps/random_ruins/exoplanets/konyang/telecomms_outpost.dmm @@ -306,7 +306,7 @@ /area/konyang_telecomms_outpost) "pw" = ( /obj/effect/decal/road_marking/thin, -/obj/machinery/mech_recharger/automobile, +/obj/machinery/mech_recharger, /obj/vehicle/bike/speeder{ dir = 8 }, @@ -422,7 +422,7 @@ /area/konyang_telecomms_outpost) "wj" = ( /obj/effect/decal/road_marking/thin, -/obj/machinery/mech_recharger/automobile, +/obj/machinery/mech_recharger, /turf/simulated/floor/exoplanet/asphalt, /area/konyang_telecomms_outpost) "wz" = ( @@ -432,7 +432,7 @@ "wG" = ( /obj/structure/chainlink_fence, /obj/structure/flora/bush/konyang_reeds, -/obj/structure/road_sign/yield{ +/obj/structure/street_sign/yield{ name = "NO TRESPASSING sign"; desc = "A sign which declares this area as SCC property and staunchly declines any thought of trespassing." }, @@ -716,14 +716,7 @@ /turf/simulated/floor/exoplanet/lino/diamond, /area/konyang_telecomms_outpost) "Nh" = ( -/obj/effect/decal/fake_object{ - density = 1; - desc = "A bland air conditioning unit."; - icon = 'icons/effects/city.dmi'; - icon_state = "ac"; - layer = 2.7; - name = "AC unit" - }, +/obj/structure/ac_unit, /turf/simulated/floor/bluegrid/cooled, /area/konyang_telecomms_outpost) "Nm" = ( @@ -799,7 +792,7 @@ /area/konyang_telecomms_outpost) "Qe" = ( /obj/structure/chainlink_fence, -/obj/structure/road_sign/yield{ +/obj/structure/street_sign/yield{ name = "NO TRESPASSING sign"; desc = "A sign which declares this area as SCC property and staunchly declines any thought of trespassing." }, @@ -920,7 +913,7 @@ /area/konyang_telecomms_outpost) "Vi" = ( /obj/effect/decal/road_marking/thin, -/obj/machinery/mech_recharger/automobile, +/obj/machinery/mech_recharger, /obj/vehicle/bike/speeder{ dir = 4 }, @@ -1004,13 +997,8 @@ /area/konyang_telecomms_outpost) "YL" = ( /obj/structure/table/wood, -/obj/effect/decal/fake_object{ - desc = "An expensive flatscreen holo-television. This one's connection to the extranet seems to be severed."; - dir = 4; - icon = 'icons/effects/city.dmi'; - icon_state = "flatscreen"; +/obj/structure/television{ layer = 6.1; - name = "expensive flatscreen holovision"; pixel_y = 15 }, /turf/simulated/floor/exoplanet/lino/diamond, diff --git a/maps/random_ruins/exoplanets/konyang/village.dmm b/maps/random_ruins/exoplanets/konyang/village.dmm index 9438a393717..c1c92dd6cfb 100644 --- a/maps/random_ruins/exoplanets/konyang/village.dmm +++ b/maps/random_ruins/exoplanets/konyang/village.dmm @@ -36,10 +36,11 @@ /turf/simulated/floor/tiled/white, /area/konyang_village) "aP" = ( -/obj/structure/chainlink_fence{ - dir = 4 - }, /obj/structure/flora/rock/konyang, +/obj/structure/chainlink_fence{ + dir = 8; + pixel_x = -16 + }, /turf/simulated/floor/exoplanet/dirt_konyang, /area/konyang_village) "aV" = ( @@ -93,10 +94,11 @@ /turf/simulated/floor/exoplanet/dirt_konyang, /area/konyang_village) "bU" = ( -/obj/structure/chainlink_fence{ - dir = 4 - }, /obj/structure/flora/bush/konyang_reeds, +/obj/structure/chainlink_fence{ + dir = 8; + pixel_x = -16 + }, /turf/simulated/floor/exoplanet/konyang, /area/konyang_village) "bV" = ( @@ -117,7 +119,8 @@ /area/konyang_village) "cd" = ( /obj/structure/chainlink_fence{ - dir = 4 + dir = 4; + pixel_x = 16 }, /obj/random/dirt_75, /obj/random/junk{ @@ -126,12 +129,12 @@ /turf/simulated/floor/sidewalk/blocks, /area/konyang_village) "dc" = ( +/obj/structure/flora/rock/konyang, /obj/structure/chainlink_fence{ layer = 9.1; dir = 1 }, -/obj/structure/flora/bush/konyang_reeds, -/turf/simulated/floor/exoplanet/konyang, +/turf/simulated/floor/exoplanet/dirt_konyang, /area/konyang_village) "de" = ( /obj/structure/table/rack/clothing{ @@ -224,32 +227,29 @@ /turf/simulated/floor/lino/diamond, /area/konyang_village) "fa" = ( -/obj/structure/chainlink_fence{ - layer = 9.1; - dir = 1 - }, -/obj/structure/chainlink_fence{ - dir = 8 - }, /obj/structure/trash_pile, /obj/random/dirt_75, /obj/random/dirt_75, +/obj/structure/chainlink_fence{ + dir = 8; + pixel_x = -16 + }, /turf/simulated/floor/sidewalk, /area/konyang_village) "fm" = ( /obj/structure/chainlink_fence{ layer = 9.1 }, +/obj/random/dirt_75, +/obj/random/dirt_75, /obj/structure/chainlink_fence{ - dir = 8 + dir = 8; + pixel_x = -16 }, -/obj/random/dirt_75, -/obj/random/dirt_75, /turf/simulated/floor/sidewalk, /area/konyang_village) "fD" = ( /obj/structure/lattice/catwalk/indoor/planks/deep, -/obj/structure/light_pole/konyang/left, /obj/structure/bed/stool/chair/wood{ dir = 4 }, @@ -356,13 +356,14 @@ /turf/simulated/floor/wood, /area/konyang_village) "hQ" = ( -/obj/structure/chainlink_fence{ - dir = 8 - }, /obj/structure/chainlink_fence{ layer = 9.1; dir = 1 }, +/obj/structure/chainlink_fence{ + dir = 8; + pixel_x = -16 + }, /turf/simulated/floor/exoplanet/konyang, /area/konyang_village) "hT" = ( @@ -390,10 +391,11 @@ /turf/simulated/floor/exoplanet/konyang, /area/konyang_village) "iI" = ( -/obj/structure/chainlink_fence{ - dir = 4 - }, /obj/random/dirt_75, +/obj/structure/chainlink_fence{ + dir = 4; + pixel_x = 16 + }, /turf/simulated/floor/sidewalk, /area/konyang_village) "iP" = ( @@ -462,10 +464,11 @@ /turf/simulated/floor/tiled/white, /area/konyang_village) "ll" = ( -/obj/structure/chainlink_fence{ - dir = 8 - }, /obj/random/dirt_75, +/obj/structure/chainlink_fence{ + dir = 8; + pixel_x = -16 + }, /turf/simulated/floor/sidewalk, /area/konyang_village) "lR" = ( @@ -558,10 +561,6 @@ /turf/simulated/floor/wood, /area/konyang_village) "nu" = ( -/obj/structure/chainlink_fence{ - layer = 9.1; - dir = 1 - }, /obj/structure/closet/crate/bin/urban/dumpster, /obj/random/dirt_75, /obj/random/dirt_75, @@ -657,13 +656,6 @@ }, /turf/simulated/floor/exoplanet/dirt_konyang, /area/konyang_village) -"oF" = ( -/obj/structure/chainlink_fence{ - layer = 9.1; - dir = 1 - }, -/turf/simulated/floor/sidewalk/blocks, -/area/konyang_village) "oI" = ( /obj/structure/chainlink_fence{ layer = 9.1 @@ -705,10 +697,11 @@ /turf/simulated/floor/concrete/square, /area/konyang_village) "pX" = ( -/obj/structure/chainlink_fence{ - dir = 8 - }, /obj/structure/flora/rock/konyang/small, +/obj/structure/chainlink_fence{ + dir = 8; + pixel_x = -16 + }, /turf/simulated/floor/exoplanet/dirt_konyang, /area/konyang_village) "qL" = ( @@ -752,7 +745,8 @@ /area/konyang_village) "rl" = ( /obj/structure/chainlink_fence{ - dir = 8 + dir = 8; + pixel_x = -16 }, /turf/simulated/floor/exoplanet/dirt_konyang, /area/konyang_village) @@ -864,10 +858,6 @@ /turf/simulated/floor/lino/diamond, /area/konyang_village) "uN" = ( -/obj/structure/chainlink_fence{ - layer = 9.1; - dir = 1 - }, /obj/structure/closet/crate/trashcart, /obj/random/dirt_75, /obj/random/dirt_75, @@ -951,22 +941,23 @@ /turf/simulated/floor/sidewalk, /area/konyang_village) "wt" = ( +/obj/structure/flora/bush/konyang_reeds, /obj/structure/chainlink_fence{ layer = 9.1; dir = 1 }, -/obj/random/dirt_75, -/turf/simulated/floor/sidewalk/blocks, +/turf/simulated/floor/exoplanet/konyang, /area/konyang_village) "wB" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/exoplanet/dirt_konyang, /area/konyang_village) "xg" = ( -/obj/structure/chainlink_fence{ - dir = 8 - }, /obj/random/dirt_75, +/obj/structure/chainlink_fence{ + dir = 8; + pixel_x = -16 + }, /turf/simulated/floor/exoplanet/dirt_konyang, /area/konyang_village) "xo" = ( @@ -1026,6 +1017,10 @@ /obj/structure/chainlink_fence{ dir = 8 }, +/obj/structure/chainlink_fence{ + dir = 8; + pixel_x = -16 + }, /turf/simulated/floor/exoplanet/konyang, /area/konyang_village) "yI" = ( @@ -1093,7 +1088,8 @@ /area/konyang_village) "At" = ( /obj/structure/chainlink_fence{ - dir = 8 + dir = 8; + pixel_x = -16 }, /obj/random/dirt_75, /obj/random/dirt_75, @@ -1339,9 +1335,11 @@ layer = 9.1; dir = 1 }, -/obj/random/dirt_75, -/obj/random/dirt_75, -/turf/simulated/floor/sidewalk/blocks, +/obj/structure/chainlink_fence{ + dir = 4; + pixel_x = 16 + }, +/turf/simulated/floor/exoplanet/dirt_konyang, /area/konyang_village) "JJ" = ( /obj/structure/table/rack, @@ -1496,12 +1494,12 @@ /obj/structure/chainlink_fence{ dir = 4 }, -/obj/structure/chainlink_fence{ - layer = 9.1; - dir = 1 - }, /obj/structure/trash_pile, /obj/random/dirt_75, +/obj/structure/chainlink_fence{ + dir = 4; + pixel_x = 16 + }, /turf/simulated/floor/sidewalk, /area/konyang_village) "Nc" = ( @@ -1540,6 +1538,10 @@ /obj/structure/table/stone/marble, /turf/simulated/floor/lino/diamond, /area/konyang_village) +"Oq" = ( +/obj/structure/light_pole/konyang/left, +/turf/simulated/floor/exoplanet/konyang, +/area/konyang_village) "Ow" = ( /obj/structure/bed/padded, /obj/item/bedsheet/dorms, @@ -1719,7 +1721,7 @@ layer = 9.1; dir = 1 }, -/turf/simulated/floor/sidewalk, +/turf/simulated/floor/exoplanet/dirt_konyang, /area/konyang_village) "SD" = ( /turf/simulated/floor/exoplanet/konyang, @@ -2500,7 +2502,7 @@ SD (15,1,1) = {" SD SD -SD +hQ fa At fm @@ -2542,7 +2544,7 @@ SD (16,1,1) = {" SD SD -ys +SA nu vS gk @@ -2626,7 +2628,7 @@ SD (18,1,1) = {" NF Tl -ys +SA uN xU VV @@ -2668,7 +2670,7 @@ SD (19,1,1) = {" ys ys -ys +Jh Mx cd iI @@ -2713,8 +2715,8 @@ SD UB ys ys -ys -Jh +SA +VV Cg xY BJ @@ -2755,8 +2757,8 @@ SD SD ys Tl -ys -Jh +SA +VV VC dq dq @@ -2797,8 +2799,8 @@ SD SD SD SD -ys -wt +SA +aH UB BJ SD @@ -2839,8 +2841,8 @@ SD SD SD NF -ys -wt +SA +aH JS NF SD @@ -2881,8 +2883,8 @@ SD vF SD NF -ys -oF +SA +Kv ys oe SD @@ -2923,13 +2925,13 @@ SD SD SD NF -UB -SA +dc +fF pn Ui SD SD -SD +Oq Bb KO KO @@ -2965,8 +2967,8 @@ SD PB SD SD -SD DA +SD PB aH SD @@ -3007,8 +3009,8 @@ NF SD SD Li -NF -DA +wt +SD SD aH NF @@ -3049,8 +3051,8 @@ NF SD SD SD -NF -DA +wt +SD SD pn SD @@ -3091,8 +3093,8 @@ NF NF SD SD +wt NF -dc SD pn SD @@ -3133,8 +3135,8 @@ NF SD SD ys -ys -DA +SA +SD SD fF SD @@ -3217,11 +3219,11 @@ SD Li SD SD -SD DA SD SD SD +SD KO SY Lg @@ -3259,9 +3261,9 @@ vF SD Hg SD -SD DA SD +SD vF NF KO diff --git a/maps/random_ruins/exoplanets/konyang/zombie_outpost.dmm b/maps/random_ruins/exoplanets/konyang/zombie_outpost.dmm index 76c22a8f153..af61c0548a0 100644 --- a/maps/random_ruins/exoplanets/konyang/zombie_outpost.dmm +++ b/maps/random_ruins/exoplanets/konyang/zombie_outpost.dmm @@ -2,7 +2,7 @@ "ac" = ( /obj/structure/chainlink_fence, /obj/structure/flora/bush/konyang_reeds, -/obj/structure/road_sign/yield{ +/obj/structure/street_sign/yield{ name = "NO TRESPASSING sign"; desc = "A sign which declares this area as SCC property and staunchly declines any thought of trespassing." }, @@ -303,14 +303,7 @@ /turf/simulated/floor/exoplanet/lino/diamond, /area/konyang_telecomms_outpost) "nt" = ( -/obj/effect/decal/fake_object{ - density = 1; - desc = "A bland air conditioning unit."; - icon = 'icons/effects/city.dmi'; - icon_state = "ac"; - layer = 2.7; - name = "AC unit" - }, +/obj/structure/ac_unit, /turf/simulated/floor/bluegrid/cooled, /area/konyang_telecomms_outpost) "nz" = ( @@ -328,7 +321,7 @@ /area/konyang_telecomms_outpost) "on" = ( /obj/effect/decal/road_marking/thin, -/obj/machinery/mech_recharger/automobile, +/obj/machinery/mech_recharger, /turf/simulated/floor/exoplanet/asphalt, /area/konyang_telecomms_outpost) "oG" = ( @@ -385,7 +378,7 @@ /area/konyang_telecomms_outpost) "rm" = ( /obj/effect/decal/road_marking/thin, -/obj/machinery/mech_recharger/automobile, +/obj/machinery/mech_recharger, /obj/vehicle/bike/speeder{ dir = 4 }, @@ -479,7 +472,7 @@ /area/konyang_telecomms_outpost) "uR" = ( /obj/structure/chainlink_fence, -/obj/structure/road_sign/yield{ +/obj/structure/street_sign/yield{ name = "NO TRESPASSING sign"; desc = "A sign which declares this area as SCC property and staunchly declines any thought of trespassing." }, @@ -569,7 +562,7 @@ /area/konyang_telecomms_outpost) "yr" = ( /obj/effect/decal/road_marking/thin, -/obj/machinery/mech_recharger/automobile, +/obj/machinery/mech_recharger, /obj/vehicle/bike/speeder{ dir = 8 }, diff --git a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm index 6ac25cfaaa7..c8231330a91 100644 --- a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm +++ b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm @@ -35784,13 +35784,8 @@ /area/horizon/holodeck/source_desert) "eFm" = ( /obj/structure/table/wood, -/obj/effect/decal/fake_object{ - desc = "An expensive flatscreen holo-television. This one's connection to the extranet seems to be severed."; - dir = 4; - icon = 'icons/effects/city.dmi'; - icon_state = "flatscreen"; +/obj/structure/television{ layer = 6.1; - name = "expensive flatscreen holovision"; pixel_y = 15 }, /obj/effect/floor_decal/spline/fancy/wood{ @@ -37405,14 +37400,7 @@ layer = 2.4; name = "grate" }, -/obj/effect/decal/fake_object{ - density = 1; - desc = "A bland air conditioning unit."; - icon = 'icons/effects/city.dmi'; - icon_state = "ac"; - layer = 2.7; - name = "AC unit" - }, +/obj/structure/ac_unit, /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 }, @@ -39005,12 +38993,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, -/obj/effect/decal/fake_object{ - desc = "An expensive flatscreen holo-television. This one's connection to the extranet seems to be severed."; - dir = 4; - icon = 'icons/effects/city.dmi'; - icon_state = "flatscreen"; - name = "expensive flatscreen holovision"; +/obj/structure/television{ pixel_y = 15 }, /obj/structure/table/wood, @@ -39600,12 +39583,8 @@ }, /area/horizon/holodeck/source_beach) "sJV" = ( -/obj/effect/decal/fake_object{ - desc = "A Hephaestus Industries Z-Cube! This state-of-the-art gaming console is the premium of the premium. It's almost VR!"; - icon = 'icons/effects/city.dmi'; - icon_state = "gamer_console"; - layer = 2.7; - name = "gaming console" +/obj/structure/console{ + layer = 2.7 }, /obj/effect/floor_decal/spline/fancy/wood{ dir = 8