cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix teleporter discovery of hub and station requiring specific facing.

Browse Source 
* Teleporter would only search in the direction it was facing.  As long as computers have no directional sprites this is fine, but otherwise it is a problem.  Might as well do the sensible thing and search adjacent turfs.
This commit is contained in:
Leshana
2017-05-21 18:00:52 -04:00
parent dcb31bca22
commit dffe949c3a
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/game/machinery/teleporter.dm
View File

@@ -19,18 +19,24 @@
/obj/machinery/computer/teleporter/initialize() /obj/machinery/computer/teleporter/initialize()
..() ..()
var/obj/machinery/teleport/station/station = locate(/obj/machinery/teleport/station, get_step(src, dir)) var/obj/machinery/teleport/station/station
var/obj/machinery/teleport/hub/hub var/obj/machinery/teleport/hub/hub
if(station)
hub = locate(/obj/machinery/teleport/hub, get_step(station, dir)) // Search surrounding turfs for the station, and then search the station's surrounding turfs for the hub.
for(var/direction in cardinal)
station = locate(/obj/machinery/teleport/station, get_step(src, direction))
if(station)
for(direction in cardinal)
hub = locate(/obj/machinery/teleport/hub, get_step(station, direction))
if(hub)
break
break
if(istype(station)) if(istype(station))
station.com = hub station.com = hub
station.set_dir(dir)
if(istype(hub)) if(istype(hub))
hub.com = src hub.com = src
hub.set_dir(dir)
/obj/machinery/computer/teleporter/attackby(I as obj, mob/living/user as mob) /obj/machinery/computer/teleporter/attackby(I as obj, mob/living/user as mob)
if(istype(I, /obj/item/weapon/card/data/)) if(istype(I, /obj/item/weapon/card/data/))