diff --git a/aurorastation.dme b/aurorastation.dme index ab73e507855..7c9fbb29894 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1257,7 +1257,6 @@ #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 7ddec13dd16..2eb32bc5525 100644 --- a/code/game/machinery/mech_recharger.dm +++ b/code/game/machinery/mech_recharger.dm @@ -129,3 +129,9 @@ /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 0276543a71c..688bc0e8aa5 100644 --- a/code/game/objects/structures/coastal.dm +++ b/code/game/objects/structures/coastal.dm @@ -1,3 +1,14 @@ +/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." @@ -23,4 +34,14 @@ icon_state = "radio_ship" anchored = TRUE density = TRUE - layer = ABOVE_ALL_MOB_LAYER + 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 diff --git a/code/game/objects/structures/decorative.dm b/code/game/objects/structures/decorative.dm deleted file mode 100644 index 3c8b83f4230..00000000000 --- a/code/game/objects/structures/decorative.dm +++ /dev/null @@ -1,89 +0,0 @@ -/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 07eb045ab9a..dfbd2a05b9e 100644 --- a/code/game/objects/structures/light_pole.dm +++ b/code/game/objects/structures/light_pole.dm @@ -16,30 +16,26 @@ /obj/structure/light_pole/konyang name = "dangling lamp" desc = "A flame-lit lamp dangling precariously from a tall pole." - icon = 'icons/obj/structure/urban/streetpoles.dmi' - icon_state = "lamp" - layer = ABOVE_ALL_MOB_LAYER + icon = 'icons/obj/structure/urban/poles.dmi' + icon_state = "right_lamp" + layer = 9.1 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 - dir = NORTH + icon_state = "left_lamp" /obj/structure/utility_pole name = "tall pole" desc = "A very tall utility pole for urban infrastructure." - icon = 'icons/obj/structure/urban/streetpoles.dmi' + icon = 'icons/obj/structure/urban/poles.dmi' icon_state = "junction" - layer = ABOVE_ALL_MOB_LAYER + layer = 9 anchored = TRUE - pixel_x = -32 - pixel_y = 8 /obj/structure/utility_pole/gwok name = "Go Go Gwok street sign" @@ -47,52 +43,38 @@ icon = 'icons/obj/structure/urban/konyang64x96.dmi' icon_state = "nice_gwok" -// street lights - /obj/structure/utility_pole/street - 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" + desc = "A tall light source. This one seems to be off." + icon = 'icons/obj/structure/urban/poles.dmi' + icon_state = "street" -/obj/structure/utility_pole/street/on - light_wedge = LIGHT_OMNI - light_color = "#e8ffeb" - light_range = 8 - light_power = 1.9 - -/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 + 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 = TRUE + density = 1 + +/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/classic + icon_state = "classic_lamp" /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 @@ -130,7 +112,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 = "trafficlight" + icon_state = "traffic" light_color = LIGHT_COLOR_HALOGEN light_range = 3.1 light_power = 2.6 @@ -157,11 +139,9 @@ /obj/effect/overlay/overhead_line name = "overhead utility line" - icon = 'icons/obj/structure/urban/streetpoles.dmi' + icon = 'icons/obj/structure/urban/poles.dmi' icon_state = "line" - layer = ABOVE_ALL_MOB_LAYER - pixel_x = -32 - pixel_y = 8 + layer = 9.1 /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 a158d74a4f4..429419916eb 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -625,59 +625,3 @@ 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 cd8fcac5b36..959111ca8fd 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 = ABOVE_ALL_MOB_LAYER + layer = 7 /obj/structure/automobile/random/Initialize(mapload) . = ..() @@ -28,105 +28,44 @@ anchored = TRUE density = TRUE -// Street Signs - -/obj/structure/street_sign +/obj/structure/road_sign name = "stop sign" desc = "A stop sign to direct traffic. Sometimes a demand." - icon = 'icons/obj/structure/urban/street_signs.dmi' + icon = 'icons/obj/structure/urban/road_signs.dmi' icon_state = "stop" - layer = ABOVE_ALL_MOB_LAYER + layer = 9 anchored = TRUE -/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 +/obj/structure/road_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/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/pedestrian + name = "pedestrian passing sign" + desc = "A yellow sign which alerts you of bonus points ahead." + icon_state = "pedestrian" -/obj/structure/street_sign/directional +/obj/structure/road_sign/turn name = "turn ahead sign" - desc = "A directional sign. How the turntables..." - icon_state = "directional" + desc = "A sign which warns of an approaching turn to the right. Is it the right choice?" + icon_state = "right" -/obj/structure/street_sign/directional/yellow - icon_state = "directional_yellow" +/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/street +/obj/structure/road_sign/street name = "street sign" - desc = "A street sign. As common as they are, sometimes people still get lost." - icon_state = "street" + desc = "A green, wide street sign with words telling you that you are indeed on a street." + icon_state = "street_big" var/street_name = null -/obj/structure/street_sign/street/Initialize(mapload) +/obj/structure/road_sign/street/Initialize(mapload) . = ..() name = "[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 + desc = "This sign indicates this crossing street is called [street_name]." /obj/structure/stairs/urban icon = 'icons/obj/structure/urban/ledges.dmi' @@ -174,6 +113,16 @@ /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." @@ -227,6 +176,13 @@ 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." @@ -241,7 +197,7 @@ icon = 'icons/obj/structure/urban/konyang_neon.dmi' icon_state = "sign1" anchored = TRUE - layer = ABOVE_ALL_MOB_LAYER + layer = 7 /obj/structure/shipping_container name = "freight container" @@ -250,13 +206,13 @@ icon_state = "blue1" anchored = TRUE density = TRUE - layer = ABOVE_ALL_MOB_LAYER + layer = 7 /obj/effect/overlay/container_logo name = "Hephaestus Industries emblem" icon = 'icons/obj/structure/industrial/shipping_containers.dmi' icon_state = "heph1" - layer = 4.6 + layer = 7.01 /obj/effect/overlay/container_logo/einstein name = "Einstein Engines emblem" @@ -275,7 +231,7 @@ density = TRUE throwpass = TRUE climbable = TRUE - layer = ABOVE_MOB_LAYER + layer = 4.01 anchored = TRUE /obj/structure/rod_railing/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) @@ -306,7 +262,7 @@ density = TRUE throwpass = TRUE anchored = TRUE - layer = ABOVE_MOB_LAYER + layer = 4.01 /obj/structure/road_barrier name = "roadway barrier" @@ -317,7 +273,7 @@ throwpass = TRUE climbable = TRUE anchored = TRUE - layer = ABOVE_MOB_LAYER + layer = 4.01 //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 @@ -353,28 +309,16 @@ return TRUE /obj/structure/chainlink_fence - name = "chainlink fence" + name = "chainlink industrial fencing" desc = "A tall, imposing metal fence. Not to be confused with the slightly more popular Chainlink of recent years." - icon = 'icons/obj/structure/obstacles/obstacles.dmi' + icon = 'icons/obj/structure/industrial/fencing_tall.dmi' density = TRUE - icon_state = "normal_fence" + icon_state = "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 @@ -449,6 +393,13 @@ 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." @@ -470,6 +421,23 @@ 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." @@ -498,6 +466,37 @@ 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 23c0f6229e6..8b55de835f5 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/trophy.dmi' + icon = 'icons/obj/item/reagent_containers/food/drinks/bottle.dmi' icon_state = "pewter_cup" w_class = ITEMSIZE_TINY force = 1 diff --git a/icons/effects/city.dmi b/icons/effects/city.dmi new file mode 100644 index 00000000000..c880af006fc Binary files /dev/null and b/icons/effects/city.dmi differ diff --git a/icons/mecha/mech_bay.dmi b/icons/mecha/mech_bay.dmi index bd63bffc89f..88eb2324dd2 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 d632d61660c..0090244cfcd 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 deleted file mode 100644 index 72e2378555e..00000000000 Binary files a/icons/obj/structure/64x32_signs.dmi and /dev/null differ diff --git a/icons/obj/structure/64x64_machinery.dmi b/icons/obj/structure/64x64_machinery.dmi deleted file mode 100644 index 93580bcac19..00000000000 Binary files a/icons/obj/structure/64x64_machinery.dmi and /dev/null differ diff --git a/icons/obj/structure/64x64_misc.dmi b/icons/obj/structure/64x64_misc.dmi deleted file mode 100644 index 8cb9e203c75..00000000000 Binary files a/icons/obj/structure/64x64_misc.dmi and /dev/null differ diff --git a/icons/obj/structure/industrial/docks.dmi b/icons/obj/structure/industrial/docks.dmi index 21d751006c2..1e430300005 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 new file mode 100644 index 00000000000..5050e5d69b6 Binary files /dev/null and b/icons/obj/structure/industrial/fencing_tall.dmi differ diff --git a/icons/obj/structure/industrial/infrastructure.dmi b/icons/obj/structure/industrial/infrastructure.dmi index 73311ae0139..6f0572cb166 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 deleted file mode 100644 index cd749cfc9bc..00000000000 Binary files a/icons/obj/structure/miscellaneous.dmi and /dev/null differ diff --git a/icons/obj/structure/obstacles/obstacles.dmi b/icons/obj/structure/obstacles/obstacles.dmi deleted file mode 100644 index d80c53dd47f..00000000000 Binary files a/icons/obj/structure/obstacles/obstacles.dmi and /dev/null differ diff --git a/icons/obj/structure/urban/infrastructure.dmi b/icons/obj/structure/urban/infrastructure.dmi index cac4b4ce61c..2d8cc776618 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 new file mode 100644 index 00000000000..480e453137e Binary files /dev/null and b/icons/obj/structure/urban/konyang_signs.dmi differ diff --git a/icons/obj/structure/urban/misc_64x64.dmi b/icons/obj/structure/urban/misc_64x64.dmi new file mode 100644 index 00000000000..32f3cad1fe2 Binary files /dev/null and b/icons/obj/structure/urban/misc_64x64.dmi differ diff --git a/icons/obj/structure/urban/poles.dmi b/icons/obj/structure/urban/poles.dmi new file mode 100644 index 00000000000..a3c7854c725 Binary files /dev/null and b/icons/obj/structure/urban/poles.dmi differ diff --git a/icons/obj/structure/urban/restaurant.dmi b/icons/obj/structure/urban/restaurant.dmi index aea3e91b41a..5b7001b8118 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 a719b0ec889..b4686ef9227 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 new file mode 100644 index 00000000000..f9e73d20dc3 Binary files /dev/null and b/icons/obj/structure/urban/road_signs.dmi differ diff --git a/icons/obj/structure/urban/street_signs.dmi b/icons/obj/structure/urban/street_signs.dmi deleted file mode 100644 index 8a46a59f64f..00000000000 Binary files a/icons/obj/structure/urban/street_signs.dmi and /dev/null differ diff --git a/icons/obj/structure/urban/streetpoles.dmi b/icons/obj/structure/urban/streetpoles.dmi deleted file mode 100644 index 5775fea2441..00000000000 Binary files a/icons/obj/structure/urban/streetpoles.dmi and /dev/null 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 c0d79d3a71c..8656245c6ff 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,11 +14,6 @@ /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, @@ -45,7 +40,7 @@ }, /obj/structure/utility_pole/street/on{ dir = 8; - pixel_x = -18 + pixel_x = -6 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -82,8 +77,7 @@ /obj/random/dirt_75, /obj/random/dirt_75, /obj/structure/utility_pole/street/on{ - dir = 1; - pixel_y = -8 + dir = 1 }, /turf/simulated/floor/sidewalk/blocks, /area/point_verdant/outdoors) @@ -569,8 +563,7 @@ "bL" = ( /obj/random/dirt_75, /obj/structure/utility_pole/street/on{ - dir = 1; - pixel_y = -8 + dir = 1 }, /turf/simulated/floor/sidewalk/blocks, /area/point_verdant/outdoors) @@ -596,7 +589,7 @@ /turf/simulated/floor/lino/diamond, /area/point_verdant/interior/hotel) "bQ" = ( -/obj/structure/street_sign/yield{ +/obj/structure/road_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." @@ -607,7 +600,7 @@ "bR" = ( /obj/structure/utility_pole/street/on{ dir = 8; - pixel_x = -18 + pixel_x = -6 }, /obj/effect/decal/road_marking{ dir = 4 @@ -661,8 +654,7 @@ /turf/simulated/floor/sidewalk/flat, /area/point_verdant/interior) "bX" = ( -/obj/structure/street_sign/warnings{ - dir = 4; +/obj/structure/road_sign/pedestrian{ pixel_x = -16 }, /turf/simulated/floor/sidewalk, @@ -2066,8 +2058,7 @@ /area/point_verdant/interior/tunnels) "gt" = ( /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 + dir = 8 }, /obj/structure/ledge{ dir = 1 @@ -2634,13 +2625,6 @@ }, /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; @@ -2867,10 +2851,6 @@ /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, @@ -3114,7 +3094,7 @@ /obj/effect/decal/exterior_stairs/half{ dir = 1 }, -/obj/structure/sign/staff{ +/obj/structure/sign/urban/staff{ pixel_y = 19; pixel_x = -1; layer = 9 @@ -3181,8 +3161,7 @@ dir = 1 }, /obj/structure/utility_pole/street/on{ - dir = 1; - pixel_y = -8 + dir = 1 }, /obj/structure/road_barrier/bot_end{ dir = 1; @@ -3868,7 +3847,7 @@ /turf/simulated/floor/sidewalk/blocks, /area/point_verdant/outdoors) "lz" = ( -/obj/structure/sign/restroom, +/obj/structure/sign/urban/restroom, /turf/simulated/wall, /area/point_verdant/interior/bar) "lA" = ( @@ -4801,7 +4780,7 @@ }, /obj/structure/utility_pole/street/on{ dir = 8; - pixel_x = -18 + pixel_x = -6 }, /obj/random/dirt_75, /turf/simulated/floor/asphalt, @@ -5244,8 +5223,7 @@ dir = 1 }, /obj/structure/utility_pole/street/on{ - dir = 1; - pixel_y = -8 + dir = 1 }, /turf/simulated/floor/asphalt, /area/point_verdant/interior/tunnels) @@ -5274,8 +5252,7 @@ dir = 1 }, /obj/structure/utility_pole/street/on{ - dir = 1; - pixel_y = -8 + dir = 1 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -5545,8 +5522,7 @@ layer = 9.1 }, /obj/structure/utility_pole/street/on{ - dir = 1; - pixel_y = -8 + dir = 1 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -6249,10 +6225,6 @@ /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{ @@ -6461,8 +6433,7 @@ pixel_y = -16 }, /obj/structure/utility_pole/street/on{ - dir = 8; - pixel_x = -18 + dir = 8 }, /turf/simulated/floor/concrete, /area/point_verdant/outdoors) @@ -6822,11 +6793,10 @@ dir = 1 }, /obj/structure/utility_pole/street/on{ - dir = 1; - pixel_y = -8 + dir = 1 }, /obj/structure/chainlink_fence{ - pixel_y = -32 + layer = 9.1 }, /turf/simulated/floor/asphalt, /area/point_verdant/interior/tunnels) @@ -7063,9 +7033,7 @@ /obj/effect/decal/curb{ dir = 1 }, -/obj/structure/chainlink_fence{ - pixel_y = -32 - }, +/obj/structure/chainlink_fence, /turf/simulated/floor/asphalt, /area/point_verdant/interior/tunnels) "vz" = ( @@ -8888,8 +8856,7 @@ dir = 8 }, /obj/structure/utility_pole/street/on{ - dir = 8; - pixel_x = -18 + dir = 8 }, /turf/simulated/floor/asphalt, /area/point_verdant/interior/tunnels) @@ -9467,8 +9434,7 @@ dir = 1 }, /obj/structure/utility_pole/street/on{ - dir = 1; - pixel_y = -8 + dir = 1 }, /obj/random/dirt_75, /turf/simulated/floor/asphalt, @@ -9545,8 +9511,7 @@ dir = 1 }, /obj/structure/utility_pole/street/on{ - dir = 1; - pixel_y = -8 + dir = 1 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -10324,10 +10289,6 @@ }, /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{ @@ -10599,7 +10560,7 @@ /turf/simulated/floor/sidewalk/flat, /area/point_verdant/interior/tunnels) "GB" = ( -/obj/structure/street_sign/yield{ +/obj/structure/road_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." @@ -11333,16 +11294,18 @@ /turf/simulated/floor/exoplanet/water/konyang, /area/point_verdant/water/deep) "Iq" = ( +/obj/effect/decal/road_marking{ + dir = 4 + }, /obj/effect/decal/curb{ - dir = 1 + dir = 8 }, /obj/structure/utility_pole/street/on{ - dir = 1; - pixel_y = -8; - layer = 4.6 + dir = 8; + pixel_x = -6 }, /turf/simulated/floor/asphalt, -/area/point_verdant/outdoors) +/area/point_verdant/interior/tunnels) "Ir" = ( /turf/simulated/wall/r_wall, /area/point_verdant/interior/police) @@ -11933,13 +11896,6 @@ "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) @@ -13062,8 +13018,7 @@ /area/point_verdant/interior/hotel) "Nw" = ( /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 + dir = 8 }, /obj/effect/decal/curb{ dir = 4 @@ -13320,7 +13275,7 @@ dir = 5 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/sign/staff{ +/obj/structure/sign/urban/staff{ pixel_y = 40; layer = 9 }, @@ -13634,7 +13589,7 @@ "Po" = ( /obj/structure/utility_pole/street/on{ dir = 8; - pixel_x = -18 + pixel_x = -6 }, /obj/effect/decal/road_marking{ dir = 4 @@ -13706,8 +13661,7 @@ /area/point_verdant/outdoors) "Pz" = ( /obj/structure/utility_pole/street/on{ - dir = 1; - pixel_y = -8 + dir = 1 }, /turf/simulated/floor/sidewalk/blocks, /area/point_verdant/outdoors) @@ -13963,7 +13917,7 @@ /obj/structure/rod_railing{ dir = 8 }, -/obj/structure/sign/staff{ +/obj/structure/sign/urban/staff{ pixel_y = 42; pixel_x = -29; layer = 9 @@ -14213,7 +14167,8 @@ /obj/effect/decal/curb/corner{ dir = 1 }, -/obj/structure/sign/exit{ +/obj/structure/sign/urban{ + dir = 8; pixel_x = -6; pixel_y = 7 }, @@ -14241,8 +14196,7 @@ "QT" = ( /obj/structure/dock_structure, /obj/structure/utility_pole/street/on{ - dir = 8; - pixel_x = -18 + dir = 8 }, /turf/simulated/floor/concrete, /area/point_verdant/outdoors) @@ -14391,10 +14345,6 @@ /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"; @@ -15300,8 +15250,7 @@ dir = 8 }, /obj/structure/utility_pole/street/on{ - dir = 8; - pixel_x = -18 + dir = 8 }, /obj/random/dirt_75, /turf/simulated/floor/asphalt, @@ -15696,12 +15645,6 @@ /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, @@ -16278,8 +16221,7 @@ "Ww" = ( /obj/structure/dock_structure, /obj/structure/utility_pole/street/on{ - dir = 8; - pixel_x = -18 + dir = 8 }, /obj/item/reagent_containers/glass/bucket/wood{ pixel_y = -2; @@ -16390,8 +16332,7 @@ /area/point_verdant/outdoors) "WM" = ( /obj/structure/utility_pole/street/on{ - dir = 8; - pixel_x = -18 + dir = 8 }, /turf/simulated/floor/concrete, /area/point_verdant/outdoors) @@ -16548,9 +16489,7 @@ /area/point_verdant/interior/police) "Xm" = ( /obj/structure/lattice/catwalk/indoor/urban, -/obj/structure/chainlink_fence{ - pixel_y = -32 - }, +/obj/structure/chainlink_fence, /turf/simulated/floor/exoplanet/water/shallow/konyang, /area/point_verdant/interior/tunnels) "Xn" = ( @@ -17419,20 +17358,13 @@ /obj/effect/decal/exterior_stairs/half{ dir = 1 }, -/obj/structure/sign/staff{ +/obj/structure/sign/urban/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, @@ -57673,10 +57605,10 @@ Ga dN QV As -Kq +oJ yv -UZ -ag +dK +GK yv dK yv @@ -58187,10 +58119,10 @@ Ga dN QV As -ZQ +oJ Ps qZ -id +qZ qZ lW yv @@ -59516,7 +59448,7 @@ qB qB qB qB -Bq +Iq qB qB qB @@ -66432,7 +66364,7 @@ IK Gl Rv fn -Iq +pZ yv ew hm @@ -67439,7 +67371,7 @@ Ga Qo yv yv -Re +yv yv dK IK @@ -67448,7 +67380,7 @@ sP Gl Rv Jc -sQ +Rv nI dK yv @@ -67953,7 +67885,7 @@ Ga Qo yv yv -FF +yv yv yv IK @@ -67962,7 +67894,7 @@ Jc Rv Rv Jc -iI +Rv nI yv yv @@ -68488,7 +68420,7 @@ IK Rv Rv fZ -Iq +pZ 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 14986721151..0e306a91b87 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,13 +77,12 @@ }, /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1; - pixel_y = 32 + dir = 1 }, /turf/simulated/floor/sidewalk/flat, /area/point_verdant/outdoors) "am" = ( -/obj/structure/sign/exit{ +/obj/structure/sign/urban{ dir = 8; pixel_x = -6; pixel_y = 7 @@ -112,7 +111,7 @@ /area/point_verdant/outdoors) "as" = ( /obj/structure/utility_pole/street/on{ - pixel_y = -8 + pixel_y = -3 }, /obj/random/dirt_75, /turf/simulated/floor/sidewalk/blocks, @@ -196,8 +195,7 @@ "aB" = ( /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1; - pixel_y = 32 + dir = 1 }, /obj/effect/step_trigger/thrower{ icon_state = "dir_arrow"; @@ -247,8 +245,7 @@ dir = 4 }, /obj/structure/chainlink_fence{ - dir = 4; - pixel_x = 16 + dir = 4 }, /obj/effect/decal/road_marking{ dir = 4 @@ -375,8 +372,7 @@ dir = 4 }, /obj/structure/chainlink_fence{ - dir = 4; - pixel_x = 16 + dir = 4 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -582,8 +578,7 @@ dir = 4 }, /obj/structure/chainlink_fence{ - dir = 4; - pixel_x = 16 + dir = 4 }, /obj/structure/konyang_cliff{ icon_state = "cliff-west"; @@ -658,8 +653,7 @@ dir = 10 }, /obj/structure/utility_pole/street/on{ - dir = 8; - pixel_x = -24 + dir = 8 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -720,7 +714,7 @@ /area/point_verdant/outdoors) "bV" = ( /obj/structure/utility_pole/street/on{ - pixel_y = -8 + pixel_y = -3 }, /turf/simulated/floor/sidewalk/blocks, /area/point_verdant/outdoors) @@ -882,8 +876,7 @@ }, /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1; - pixel_y = 32 + dir = 1 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -1000,7 +993,7 @@ /turf/simulated/floor/tiled, /area/point_verdant/interior/robotics) "cP" = ( -/obj/structure/sign/restroom{ +/obj/structure/sign/urban/restroom{ pixel_x = 22; pixel_y = -15 }, @@ -1070,8 +1063,7 @@ dir = 1 }, /obj/structure/utility_pole/street/on{ - dir = 1; - pixel_y = -8 + dir = 1 }, /obj/structure/chainlink_fence{ layer = 9.1 @@ -1505,16 +1497,14 @@ /area/point_verdant/outdoors) "eg" = ( /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 + dir = 8 }, /obj/structure/rod_railing, /turf/simulated/floor/concrete, /area/point_verdant/outdoors) "eh" = ( /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 + dir = 8 }, /obj/structure/konyang_cliff{ icon_state = "cliff-east" @@ -1540,8 +1530,7 @@ "ek" = ( /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1; - pixel_y = 32 + dir = 1 }, /obj/effect/step_trigger/thrower{ icon_state = "dir_arrow"; @@ -1867,8 +1856,7 @@ /area/point_verdant/outdoors) "ff" = ( /obj/structure/utility_pole/street/on{ - dir = 8; - pixel_x = -24 + dir = 8 }, /obj/structure/ledge/corner{ dir = 8 @@ -1945,8 +1933,7 @@ /area/point_verdant/interior/shallow) "ft" = ( /obj/structure/utility_pole/street/on{ - dir = 8; - pixel_x = -24 + dir = 8 }, /turf/simulated/floor/sidewalk/flat, /area/point_verdant/outdoors) @@ -2119,8 +2106,7 @@ icon_state = "cliff-west" }, /obj/structure/utility_pole/street/on{ - dir = 8; - pixel_x = -24 + dir = 8 }, /turf/simulated/floor/exoplanet/water/shallow/konyang, /area/point_verdant/outdoors) @@ -2166,7 +2152,7 @@ /turf/simulated/floor/asphalt, /area/point_verdant/water) "fY" = ( -/obj/structure/sign/staff{ +/obj/structure/sign/urban/staff{ pixel_y = 36; layer = 9; pixel_x = -33 @@ -2192,7 +2178,7 @@ /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) "gc" = ( -/obj/structure/sign/restroom{ +/obj/structure/sign/urban/restroom{ pixel_x = 31; pixel_y = 10 }, @@ -2281,16 +2267,14 @@ /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) "gr" = ( -/obj/structure/chainlink_fence{ - layer = 9.1; - dir = 1; - pixel_y = 32 +/obj/structure/konyang_cliff{ + icon_state = "cliff-top1" }, -/obj/effect/decal/curb, +/obj/structure/chainlink_fence, /obj/structure/utility_pole/street/on{ layer = 9.2 }, -/turf/simulated/floor/asphalt, +/turf/simulated/floor/exoplanet/water/shallow/konyang, /area/point_verdant/outdoors) "gt" = ( /obj/structure/konyang_cliff{ @@ -2768,8 +2752,7 @@ /area/point_verdant/interior/offices) "hG" = ( /obj/structure/utility_pole/street/on{ - dir = 4; - pixel_x = -40 + dir = 4 }, /obj/effect/decal/road_marking{ dir = 8 @@ -2916,9 +2899,7 @@ /turf/simulated/floor/asphalt, /area/point_verdant/interior/offices) "ie" = ( -/obj/structure/utility_pole/street/on{ - pixel_y = -16 - }, +/obj/structure/utility_pole/street/on, /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) "if" = ( @@ -3125,8 +3106,7 @@ dir = 10 }, /obj/structure/utility_pole/street/on{ - dir = 8; - pixel_x = -24 + dir = 8 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -3195,8 +3175,7 @@ /area/point_verdant/outdoors) "iS" = ( /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 + dir = 8 }, /turf/simulated/floor/concrete, /area/point_verdant/outdoors) @@ -3220,8 +3199,7 @@ "iV" = ( /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1; - pixel_y = 32 + dir = 1 }, /obj/structure/closet/crate/bin/urban/dumpster, /obj/effect/step_trigger/thrower{ @@ -3348,8 +3326,7 @@ }, /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1; - pixel_y = 32 + dir = 1 }, /obj/structure/flora/bush/konyang_reeds, /turf/simulated/floor/exoplanet/konyang, @@ -3478,7 +3455,7 @@ /obj/effect/decal/curb{ dir = 1 }, -/obj/structure/street_sign/turn{ +/obj/structure/road_sign/turn{ dir = 8; pixel_x = 15; pixel_y = -7 @@ -3560,8 +3537,7 @@ dir = 4 }, /obj/structure/utility_pole/street/on{ - dir = 8; - pixel_x = -24 + dir = 8 }, /turf/simulated/floor/concrete, /area/point_verdant/outdoors) @@ -3677,7 +3653,7 @@ /turf/simulated/floor/tiled/white, /area/point_verdant/interior/pharmacy) "kf" = ( -/obj/structure/sign/double/arcade{ +/obj/structure/sign/urban/konyang/arcade{ pixel_y = 32; layer = 4.6 }, @@ -3968,11 +3944,11 @@ /turf/simulated/floor/carpet/lightblue, /area/point_verdant/interior/hotel) "kU" = ( -/obj/structure/street_sign/stop_konyang{ +/obj/structure/road_sign{ pixel_x = -12; pixel_y = 30 }, -/obj/structure/street_sign/street{ +/obj/structure/road_sign/street{ pixel_x = 15; street_name = "Spaceport Avenue"; pixel_y = 30 @@ -4089,8 +4065,7 @@ dir = 4 }, /obj/structure/utility_pole/street/on{ - dir = 4; - pixel_x = -40 + dir = 4 }, /turf/simulated/floor/asphalt, /area/point_verdant/interior/shallow) @@ -4123,7 +4098,7 @@ /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) "lm" = ( -/obj/structure/street_sign/drive_thru, +/obj/structure/sign/urban/drive_thru, /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) "ln" = ( @@ -4146,8 +4121,7 @@ dir = 8 }, /obj/structure/utility_pole/street/on{ - dir = 4; - pixel_x = -40 + dir = 4 }, /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) @@ -4383,9 +4357,10 @@ /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) "lW" = ( -/obj/structure/street_sign/street{ +/obj/structure/road_sign/street{ pixel_x = -16; pixel_y = 28; + icon_state = "street_right"; street_name = "Chainlink Boulevard" }, /turf/simulated/floor/sidewalk/blocks, @@ -4408,9 +4383,7 @@ /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) "lZ" = ( -/obj/structure/utility_pole/street/on{ - pixel_y = -16 - }, +/obj/structure/utility_pole/street/on, /turf/simulated/floor/sidewalk/detail, /area/point_verdant/interior/shallow) "ma" = ( @@ -4673,9 +4646,7 @@ /obj/structure/ledge{ dir = 1 }, -/obj/structure/utility_pole/street/on{ - pixel_y = -16 - }, +/obj/structure/utility_pole/street/on, /turf/simulated/floor/concrete, /area/point_verdant/outdoors) "mM" = ( @@ -4687,8 +4658,7 @@ "mN" = ( /obj/structure/rod_railing, /obj/structure/chainlink_fence{ - dir = 4; - pixel_x = 16 + dir = 4 }, /obj/structure/konyang_cliff{ icon_state = "innercorner5" @@ -4827,7 +4797,7 @@ /obj/effect/decal/exterior_stairs/half/center{ dir = 4 }, -/obj/structure/sign/staff{ +/obj/structure/sign/urban/staff{ pixel_y = 37; pixel_x = -1; layer = 9 @@ -5347,8 +5317,7 @@ dir = 4 }, /obj/structure/chainlink_fence{ - dir = 4; - pixel_x = 16 + dir = 4 }, /obj/structure/utility_pole/street/on{ dir = 8; @@ -5602,8 +5571,7 @@ "oX" = ( /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1; - pixel_y = 32 + dir = 1 }, /obj/item/material/stool/chair/folding, /obj/item/material/stool/chair/folding{ @@ -5613,8 +5581,7 @@ pixel_y = 10 }, /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 + dir = 8 }, /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) @@ -5695,15 +5662,11 @@ "pj" = ( /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1; - pixel_y = 32 + dir = 1 }, /obj/effect/decal/curb{ dir = 6 }, -/obj/structure/utility_pole/street/on{ - layer = 9.2 - }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) "pk" = ( @@ -5727,7 +5690,7 @@ /area/point_verdant/outdoors) "pn" = ( /obj/effect/decal/curb, -/obj/structure/sign/double/bar{ +/obj/structure/sign/urban/konyang/bar{ pixel_y = 32; pixel_x = 1 }, @@ -5968,8 +5931,7 @@ /turf/simulated/floor/lino, /area/point_verdant/interior/restaurant) "pU" = ( -/obj/structure/street_sign/turn{ - dir = 1; +/obj/structure/road_sign/turn/left{ pixel_x = -14; layer = 9.1 }, @@ -5977,8 +5939,7 @@ /area/point_verdant/outdoors) "pV" = ( /obj/structure/utility_pole/street/on{ - dir = 8; - pixel_x = -24 + dir = 8 }, /obj/structure/ledge/corner{ dir = 8 @@ -6144,8 +6105,7 @@ dir = 4 }, /obj/structure/chainlink_fence{ - dir = 4; - pixel_x = 16 + dir = 4 }, /obj/effect/decal/road_marking/thin{ dir = 1 @@ -6203,8 +6163,7 @@ icon_state = "innercorner6" }, /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 + dir = 8 }, /turf/simulated/floor/exoplanet/water/shallow/konyang, /area/point_verdant/outdoors) @@ -6220,8 +6179,7 @@ }, /obj/structure/automobile_filler, /obj/structure/chainlink_fence{ - dir = 4; - pixel_x = 16 + dir = 4 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -6241,8 +6199,7 @@ /obj/structure/hydrant{ pixel_x = -15 }, -/obj/structure/street_sign/warnings{ - dir = 4; +/obj/structure/road_sign/pedestrian{ pixel_y = 30; pixel_x = -16 }, @@ -6358,8 +6315,7 @@ "re" = ( /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1; - pixel_y = 32 + dir = 1 }, /obj/structure/bed/stool/chair/plastic, /turf/simulated/floor/sidewalk, @@ -6433,7 +6389,7 @@ /obj/effect/decal/road_marking{ dir = 8 }, -/obj/structure/street_sign/turn{ +/obj/structure/road_sign/turn{ dir = 1; pixel_x = -11 }, @@ -6449,8 +6405,7 @@ "rp" = ( /obj/structure/chainlink_fence, /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 + dir = 8 }, /obj/structure/konyang_cliff{ icon_state = "topcorner_east" @@ -6483,7 +6438,7 @@ /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) "ru" = ( -/obj/structure/sign/staff{ +/obj/structure/sign/urban/staff{ pixel_y = 40; layer = 9 }, @@ -6554,8 +6509,7 @@ dir = 8 }, /obj/structure/utility_pole/street/on{ - dir = 4; - pixel_x = -40 + dir = 4 }, /turf/simulated/floor/sidewalk/flat, /area/point_verdant/outdoors) @@ -6564,8 +6518,7 @@ dir = 4 }, /obj/structure/chainlink_fence{ - dir = 4; - pixel_x = 16 + dir = 4 }, /obj/structure/konyang_cliff{ icon_state = "innercorner3" @@ -6723,8 +6676,7 @@ icon_state = "innercorner2" }, /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 + dir = 8 }, /turf/simulated/floor/exoplanet/water/konyang, /area/point_verdant/outdoors) @@ -6835,13 +6787,15 @@ /obj/structure/hydrant{ pixel_x = 15 }, -/obj/structure/street_sign/stop_konyang{ +/obj/structure/road_sign{ pixel_y = 30; - pixel_x = -10 + pixel_x = -10; + dir = 8 }, -/obj/structure/street_sign/street{ +/obj/structure/road_sign/street{ pixel_x = 1; pixel_y = 30; + icon_state = "street_right"; street_name = "Spaceport Avenue" }, /turf/simulated/floor/sidewalk, @@ -6897,16 +6851,14 @@ /obj/effect/decal/curb/corner, /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1; - pixel_y = 32 + dir = 1 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) "sA" = ( /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1; - pixel_y = 32 + dir = 1 }, /turf/simulated/floor/sidewalk/flat, /area/point_verdant/outdoors) @@ -7038,8 +6990,7 @@ dir = 8 }, /obj/structure/chainlink_fence{ - dir = 4; - pixel_x = 16 + dir = 4 }, /obj/structure/konyang_cliff{ icon_state = "cliff-west"; @@ -7269,8 +7220,7 @@ dir = 8 }, /obj/structure/utility_pole/street/on{ - dir = 4; - pixel_x = -40 + dir = 4 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -7404,8 +7354,7 @@ "tP" = ( /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1; - pixel_y = 32 + dir = 1 }, /obj/effect/step_trigger/thrower{ icon_state = "dir_arrow"; @@ -7532,8 +7481,7 @@ dir = 9 }, /obj/structure/utility_pole/street/on{ - dir = 8; - pixel_x = -24 + dir = 8 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -7606,7 +7554,7 @@ /turf/simulated/floor/exoplanet/water/shallow/konyang, /area/point_verdant/water) "uo" = ( -/obj/structure/sign/staff{ +/obj/structure/sign/urban/staff{ pixel_y = 40; layer = 9 }, @@ -7647,8 +7595,7 @@ layer = 9.1 }, /obj/structure/utility_pole/street/on{ - dir = 1; - pixel_y = -8 + dir = 1 }, /turf/simulated/floor/exoplanet/konyang, /area/point_verdant/outdoors) @@ -7681,7 +7628,7 @@ /area/point_verdant/interior/offices) "ux" = ( /obj/structure/utility_pole/street/on{ - pixel_y = -8 + pixel_y = -3 }, /turf/simulated/floor/sidewalk/detail, /area/point_verdant/outdoors) @@ -7851,7 +7798,7 @@ }, /obj/structure/utility_pole/street/on{ dir = 8; - pixel_x = -24 + pixel_x = -6 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -8019,17 +7966,14 @@ /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) "vu" = ( -/obj/structure/chainlink_fence{ - layer = 9.1; - dir = 1; - pixel_y = 32 +/obj/effect/decal/road_marking{ + dir = 4 }, -/obj/effect/decal/road_marking/thin{ +/obj/effect/decal/curb{ dir = 8 }, -/obj/effect/decal/curb, /obj/structure/utility_pole/street/on{ - layer = 9.2 + dir = 8 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -8086,15 +8030,13 @@ /turf/simulated/floor/exoplanet/water/shallow/konyang, /area/point_verdant/water) "vF" = ( -/obj/structure/chainlink_fence{ - layer = 9.1; - dir = 1; - pixel_y = 32 +/obj/structure/konyang_cliff{ + icon_state = "cliff-top1" }, /obj/structure/utility_pole/street/on{ layer = 9.2 }, -/turf/simulated/floor/sidewalk/flat, +/turf/simulated/floor/exoplanet/water/shallow/konyang/no_smooth, /area/point_verdant/outdoors) "vG" = ( /obj/structure/table/rack/retail_shelf, @@ -8296,8 +8238,7 @@ dir = 4 }, /obj/structure/utility_pole/street/on{ - dir = 4; - pixel_x = -40 + dir = 4 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -8331,9 +8272,9 @@ /turf/simulated/floor/tiled/white, /area/point_verdant/interior/hotel) "wf" = ( -/obj/structure/street_sign/turn{ - dir = 8; +/obj/structure/road_sign/turn/left{ pixel_x = -16; + dir = 8; pixel_y = -9 }, /obj/effect/decal/road_marking{ @@ -8514,8 +8455,7 @@ dir = 8 }, /obj/structure/utility_pole/street/on{ - dir = 4; - pixel_x = -40 + dir = 4 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -8838,8 +8778,7 @@ dir = 6 }, /obj/structure/utility_pole/street/on{ - dir = 4; - pixel_x = -40 + dir = 4 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -8863,8 +8802,7 @@ icon_state = "cliff-top1" }, /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 + dir = 8 }, /obj/structure/konyang_cliff{ icon_state = "cliff-east" @@ -8874,7 +8812,7 @@ "xF" = ( /obj/structure/lattice/catwalk/indoor/planks, /obj/machinery/door/window/northright, -/obj/structure/sign/staff{ +/obj/structure/sign/urban/staff{ pixel_y = 35; pixel_x = 25; layer = 9 @@ -8882,12 +8820,16 @@ /turf/simulated/floor/wood, /area/point_verdant/interior/hotel) "xG" = ( -/obj/structure/road_barrier, -/obj/structure/utility_pole/street/on{ - pixel_y = -16; - layer = 4.6 +/obj/structure/konyang_cliff{ + icon_state = "cliff-top1" }, -/turf/simulated/floor/sidewalk, +/obj/structure/ledge{ + dir = 4 + }, +/obj/structure/utility_pole/street/on{ + layer = 9.2 + }, +/turf/simulated/floor/exoplanet/water/shallow/konyang/no_smooth, /area/point_verdant/outdoors) "xH" = ( /obj/effect/decal/road_marking/center{ @@ -9180,8 +9122,9 @@ pixel_y = -1; pixel_x = 1 }, -/obj/structure/street_sign/street{ +/obj/structure/road_sign/street{ pixel_x = 3; + icon_state = "street_left"; street_name = "Spaceport Avenue" }, /turf/simulated/floor/sidewalk/detail, @@ -9202,9 +9145,7 @@ /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) "yt" = ( -/obj/structure/utility_pole/street/on{ - pixel_y = -16 - }, +/obj/structure/utility_pole/street/on, /obj/structure/hydrant{ pixel_x = -15 }, @@ -9227,7 +9168,7 @@ /turf/simulated/open, /area/point_verdant/outdoors) "yx" = ( -/obj/machinery/mech_recharger, +/obj/machinery/mech_recharger/automobile, /turf/simulated/floor/concrete, /area/point_verdant/interior/shallow) "yy" = ( @@ -9254,7 +9195,7 @@ /turf/simulated/floor/tiled, /area/point_verdant/interior/offices) "yC" = ( -/obj/structure/sign/staff{ +/obj/structure/sign/urban/staff{ pixel_y = 5; pixel_x = -11; layer = 9 @@ -9408,7 +9349,7 @@ /obj/structure/ledge/quarter{ dir = 1 }, -/obj/structure/sign/exit{ +/obj/structure/sign/urban{ pixel_x = 6; pixel_y = 1 }, @@ -9555,9 +9496,7 @@ /turf/simulated/floor/tiled, /area/point_verdant/interior/police) "zp" = ( -/obj/structure/utility_pole/street/on{ - pixel_y = -16 - }, +/obj/structure/utility_pole/street/on, /obj/structure/ledge{ dir = 1 }, @@ -9573,8 +9512,7 @@ "zr" = ( /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1; - pixel_y = 32 + dir = 1 }, /obj/effect/decal/road_marking/thin{ dir = 8 @@ -9746,8 +9684,7 @@ "zI" = ( /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1; - pixel_y = 32 + dir = 1 }, /obj/effect/decal/curb, /turf/simulated/floor/asphalt, @@ -9942,8 +9879,7 @@ "Ag" = ( /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1; - pixel_y = 32 + dir = 1 }, /obj/effect/step_trigger/thrower{ icon_state = "dir_arrow"; @@ -10233,7 +10169,7 @@ /obj/structure/road_barrier/bot_end{ dir = 1 }, -/obj/structure/street_sign/yield{ +/obj/structure/road_sign/yield{ pixel_x = -16 }, /obj/effect/decal/road_marking/thin{ @@ -10360,7 +10296,7 @@ /area/point_verdant/interior/minimart) "Bh" = ( /obj/structure/utility_pole/street/on{ - pixel_y = -8 + pixel_y = -3 }, /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) @@ -10762,8 +10698,7 @@ /area/point_verdant/outdoors) "Cq" = ( /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 + dir = 8 }, /obj/random/dirt_75, /turf/simulated/floor/sidewalk/blocks, @@ -10901,9 +10836,7 @@ /turf/simulated/floor/exoplanet/water/shallow/konyang, /area/point_verdant/water) "CL" = ( -/obj/structure/utility_pole/street/on{ - pixel_y = -16 - }, +/obj/structure/utility_pole/street/on, /turf/simulated/floor/sidewalk, /area/point_verdant/water) "CM" = ( @@ -10914,8 +10847,7 @@ /area/point_verdant/outdoors) "CN" = ( /obj/structure/utility_pole/street/on{ - dir = 1; - pixel_y = -8 + dir = 1 }, /obj/effect/decal/road_marking{ dir = 1 @@ -11011,8 +10943,7 @@ dir = 5 }, /obj/structure/utility_pole/street/on{ - dir = 4; - pixel_x = -40 + dir = 4 }, /obj/effect/decal/road_marking/reflector, /turf/simulated/floor/asphalt, @@ -11020,8 +10951,7 @@ "Db" = ( /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1; - pixel_y = 32 + dir = 1 }, /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) @@ -11068,8 +10998,7 @@ /area/point_verdant/outdoors) "Dh" = ( /obj/structure/utility_pole/street/on{ - dir = 4; - pixel_x = -40 + dir = 4 }, /obj/structure/rod_railing{ dir = 8 @@ -11115,8 +11044,9 @@ /turf/simulated/floor/lino/diamond, /area/point_verdant/interior/minimart) "Dl" = ( -/obj/structure/street_sign/street{ +/obj/structure/road_sign/street{ pixel_x = -12; + icon_state = "street_left"; street_name = "Spaceport Avenue" }, /turf/simulated/floor/sidewalk/blocks, @@ -11315,8 +11245,7 @@ "DM" = ( /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1; - pixel_y = 32 + dir = 1 }, /obj/effect/decal/curb{ dir = 10 @@ -11510,8 +11439,7 @@ dir = 6 }, /obj/structure/chainlink_fence{ - dir = 4; - pixel_x = 16 + dir = 4 }, /obj/structure/chainlink_fence, /turf/simulated/floor/asphalt, @@ -11530,7 +11458,7 @@ /turf/simulated/floor/sidewalk, /area/point_verdant/interior/laundromat) "Er" = ( -/obj/structure/sign/double/pharmacy, +/obj/structure/sign/urban/konyang/pharmacy, /turf/simulated/wall, /area/point_verdant/interior/pharmacy) "Et" = ( @@ -11599,8 +11527,7 @@ /area/point_verdant/outdoors) "EC" = ( /obj/structure/utility_pole/street/on{ - dir = 4; - pixel_x = -40 + dir = 4 }, /obj/structure/ledge{ dir = 8 @@ -11710,8 +11637,7 @@ "EL" = ( /obj/effect/decal/road_marking, /obj/effect/decal/curb, -/obj/structure/street_sign/warnings{ - dir = 4; +/obj/structure/road_sign/pedestrian{ pixel_y = 28; pixel_x = -10 }, @@ -11765,8 +11691,7 @@ dir = 8 }, /obj/structure/utility_pole/street/on{ - dir = 8; - pixel_x = -24 + dir = 8 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -11818,7 +11743,8 @@ dir = 4 }, /obj/structure/utility_pole/street/on{ - dir = 4 + dir = 4; + pixel_x = 19 }, /turf/simulated/floor/concrete, /area/point_verdant/outdoors) @@ -12004,8 +11930,7 @@ "FD" = ( /obj/structure/trash_pile, /obj/structure/chainlink_fence{ - dir = 4; - pixel_x = 16 + dir = 4 }, /turf/simulated/floor/sidewalk/flat, /area/point_verdant/outdoors) @@ -12160,8 +12085,7 @@ dir = 4 }, /obj/structure/chainlink_fence{ - dir = 4; - pixel_x = 16 + dir = 4 }, /obj/structure/konyang_cliff{ icon_state = "cliff-west"; @@ -12342,8 +12266,7 @@ layer = 9.1 }, /obj/structure/utility_pole/street/on{ - dir = 1; - pixel_y = -8 + dir = 1 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -12408,7 +12331,7 @@ /turf/simulated/floor/reinforced, /area/point_verdant/interior/robotics) "GD" = ( -/obj/structure/sign/double/robotics, +/obj/structure/sign/urban/konyang/robotics, /turf/simulated/wall, /area/point_verdant/interior/robotics) "GE" = ( @@ -12486,10 +12409,7 @@ /area/point_verdant/outdoors) "GO" = ( /obj/structure/road_barrier, -/obj/structure/utility_pole/street/on{ - pixel_y = -16; - layer = 4.6 - }, +/obj/structure/utility_pole/street/on, /turf/simulated/floor/sidewalk/detail, /area/point_verdant/outdoors) "GP" = ( @@ -12519,8 +12439,7 @@ dir = 4 }, /obj/structure/utility_pole/street/on{ - dir = 4; - pixel_x = -40 + dir = 4 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -12637,8 +12556,7 @@ /area/point_verdant/interior/pharmacy) "Hi" = ( /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 + dir = 8 }, /turf/simulated/floor/sidewalk/blocks, /area/point_verdant/outdoors) @@ -12686,7 +12604,8 @@ dir = 4 }, /obj/structure/utility_pole/street/on{ - dir = 4 + dir = 4; + pixel_x = 19 }, /obj/structure/rod_railing{ name = "imposing rod railing"; @@ -12865,8 +12784,7 @@ "HL" = ( /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1; - pixel_y = 32 + dir = 1 }, /obj/effect/decal/curb, /obj/effect/decal/road_marking/turn_left, @@ -12880,8 +12798,7 @@ dir = 1 }, /obj/structure/utility_pole/street/on{ - dir = 1; - pixel_y = -8 + dir = 1 }, /obj/structure/road_barrier{ layer = 9.1 @@ -12916,8 +12833,7 @@ /area/point_verdant/interior/police) "HR" = ( /obj/structure/utility_pole/street/on{ - dir = 8; - pixel_x = -24 + dir = 8 }, /obj/effect/decal/road_marking{ dir = 4 @@ -12997,8 +12913,7 @@ /area/point_verdant/outdoors) "Ie" = ( /obj/structure/utility_pole/street/on{ - dir = 4; - pixel_x = -40 + dir = 4 }, /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) @@ -13154,9 +13069,9 @@ /turf/simulated/floor/tiled, /area/point_verdant/interior/offices) "ID" = ( -/obj/structure/street_sign/warnings{ - dir = 8; +/obj/structure/road_sign/pedestrian{ pixel_x = -1; + dir = 8; pixel_y = 7 }, /obj/structure/ledge/quarter{ @@ -13257,8 +13172,7 @@ /area/point_verdant/interior/bar) "IT" = ( /obj/structure/utility_pole/street/on{ - dir = 4; - pixel_x = -40 + dir = 4 }, /obj/structure/rod_railing{ dir = 8 @@ -13271,7 +13185,7 @@ /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) "IU" = ( -/obj/structure/street_sign/turn, +/obj/structure/road_sign/turn, /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) "IV" = ( @@ -13286,8 +13200,7 @@ dir = 8 }, /obj/structure/utility_pole/street/on{ - dir = 4; - pixel_x = -40 + dir = 4 }, /obj/random/dirt_75, /turf/simulated/floor/concrete, @@ -13367,7 +13280,7 @@ /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) "Jq" = ( -/obj/structure/sign/exit{ +/obj/structure/sign/urban{ dir = 8; pixel_x = -6; pixel_y = 7 @@ -13398,7 +13311,8 @@ /turf/simulated/floor/exoplanet/water/shallow/konyang/no_smooth, /area/point_verdant/outdoors) "Jt" = ( -/obj/structure/street_sign/stop_konyang{ +/obj/structure/road_sign{ + dir = 4; pixel_y = -4; pixel_x = -13 }, @@ -13594,7 +13508,7 @@ /turf/simulated/floor/lino, /area/point_verdant/interior/restaurant) "JW" = ( -/obj/structure/street_sign/yield{ +/obj/structure/road_sign/yield{ pixel_x = -16 }, /turf/simulated/floor/sidewalk, @@ -13794,7 +13708,7 @@ "Kv" = ( /obj/machinery/door/urban, /obj/effect/decal/exterior_stairs/half, -/obj/structure/sign/restroom{ +/obj/structure/sign/urban/restroom{ pixel_x = 31; pixel_y = 10 }, @@ -13866,7 +13780,7 @@ /area/point_verdant/outdoors) "KB" = ( /obj/machinery/door/urban, -/obj/structure/sign/staff{ +/obj/structure/sign/urban/staff{ pixel_y = 19; pixel_x = -1; layer = 9 @@ -13976,8 +13890,7 @@ icon_state = "cliff-west" }, /obj/structure/utility_pole/street/on{ - dir = 8; - pixel_x = -24 + dir = 8 }, /turf/simulated/floor/exoplanet/water/shallow/konyang/no_smooth, /area/point_verdant/outdoors) @@ -14092,8 +14005,7 @@ }, /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1; - pixel_y = 32 + dir = 1 }, /turf/simulated/floor/sidewalk/flat, /area/point_verdant/outdoors) @@ -14193,8 +14105,7 @@ /area/point_verdant/outdoors) "Lz" = ( /obj/structure/utility_pole/street/on{ - dir = 1; - pixel_y = -8 + dir = 1 }, /obj/effect/decal/curb{ dir = 1 @@ -14229,8 +14140,7 @@ /area/point_verdant/outdoors) "LF" = ( /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 + dir = 8 }, /turf/simulated/floor/sidewalk/flat, /area/point_verdant/outdoors) @@ -14518,8 +14428,7 @@ /area/point_verdant/outdoors) "Mz" = ( /obj/structure/utility_pole/street/on{ - dir = 4; - pixel_x = -40 + dir = 4 }, /obj/structure/rod_railing{ dir = 8 @@ -14634,7 +14543,7 @@ "MO" = ( /obj/structure/lattice/catwalk/indoor/planks/opaque, /obj/machinery/door/urban, -/obj/structure/sign/staff{ +/obj/structure/sign/urban/staff{ pixel_y = 19; pixel_x = -1; layer = 9 @@ -14693,8 +14602,7 @@ /area/point_verdant/interior/police) "MU" = ( /obj/structure/road_barrier/bot_in, -/obj/structure/street_sign/warnings{ - dir = 4; +/obj/structure/road_sign/pedestrian{ pixel_x = -16 }, /turf/simulated/floor/sidewalk, @@ -14903,8 +14811,7 @@ dir = 4 }, /obj/structure/chainlink_fence{ - dir = 4; - pixel_x = 16 + dir = 4 }, /obj/structure/konyang_cliff{ icon_state = "innercorner4" @@ -15102,16 +15009,14 @@ /obj/structure/closet/crate/bin/urban/dumpster, /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1; - pixel_y = 32 + dir = 1 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) "NW" = ( /obj/structure/chainlink_fence, /obj/structure/chainlink_fence{ - dir = 4; - pixel_x = 16 + dir = 4 }, /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) @@ -15383,8 +15288,7 @@ dir = 4 }, /obj/structure/chainlink_fence{ - dir = 4; - pixel_x = 16 + dir = 4 }, /obj/structure/automobile_filler, /turf/simulated/floor/asphalt, @@ -15432,7 +15336,7 @@ /turf/simulated/floor/tiled, /area/point_verdant/interior/spaceport) "OE" = ( -/obj/structure/sign/staff{ +/obj/structure/sign/urban/staff{ pixel_y = 40; layer = 9 }, @@ -15502,7 +15406,7 @@ /turf/simulated/floor/tiled/white, /area/point_verdant/interior/robotics) "OQ" = ( -/obj/structure/sign/double/convenience{ +/obj/structure/sign/urban/konyang{ layer = 4.6; pixel_y = 32 }, @@ -15577,9 +15481,10 @@ dir = 8; pixel_y = 12 }, -/obj/structure/street_sign/street{ +/obj/structure/road_sign/street{ pixel_x = -11; pixel_y = 28; + icon_state = "street_right"; street_name = "Spaceport Avenue" }, /turf/simulated/floor/sidewalk/blocks, @@ -15604,7 +15509,7 @@ /turf/simulated/floor/exoplanet/konyang, /area/point_verdant/outdoors) "Pd" = ( -/obj/structure/sign/restroom{ +/obj/structure/sign/urban/restroom{ pixel_x = 31; pixel_y = 6 }, @@ -15653,8 +15558,7 @@ dir = 4 }, /obj/structure/chainlink_fence{ - dir = 4; - pixel_x = 16 + dir = 4 }, /obj/effect/decal/road_marking/thin, /turf/simulated/floor/asphalt, @@ -15879,9 +15783,7 @@ /obj/structure/ledge{ dir = 1 }, -/obj/structure/utility_pole/street/on{ - pixel_y = -16 - }, +/obj/structure/utility_pole/street/on, /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) "PG" = ( @@ -15929,9 +15831,7 @@ /area/point_verdant/interior/streetvendor) "PN" = ( /obj/structure/road_barrier, -/obj/structure/utility_pole/street/on{ - pixel_y = -16 - }, +/obj/structure/utility_pole/street/on, /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) "PO" = ( @@ -16007,8 +15907,7 @@ }, /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1; - pixel_y = 32 + dir = 1 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -16033,8 +15932,7 @@ /area/point_verdant/outdoors) "Qa" = ( /obj/structure/utility_pole/street/on{ - dir = 8; - pixel_x = -24 + dir = 8 }, /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) @@ -16182,8 +16080,7 @@ dir = 8 }, /obj/structure/utility_pole/street/on{ - dir = 8; - pixel_x = -24 + dir = 8 }, /obj/random/dirt_75, /turf/simulated/floor/asphalt, @@ -16304,8 +16201,7 @@ "QK" = ( /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1; - pixel_y = 32 + dir = 1 }, /obj/structure/bed/stool/chair/plastic{ dir = 8 @@ -16356,8 +16252,7 @@ /area/point_verdant/interior/bar) "QQ" = ( /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 + dir = 8 }, /obj/structure/konyang_cliff{ icon_state = "topcorner_east" @@ -16504,7 +16399,9 @@ /obj/effect/decal/curb{ dir = 1 }, -/obj/structure/street_sign/stop_konyang, +/obj/structure/road_sign{ + dir = 4 + }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) "Ru" = ( @@ -16567,8 +16464,7 @@ /area/point_verdant/outdoors) "RB" = ( /obj/structure/utility_pole/street/on{ - dir = 8; - pixel_x = -24 + dir = 8 }, /obj/structure/ledge{ dir = 4 @@ -16618,7 +16514,8 @@ /turf/simulated/floor/lino, /area/point_verdant/interior/cafe) "RH" = ( -/obj/structure/street_sign/stop_konyang{ +/obj/structure/road_sign{ + dir = 4; pixel_y = -4; pixel_x = -13 }, @@ -16689,8 +16586,9 @@ /turf/simulated/floor/wood, /area/point_verdant/interior/police) "RR" = ( -/obj/structure/street_sign/street{ +/obj/structure/road_sign/street{ pixel_x = 3; + icon_state = "street_left"; street_name = "Noella-Brookes Road" }, /turf/simulated/floor/sidewalk, @@ -16833,8 +16731,7 @@ /area/point_verdant/interior/offices) "Sn" = ( /obj/structure/utility_pole/street/on{ - dir = 4; - pixel_x = -40 + dir = 4 }, /obj/structure/ledge{ dir = 8 @@ -16849,8 +16746,9 @@ /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) "So" = ( -/obj/structure/street_sign/street{ +/obj/structure/road_sign/street{ pixel_x = -15; + icon_state = "street_left"; street_name = "Listor Bend Street"; pixel_y = -1; layer = 9.1 @@ -16974,16 +16872,14 @@ }, /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1; - pixel_y = 32 + dir = 1 }, /obj/effect/floor_decal/konyang_flowers, /turf/simulated/floor/exoplanet/konyang, /area/point_verdant/outdoors) "SJ" = ( /obj/structure/utility_pole/street/on{ - dir = 8; - pixel_x = -24 + dir = 8 }, /turf/simulated/floor/sidewalk/blocks, /area/point_verdant/outdoors) @@ -17145,7 +17041,7 @@ /turf/simulated/floor/exoplanet/konyang/pink, /area/point_verdant/outdoors) "Ti" = ( -/obj/structure/sign/double/police{ +/obj/structure/sign/urban/konyang/police{ pixel_y = 40 }, /turf/simulated/floor/sidewalk, @@ -17157,7 +17053,7 @@ /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 4 }, -/obj/structure/sign/exit{ +/obj/structure/sign/urban{ dir = 4; pixel_x = 6; pixel_y = 7 @@ -17171,7 +17067,7 @@ /turf/simulated/floor/asphalt, /area/point_verdant/interior/offices) "Tm" = ( -/obj/structure/sign/staff{ +/obj/structure/sign/urban/staff{ pixel_y = 40; layer = 9 }, @@ -17480,15 +17376,13 @@ layer = 9.1 }, /obj/structure/utility_pole/street/on{ - dir = 1; - pixel_y = -8 + dir = 1 }, /turf/simulated/floor/sidewalk/flat, /area/point_verdant/outdoors) "Ua" = ( /obj/structure/utility_pole/street/on{ - dir = 8; - pixel_x = -24 + dir = 8 }, /obj/effect/decal/cleanable/generic/beet_tree_petals, /turf/simulated/floor/sidewalk, @@ -18052,8 +17946,7 @@ /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) "VM" = ( -/obj/structure/street_sign/warnings{ - dir = 4; +/obj/structure/road_sign/pedestrian{ pixel_y = 30; pixel_x = -16 }, @@ -18074,7 +17967,9 @@ /obj/structure/road_barrier/bot_end{ layer = 9.1 }, -/obj/structure/utility_pole/street/crosswalk, +/obj/structure/utility_pole/street/crosswalk{ + pixel_x = 10 + }, /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) "VP" = ( @@ -18157,7 +18052,7 @@ /obj/effect/decal/exterior_stairs/half/center{ dir = 4 }, -/obj/structure/sign/staff{ +/obj/structure/sign/urban/staff{ pixel_y = 37; pixel_x = -1; layer = 9 @@ -18250,7 +18145,7 @@ /turf/simulated/floor/tiled/freezer, /area/point_verdant/interior/police) "Wo" = ( -/obj/structure/pylon, +/obj/structure/urban/pylon, /obj/effect/decal/road_marking/no_pass{ dir = 8 }, @@ -18496,8 +18391,7 @@ dir = 1 }, /obj/structure/utility_pole/street/on{ - dir = 1; - pixel_y = -8 + dir = 1 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -18628,8 +18522,7 @@ icon_state = "topcorner_east" }, /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 + dir = 8 }, /turf/simulated/floor/exoplanet/water/konyang, /area/point_verdant/water) @@ -18733,8 +18626,7 @@ layer = 9.1 }, /obj/structure/utility_pole/street/on{ - dir = 1; - pixel_y = -8 + dir = 1 }, /turf/simulated/floor/asphalt, /area/point_verdant/water) @@ -18974,7 +18866,7 @@ /turf/simulated/floor/sidewalk/flat, /area/point_verdant/interior/shallow) "XY" = ( -/obj/structure/street_sign/turn{ +/obj/structure/road_sign/turn{ pixel_x = 13 }, /turf/simulated/floor/sidewalk/paved, @@ -19082,8 +18974,7 @@ "Yt" = ( /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1; - pixel_y = 32 + dir = 1 }, /obj/effect/step_trigger/thrower{ icon_state = "dir_arrow"; @@ -19099,11 +18990,14 @@ /turf/simulated/floor/lino/diamond, /area/point_verdant/interior/minimart) "Yy" = ( -/obj/structure/street_sign/street{ +/obj/structure/road_sign/street{ pixel_x = -12; + icon_state = "street_left"; street_name = "Spaceport Avenue" }, -/obj/structure/street_sign/stop_konyang, +/obj/structure/road_sign{ + dir = 4 + }, /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) "Yz" = ( @@ -19116,8 +19010,9 @@ /turf/simulated/floor/lino/diamond, /area/point_verdant/interior/restaurant) "YA" = ( -/obj/structure/street_sign/street{ +/obj/structure/road_sign/street{ pixel_x = -15; + icon_state = "street_right"; street_name = "Listor Bend Street"; pixel_y = 30; layer = 9.1 @@ -19221,8 +19116,7 @@ icon_state = "innercorner2" }, /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 + dir = 8 }, /turf/simulated/floor/exoplanet/water/shallow/konyang, /area/point_verdant/outdoors) @@ -19305,8 +19199,7 @@ }, /obj/structure/chainlink_fence{ layer = 9.1; - dir = 1; - pixel_y = 32 + dir = 1 }, /turf/simulated/floor/exoplanet/konyang, /area/point_verdant/outdoors) @@ -19429,7 +19322,7 @@ /area/point_verdant/interior/minimart) "Zs" = ( /obj/machinery/door/urban, -/obj/structure/sign/staff{ +/obj/structure/sign/urban/staff{ pixel_y = 19; pixel_x = -1; layer = 9 @@ -19625,8 +19518,7 @@ dir = 4 }, /obj/structure/chainlink_fence{ - dir = 4; - pixel_x = 16 + dir = 4 }, /obj/structure/utility_pole/street/on{ dir = 8; @@ -35727,7 +35619,7 @@ bb Qf bu bu -uU +vu bu bu bu @@ -38328,7 +38220,7 @@ CY HX oy BT -xG +PN LN iL vX @@ -39613,7 +39505,7 @@ CY HX oy BT -xG +PN LN bb Cp @@ -40898,7 +40790,7 @@ lN HX oy BT -xG +PN LN iL PQ @@ -43934,12 +43826,12 @@ kn bu bu bu -uU +vu bu bu bu bu -uU +vu bu bu xs @@ -44657,7 +44549,7 @@ Dz MA Mw az -Zp +gr pj kM iL @@ -46199,8 +46091,8 @@ Dz MA wK az -Zp gr +zI iL up zc @@ -47998,8 +47890,8 @@ Dz MA az eT -Zp gr +zI ui JY Wq @@ -48029,24 +47921,24 @@ bu bu bu bu -uU +vu bu bu bu -uU +vu bu bu bu bu bu bu -uU +vu iY iL iL Wf bu -uU +vu bu bu bu @@ -48054,7 +47946,7 @@ bu bu bu bu -uU +vu cC iY iL @@ -49797,8 +49689,8 @@ Dz MA MA az -wL -vu +DC +zr ui kO Ha @@ -53696,8 +53588,8 @@ az lL wK wK -YD vF +sA od xb SS @@ -54981,8 +54873,8 @@ az wK wK wK -iK -vF +xG +sA 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 dfb64a629ec..b4ff71146b5 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,8 +20,7 @@ dir = 10 }, /obj/structure/utility_pole/street/on{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/structure/rod_railing{ name = "imposing rod railing"; @@ -151,8 +150,7 @@ /area/point_verdant/interior/arcade) "bc" = ( /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 + dir = 8 }, /obj/structure/ledge/quarter/corner{ dir = 8 @@ -246,9 +244,7 @@ /obj/structure/ledge{ dir = 1 }, -/obj/structure/utility_pole/street/on{ - pixel_y = 0 - }, +/obj/structure/utility_pole/street/on, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) "bF" = ( @@ -406,7 +402,7 @@ "cC" = ( /obj/machinery/door/urban, /obj/effect/decal/exterior_stairs/half, -/obj/structure/sign/restroom{ +/obj/structure/sign/urban/restroom{ pixel_x = 31; pixel_y = 10 }, @@ -570,8 +566,7 @@ /area/point_verdant/interior/restaurant) "eg" = ( /obj/structure/chainlink_fence{ - dir = 4; - pixel_x = 16 + dir = 4 }, /obj/structure/rod_railing{ dir = 8 @@ -620,8 +615,7 @@ dir = 4 }, /obj/structure/utility_pole/street/on{ - dir = 8; - pixel_x = -24 + dir = 8 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -1003,8 +997,7 @@ "gS" = ( /obj/structure/ledge, /obj/structure/utility_pole/street/on{ - dir = 1; - pixel_y = 0 + dir = 1 }, /obj/structure/rod_railing{ name = "imposing rod railing"; @@ -1328,7 +1321,7 @@ "jK" = ( /obj/machinery/door/urban, /obj/effect/decal/exterior_stairs/half, -/obj/structure/sign/restroom{ +/obj/structure/sign/urban/restroom{ pixel_x = 31; pixel_y = 10 }, @@ -1394,19 +1387,6 @@ /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 @@ -1437,19 +1417,6 @@ }, /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 @@ -1729,8 +1696,7 @@ /area/point_verdant/interior/offices) "nd" = ( /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 + dir = 8 }, /turf/simulated/floor/concrete/square, /area/point_verdant/outdoors) @@ -1987,17 +1953,6 @@ }, /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, @@ -2077,12 +2032,10 @@ /obj/structure/ledge{ dir = 5 }, -/obj/item/hullbeacon/red, /obj/structure/utility_pole/street/on{ - dir = 8; - pixel_x = -24; - pixel_y = 0 + dir = 8 }, +/obj/item/hullbeacon/red, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) "qq" = ( @@ -2298,8 +2251,7 @@ /area/point_verdant/outdoors) "rE" = ( /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 + dir = 8 }, /obj/structure/ledge/quarter{ dir = 4 @@ -2346,18 +2298,6 @@ /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) @@ -2392,8 +2332,7 @@ "sk" = ( /obj/structure/chainlink_fence, /obj/structure/chainlink_fence{ - dir = 4; - pixel_x = 16 + dir = 4 }, /turf/simulated/floor/concrete/square, /area/point_verdant/outdoors) @@ -2557,8 +2496,7 @@ /area/point_verdant/outdoors) "tR" = ( /obj/structure/chainlink_fence{ - dir = 4; - pixel_x = 16 + dir = 4 }, /turf/simulated/floor/concrete, /area/point_verdant/outdoors) @@ -2604,18 +2542,6 @@ }, /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, @@ -2823,8 +2749,7 @@ dir = 9 }, /obj/structure/utility_pole/street/on{ - dir = 4; - pixel_x = -40 + dir = 4 }, /obj/item/hullbeacon/red, /turf/simulated/floor/asphalt, @@ -2963,9 +2888,7 @@ /turf/simulated/floor/tiled, /area/point_verdant/interior/offices) "wZ" = ( -/obj/structure/utility_pole/street/on{ - pixel_y = 0 - }, +/obj/structure/utility_pole/street/on, /turf/simulated/floor/concrete, /area/point_verdant/outdoors) "xa" = ( @@ -3093,8 +3016,7 @@ /area/point_verdant/interior/offices) "yk" = ( /obj/structure/chainlink_fence{ - dir = 4; - pixel_x = 16 + dir = 4 }, /turf/simulated/floor/concrete/square, /area/point_verdant/outdoors) @@ -3107,8 +3029,7 @@ dir = 8 }, /obj/structure/utility_pole/street/on{ - dir = 4; - pixel_x = -40 + dir = 4 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -3325,7 +3246,7 @@ /obj/structure/ledge/quarter{ dir = 9 }, -/obj/structure/sign/staff{ +/obj/structure/sign/urban/staff{ pixel_y = 40; layer = 9 }, @@ -4041,8 +3962,7 @@ /area/point_verdant/interior/hotel) "EF" = ( /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 + dir = 8 }, /turf/simulated/floor/concrete, /area/point_verdant/outdoors) @@ -4172,7 +4092,14 @@ /turf/simulated/open, /area/point_verdant/interior/laundromat) "FO" = ( -/obj/structure/ac_unit, +/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/rod_railing{ dir = 4 }, @@ -5016,8 +4943,7 @@ /area/point_verdant/interior/minimart) "Mx" = ( /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 + dir = 8 }, /obj/structure/chainlink_fence, /turf/simulated/floor/concrete/square, @@ -5083,8 +5009,7 @@ dir = 1 }, /obj/structure/utility_pole/street/on{ - dir = 1; - pixel_y = 0 + dir = 1 }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) @@ -5185,6 +5110,7 @@ /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) "NJ" = ( +/obj/structure/urban/pylon, /obj/effect/decal/road_marking/no_pass{ dir = 8 }, @@ -5225,8 +5151,7 @@ /area/point_verdant/outdoors) "NR" = ( /obj/structure/utility_pole/street/on{ - dir = 4; - pixel_x = -40 + dir = 4 }, /obj/structure/ledge/quarter{ dir = 8 @@ -5262,14 +5187,13 @@ /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" = ( @@ -5646,6 +5570,7 @@ /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" = ( @@ -5778,20 +5703,6 @@ /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 @@ -6360,7 +6271,14 @@ /turf/simulated/floor/carpet/darkblue, /area/point_verdant/interior/hotel) "Xn" = ( -/obj/structure/ac_unit, +/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" + }, /turf/simulated/floor/asphalt, /area/point_verdant/outdoors) "Xr" = ( @@ -6502,7 +6420,14 @@ /turf/simulated/floor/sidewalk, /area/point_verdant/outdoors) "Yc" = ( -/obj/structure/ac_unit, +/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/machinery/light/small/floor, /turf/simulated/floor/roofing_tiles, /area/point_verdant/outdoors) @@ -6580,7 +6505,14 @@ /turf/simulated/floor/carpet/aquablue, /area/point_verdant/interior/hotel) "Yv" = ( -/obj/structure/ac_unit, +/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" + }, /turf/simulated/floor/roofing_tiles, /area/point_verdant/outdoors) "Yy" = ( @@ -6597,8 +6529,7 @@ /area/point_verdant/interior/spaceport) "YG" = ( /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 + dir = 8 }, /obj/effect/decal/exterior_stairs/half/center{ dir = 1 @@ -36470,7 +36401,7 @@ yS DC DC tP -ko +wt PP PP PP @@ -43152,7 +43083,7 @@ Il DC DC tP -kD +qi Ym Ym Ym @@ -46504,7 +46435,7 @@ ac DC DC oa -ua +wt PP PP PP @@ -48064,7 +47995,7 @@ DD DD DD DD -rZ +gS DC DC DC @@ -49092,7 +49023,7 @@ DD DD DD DD -rZ +gS DC DC DC @@ -50597,7 +50528,7 @@ pN DC DC oa -px +qi Ym Ym Ym @@ -50612,7 +50543,7 @@ ew Ym Ym Ym -SG +Ob DC DC oa diff --git a/maps/event/halloween/halloween.dmm b/maps/event/halloween/halloween.dmm index a49be3ad96c..8b1d21e2f0f 100644 --- a/maps/event/halloween/halloween.dmm +++ b/maps/event/halloween/halloween.dmm @@ -945,6 +945,13 @@ /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, @@ -1241,7 +1248,12 @@ /turf/simulated/floor/tiled/white, /area/city/horrorhouse) "dN" = ( -/obj/structure/ac_unit{ +/obj/effect/decal/fake_object{ + density = 1; + desc = "A bland air conditioning unit."; + icon = 'icons/effects/city.dmi'; + icon_state = "ac"; + name = "AC unit"; layer = 3.3 }, /obj/structure/railing/mapped{ @@ -1262,10 +1274,19 @@ /area/city/hallway) "dQ" = ( /obj/structure/table/wood, -/obj/structure/television{ +/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"; pixel_y = 25 }, -/obj/structure/console, +/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/effect/floor_decal/spline/fancy/wood{ dir = 1 }, @@ -5252,7 +5273,14 @@ /turf/simulated/floor/wood, /area/city/bar) "vO" = ( -/obj/structure/ac_unit, +/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" + }, /turf/simulated/floor/marble/dark, /area/city/costumeroom) "vP" = ( @@ -5893,7 +5921,12 @@ /turf/simulated/floor/carpet/rubber, /area/city/medical) "xk" = ( -/obj/structure/shelf{ +/obj/effect/decal/fake_object{ + desc = "A nondescript decorative shelf."; + icon = 'icons/effects/city.dmi'; + icon_state = "shelf"; + layer = 2.7; + name = "shelf"; pixel_y = 29 }, /obj/effect/floor_decal/spline/fancy/wood/corner{ @@ -6134,7 +6167,14 @@ /turf/simulated/floor/wood, /area/city/dining) "yG" = ( -/obj/structure/ac_unit, +/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/effect/map_effect/perma_light/brighter{ color = "#FFA500"; light_color = "#FFA500" @@ -7161,7 +7201,12 @@ /turf/simulated/floor/wood, /area/city/horrorhouse) "Dp" = ( -/obj/structure/ac_unit{ +/obj/effect/decal/fake_object{ + density = 1; + desc = "A bland air conditioning unit."; + icon = 'icons/effects/city.dmi'; + icon_state = "ac"; + name = "AC unit"; layer = 3.3 }, /obj/structure/railing/mapped{ @@ -8308,7 +8353,14 @@ dir = 4 }, /obj/structure/lattice/catwalk, -/obj/structure/ac_unit, +/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" + }, /turf/simulated/floor/plating, /area/city/pool) "GI" = ( @@ -9359,6 +9411,13 @@ /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, @@ -10236,6 +10295,16 @@ /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 @@ -12034,7 +12103,12 @@ /turf/simulated/floor/wood/mahogany, /area/city/dining) "Ub" = ( -/obj/structure/shelf{ +/obj/effect/decal/fake_object{ + desc = "A nondescript decorative shelf."; + icon = 'icons/effects/city.dmi'; + icon_state = "shelf2"; + layer = 2.7; + name = "shelf"; pixel_y = 31 }, /obj/structure/flora/pottedplant/dead, @@ -12474,7 +12548,11 @@ /turf/simulated/floor/tiled/full, /area/city/hallway) "VI" = ( -/obj/structure/television{ +/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"; pixel_y = 15 }, /obj/structure/table/wood, @@ -13498,8 +13576,15 @@ /turf/simulated/floor/beach/water/alt, /area/city/hallway) "Zf" = ( -/obj/structure/sign/double/hotel_montparnasse, -/turf/simulated/wall/wood, +/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, /area/city/horrorhouse) "Zg" = ( /obj/structure/railing/mapped{ @@ -13520,7 +13605,12 @@ /turf/simulated/floor/grass, /area/city/hallway) "Zj" = ( -/obj/structure/ac_unit{ +/obj/effect/decal/fake_object{ + density = 1; + desc = "A bland air conditioning unit."; + icon = 'icons/effects/city.dmi'; + icon_state = "ac"; + name = "AC unit"; layer = 3.3; pixel_x = -2 }, @@ -13547,11 +13637,20 @@ /area/city/outside) "Zl" = ( /obj/structure/table/wood, -/obj/structure/television{ +/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"; pixel_y = 25; layer = 3.5 }, -/obj/structure/console, +/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/effect/floor_decal/spline/fancy/wood{ dir = 1 }, @@ -16839,7 +16938,7 @@ Ub Rq XM eo -Zf +rn cD Gq xN @@ -17163,8 +17262,8 @@ xk Xp eB hu +rn Zf -yu aQ Am dk @@ -17245,7 +17344,7 @@ WA WA WA rn -WA +OR Vd qC zb diff --git a/maps/event/idris_cruise/idris_cruise-1.dmm b/maps/event/idris_cruise/idris_cruise-1.dmm index 3998accd05e..7d192b46ed1 100644 --- a/maps/event/idris_cruise/idris_cruise-1.dmm +++ b/maps/event/idris_cruise/idris_cruise-1.dmm @@ -6552,7 +6552,12 @@ /obj/machinery/shower{ dir = 4 }, -/obj/structure/vent{ +/obj/effect/decal/fake_object{ + desc = "A nondescript shower drain."; + icon = 'icons/effects/city.dmi'; + icon_state = "vent"; + layer = 2.7; + name = "shower drain"; pixel_x = 9; pixel_y = -14 }, @@ -7304,7 +7309,12 @@ }, /area/cruise/beach) "fLx" = ( -/obj/structure/vent{ +/obj/effect/decal/fake_object{ + desc = "A nondescript shower drain."; + icon = 'icons/effects/city.dmi'; + icon_state = "vent"; + layer = 2.7; + name = "shower drain"; pixel_x = 9; pixel_y = -14 }, @@ -9770,7 +9780,12 @@ /obj/machinery/shower{ dir = 8 }, -/obj/structure/vent{ +/obj/effect/decal/fake_object{ + desc = "A nondescript shower drain."; + icon = 'icons/effects/city.dmi'; + icon_state = "vent"; + layer = 2.7; + name = "shower drain"; pixel_x = 9; pixel_y = -14 }, @@ -10011,7 +10026,12 @@ }, /area/cruise/security) "hTz" = ( -/obj/structure/television{ +/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"; pixel_y = 15 }, /obj/structure/table/wood, @@ -10575,7 +10595,12 @@ /area/cruise/tcomms_sat) "ipv" = ( /obj/structure/table/standard, -/obj/structure/television{ +/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"; pixel_y = 15 }, /turf/unsimulated/floor{ @@ -14306,7 +14331,12 @@ }, /area/cruise/fore) "lsd" = ( -/obj/structure/television{ +/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"; pixel_y = 15 }, /obj/structure/table/wood, @@ -14540,7 +14570,11 @@ /area/cruise/main_bar) "lAa" = ( /obj/structure/table/wood, -/obj/structure/television{ +/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"; pixel_y = 15 }, /obj/effect/floor_decal/spline/fancy/wood/corner{ @@ -30167,7 +30201,12 @@ /obj/machinery/shower{ dir = 4 }, -/obj/structure/vent{ +/obj/effect/decal/fake_object{ + desc = "A nondescript shower drain."; + icon = 'icons/effects/city.dmi'; + icon_state = "vent"; + layer = 2.7; + name = "shower drain"; pixel_x = 9; pixel_y = -14 }, diff --git a/maps/event/rooftop/rooftop-1.dmm b/maps/event/rooftop/rooftop-1.dmm index ef7f1a1b31b..7f67283a481 100644 --- a/maps/event/rooftop/rooftop-1.dmm +++ b/maps/event/rooftop/rooftop-1.dmm @@ -44,6 +44,22 @@ }, /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"; @@ -62,6 +78,13 @@ }, /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 @@ -98,9 +121,12 @@ }, /area/city/mendell) "ao" = ( -/obj/structure/sign/double/hotel_montparnasse, -/turf/unsimulated/wall/steel, -/area/city/mendell/interior) +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/door/airlock/glass_security{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/city/mendell) "ap" = ( /obj/effect/floor_decal/corner/blue{ dir = 10 @@ -368,7 +394,12 @@ }, /area/city/mendell/interior) "bR" = ( -/obj/structure/shelf{ +/obj/effect/decal/fake_object{ + desc = "A nondescript decorative shelf."; + icon = 'icons/effects/city.dmi'; + icon_state = "shelf1"; + layer = 2.7; + name = "shelf"; pixel_y = 35 }, /turf/unsimulated/floor{ @@ -521,6 +552,10 @@ }, /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, @@ -552,7 +587,11 @@ }, /area/city/mendell/interior) "cX" = ( -/obj/structure/window{ +/obj/effect/decal/fake_object{ + desc = "A window overlooking the pristine Mendell City."; + icon = 'icons/effects/city.dmi'; + icon_state = "win2"; + name = "window"; pixel_y = 33 }, /turf/simulated/floor/tiled/ramp{ @@ -597,6 +636,19 @@ 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{ @@ -668,7 +720,11 @@ "dp" = ( /obj/structure/bed/padded, /obj/item/bedsheet/black, -/obj/structure/window{ +/obj/effect/decal/fake_object{ + desc = "A window overlooking the pristine Mendell City."; + icon = 'icons/effects/city.dmi'; + icon_state = "win1"; + name = "window"; pixel_y = 33 }, /turf/simulated/floor/carpet, @@ -1046,7 +1102,11 @@ /obj/item/clothing/under/suit_jacket/white, /obj/effect/floor_decal/industrial/hatch, /obj/structure/table/rack, -/obj/structure/window{ +/obj/effect/decal/fake_object{ + desc = "A window overlooking the pristine Mendell City."; + icon = 'icons/effects/city.dmi'; + icon_state = "win3"; + name = "window"; pixel_y = 33 }, /turf/simulated/floor/marble/dark, @@ -1181,7 +1241,11 @@ /obj/item/clothing/under/suit_jacket/checkered, /obj/effect/floor_decal/industrial/hatch, /obj/structure/table/rack, -/obj/structure/window{ +/obj/effect/decal/fake_object{ + desc = "A window overlooking the pristine Mendell City."; + icon = 'icons/effects/city.dmi'; + icon_state = "win1"; + name = "window"; pixel_y = 33 }, /turf/simulated/floor/marble/dark, @@ -1249,7 +1313,11 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen, -/obj/structure/window{ +/obj/effect/decal/fake_object{ + desc = "A window overlooking the pristine Mendell City."; + icon = 'icons/effects/city.dmi'; + icon_state = "win3"; + name = "window"; pixel_y = 33 }, /turf/unsimulated/floor{ @@ -1310,7 +1378,12 @@ }, /area/city/mendell) "gF" = ( -/obj/structure/shelf{ +/obj/effect/decal/fake_object{ + desc = "A nondescript decorative shelf."; + icon = 'icons/effects/city.dmi'; + icon_state = "shelf"; + layer = 2.7; + name = "shelf"; pixel_y = 35 }, /obj/structure/filingcabinet/chestdrawer, @@ -1540,7 +1613,11 @@ /turf/simulated/floor/carpet/rubber, /area/city/mendell/interior) "hO" = ( -/obj/structure/window{ +/obj/effect/decal/fake_object{ + desc = "A window overlooking the pristine Mendell City."; + icon = 'icons/effects/city.dmi'; + icon_state = "win1"; + name = "window"; pixel_y = -32 }, /turf/unsimulated/floor{ @@ -1563,8 +1640,12 @@ /area/city/mendell/interior) "hW" = ( /obj/structure/table/wood, -/obj/structure/television{ +/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"; layer = 9; + name = "expensive flatscreen holovision"; pixel_y = 15 }, /obj/structure/window/reinforced{ @@ -1604,7 +1685,11 @@ }, /area/city/mendell) "ih" = ( -/obj/structure/window{ +/obj/effect/decal/fake_object{ + desc = "A window overlooking the pristine Mendell City."; + icon = 'icons/effects/city.dmi'; + icon_state = "win1"; + name = "window"; pixel_y = -32 }, /turf/simulated/floor/carpet, @@ -1658,7 +1743,12 @@ /turf/simulated/floor/carpet, /area/city/mendell/interior) "iO" = ( -/obj/structure/television{ +/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"; pixel_y = 15 }, /obj/structure/table/wood, @@ -1846,6 +1936,12 @@ }, /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, @@ -1952,7 +2048,12 @@ /turf/simulated/floor/shuttle/black, /area/city/mendell) "kx" = ( -/obj/structure/vent{ +/obj/effect/decal/fake_object{ + desc = "A nondescript vent."; + icon = 'icons/effects/city.dmi'; + icon_state = "vent"; + layer = 2.7; + name = "wall vent"; pixel_x = 6; pixel_y = 25 }, @@ -2184,7 +2285,12 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/structure/vent{ +/obj/effect/decal/fake_object{ + desc = "A nondescript vent."; + icon = 'icons/effects/city.dmi'; + icon_state = "vent"; + layer = 2.7; + name = "wall vent"; pixel_x = 6; pixel_y = 25 }, @@ -2193,6 +2299,19 @@ 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, @@ -2246,14 +2365,29 @@ /turf/simulated/floor/tiled/dark, /area/city/mendell) "mo" = ( -/obj/structure/shelf{ +/obj/effect/decal/fake_object{ + desc = "A nondescript decorative shelf."; + icon = 'icons/effects/city.dmi'; + icon_state = "shelf"; + layer = 2.7; + name = "shelf"; pixel_y = 35 }, /obj/structure/table/wood, -/obj/structure/television{ +/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"; pixel_y = 15 }, -/obj/structure/vent{ +/obj/effect/decal/fake_object{ + desc = "A nondescript vent."; + icon = 'icons/effects/city.dmi'; + icon_state = "vent"; + layer = 2.7; + name = "wall vent"; pixel_x = 6; pixel_y = 25 }, @@ -2287,7 +2421,11 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen, -/obj/structure/window{ +/obj/effect/decal/fake_object{ + desc = "A window overlooking the pristine Mendell City."; + icon = 'icons/effects/city.dmi'; + icon_state = "win3"; + name = "window"; pixel_y = 32 }, /turf/unsimulated/floor{ @@ -3149,7 +3287,12 @@ /area/city/mendell) "rH" = ( /obj/structure/table/wood, -/obj/structure/television{ +/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"; pixel_y = 15 }, /turf/unsimulated/floor{ @@ -3267,7 +3410,11 @@ "st" = ( /obj/structure/bed/padded, /obj/item/bedsheet/black, -/obj/structure/window{ +/obj/effect/decal/fake_object{ + desc = "A window overlooking the pristine Mendell City."; + icon = 'icons/effects/city.dmi'; + icon_state = "win1"; + name = "window"; pixel_y = 32 }, /turf/simulated/floor/carpet, @@ -3360,7 +3507,12 @@ /turf/simulated/floor/beach/water/pool, /area/city/mendell/interior) "tn" = ( -/obj/structure/outlet{ +/obj/effect/decal/fake_object{ + desc = "Power outlets, in space!"; + icon = 'icons/effects/city.dmi'; + icon_state = "outlet"; + layer = 2.7; + name = "power outlets"; pixel_x = 21; pixel_y = 9 }, @@ -3415,7 +3567,12 @@ /turf/simulated/floor/tiled, /area/city/mendell/interior) "tM" = ( -/obj/structure/shelf{ +/obj/effect/decal/fake_object{ + desc = "A nondescript decorative shelf."; + icon = 'icons/effects/city.dmi'; + icon_state = "shelf2"; + layer = 2.7; + name = "shelf"; pixel_y = 35 }, /turf/unsimulated/floor{ @@ -3562,7 +3719,11 @@ /turf/simulated/floor/tiled/ramp, /area/city/mendell/interior) "uL" = ( -/obj/structure/window{ +/obj/effect/decal/fake_object{ + desc = "A window overlooking the pristine Mendell City."; + icon = 'icons/effects/city.dmi'; + icon_state = "win1"; + name = "window"; pixel_y = 33 }, /turf/simulated/floor/marble/dark, @@ -4266,7 +4427,14 @@ }, /area/city/mendell/interior) "yj" = ( -/obj/structure/ac_unit, +/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" + }, /turf/simulated/floor/tiled, /area/city/mendell/interior) "yk" = ( @@ -4292,6 +4460,17 @@ 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 @@ -4394,7 +4573,12 @@ /turf/simulated/floor/marble/dark, /area/city/mendell/interior) "zi" = ( -/obj/structure/outlet{ +/obj/effect/decal/fake_object{ + desc = "Power outlets, in space!"; + icon = 'icons/effects/city.dmi'; + icon_state = "outlet"; + layer = 2.7; + name = "power outlets"; pixel_y = -12 }, /turf/unsimulated/floor{ @@ -4405,7 +4589,12 @@ /turf/simulated/floor/carpet/art, /area/city/mendell/interior) "zl" = ( -/obj/structure/outlet{ +/obj/effect/decal/fake_object{ + desc = "Power outlets, in space!"; + icon = 'icons/effects/city.dmi'; + icon_state = "outlet"; + layer = 2.7; + name = "power outlets"; pixel_y = -12 }, /turf/simulated/floor/carpet, @@ -4569,7 +4758,12 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/shelf{ +/obj/effect/decal/fake_object{ + desc = "A nondescript decorative shelf."; + icon = 'icons/effects/city.dmi'; + icon_state = "shelf1"; + layer = 2.7; + name = "shelf"; pixel_y = 35 }, /obj/structure/table/wood, @@ -4578,7 +4772,11 @@ /area/city/mendell/interior) "At" = ( /obj/machinery/recharge_station, -/obj/structure/window{ +/obj/effect/decal/fake_object{ + desc = "A window overlooking the pristine Mendell City."; + icon = 'icons/effects/city.dmi'; + icon_state = "win2"; + name = "window"; pixel_y = 33 }, /turf/unsimulated/floor{ @@ -4793,6 +4991,13 @@ }, /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, @@ -4914,7 +5119,11 @@ /turf/simulated/floor/tiled/white, /area/city/mendell/interior) "CF" = ( -/obj/structure/window{ +/obj/effect/decal/fake_object{ + desc = "A window overlooking the pristine Mendell City."; + icon = 'icons/effects/city.dmi'; + icon_state = "win1"; + name = "window"; pixel_y = 33 }, /turf/simulated/floor/tiled/ramp/bottom{ @@ -4928,7 +5137,11 @@ /area/city/mendell/interior) "CI" = ( /obj/machinery/recharge_station, -/obj/structure/window{ +/obj/effect/decal/fake_object{ + desc = "A window overlooking the pristine Mendell City."; + icon = 'icons/effects/city.dmi'; + icon_state = "win2"; + name = "window"; pixel_y = 32 }, /turf/unsimulated/floor{ @@ -5130,7 +5343,12 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/structure/shelf{ +/obj/effect/decal/fake_object{ + desc = "A nondescript decorative shelf."; + icon = 'icons/effects/city.dmi'; + icon_state = "shelf1"; + layer = 2.7; + name = "shelf"; pixel_y = 35 }, /turf/unsimulated/floor{ @@ -5263,7 +5481,11 @@ /turf/simulated/floor/tiled, /area/city/mendell/interior) "Eh" = ( -/obj/structure/window{ +/obj/effect/decal/fake_object{ + desc = "A window overlooking the pristine Mendell City."; + icon = 'icons/effects/city.dmi'; + icon_state = "win1"; + name = "window"; pixel_y = 33 }, /turf/simulated/floor/tiled/ramp{ @@ -5297,8 +5519,12 @@ /turf/simulated/floor/tiled/dark, /area/city/mendell/interior) "Ez" = ( -/obj/structure/console{ - layer = 2.7 +/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" }, /turf/simulated/floor/carpet, /area/city/mendell/interior) @@ -5388,7 +5614,12 @@ /obj/structure/bed/stool/chair/padded/blue{ dir = 8 }, -/obj/structure/shelf{ +/obj/effect/decal/fake_object{ + desc = "A nondescript decorative shelf."; + icon = 'icons/effects/city.dmi'; + icon_state = "shelf1"; + layer = 2.7; + name = "shelf"; pixel_y = 35 }, /turf/unsimulated/floor{ @@ -5396,6 +5627,13 @@ }, /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, @@ -5654,7 +5892,12 @@ }, /area/city/mendell/interior) "HD" = ( -/obj/structure/shelf{ +/obj/effect/decal/fake_object{ + desc = "A nondescript decorative shelf."; + icon = 'icons/effects/city.dmi'; + icon_state = "shelf"; + layer = 2.7; + name = "shelf"; pixel_y = 35 }, /turf/simulated/floor/carpet, @@ -5684,7 +5927,12 @@ /obj/item/towel, /obj/item/towel, /obj/item/towel, -/obj/structure/shelf{ +/obj/effect/decal/fake_object{ + desc = "A nondescript decorative shelf."; + icon = 'icons/effects/city.dmi'; + icon_state = "shelf"; + layer = 2.7; + name = "shelf"; pixel_y = 35 }, /turf/unsimulated/floor{ @@ -5692,7 +5940,11 @@ }, /area/city/mendell/interior) "HN" = ( -/obj/structure/window{ +/obj/effect/decal/fake_object{ + desc = "A window overlooking the pristine Mendell City."; + icon = 'icons/effects/city.dmi'; + icon_state = "win3"; + name = "window"; pixel_y = -32 }, /turf/unsimulated/floor{ @@ -5785,6 +6037,10 @@ /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, @@ -5833,7 +6089,12 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/structure/outlet{ +/obj/effect/decal/fake_object{ + desc = "Power outlets, in space!"; + icon = 'icons/effects/city.dmi'; + icon_state = "outlet"; + layer = 2.7; + name = "power outlets"; pixel_x = -3; pixel_y = 35 }, @@ -5924,6 +6185,13 @@ }, /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 }, @@ -6611,10 +6879,20 @@ /area/city/mendell/interior) "MP" = ( /obj/structure/table/wood, -/obj/structure/television{ +/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"; pixel_y = 15 }, -/obj/structure/vent{ +/obj/effect/decal/fake_object{ + desc = "A nondescript vent."; + icon = 'icons/effects/city.dmi'; + icon_state = "vent"; + layer = 2.7; + name = "wall vent"; pixel_x = 6; pixel_y = 25 }, @@ -6658,7 +6936,12 @@ /area/city/mendell) "Nb" = ( /obj/machinery/door/window/eastleft, -/obj/structure/outlet{ +/obj/effect/decal/fake_object{ + desc = "Power outlets, in space!"; + icon = 'icons/effects/city.dmi'; + icon_state = "outlet"; + layer = 2.7; + name = "power outlets"; pixel_y = -12 }, /turf/simulated/floor/wood, @@ -6676,7 +6959,11 @@ /area/city/mendell) "Nh" = ( /obj/structure/table/wood, -/obj/structure/television{ +/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"; pixel_y = 15 }, /turf/simulated/floor/wood, @@ -6740,7 +7027,12 @@ /turf/simulated/floor/carpet, /area/city/mendell/interior) "NM" = ( -/obj/structure/shelf{ +/obj/effect/decal/fake_object{ + desc = "A nondescript decorative shelf."; + icon = 'icons/effects/city.dmi'; + icon_state = "shelf"; + layer = 2.7; + name = "shelf"; pixel_y = 35 }, /obj/random/pottedplant, @@ -7254,7 +7546,11 @@ }, /area/city/mendell) "Ql" = ( -/obj/structure/window{ +/obj/effect/decal/fake_object{ + desc = "A window overlooking the pristine Mendell City."; + icon = 'icons/effects/city.dmi'; + icon_state = "win3"; + name = "window"; pixel_y = 33 }, /turf/simulated/floor/tiled/ramp{ @@ -7607,6 +7903,17 @@ 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 @@ -8079,7 +8386,12 @@ }, /area/city/mendell/interior) "Vf" = ( -/obj/structure/shelf{ +/obj/effect/decal/fake_object{ + desc = "A nondescript decorative shelf."; + icon = 'icons/effects/city.dmi'; + icon_state = "shelf"; + layer = 2.7; + name = "shelf"; pixel_y = 35 }, /turf/unsimulated/floor{ @@ -8099,7 +8411,14 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/structure/ac_unit, +/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" + }, /turf/simulated/floor/tiled, /area/city/mendell/interior) "Vl" = ( @@ -8137,7 +8456,11 @@ }, /area/city/mendell/interior) "Vz" = ( -/obj/structure/window{ +/obj/effect/decal/fake_object{ + desc = "A window overlooking the pristine Mendell City."; + icon = 'icons/effects/city.dmi'; + icon_state = "win3"; + name = "window"; pixel_y = 33 }, /turf/simulated/floor/tiled/ramp/bottom{ @@ -8222,7 +8545,12 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/structure/outlet{ +/obj/effect/decal/fake_object{ + desc = "Power outlets, in space!"; + icon = 'icons/effects/city.dmi'; + icon_state = "outlet"; + layer = 2.7; + name = "power outlets"; pixel_y = -12 }, /turf/simulated/floor/carpet, @@ -8447,6 +8775,17 @@ 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{ @@ -8618,14 +8957,24 @@ /area/city/mendell/interior) "Yz" = ( /obj/structure/table/wood, -/obj/structure/television{ +/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"; pixel_y = 15 }, /turf/simulated/floor/carpet, /area/city/mendell/interior) "YD" = ( /obj/random/pottedplant, -/obj/structure/vent{ +/obj/effect/decal/fake_object{ + desc = "A nondescript vent."; + icon = 'icons/effects/city.dmi'; + icon_state = "vent"; + layer = 2.7; + name = "wall vent"; pixel_x = 6; pixel_y = 25 }, @@ -8891,7 +9240,12 @@ /turf/simulated/floor/shuttle/dark_blue, /area/shuttle/city) "ZY" = ( -/obj/structure/vent{ +/obj/effect/decal/fake_object{ + desc = "A nondescript vent."; + icon = 'icons/effects/city.dmi'; + icon_state = "vent"; + layer = 2.7; + name = "wall vent"; pixel_x = 6; pixel_y = 25 }, @@ -16759,8 +17113,8 @@ ZL CP CP CP -ao -pK +CP +Sf ny ny ny @@ -16847,7 +17201,7 @@ CP CP CP CP -pK +WZ ny ny CP @@ -18812,7 +19166,7 @@ hx rz CP CP -cF +IA CP js nn @@ -19020,7 +19374,7 @@ ZL ZL bo ZG -ac +jy ZG ZG ZG @@ -19194,7 +19548,7 @@ ZL ZL bk ZG -ac +jy ZG ZG ZG @@ -19396,8 +19750,8 @@ zU Eq AN CP -cF -cF +IA +IA CP fa Hn @@ -19461,8 +19815,8 @@ QK Uk pc pc -ao -sm +CP +df ZG Dt DI @@ -19564,7 +19918,7 @@ CP CP CP ae -ae +af CP Eq Eq @@ -19849,7 +20203,7 @@ Rb Iw jq tj -cF +IA ZL ZL ZL @@ -19911,7 +20265,7 @@ UZ UZ ob CP -ah +ag ah CP Eq @@ -20023,7 +20377,7 @@ fg WA EA Lz -cF +IA ZL ZL ZL @@ -20262,7 +20616,7 @@ GI Dt Dt Xs -cF +IA Eq Eq Eq @@ -20349,7 +20703,7 @@ CP CP Dt Dt -cF +IA Eq Eq Eq @@ -20424,8 +20778,8 @@ CP CP CP CP -ao -JQ +CP +ys JQ Af Af @@ -20440,7 +20794,7 @@ CP ug ug CP -cF +IA CP CP yA @@ -20512,7 +20866,7 @@ Dt OU av CP -sm +lR sm eV eV @@ -20615,7 +20969,7 @@ ZG ZG ZG ZG -cF +IA CY yU yU @@ -20676,7 +21030,7 @@ ZG ZG ZG lc -cF +IA JQ Dt Dt @@ -20702,7 +21056,7 @@ Dt Dt ZG ZG -cF +IA Dt Dt Dt @@ -20763,7 +21117,7 @@ ZG ZG ZG ZG -cF +IA JQ sm Ph @@ -20789,7 +21143,7 @@ KX Dt ZG ZG -cF +IA Dt Dt Dt @@ -20850,41 +21204,41 @@ ZG ZG ZG tQ -cF -cF -cF +IA +IA +IA CP -cF -cF -cF +IA +IA +IA CP CP CP -cF -cF -cF +IA +IA +IA CP -cF -cF -cF +IA +IA +IA CP CP CP Dt -ao +CP BQ Dt ZG tQ CP -cF +IA yY yY -cF +IA CP GX jH -cF +IA Vi yj CP @@ -20892,8 +21246,8 @@ YX qT xY kZ -cF -cF +IA +IA ZL ZL ZL @@ -20971,7 +21325,7 @@ kY jH GX GX -cF +IA GX GX CP @@ -20980,7 +21334,7 @@ ny ny QI JF -cF +IA ZL ZL ZL @@ -21058,7 +21412,7 @@ GX GX GX GX -cF +IA GX GX CP @@ -21067,7 +21421,7 @@ Lw ny ny oE -cF +IA ZL ZL ZL @@ -21154,7 +21508,7 @@ CP zk zk zk -cF +IA ZL ZL ZL @@ -21241,7 +21595,7 @@ CP jX zk zk -cF +IA ZL ZL ZL @@ -21328,7 +21682,7 @@ CP zk zO zO -cF +IA ZL ZL ZL @@ -21464,7 +21818,7 @@ jB jB hd oT -cF +IA Bl Df Df @@ -21551,7 +21905,7 @@ jB jB hd UZ -cF +IA Bn Eq Go @@ -21638,7 +21992,7 @@ jB jB hd oT -cF +IA Bx Eq Go @@ -21660,7 +22014,7 @@ kd GX kd GX -cF +IA kd GX gZ @@ -21725,7 +22079,7 @@ jB jB hd UZ -cF +IA Bn Eq Go @@ -21751,8 +22105,8 @@ OQ kd GX gZ -cF -cF +IA +IA CP CU CU @@ -21812,7 +22166,7 @@ jB jB hd oT -cF +IA BD yY yY @@ -21838,12 +22192,12 @@ cF kd GX GX -cF +IA fh gG ny ny -cF +IA GX wS ZG @@ -21917,20 +22271,20 @@ CP Dt Dt Ix -cF +IA Ee -cF +IA BL WG GX GX GX -cF +IA kd ny ny ny -cF +IA GX wS ZG @@ -22012,12 +22366,12 @@ Vh vJ GX GX -cF +IA fh Gf ny ny -cF +IA GX wS ZG @@ -22095,12 +22449,12 @@ vJ GX vJ GX -cF +cL vJ GX gZ -cF -cF +IA +IA CP CU CU @@ -22182,7 +22536,7 @@ vJ GX vJ GX -cF +IA vJ GX gZ @@ -22356,7 +22710,7 @@ vJ GX vJ wP -cF +cL vJ GX Ln @@ -22607,11 +22961,11 @@ ZG ZG ZG tQ -cF +IA sj Df Qx -cF +IA Rs ZG ZG @@ -22772,9 +23126,9 @@ nH VY VY yz -cF +IA Tp -cF +IA CP Uc eX @@ -22792,9 +23146,9 @@ CX eX jp CP -cF +IA Tp -cF +IA nH VY VY @@ -22859,7 +23213,7 @@ VY VY VY VY -cF +IA ZL ZL ZL @@ -22881,7 +23235,7 @@ ZL ZL ZL Ju -cF +IA VY VY VY @@ -22946,7 +23300,7 @@ VY VY VY VY -cF +IA ZL ZL ZL @@ -22968,7 +23322,7 @@ ZL ZL ZL ZL -cF +IA VY VY VY @@ -23055,7 +23409,7 @@ ZL ZL ZL ZL -cF +IA Df Df Df @@ -23064,7 +23418,7 @@ CP Hp EO Yu -cF +IA vk EO yL @@ -23111,7 +23465,7 @@ bL Ga EO Yu -cF +IA vk EO EO @@ -23120,7 +23474,7 @@ Df Df Df Df -cF +IA ZL ZL ZL @@ -23207,7 +23561,7 @@ sj Df Df Qx -cF +IA ZL ZL ZL @@ -23229,7 +23583,7 @@ ZL ZL ZL ZL -cF +IA sj Df Df @@ -23652,7 +24006,7 @@ FM Lo Rj uO -cF +IA FM yQ yQ @@ -23737,9 +24091,9 @@ FM FM FM Yu -cF +IA vk -cF +IA FM yQ GJ @@ -23826,7 +24180,7 @@ Po ZS po vr -cF +IA FM yQ cW @@ -23981,7 +24335,7 @@ cK ho ho ls -cF +IA rk ho oZ @@ -24000,7 +24354,7 @@ EO sF EO EO -cF +IA FM yQ GJ @@ -24071,7 +24425,7 @@ ho oD ho ls -cF +IA vk Px UZ @@ -24087,7 +24441,7 @@ yL CP EO EO -cF +IA FM yQ yQ @@ -24174,7 +24528,7 @@ EO EO EO EO -cF +IA Hk yQ yQ @@ -24435,11 +24789,11 @@ wp CG CA ho -cF +IA ho -cF +IA ho -cF +IA FM yQ CP @@ -24593,7 +24947,7 @@ ho oZ ho ls -cF +IA vk wo UZ @@ -24677,7 +25031,7 @@ cK ho ho ls -cF +IA rk ho oD @@ -24696,7 +25050,7 @@ EO EO EO EO -cF +IA FM yQ EO @@ -24721,7 +25075,7 @@ GJ rl CG CG -cF +IA ZL ZL ZL @@ -24783,7 +25137,7 @@ EO EO EO EO -cF +IA FM yQ EO @@ -24870,7 +25224,7 @@ EO cW EO EO -cF +IA FM yQ EO @@ -24895,7 +25249,7 @@ EO rl CG Sp -cF +IA ZL ZL ZL @@ -24982,7 +25336,7 @@ EO rl CG rc -cF +IA ZL ZL ZL @@ -25046,9 +25400,9 @@ PF PF CP CP -cF +IA Tp -cF +IA CP CP CP @@ -25067,8 +25421,8 @@ nr yZ CP Tp -cF -cF +IA +IA CP ZL ZL @@ -28959,7 +29313,7 @@ Kg xD xD xD -tY +aj xD xD hM @@ -30351,7 +30705,7 @@ Kg xD xD xD -aN +ao 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 3413be842af..4838afd0d15 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/street_sign/yield{ +/obj/structure/road_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/exit{ +/obj/structure/sign/urban{ 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 c2e3f0334e0..46cfdbb79de 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, +/obj/machinery/mech_recharger/automobile, /turf/simulated/floor/asphalt, /area/exoplanet/grass/konyang) "gZ" = ( @@ -111,7 +111,7 @@ /turf/simulated/floor/foundation, /area/exoplanet/grass/konyang) "hm" = ( -/obj/structure/street_sign/yield{ +/obj/structure/road_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/pylon, +/obj/structure/urban/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 01f509d2610..1419df0a1b5 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, +/obj/machinery/mech_recharger/automobile, /obj/effect/decal/curb{ dir = 10 }, @@ -204,7 +204,7 @@ /turf/simulated/floor/exoplanet/concrete, /area/exoplanet/grass/konyang) "ki" = ( -/obj/machinery/mech_recharger, +/obj/machinery/mech_recharger/automobile, /obj/effect/decal/curb{ dir = 6 }, @@ -915,7 +915,14 @@ /turf/simulated/floor/exoplanet/tiled/white, /area/konyang/house_small) "Vx" = ( -/obj/structure/ac_unit, +/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" + }, /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 31a8efa2e07..224314ee611 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/street_sign/yield{ +/obj/structure/road_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/street_sign/yield{ +/obj/structure/road_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/street_sign/yield{ +/obj/structure/road_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/street_sign/yield{ +/obj/structure/road_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/street_sign/yield{ +/obj/structure/road_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/street_sign/yield{ +/obj/structure/road_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/street_sign/yield{ +/obj/structure/road_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/street_sign/yield{ +/obj/structure/road_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 8eb13b2df44..ebf7f9e63d6 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/corner, +/obj/structure/chainlink_fence, /turf/simulated/floor/exoplanet/konyang, /area/konyang_fireoutpost) "eQ" = ( @@ -461,8 +461,7 @@ /area/konyang_fireoutpost) "qV" = ( /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 + dir = 8 }, /turf/simulated/floor/concrete, /area/konyang_fireoutpost) @@ -715,12 +714,11 @@ /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" = ( @@ -998,13 +996,6 @@ /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{ @@ -1018,8 +1009,7 @@ /area/exoplanet/grass/konyang) "QS" = ( /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 + dir = 8 }, /obj/structure/closet/outhouse, /turf/simulated/floor/concrete, @@ -1098,8 +1088,7 @@ /area/exoplanet/grass/konyang) "TI" = ( /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 + dir = 8 }, /turf/simulated/floor/exoplanet/konyang, /area/konyang_fireoutpost) @@ -1247,7 +1236,10 @@ "ZQ" = ( /obj/structure/chainlink_fence{ dir = 8; - pixel_x = -16 + pixel_y = -19 + }, +/obj/structure/chainlink_fence{ + dir = 8 }, /turf/simulated/floor/exoplanet/konyang/wilting, /area/konyang_fireoutpost) @@ -1580,7 +1572,7 @@ qV Fq TI ZQ -ZQ +mh Pp fO BY @@ -2150,7 +2142,7 @@ zS "} (29,1,1) = {" yn -Qj +sK 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 9ef7097bb49..27835d97c03 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/random/dirt_75, -/obj/structure/flora/rock/konyang/small, /obj/structure/chainlink_fence{ - dir = 8 + dir = 1 }, +/obj/random/dirt_75, +/obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/exoplanet/dirt_konyang, /area/space) "iq" = ( @@ -1262,12 +1262,6 @@ }, /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, @@ -2531,10 +2525,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" = ( @@ -3077,8 +3071,8 @@ Fo TI iq Om -WC -im +bn +ft xf xf xf @@ -3127,9 +3121,9 @@ Om pu il iq -yI -aD -bn +TI +im +WC 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 9a40058ea27..d93fa73e544 100644 --- a/maps/random_ruins/exoplanets/konyang/hivebot_burrows_2.dmm +++ b/maps/random_ruins/exoplanets/konyang/hivebot_burrows_2.dmm @@ -386,6 +386,9 @@ /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" = ( @@ -3836,6 +3839,9 @@ /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, @@ -5485,7 +5491,7 @@ iq eO XM Xi -fc +Oh Zq XQ XQ @@ -5537,8 +5543,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 0af73e13ca4..94353de1aa2 100644 --- a/maps/random_ruins/exoplanets/konyang/homestead.dmm +++ b/maps/random_ruins/exoplanets/konyang/homestead.dmm @@ -47,6 +47,9 @@ /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, @@ -65,13 +68,6 @@ }, /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{ @@ -192,11 +188,13 @@ /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" = ( @@ -221,7 +219,9 @@ /turf/simulated/floor/wood, /area/konyang_homestead) "jN" = ( -/obj/structure/chainlink_fence/corner, +/obj/structure/chainlink_fence{ + layer = 9.1 + }, /obj/structure/chainlink_fence{ dir = 4 }, @@ -319,6 +319,9 @@ /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, @@ -364,10 +367,12 @@ /turf/simulated/floor/lino/diamond, /area/konyang_homestead) "pC" = ( -/obj/structure/flora/bush/konyang_reeds, -/obj/structure/reagent_dispensers/watertank, -/turf/simulated/floor/exoplanet/konyang, -/area/konyang_homestead) +/obj/structure/chainlink_fence{ + dir = 8 + }, +/obj/structure/flora/ausbushes/sparsegrass, +/turf/simulated/floor/exoplanet/dirt_konyang, +/area/exoplanet/grass/konyang) "pT" = ( /obj/structure/lattice/catwalk/indoor/tatami{ dir = 8 @@ -461,13 +466,6 @@ }, /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 @@ -578,13 +576,6 @@ }, /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, @@ -742,6 +733,9 @@ /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{ @@ -749,14 +743,6 @@ }, /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{ @@ -875,6 +861,7 @@ dir = 1 }, /obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/exoplanet/konyang, /area/konyang_homestead) "Kn" = ( @@ -1121,12 +1108,6 @@ /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 @@ -1550,8 +1531,8 @@ gR gR bz rw -tj -Gm +bz +xu UU Nh tp @@ -1582,7 +1563,7 @@ vJ bz bz oT -xW +pC Fe UU ki @@ -1613,7 +1594,7 @@ bz gR oT bz -ZM +oT nZ cV UU @@ -1645,7 +1626,7 @@ bz xF kG bz -dT +kG cj va Qn @@ -1677,7 +1658,7 @@ QY QY SW gR -xf +oT Qn Qn Qn @@ -1810,7 +1791,7 @@ Qn Qn Qn Qn -pC +No Qv nn hG diff --git a/maps/random_ruins/exoplanets/konyang/landing_zone.dmm b/maps/random_ruins/exoplanets/konyang/landing_zone.dmm index 1b01eb70eb6..597a4599eab 100644 --- a/maps/random_ruins/exoplanets/konyang/landing_zone.dmm +++ b/maps/random_ruins/exoplanets/konyang/landing_zone.dmm @@ -191,8 +191,7 @@ dir = 4 }, /obj/structure/utility_pole/street/on{ - dir = 8; - pixel_x = -26 + dir = 8 }, /turf/simulated/floor/asphalt, /area/konyang_landing_zone) @@ -215,8 +214,7 @@ /area/konyang_landing_zone) "cN" = ( /obj/structure/utility_pole/street/on{ - dir = 8; - pixel_x = -14 + dir = 8 }, /obj/structure/ledge/quarter{ dir = 4 @@ -272,11 +270,10 @@ /area/konyang_landing_zone/command_center/greenhouse) "dJ" = ( /obj/structure/chainlink_fence{ - layer = 9.1 + dir = 4 }, /obj/structure/chainlink_fence{ - dir = 4; - pixel_x = 16 + layer = 9.1 }, /turf/simulated/floor/exoplanet/konyang, /area/konyang_landing_zone) @@ -487,7 +484,7 @@ /obj/structure/ledge/quarter{ dir = 4 }, -/obj/structure/street_sign/yield{ +/obj/structure/road_sign/yield{ name = "NO TRESPASSING sign"; desc = "A sign which declares this area as SCC property and staunchly declines any thought of trespassing." }, @@ -506,11 +503,10 @@ /turf/simulated/floor/exoplanet/konyang, /area/konyang_landing_zone) "gB" = ( -/obj/effect/decal/road_marking/reflector, /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 + dir = 8 }, +/obj/effect/decal/road_marking/reflector, /turf/simulated/floor/concrete, /area/konyang_landing_zone) "gL" = ( @@ -610,7 +606,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{ @@ -675,14 +671,6 @@ }, /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" @@ -801,9 +789,7 @@ /obj/structure/ledge{ dir = 1 }, -/obj/structure/utility_pole/street/on{ - pixel_y = 0 - }, +/obj/structure/utility_pole/street/on, /turf/simulated/floor/asphalt, /area/konyang_landing_zone) "jZ" = ( @@ -825,8 +811,7 @@ /area/konyang_landing_zone) "ke" = ( /obj/structure/utility_pole/street/on{ - dir = 4; - pixel_x = -50 + dir = 4 }, /obj/structure/ledge/quarter{ dir = 9 @@ -912,11 +897,10 @@ /turf/simulated/floor/airless, /area/konyang_landing_zone/command_center/landing_pads) "lp" = ( -/obj/effect/floor_decal/konyang_flowers, /obj/structure/chainlink_fence{ - dir = 4; - pixel_x = 16 + dir = 4 }, +/obj/effect/floor_decal/konyang_flowers, /turf/simulated/floor/exoplanet/konyang, /area/konyang_landing_zone) "lr" = ( @@ -968,8 +952,7 @@ dir = 8 }, /obj/structure/utility_pole/street/on{ - dir = 4; - pixel_x = -40 + dir = 4 }, /turf/simulated/floor/asphalt, /area/konyang_landing_zone) @@ -1030,8 +1013,7 @@ /area/konyang_landing_zone/command_center/landing_pads) "mF" = ( /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 + dir = 8 }, /turf/simulated/floor/concrete, /area/konyang_landing_zone) @@ -1050,6 +1032,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/structure/chainlink_fence{ + dir = 4 + }, /obj/structure/railing/mapped{ dir = 4 }, @@ -1241,13 +1226,12 @@ /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" = ( @@ -1354,7 +1338,7 @@ /turf/simulated/floor/reinforced, /area/konyang_landing_zone/command_center/garage) "rz" = ( -/obj/structure/street_sign/yield{ +/obj/structure/road_sign/yield{ name = "NO TRESPASSING sign"; desc = "A sign which declares this area as SCC property and staunchly declines any thought of trespassing." }, @@ -1375,8 +1359,7 @@ dir = 1 }, /obj/structure/chainlink_fence{ - dir = 4; - pixel_x = 16 + dir = 4 }, /turf/simulated/floor/exoplanet/konyang, /area/konyang_landing_zone) @@ -1387,12 +1370,11 @@ /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" = ( @@ -1556,8 +1538,7 @@ layer = 9.1 }, /obj/structure/chainlink_fence{ - dir = 4; - pixel_x = 16 + dir = 4 }, /turf/simulated/floor/concrete, /area/konyang_landing_zone) @@ -1567,14 +1548,6 @@ }, /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; @@ -1594,19 +1567,6 @@ /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" @@ -1736,13 +1696,12 @@ /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" = ( @@ -1757,7 +1716,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{ @@ -1767,12 +1726,10 @@ /area/konyang_landing_zone/command_center) "wz" = ( /obj/structure/chainlink_fence{ - dir = 4; - pixel_x = 16 + dir = 8 }, /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 + dir = 4 }, /turf/simulated/floor/concrete, /area/konyang_landing_zone) @@ -2114,7 +2071,7 @@ dir = 5 }, /obj/structure/utility_pole/street/on{ - pixel_y = 0 + dir = 8 }, /turf/simulated/floor/asphalt, /area/konyang_landing_zone) @@ -2343,16 +2300,13 @@ /turf/simulated/floor/asphalt, /area/konyang_landing_zone) "Dv" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black, /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 - }, -/obj/structure/chainlink_fence{ - dir = 4; - pixel_x = 16 + dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/concrete, -/area/konyang_landing_zone) +/area/konyang_landing_zone/command_center/landing_pads) "DP" = ( /obj/effect/decal/curb{ dir = 8 @@ -2360,11 +2314,10 @@ /turf/simulated/floor/asphalt, /area/konyang_landing_zone) "DQ" = ( -/obj/structure/flora/bush/konyang_reeds, /obj/structure/chainlink_fence{ - dir = 4; - pixel_x = 16 + dir = 4 }, +/obj/structure/flora/bush/konyang_reeds, /turf/simulated/floor/exoplanet/konyang, /area/konyang_landing_zone) "DS" = ( @@ -2396,13 +2349,12 @@ /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" = ( @@ -2512,8 +2464,7 @@ /area/konyang_landing_zone/command_center/landing_pads) "Fz" = ( /obj/structure/chainlink_fence{ - dir = 4; - pixel_x = 16 + dir = 4 }, /turf/simulated/floor/exoplanet/konyang, /area/konyang_landing_zone) @@ -2553,7 +2504,7 @@ dir = 8 }, /obj/structure/flora/bush/konyang_reeds, -/obj/structure/street_sign/yield{ +/obj/structure/road_sign/yield{ name = "NO TRESPASSING sign"; desc = "A sign which declares this area as SCC property and staunchly declines any thought of trespassing." }, @@ -2917,6 +2868,9 @@ /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; @@ -2957,8 +2911,7 @@ dir = 9 }, /obj/structure/utility_pole/street/on{ - dir = 4; - pixel_y = 0 + dir = 4 }, /turf/simulated/floor/asphalt, /area/konyang_landing_zone) @@ -3052,15 +3005,14 @@ /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/street_sign/yield{ +/obj/structure/road_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" = ( @@ -3069,10 +3021,6 @@ /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" = ( @@ -3236,7 +3184,7 @@ /obj/structure/ledge/quarter{ dir = 8 }, -/obj/structure/street_sign/yield{ +/obj/structure/road_sign/yield{ name = "NO TRESPASSING sign"; desc = "A sign which declares this area as SCC property and staunchly declines any thought of trespassing." }, @@ -3284,7 +3232,12 @@ /turf/simulated/floor/plating, /area/konyang_landing_zone/command_center/landing_pads) "Oa" = ( -/obj/effect/decal/road_marking/reflector, +/obj/structure/chainlink_fence{ + dir = 4 + }, +/obj/structure/chainlink_fence{ + layer = 9.1 + }, /turf/simulated/floor/concrete, /area/konyang_landing_zone) "Ob" = ( @@ -3327,11 +3280,10 @@ /turf/simulated/floor/exoplanet/konyang, /area/konyang_landing_zone/command_center/landing_pads) "Oz" = ( -/obj/effect/decal/road_marking/reflector, /obj/structure/chainlink_fence{ - dir = 4; - pixel_x = 16 + dir = 4 }, +/obj/effect/decal/road_marking/reflector, /turf/simulated/floor/concrete, /area/konyang_landing_zone) "OA" = ( @@ -3380,14 +3332,13 @@ /turf/simulated/floor/plating, /area/konyang_landing_zone/command_center/landing_pads) "OW" = ( -/obj/structure/street_sign/yield{ +/obj/structure/chainlink_fence{ + dir = 4 + }, +/obj/structure/road_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" = ( @@ -3555,8 +3506,7 @@ "QM" = ( /obj/structure/chainlink_fence, /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 + dir = 8 }, /turf/simulated/floor/concrete, /area/konyang_landing_zone) @@ -3760,16 +3710,6 @@ /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{ @@ -3801,20 +3741,18 @@ /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" = ( @@ -4033,8 +3971,7 @@ /area/konyang_landing_zone) "WF" = ( /obj/structure/utility_pole/street/on{ - dir = 4; - pixel_x = -50 + dir = 4 }, /obj/structure/ledge/quarter{ dir = 9 @@ -4078,8 +4015,7 @@ /area/konyang_landing_zone/command_center/garage) "Xv" = ( /obj/structure/chainlink_fence{ - dir = 4; - pixel_x = 16 + dir = 4 }, /turf/simulated/floor/concrete, /area/konyang_landing_zone) @@ -4851,7 +4787,7 @@ YV Jp Lb Ll -tI +lX dK dK mF @@ -4914,7 +4850,7 @@ tm CU CU CU -Tc +EV dK aG dK @@ -5028,7 +4964,7 @@ jn xo bJ sK -iM +pz dK dK dK @@ -5270,7 +5206,7 @@ EO jL jL Pl -rM +Dv rM rM rM @@ -5336,10 +5272,10 @@ Xv Xv Xv Xv -dK -Oa -Oa -Oa +Xv +Oz +Oz +Oz dK dK Gc @@ -6752,9 +6688,9 @@ Ly pT dK dK -Xv -Xv -Xv +dK +dK +dK Xv Xv Xv @@ -6791,24 +6727,24 @@ fe TD Zi dK -tv +gB gB gB wz -Dv -Dv -Dv -Dv -Dv -Dv +wz +wz +wz +wz +wz +wz mF mF mF TB -Dv +wz +wz Xv -Xv -tp +Oa 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 04d0f690064..78417b34b0d 100644 --- a/maps/random_ruins/exoplanets/konyang/ocean/naval_landing_zone.dmm +++ b/maps/random_ruins/exoplanets/konyang/ocean/naval_landing_zone.dmm @@ -26,14 +26,13 @@ /turf/simulated/floor/reinforced/carbon_dioxide, /area/konyang_landing_zone/command_center/landing_pads) "as" = ( -/obj/structure/railing/mapped{ +/obj/structure/ledge{ dir = 8 }, -/obj/effect/floor_decal/industrial/outline/engineering, /obj/structure/utility_pole/street/on{ - dir = 8 + dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/asphalt, /area/konyang_landing_zone) "av" = ( /turf/simulated/wall, @@ -210,7 +209,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{ @@ -278,9 +277,6 @@ /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" = ( @@ -539,14 +535,13 @@ /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 }, -/turf/simulated/floor/tiled, +/obj/structure/ledge/quarter{ + dir = 4 + }, +/turf/simulated/floor/exoplanet/water/konyang, /area/konyang_landing_zone) "fP" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ @@ -747,13 +742,13 @@ /turf/simulated/floor/tiled/full, /area/konyang_landing_zone/command_center/reactor) "hW" = ( -/obj/structure/railing/mapped{ - layer = 9.1 +/obj/structure/ledge/quarter{ + dir = 8 }, /obj/structure/utility_pole/street/on{ - dir = 1 + dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/asphalt, /area/konyang_landing_zone) "ir" = ( /obj/effect/decal/curb{ @@ -1104,14 +1099,6 @@ /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" @@ -1157,9 +1144,6 @@ /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" = ( @@ -1532,15 +1516,6 @@ }, /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, @@ -2018,13 +1993,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 = 8 + dir = 4 }, -/turf/simulated/floor/tiled, +/obj/structure/ledge/quarter{ + dir = 9 + }, +/turf/simulated/floor/exoplanet/water/konyang, /area/konyang_landing_zone) "Bt" = ( /obj/structure/tank_wall/air{ @@ -2264,6 +2239,9 @@ /obj/structure/ledge{ dir = 5 }, +/obj/structure/utility_pole/street/on{ + dir = 8 + }, /turf/simulated/floor/asphalt, /area/konyang_landing_zone) "Fr" = ( @@ -2285,7 +2263,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{ @@ -2379,13 +2357,11 @@ /turf/simulated/floor/tiled/full, /area/konyang_landing_zone/command_center/reactor) "GE" = ( -/obj/structure/chainlink_fence{ - dir = 4 +/obj/structure/ledge{ + dir = 1 }, -/obj/structure/utility_pole/street/on{ - dir = 4 - }, -/turf/simulated/floor/tiled, +/obj/structure/utility_pole/street/on, +/turf/simulated/floor/asphalt, /area/konyang_landing_zone) "GG" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ @@ -2399,16 +2375,16 @@ /turf/simulated/floor/plating, /area/konyang_landing_zone/command_center/landing_pads) "GL" = ( -/obj/structure/railing/mapped{ +/obj/structure/ledge/quarter{ dir = 8 }, -/obj/structure/railing/mapped{ - dir = 4 - }, /obj/structure/utility_pole/street/on{ - dir = 8 + dir = 4 }, -/turf/simulated/floor/tiled, +/obj/effect/decal/road_marking{ + dir = 4 + }, +/turf/simulated/floor/asphalt, /area/konyang_landing_zone) "GM" = ( /obj/effect/floor_decal/industrial/warning, @@ -2422,11 +2398,13 @@ /turf/simulated/floor/asphalt, /area/konyang_landing_zone) "GQ" = ( -/obj/structure/utility_pole/street/on, -/obj/structure/railing/mapped{ - layer = 9.1 +/obj/structure/ledge{ + dir = 4 }, -/turf/simulated/floor/tiled, +/obj/structure/utility_pole/street/on{ + dir = 8 + }, +/turf/simulated/floor/asphalt, /area/konyang_landing_zone) "GR" = ( /obj/structure/cable/yellow{ @@ -2468,6 +2446,9 @@ /obj/structure/ledge{ dir = 4 }, +/obj/structure/utility_pole/street/on{ + dir = 8 + }, /obj/structure/railing/mapped{ layer = 9.1 }, @@ -2535,9 +2516,6 @@ /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" = ( @@ -3019,9 +2997,6 @@ /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" = ( @@ -3110,19 +3085,6 @@ /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 @@ -3150,16 +3112,6 @@ "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{ @@ -3295,15 +3247,6 @@ }, /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, @@ -3318,9 +3261,6 @@ /obj/structure/railing/mapped{ dir = 8 }, -/obj/structure/utility_pole/street/on{ - dir = 8 - }, /turf/simulated/floor/tiled, /area/konyang_landing_zone) "Tz" = ( @@ -3411,6 +3351,9 @@ /obj/structure/ledge{ dir = 9 }, +/obj/structure/utility_pole/street/on{ + dir = 4 + }, /turf/simulated/floor/asphalt, /area/konyang_landing_zone) "UD" = ( @@ -3534,6 +3477,9 @@ /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" = ( @@ -3643,7 +3589,12 @@ /area/konyang_landing_zone/command_center) "XW" = ( /obj/structure/ledge, -/obj/structure/railing/mapped, +/obj/structure/utility_pole/street/on{ + dir = 1 + }, +/obj/structure/railing/mapped{ + layer = 9.1 + }, /turf/simulated/floor/asphalt, /area/konyang_landing_zone) "Yd" = ( @@ -3754,14 +3705,13 @@ /turf/simulated/floor/asphalt, /area/konyang_landing_zone) "ZR" = ( -/obj/effect/decal/curb{ - dir = 5 +/obj/structure/ledge/quarter{ + dir = 4 }, -/obj/effect/decal/road_marking/reflector{ +/obj/structure/utility_pole/street/on{ dir = 8 }, -/obj/structure/crane/body, -/turf/simulated/floor/asphalt, +/turf/simulated/floor/exoplanet/water/konyang, /area/konyang_landing_zone) "ZW" = ( /turf/simulated/wall, @@ -4318,7 +4268,7 @@ Wz VD VD VD -VD +ZR mW rS rS @@ -4371,7 +4321,7 @@ gF gF gF gF -Bh +gF gF gF gF @@ -4418,7 +4368,7 @@ On Og Og Og -ZR +gj ae By ae @@ -4532,7 +4482,7 @@ Jh Zy lM vX -nD +Ua ae ae ae @@ -4813,22 +4763,11 @@ uy vy HZ TY -RT +FR FR FR jH jH -Tp -jH -jH -jH -jH -Tp -jH -jH -jH -jH -Tp jH jH jH @@ -4836,12 +4775,23 @@ jH jH jH jH -Tp jH jH jH jH -RT +jH +jH +jH +jH +jH +jH +jH +jH +jH +jH +jH +jH +FR FR FR ae @@ -4875,6 +4825,17 @@ Ha Ha Ha Ha +as +Ha +Ha +Ha +Ha +as +Ha +Ha +Ha +Ha +as Ha Ha Ha @@ -4882,23 +4843,12 @@ Ha Ha Ha Ha +as Ha Ha Ha Ha -Ha -Ha -Ha -Ha -Ha -Ha -Ha -Ha -Ha -Ha -Ha -Ha -Ha +as Ha EB ae @@ -4908,7 +4858,7 @@ ae Xr fV ta -VD +fI VD VD mW @@ -5072,7 +5022,7 @@ FU FU FU XW -ug +RG uy Oz ae @@ -5097,8 +5047,8 @@ xd aa tR ae -GQ -mI +RG +GE FU lb Pq @@ -5250,7 +5200,7 @@ ae YY VP fn -sL +Bh jG jG iX @@ -5300,7 +5250,7 @@ FU FU FU XW -ug +RG uy Oz ae @@ -5325,8 +5275,8 @@ aa vO JG rJ -GQ -mI +RG +GE FU lb Pq @@ -5592,7 +5542,7 @@ ae YY ta VD -VD +fI VD VD mW @@ -5667,8 +5617,8 @@ wR av sp rJ -GQ -mI +RG +GE FU lb Pq @@ -5756,7 +5706,7 @@ FU FU FU XW -hW +RG uy Oz ae @@ -5934,7 +5884,7 @@ ae od VP od -sL +Bh jG jG iX @@ -5984,7 +5934,7 @@ DZ FU FU XW -ug +RG ta xR Ni @@ -6009,8 +5959,8 @@ kj bZ zG rJ -GQ -mI +RG +GE FU Bf mA @@ -6147,12 +6097,12 @@ wE wE wE wE +GQ wE wE wE wE -wE -wE +GQ wE vn ae @@ -6204,12 +6154,12 @@ gF gF gF gF -Bh gF gF gF gF -fI +gF +Lr Lr Lr ae @@ -6243,12 +6193,12 @@ wE wE wE wE +GQ wE wE wE wE -wE -wE +GQ wE wE RC @@ -6261,12 +6211,12 @@ ae ae Xs Xs -GE Xs Xs Xs Xs -GE +Xs +Xs Xs Xs Xs @@ -6295,22 +6245,22 @@ ac di rJ ae -fI +Lr Lr Lr Dy Dy -Rs Dy Dy Dy Dy -as +Dy +eS eS eS dC MH -GL +MH jH JD yn @@ -6318,12 +6268,12 @@ LY dw cm Tz -cm +GL Tz cm Tz cm -Tz +hW cm Tz cm diff --git a/maps/random_ruins/exoplanets/konyang/telecomms_outpost.dmm b/maps/random_ruins/exoplanets/konyang/telecomms_outpost.dmm index 13ce5aa91e2..ac8b3696aae 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, +/obj/machinery/mech_recharger/automobile, /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, +/obj/machinery/mech_recharger/automobile, /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/street_sign/yield{ +/obj/structure/road_sign/yield{ name = "NO TRESPASSING sign"; desc = "A sign which declares this area as SCC property and staunchly declines any thought of trespassing." }, @@ -716,7 +716,14 @@ /turf/simulated/floor/exoplanet/lino/diamond, /area/konyang_telecomms_outpost) "Nh" = ( -/obj/structure/ac_unit, +/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" + }, /turf/simulated/floor/bluegrid/cooled, /area/konyang_telecomms_outpost) "Nm" = ( @@ -792,7 +799,7 @@ /area/konyang_telecomms_outpost) "Qe" = ( /obj/structure/chainlink_fence, -/obj/structure/street_sign/yield{ +/obj/structure/road_sign/yield{ name = "NO TRESPASSING sign"; desc = "A sign which declares this area as SCC property and staunchly declines any thought of trespassing." }, @@ -913,7 +920,7 @@ /area/konyang_telecomms_outpost) "Vi" = ( /obj/effect/decal/road_marking/thin, -/obj/machinery/mech_recharger, +/obj/machinery/mech_recharger/automobile, /obj/vehicle/bike/speeder{ dir = 4 }, @@ -997,8 +1004,13 @@ /area/konyang_telecomms_outpost) "YL" = ( /obj/structure/table/wood, -/obj/structure/television{ +/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"; 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 c1c92dd6cfb..9438a393717 100644 --- a/maps/random_ruins/exoplanets/konyang/village.dmm +++ b/maps/random_ruins/exoplanets/konyang/village.dmm @@ -36,11 +36,10 @@ /turf/simulated/floor/tiled/white, /area/konyang_village) "aP" = ( -/obj/structure/flora/rock/konyang, /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 + dir = 4 }, +/obj/structure/flora/rock/konyang, /turf/simulated/floor/exoplanet/dirt_konyang, /area/konyang_village) "aV" = ( @@ -94,11 +93,10 @@ /turf/simulated/floor/exoplanet/dirt_konyang, /area/konyang_village) "bU" = ( -/obj/structure/flora/bush/konyang_reeds, /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 + dir = 4 }, +/obj/structure/flora/bush/konyang_reeds, /turf/simulated/floor/exoplanet/konyang, /area/konyang_village) "bV" = ( @@ -119,8 +117,7 @@ /area/konyang_village) "cd" = ( /obj/structure/chainlink_fence{ - dir = 4; - pixel_x = 16 + dir = 4 }, /obj/random/dirt_75, /obj/random/junk{ @@ -129,12 +126,12 @@ /turf/simulated/floor/sidewalk/blocks, /area/konyang_village) "dc" = ( -/obj/structure/flora/rock/konyang, /obj/structure/chainlink_fence{ layer = 9.1; dir = 1 }, -/turf/simulated/floor/exoplanet/dirt_konyang, +/obj/structure/flora/bush/konyang_reeds, +/turf/simulated/floor/exoplanet/konyang, /area/konyang_village) "de" = ( /obj/structure/table/rack/clothing{ @@ -227,29 +224,32 @@ /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; - pixel_x = -16 + dir = 8 }, +/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 }, @@ -357,12 +357,11 @@ /area/konyang_village) "hQ" = ( /obj/structure/chainlink_fence{ - layer = 9.1; - dir = 1 + dir = 8 }, /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 + layer = 9.1; + dir = 1 }, /turf/simulated/floor/exoplanet/konyang, /area/konyang_village) @@ -391,11 +390,10 @@ /turf/simulated/floor/exoplanet/konyang, /area/konyang_village) "iI" = ( -/obj/random/dirt_75, /obj/structure/chainlink_fence{ - dir = 4; - pixel_x = 16 + dir = 4 }, +/obj/random/dirt_75, /turf/simulated/floor/sidewalk, /area/konyang_village) "iP" = ( @@ -464,11 +462,10 @@ /turf/simulated/floor/tiled/white, /area/konyang_village) "ll" = ( -/obj/random/dirt_75, /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 + dir = 8 }, +/obj/random/dirt_75, /turf/simulated/floor/sidewalk, /area/konyang_village) "lR" = ( @@ -561,6 +558,10 @@ /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, @@ -656,6 +657,13 @@ }, /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 @@ -697,11 +705,10 @@ /turf/simulated/floor/concrete/square, /area/konyang_village) "pX" = ( -/obj/structure/flora/rock/konyang/small, /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 + dir = 8 }, +/obj/structure/flora/rock/konyang/small, /turf/simulated/floor/exoplanet/dirt_konyang, /area/konyang_village) "qL" = ( @@ -745,8 +752,7 @@ /area/konyang_village) "rl" = ( /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 + dir = 8 }, /turf/simulated/floor/exoplanet/dirt_konyang, /area/konyang_village) @@ -858,6 +864,10 @@ /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, @@ -941,23 +951,22 @@ /turf/simulated/floor/sidewalk, /area/konyang_village) "wt" = ( -/obj/structure/flora/bush/konyang_reeds, /obj/structure/chainlink_fence{ layer = 9.1; dir = 1 }, -/turf/simulated/floor/exoplanet/konyang, +/obj/random/dirt_75, +/turf/simulated/floor/sidewalk/blocks, /area/konyang_village) "wB" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/exoplanet/dirt_konyang, /area/konyang_village) "xg" = ( -/obj/random/dirt_75, /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 + dir = 8 }, +/obj/random/dirt_75, /turf/simulated/floor/exoplanet/dirt_konyang, /area/konyang_village) "xo" = ( @@ -1017,10 +1026,6 @@ /obj/structure/chainlink_fence{ dir = 8 }, -/obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 - }, /turf/simulated/floor/exoplanet/konyang, /area/konyang_village) "yI" = ( @@ -1088,8 +1093,7 @@ /area/konyang_village) "At" = ( /obj/structure/chainlink_fence{ - dir = 8; - pixel_x = -16 + dir = 8 }, /obj/random/dirt_75, /obj/random/dirt_75, @@ -1335,11 +1339,9 @@ layer = 9.1; dir = 1 }, -/obj/structure/chainlink_fence{ - dir = 4; - pixel_x = 16 - }, -/turf/simulated/floor/exoplanet/dirt_konyang, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/sidewalk/blocks, /area/konyang_village) "JJ" = ( /obj/structure/table/rack, @@ -1494,12 +1496,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" = ( @@ -1538,10 +1540,6 @@ /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, @@ -1721,7 +1719,7 @@ layer = 9.1; dir = 1 }, -/turf/simulated/floor/exoplanet/dirt_konyang, +/turf/simulated/floor/sidewalk, /area/konyang_village) "SD" = ( /turf/simulated/floor/exoplanet/konyang, @@ -2502,7 +2500,7 @@ SD (15,1,1) = {" SD SD -hQ +SD fa At fm @@ -2544,7 +2542,7 @@ SD (16,1,1) = {" SD SD -SA +ys nu vS gk @@ -2628,7 +2626,7 @@ SD (18,1,1) = {" NF Tl -SA +ys uN xU VV @@ -2670,7 +2668,7 @@ SD (19,1,1) = {" ys ys -Jh +ys Mx cd iI @@ -2715,8 +2713,8 @@ SD UB ys ys -SA -VV +ys +Jh Cg xY BJ @@ -2757,8 +2755,8 @@ SD SD ys Tl -SA -VV +ys +Jh VC dq dq @@ -2799,8 +2797,8 @@ SD SD SD SD -SA -aH +ys +wt UB BJ SD @@ -2841,8 +2839,8 @@ SD SD SD NF -SA -aH +ys +wt JS NF SD @@ -2883,8 +2881,8 @@ SD vF SD NF -SA -Kv +ys +oF ys oe SD @@ -2925,13 +2923,13 @@ SD SD SD NF -dc -fF +UB +SA pn Ui SD SD -Oq +SD Bb KO KO @@ -2967,8 +2965,8 @@ SD PB SD SD -DA SD +DA PB aH SD @@ -3009,8 +3007,8 @@ NF SD SD Li -wt -SD +NF +DA SD aH NF @@ -3051,8 +3049,8 @@ NF SD SD SD -wt -SD +NF +DA SD pn SD @@ -3093,8 +3091,8 @@ NF NF SD SD -wt NF +dc SD pn SD @@ -3135,8 +3133,8 @@ NF SD SD ys -SA -SD +ys +DA SD fF SD @@ -3219,8 +3217,8 @@ SD Li SD SD -DA SD +DA SD SD SD @@ -3261,8 +3259,8 @@ vF SD Hg SD -DA SD +DA SD vF NF diff --git a/maps/random_ruins/exoplanets/konyang/zombie_outpost.dmm b/maps/random_ruins/exoplanets/konyang/zombie_outpost.dmm index af61c0548a0..76c22a8f153 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/street_sign/yield{ +/obj/structure/road_sign/yield{ name = "NO TRESPASSING sign"; desc = "A sign which declares this area as SCC property and staunchly declines any thought of trespassing." }, @@ -303,7 +303,14 @@ /turf/simulated/floor/exoplanet/lino/diamond, /area/konyang_telecomms_outpost) "nt" = ( -/obj/structure/ac_unit, +/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" + }, /turf/simulated/floor/bluegrid/cooled, /area/konyang_telecomms_outpost) "nz" = ( @@ -321,7 +328,7 @@ /area/konyang_telecomms_outpost) "on" = ( /obj/effect/decal/road_marking/thin, -/obj/machinery/mech_recharger, +/obj/machinery/mech_recharger/automobile, /turf/simulated/floor/exoplanet/asphalt, /area/konyang_telecomms_outpost) "oG" = ( @@ -378,7 +385,7 @@ /area/konyang_telecomms_outpost) "rm" = ( /obj/effect/decal/road_marking/thin, -/obj/machinery/mech_recharger, +/obj/machinery/mech_recharger/automobile, /obj/vehicle/bike/speeder{ dir = 4 }, @@ -472,7 +479,7 @@ /area/konyang_telecomms_outpost) "uR" = ( /obj/structure/chainlink_fence, -/obj/structure/street_sign/yield{ +/obj/structure/road_sign/yield{ name = "NO TRESPASSING sign"; desc = "A sign which declares this area as SCC property and staunchly declines any thought of trespassing." }, @@ -562,7 +569,7 @@ /area/konyang_telecomms_outpost) "yr" = ( /obj/effect/decal/road_marking/thin, -/obj/machinery/mech_recharger, +/obj/machinery/mech_recharger/automobile, /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 c8231330a91..6ac25cfaaa7 100644 --- a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm +++ b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm @@ -35784,8 +35784,13 @@ /area/horizon/holodeck/source_desert) "eFm" = ( /obj/structure/table/wood, -/obj/structure/television{ +/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"; layer = 6.1; + name = "expensive flatscreen holovision"; pixel_y = 15 }, /obj/effect/floor_decal/spline/fancy/wood{ @@ -37400,7 +37405,14 @@ layer = 2.4; name = "grate" }, -/obj/structure/ac_unit, +/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/effect/floor_decal/spline/fancy/wood{ dir = 5 }, @@ -38993,7 +39005,12 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, -/obj/structure/television{ +/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"; pixel_y = 15 }, /obj/structure/table/wood, @@ -39583,8 +39600,12 @@ }, /area/horizon/holodeck/source_beach) "sJV" = ( -/obj/structure/console{ - layer = 2.7 +/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/effect/floor_decal/spline/fancy/wood{ dir = 8