cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 22:19:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Teleporter machinery now auto links with each other, removes screwdriver + wirecutter interaction (#1266)

Browse Source 
* Teleporter machinery now auto links with each other, removes screwdriver + wirecutter interaction (#54325)

Teleporter machinery will now automatically link with each other. This makes the screwdriver + wirecutter interaction redundant, so it has been removed.

* Teleporter machinery now auto links with each other, removes screwdriver + wirecutter interaction

Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
This commit is contained in:
SkyratBot
2020-10-12 23:17:29 +02:00
committed by GitHub
co-authored by Jared-Fogle
parent 2b8e5bfa2a
commit 0d6453f671
4 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/computer/teleporter.dm
+1
View File
@@ -29,6 +29,7 @@
for(var/direction in GLOB.cardinals)
power_station = locate(/obj/machinery/teleport/station, get_step(src, direction))
if(power_station)
power_station.link_console_and_hub()
break
return power_station
code/game/machinery/teleporter.dm
+2 -7
View File
@@ -42,6 +42,7 @@
for(var/direction in GLOB.cardinals)
power_station = locate(/obj/machinery/teleport/station, get_step(src, direction))
if(power_station)
power_station.link_console_and_hub()
break
return power_station
@@ -132,7 +133,7 @@
if(!panel_open)
. += "<span class='notice'>The panel is <i>screwed</i> in, obstructing the linking device and wiring panel.</span>"
else
. += "<span class='notice'>The <i>linking</i> device is now able to be <i>scanned</i> with a multitool.<br>The <i>wiring</i> can be <i>connected<i> to a nearby console and hub with a pair of wirecutters.</span>"
. += "<span class='notice'>The <i>linking</i> device is now able to be <i>scanned</i> with a multitool.</span>"
if(in_range(user, src) || isobserver(user))
. += "<span class='notice'>The status display reads: This station can be linked to <b>[efficiency]</b> other station(s).</span>"
@@ -183,12 +184,6 @@
else if(default_deconstruction_crowbar(W))
return
else if(W.tool_behaviour == TOOL_WIRECUTTER)
if(panel_open)
link_console_and_hub()
to_chat(user, "<span class='notice'>You reconnect the station to nearby machinery.</span>")
return
else
return ..()
code/modules/unit_tests/_unit_tests.dm
+1
View File
@@ -49,6 +49,7 @@
#include "stomach.dm"
#include "subsystem_init.dm"
#include "surgeries.dm"
#include "teleporters.dm"
#include "timer_sanity.dm"
#include "unit_test.dm"
code/modules/unit_tests/teleporters.dm
+10
View File
@@ -0,0 +1,10 @@
/datum/unit_test/auto_teleporter_linking/Run()
// Put down the teleporter machinery
var/obj/machinery/teleport/hub/hub = allocate(/obj/machinery/teleport/hub)
var/obj/machinery/teleport/station/station = allocate(/obj/machinery/teleport/station, locate(run_loc_bottom_left.x + 1, run_loc_bottom_left.y, run_loc_bottom_left.z))
var/obj/machinery/computer/teleporter/computer = allocate(/obj/machinery/computer/teleporter, locate(run_loc_bottom_left.x + 2, run_loc_bottom_left.y, run_loc_bottom_left.z))
TEST_ASSERT_EQUAL(hub.power_station, station, "Hub didn't link to the station")
TEST_ASSERT_EQUAL(station.teleporter_console, computer, "Station didn't link to the teleporter console")
TEST_ASSERT_EQUAL(station.teleporter_hub, hub, "Station didn't link to the hub")
TEST_ASSERT_EQUAL(computer.power_station, station, "Teleporter console didn't link to the hub")