cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes abductor console linking (#5098)

Browse Source
This commit is contained in:
Crazy Lemon
2016-07-18 19:51:12 -04:00
committed by Fox McCloud
parent 23a9a80fcd
commit fd486d3924
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/miniantags/abduction/machinery/camera.dm
+5 -1
View File
@@ -14,6 +14,10 @@
icon = 'icons/obj/abductor.dmi'
icon_state = "camera"
/obj/machinery/computer/camera_advanced/abductor/New()
abductor_equipment.Add(src)
..()
/obj/machinery/computer/camera_advanced/abductor/CreateEye()
..()
eyeobj.visible_icon = 1
@@ -162,4 +166,4 @@
var/mob/camera/aiEye/remote/remote_eye = C.remote_control
var/obj/machinery/abductor/console/console = target
console.SetDroppoint(remote_eye.loc,owner)
console.SetDroppoint(remote_eye.loc,owner)
code/game/gamemodes/miniantags/abduction/machinery/console.dm
+4 -4
View File
@@ -167,17 +167,17 @@
/obj/machinery/abductor/console/proc/Link_Abduction_Equipment() // these must all be explicitly `in machines` or they will not properly link.
for(var/obj/machinery/abductor/pad/p in machines)
for(var/obj/machinery/abductor/pad/p in abductor_equipment)
if(p.team == team)
pad = p
break
for(var/obj/machinery/abductor/experiment/e in machines)
for(var/obj/machinery/abductor/experiment/e in abductor_equipment)
if(e.team == team)
experiment = e
e.console = src
for(var/obj/machinery/computer/camera_advanced/abductor/c in machines)
for(var/obj/machinery/computer/camera_advanced/abductor/c in abductor_equipment)
if(c.team == team)
camera = c
c.console = src
@@ -220,4 +220,4 @@
new item(src.loc)
else
atom_say("Insufficent data!")
return
return