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

Tweaks to Dvoraks telecomns sat ruin #26429

Merged
merged 1 commit into from
Aug 30, 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
116 changes: 72 additions & 44 deletions _maps/map_files/RandomRuins/SpaceRuins/telecomns_returns.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/floodlight,
/turf/simulated/floor/bluegrid{
name = "Mainframe Base";
nitrogen = 400;
Expand Down Expand Up @@ -218,11 +219,6 @@
"dD" = (
/obj/structure/closet/crate,
/obj/item/multitool,
/obj/machinery/camera{
c_tag = "Telecomms Entrance South";
dir = 1;
network = list("Telecomms")
},
/turf/simulated/floor/plasteel,
/area/ruin/space/telecomms/tele)
"dR" = (
Expand Down Expand Up @@ -268,6 +264,9 @@
},
/turf/simulated/floor/plasteel,
/area/ruin/space/telecomms/computer)
"eA" = (
/turf/simulated/wall/indestructible/riveted,
/area/ruin/space/telecomms/foyer)
"eE" = (
/obj/machinery/mecha_part_fabricator,
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -710,14 +709,18 @@
pixel_x = 0
},
/obj/structure/grille,
/turf/simulated/floor/plating/airless,
/turf/simulated/floor/catwalk/airless,
/area/space/nearstation)
"mZ" = (
/obj/machinery/door/airlock/maintenance_hatch{
name = "Core Access";
locked = 1
},
/obj/machinery/door/firedoor,
/obj/machinery/door/poddoor{
id = "dvorak";
id_tag = "dvorak"
},
/turf/simulated/floor/plasteel{
icon_state = "vault";
dir = 5
Expand Down Expand Up @@ -1211,7 +1214,7 @@
/turf/simulated/floor/plasteel,
/area/ruin/space/telecomms/computer)
"tW" = (
/obj/machinery/r_n_d/server/upgraded,
/obj/machinery/power/grounding_rod,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "vault";
Expand Down Expand Up @@ -1512,6 +1515,10 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/firedoor,
/obj/machinery/door/poddoor{
id = "dvorak";
id_tag = "dvorak"
},
/turf/simulated/floor/plasteel{
icon_state = "vault";
dir = 5
Expand Down Expand Up @@ -1645,17 +1652,6 @@
/obj/item/clothing/glasses/night,
/turf/simulated/floor/plasteel,
/area/ruin/space/telecomms/tele)
"zg" = (
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 4
},
/obj/machinery/camera{
c_tag = "Telecomms Power Control";
dir = 2;
network = list("Telecomms")
},
/turf/simulated/floor/catwalk,
/area/ruin/space/telecomms/powercontrol)
"zk" = (
/obj/structure/lattice,
/obj/effect/abstract/cheese_trap,
Expand Down Expand Up @@ -1962,6 +1958,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
/obj/machinery/computer/nonfunctional,
/turf/simulated/floor/plasteel,
/area/ruin/space/telecomms/foyer)
"Dy" = (
Expand Down Expand Up @@ -2345,7 +2342,7 @@
/area/space/nearstation)
"Jb" = (
/obj/effect/spawner/random_spawners/fungus_maybe,
/turf/simulated/wall/r_wall,
/turf/simulated/wall/indestructible/riveted,
/area/ruin/space/telecomms/foyer)
"Jm" = (
/obj/machinery/computer/sm_monitor{
Expand Down Expand Up @@ -2478,6 +2475,9 @@
temperature = 80
},
/area/ruin/space/telecomms/chamber)
"Lk" = (
/turf/simulated/wall/indestructible/riveted,
/area/ruin/space/telecomms/tele)
"Ln" = (
/obj/structure/window/reinforced{
dir = 4
Expand Down Expand Up @@ -2507,6 +2507,17 @@
temperature = 80
},
/area/ruin/space/telecomms/chamber)
"LC" = (
/obj/machinery/doppler_array,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "vault";
name = "Mainframe floor";
nitrogen = 400;
oxygen = 0;
temperature = 80
},
/area/ruin/space/telecomms/chamber)
"LK" = (
/obj/structure/cable{
d1 = 4;
Expand Down Expand Up @@ -2563,6 +2574,7 @@
/obj/machinery/light/small{
dir = 1
},
/obj/effect/abstract/bot_trap,
/turf/simulated/floor/plasteel{
icon_state = "vault";
dir = 5
Expand Down Expand Up @@ -2745,6 +2757,10 @@
req_access_txt = "61"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/poddoor/preopen{
id = "dvorak";
id_tag = "dvorak"
},
/turf/simulated/floor/plasteel,
/area/ruin/space/telecomms/foyer)
"PZ" = (
Expand Down Expand Up @@ -2804,6 +2820,12 @@
"Qx" = (
/turf/simulated/floor/catwalk,
/area/ruin/space/telecomms/powercontrol)
"Qz" = (
/obj/machinery/door_control{
id = "dvorak"
},
/turf/simulated/wall/indestructible/riveted,
/area/ruin/space/telecomms/chamber)
"QN" = (
/obj/structure/window/reinforced{
dir = 4
Expand Down Expand Up @@ -3106,6 +3128,15 @@
temperature = 80
},
/area/ruin/space/telecomms/chamber)
"Vl" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/grille,
/turf/simulated/floor/catwalk/airless,
/area/space/nearstation)
"Vm" = (
/obj/machinery/light/small,
/obj/machinery/light_switch{
Expand Down Expand Up @@ -3209,9 +3240,6 @@
dir = 1;
level = 1
},
/obj/item/radio/intercom{
pixel_y = 25
},
/turf/simulated/floor/plasteel,
/area/ruin/space/telecomms/foyer)
"Xf" = (
Expand Down Expand Up @@ -6389,7 +6417,7 @@ ik
Sv
lW
Ga
Ga
Vl
mh
Lp
Lp
Expand Down Expand Up @@ -7123,7 +7151,7 @@ yo
FC
FC
SA
zg
Bn
lr
Qx
PA
Expand Down Expand Up @@ -7210,7 +7238,7 @@ Zu
EO
yr
Xf
PQ
Lk
oG
PQ
PQ
Expand Down Expand Up @@ -7296,13 +7324,13 @@ bJ
Tw
eE
il
tW
LC
EM
Zu
uM
IL
uM
uM
eA
yJ
BZ
PQ
Expand Down Expand Up @@ -7394,7 +7422,7 @@ Zu
Qa
nD
eJ
uM
eA
DV
Uw
PQ
Expand Down Expand Up @@ -7578,7 +7606,7 @@ Zu
WO
nD
Ri
uM
eA
xv
Uw
UF
Expand Down Expand Up @@ -7758,11 +7786,11 @@ gG
pa
il
qe
Zu
Qz
Xb
oz
Ri
uM
eA
Rt
Uw
UF
Expand Down Expand Up @@ -7854,7 +7882,7 @@ Zu
Gt
GQ
cj
uM
eA
Yr
VO
PQ
Expand Down Expand Up @@ -7946,7 +7974,7 @@ Zu
ao
nD
Bf
uM
eA
iE
AY
PQ
Expand Down Expand Up @@ -8017,11 +8045,11 @@ yo
Ed
xa
ik
ik
iD
ux
ux
ux
ux
Hr
Hr
Hr
To
ME
Zj
Expand All @@ -8038,7 +8066,7 @@ Zu
uM
yD
uM
uM
eA
HR
De
PQ
Expand Down Expand Up @@ -8130,7 +8158,7 @@ Zu
EO
yr
Xf
PQ
Lk
oW
PQ
PQ
Expand Down Expand Up @@ -8202,12 +8230,12 @@ Dy
xa
ik
ux
Hr
ux
Aj
Hr
Hr
Hr
Hr
ux
ux
ux
ux
Zu
fq
EM
Expand Down
4 changes: 4 additions & 0 deletions code/game/machinery/constructable_frame.dm
Original file line number Diff line number Diff line change
Expand Up @@ -713,6 +713,10 @@ to destroy them and players will be able to make replacements.
icon_state = "engineering"
build_path = /obj/machinery/autolathe/syndicate

/obj/item/circuitboard/autolathe/trapped
board_name = "Modified Autolathe"
build_path = /obj/machinery/autolathe/trapped

/obj/item/circuitboard/protolathe
board_name = "Protolathe"
icon_state = "science"
Expand Down
1 change: 1 addition & 0 deletions code/modules/awaymissions/mission_code/ruins/telecomns.dm
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ GLOBAL_LIST_EMPTY(telecomms_trap_tank)
name = "recharger"
desc = "A charging dock for energy based weaponry. Did it just-"
icon_state = "autolathe_trap"
board_type = /obj/item/circuitboard/autolathe/trapped
//Has someone put an item in the autolathe, breaking the hologram?
var/disguise_broken = FALSE

Expand Down