From 8ea2d8a935114aeebd56cab15219b84a91210fe2 Mon Sep 17 00:00:00 2001 From: BluBerry016 <50649185+unit0016@users.noreply.github.com> Date: Fri, 16 Aug 2024 16:44:00 -0400 Subject: [PATCH] Fixes For Bitrunner Domains & Safehouses To Fit The New Perspective (#85832) ## About The Pull Request Acts on another of my claims in #85583 . Back on the main repo; time to get serious. This fixes the bitrunner domains and safehouses (all vetted in-game) to be 100% there for wallening. Buttons moved and fixed; wallmounts fixed (there were some types in there we delibrately linted against using; how did those slip by?? Are we just not checking the folders for these with linters?); the whole nine yards. Maps not touched by this PR were already 100% above board. ## Why It's Good For The Game Bitrunner maps were still mostly playable but this irons out the rough edges (mapping-side; there's a few sprite issues in the "i played every map help me" section) to make them proper presentable again. I had to play through each bitrunner map in private just to test this PR. Send help.
Screenshots Of Each Domain / Safehouse As Proof Of This Insanity

Peaceful Domains:

Beach Bar

![image](https://github.com/user-attachments/assets/b50e617a-9938-49ab-9d42-a82becc668c6) ![image](https://github.com/user-attachments/assets/442d3bd3-7ca2-450f-acb9-d8fa0278a40b)

Breeze Bay

![image](https://github.com/user-attachments/assets/56705aef-9824-451f-b141-4945b928a01f) ![image](https://github.com/user-attachments/assets/774f80b9-89bb-448a-8cc5-24f5d03f15c4)

Gondola Asteroid

![image](https://github.com/user-attachments/assets/886a055e-e112-46da-800e-c94d0edcf8f2) ![image](https://github.com/user-attachments/assets/4accac92-d710-4f50-88ed-b7b1cd0908d0)

Vaporwave

![image](https://github.com/user-attachments/assets/adf25801-8251-4ba2-835c-f270080bcf0b) ![image](https://github.com/user-attachments/assets/1bc8780c-e3dd-4592-ab5b-be2225f1b0c7)

Easy Domains:
Clown Planet

![image](https://github.com/user-attachments/assets/2ef17360-2330-4fe1-9703-60efca5b6901) ![image](https://github.com/user-attachments/assets/e37f34d3-ca74-46e2-a517-66c6f290b023)

Disposal Pipe Factory

![image](https://github.com/user-attachments/assets/a98ad4aa-7c42-4c69-b62b-e8f2e1b17c53) ![image](https://github.com/user-attachments/assets/b203cb20-c8ea-4457-a597-7a93b908e748)

Snakes And Ladders

![image](https://github.com/user-attachments/assets/46cbf2de-a630-47fa-968c-203fafb3f15b) ![image](https://github.com/user-attachments/assets/6e023a4b-aec6-482b-bb74-08d96a9cae77)

Xeno

![image](https://github.com/user-attachments/assets/be9d4be7-8db6-4a7c-b0dd-bc0c2c2d8430) ![image](https://github.com/user-attachments/assets/05047446-d9ee-49a8-8ee9-cfb1d575c898)

Medium:
Crate Chaos (!!!)

![image](https://github.com/user-attachments/assets/665850fb-b880-43db-9709-dc63d7068e62)

Abductor Ship

![image](https://github.com/user-attachments/assets/53c13719-c41d-44e3-8890-5167f22e94b3) ![image](https://github.com/user-attachments/assets/2faf40cc-1b6e-4c7c-b61c-6d7834af2633)

(I skipped the megafauna arenas because they're vetted already)
5/9ths Already

![image](https://github.com/user-attachments/assets/7595f005-8c54-40c2-be66-4a9bda8994f7) ![image](https://github.com/user-attachments/assets/df25e6b8-3f9e-4a0e-b920-ca1e092eb001)

Corsair Cove

![image](https://github.com/user-attachments/assets/698f5c1e-acd1-42b5-807a-b49708e61ad8) ![image](https://github.com/user-attachments/assets/d6bb6554-c69d-44cd-9628-86df7bcf4800)

(Infected Domain had the same issue Crate Chaos had.)
Syndicate Assault

![image](https://github.com/user-attachments/assets/fed1104c-1f40-4d14-ace3-a8fa671bfa82) ![image](https://github.com/user-attachments/assets/24c39d41-7d04-4608-82d0-4a186b3e11a1)

Hard:
Island Brawl

![image](https://github.com/user-attachments/assets/21b88e54-21fc-44e1-951d-d7fd607001b1)

You thought I was fuckin' joking. Smh

## Changelog :cl: fix: Every bitrunner domain's been patched up for the new perspective shift. /:cl: --- _maps/safehouses/den.dmm | 16 +- _maps/safehouses/ice.dmm | 11 +- _maps/safehouses/shuttle.dmm | 11 +- _maps/safehouses/shuttle_space.dmm | 11 +- _maps/safehouses/wood.dmm | 10 +- _maps/virtual_domains/abductor_ship.dmm | 58 ++-- _maps/virtual_domains/beach_bar.dmm | 150 ++++++----- _maps/virtual_domains/breeze_bay.dmm | 8 +- _maps/virtual_domains/clown_planet.dmm | 24 +- .../virtual_domains/fredingtonfastingbear.dmm | 158 +++++------ _maps/virtual_domains/gondola_asteroid.dmm | 12 +- _maps/virtual_domains/island_brawl.dmm | 68 ++--- _maps/virtual_domains/pipedream.dmm | 235 ++++++----------- _maps/virtual_domains/pirates.dmm | 24 +- _maps/virtual_domains/syndicate_assault.dmm | 248 ++++++++++-------- _maps/virtual_domains/vaporwave.dmm | 12 +- _maps/virtual_domains/xeno_nest.dmm | 14 +- code/modules/bitrunning/turfs.dm | 3 +- icons/turf/walls/binary_wall.dmi | Bin 0 -> 8139 bytes icons/turf/walls/binary_wall.png | Bin 0 -> 2583 bytes icons/turf/walls/binary_wall.png.toml | 1 + 21 files changed, 532 insertions(+), 542 deletions(-) create mode 100644 icons/turf/walls/binary_wall.dmi create mode 100644 icons/turf/walls/binary_wall.png create mode 100644 icons/turf/walls/binary_wall.png.toml diff --git a/_maps/safehouses/den.dmm b/_maps/safehouses/den.dmm index 9b0b37f5351..41c73bae065 100644 --- a/_maps/safehouses/den.dmm +++ b/_maps/safehouses/den.dmm @@ -49,12 +49,12 @@ /obj/effect/turf_decal/trimline/yellow/line{ dir = 9 }, +/obj/machinery/light/small/directional/north, /turf/open/floor/pod/dark, /area/virtual_domain/safehouse) "u" = ( /obj/structure/railing, /obj/effect/turf_decal/siding/dark, -/obj/structure/sign/poster/contraband/hacking_guide/directional/east, /obj/effect/landmark/bitrunning/cache_goal_turf, /obj/effect/turf_decal/loading_area{ dir = 4 @@ -126,6 +126,10 @@ }, /turf/open/floor/pod/dark, /area/virtual_domain/safehouse) +"Q" = ( +/obj/structure/sign/poster/contraband/hacking_guide/directional/north, +/turf/open/floor/pod/dark, +/area/virtual_domain/safehouse) "R" = ( /obj/effect/turf_decal/trimline/yellow/line{ dir = 4 @@ -135,7 +139,6 @@ "U" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/sign/departments/cargo/directional/west, -/obj/machinery/light/small/directional/west, /turf/open/floor/pod, /area/virtual_domain/safehouse) "W" = ( @@ -152,10 +155,11 @@ /area/virtual_domain/safehouse) "Y" = ( /obj/structure/table/reinforced/plastitaniumglass, -/obj/machinery/button/door{ - pixel_x = 4; +/obj/machinery/button/door/table{ + id = "safehouseshutter"; + name = "Window shutters"; pixel_y = 4; - id = "safehouseshutter" + pixel_x = 4 }, /obj/effect/spawner/random/food_or_drink/refreshing_beverage{ pixel_y = 6; @@ -204,7 +208,7 @@ i "} (5,1,1) = {" C -M +Q l e I diff --git a/_maps/safehouses/ice.dmm b/_maps/safehouses/ice.dmm index f9716de7103..f1ff8b31897 100644 --- a/_maps/safehouses/ice.dmm +++ b/_maps/safehouses/ice.dmm @@ -25,11 +25,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/snowed, /area/virtual_domain/safehouse) -"g" = ( -/obj/effect/spawner/structure/window/ice, -/obj/structure/barricade/wooden/crude/snow, -/turf/open/floor/plating/snowed, -/area/virtual_domain/safehouse) "i" = ( /turf/closed/wall/ice, /area/virtual_domain/safehouse) @@ -203,7 +198,7 @@ (1,1,1) = {" i i -g +a a i e @@ -251,8 +246,8 @@ i (7,1,1) = {" i i -g -g +a +a i i "} diff --git a/_maps/safehouses/shuttle.dmm b/_maps/safehouses/shuttle.dmm index 19f0c4b73aa..1056464db6c 100644 --- a/_maps/safehouses/shuttle.dmm +++ b/_maps/safehouses/shuttle.dmm @@ -34,7 +34,9 @@ }, /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt, -/obj/item/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency{ + pixel_y = 8 + }, /turf/open/floor/iron, /area/virtual_domain/safehouse) "l" = ( @@ -136,9 +138,12 @@ }, /obj/structure/table/reinforced, /obj/item/tank/internals/emergency_oxygen{ - pixel_x = 3 + pixel_x = 3; + pixel_y = 8 + }, +/obj/item/clothing/mask/gas{ + pixel_y = 8 }, -/obj/item/clothing/mask/gas, /turf/open/floor/iron, /area/virtual_domain/safehouse) "L" = ( diff --git a/_maps/safehouses/shuttle_space.dmm b/_maps/safehouses/shuttle_space.dmm index 2f4071a8347..adc77c7bba6 100644 --- a/_maps/safehouses/shuttle_space.dmm +++ b/_maps/safehouses/shuttle_space.dmm @@ -60,7 +60,9 @@ }, /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt, -/obj/item/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency{ + pixel_y = 8 + }, /turf/open/floor/iron, /area/virtual_domain/safehouse) "r" = ( @@ -133,9 +135,12 @@ }, /obj/structure/table/reinforced, /obj/item/tank/internals/emergency_oxygen{ - pixel_x = 3 + pixel_x = 3; + pixel_y = 8 + }, +/obj/item/clothing/mask/gas{ + pixel_y = 8 }, -/obj/item/clothing/mask/gas, /turf/open/floor/iron, /area/virtual_domain/safehouse) "N" = ( diff --git a/_maps/safehouses/wood.dmm b/_maps/safehouses/wood.dmm index 5faa33faa41..919829766d9 100644 --- a/_maps/safehouses/wood.dmm +++ b/_maps/safehouses/wood.dmm @@ -24,7 +24,9 @@ "v" = ( /obj/machinery/light/small/directional/east, /obj/structure/table/wood, -/obj/item/newspaper, +/obj/item/newspaper{ + pixel_y = 8 + }, /turf/open/indestructible/hotelwood, /area/virtual_domain/safehouse) "w" = ( @@ -37,10 +39,6 @@ }, /turf/open/floor/carpet/green, /area/virtual_domain/safehouse) -"z" = ( -/obj/structure/sign/poster/random/directional/east, -/turf/open/indestructible/hotelwood, -/area/virtual_domain/safehouse) "G" = ( /turf/closed/wall/mineral/wood, /area/virtual_domain/safehouse) @@ -110,7 +108,7 @@ G i s J -z +a v i "} diff --git a/_maps/virtual_domains/abductor_ship.dmm b/_maps/virtual_domains/abductor_ship.dmm index b182c50ed66..8f25c17badf 100644 --- a/_maps/virtual_domains/abductor_ship.dmm +++ b/_maps/virtual_domains/abductor_ship.dmm @@ -5,15 +5,15 @@ "cp" = ( /obj/structure/table/abductor, /obj/item/food/soylentgreen{ - pixel_x = -6; - pixel_y = 5 + pixel_x = -1; + pixel_y = 12 }, /turf/open/floor/plating/abductor, /area/virtual_domain) "cr" = ( /obj/item/flashlight/lantern{ pixel_x = 4; - pixel_y = -8; + pixel_y = 8; light_on = 1 }, /obj/item/flashlight/lantern{ @@ -45,7 +45,7 @@ /obj/structure/table/abductor, /obj/item/poster/random_abductor{ pixel_x = 9; - pixel_y = 3 + pixel_y = 10 }, /turf/open/floor/plating/abductor, /area/virtual_domain) @@ -93,11 +93,11 @@ /obj/structure/table/abductor, /obj/item/clothing/head/helmet/abductor{ pixel_x = -5; - pixel_y = 7 + pixel_y = 17 }, /obj/item/abductor/silencer{ pixel_x = 6; - pixel_y = -4 + pixel_y = 6 }, /turf/open/floor/plating/abductor, /area/virtual_domain) @@ -120,7 +120,7 @@ /obj/structure/table/abductor, /obj/item/food/soylentgreen{ pixel_x = 4; - pixel_y = -1 + pixel_y = 12 }, /turf/open/floor/plating/abductor, /area/virtual_domain) @@ -151,10 +151,12 @@ /area/virtual_domain/safehouse) "sv" = ( /obj/structure/table/abductor, -/obj/item/crowbar/abductor, +/obj/item/crowbar/abductor{ + pixel_y = 6 + }, /obj/item/stock_parts/power_store/cell/infinite/abductor{ pixel_x = 5; - pixel_y = -3 + pixel_y = 2 }, /turf/open/floor/plating/abductor, /area/virtual_domain) @@ -169,11 +171,11 @@ /obj/structure/table/abductor, /obj/item/wrench/abductor{ pixel_x = 2; - pixel_y = 7 + pixel_y = 16 }, /obj/item/wirecutters/abductor{ pixel_x = -3; - pixel_y = 4 + pixel_y = 10 }, /turf/open/floor/plating/abductor, /area/virtual_domain) @@ -273,11 +275,11 @@ /obj/item/melee/baton/abductor{ desc = "Even aliens can see the use of a good old-fashioned beating stick."; pixel_x = 6; - pixel_y = -5 + pixel_y = 3 }, /obj/item/gun/energy/shrink_ray{ pixel_x = -5; - pixel_y = 7 + pixel_y = 12 }, /turf/open/floor/plating/abductor, /area/virtual_domain) @@ -316,14 +318,16 @@ /area/virtual_domain) "Rg" = ( /obj/structure/table/abductor, -/obj/item/ammo_box/magazine/smgm45, +/obj/item/ammo_box/magazine/smgm45{ + pixel_y = 8 + }, /obj/item/ammo_box/magazine/smgm45{ pixel_x = 9; - pixel_y = 3 + pixel_y = 13 }, /obj/item/gun/ballistic/automatic/c20r/unrestricted{ pixel_x = -5; - pixel_y = -5 + pixel_y = -1 }, /turf/template_noop, /area/virtual_domain/safehouse) @@ -342,10 +346,6 @@ /turf/open/floor/plating/abductor, /area/virtual_domain) "Uf" = ( -/obj/item/flashlight/seclite{ - pixel_x = 9; - pixel_y = -11 - }, /obj/item/clothing/suit/armor/vest/alt{ pixel_x = 10; pixel_y = 8 @@ -358,13 +358,17 @@ pixel_x = 2; pixel_y = -2 }, +/obj/item/flashlight/seclite{ + pixel_x = 9 + }, /turf/template_noop, /area/virtual_domain/safehouse) "Us" = ( /obj/structure/table/abductor, /obj/item/abductor/mind_device{ desc = "Just holding this makes your head ache."; - pixel_x = 3 + pixel_x = 3; + pixel_y = 12 }, /turf/open/floor/plating/abductor, /area/virtual_domain) @@ -378,7 +382,9 @@ /area/virtual_domain) "VE" = ( /obj/structure/table/abductor, -/obj/item/storage/box/alienhandcuffs, +/obj/item/storage/box/alienhandcuffs{ + pixel_y = 8 + }, /turf/open/floor/plating/abductor, /area/virtual_domain) "VY" = ( @@ -393,17 +399,19 @@ /obj/structure/table/abductor, /obj/item/dualsaber/green{ pixel_x = -5; - pixel_y = 2 + pixel_y = 12 }, /obj/item/gun/ballistic/automatic/c20r/unrestricted{ pixel_x = 8; - pixel_y = -6 + pixel_y = 2 }, /turf/template_noop, /area/virtual_domain/safehouse) "Wk" = ( /obj/structure/table/abductor, -/obj/item/weldingtool/abductor, +/obj/item/weldingtool/abductor{ + pixel_y = 8 + }, /turf/open/floor/plating/abductor, /area/virtual_domain) "WS" = ( diff --git a/_maps/virtual_domains/beach_bar.dmm b/_maps/virtual_domains/beach_bar.dmm index 0b3a037c463..b22a26cd199 100644 --- a/_maps/virtual_domains/beach_bar.dmm +++ b/_maps/virtual_domains/beach_bar.dmm @@ -2,7 +2,6 @@ "ab" = ( /obj/machinery/vending/cigarette/beach, /obj/effect/turf_decal/sand, -/obj/structure/sign/poster/contraband/have_a_puff/directional/west, /turf/open/floor/iron, /area/virtual_domain/fullbright) "ag" = ( @@ -68,6 +67,18 @@ /obj/item/reagent_containers/pill/lsd, /obj/item/reagent_containers/pill/lsd, /obj/item/reagent_containers/pill/lsd, +/obj/item/reagent_containers/pill/zoom{ + pixel_y = 12; + pixel_x = 5 + }, +/obj/item/reagent_containers/pill/zoom{ + pixel_y = 12; + pixel_x = 5 + }, +/obj/item/reagent_containers/pill/zoom{ + pixel_y = 12; + pixel_x = 5 + }, /turf/open/floor/wood, /area/virtual_domain/fullbright) "cv" = ( @@ -281,7 +292,9 @@ /area/virtual_domain/fullbright) "oP" = ( /obj/structure/table/wood, -/obj/machinery/reagentgrinder, +/obj/machinery/reagentgrinder{ + pixel_y = 8 + }, /turf/open/floor/wood, /area/virtual_domain/fullbright) "pr" = ( @@ -305,10 +318,6 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/misc/beach/sand, /area/virtual_domain/fullbright) -"qg" = ( -/obj/structure/sign/poster/contraband/space_up/directional/west, -/turf/open/floor/wood, -/area/virtual_domain/fullbright) "qR" = ( /obj/effect/spawner/structure/window, /obj/structure/curtain, @@ -325,10 +334,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/wood, /area/virtual_domain/fullbright) -"ri" = ( -/obj/structure/sign/poster/official/fruit_bowl, -/turf/closed/wall/mineral/wood/nonmetal, -/area/virtual_domain/fullbright) "rm" = ( /obj/item/storage/crayons, /obj/structure/closet/crate/wooden, @@ -460,13 +465,17 @@ /area/lavaland/surface/outdoors/virtual_domain) "xk" = ( /obj/structure/table/wood/poker, -/obj/item/storage/dice, -/obj/item/stack/spacecash/c1000, +/obj/item/storage/dice{ + pixel_y = 10 + }, +/obj/item/stack/spacecash/c1000{ + pixel_y = 4 + }, /turf/open/floor/wood, /area/virtual_domain/fullbright) "xq" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/window/reinforced/half/directional/west, +/obj/structure/window/reinforced/half/directional/south, /obj/item/megaphone, /turf/open/floor/wood, /area/virtual_domain/fullbright) @@ -486,21 +495,14 @@ /turf/open/floor/wood, /area/virtual_domain/fullbright) "xR" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/half/directional/east, +/obj/structure/window/reinforced/half/directional/north, /obj/structure/chair/stool/directional/south, /obj/item/storage/backpack/duffelbag, /obj/item/clothing/under/shorts/red, /obj/item/clothing/glasses/sunglasses, /turf/open/floor/wood, /area/virtual_domain/fullbright) -"ya" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/pill/zoom, -/obj/item/reagent_containers/pill/zoom, -/obj/item/reagent_containers/pill/zoom, -/turf/open/floor/wood, -/area/virtual_domain/fullbright) "yi" = ( /obj/structure/sink/kitchen/directional/west{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; @@ -542,7 +544,7 @@ /turf/open/floor/plating, /area/virtual_domain/fullbright) "yX" = ( -/obj/structure/chair/stool/bar/directional/south, +/obj/structure/chair/stool/bar/directional/north, /turf/open/floor/carpet/red, /area/virtual_domain/fullbright) "zn" = ( @@ -593,7 +595,8 @@ /area/virtual_domain/fullbright) "AP" = ( /obj/machinery/chem_dispenser/drinks/beer/fullupgrade{ - dir = 1 + dir = 1; + pixel_y = 8 }, /obj/structure/table/wood, /turf/open/floor/wood, @@ -601,11 +604,12 @@ "Br" = ( /obj/structure/table/wood/poker, /obj/item/toy/cards/deck/cas{ - pixel_x = -6 + pixel_x = -6; + pixel_y = 8 }, /obj/item/toy/cards/deck/cas/black{ pixel_x = -6; - pixel_y = 2 + pixel_y = 17 }, /turf/open/floor/wood, /area/virtual_domain/fullbright) @@ -625,7 +629,9 @@ /area/virtual_domain/fullbright) "BJ" = ( /obj/structure/table/wood/poker, -/obj/item/toy/cards/deck, +/obj/item/toy/cards/deck{ + pixel_y = 10 + }, /turf/open/floor/wood, /area/virtual_domain/fullbright) "BM" = ( @@ -647,7 +653,7 @@ /turf/open/floor/iron/grimy, /area/virtual_domain/fullbright) "CA" = ( -/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/half/directional/east, /obj/effect/mob_spawn/ghost_role/human/beach/lifeguard, /turf/open/floor/wood, /area/virtual_domain/fullbright) @@ -656,10 +662,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/wood, /area/virtual_domain/fullbright) -"Db" = ( -/obj/machinery/barsign/all_access, -/turf/closed/wall/mineral/wood/nonmetal, -/area/virtual_domain/fullbright) "Ds" = ( /obj/machinery/door/airlock/public/glass{ name = "Resort Lobby" @@ -676,9 +678,12 @@ /turf/closed/wall/mineral/sandstone, /area/virtual_domain/fullbright) "Em" = ( -/obj/item/reagent_containers/condiment/enzyme, +/obj/item/reagent_containers/condiment/enzyme{ + pixel_y = 14 + }, /obj/item/reagent_containers/cup/beaker{ - pixel_x = 5 + pixel_x = 5; + pixel_y = 3 }, /obj/structure/table, /turf/open/floor/wood, @@ -690,11 +695,12 @@ /area/virtual_domain/fullbright) "Ev" = ( /obj/structure/reagent_dispensers/beerkeg, +/obj/structure/sign/poster/official/high_class_martini/directional/north, /turf/open/floor/wood, /area/virtual_domain/fullbright) "EC" = ( -/obj/structure/sign/warning/gas_mask/directional/west, -/turf/open/floor/plating, +/obj/machinery/barsign/all_access/directional/north, +/turf/open/misc/beach/sand, /area/virtual_domain/fullbright) "EP" = ( /obj/machinery/light/directional/north, @@ -716,12 +722,6 @@ /obj/item/reagent_containers/cup/bottle/nutrient/ez, /turf/open/floor/pod/light, /area/virtual_domain/fullbright) -"FS" = ( -/obj/effect/turf_decal/sand, -/obj/structure/sign/warning/no_smoking/circle/directional/east, -/obj/machinery/light/directional/east, -/turf/open/misc/beach/sand, -/area/virtual_domain/fullbright) "FY" = ( /obj/structure/mineral_door/wood, /turf/open/floor/wood, @@ -736,12 +736,19 @@ /turf/open/misc/beach/sand, /area/virtual_domain/fullbright) "GA" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/item/bikehorn/airhorn, +/obj/structure/window/reinforced/half/directional/north, +/obj/structure/window/reinforced/half/directional/west, +/obj/item/bikehorn/airhorn{ + pixel_y = 11; + pixel_x = 6 + }, /obj/structure/table/wood, -/obj/item/storage/medkit/regular, -/obj/item/storage/medkit/brute, +/obj/item/storage/medkit/regular{ + pixel_y = 8 + }, +/obj/item/storage/medkit/brute{ + pixel_y = 7 + }, /turf/open/floor/wood, /area/virtual_domain/fullbright) "Hs" = ( @@ -767,8 +774,13 @@ /area/virtual_domain/fullbright) "Iv" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/condiment/peppermill, -/obj/item/reagent_containers/condiment/soysauce, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_y = 5 + }, +/obj/item/reagent_containers/condiment/soysauce{ + pixel_y = 9; + pixel_x = 9 + }, /turf/open/floor/wood, /area/virtual_domain/fullbright) "IH" = ( @@ -805,10 +817,6 @@ /obj/structure/flora/rock/style_random, /turf/open/misc/beach/sand, /area/virtual_domain/fullbright) -"Kd" = ( -/obj/structure/sign/warning/secure_area, -/turf/closed/wall/mineral/sandstone, -/area/virtual_domain/fullbright) "KH" = ( /obj/structure/mineral_door/wood{ name = "Croupier's Booth" @@ -905,7 +913,6 @@ /turf/open/misc/beach/sand, /area/virtual_domain/fullbright) "Pg" = ( -/obj/structure/sign/poster/official/high_class_martini/directional/west, /obj/effect/mob_spawn/ghost_role/human/bartender{ dir = 4 }, @@ -917,6 +924,7 @@ /area/virtual_domain/fullbright) "Qb" = ( /obj/machinery/griddle, +/obj/structure/sign/poster/official/fruit_bowl/directional/north, /turf/open/floor/wood, /area/virtual_domain/fullbright) "Qu" = ( @@ -929,7 +937,8 @@ /area/virtual_domain/fullbright) "QX" = ( /obj/machinery/chem_dispenser/drinks/fullupgrade{ - dir = 1 + dir = 1; + pixel_y = 8 }, /obj/structure/table/wood, /obj/machinery/light/small/directional/east, @@ -963,7 +972,8 @@ /area/virtual_domain/fullbright) "SD" = ( /obj/machinery/door/airlock/sandstone{ - name = "Bar Access" + name = "Bar Access"; + dir = 4 }, /turf/open/floor/wood, /area/virtual_domain/fullbright) @@ -1102,7 +1112,7 @@ /turf/open/misc/beach/sand, /area/virtual_domain/fullbright) "Zb" = ( -/obj/structure/sign/poster/official/cohiba_robusto_ad/directional/west, +/obj/structure/chair/stool/bar/directional/north, /turf/open/floor/wood, /area/virtual_domain/fullbright) "Zd" = ( @@ -1609,7 +1619,7 @@ LD LD Fn Fn -Kd +Fn Fn Fn bQ @@ -1650,7 +1660,7 @@ Fn LD pT LD -EC +LD LD pT PM @@ -1685,9 +1695,9 @@ kv Al Fn VA -kT Zb TG +TG Fn Fn Fn @@ -1775,7 +1785,7 @@ yX ag kT BJ -kT +Zb Fn as ab @@ -1998,7 +2008,7 @@ Zt BD Iv BM -Db +BM Nr wD yl @@ -2042,7 +2052,7 @@ TG TG mX BM -wD +EC wD Au wD @@ -2084,7 +2094,7 @@ BM aw TG TG -ya +BM wD wD YJ @@ -2123,7 +2133,7 @@ BM Em TG mq -ri +BM Qb TG TG @@ -2214,9 +2224,9 @@ TG TG CO BM -wD +Nr Yi -XL +wD wD wD wD @@ -2605,7 +2615,7 @@ Gh Ud Ud Ud -FS +ys aE aE aE @@ -2637,7 +2647,7 @@ TG TG TG TG -qg +TG TG Fn Fn diff --git a/_maps/virtual_domains/breeze_bay.dmm b/_maps/virtual_domains/breeze_bay.dmm index 5fa537bccde..1d712e53f5f 100644 --- a/_maps/virtual_domains/breeze_bay.dmm +++ b/_maps/virtual_domains/breeze_bay.dmm @@ -35,11 +35,13 @@ "m" = ( /obj/item/fishing_rod{ pixel_x = 5; - pixel_y = -5 + pixel_y = 4 }, -/obj/item/fishing_rod, /obj/item/fishing_rod{ - pixel_y = 5; + pixel_y = 8 + }, +/obj/item/fishing_rod{ + pixel_y = 12; pixel_x = -5 }, /obj/structure/table/wood, diff --git a/_maps/virtual_domains/clown_planet.dmm b/_maps/virtual_domains/clown_planet.dmm index 37e00bd45fc..43565f2145b 100644 --- a/_maps/virtual_domains/clown_planet.dmm +++ b/_maps/virtual_domains/clown_planet.dmm @@ -355,8 +355,12 @@ invisibility = 101 }, /obj/structure/table, -/obj/item/paper/crumpled/bloody/ruins/lavaland/clown_planet/escape, -/obj/item/pen/fourcolor, +/obj/item/paper/crumpled/bloody/ruins/lavaland/clown_planet/escape{ + pixel_y = 8 + }, +/obj/item/pen/fourcolor{ + pixel_y = 8 + }, /turf/open/indestructible/white, /area/lavaland/surface/outdoors/virtual_domain) "wz" = ( @@ -476,13 +480,17 @@ /turf/closed/indestructible/binary, /area/virtual_domain/fullbright) "FI" = ( -/obj/item/reagent_containers/cup/glass/trophy/gold_cup, +/obj/item/reagent_containers/cup/glass/trophy/gold_cup{ + pixel_y = 12 + }, /obj/structure/table/glass, /turf/open/floor/carpet, /area/lavaland/surface/outdoors/virtual_domain) "Gg" = ( /obj/structure/table/glass, -/obj/item/gun/magic/staff/honk, +/obj/item/gun/magic/staff/honk{ + pixel_y = 8 + }, /turf/open/floor/carpet, /area/lavaland/surface/outdoors/virtual_domain) "Hq" = ( @@ -592,7 +600,9 @@ /area/lavaland/surface/outdoors/virtual_domain) "NW" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/spray/waterflower/superlube, +/obj/item/reagent_containers/spray/waterflower/superlube{ + pixel_y = 8 + }, /turf/open/floor/carpet, /area/lavaland/surface/outdoors/virtual_domain) "Ok" = ( @@ -649,7 +659,9 @@ invisibility = 101 }, /obj/structure/table, -/obj/item/flashlight/lamp/bananalamp, +/obj/item/flashlight/lamp/bananalamp{ + pixel_y = 8 + }, /turf/open/indestructible/white, /area/lavaland/surface/outdoors/virtual_domain) "Sg" = ( diff --git a/_maps/virtual_domains/fredingtonfastingbear.dmm b/_maps/virtual_domains/fredingtonfastingbear.dmm index 422395c72bc..926ea5c60ac 100644 --- a/_maps/virtual_domains/fredingtonfastingbear.dmm +++ b/_maps/virtual_domains/fredingtonfastingbear.dmm @@ -15,12 +15,10 @@ /obj/effect/decal/cleanable/greenglow, /turf/open/floor/iron/kitchen, /area/virtual_domain) -"bP" = ( -/obj/structure/sign/poster/official/report_crimes, -/turf/closed/indestructible/reinforced, -/area/virtual_domain/protected_space/fullbright) "bR" = ( -/obj/machinery/chem_dispenser/drinks/beer, +/obj/machinery/chem_dispenser/drinks/beer{ + pixel_y = 8 + }, /obj/structure/table/wood, /turf/open/floor/iron/kitchen, /area/virtual_domain) @@ -48,11 +46,6 @@ /mob/living/basic/bear/snow, /turf/open/floor/iron/kitchen, /area/virtual_domain) -"cY" = ( -/obj/structure/sign/poster/official/no_erp/directional/north, -/obj/structure/sign/poster/official/no_erp/directional/north, -/turf/closed/indestructible/reinforced, -/area/virtual_domain) "dl" = ( /obj/structure/sign/poster/contraband/blood_geometer/directional/south, /obj/effect/landmark/bitrunning/cache_spawn, @@ -72,10 +65,6 @@ /obj/structure/table/glass, /turf/open/floor/iron/kitchen, /area/virtual_domain) -"ex" = ( -/obj/structure/sign/poster/contraband/bountyhunters/directional/south, -/turf/template_noop, -/area/virtual_domain) "eE" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/effect/turf_decal/tile/bar/opposingcorners, @@ -121,8 +110,9 @@ /turf/open/floor/iron/kitchen, /area/virtual_domain) "gl" = ( -/obj/structure/sign/poster/contraband/blasto_detergent, -/turf/closed/indestructible/reinforced, +/obj/structure/closet/crate/trashcart/filled, +/obj/structure/sign/poster/contraband/blasto_detergent/directional/north, +/turf/open/floor/iron/kitchen, /area/virtual_domain) "gL" = ( /obj/effect/turf_decal/tile/dark_red/opposingcorners, @@ -137,11 +127,13 @@ "hq" = ( /obj/structure/table/reinforced, /obj/item/flashlight/seclite{ - pixel_y = 9 + pixel_y = 19 }, -/obj/item/flashlight/seclite, /obj/item/flashlight/seclite{ - pixel_y = 6 + pixel_y = 13 + }, +/obj/item/flashlight/seclite{ + pixel_y = 5 }, /turf/open/floor/iron/cafeteria, /area/virtual_domain/protected_space/fullbright) @@ -163,10 +155,10 @@ /turf/open/floor/iron/kitchen, /area/virtual_domain) "jE" = ( -/obj/structure/sign/poster/abductor/ayy_over_tizira, -/obj/structure/sign/poster/official/the_owl, -/turf/closed/indestructible/reinforced, -/area/virtual_domain/protected_space/fullbright) +/turf/closed/indestructible/fakedoor{ + dir = 4 + }, +/area/virtual_domain) "jZ" = ( /obj/effect/turf_decal/tile/dark_red/opposingcorners, /obj/effect/turf_decal/tile/dark_red/opposingcorners, @@ -197,7 +189,9 @@ /area/virtual_domain) "lL" = ( /obj/structure/table, -/obj/item/kitchen/rollingpin/illegal, +/obj/item/kitchen/rollingpin/illegal{ + pixel_y = 7 + }, /turf/open/floor/iron/kitchen/small, /area/virtual_domain) "lP" = ( @@ -298,12 +292,13 @@ /obj/structure/table/reinforced, /obj/item/toy/plush/nukeplushie{ pixel_x = 5; - pixel_y = 6 + pixel_y = 9 }, /obj/item/phone{ base_pixel_w = 4; pixel_x = -6 }, +/obj/structure/sign/poster/official/the_owl/directional/north, /turf/open/floor/iron/cafeteria, /area/virtual_domain/protected_space/fullbright) "qK" = ( @@ -366,10 +361,10 @@ /turf/open/floor/iron/kitchen, /area/virtual_domain) "sl" = ( -/obj/effect/spawner/structure/window/reinforced/indestructible, -/obj/structure/sign/poster/contraband/space_cola/directional/north, -/turf/open/floor/iron, -/area/virtual_domain/protected_space/fullbright) +/obj/structure/table/wood, +/obj/structure/sign/poster/contraband/ambrosia_vulgaris/directional/north, +/turf/open/floor/iron/kitchen, +/area/virtual_domain) "sR" = ( /obj/structure/chair/sofa/corp/right{ dir = 1 @@ -403,7 +398,9 @@ /area/virtual_domain/safehouse) "tZ" = ( /obj/structure/table/wood/poker, -/obj/item/trash/ready_donk, +/obj/item/trash/ready_donk{ + pixel_y = 2 + }, /turf/open/floor/iron/kitchen, /area/virtual_domain) "ud" = ( @@ -499,12 +496,6 @@ /obj/effect/decal/cleanable/confetti, /turf/open/floor/iron/kitchen, /area/virtual_domain) -"xv" = ( -/obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/structure/sign/poster/official/moth_hardhat/directional/west, -/turf/open/floor/iron/kitchen, -/area/virtual_domain) "xY" = ( /obj/effect/decal/cleanable/insectguts, /turf/open/floor/iron/kitchen, @@ -664,18 +655,19 @@ "HE" = ( /obj/structure/table/reinforced, /obj/item/gun/energy/laser{ - pixel_x = -4 + pixel_x = -4; + pixel_y = 7 }, /obj/item/gun/energy/laser{ - pixel_y = 2 + pixel_y = 11 }, /obj/item/gun/energy/laser{ pixel_x = 4; - pixel_y = 4 + pixel_y = 16 }, /obj/machinery/recharger{ pixel_x = 7; - pixel_y = -1 + pixel_y = 4 }, /obj/machinery/button/door/directional/east{ id = "door2" @@ -700,7 +692,9 @@ /area/virtual_domain) "IY" = ( /obj/structure/table/wood/poker, -/obj/item/toy/cards/deck/syndicate, +/obj/item/toy/cards/deck/syndicate{ + pixel_y = 7 + }, /turf/open/floor/iron/kitchen, /area/virtual_domain) "Jh" = ( @@ -725,10 +719,6 @@ }, /turf/template_noop, /area/virtual_domain/safehouse) -"JW" = ( -/obj/structure/sign/poster/official/the_owl, -/turf/closed/indestructible/reinforced, -/area/virtual_domain/protected_space/fullbright) "Ke" = ( /obj/structure/chair/comfy/black{ dir = 8 @@ -779,10 +769,6 @@ /obj/structure/chair/stool/bar/directional/north, /turf/open/floor/iron/kitchen, /area/virtual_domain) -"Mq" = ( -/obj/structure/sign/poster/contraband/ambrosia_vulgaris/directional/west, -/turf/closed/indestructible/reinforced, -/area/virtual_domain) "ML" = ( /obj/effect/turf_decal/tile/dark_red/opposingcorners, /obj/effect/turf_decal/tile/dark_red/opposingcorners, @@ -804,10 +790,6 @@ "Ne" = ( /turf/closed/indestructible/binary, /area/virtual_domain/fullbright) -"Nz" = ( -/obj/structure/sign/poster/official/pda_ad/directional/north, -/turf/closed/indestructible/reinforced, -/area/virtual_domain) "NA" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/effect/turf_decal/tile/bar/opposingcorners, @@ -822,10 +804,6 @@ /obj/item/toy/cards/deck, /turf/open/floor/iron/kitchen, /area/virtual_domain) -"Ox" = ( -/obj/structure/sign/poster/official/the_owl, -/turf/closed/indestructible/reinforced, -/area/virtual_domain) "OB" = ( /turf/open/floor/wood, /area/virtual_domain) @@ -892,10 +870,6 @@ }, /turf/open/floor/iron/kitchen, /area/virtual_domain) -"Tp" = ( -/obj/structure/sign/poster/official/soft_cap_pop_art, -/turf/closed/indestructible/reinforced, -/area/virtual_domain) "Tq" = ( /turf/open/misc/dirt/jungle, /area/virtual_domain/fullbright) @@ -931,10 +905,6 @@ /obj/effect/decal/cleanable/confetti, /turf/open/floor/iron/kitchen, /area/virtual_domain) -"UW" = ( -/obj/structure/sign/poster/official/no_erp/directional/north, -/turf/closed/indestructible/reinforced, -/area/virtual_domain) "Vd" = ( /turf/open/floor/iron/cafeteria, /area/virtual_domain/protected_space/fullbright) @@ -952,17 +922,15 @@ /area/virtual_domain) "VS" = ( /obj/structure/table/reinforced, -/obj/item/modular_computer/laptop/preset/civilian, +/obj/item/modular_computer/laptop/preset/civilian{ + pixel_y = 8 + }, /turf/open/floor/iron/cafeteria, /area/virtual_domain/protected_space/fullbright) "VW" = ( /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/iron/kitchen, /area/virtual_domain) -"Wj" = ( -/obj/structure/sign/poster/contraband/free_key/directional, -/turf/closed/indestructible/reinforced, -/area/virtual_domain/protected_space/fullbright) "Wy" = ( /obj/effect/decal/cleanable/molten_object/large, /turf/open/floor/iron/kitchen, @@ -990,7 +958,9 @@ /area/virtual_domain) "Ye" = ( /obj/structure/table/glass, -/obj/item/reagent_containers/cup/soda_cans/grey_bull, +/obj/item/reagent_containers/cup/soda_cans/grey_bull{ + pixel_y = 8 + }, /turf/open/floor/iron/kitchen, /area/virtual_domain) "Yy" = ( @@ -1296,7 +1266,7 @@ ve ve ve ve -Ox +ve ve ve ve @@ -1431,8 +1401,8 @@ Cm Cm Cm Cm +ve gl -GK Ux Ux Bj @@ -1494,7 +1464,7 @@ Ke re re Ux -Tp +ve Cm Cm ve @@ -1598,10 +1568,10 @@ ve ve ve ve -UW -UW -cY -UW +ve +ve +ve +ve ve ve Cm @@ -1738,10 +1708,10 @@ ve ve Fc Fc -sl +nF SW Fc -Wj +Fc Fc ve ve @@ -1829,8 +1799,8 @@ lP qK sg sg -ex -jE +sg +Fc VS Vd Vd @@ -1877,7 +1847,7 @@ ve sg sg sg -JW +Fc ql BU ud @@ -1929,7 +1899,7 @@ Fc nF rD Fc -bP +Fc Fc ve ve @@ -1970,7 +1940,7 @@ NA NA NA NA -xv +NA NA NA NA @@ -2064,10 +2034,10 @@ ve ve ve ve -qK +jE +ve ve ve -Nz ve ve ve @@ -2184,7 +2154,7 @@ Cm Cm Cm ve -dz +sl dz dz dz @@ -2230,7 +2200,7 @@ Cm Cm Cm Cm -Mq +ve bR Ux Ux @@ -2326,7 +2296,7 @@ Cm Cm ve ve -qK +jE ve ve ve @@ -2562,8 +2532,8 @@ Cm ve ve ve -qK -qK +jE +jE ve ve ve @@ -2572,8 +2542,8 @@ ve ve ve ve -qK -qK +jE +jE ve ve Cm diff --git a/_maps/virtual_domains/gondola_asteroid.dmm b/_maps/virtual_domains/gondola_asteroid.dmm index d01ab29e140..e519c80889c 100644 --- a/_maps/virtual_domains/gondola_asteroid.dmm +++ b/_maps/virtual_domains/gondola_asteroid.dmm @@ -87,9 +87,15 @@ /area/virtual_domain) "M" = ( /obj/structure/table/wood, -/obj/item/storage/bag/tray, -/obj/item/kitchen/fork, -/obj/item/knife/kitchen, +/obj/item/storage/bag/tray{ + pixel_y = 8 + }, +/obj/item/kitchen/fork{ + pixel_y = 8 + }, +/obj/item/knife/kitchen{ + pixel_y = 8 + }, /turf/template_noop, /area/virtual_domain/safehouse) "N" = ( diff --git a/_maps/virtual_domains/island_brawl.dmm b/_maps/virtual_domains/island_brawl.dmm index f71ef3ab3e3..5657d7f6314 100644 --- a/_maps/virtual_domains/island_brawl.dmm +++ b/_maps/virtual_domains/island_brawl.dmm @@ -297,9 +297,11 @@ "dv" = ( /obj/structure/table, /obj/item/wrench{ - pixel_y = 4 + pixel_y = 13 + }, +/obj/item/storage/toolbox/emergency{ + pixel_y = 3 }, -/obj/item/storage/toolbox/emergency, /obj/effect/decal/cleanable/oil, /turf/open/floor/iron/dark/herringbone, /area/virtual_domain) @@ -494,8 +496,8 @@ /turf/open/floor/wood/large, /area/virtual_domain) "fY" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/window/reinforced/half/directional/west, +/obj/structure/window/reinforced/half/directional/south, /obj/item/binoculars{ pixel_y = 20 }, @@ -702,8 +704,8 @@ /turf/open/floor/wood, /area/virtual_domain/fullbright) "iy" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/window/reinforced/half/directional/east, +/obj/structure/window/reinforced/half/directional/north, /obj/structure/chair/stool/directional/south, /obj/item/clothing/glasses/sunglasses{ pixel_y = -2; @@ -1444,7 +1446,7 @@ "sI" = ( /obj/structure/table/bronze, /obj/item/clothing/suit/costume/hawaiian{ - pixel_y = 2; + pixel_y = 8; pixel_x = 5 }, /obj/item/clothing/suit/costume/hawaiian{ @@ -1590,7 +1592,7 @@ /turf/open/floor/iron/white/textured_large, /area/virtual_domain) "ut" = ( -/obj/structure/window/reinforced/spawner/directional/east, +/obj/structure/window/reinforced/half/directional/east, /obj/effect/turf_decal/siding/wood{ dir = 6 }, @@ -2055,7 +2057,7 @@ "Aq" = ( /obj/structure/table/wood/poker, /obj/item/storage/dice{ - pixel_y = 3; + pixel_y = 5; pixel_x = 5 }, /turf/open/floor/wood/large, @@ -2183,6 +2185,7 @@ /obj/structure/closet/crate/bin, /obj/item/flashlight/glowstick/yellow, /obj/item/trash/candy, +/obj/structure/sign/poster/official/tactical_game_cards/directional/north, /turf/open/floor/eighties, /area/virtual_domain) "BU" = ( @@ -2192,13 +2195,8 @@ /turf/open/misc/beach/sand, /area/virtual_domain/fullbright) "BV" = ( -/obj/structure/sign/directions/dorms/north_arrow{ - pixel_y = 35 - }, -/obj/structure/sign/directions/medical/north_arrow{ - pixel_y = 29 - }, /obj/machinery/computer/slot_machine, +/obj/structure/sign/directions/dorms/north_arrow/directional/north, /turf/open/floor/wood/large, /area/virtual_domain) "BW" = ( @@ -2633,7 +2631,6 @@ /turf/open/water/beach, /area/virtual_domain) "HR" = ( -/obj/structure/sign/poster/official/tactical_game_cards/directional/west, /obj/effect/mob_spawn/ghost_role/human/virtual_domain/islander, /turf/open/floor/eighties, /area/virtual_domain) @@ -2936,7 +2933,9 @@ pixel_x = 8; pixel_y = 9 }, -/obj/machinery/cell_charger, +/obj/machinery/cell_charger{ + pixel_y = 8 + }, /turf/open/floor/iron/dark/diagonal, /area/virtual_domain) "Lm" = ( @@ -3422,8 +3421,8 @@ /turf/open/floor/wood/large, /area/virtual_domain) "QY" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/half/directional/north, +/obj/structure/window/reinforced/half/directional/west, /obj/structure/table/wood, /obj/item/storage/medkit/o2{ pixel_y = 4; @@ -3466,7 +3465,9 @@ /area/virtual_domain/fullbright) "Rk" = ( /obj/structure/table/glass, -/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets{ + pixel_y = 8 + }, /turf/open/floor/iron/dark/diagonal, /area/virtual_domain) "Rs" = ( @@ -3542,8 +3543,7 @@ pixel_y = 6 }, /obj/item/clothing/head/utility/welding{ - pixel_x = -10; - pixel_y = -8 + pixel_x = -10 }, /turf/open/floor/wood/parquet, /area/virtual_domain) @@ -3718,11 +3718,12 @@ "TK" = ( /obj/structure/table/bronze, /obj/item/clothing/suit/costume/hawaiian{ - pixel_y = 1; + pixel_y = 8; pixel_x = 7 }, /obj/item/clothing/suit/costume/hawaiian{ - pixel_x = -14 + pixel_x = -14; + pixel_y = 8 }, /turf/open/floor/wood/parquet, /area/virtual_domain/fullbright) @@ -3748,14 +3749,16 @@ dir = 1 }, /obj/item/clothing/mask/breath/medical{ - pixel_y = 7; + pixel_y = 14; pixel_x = -9 }, /obj/item/clothing/mask/breath/medical{ - pixel_y = 4; + pixel_y = 10; pixel_x = 3 }, -/obj/item/clothing/gloves/latex, +/obj/item/clothing/gloves/latex{ + pixel_y = 3 + }, /obj/structure/table/glass, /turf/open/floor/wood/large, /area/virtual_domain/fullbright) @@ -3901,6 +3904,7 @@ /area/virtual_domain/fullbright) "VI" = ( /obj/machinery/vending/dinnerware, +/obj/machinery/light/directional/north, /turf/open/floor/wood/large, /area/virtual_domain) "VK" = ( @@ -4012,8 +4016,8 @@ /turf/open/misc/beach/sand, /area/virtual_domain/fullbright) "Yb" = ( -/obj/structure/sign/poster/contraband/pwr_game/directional/west, -/turf/open/floor/eighties, +/obj/structure/sign/directions/medical/right/north_arrow/directional/west, +/turf/open/floor/wood/large, /area/virtual_domain) "Yd" = ( /obj/structure/flora/tree/palm/style_2{ @@ -6378,7 +6382,7 @@ Mb JG Mb dj -Mb +Yb Mb IS gN @@ -6811,7 +6815,7 @@ eK UO en ty -Yb +en en HR gi @@ -7959,7 +7963,7 @@ ka ka eK eK -pv +Mb uD DT Mb diff --git a/_maps/virtual_domains/pipedream.dmm b/_maps/virtual_domains/pipedream.dmm index a455ee49aa5..38c78bd4c68 100644 --- a/_maps/virtual_domains/pipedream.dmm +++ b/_maps/virtual_domains/pipedream.dmm @@ -30,9 +30,7 @@ /turf/open/floor/iron, /area/virtual_domain) "bq" = ( -/obj/machinery/light/small/red/dim{ - dir = 1 - }, +/obj/machinery/light/small/red/dim/directional/north, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/virtual_domain) @@ -112,7 +110,7 @@ /turf/open/floor/iron, /area/virtual_domain) "dz" = ( -/obj/machinery/light/broken, +/obj/machinery/light/broken/directional/south, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/yellow/corner, /obj/effect/turf_decal/trimline/yellow/warning{ @@ -121,9 +119,7 @@ /turf/open/floor/iron, /area/virtual_domain) "dA" = ( -/obj/machinery/light/dim{ - dir = 4 - }, +/obj/machinery/light/dim/directional/east, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/virtual_domain) @@ -161,9 +157,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/broken{ - dir = 1 - }, +/obj/machinery/light/broken/directional/north, /turf/open/floor/iron, /area/virtual_domain) "eY" = ( @@ -208,7 +202,6 @@ /obj/effect/turf_decal/trimline/yellow/line{ dir = 5 }, -/obj/structure/sign/poster/official/random/directional/west, /turf/open/floor/iron, /area/virtual_domain) "fZ" = ( @@ -259,9 +252,7 @@ "hk" = ( /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/broken{ - dir = 4 - }, +/obj/machinery/light/broken/directional/east, /turf/open/floor/iron, /area/virtual_domain) "ho" = ( @@ -293,9 +284,7 @@ /obj/effect/turf_decal/trimline/yellow/line{ dir = 8 }, -/obj/machinery/light/small/red/dim{ - dir = 8 - }, +/obj/machinery/light/small/red/dim/directional/west, /turf/open/floor/iron, /area/virtual_domain) "jw" = ( @@ -310,9 +299,7 @@ /area/virtual_domain) "jQ" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/light/small/red/dim{ - dir = 1 - }, +/obj/machinery/light/small/red/dim/directional/north, /turf/open/floor/plating, /area/virtual_domain) "jS" = ( @@ -338,9 +325,7 @@ /turf/open/floor/iron, /area/virtual_domain) "kn" = ( -/obj/machinery/light/small/red/dim{ - dir = 1 - }, +/obj/machinery/light/small/red/dim/directional/north, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/virtual_domain) @@ -358,7 +343,9 @@ /turf/open/floor/plating, /area/virtual_domain) "lp" = ( -/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/airlock/maintenance{ + dir = 4 + }, /obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/plating, /area/virtual_domain) @@ -415,20 +402,12 @@ /obj/effect/turf_decal/trimline/yellow/line{ dir = 1 }, -/obj/machinery/light/small/red/dim{ - dir = 1 - }, +/obj/machinery/light/small/red/dim/directional/north, /turf/open/floor/iron, /area/virtual_domain) "nc" = ( -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/poster/official/safety_internals/directional/south, -/turf/open/floor/iron, +/obj/structure/sign/warning/doors/directional/north, +/turf/open/floor/plating, /area/virtual_domain) "nz" = ( /obj/structure/broken_flooring/side/directional/north, @@ -455,9 +434,6 @@ /area/virtual_domain) "op" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/dim{ - dir = 1 - }, /obj/structure/sign/warning/doors/directional/north, /turf/open/floor/iron, /area/virtual_domain) @@ -472,9 +448,7 @@ /turf/open/floor/plating, /area/virtual_domain) "pa" = ( -/obj/machinery/light/small/red/dim{ - dir = 1 - }, +/obj/machinery/light/small/red/dim/directional/north, /turf/open/floor/carpet/orange, /area/virtual_domain) "pb" = ( @@ -505,9 +479,7 @@ /area/virtual_domain) "pI" = ( /obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/machinery/light/small/red/dim{ - dir = 4 - }, +/obj/machinery/light/small/red/dim/directional/east, /turf/open/floor/iron, /area/virtual_domain) "pJ" = ( @@ -521,7 +493,9 @@ dir = 8 }, /obj/structure/table/reinforced, -/obj/effect/spawner/random/bureaucracy/briefcase, +/obj/effect/spawner/random/bureaucracy/briefcase{ + pixel_y = 8 + }, /turf/open/floor/iron, /area/virtual_domain) "qk" = ( @@ -547,9 +521,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/light/small/red/dim{ - dir = 1 - }, +/obj/machinery/light/small/red/dim/directional/north, /turf/open/floor/plating, /area/virtual_domain) "qV" = ( @@ -559,9 +531,7 @@ /turf/open/floor/iron, /area/virtual_domain) "qW" = ( -/obj/machinery/light/dim{ - dir = 1 - }, +/obj/machinery/light/dim/directional/north, /obj/effect/turf_decal/trimline/yellow/line{ dir = 1 }, @@ -577,11 +547,11 @@ /obj/effect/turf_decal/trimline/yellow/line{ dir = 1 }, -/obj/machinery/light/small/red/dim, +/obj/machinery/light/small/red/dim/directional/south, /turf/open/floor/iron, /area/virtual_domain) "rG" = ( -/obj/machinery/light/dim, +/obj/machinery/light/dim/directional/south, /obj/effect/turf_decal/trimline/yellow/line, /turf/open/floor/iron, /area/virtual_domain) @@ -605,9 +575,7 @@ }, /area/virtual_domain) "sB" = ( -/obj/machinery/light/broken{ - dir = 8 - }, +/obj/machinery/light/broken/directional/west, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes{ dir = 8 @@ -655,9 +623,7 @@ /turf/open/floor/plating, /area/virtual_domain) "um" = ( -/obj/machinery/light/dim{ - dir = 1 - }, +/obj/machinery/light/dim/directional/north, /turf/open/floor/iron/cafeteria, /area/virtual_domain) "uv" = ( @@ -696,7 +662,7 @@ /obj/effect/turf_decal/trimline/yellow/line{ dir = 5 }, -/obj/machinery/light/broken, +/obj/machinery/light/broken/directional/south, /turf/open/floor/iron, /area/virtual_domain) "ve" = ( @@ -728,9 +694,7 @@ /turf/open/floor/iron, /area/virtual_domain) "wg" = ( -/obj/machinery/light/small/red/dim{ - dir = 4 - }, +/obj/machinery/light/small/red/dim/directional/east, /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate/preopen, /turf/open/floor/plating, @@ -754,9 +718,10 @@ /area/virtual_domain) "wq" = ( /obj/structure/table/wood, -/obj/machinery/button/door{ - name = "Cargo Bay Lockdown"; - id = "factorylockdown" +/obj/machinery/button/door/table{ + pixel_y = 8; + id = "factorylockdown"; + name = "Cargo Bay Lockdown" }, /turf/open/floor/carpet/royalblue{ icon_state = "carpet_royalblue-63" @@ -804,9 +769,7 @@ /turf/open/floor/plating, /area/virtual_domain) "xk" = ( -/obj/machinery/light/dim{ - dir = 4 - }, +/obj/machinery/light/dim/directional/east, /obj/effect/landmark/bitrunning/cache_spawn, /turf/open/floor/iron, /area/virtual_domain) @@ -825,7 +788,7 @@ /obj/effect/turf_decal/trimline/yellow/line{ dir = 9 }, -/obj/machinery/light/broken, +/obj/machinery/light/broken/directional/south, /turf/open/floor/iron, /area/virtual_domain) "xF" = ( @@ -853,7 +816,8 @@ /area/virtual_domain) "yM" = ( /turf/closed/indestructible/fakedoor{ - name = "Stairwell Access" + name = "Stairwell Access"; + dir = 4 }, /area/virtual_domain) "yQ" = ( @@ -868,7 +832,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light/broken, +/obj/machinery/light/broken/directional/south, /turf/open/floor/carpet/orange, /area/virtual_domain) "zB" = ( @@ -891,7 +855,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light/broken, +/obj/machinery/light/broken/directional/south, /turf/open/floor/iron, /area/virtual_domain) "Av" = ( @@ -979,9 +943,6 @@ /obj/machinery/conveyor/auto{ dir = 6 }, -/obj/machinery/light/broken{ - dir = 1 - }, /obj/structure/sign/warning/vacuum/directional/north, /obj/structure/window/reinforced/spawner/directional/east, /turf/open/floor/plating, @@ -1017,9 +978,7 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/light/dim{ - dir = 8 - }, +/obj/machinery/light/dim/directional/west, /turf/open/floor/plating, /area/virtual_domain) "DA" = ( @@ -1087,8 +1046,8 @@ /obj/structure/flora/bush/fullgrass/style_random, /obj/structure/flora/rock/pile/style_random, /obj/structure/flora/bush/flowers_yw/style_random, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/window/reinforced/half/directional/north, +/obj/structure/window/reinforced/half/directional/west, /turf/open/floor/grass, /area/virtual_domain) "FK" = ( @@ -1127,9 +1086,7 @@ /obj/effect/turf_decal/trimline/yellow/line{ dir = 1 }, -/obj/machinery/light/broken{ - dir = 1 - }, +/obj/machinery/light/broken/directional/north, /turf/open/floor/iron, /area/virtual_domain) "Gy" = ( @@ -1147,9 +1104,7 @@ /turf/open/floor/iron, /area/virtual_domain) "GV" = ( -/obj/machinery/light/small/red/dim{ - dir = 8 - }, +/obj/machinery/light/small/red/dim/directional/west, /obj/effect/turf_decal/stripes{ dir = 9 }, @@ -1203,7 +1158,7 @@ /area/virtual_domain) "Jm" = ( /obj/structure/broken_flooring/pile/directional/north, -/obj/machinery/light/dim, +/obj/machinery/light/dim/directional/south, /turf/open/floor/plating, /area/virtual_domain) "Jn" = ( @@ -1214,21 +1169,14 @@ /obj/structure/railing/corner/end/flip{ dir = 8 }, -/obj/structure/sign/warning/doors/directional/east, /turf/open/floor/iron, /area/virtual_domain) "Jq" = ( -/obj/structure/broken_flooring/pile{ - dir = 1 - }, -/obj/structure/sign/poster/contraband/random/directional/west, +/obj/machinery/light/dim/directional/north, /turf/open/floor/plating, /area/virtual_domain) "JE" = ( -/obj/machinery/light/small/red/dim{ - dir = 1 - }, -/obj/structure/sign/warning/chem_diamond/directional/west, +/obj/machinery/light/small/red/dim/directional/north, /turf/open/floor/plating, /area/virtual_domain) "JR" = ( @@ -1253,7 +1201,7 @@ /area/virtual_domain) "KO" = ( /obj/structure/broken_flooring/side/directional/north, -/obj/machinery/light/small/red/dim, +/obj/machinery/light/small/red/dim/directional/south, /turf/open/floor/plating, /area/virtual_domain) "KX" = ( @@ -1269,7 +1217,7 @@ /area/virtual_domain) "Lp" = ( /obj/effect/turf_decal/trimline/yellow/line, -/obj/machinery/light/broken, +/obj/machinery/light/broken/directional/south, /turf/open/floor/iron, /area/virtual_domain) "LN" = ( @@ -1279,9 +1227,7 @@ /obj/effect/turf_decal/trimline/yellow/line{ dir = 10 }, -/obj/machinery/light/dim{ - dir = 4 - }, +/obj/machinery/light/dim/directional/east, /turf/open/floor/iron, /area/virtual_domain) "LU" = ( @@ -1331,9 +1277,7 @@ /obj/machinery/conveyor/auto{ dir = 1 }, -/obj/machinery/light/small/red/dim{ - dir = 8 - }, +/obj/machinery/light/small/red/dim/directional/west, /turf/open/floor/plating, /area/virtual_domain) "MI" = ( @@ -1375,9 +1319,7 @@ /obj/structure/broken_flooring/side{ dir = 4 }, -/obj/machinery/light/broken{ - dir = 4 - }, +/obj/machinery/light/broken/directional/east, /turf/open/floor/plating, /area/virtual_domain) "OJ" = ( @@ -1400,13 +1342,11 @@ /turf/open/floor/carpet/orange, /area/virtual_domain) "OR" = ( -/obj/machinery/light/broken, +/obj/machinery/light/broken/directional/south, /turf/open/floor/plating, /area/virtual_domain) "Po" = ( -/obj/machinery/light/small/red/dim{ - dir = 4 - }, +/obj/machinery/light/small/red/dim/directional/east, /obj/structure/disposalpipe/segment, /obj/structure/broken_flooring/corner, /obj/effect/decal/cleanable/dirt/dust, @@ -1436,22 +1376,16 @@ /obj/effect/turf_decal/trimline/yellow/line{ dir = 6 }, -/obj/machinery/light/dim{ - dir = 8 - }, +/obj/machinery/light/dim/directional/west, /turf/open/floor/iron, /area/virtual_domain) "Qh" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/light/broken{ - dir = 8 - }, +/obj/machinery/light/broken/directional/west, /turf/open/floor/plating, /area/virtual_domain) "Qj" = ( -/obj/machinery/light/dim{ - dir = 8 - }, +/obj/machinery/light/dim/directional/west, /turf/open/floor/plating, /area/virtual_domain) "Qo" = ( @@ -1462,7 +1396,8 @@ /area/virtual_domain/safehouse) "Qr" = ( /turf/closed/indestructible/fakedoor/maintenance{ - name = "maintenance access" + name = "maintenance access"; + dir = 4 }, /area/virtual_domain) "Qv" = ( @@ -1472,9 +1407,7 @@ /obj/effect/turf_decal/trimline/yellow/line{ dir = 9 }, -/obj/machinery/light/small/red/dim{ - dir = 4 - }, +/obj/machinery/light/small/red/dim/directional/east, /turf/open/floor/iron, /area/virtual_domain) "Qy" = ( @@ -1511,6 +1444,7 @@ dir = 5 }, /obj/effect/decal/cleanable/cobweb, +/obj/machinery/light/broken/directional/north, /turf/open/floor/plating, /area/virtual_domain) "Ru" = ( @@ -1617,16 +1551,11 @@ /area/virtual_domain) "Ue" = ( /obj/structure/table/reinforced, -/obj/machinery/light/small/red/dim{ - dir = 8 - }, -/obj/structure/sign/poster/official/cleanliness/directional/west, +/obj/machinery/light/small/red/dim/directional/west, /turf/open/floor/iron, /area/virtual_domain) "Uw" = ( -/obj/machinery/light/dim{ - dir = 4 - }, +/obj/machinery/light/dim/directional/east, /turf/open/floor/plating, /area/virtual_domain) "UO" = ( @@ -1644,7 +1573,7 @@ /area/virtual_domain) "UX" = ( /obj/effect/turf_decal/trimline/yellow/line, -/obj/machinery/light/small/red/dim, +/obj/machinery/light/small/red/dim/directional/south, /turf/open/floor/iron, /area/virtual_domain) "UY" = ( @@ -1660,7 +1589,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/light/broken, +/obj/machinery/light/broken/directional/south, /turf/open/floor/iron, /area/virtual_domain) "Vg" = ( @@ -1670,7 +1599,7 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/machinery/light/small/red/dim, +/obj/machinery/light/small/red/dim/directional/south, /turf/open/floor/iron, /area/virtual_domain) "Vh" = ( @@ -1685,9 +1614,7 @@ /turf/open/floor/plating, /area/virtual_domain) "VA" = ( -/obj/machinery/light/small/red/dim{ - dir = 1 - }, +/obj/machinery/light/small/red/dim/directional/north, /obj/structure/table, /turf/open/floor/plating, /area/virtual_domain) @@ -1702,9 +1629,8 @@ /turf/open/floor/plating, /area/virtual_domain) "VO" = ( -/obj/machinery/light/broken{ - dir = 1 - }, +/obj/structure/disposalpipe/segment, +/obj/machinery/light/broken/directional/north, /turf/open/floor/plating, /area/virtual_domain) "Wd" = ( @@ -1750,9 +1676,7 @@ /area/virtual_domain) "Xm" = ( /obj/item/gun/ballistic/shotgun/lethal, -/obj/machinery/light/broken{ - dir = 1 - }, +/obj/machinery/light/broken/directional/north, /turf/open/floor/iron, /area/virtual_domain) "Xo" = ( @@ -1778,7 +1702,6 @@ /obj/effect/turf_decal/trimline/yellow/corner{ dir = 4 }, -/obj/structure/sign/warning/vacuum/external/directional/south, /turf/open/floor/iron, /area/virtual_domain) "XN" = ( @@ -1804,9 +1727,7 @@ /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 4 }, -/obj/machinery/light/dim{ - dir = 4 - }, +/obj/machinery/light/dim/directional/east, /turf/open/floor/iron, /area/virtual_domain) "XR" = ( @@ -1834,7 +1755,6 @@ pixel_y = 4 }, /obj/machinery/light/small/dim/directional/south, -/obj/structure/sign/poster/official/moth_hardhat/directional/west, /turf/open/floor/plating, /area/virtual_domain) "Yt" = ( @@ -1852,7 +1772,7 @@ /turf/open/floor/plating, /area/virtual_domain) "YF" = ( -/obj/machinery/light/small/red/dim, +/obj/machinery/light/small/red/dim/directional/south, /turf/open/floor/plating, /area/virtual_domain) "YL" = ( @@ -1863,7 +1783,7 @@ /obj/effect/turf_decal/trimline/yellow/corner{ dir = 1 }, -/obj/machinery/light/dim, +/obj/machinery/light/dim/directional/south, /turf/open/floor/iron, /area/virtual_domain) "Zb" = ( @@ -1886,7 +1806,6 @@ }, /area/virtual_domain) "ZP" = ( -/obj/structure/railing, /turf/open/floor/iron/stairs/right{ dir = 8 }, @@ -2166,7 +2085,7 @@ eg vA Dr bw -Jq +pJ gc eg RJ @@ -2328,7 +2247,7 @@ nS kU Qj FK -nc +Sg eY aK aK @@ -2371,7 +2290,7 @@ lp eg RJ eg -mu +VO AJ mu eJ @@ -2421,7 +2340,7 @@ VL eg eg eg -VO +kU kU Fr jw @@ -2714,7 +2633,7 @@ tr eg eg eg -kU +nc pi kU lI @@ -2771,7 +2690,7 @@ xa eg eg eg -kU +Jq Zb kU Yt diff --git a/_maps/virtual_domains/pirates.dmm b/_maps/virtual_domains/pirates.dmm index 31b4c359ba6..8da4842eaa2 100644 --- a/_maps/virtual_domains/pirates.dmm +++ b/_maps/virtual_domains/pirates.dmm @@ -30,14 +30,14 @@ }, /obj/structure/table/wood, /obj/item/gun/energy/laser/musket{ - pixel_y = 7 + pixel_y = 15 + }, +/obj/item/gun/energy/laser/musket{ + pixel_y = 9 }, /obj/item/gun/energy/laser/musket{ pixel_y = 2 }, -/obj/item/gun/energy/laser/musket{ - pixel_y = -3 - }, /turf/open/floor/wood, /area/virtual_domain/protected_space/fullbright) "cr" = ( @@ -54,14 +54,16 @@ /area/virtual_domain/protected_space/fullbright) "cX" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/item/claymore/cutlass, -/obj/item/clothing/head/costume/pirate/bandana/armored{ - pixel_x = -9; - pixel_y = 7 +/obj/item/claymore/cutlass{ + pixel_y = 8 }, /obj/structure/table/wood, /obj/item/gun/energy/laser{ - pixel_y = -3 + pixel_y = 8 + }, +/obj/item/clothing/head/costume/pirate/bandana/armored{ + pixel_x = -9; + pixel_y = 7 }, /turf/open/floor/wood{ icon_state = "wood_large" @@ -284,7 +286,9 @@ /area/virtual_domain/protected_space) "qE" = ( /obj/structure/table/wood, -/obj/item/book/manual/wiki/ordnance, +/obj/item/book/manual/wiki/ordnance{ + pixel_y = 8 + }, /turf/open/floor/carpet/blue, /area/virtual_domain) "qS" = ( diff --git a/_maps/virtual_domains/syndicate_assault.dmm b/_maps/virtual_domains/syndicate_assault.dmm index 5207f756894..60a389addbf 100644 --- a/_maps/virtual_domains/syndicate_assault.dmm +++ b/_maps/virtual_domains/syndicate_assault.dmm @@ -4,8 +4,12 @@ /area/virtual_domain) "aA" = ( /obj/structure/table/reinforced, -/obj/item/gun/ballistic/automatic/l6_saw/unrestricted, -/obj/item/ammo_box/magazine/m7mm, +/obj/item/gun/ballistic/automatic/l6_saw/unrestricted{ + pixel_y = 8 + }, +/obj/item/ammo_box/magazine/m7mm{ + pixel_y = 8 + }, /turf/open/floor/mineral/plastitanium, /area/virtual_domain/protected_space) "aS" = ( @@ -20,8 +24,12 @@ /area/virtual_domain) "aT" = ( /obj/structure/table/reinforced, -/obj/item/assembly/prox_sensor, -/obj/item/assembly/prox_sensor, +/obj/item/assembly/prox_sensor{ + pixel_y = 8 + }, +/obj/item/assembly/prox_sensor{ + pixel_y = 8 + }, /turf/open/floor/mineral/plastitanium, /area/virtual_domain) "bg" = ( @@ -66,7 +74,7 @@ /obj/structure/toilet{ dir = 1 }, -/obj/machinery/light/directional/south, +/obj/machinery/light/small/directional/south, /turf/open/floor/iron, /area/virtual_domain) "dF" = ( @@ -151,9 +159,10 @@ /turf/open/floor/plating, /area/virtual_domain/protected_space) "he" = ( -/obj/structure/sign/poster/contraband/c20r, -/turf/closed/wall/r_wall/syndicate, -/area/virtual_domain/protected_space) +/obj/effect/landmark/bitrunning/cache_spawn, +/obj/machinery/light/small/directional/north, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) "hz" = ( /obj/structure/closet/syndicate{ anchored = 1; @@ -174,12 +183,6 @@ /turf/open/floor/mineral/plastitanium/red, /area/virtual_domain) "iN" = ( -/obj/machinery/camera/xray{ - c_tag = "Cargo pod"; - dir = 9; - network = list("fsci"); - screen_loc = "" - }, /obj/structure/closet, /obj/item/clothing/under/syndicate/tacticool, /obj/item/clothing/under/syndicate/tacticool, @@ -187,6 +190,10 @@ /obj/item/card/id/advanced/black/syndicate_command/crew_id, /obj/item/card/id/advanced/black/syndicate_command/crew_id, /obj/item/card/id/advanced/black/syndicate_command/crew_id, +/obj/machinery/camera/xray/directional/north{ + c_tag = "Cargo pod"; + network = list("fsci") + }, /turf/open/floor/mineral/plastitanium, /area/virtual_domain/protected_space) "ji" = ( @@ -264,8 +271,8 @@ /turf/open/floor/mineral/plastitanium, /area/virtual_domain) "mQ" = ( -/obj/machinery/shower/directional/north, -/obj/machinery/light/directional/south, +/obj/machinery/light/small/directional/south, +/obj/machinery/shower/directional/east, /turf/open/floor/iron, /area/virtual_domain) "mR" = ( @@ -291,11 +298,14 @@ /area/virtual_domain/protected_space) "nK" = ( /obj/structure/tank_dispenser/oxygen, +/obj/structure/sign/poster/contraband/c20r/directional/north, /turf/open/floor/mineral/plastitanium, /area/virtual_domain/protected_space) "om" = ( /obj/structure/table/reinforced, -/obj/item/storage/medkit/regular, +/obj/item/storage/medkit/regular{ + pixel_y = 8 + }, /obj/machinery/light/small/directional/north, /turf/open/floor/mineral/plastitanium, /area/virtual_domain/protected_space) @@ -320,9 +330,17 @@ /turf/open/floor/mineral/plastitanium/red, /area/virtual_domain) "pP" = ( -/obj/structure/sign/departments/cargo, -/turf/closed/wall/r_wall/syndicate, -/area/virtual_domain/protected_space) +/obj/machinery/porta_turret/syndicate/energy{ + dir = 4; + name = "Syndicate Ship Turret"; + on = 0; + shot_delay = 10 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/plating/airless, +/area/virtual_domain) "pT" = ( /obj/machinery/computer/operating, /turf/open/floor/plastic, @@ -345,8 +363,16 @@ /turf/closed/mineral/random/high_chance, /area/ruin/space/virtual_domain) "rN" = ( -/obj/structure/sink/directional/south, -/turf/open/floor/iron/dark, +/obj/machinery/porta_turret/syndicate/energy{ + dir = 4; + name = "Syndicate Ship Turret"; + on = 0; + shot_delay = 10 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/plating/airless, /area/virtual_domain) "rO" = ( /obj/machinery/vending/cigarette/syndicate, @@ -366,7 +392,9 @@ /area/virtual_domain/safehouse) "tm" = ( /obj/structure/table/reinforced, -/obj/item/paper/fluff/ruins/forgottenship/missionobj, +/obj/item/paper/fluff/ruins/forgottenship/missionobj{ + pixel_y = 8 + }, /turf/open/floor/mineral/plastitanium, /area/virtual_domain) "tK" = ( @@ -438,14 +466,19 @@ on = 0; shot_delay = 10 }, -/turf/closed/wall/r_wall/syndicate/nodiagonal, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/plating/airless, /area/virtual_domain) "vX" = ( /obj/effect/landmark/bitrunning/cache_spawn, /turf/open/floor/mineral/plastitanium/red, /area/virtual_domain) "vZ" = ( -/obj/item/storage/backpack/duffelbag/syndie/surgery, +/obj/item/storage/backpack/duffelbag/syndie/surgery{ + pixel_y = 8 + }, /obj/structure/table/reinforced, /turf/open/floor/plastic, /area/virtual_domain) @@ -462,14 +495,9 @@ /turf/open/floor/pod/dark, /area/virtual_domain/protected_space) "xa" = ( -/obj/machinery/light/small/directional/south, -/obj/effect/mob_spawn/ghost_role/human/virtual_domain/syndie, +/obj/structure/sign/warning/vacuum/external/directional/north, /turf/open/floor/mineral/plastitanium, /area/virtual_domain) -"xb" = ( -/obj/structure/sign/poster/contraband/syndicate_recruitment, -/turf/closed/wall/r_wall/syndicate, -/area/virtual_domain) "xc" = ( /obj/structure/table/reinforced, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -480,7 +508,9 @@ /area/virtual_domain) "xg" = ( /obj/structure/table/reinforced, -/obj/item/dualsaber/green, +/obj/item/dualsaber/green{ + pixel_y = 8 + }, /obj/machinery/light/small/directional/east, /turf/open/floor/mineral/plastitanium, /area/virtual_domain/protected_space) @@ -536,18 +566,18 @@ /area/virtual_domain) "zy" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/cup/glass/trophy/silver_cup, +/obj/item/reagent_containers/cup/glass/trophy/silver_cup{ + pixel_y = 12 + }, /turf/open/floor/mineral/plastitanium/red, /area/virtual_domain) "zE" = ( /turf/closed/mineral/random, /area/ruin/space/virtual_domain) "zN" = ( -/obj/machinery/camera/xray{ +/obj/machinery/camera/xray/directional/east{ c_tag = "Medbay"; - dir = 6; - network = list("fsci"); - screen_loc = "" + network = list("fsc") }, /turf/open/floor/plastic, /area/virtual_domain) @@ -563,9 +593,8 @@ /turf/open/floor/pod/dark, /area/virtual_domain/protected_space) "Aq" = ( -/obj/machinery/button/crematorium{ - id = "fscremate"; - pixel_x = -32 +/obj/machinery/button/crematorium/directional/west{ + id = "fscremate" }, /turf/open/floor/mineral/plastitanium, /area/virtual_domain) @@ -600,9 +629,12 @@ /turf/open/space/basic, /area/virtual_domain/protected_space) "Bb" = ( -/obj/structure/sign/poster/contraband/tools, -/turf/closed/wall/r_wall/syndicate, -/area/virtual_domain/protected_space) +/obj/item/ai_module/core/full/cybersun{ + pixel_y = 8 + }, +/obj/structure/table/reinforced, +/turf/open/floor/mineral/plastitanium/red, +/area/virtual_domain) "Bq" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{ @@ -625,7 +657,10 @@ on = 0; shot_delay = 10 }, -/turf/closed/wall/r_wall/syndicate, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/plating/airless, /area/virtual_domain) "Ck" = ( /obj/structure/tank_dispenser/oxygen, @@ -674,7 +709,9 @@ /area/virtual_domain) "EI" = ( /obj/structure/table/reinforced, -/obj/item/ammo_box/c9mm, +/obj/item/ammo_box/c9mm{ + pixel_y = 8 + }, /turf/open/floor/mineral/plastitanium, /area/virtual_domain) "EL" = ( @@ -818,8 +855,8 @@ /turf/open/floor/iron/dark, /area/virtual_domain) "JR" = ( -/obj/structure/sign/warning/vacuum/external, -/turf/closed/wall/r_wall/syndicate, +/obj/structure/sign/poster/contraband/syndicate_recruitment/directional/north, +/turf/open/floor/mineral/plastitanium/red, /area/virtual_domain) "JY" = ( /obj/structure/cable, @@ -847,13 +884,11 @@ /turf/open/floor/pod/dark, /area/virtual_domain/protected_space) "Lg" = ( -/obj/machinery/turretid/directional/south{ - control_area = "/area/ruin/space/has_grav/syndicate_forgotten_ship"; +/obj/machinery/turretid/directional/north{ enabled = 0; - icon_state = "control_kill"; lethal = 1; - name = "Ship turret control panel"; - req_access = list("syndicate") + req_access = list("syndicate"); + name = "Ship turret control panel" }, /turf/open/floor/mineral/plastitanium/red, /area/virtual_domain) @@ -884,10 +919,11 @@ /area/virtual_domain) "MN" = ( /obj/structure/table/reinforced, -/obj/machinery/button/door{ +/obj/machinery/button/door/table{ id = "fslockdown"; name = "Window shutters"; - req_access = list("syndicate") + req_access = list("syndicate"); + pixel_y = 8 }, /turf/open/floor/mineral/plastitanium/red, /area/virtual_domain) @@ -922,8 +958,7 @@ "NY" = ( /obj/machinery/camera/xray/directional/east{ c_tag = "Conference room"; - network = list("fsc"); - screen_loc = "" + network = list("fsc") }, /turf/open/floor/mineral/plastitanium, /area/virtual_domain) @@ -992,7 +1027,7 @@ /area/virtual_domain/protected_space) "Rl" = ( /obj/structure/sink/directional/south, -/obj/structure/mirror/directional/west, +/obj/structure/mirror/directional/north, /turf/open/floor/iron/dark, /area/virtual_domain) "Rx" = ( @@ -1076,7 +1111,9 @@ /turf/template_noop, /area/virtual_domain/safehouse) "Vv" = ( -/obj/machinery/stasis, +/obj/machinery/stasis{ + dir = 4 + }, /turf/open/floor/plastic, /area/virtual_domain) "VE" = ( @@ -1122,8 +1159,13 @@ "Xn" = ( /obj/structure/cable, /obj/structure/table/reinforced, -/obj/item/storage/toolbox/syndicate, -/obj/item/storage/toolbox/syndicate, +/obj/item/storage/toolbox/syndicate{ + pixel_y = 8 + }, +/obj/item/storage/toolbox/syndicate{ + pixel_y = 8 + }, +/obj/structure/sign/poster/contraband/tools/directional/north, /turf/open/floor/mineral/plastitanium, /area/virtual_domain/protected_space) "Xw" = ( @@ -1144,8 +1186,12 @@ /area/virtual_domain) "XK" = ( /obj/structure/table/reinforced, -/obj/item/paper, -/obj/item/pen, +/obj/item/paper{ + pixel_y = 8 + }, +/obj/item/pen{ + pixel_y = 8 + }, /obj/machinery/computer/security/telescreen/forgotten_ship/sci/directional/south, /turf/open/floor/carpet/royalblack, /area/virtual_domain) @@ -1160,11 +1206,6 @@ "YC" = ( /turf/open/space/basic, /area/virtual_domain/protected_space) -"YN" = ( -/obj/item/ai_module/core/full/cybersun, -/obj/structure/table/reinforced, -/turf/open/floor/mineral/plastitanium/red, -/area/virtual_domain) "YO" = ( /obj/structure/lattice/catwalk, /obj/structure/cable, @@ -1195,10 +1236,11 @@ /area/virtual_domain) "ZI" = ( /obj/structure/table/reinforced, -/obj/machinery/button/door{ +/obj/machinery/button/door/table{ id = "fscaproom"; name = "Room shutters control"; - req_access = list("syndicate") + req_access = list("syndicate"); + pixel_y = 8 }, /turf/open/floor/mineral/plastitanium, /area/virtual_domain) @@ -1981,7 +2023,7 @@ ON ON ON ON -Cg +rN HG yk Nj @@ -2040,9 +2082,9 @@ ON ON ON HG +HG Pj WA -WA mb Lj WA @@ -2053,8 +2095,8 @@ WA Lj WA mb -WA Pj +HG oP ON ON @@ -2170,7 +2212,7 @@ aT Lv WA bU -WA +DY HG ON ON @@ -2228,7 +2270,7 @@ bU WA WA WA -xa +dN HG ON ON @@ -2272,7 +2314,7 @@ ON ON ON HG -Qx +xF Qx pi ah @@ -2330,7 +2372,7 @@ ON ON ON HG -xF +Bb Qx HG ah @@ -2387,8 +2429,8 @@ ON ON ON ON +Rx HG -YN Qx HG HH @@ -2401,9 +2443,9 @@ HG Fl WA WA -WA DY HG +HG ON ON ON @@ -2445,7 +2487,7 @@ ON ON ON ON -vv +pP HG dF HG @@ -2630,7 +2672,7 @@ Gu SA WA HG -rN +Rl nh HG HG @@ -2701,7 +2743,7 @@ ON ON zE zE -he +ye nK PD PD @@ -2735,7 +2777,7 @@ ON ON ON ON -Cg +rN HG HG HG @@ -2794,7 +2836,7 @@ ON ON ON HG -CP +HG Aq HG uN @@ -2852,7 +2894,7 @@ ON ON ON HG -WA +CP dN HG rX @@ -2875,7 +2917,7 @@ ON ON ON ON -Bb +ye Xn JY PD @@ -2968,9 +3010,9 @@ ON ON ON HG +el WA -WA -JR +HG WA WA WA @@ -2980,8 +3022,8 @@ WA WA WA WA -JR -WA +HG +xa ID HG ON @@ -2991,7 +3033,7 @@ ON ON ON ON -pP +ye aA PD PD @@ -3026,7 +3068,7 @@ ON ON ON HG -el +HG WA HG qn @@ -3083,7 +3125,7 @@ ON ON ON ON -vv +pP HG Cc HG @@ -3202,7 +3244,7 @@ ON ON ON ON -xb +HG jw Gl Qx @@ -3261,7 +3303,7 @@ HG HG HG HG -Qx +JR Qx Qx Qx @@ -3329,7 +3371,7 @@ Qx Qx oT HG -ur +Qx ur HG ON @@ -3374,8 +3416,8 @@ ON ON ON HG -Qx -vX +HG +he jo Qx SR @@ -3387,9 +3429,9 @@ Qx SR Qx cv -Qx VE HG +HG ON ON ON @@ -3431,7 +3473,7 @@ ON ON ON ON -vv +pP HG Qx HG @@ -3551,7 +3593,7 @@ ON ON HG HG -jU +HG jU Fe jU @@ -3608,9 +3650,8 @@ ON ON ON ON -vv -Dr -Dr +pP +HG Dr Dr Dr @@ -3618,6 +3659,7 @@ Dr Dr Dr Dr +HG vv ON ON diff --git a/_maps/virtual_domains/vaporwave.dmm b/_maps/virtual_domains/vaporwave.dmm index 569a65a812b..eae2822aec6 100644 --- a/_maps/virtual_domains/vaporwave.dmm +++ b/_maps/virtual_domains/vaporwave.dmm @@ -56,7 +56,8 @@ "gM" = ( /obj/structure/table/reinforced, /obj/item/clothing/glasses/sunglasses/big{ - name = "aesthetic sunglasses" + name = "aesthetic sunglasses"; + pixel_y = 8 }, /turf/open/floor/iron/vaporwave, /area/virtual_domain) @@ -102,7 +103,10 @@ /area/virtual_domain/safehouse) "lI" = ( /obj/structure/table/reinforced, -/obj/machinery/chem_dispenser/drinks/beer/fullupgrade, +/obj/machinery/chem_dispenser/drinks/beer/fullupgrade{ + pixel_y = 8; + dir = 1 + }, /turf/open/floor/iron/vaporwave, /area/virtual_domain) "qm" = ( @@ -206,7 +210,9 @@ "Nz" = ( /obj/structure/window/spawner/directional/east, /obj/structure/table/reinforced, -/obj/item/storage/fancy/cigarettes/cigars/havana, +/obj/item/storage/fancy/cigarettes/cigars/havana{ + pixel_y = 8 + }, /obj/effect/spawner/random/entertainment/lighter, /turf/open/floor/iron/vaporwave, /area/virtual_domain) diff --git a/_maps/virtual_domains/xeno_nest.dmm b/_maps/virtual_domains/xeno_nest.dmm index 895ba5e84c3..163e8dfa808 100644 --- a/_maps/virtual_domains/xeno_nest.dmm +++ b/_maps/virtual_domains/xeno_nest.dmm @@ -141,14 +141,15 @@ /area/virtual_domain/fullbright) "F" = ( /obj/structure/table/greyscale, -/obj/item/gun/energy/xray, +/obj/item/gun/energy/xray{ + pixel_y = 7 + }, /obj/item/gun/energy/laser{ - pixel_x = 4; - pixel_y = -6 + pixel_x = 4 }, /obj/item/gun/energy/laser{ pixel_x = -8; - pixel_y = 6 + pixel_y = 15 }, /turf/template_noop, /area/virtual_domain/safehouse) @@ -161,11 +162,11 @@ /obj/structure/table/greyscale, /obj/machinery/recharger{ pixel_x = 8; - pixel_y = 4 + pixel_y = 8 }, /obj/machinery/recharger{ pixel_x = -8; - pixel_y = 4 + pixel_y = 8 }, /turf/template_noop, /area/virtual_domain/safehouse) @@ -179,7 +180,6 @@ /mob/living/basic/alien/queen/large{ desc = "A gigantic alien who is in charge of the hive and all of its loyal servants."; name = "alien queen"; - pixel_x = -16; can_plant_weeds = 0 }, /turf/open/misc/asteroid/basalt/lava_land_surface, diff --git a/code/modules/bitrunning/turfs.dm b/code/modules/bitrunning/turfs.dm index 763388b6e08..adf3c3b8c6a 100644 --- a/code/modules/bitrunning/turfs.dm +++ b/code/modules/bitrunning/turfs.dm @@ -5,8 +5,7 @@ /turf/closed/indestructible/binary name = "tear in the fabric of reality" - icon = 'icons/turf/floors.dmi' - icon_state = "binary" + icon = 'icons/turf/walls/binary_wall.dmi' /obj/effect/baseturf_helper/virtual_domain name = "virtual domain baseturf editor" diff --git a/icons/turf/walls/binary_wall.dmi b/icons/turf/walls/binary_wall.dmi new file mode 100644 index 0000000000000000000000000000000000000000..b28d5dbe3e74adafc87892c14f83de4d0cd71575 GIT binary patch literal 8139 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