Merge branch 'master' into corporate-comms

This commit is contained in:
warior4356
2020-10-02 17:04:04 -07:00
31 changed files with 121 additions and 61 deletions
@@ -10,11 +10,16 @@
throw_range = 20
origin_tech = "syndicate=1;engineering=3"
/// Integrated camera console to serve UI data
var/obj/machinery/computer/security/integrated_console
var/obj/machinery/computer/security/camera_bug/integrated_console
/obj/machinery/computer/security/camera_bug
name = "invasive camera utility"
desc = "How did this get here?! Please report this as a bug to github"
use_power = NO_POWER_USE
/obj/item/camera_bug/Initialize(mapload)
. = ..()
integrated_console = new
integrated_console = new(src)
integrated_console.parent = src
integrated_console.network = list("SS13")