Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Fixes hole in Birdshot hallway #954

Merged
merged 3 commits into from
Dec 4, 2023
Merged

[MIRROR] Fixes hole in Birdshot hallway #954

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a43036
[MIRROR] Fixes hole in Birdshot hallway [MDB IGNORE] (#25387)
SkyratBot Dec 3, 2023
d5831dd
Merge branch 'master' of https://github.com/Fluffy-Frontier/FluffySTG…
Iajret Dec 4, 2023
d6de26c
Merge branch 'master' of https://github.com/Fluffy-Frontier/FluffySTG…
Iajret Dec 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 51 additions & 2 deletions _maps/map_files/Birdshot/birdshot.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,15 @@
dir = 4
},
/area/station/science/xenobiology)
"ahu" = (
/obj/effect/turf_decal/siding/blue{
dir = 1
},
/obj/machinery/airalarm/directional/north,
/obj/structure/bed/dogbed/runtime,
/mob/living/basic/pet/cat/runtime,
/turf/open/floor/iron/white/small,
/area/station/command/heads_quarters/cmo)
"ahy" = (
/obj/structure/cable,
/obj/effect/turf_decal/stripes,
Expand Down Expand Up @@ -13265,6 +13274,18 @@
/obj/structure/closet/secure_closet/engineering_welding,
/turf/open/floor/iron/small,
/area/station/engineering/atmos)
"eVc" = (
/obj/effect/turf_decal/bot_white,
/obj/effect/decal/cleanable/dirt,
/obj/item/clothing/gloves/color/fyellow{
pixel_y = 7
},
/obj/structure/fluff/broken_canister_frame,
/obj/machinery/camera/autoname/directional/north,
/obj/item/stack/sticky_tape/super,
/obj/item/radio/intercom/directional/north,
/turf/open/floor/plating,
/area/station/commons/storage/tools)
"eVd" = (
/obj/structure/cable,
/obj/item/clothing/shoes/griffin{
Expand Down Expand Up @@ -13784,6 +13805,15 @@
},
/turf/open/floor/iron/small,
/area/station/security/office)
"fhs" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/hallway/primary/fore)
"fhw" = (
/obj/structure/table,
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -34757,6 +34787,25 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"mrP" = (
/obj/structure/disposalpipe/segment{
dir = 6
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/table,
/obj/item/folder/red,
/obj/item/food/monkeycube/bee{
name = "monkey cube";
pixel_y = 17
},
/obj/item/food/monkeycube/chicken{
pixel_y = 15;
pixel_x = 6;
name = "monkey cube";
desc = "A new Nanotrasen classic, the monkey cube. Tastes like everything!"
},
/turf/open/floor/iron/dark,
/area/station/commons/storage/tools)
"msg" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
Expand Down Expand Up @@ -91461,7 +91510,7 @@ wbi
hrY
wbi
wbi
dDB
fhs
wbi
wbi
wbi
Expand Down Expand Up @@ -100285,7 +100334,7 @@ oNd
fFD
cbO
vDV
wVb
ahu
clt
jbr
guF
Expand Down