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

Project ARES: Adds more APOLLO consoles #4208

Merged
merged 6 commits into from
Sep 11, 2023
Merged

Project ARES: Adds more APOLLO consoles #4208

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6a77df6
Adds more APOLLO consoles
realforest2001 Aug 19, 2023
91807c5
Merge remote-tracking branch 'cmss13-devs/master' into project/ares/m…
realforest2001 Aug 22, 2023
b5f7ba2
Merge remote-tracking branch 'cmss13-devs/master' into project/ares/m…
realforest2001 Aug 24, 2023
6d6b93f
reception offset
realforest2001 Aug 24, 2023
f0231c1
Merge remote-tracking branch 'cmss13-devs/master' into project/ares/m…
realforest2001 Aug 28, 2023
a72eaff
Merge remote-tracking branch 'cmss13-devs/master' into project/ares/m…
realforest2001 Sep 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
31 changes: 16 additions & 15 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 @@ -34474,6 +34474,10 @@
/obj/structure/machinery/camera/autoname/almayer/containment/ares{
dir = 1
},
/obj/structure/machinery/computer/working_joe{
dir = 8;
pixel_x = 29
},
/turf/open/floor/almayer/no_build{
icon_state = "ai_floors"
},
Expand Down Expand Up @@ -54622,20 +54626,6 @@
icon_state = "bluefull"
},
/area/almayer/living/briefing)
"nMq" = (
/obj/effect/decal/warning_stripes{
icon_state = "E";
pixel_x = 1
},
/obj/structure/machinery/computer/working_joe{
dir = 8;
pixel_x = 17
},
/turf/open/floor/almayer{
dir = 4;
icon_state = "silver"
},
/area/almayer/hallways/aft_hallway)
"nMu" = (
/turf/open/floor/almayer{
dir = 9;
Expand Down Expand Up @@ -67622,6 +67612,10 @@
pixel_y = 5
},
/obj/item/tool/pen,
/obj/structure/machinery/computer/working_joe{
dir = 8;
pixel_x = 17
},
/turf/open/floor/almayer{
icon_state = "sterile_green_side"
},
Expand Down Expand Up @@ -68627,6 +68621,10 @@
/area/almayer/command/cic)
"tUv" = (
/obj/structure/machinery/iv_drip,
/obj/structure/machinery/computer/working_joe{
dir = 8;
pixel_x = 17
},
/turf/open/floor/almayer{
dir = 4;
icon_state = "sterile_green_corner"
Expand Down Expand Up @@ -77594,6 +77592,9 @@
layer = 2.9;
pixel_x = -8
},
/obj/structure/machinery/computer/working_joe{
pixel_y = 16
},
/turf/open/floor/almayer{
icon_state = "mono"
},
Expand Down Expand Up @@ -117082,7 +117083,7 @@ auG
azb
azb
azb
nMq
auG
aDp
apK
cbr
Expand Down