From 1d966a688eb926a1e37c5d2611c24c817f7200c8 Mon Sep 17 00:00:00 2001
From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Date: Sun, 14 Apr 2019 23:17:37 -0400
Subject: [PATCH 01/14] Update shield.dm

---
 code/modules/station_goals/shield.dm | 30 ++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/code/modules/station_goals/shield.dm b/code/modules/station_goals/shield.dm
index 44746e595e..4aeebab02c 100644
--- a/code/modules/station_goals/shield.dm
+++ b/code/modules/station_goals/shield.dm
@@ -127,13 +127,39 @@
 	else
 		return ..()
 
-/obj/machinery/satellite/meteor_shield
+/obj/machinery/satellite
 	name = "\improper Meteor Shield Satellite"
 	desc = "A meteor point-defense satellite."
 	mode = "M-SHIELD"
 	speed_process = TRUE
 	var/kill_range = 14
 
+/obj/machinery/satellite/meteor_shield/sci
+	name = "\improper Meteor Shield Satellite"
+	desc = "A station made meteor point-defense satellite."
+	mode = "M-SHIELD"
+
+/obj/item/disk/meteor
+	name = "Meteor Shield Upgrade Disk"
+	desc = "A floppy disk that allows meteor shields to fire at longer ranges and lowers meteor drawing from gravitational fields.."
+
+/obj/machinery/satellite/meteor_shield/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/disk/meteor))
+		to_chat(user, "<span class='notice'>The disk uploads better tracking and rang modification software.</span>")
+		kill_range = 17
+		change_meteor_chance(0.5)
+	else
+		return ..()
+
+/obj/machinery/satellite/meteor_shield/sci/toggle(user)
+	if(!..(user))
+		return FALSE
+	if(obj_flags & EMAGGED)
+		if(active)
+			change_meteor_chance(8)
+		else
+			change_meteor_chance(1.5)
+
 /obj/machinery/satellite/meteor_shield/proc/space_los(meteor)
 	for(var/turf/T in getline(src,meteor))
 		if(!isspaceturf(T))
@@ -177,4 +203,4 @@
 	obj_flags |= EMAGGED
 	to_chat(user, "<span class='notice'>You access the satellite's debug mode, increasing the chance of meteor strikes.</span>")
 	if(active)
-		change_meteor_chance(2)
+		change_meteor_chance(4)

From cc06df001aeb8741155f72cb7d3033a95529c9c2 Mon Sep 17 00:00:00 2001
From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Date: Sun, 14 Apr 2019 23:20:09 -0400
Subject: [PATCH 02/14] Update all_nodes.dm

---
 code/modules/research/techweb/all_nodes.dm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index 4d631691d0..51b8c67e92 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -203,6 +203,25 @@
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 3000)
 	export_price = 5000
 
+/datum/techweb_node/basic_meteor_defense
+	id = "basic_meteor_defense"
+	display_name = "Meteor Defense Research"
+	description = "Unlock the potential of the mysterious of why CC desided to not build these around the staition themselfs."
+	prereq_ids = list("adv_engi", "high_efficiency")
+	design_ids = list("meteor_defence", "meteor_console")
+	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000)
+	export_price = 5000
+
+/datum/techweb_node/adv_meteor_defense
+	id = "adv_meteor_defense"
+	display_name = "Meteor Defense Research"
+	description = "New and improved coding and lock on tech for meteor defence!"
+	prereq_ids = list("basic_meteor_defense", "adv_datatheory", "emp_adv")
+	design_ids = list("meteor_disk")
+	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1500)
+	export_price = 5000
+
+
 /////////////////////////Bluespace tech/////////////////////////
 /datum/techweb_node/bluespace_basic //Bluespace-memery
 	id = "bluespace_basic"

From 1a0aca6a655cbcee421c1608ac87de67209aae55 Mon Sep 17 00:00:00 2001
From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Date: Sun, 14 Apr 2019 23:20:49 -0400
Subject: [PATCH 03/14] Update comp_board_designs.dm

---
 code/modules/research/designs/comp_board_designs.dm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/code/modules/research/designs/comp_board_designs.dm b/code/modules/research/designs/comp_board_designs.dm
index 68aee66d62..5d567bf955 100644
--- a/code/modules/research/designs/comp_board_designs.dm
+++ b/code/modules/research/designs/comp_board_designs.dm
@@ -303,3 +303,11 @@
 	build_path = /obj/item/circuitboard/computer/nanite_cloud_controller
 	category = list("Computer Boards")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
+
+/datum/design/board/meteor_console
+	name = "Computer Design (Meteor Satellite Console)"
+	desc = "Allows for the construction of circuit boards used to build a new Meteor Satellite monitor console."
+	id = "meteor_console"
+	build_path = /obj/item/circuitboard/computer/sat_control
+	category = list("Computer Boards")
+	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING

From 84b04d87521ad6b9fb89d849bd591fe630d16bef Mon Sep 17 00:00:00 2001
From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Date: Sun, 14 Apr 2019 23:22:17 -0400
Subject: [PATCH 04/14] Update misc_designs.dm

---
 code/modules/research/designs/misc_designs.dm | 52 +++++++++++++++----
 1 file changed, 41 insertions(+), 11 deletions(-)

diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm
index d567334998..505d0c3d9c 100644
--- a/code/modules/research/designs/misc_designs.dm
+++ b/code/modules/research/designs/misc_designs.dm
@@ -228,16 +228,6 @@
 	category = list("Equipment")
 	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
 
-/datum/design/forcefield_projector
-	name = "Forcefield Projector"
-	desc = "A device which can project temporary forcefields to seal off an area."
-	id = "forcefield_projector"
-	build_type = PROTOLATHE
-	materials = list(MAT_METAL = 2500, MAT_GLASS = 1000)
-	build_path = /obj/item/forcefield_projector
-	category = list("Equipment")
-	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
-
 /datum/design/sci_goggles
 	name = "Science Goggles"
 	desc = "Goggles fitted with a portable analyzer capable of determining the research worth of an item or components of a machine."
@@ -312,6 +302,11 @@
 	category = list("Equipment")
 	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
 
+/////////////////////////////////////////
+////////////Holosign Designs//////////////
+/////////////////////////////////////////
+
+
 /datum/design/holosign
 	name = "Holographic Sign Projector"
 	desc = "A holograpic projector used to project various warning signs."
@@ -352,6 +347,16 @@
 	category = list("Equipment")
 	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
 
+/datum/design/forcefield_projector
+	name = "Forcefield Projector"
+	desc = "A device which can project temporary forcefields to seal off an area."
+	id = "forcefield_projector"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 2500, MAT_GLASS = 1000)
+	build_path = /obj/item/forcefield_projector
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
+
 /////////////////////////////////////////
 ////////////Tools//////////////
 /////////////////////////////////////////
@@ -457,7 +462,7 @@
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING
 
 /////////////////////////////////////////
-////////////Armour//////////////
+////////////Armour///////////////////////
 /////////////////////////////////////////
 
 /datum/design/reactive_armour
@@ -469,3 +474,28 @@
 	build_path = /obj/item/reactive_armour_shell
 	category = list("Equipment")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING
+
+/////////////////////////////////////////
+////////////Meteor///////////////////////
+/////////////////////////////////////////
+
+/datum/design/meteor_defence
+	name = "Meteor Defence"
+	desc = "A blue print of a early model of the Meteor defence turret."
+	id = "meteor_defence"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 150000, MAT_GLASS = 150000, MAT_SILVER = 7500, MAT_GOLD = 10000, MAT_TITANIUM = 35000) //Station goal
+	build_path = /obj/machinery/satellite/meteor_shield/sci
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
+
+/datum/design/meteor_disk
+	name = "Meteor Defence Upgrade Disk"
+	desc = "A disk containing debugging programming to solve and monitor meteors more effectively."
+	id = "meteor_disk"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 1500, MAT_GLASS = 1500, MAT_SILVER = 2500, MAT_GOLD = 1000)
+	build_path = /obj/item/disk/meteor
+	category = list("Electronics")
+	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
+

From ad19f6fcaec6d2cf44279913f2706032720998d1 Mon Sep 17 00:00:00 2001
From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Date: Sun, 14 Apr 2019 23:30:52 -0400
Subject: [PATCH 05/14] Shame to see it

---
 code/modules/station_goals/shield.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/station_goals/shield.dm b/code/modules/station_goals/shield.dm
index 4aeebab02c..fda0109b77 100644
--- a/code/modules/station_goals/shield.dm
+++ b/code/modules/station_goals/shield.dm
@@ -127,7 +127,7 @@
 	else
 		return ..()
 
-/obj/machinery/satellite
+/obj/machinery/satellite/meteor_shield
 	name = "\improper Meteor Shield Satellite"
 	desc = "A meteor point-defense satellite."
 	mode = "M-SHIELD"

From 558a989d8a957504ea3fe0e1a5b3f21ba34e8597 Mon Sep 17 00:00:00 2001
From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Date: Mon, 15 Apr 2019 15:03:03 -0400
Subject: [PATCH 06/14] fixed

---
 code/modules/station_goals/shield.dm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/modules/station_goals/shield.dm b/code/modules/station_goals/shield.dm
index fda0109b77..2d8b2a60ba 100644
--- a/code/modules/station_goals/shield.dm
+++ b/code/modules/station_goals/shield.dm
@@ -147,7 +147,6 @@
 	if(istype(I, /obj/item/disk/meteor))
 		to_chat(user, "<span class='notice'>The disk uploads better tracking and rang modification software.</span>")
 		kill_range = 17
-		change_meteor_chance(0.5)
 	else
 		return ..()
 
@@ -158,7 +157,7 @@
 		if(active)
 			change_meteor_chance(8)
 		else
-			change_meteor_chance(1.5)
+			change_meteor_chance(1.25)
 
 /obj/machinery/satellite/meteor_shield/proc/space_los(meteor)
 	for(var/turf/T in getline(src,meteor))

From 875bd522d0f725c2c1f98c97970b58a4da39a5de Mon Sep 17 00:00:00 2001
From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Date: Mon, 15 Apr 2019 22:45:08 -0400
Subject: [PATCH 07/14] grammer

---
 code/modules/research/techweb/all_nodes.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index 51b8c67e92..879a57ed8f 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -206,7 +206,7 @@
 /datum/techweb_node/basic_meteor_defense
 	id = "basic_meteor_defense"
 	display_name = "Meteor Defense Research"
-	description = "Unlock the potential of the mysterious of why CC desided to not build these around the staition themselfs."
+	description = "Unlock the potential of the mysterious of why CC decided to not build these around the station themselves."
 	prereq_ids = list("adv_engi", "high_efficiency")
 	design_ids = list("meteor_defence", "meteor_console")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000)

From 2adc3c6069e9106c23c4c5d633a3944c1ee37c6b Mon Sep 17 00:00:00 2001
From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Date: Tue, 16 Apr 2019 15:11:46 -0400
Subject: [PATCH 08/14] Update shield.dm

---
 code/modules/station_goals/shield.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/station_goals/shield.dm b/code/modules/station_goals/shield.dm
index 2d8b2a60ba..98f5534d06 100644
--- a/code/modules/station_goals/shield.dm
+++ b/code/modules/station_goals/shield.dm
@@ -157,7 +157,7 @@
 		if(active)
 			change_meteor_chance(8)
 		else
-			change_meteor_chance(1.25)
+			change_meteor_chance(0.125)
 
 /obj/machinery/satellite/meteor_shield/proc/space_los(meteor)
 	for(var/turf/T in getline(src,meteor))

From ebc3347850eb6087a9f65acd9450d77999becdec Mon Sep 17 00:00:00 2001
From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Date: Tue, 23 Apr 2019 12:16:07 -0400
Subject: [PATCH 09/14] Update misc_designs.dm

---
 code/modules/research/designs/misc_designs.dm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm
index 505d0c3d9c..c76d1024b6 100644
--- a/code/modules/research/designs/misc_designs.dm
+++ b/code/modules/research/designs/misc_designs.dm
@@ -53,7 +53,6 @@
 	category = list("Equipment")
 	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
 
-
 /datum/design/security_hud_night
 	name = "Night Vision Security HUD"
 	desc = "A heads-up display which provides id data and vision in complete darkness."
@@ -306,7 +305,6 @@
 ////////////Holosign Designs//////////////
 /////////////////////////////////////////
 
-
 /datum/design/holosign
 	name = "Holographic Sign Projector"
 	desc = "A holograpic projector used to project various warning signs."
@@ -484,7 +482,7 @@
 	desc = "A blue print of a early model of the Meteor defence turret."
 	id = "meteor_defence"
 	build_type = PROTOLATHE
-	materials = list(MAT_METAL = 150000, MAT_GLASS = 150000, MAT_SILVER = 7500, MAT_GOLD = 10000, MAT_TITANIUM = 35000) //Station goal
+	materials = list(MAT_METAL = 100000, MAT_GLASS = 100000, MAT_SILVER = 17500, MAT_GOLD = 15000, MAT_TITANIUM = 75000, MAT_URANIUM = 18000) //Station goal
 	build_path = /obj/machinery/satellite/meteor_shield/sci
 	category = list("Equipment")
 	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING

From 7b4ddd896547fcab753eef1a07f8b676561a19df Mon Sep 17 00:00:00 2001
From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Date: Sat, 25 May 2019 18:24:19 -0400
Subject: [PATCH 10/14] Update comp_board_designs.dm

---
 code/modules/research/designs/comp_board_designs.dm | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/code/modules/research/designs/comp_board_designs.dm b/code/modules/research/designs/comp_board_designs.dm
index 5d567bf955..fc053dc4b8 100644
--- a/code/modules/research/designs/comp_board_designs.dm
+++ b/code/modules/research/designs/comp_board_designs.dm
@@ -304,10 +304,3 @@
 	category = list("Computer Boards")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
 
-/datum/design/board/meteor_console
-	name = "Computer Design (Meteor Satellite Console)"
-	desc = "Allows for the construction of circuit boards used to build a new Meteor Satellite monitor console."
-	id = "meteor_console"
-	build_path = /obj/item/circuitboard/computer/sat_control
-	category = list("Computer Boards")
-	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING

From df236fbda55251eeef15761cf8c621c88566c7ba Mon Sep 17 00:00:00 2001
From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Date: Sat, 25 May 2019 18:24:33 -0400
Subject: [PATCH 11/14] Update comp_board_designs.dm

---
 code/modules/research/designs/comp_board_designs.dm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/modules/research/designs/comp_board_designs.dm b/code/modules/research/designs/comp_board_designs.dm
index fc053dc4b8..68aee66d62 100644
--- a/code/modules/research/designs/comp_board_designs.dm
+++ b/code/modules/research/designs/comp_board_designs.dm
@@ -303,4 +303,3 @@
 	build_path = /obj/item/circuitboard/computer/nanite_cloud_controller
 	category = list("Computer Boards")
 	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-

From a29aed136b6502bc0d569841691a9e5f988518e8 Mon Sep 17 00:00:00 2001
From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Date: Sat, 25 May 2019 18:25:01 -0400
Subject: [PATCH 12/14] Update misc_designs.dm

---
 code/modules/research/designs/misc_designs.dm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm
index c76d1024b6..e4e2dde7a3 100644
--- a/code/modules/research/designs/misc_designs.dm
+++ b/code/modules/research/designs/misc_designs.dm
@@ -497,3 +497,10 @@
 	category = list("Electronics")
 	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
 
+/datum/design/board/meteor_console
+	name = "Computer Design (Meteor Satellite Console)"
+	desc = "Allows for the construction of circuit boards used to build a new Meteor Satellite monitor console."
+	id = "meteor_console"
+	build_path = /obj/item/circuitboard/computer/sat_control
+	category = list("Computer Boards")
+	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING

From c5e3010cfa96dba107e752708290cc8473d5490d Mon Sep 17 00:00:00 2001
From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Date: Fri, 14 Jun 2019 12:01:52 -0400
Subject: [PATCH 13/14] Update misc_designs.dm

---
 code/modules/research/designs/misc_designs.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm
index e39d27efda..59df0f6e85 100644
--- a/code/modules/research/designs/misc_designs.dm
+++ b/code/modules/research/designs/misc_designs.dm
@@ -493,7 +493,7 @@
 	desc = "A blue print of a early model of the Meteor defence turret."
 	id = "meteor_defence"
 	build_type = PROTOLATHE
-	materials = list(MAT_METAL = 100000, MAT_GLASS = 100000, MAT_SILVER = 17500, MAT_GOLD = 15000, MAT_TITANIUM = 75000, MAT_URANIUM = 18000) //Station goal
+	materials = list(MAT_METAL = 50000, MAT_GLASS = 50000, MAT_SILVER = 8500, MAT_GOLD = 8500, MAT_TITANIUM = 7500, MAT_URANIUM = 7500)
 	build_path = /obj/machinery/satellite/meteor_shield/sci
 	category = list("Equipment")
 	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING

From f32291146b8086bebd11ec482a8fade26ea74e99 Mon Sep 17 00:00:00 2001
From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Date: Fri, 14 Jun 2019 12:02:55 -0400
Subject: [PATCH 14/14] Update all_nodes.dm

---
 code/modules/research/techweb/all_nodes.dm | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index 701a83bdc9..80c597c2c0 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -212,15 +212,14 @@
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000)
 	export_price = 5000
 
-/datum/techweb_node/adv_meteor_defense
-	id = "adv_meteor_defense"
-	display_name = "Meteor Defense Research"
-	description = "New and improved coding and lock on tech for meteor defence!"
-	prereq_ids = list("basic_meteor_defense", "adv_datatheory", "emp_adv")
-	design_ids = list("meteor_disk")
-	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1500)
-	export_price = 5000
-
+//datum/techweb_node/adv_meteor_defense
+	//id = "adv_meteor_defense"
+	//display_name = "Meteor Defense Research"
+	//description = "New and improved coding and lock on tech for meteor defence!"
+	//prereq_ids = list("basic_meteor_defense", "adv_datatheory", "emp_adv")
+	//design_ids = list("meteor_disk")
+	//research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1500)
+	//export_price = 5000
 
 /////////////////////////Bluespace tech/////////////////////////
 /datum/techweb_node/bluespace_basic //Bluespace-memery