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.

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

Adds Holopads to 6 Different maps #2619

Merged
merged 1 commit into from
Dec 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 17 additions & 1 deletion _maps/map_files/Alpha/alphacorp.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1578,6 +1578,7 @@
/obj/structure/disposalpipe/segment,
/obj/effect/landmark/department_center,
/obj/machinery/navbeacon/wayfinding/informationdepartment,
/obj/machinery/holopad,
/turf/open/floor/facility/dark,
/area/department_main/information)
"lo" = (
Expand Down Expand Up @@ -1853,6 +1854,7 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/navbeacon/wayfinding/controldepartment,
/mob/living/simple_animal/bot/cleanbot,
/obj/machinery/holopad,
/turf/open/floor/carpet/red,
/area/department_main/control)
"nH" = (
Expand Down Expand Up @@ -2104,6 +2106,18 @@
/obj/structure/chair/comfy/beige,
/turf/open/floor/carpet/orange,
/area/department_main/training)
"pA" = (
/obj/effect/turf_decal/tile/brown{
dir = 1
},
/obj/effect/turf_decal/tile/brown,
/obj/effect/turf_decal/siding/brown,
/obj/effect/turf_decal/siding/brown{
dir = 1
},
/obj/machinery/holopad,
/turf/open/floor/plasteel,
/area/department_main/training)
"pF" = (
/obj/effect/turf_decal/tile/brown,
/obj/effect/turf_decal/tile/brown{
Expand Down Expand Up @@ -5068,6 +5082,7 @@
/obj/effect/landmark/department_center,
/obj/machinery/navbeacon/wayfinding/centralcommanddepartment,
/mob/living/simple_animal/bot/cleanbot,
/obj/machinery/holopad,
/turf/open/floor/wood,
/area/department_main/command)
"Nw" = (
Expand Down Expand Up @@ -6126,6 +6141,7 @@
"Vt" = (
/obj/effect/landmark/department_center,
/obj/machinery/navbeacon/wayfinding/safetydepartment,
/obj/machinery/holopad,
/turf/open/floor/carpet/green,
/area/department_main/safety)
"Vu" = (
Expand Down Expand Up @@ -47314,7 +47330,7 @@ uL
pu
KH
ed
uL
pA
qO
Ky
zW
Expand Down
13 changes: 12 additions & 1 deletion _maps/map_files/Beta/betacorp.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -913,6 +913,7 @@
"ez" = (
/obj/effect/landmark/department_center,
/obj/machinery/navbeacon/wayfinding/welfaredepartment,
/obj/machinery/holopad,
/turf/open/floor/carpet/royalblue,
/area/department_main/welfare)
"eA" = (
Expand Down Expand Up @@ -2388,6 +2389,7 @@
"md" = (
/obj/effect/landmark/department_center,
/obj/machinery/navbeacon/wayfinding/controldepartment,
/obj/machinery/holopad,
/turf/open/floor/facility/dark,
/area/department_main/control)
"mg" = (
Expand Down Expand Up @@ -3461,6 +3463,11 @@
},
/turf/open/floor/carpet/orange,
/area/department_main/training)
"rf" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/holopad,
/turf/open/floor/carpet/red,
/area/department_main/discipline)
"rg" = (
/obj/machinery/disposal/bin,
/obj/structure/sign/departments/custodian{
Expand Down Expand Up @@ -5059,6 +5066,7 @@
/area/facility_hallway/north)
"yx" = (
/mob/living/simple_animal/bot/cleanbot/medbay,
/obj/machinery/holopad,
/turf/open/floor/carpet/green,
/area/department_main/safety)
"yy" = (
Expand Down Expand Up @@ -6786,6 +6794,7 @@
},
/obj/effect/landmark/department_center,
/obj/machinery/navbeacon/wayfinding/trainingdepartment,
/obj/machinery/holopad,
/turf/open/floor/plasteel,
/area/department_main/training)
"HC" = (
Expand Down Expand Up @@ -8431,6 +8440,7 @@
"PZ" = (
/obj/effect/landmark/department_center,
/obj/machinery/navbeacon/wayfinding/informationdepartment,
/obj/machinery/holopad,
/turf/open/floor/facility/dark,
/area/department_main/information)
"Qa" = (
Expand Down Expand Up @@ -9695,6 +9705,7 @@
pixel_y = 5
},
/obj/machinery/navbeacon/wayfinding/centralcommanddepartment,
/obj/machinery/holopad,
/turf/open/floor/wood,
/area/department_main/command)
"WI" = (
Expand Down Expand Up @@ -37582,7 +37593,7 @@ rN
Ns
oT
oT
Ns
rf
Qi
on
VS
Expand Down
7 changes: 7 additions & 0 deletions _maps/map_files/Delta/deltacorp.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4314,6 +4314,7 @@
dir = 4
},
/mob/living/simple_animal/bot/cleanbot,
/obj/machinery/holopad,
/turf/open/floor/bronze,
/area/department_main/training)
"jE" = (
Expand Down Expand Up @@ -5381,6 +5382,7 @@
},
/obj/structure/disposalpipe/junction,
/mob/living/simple_animal/bot/cleanbot,
/obj/machinery/holopad,
/turf/open/floor/plasteel/sepia{
color = "#ccc8c0"
},
Expand Down Expand Up @@ -6067,6 +6069,7 @@
dir = 9
},
/mob/living/simple_animal/bot/cleanbot,
/obj/machinery/holopad,
/turf/open/floor/plasteel/sepia,
/area/department_main/control)
"nS" = (
Expand Down Expand Up @@ -9708,6 +9711,7 @@
color = "#090807";
dir = 4
},
/obj/machinery/holopad,
/turf/open/floor/plasteel/sepia{
color = "#ccc8c0"
},
Expand Down Expand Up @@ -10225,6 +10229,7 @@
color = "#bf48b1";
dir = 4
},
/obj/machinery/holopad,
/turf/open/floor/plasteel/sepia,
/area/department_main/command)
"xJ" = (
Expand Down Expand Up @@ -13064,6 +13069,7 @@
dir = 4
},
/mob/living/simple_animal/bot/cleanbot,
/obj/machinery/holopad,
/turf/open/floor/plasteel/sepia,
/area/department_main/welfare)
"DT" = (
Expand Down Expand Up @@ -15065,6 +15071,7 @@
dir = 4
},
/mob/living/simple_animal/bot/cleanbot,
/obj/machinery/holopad,
/turf/open/floor/plasteel/sepia,
/area/department_main/discipline)
"II" = (
Expand Down
5 changes: 5 additions & 0 deletions _maps/map_files/Epsilon/epsiloncorp.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1886,6 +1886,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/holopad,
/turf/open/floor/bronze,
/area/department_main/command)
"fL" = (
Expand Down Expand Up @@ -8858,6 +8859,7 @@
},
/obj/machinery/navbeacon/wayfinding/welfaredepartment,
/mob/living/simple_animal/bot/cleanbot,
/obj/machinery/holopad,
/turf/open/floor/plasteel/sepia{
color = "#ccc8c0"
},
Expand Down Expand Up @@ -10261,6 +10263,7 @@
},
/obj/machinery/navbeacon/wayfinding/controldepartment,
/mob/living/simple_animal/bot/cleanbot,
/obj/machinery/holopad,
/turf/open/floor/plasteel/sepia{
color = "#ccc8c0"
},
Expand Down Expand Up @@ -10766,6 +10769,7 @@
icon_state = "LC2"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/holopad,
/turf/open/floor/plasteel/sepia{
color = "#ccc8c0"
},
Expand Down Expand Up @@ -11888,6 +11892,7 @@
icon_state = "LC2"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/holopad,
/turf/open/floor/plasteel/sepia{
color = "#ccc8c0"
},
Expand Down
5 changes: 5 additions & 0 deletions _maps/map_files/Eta/etacorp.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,7 @@
desc = "Even in death, a clerk does their job."
},
/obj/machinery/navbeacon/wayfinding/trainingdepartment,
/obj/machinery/holopad,
/turf/open/floor/mineral/titanium/purple{
color = "#ffa500";
name = "floor"
Expand Down Expand Up @@ -695,6 +696,7 @@
set_luminosity = 24
},
/obj/machinery/navbeacon/wayfinding/controldepartment,
/obj/machinery/holopad,
/turf/open/floor/mineral/titanium/yellow{
name = "floor"
},
Expand Down Expand Up @@ -2701,6 +2703,7 @@
},
/obj/machinery/light/floor,
/obj/structure/disposalpipe/segment,
/obj/machinery/holopad,
/turf/open/floor/facility/dark,
/area/department_main/command)
"mK" = (
Expand Down Expand Up @@ -6647,6 +6650,7 @@
},
/obj/machinery/navbeacon/wayfinding/informationdepartment,
/obj/structure/disposalpipe/junction/yjunction,
/obj/machinery/holopad,
/turf/open/floor/mineral/titanium/purple{
name = "floor"
},
Expand Down Expand Up @@ -10010,6 +10014,7 @@
desc = "Even in death, a clerk does their job."
},
/obj/machinery/navbeacon/wayfinding/safetydepartment,
/obj/machinery/holopad,
/turf/open/floor/mineral/titanium/purple{
color = "#7FFF00";
name = "floor"
Expand Down
27 changes: 19 additions & 8 deletions _maps/map_files/Zeta/zetacorp.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3125,6 +3125,7 @@
/area/department_main/training)
"iO" = (
/obj/machinery/navbeacon/wayfinding/controldepartment,
/obj/machinery/holopad,
/turf/open/floor/plasteel/dark,
/area/department_main/control)
"iP" = (
Expand Down Expand Up @@ -4991,8 +4992,8 @@
pixel_x = 9
},
/obj/structure/table/wood{
density = 0;
alpha = 0
alpha = 0;
density = 0
},
/obj/effect/turf_decal/siding/wood{
dir = 6
Expand Down Expand Up @@ -5249,8 +5250,8 @@
dir = 4
},
/obj/structure/table/wood{
density = 0;
alpha = 0
alpha = 0;
density = 0
},
/obj/effect/turf_decal/siding/wood{
dir = 10
Expand Down Expand Up @@ -11853,6 +11854,7 @@
/obj/effect/turf_decal/siding/thinplating/dark/corner{
dir = 8
},
/obj/machinery/holopad,
/turf/open/floor/plasteel/dark,
/area/department_main/information)
"HH" = (
Expand Down Expand Up @@ -11987,6 +11989,13 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/facility/dark,
/area/department_main/information)
"Id" = (
/obj/effect/turf_decal/siding/brown{
dir = 1
},
/obj/machinery/holopad,
/turf/open/floor/plasteel/dark,
/area/department_main/training)
"Ig" = (
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 1
Expand Down Expand Up @@ -13828,10 +13837,10 @@
/area/facility_hallway/south)
"Ny" = (
/obj/structure/statue/bronze/marx{
pixel_y = 14;
pixel_x = 1;
desc = "The wealthy, eccentric, and former owner of land this facility is built upon.";
name = "\improper Late Wing Shareholder bust"
name = "\improper Late Wing Shareholder bust";
pixel_x = 1;
pixel_y = 14
},
/obj/structure/table/wood/fancy/orange,
/obj/effect/turf_decal/siding/wood{
Expand Down Expand Up @@ -14392,6 +14401,7 @@
/obj/machinery/camera/autoname,
/obj/effect/landmark/department_center,
/obj/machinery/navbeacon/wayfinding/safetydepartment,
/obj/machinery/holopad,
/turf/open/floor/mineral/titanium/purple{
color = "#7FFF00";
name = "floor"
Expand Down Expand Up @@ -14658,6 +14668,7 @@
view_range = 13
},
/obj/machinery/navbeacon/wayfinding/centralcommanddepartment,
/obj/machinery/holopad,
/turf/open/floor/mineral/titanium/yellow{
name = "floor"
},
Expand Down Expand Up @@ -42907,7 +42918,7 @@ wD
CQ
pI
pS
xT
Id
VH
pM
Ak
Expand Down
Loading
Loading