Skip to content

Commit

Permalink
Pulsar Relay (#8208)
Browse files Browse the repository at this point in the history 
* Initial Setup

After extensive testing using both a relay and an All In One preset machines, the Relay sees the HUB, but the HUB doesn't see the relay. Setting the first Initialize() in telecommunications.dm to LateInitialize() did not solve this issue. No idea why.

* Relay Operational

All but airlock working. Still troubleshooting.

* Update pulsar.dmm

More troubleshooting on the airlock, no change.

* Update presets.dm

Remove old preset used during testing.
  • Loading branch information
@Mycah142
Mycah142 committed Jun 16, 2023
1 parent a79b308 commit 258fa3c
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 32 deletions.
11 changes: 9 additions & 2 deletions code/game/machinery/telecomms/presets.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@
toggled = 0
autolinkers = list("r_relay")

/obj/machinery/telecomms/relay/preset/pulsar
id = "Pulsar Relay"
use_power = NO_POWER_USE //TODO: Wire and power Pulsar sat with generator
idle_power_usage = 0
produces_heat = 0
autolinkers = list("p_relay")

/obj/machinery/telecomms/relay/preset/centcom
id = "Centcom Relay"
hide = 1
Expand All @@ -39,15 +46,15 @@
/obj/machinery/telecomms/hub/preset
id = "Hub"
network = "eris"
autolinkers = list("hub", "relay", "c_relay", "s_relay", "m_relay", "r_relay", "science", "medical",
autolinkers = list("hub", "relay", "c_relay", "s_relay", "m_relay", "r_relay", "p_relay", "science", "medical",
"supply", "service", "common", "command", "engineering", "security", "nt", "unused",
"receiverA", "broadcasterA")

/obj/machinery/telecomms/hub/preset_cent
id = "CentCom Hub"
network = "eris"
produces_heat = 0
autolinkers = list("hub_cent", "c_relay", "s_relay", "m_relay", "r_relay",
autolinkers = list("hub_cent", "c_relay", "s_relay", "m_relay", "r_relay", "p_relay",
"centcom", "receiverCent", "broadcasterCent")

//Receivers
Expand Down
2 changes: 2 additions & 0 deletions code/game/machinery/telecomms/telecomunications.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,8 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
else
for(var/obj/machinery/telecomms/T in telecomms_list)
add_link(T)

return INITIALIZE_HINT_LATELOAD

/obj/machinery/telecomms/Destroy()
telecomms_list -= src
Expand Down
69 changes: 39 additions & 30 deletions maps/pulsar/pulsar.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,11 @@
/area/outpost/pulsar/maintenance)
"bS" = (
/obj/machinery/door/airlock/external{
frequency = 1379;
icon_state = "door_locked";
id_tag = "satellite_airlock_door_ext";
locked = 1;
name = "External Satellite Airlock"
name = "External Satellite Airlock";
frequency = 1420
},
/turf/simulated/floor/tiled/steel/cargo,
/area/outpost/pulsar/maintenance)
Expand Down Expand Up @@ -184,11 +184,11 @@
/area/outpost/pulsar/maintenance)
"gi" = (
/obj/machinery/door/airlock/external{
frequency = 1379;
icon_state = "door_locked";
id_tag = "satellite_airlock_door_int";
locked = 1;
name = "Internal Satellite Airlock"
name = "Internal Satellite Airlock";
frequency = 1420
},
/turf/simulated/floor/tiled/steel/cargo,
/area/outpost/pulsar/maintenance)
Expand Down Expand Up @@ -314,11 +314,11 @@
dir = 4
},
/obj/machinery/door/airlock/external{
frequency = 1379;
icon_state = "door_locked";
id_tag = "satellite_airlock_door_int";
locked = 1;
name = "Internal Satellite Airlock"
name = "Internal Satellite Airlock";
frequency = 1420
},
/turf/simulated/floor/tiled/steel/cargo,
/area/outpost/pulsar/maintenance)
Expand Down Expand Up @@ -469,6 +469,9 @@
/obj/spawner/boxes,
/turf/simulated/floor/tiled/steel/brown_platform,
/area/outpost/pulsar/maintenance)
"rp" = (
/turf/simulated/floor/bluegrid,
/area/outpost/pulsar/maintenance)
"rJ" = (
/obj/spawner/scrap/sparse,
/turf/simulated/floor/plating/under,
Expand Down Expand Up @@ -687,11 +690,11 @@
"zr" = (
/obj/machinery/access_button{
command = "cycle_exterior";
frequency = 1379;
master_tag = "satellite_access_console";
name = "Satellite External Access Button";
name = "Satellite Airlock - External Access Button";
pixel_x = -25;
pixel_y = 25
pixel_y = 25;
frequency = 1420
},
/obj/structure/catwalk,
/turf/space/pulsar,
Expand All @@ -701,19 +704,22 @@
/turf/simulated/floor/tiled/steel/gray_platform,
/area/outpost/pulsar/maintenance)
"zC" = (
/obj/machinery/airlock_sensor{
id_tag = "satellite_airlock_sensor";
pixel_y = 20;
master_tag = "satellite_access_console";
name = "Satellite Airlock Sensor";
frequency = 1420
},
/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
pixel_y = 30;
id_tag = "satellite_access_console";
name = "Satellite Airlock Console";
pixel_y = 32;
tag_airpump = "satellite_airlock_pump";
tag_chamber_sensor = "satellite_airlock_sensor";
tag_exterior_door = "satellite_airlock_door_ext";
tag_interior_door = "satellite_airlock_door_int"
},
/obj/machinery/airlock_sensor{
id_tag = "satellite_airlock_sensor";
name = "Satellite Airlock Sensor";
pixel_y = 20
tag_interior_door = "satellite_airlock_door_int";
tag_chamber_sensor = "satellite_airlock_sensor";
frequency = 1420
},
/turf/simulated/floor/tiled/steel/techfloor,
/area/outpost/pulsar/maintenance)
Expand Down Expand Up @@ -817,7 +823,7 @@
/obj/structure/bed/chair{
dir = 4
},
/turf/simulated/floor/tiled/steel/gray_perforated,
/turf/simulated/floor/bluegrid,
/area/outpost/pulsar/maintenance)
"Dk" = (
/obj/spawner/booze/low_chance,
Expand Down Expand Up @@ -855,7 +861,7 @@
anchored = 1;
dir = 8
},
/turf/simulated/floor/tiled/steel/gray_perforated,
/turf/simulated/floor/bluegrid,
/area/outpost/pulsar/maintenance)
"En" = (
/obj/machinery/computer/arcade,
Expand Down Expand Up @@ -997,7 +1003,7 @@
"Jq" = (
/obj/structure/table/standard,
/obj/spawner/booze,
/turf/simulated/floor/tiled/steel/gray_perforated,
/turf/simulated/floor/bluegrid,
/area/outpost/pulsar/maintenance)
"Jz" = (
/obj/structure/railing{
Expand All @@ -1022,6 +1028,10 @@
},
/turf/simulated/floor/tiled/dark,
/area/outpost/pulsar)
"LT" = (
/obj/machinery/telecomms/relay/preset/pulsar,
/turf/simulated/floor/bluegrid,
/area/outpost/pulsar/maintenance)
"LW" = (
/obj/machinery/door/airlock/maintenance_engineering{
icon_state = "door_locked";
Expand Down Expand Up @@ -1113,9 +1123,8 @@
"NY" = (
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 8;
frequency = 1379;
id_tag = "third_sec_3_airlock_pump";
name = "Third Section Airlock Pump - 3"
id_tag = "satellite_airlock_pump";
frequency = 1420
},
/turf/simulated/floor/tiled/steel/techfloor,
/area/outpost/pulsar/maintenance)
Expand Down Expand Up @@ -1240,7 +1249,7 @@
pixel_y = 7
},
/obj/item/pen,
/turf/simulated/floor/tiled/steel/gray_perforated,
/turf/simulated/floor/bluegrid,
/area/outpost/pulsar/maintenance)
"Tk" = (
/obj/machinery/door/airlock/maintenance_engineering{
Expand Down Expand Up @@ -1315,11 +1324,11 @@
"Vg" = (
/obj/machinery/access_button{
command = "cycle_interior";
frequency = 1379;
master_tag = "satellite_access_console";
name = "Satellite Airlock - Internal Access Button";
pixel_x = 25;
pixel_y = 25
pixel_y = 25;
frequency = 1420
},
/obj/structure/catwalk,
/turf/simulated/floor/plating/under,
Expand Down Expand Up @@ -1411,7 +1420,7 @@
"Xw" = (
/obj/structure/table/standard,
/obj/spawner/lowkeyrandom,
/turf/simulated/floor/tiled/steel/gray_perforated,
/turf/simulated/floor/bluegrid,
/area/outpost/pulsar/maintenance)
"Yf" = (
/turf/simulated/floor/tiled/dark,
Expand All @@ -1432,7 +1441,7 @@
"YD" = (
/obj/structure/table/standard,
/obj/item/device/lighting/toggleable/lamp,
/turf/simulated/floor/tiled/steel/gray_perforated,
/turf/simulated/floor/bluegrid,
/area/outpost/pulsar/maintenance)
"YQ" = (
/obj/structure/railing{
Expand Down Expand Up @@ -21578,7 +21587,7 @@ Cl
AQ
bq
aj
om
LT
Xw
bM
WB
Expand Down Expand Up @@ -21780,7 +21789,7 @@ Hy
ok
aJ
fD
yE
rp
SY
He
WB
Expand Down

0 comments on commit 258fa3c

Please sign in to comment.