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

CL Storage Room Change #4118

Merged
merged 3 commits into from
Aug 7, 2023
Merged

CL Storage Room Change #4118

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a0dacc8
CL Storage Room Change
HeresKozmos Aug 6, 2023
04b2f0d
Fixes area for APC.
HeresKozmos Aug 6, 2023
9d91e5f
Merge branch 'master' into CLOfficeUpdate
HeresKozmos Aug 7, 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
30 changes: 13 additions & 17 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 @@ -41459,6 +41459,7 @@
/obj/item/reagent_container/food/drinks/bottle/sake{
pixel_x = -4
},
/obj/structure/machinery/light,
/turf/open/floor/almayer{
icon_state = "plate"
},
Expand Down Expand Up @@ -45529,11 +45530,11 @@
},
/area/almayer/hull/lower_hull/l_m_p)
"jZU" = (
/obj/structure/machinery/light{
/obj/structure/machinery/power/apc/almayer{
dir = 1
},
/turf/open/floor/almayer,
/area/almayer/command/corporateliason)
/area/almayer/medical/containment/cell/cl)
"jZY" = (
/obj/structure/closet/l3closet/virology,
/turf/open/floor/almayer{
Expand Down Expand Up @@ -46056,13 +46057,17 @@
/area/almayer/hull/upper_hull/u_a_p)
"kmL" = (
/obj/structure/surface/table/almayer,
/obj/item/storage/firstaid/toxin{
/obj/item/storage/firstaid/regular{
pixel_x = 8;
pixel_y = -2
},
/obj/item/storage/box/drinkingglasses{
pixel_x = -7
},
/obj/item/reagent_container/spray/cleaner{
pixel_x = -10;
pixel_y = 14
},
/obj/item/storage/xeno_tag_case/full{
pixel_y = 8
},
Expand Down Expand Up @@ -58554,11 +58559,11 @@
},
/area/almayer/engineering/engine_core)
"pQu" = (
/obj/structure/machinery/power/apc/almayer{
dir = 1
/obj/structure/machinery/chem_dispenser/soda{
pixel_y = 20
},
/turf/open/floor/almayer,
/area/almayer/medical/containment/cell/cl)
/area/almayer/command/corporateliason)
"pQy" = (
/obj/structure/window/framed/almayer,
/turf/open/floor/plating,
Expand Down Expand Up @@ -58697,15 +58702,6 @@
icon_state = "test_floor4"
},
/area/almayer/command/airoom)
"pTM" = (
/obj/structure/sign/safety/water{
pixel_x = 8;
pixel_y = -32
},
/turf/open/floor/almayer{
icon_state = "sterile_green_side"
},
/area/almayer/medical/hydroponics)
"pTT" = (
/obj/structure/platform{
dir = 4
Expand Down Expand Up @@ -108941,7 +108937,7 @@ iBt
iBt
iBt
awE
cvj
jZU
rjH
qVM
vGk
Expand Down Expand Up @@ -109144,7 +109140,7 @@ iBt
iBt
iBt
awE
jZU
cvj
iiz
qVM
oLw
Expand Down