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

Jump to bottom

Adds bin to SE Research room, moves item that was hiding pillbox #4180

Merged
merged 2 commits into from
Aug 17, 2023
Merged

Adds bin to SE Research room, moves item that was hiding pillbox #4180

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a34d323
d
spartanbobby Aug 13, 2023
77fdcf4
b
spartanbobby Aug 13, 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
103 changes: 75 additions & 28 deletions maps/map_files/USS_Almayer/USS_Almayer.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8144,6 +8144,9 @@
/obj/structure/machinery/light{
dir = 1
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/open/floor/almayer{
icon_state = "dark_sterile"
},
Expand Down Expand Up @@ -9835,6 +9838,10 @@
pixel_x = 5;
pixel_y = 3
},
/obj/item/reagent_container/glass/beaker/cryoxadone{
pixel_x = -6;
pixel_y = 8
},
/turf/open/floor/almayer{
icon_state = "mono"
},
Expand Down Expand Up @@ -34237,20 +34244,10 @@
/turf/open/floor/almayer,
/area/almayer/living/chapel)
"eVT" = (
/obj/structure/surface/table/almayer,
/obj/item/paper_bin/wy{
pixel_x = 6;
pixel_y = 5
},
/obj/item/tool/pen{
pixel_x = 8
},
/obj/item/clipboard{
pixel_x = -8
},
/obj/item/folder/white{
pixel_x = -8
/obj/structure/disposalpipe/trunk{
dir = 1
},
/obj/structure/machinery/disposal,
/turf/open/floor/almayer{
icon_state = "sterile_green_side"
},
Expand Down Expand Up @@ -35071,6 +35068,12 @@
icon_state = "plate"
},
/area/almayer/engineering/starboard_atmos)
"fpT" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/almayer{
icon_state = "dark_sterile"
},
/area/almayer/medical/medical_science)
"fpW" = (
/obj/structure/sign/safety/bulkhead_door{
pixel_x = 32
Expand Down Expand Up @@ -35810,7 +35813,9 @@
/turf/open/floor/almayer,
/area/almayer/lifeboat_pumps/south1)
"fGu" = (
/obj/structure/disposalpipe/segment,
/obj/structure/disposalpipe/junction{
dir = 1
},
/obj/structure/machinery/door_control{
dir = 1;
id = "researchlockdownext";
Expand Down Expand Up @@ -36859,6 +36864,19 @@
/area/almayer/medical/containment/cell/cl)
"ger" = (
/obj/structure/surface/table/almayer,
/obj/item/paper_bin/wy{
pixel_x = 6;
pixel_y = 5
},
/obj/item/tool/pen{
pixel_x = 8
},
/obj/item/clipboard{
pixel_x = -8
},
/obj/item/folder/white{
pixel_x = -8
},
/turf/open/floor/almayer{
icon_state = "dark_sterile"
},
Expand Down Expand Up @@ -37226,13 +37244,11 @@
},
/area/almayer/medical/lower_medical_medbay)
"glB" = (
/obj/structure/machinery/chem_master{
vial_maker = 1
},
/obj/structure/sign/safety/chem_lab{
pixel_x = 5;
pixel_y = 29
},
/obj/structure/machinery/chem_master,
/turf/open/floor/almayer{
icon_state = "mono"
},
Expand Down Expand Up @@ -39712,6 +39728,9 @@
id = "Containment Breach";
name = "\improper Secure Airlock"
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/open/floor/almayer{
icon_state = "test_floor4"
},
Expand Down Expand Up @@ -57519,6 +57538,7 @@
/obj/structure/bed/chair/comfy{
dir = 4
},
/obj/structure/disposalpipe/segment,
/turf/open/floor/almayer{
icon_state = "dark_sterile"
},
Expand Down Expand Up @@ -59912,6 +59932,9 @@
pixel_x = 1;
pixel_y = 1
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/open/floor/almayer{
dir = 5;
icon_state = "sterile_green_side"
Expand Down Expand Up @@ -61949,6 +61972,16 @@
icon_state = "dark_sterile"
},
/area/almayer/medical/lower_medical_medbay)
"rmc" = (
/obj/structure/pipes/standard/simple/hidden/supply,
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/open/floor/almayer{
dir = 4;
icon_state = "sterile_green_side"
},
/area/almayer/medical/medical_science)
"rmv" = (
/obj/structure/machinery/door/airlock/almayer/security{
dir = 2;
Expand Down Expand Up @@ -66714,6 +66747,20 @@
},
/turf/open/floor/wood/ship,
/area/almayer/command/corporateliason)
"tsM" = (
/obj/effect/decal/warning_stripes{
icon_state = "N";
pixel_y = 1
},
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c"
},
/turf/open/floor/almayer{
dir = 1;
icon_state = "sterile_green_side"
},
/area/almayer/medical/medical_science)
"tsX" = (
/turf/closed/wall/almayer/reinforced,
/area/almayer/shipboard/brig/lobby)
Expand Down Expand Up @@ -70828,21 +70875,21 @@
/area/almayer/medical/hydroponics)
"vgB" = (
/obj/structure/surface/table/almayer,
/obj/item/reagent_container/glass/beaker/cryoxadone{
pixel_x = -6;
pixel_y = 8
},
/obj/item/storage/box/autoinjectors{
pixel_x = -6;
pixel_y = -1
},
/obj/item/storage/box/pillbottles{
pixel_x = 6;
pixel_y = 7
},
/obj/item/device/mass_spectrometer{
pixel_x = 8
},
/obj/item/storage/box/pillbottles{
pixel_x = -6;
pixel_y = 9
},
/obj/item/reagent_container/glass/beaker/cryoxadone{
pixel_x = 8;
pixel_y = 10
},
/turf/open/floor/almayer{
icon_state = "sterile_green_side"
},
Expand Down Expand Up @@ -110049,7 +110096,7 @@ hec
gNp
hVf
dVu
dVu
rmc
lON
dVu
oDR
Expand Down Expand Up @@ -110861,9 +110908,9 @@ mWs
lmw
vOy
dyb
vkp
tsM
prx
aoM
fpT
eVT
kgs
ayT
Expand Down