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 c880af006fc..00000000000 Binary files a/icons/effects/city.dmi and /dev/null differ diff --git a/icons/mecha/mech_bay.dmi b/icons/mecha/mech_bay.dmi index 88eb2324dd2..bd63bffc89f 100644 Binary files a/icons/mecha/mech_bay.dmi and b/icons/mecha/mech_bay.dmi differ diff --git a/icons/obj/signs.dmi b/icons/obj/signs.dmi index 0090244cfcd..d632d61660c 100644 Binary files a/icons/obj/signs.dmi and b/icons/obj/signs.dmi differ diff --git a/icons/obj/structure/64x32_signs.dmi b/icons/obj/structure/64x32_signs.dmi new file mode 100644 index 00000000000..72e2378555e Binary files /dev/null and b/icons/obj/structure/64x32_signs.dmi differ diff --git a/icons/obj/structure/64x64_machinery.dmi b/icons/obj/structure/64x64_machinery.dmi new file mode 100644 index 00000000000..93580bcac19 Binary files /dev/null and b/icons/obj/structure/64x64_machinery.dmi differ diff --git a/icons/obj/structure/64x64_misc.dmi b/icons/obj/structure/64x64_misc.dmi new file mode 100644 index 00000000000..8cb9e203c75 Binary files /dev/null and b/icons/obj/structure/64x64_misc.dmi differ diff --git a/icons/obj/structure/industrial/docks.dmi b/icons/obj/structure/industrial/docks.dmi index 1e430300005..21d751006c2 100644 Binary files a/icons/obj/structure/industrial/docks.dmi and b/icons/obj/structure/industrial/docks.dmi differ diff --git a/icons/obj/structure/industrial/fencing_tall.dmi b/icons/obj/structure/industrial/fencing_tall.dmi deleted file mode 100644 index 5050e5d69b6..00000000000 Binary files a/icons/obj/structure/industrial/fencing_tall.dmi and /dev/null differ diff --git a/icons/obj/structure/industrial/infrastructure.dmi b/icons/obj/structure/industrial/infrastructure.dmi index 6f0572cb166..73311ae0139 100644 Binary files a/icons/obj/structure/industrial/infrastructure.dmi and b/icons/obj/structure/industrial/infrastructure.dmi differ diff --git a/icons/obj/structure/miscellaneous.dmi b/icons/obj/structure/miscellaneous.dmi new file mode 100644 index 00000000000..cd749cfc9bc Binary files /dev/null and b/icons/obj/structure/miscellaneous.dmi differ diff --git a/icons/obj/structure/obstacles/obstacles.dmi b/icons/obj/structure/obstacles/obstacles.dmi new file mode 100644 index 00000000000..d80c53dd47f Binary files /dev/null and b/icons/obj/structure/obstacles/obstacles.dmi differ diff --git a/icons/obj/structure/urban/infrastructure.dmi b/icons/obj/structure/urban/infrastructure.dmi index 2d8cc776618..cac4b4ce61c 100644 Binary files a/icons/obj/structure/urban/infrastructure.dmi and b/icons/obj/structure/urban/infrastructure.dmi differ diff --git a/icons/obj/structure/urban/konyang_signs.dmi b/icons/obj/structure/urban/konyang_signs.dmi deleted file mode 100644 index 480e453137e..00000000000 Binary files a/icons/obj/structure/urban/konyang_signs.dmi and /dev/null differ diff --git a/icons/obj/structure/urban/misc_64x64.dmi b/icons/obj/structure/urban/misc_64x64.dmi deleted file mode 100644 index 32f3cad1fe2..00000000000 Binary files a/icons/obj/structure/urban/misc_64x64.dmi and /dev/null differ diff --git a/icons/obj/structure/urban/poles.dmi b/icons/obj/structure/urban/poles.dmi deleted file mode 100644 index a3c7854c725..00000000000 Binary files a/icons/obj/structure/urban/poles.dmi and /dev/null differ diff --git a/icons/obj/structure/urban/restaurant.dmi b/icons/obj/structure/urban/restaurant.dmi index 5b7001b8118..aea3e91b41a 100644 Binary files a/icons/obj/structure/urban/restaurant.dmi and b/icons/obj/structure/urban/restaurant.dmi differ diff --git a/icons/obj/structure/urban/road_edges.dmi b/icons/obj/structure/urban/road_edges.dmi index b4686ef9227..a719b0ec889 100644 Binary files a/icons/obj/structure/urban/road_edges.dmi and b/icons/obj/structure/urban/road_edges.dmi differ diff --git a/icons/obj/structure/urban/road_signs.dmi b/icons/obj/structure/urban/road_signs.dmi deleted file mode 100644 index f9e73d20dc3..00000000000 Binary files a/icons/obj/structure/urban/road_signs.dmi and /dev/null differ diff --git a/icons/obj/structure/urban/street_signs.dmi b/icons/obj/structure/urban/street_signs.dmi new file mode 100644 index 00000000000..8a46a59f64f Binary files /dev/null and b/icons/obj/structure/urban/street_signs.dmi differ diff --git a/icons/obj/structure/urban/streetpoles.dmi b/icons/obj/structure/urban/streetpoles.dmi new file mode 100644 index 00000000000..5775fea2441 Binary files /dev/null and b/icons/obj/structure/urban/streetpoles.dmi differ 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