Merge branch 'master' into upstream-merge-29940

2017-08-21 23:29:24 -05:00
parent 87b3df3069 b5e7f7f7fe
commit a0cf777040
364 changed files with 4317 additions and 3134 deletions
@@ -18,8 +18,8 @@
 	circuit = /obj/item/weapon/circuitboard/computer/cargo/request
 	requestonly = TRUE

-/obj/machinery/computer/cargo/New()
-	..()
+/obj/machinery/computer/cargo/Initialize()
+	. = ..()
 	var/obj/item/weapon/circuitboard/computer/cargo/board = circuit
 	contraband = board.contraband
 	emagged = board.emagged
@@ -1778,9 +1778,7 @@
 	name = "Shield System Control Board"
 	cost = 5000
 	special = TRUE
-	contains = list(
-					/obj/item/weapon/circuitboard/machine/computer/sat_control
-					)
+	contains = list(/obj/item/weapon/circuitboard/computer/sat_control)
 	crate_name= "shield control board crate"

 /datum/supply_pack/misc/bicycle