From 8accdb52db101aa23b5ede76119ee5a060ae80ee Mon Sep 17 00:00:00 2001 From: Robertha89 Date: Sun, 7 Feb 2016 19:27:22 +0100 Subject: [PATCH 1/4] add tesla to supplypacks --- code/datums/supplypacks.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 3523a69bf9c..6cd6c33d5f0 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -524,6 +524,12 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine cost = 10 containername = "singularity generator crate" +/datum/supply_packs/engineering/engine/tesla + name = "Energy Ball Generator" + contains = list(1 /obj/machinery/the_singularitygen/tesla) + cost = 10 + containername = "energy ball generator" + /datum/supply_packs/engineering/engine/collector name = "Collector Crate" contains = list(/obj/machinery/power/rad_collector, From dba3a8d9374d71e92fe8a9362f6fd477706675f3 Mon Sep 17 00:00:00 2001 From: Robertha89 Date: Sun, 7 Feb 2016 19:40:19 +0100 Subject: [PATCH 2/4] Fixes issue --- code/datums/supplypacks.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 6cd6c33d5f0..542081f8a92 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -526,7 +526,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/engineering/engine/tesla name = "Energy Ball Generator" - contains = list(1 /obj/machinery/the_singularitygen/tesla) + contains = list(/obj/machinery/the_singularitygen/tesla) cost = 10 containername = "energy ball generator" From a743335161a871e308f97a70a4131a1f4797ee03 Mon Sep 17 00:00:00 2001 From: Robertha89 Date: Sun, 7 Feb 2016 23:06:49 +0100 Subject: [PATCH 3/4] add grounding, and coil, minor fixes. --- code/datums/supplypacks.dm | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 542081f8a92..f6488802ce4 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -525,10 +525,26 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine containername = "singularity generator crate" /datum/supply_packs/engineering/engine/tesla - name = "Energy Ball Generator" + name = "Energy Ball Generator Crate" contains = list(/obj/machinery/the_singularitygen/tesla) cost = 10 - containername = "energy ball generator" + containername = "energy ball generator crate" + +/datum/supply_packs/engineering/engine/coil + name = "Tesla Coil Crate" + contains = list(/obj/machinery/power/tesla_coil, + /obj/machinery/power/tesla_coil, + /obj/machinery/power/tesla_coil) + cost = 10 + containername = "tesla coil crate" + +/datum/supply_packs/engineering/engine/grounding + name = "Grounding Rod Crate" + contains = list(/obj/machinery/power/grounding_rod, + /obj/machinery/power/grounding_rod, + /obj/machinery/power/grounding_rod) + cost = 10 + containername = "grounding rod crate" /datum/supply_packs/engineering/engine/collector name = "Collector Crate" From 15e37b498cba41ac64bd19961a5f05e9d82948ac Mon Sep 17 00:00:00 2001 From: Robertha89 Date: Sun, 7 Feb 2016 23:07:59 +0100 Subject: [PATCH 4/4] Removes a grounding rod --- code/datums/supplypacks.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index f6488802ce4..b9311f76992 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -541,7 +541,6 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/engineering/engine/grounding name = "Grounding Rod Crate" contains = list(/obj/machinery/power/grounding_rod, - /obj/machinery/power/grounding_rod, /obj/machinery/power/grounding_rod) cost = 10 containername = "grounding rod crate"