From 4f7030a42635a65805e4b9dfecb531de4f02ddd7 Mon Sep 17 00:00:00 2001
From: "rastaf.zero@gmail.com"
 <rastaf.zero@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Mon, 18 Jul 2011 19:17:58 +0000
Subject: [PATCH] Jack Rost updates: -more dismantable consoles: --Teleporter
 --Supply ordering console --Supply shuttle console --Power Monitor -new
 circuit boards (both constructable and destructable) --Supply ordering
 console (programming 2) --Supply shuttle console (programming 3) --Outpost
 Status Display(programming 2) --Operating Computer (programming 2, biotech 2)
 -R&D Console circuit now requires programming 4 (was 6).

Balagi updates:
-Trash bag: works as mining satchels but for trash.
-Started redesign computers code
-fixed candles sprites
-trashbag now has "in hands" sprite
-fixed emagging supply shuttle console

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1883 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/WorkInProgress/recycling/disposal.dm     |   8 ++
 code/defines/obj/computer.dm                  |  46 ++++++++-
 code/game/machinery/computer/Operating.dm     |   1 -
 code/game/machinery/computer/arcade.dm        |  31 ------
 code/game/machinery/computer/atmos.dm         |  32 -------
 .../game/machinery/computer/buildandrepair.dm |  16 ++++
 .../game/machinery/computer/communications.dm |  31 ------
 code/game/machinery/computer/computer.dm      |  90 +++++-------------
 code/game/machinery/computer/crew.dm          |  31 ------
 code/game/machinery/computer/explosive.dm     |  48 ----------
 code/game/machinery/computer/medical.dm       |  31 ------
 code/game/machinery/computer/power.dm         |  30 ++++++
 code/game/machinery/computer/robot.dm         |  47 ---------
 code/game/machinery/computer/security.dm      |  31 ------
 code/game/machinery/teleporter.dm             |  31 ++++++
 code/game/mecha/mech_bay.dm                   |  32 +------
 code/game/mecha/mecha_control_console.dm      |  30 +-----
 code/game/objects/items/candle.dm             |   3 +
 code/game/objects/items/trash.dm              |  60 +++++++++++-
 code/game/research/designs.dm                 |  42 +++++++-
 code/game/supplyshuttle.dm                    |  50 +++++++---
 icons/obj/candle.dmi                          | Bin 7473 -> 2793 bytes
 icons/obj/trash.dmi                           | Bin 3096 -> 3762 bytes
 tgstation.dme                                 |   1 -
 24 files changed, 295 insertions(+), 427 deletions(-)

diff --git a/code/WorkInProgress/recycling/disposal.dm b/code/WorkInProgress/recycling/disposal.dm
index c24ad1b1b6..c4b4f7c949 100644
--- a/code/WorkInProgress/recycling/disposal.dm
+++ b/code/WorkInProgress/recycling/disposal.dm
@@ -45,6 +45,14 @@
 			user << "You can't place that item inside the disposal unit."
 			return
 
+		if(istype(I, /obj/item/weapon/trashbag))
+			user << "\blue You empty the bag."
+			for (var/obj/item/trash/O in I.contents)
+				I.contents -= O
+				O.loc = src
+			I.update_icon()
+			return
+
 		var/obj/item/weapon/grab/G = I
 		if(istype(G))	// handle grabbed mob
 			if(ismob(G.affecting))
diff --git a/code/defines/obj/computer.dm b/code/defines/obj/computer.dm
index af0477f9f7..35950cd32e 100644
--- a/code/defines/obj/computer.dm
+++ b/code/defines/obj/computer.dm
@@ -3,6 +3,8 @@
 	icon = 'computer.dmi'
 	density = 1
 	anchored = 1.0
+	var/obj/item/weapon/circuitboard/circuit = null //if circuit==null, computer can't disassemble
+
 /*
 /obj/machinery/computer/airtunnel
 	name = "Air Tunnel Control"
@@ -16,6 +18,7 @@
 	anchored = 1.0
 	icon = 'computer.dmi'
 	icon_state = "comm"
+	circuit = "/obj/item/weapon/circuitboard/operating"
 
 	var/mob/living/carbon/human/victim = null
 
@@ -31,6 +34,7 @@
 	desc = "Does not support Pin ball."
 	icon = 'computer.dmi'
 	icon_state = "arcade"
+	circuit = "/obj/item/weapon/circuitboard/arcade"
 	var/enemy_name = "Space Villian"
 	var/temp = "Winners Don't Use Spacedrugs" //Temporary message, for attack messages, etc
 	var/player_hp = 30 //Player health/attack points
@@ -44,6 +48,7 @@
 	name = "AI Upload"
 	desc = "It is said that you can upload silly laws to AI's with this."
 	icon_state = "command"
+	circuit = "/obj/item/weapon/circuitboard/aiupload"
 	var/mob/living/silicon/ai/current = null
 	var/opened = 0
 
@@ -61,6 +66,7 @@
 	name = "Station Alert Computer"
 	desc = "Alert. Alert. ALERT!!!"
 	icon_state = "alert:0"
+	circuit = "/obj/item/weapon/circuitboard/stationalert"
 	var/alarms = list("Fire"=list(), "Atmosphere"=list(), "Power"=list())
 
 /obj/machinery/computer/atmos_alert
@@ -86,6 +92,7 @@
 	name = "Identification Computer"
 	desc = "You can use this to change ID's. YOU ARE GOD!"
 	icon_state = "id"
+	circuit = "/obj/item/weapon/circuitboard/card"
 	var/obj/item/weapon/card/id/scan = null
 	var/obj/item/weapon/card/id/modify = null
 	var/authenticated = 0.0
@@ -97,6 +104,7 @@
 /obj/machinery/computer/card/centcom
 	name = "CentCom Identification Computer"
 	desc = "You are the Gods's God."
+	circuit = "/obj/item/weapon/circuitboard/card/centcom"
 	req_access = list(access_cent_captain)
 
 /obj/machinery/computer/communications
@@ -104,6 +112,7 @@
 	desc = "This can be used for various important functions. Still under developement."
 	icon_state = "comm"
 	req_access = list(access_heads)
+	circuit = "/obj/item/weapon/circuitboard/communications"
 	var/prints_intercept = 1
 	var/authenticated = 0
 	var/list/messagetitle = list()
@@ -167,6 +176,7 @@
 	desc = "This can be used to check medical records."
 	icon_state = "dna"
 	req_access = list(access_medical)
+	circuit = "/obj/item/weapon/circuitboard/med_data"
 	var/obj/item/weapon/card/id/scan = null
 	var/authenticated = null
 	var/rank = null
@@ -246,6 +256,7 @@
 	desc = "Beepsky. ARREST!!!"
 	icon_state = "security"
 	req_access = list(access_security)
+	circuit = "/obj/item/weapon/circuitboard/secure_data"
 	var/obj/item/weapon/card/id/scan = null
 	var/authenticated = null
 	var/rank = null
@@ -265,6 +276,7 @@
 	name = "Security Cameras"
 	desc = "Better than Television."
 	icon_state = "cameras"
+	circuit = "/obj/item/weapon/circuitboard/security"
 	var/obj/machinery/camera/current = null
 	var/last_pic = 1.0
 	var/network = "SS13"
@@ -277,6 +289,7 @@
 	icon_state = "telescreen"
 	network = "thunder"
 	density = 0
+	circuit = null
 
 /obj/machinery/computer/security/wooden_tv
 	name = "Security Cameras"
@@ -288,6 +301,7 @@
 	desc = "It's better than reality TV."
 	icon_state = "miningcameras"
 	network = "MINE"
+	circuit = "/obj/item/weapon/circuitboard/mining"
 
 /obj/machinery/computer/shuttle
 	name = "Shuttle"
@@ -316,4 +330,34 @@
 	use_power = 1
 	idle_power_usage = 250
 	active_power_usage = 500
-	var/list/tracked =	list(  )
\ No newline at end of file
+	circuit = "/obj/item/weapon/circuitboard/crew"
+	var/list/tracked =	list(  )
+
+/obj/machinery/computer/robotics
+	name = "Robotics Control"
+	icon = 'computer.dmi'
+	icon_state = "robot"
+	req_access = list(access_robotics)
+	circuit = "/obj/item/weapon/circuitboard/robotics"
+
+	var/id = 0.0
+	var/temp = null
+	var/status = 0
+	var/timeleft = 60
+	var/stop = 0.0
+	var/screen = 0 // 0 - Main Menu, 1 - Cyborg Status, 2 - Kill 'em All! -- In text
+
+/obj/machinery/computer/prisoner
+	name = "Prisoner Management"
+	icon = 'computer.dmi'
+	icon_state = "explosive"
+	req_access = list(access_armory)
+	circuit = "/obj/item/weapon/circuitboard/prisoner"
+
+	var/id = 0.0
+	var/temp = null
+	var/status = 0
+	var/timeleft = 60
+	var/stop = 0.0
+	var/screen = 0 // 0 - No Access Denied, 1 - Access allowed
+	var/malf_access = 0
\ No newline at end of file
diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm
index 4651bb264b..3df263a682 100644
--- a/code/game/machinery/computer/Operating.dm
+++ b/code/game/machinery/computer/Operating.dm
@@ -16,7 +16,6 @@
 		return
 	interact(user)
 
-
 /obj/machinery/computer/operating/proc/interact(mob/user)
 	if ( (get_dist(src, user) > 1 ) || (stat & (BROKEN|NOPOWER)) )
 		if (!istype(user, /mob/living/silicon))
diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index 88abf6d507..eb40a09ab4 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -1,34 +1,3 @@
-/obj/machinery/computer/arcade/attackby(I as obj, user as mob)
-	if(istype(I, /obj/item/weapon/screwdriver))
-		playsound(src.loc, 'Screwdriver.ogg', 50, 1)
-		if(do_after(user, 20))
-			if (src.stat & BROKEN)
-				user << "\blue The broken glass falls out."
-				var/obj/computerframe/A = new /obj/computerframe( src.loc )
-				new /obj/item/weapon/shard( src.loc )
-				var/obj/item/weapon/circuitboard/arcade/M = new /obj/item/weapon/circuitboard/arcade( A )
-				for (var/obj/C in src)
-					C.loc = src.loc
-				A.circuit = M
-				A.state = 3
-				A.icon_state = "3"
-				A.anchored = 1
-				del(src)
-			else
-				user << "\blue You disconnect the monitor."
-				var/obj/computerframe/A = new /obj/computerframe( src.loc )
-				var/obj/item/weapon/circuitboard/arcade/M = new /obj/item/weapon/circuitboard/arcade( A )
-				for (var/obj/C in src)
-					C.loc = src.loc
-				A.circuit = M
-				A.state = 4
-				A.icon_state = "4"
-				A.anchored = 1
-				del(src)
-	else
-		src.attack_hand(user)
-	return
-
 /obj/machinery/computer/arcade/New()
 	..()
 	var/name_action
diff --git a/code/game/machinery/computer/atmos.dm b/code/game/machinery/computer/atmos.dm
index 22db63fc74..f7acd285e2 100644
--- a/code/game/machinery/computer/atmos.dm
+++ b/code/game/machinery/computer/atmos.dm
@@ -20,38 +20,6 @@ Atmos alert computer
 		return
 	interact(user)
 
-/obj/machinery/computer/station_alert/attackby(I as obj, user as mob)
-	if(istype(I, /obj/item/weapon/screwdriver))
-		playsound(src.loc, 'Screwdriver.ogg', 50, 1)
-		if(do_after(user, 20))
-			if (src.stat & BROKEN)
-				user << "\blue The broken glass falls out."
-				var/obj/computerframe/A = new /obj/computerframe( src.loc )
-				new /obj/item/weapon/shard( src.loc )
-				var /obj/item/weapon/circuitboard/stationalert/M = new /obj/item/weapon/circuitboard/stationalert( A )
-				for (var/obj/C in src)
-					C.loc = src.loc
-				A.circuit = M
-				A.state = 3
-				A.icon_state = "3"
-				A.anchored = 1
-				del(src)
-			else
-				user << "\blue You disconnect the monitor."
-				var/obj/computerframe/A = new /obj/computerframe( src.loc )
-				var/obj/item/weapon/circuitboard/stationalert/M = new /obj/item/weapon/circuitboard/stationalert( A )
-				for (var/obj/C in src)
-					C.loc = src.loc
-				A.circuit = M
-				A.state = 4
-				A.icon_state = "4"
-				A.anchored = 1
-				del(src)
-	else
-		src.attack_hand(user)
-	return
-
-
 /obj/machinery/computer/station_alert/proc/interact(mob/user)
 	usr.machine = src
 	var/dat = "<HEAD><TITLE>Current Station Alerts</TITLE><META HTTP-EQUIV='Refresh' CONTENT='10'></HEAD><BODY>\n"
diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm
index 2a777d31be..cd57816924 100644
--- a/code/game/machinery/computer/buildandrepair.dm
+++ b/code/game/machinery/computer/buildandrepair.dm
@@ -141,6 +141,22 @@
 	name = "Circuit board (Mech Bay Power Control Console)"
 	build_path = "/obj/machinery/computer/mech_bay_power_console"
 	origin_tech = "programming=2;powerstorage=3"
+/obj/item/weapon/circuitboard/ordercomp
+	name = "Circuit board (Supply ordering console)"
+	build_path = "/obj/machinery/computer/ordercomp"
+	origin_tech = "programming=2"
+/obj/item/weapon/circuitboard/supplycomp
+	name = "Circuit board (Supply shuttle console)"
+	build_path = "/obj/machinery/computer/supplycomp"
+	origin_tech = "programming=3"
+/obj/item/weapon/circuitboard/operating
+	name = "Circuit board (Operating Computer)"
+	build_path = "/obj/machinery/computer/operating"
+	origin_tech = "programming=2;biotech=2"
+/obj/item/weapon/circuitboard/mining
+	name = "Circuit board (Outpost Status Display)"
+	build_path = "/obj/machinery/computer/security/mining"
+	origin_tech = "programming=2"
 
 
 /obj/computerframe/attackby(obj/item/P as obj, mob/user as mob)
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index 6784bd64de..5c9d6ff9ad 100644
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -156,37 +156,6 @@
 				AL.open()
 				AL.lockdownbyai = 0
 
-/obj/machinery/computer/communications/attackby(I as obj, user as mob)
-	if(istype(I, /obj/item/weapon/screwdriver))
-		playsound(src.loc, 'Screwdriver.ogg', 50, 1)
-		if(do_after(user, 20))
-			if (src.stat & BROKEN)
-				user << "\blue The broken glass falls out."
-				var/obj/computerframe/A = new /obj/computerframe( src.loc )
-				new /obj/item/weapon/shard( src.loc )
-				var/obj/item/weapon/circuitboard/communications/M = new /obj/item/weapon/circuitboard/communications( A )
-				for (var/obj/C in src)
-					C.loc = src.loc
-				A.circuit = M
-				A.state = 3
-				A.icon_state = "3"
-				A.anchored = 1
-				del(src)
-			else
-				user << "\blue You disconnect the monitor."
-				var/obj/computerframe/A = new /obj/computerframe( src.loc )
-				var/obj/item/weapon/circuitboard/communications/M = new /obj/item/weapon/circuitboard/communications( A )
-				for (var/obj/C in src)
-					C.loc = src.loc
-				A.circuit = M
-				A.state = 4
-				A.icon_state = "4"
-				A.anchored = 1
-				del(src)
-	else
-		src.attack_hand(user)
-	return
-
 /obj/machinery/computer/communications/attack_ai(var/mob/user as mob)
 	return src.attack_hand(user)
 
diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm
index aeb66c5c3d..960164d417 100644
--- a/code/game/machinery/computer/computer.dm
+++ b/code/game/machinery/computer/computer.dm
@@ -92,41 +92,35 @@ Pod/Blast Doors computer
 	icon_state += "b"
 	stat |= BROKEN
 
+/obj/machinery/computer/attackby(I as obj, user as mob)
+	if(istype(I, /obj/item/weapon/screwdriver) && circuit)
+		playsound(src.loc, 'Screwdriver.ogg', 50, 1)
+		if(do_after(user, 20))
+			var/obj/computerframe/A = new /obj/computerframe( src.loc )
+			var/obj/item/weapon/circuitboard/M = new circuit( A )
+			A.circuit = M
+			A.anchored = 1
+			for (var/obj/C in src)
+				C.loc = src.loc
+			if (src.stat & BROKEN)
+				user << "\blue The broken glass falls out."
+				new /obj/item/weapon/shard( src.loc )
+				A.state = 3
+				A.icon_state = "3"
+			else
+				user << "\blue You disconnect the monitor."
+				A.state = 4
+				A.icon_state = "4"
+			del(src)
+	else
+		src.attack_hand(user)
+	return
+
+
 /obj/machinery/computer/security/New()
 	..()
 	verbs -= /obj/machinery/computer/security/verb/station_map
 
-/obj/machinery/computer/security/attackby(I as obj, user as mob)
-	if(istype(I, /obj/item/weapon/screwdriver))
-		playsound(loc, 'Screwdriver.ogg', 50, 1)
-		if(do_after(user, 20))
-			if (stat & BROKEN)
-				user << "\blue The broken glass falls out."
-				var/obj/computerframe/A = new /obj/computerframe( loc )
-				new /obj/item/weapon/shard( loc )
-				var/obj/item/weapon/circuitboard/security/M = new /obj/item/weapon/circuitboard/security( A )
-				for (var/obj/C in src)
-					C.loc = loc
-				A.circuit = M
-				A.state = 3
-				A.icon_state = "3"
-				A.anchored = 1
-				del(src)
-			else
-				user << "\blue You disconnect the monitor."
-				var/obj/computerframe/A = new /obj/computerframe( loc )
-				var/obj/item/weapon/circuitboard/security/M = new /obj/item/weapon/circuitboard/security( A )
-				for (var/obj/C in src)
-					C.loc = loc
-				A.circuit = M
-				A.state = 4
-				A.icon_state = "4"
-				A.anchored = 1
-				del(src)
-	else
-		attack_hand(user)
-	return
-
 /obj/machinery/computer/security/attack_ai(var/mob/user as mob)
 	return attack_hand(user)
 
@@ -139,8 +133,6 @@ Pod/Blast Doors computer
 	user.reset_view(current)
 	return 1
 
-
-
 /obj/machinery/computer/card/attack_ai(var/mob/user as mob)
 	return attack_hand(user)
 
@@ -295,38 +287,6 @@ Pod/Blast Doors computer
 	updateUsrDialog()
 	return
 
-/obj/machinery/computer/card/attackby(I as obj, user as mob)
-	if(istype(I, /obj/item/weapon/screwdriver))
-		playsound(loc, 'Screwdriver.ogg', 50, 1)
-		if(do_after(user, 20))
-			var/card_path = text2path("/obj/item/weapon/circuitboard/card[istype(src,/obj/machinery/computer/card/centcom)?"/centcom":""]")
-			if (stat & BROKEN)
-				user << "\blue The broken glass falls out."
-				var/obj/computerframe/A = new /obj/computerframe( loc )
-				new /obj/item/weapon/shard( loc )
-				var/obj/item/weapon/circuitboard/card/M = new card_path( A )
-				for (var/obj/C in src)
-					C.loc = loc
-				A.circuit = M
-				A.state = 3
-				A.icon_state = "3"
-				A.anchored = 1
-				del(src)
-			else
-				user << "\blue You disconnect the monitor."
-				var/obj/computerframe/A = new /obj/computerframe( loc )
-				var/obj/item/weapon/circuitboard/card/M = new card_path( A )
-				for (var/obj/C in src)
-					C.loc = loc
-				A.circuit = M
-				A.state = 4
-				A.icon_state = "4"
-				A.anchored = 1
-				del(src)
-	else
-		attack_hand(user)
-	return
-
 /obj/datacore/proc/manifest()
 	for(var/mob/living/carbon/human/H in world)
 		if (!isnull(H.mind) && (H.mind.assigned_role != "MODE"))
diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm
index c4ba1bd5de..4cf6729214 100644
--- a/code/game/machinery/computer/crew.dm
+++ b/code/game/machinery/computer/crew.dm
@@ -1,34 +1,3 @@
-/obj/machinery/computer/crew/attackby(I as obj, user as mob)
-	if(istype(I, /obj/item/weapon/screwdriver))
-		playsound(src.loc, 'Screwdriver.ogg', 50, 1)
-		if(do_after(user, 20))
-			if (src.stat & BROKEN)
-				user << "\blue The broken glass falls out."
-				var/obj/computerframe/A = new /obj/computerframe( src.loc )
-				new /obj/item/weapon/shard( src.loc )
-				var/obj/item/weapon/circuitboard/crew/M = new /obj/item/weapon/circuitboard/crew( A )
-				for (var/obj/C in src)
-					C.loc = src.loc
-				A.circuit = M
-				A.state = 3
-				A.icon_state = "3"
-				A.anchored = 1
-				del(src)
-			else
-				user << "\blue You disconnect the monitor."
-				var/obj/computerframe/A = new /obj/computerframe( src.loc )
-				var/obj/item/weapon/circuitboard/crew/M = new /obj/item/weapon/circuitboard/crew( A )
-				for (var/obj/C in src)
-					C.loc = src.loc
-				A.circuit = M
-				A.state = 4
-				A.icon_state = "4"
-				A.anchored = 1
-				del(src)
-	else
-		src.attack_hand(user)
-	return
-
 /obj/machinery/computer/crew
 	New()
 		tracked = list()
diff --git a/code/game/machinery/computer/explosive.dm b/code/game/machinery/computer/explosive.dm
index cad516959d..a4181ed231 100644
--- a/code/game/machinery/computer/explosive.dm
+++ b/code/game/machinery/computer/explosive.dm
@@ -1,51 +1,3 @@
-/obj/machinery/computer/prisoner
-	name = "Prisoner Management"
-	icon = 'computer.dmi'
-	icon_state = "explosive"
-	req_access = list(access_armory)
-
-	var/id = 0.0
-	var/temp = null
-	var/status = 0
-	var/timeleft = 60
-	var/stop = 0.0
-	var/screen = 0 // 0 - No Access Denied, 1 - Access allowed
-	var/malf_access = 0
-
-/obj/machinery/computer/prisoner/attackby(I as obj, user as mob)
-	if(istype(I, /obj/item/weapon/screwdriver))
-		playsound(src.loc, 'Screwdriver.ogg', 50, 1)
-		if(do_after(user, 20))
-			if (src.stat & BROKEN)
-				user << "\blue The broken glass falls out."
-				var/obj/computerframe/A = new /obj/computerframe( src.loc )
-				new /obj/item/weapon/shard( src.loc )
-				var/obj/item/weapon/circuitboard/prisoner/M = new /obj/item/weapon/circuitboard/prisoner( A )
-				for (var/obj/C in src)
-					C.loc = src.loc
-				M.id = src.id
-				A.circuit = M
-				A.state = 3
-				A.icon_state = "3"
-				A.anchored = 1
-				del(src)
-			else
-				user << "\blue You disconnect the monitor."
-				var/obj/computerframe/A = new /obj/computerframe( src.loc )
-				var/obj/item/weapon/circuitboard/prisoner/M = new /obj/item/weapon/circuitboard/prisoner( A )
-				for (var/obj/C in src)
-					C.loc = src.loc
-				M.id = src.id
-				A.circuit = M
-				A.state = 4
-				A.icon_state = "4"
-				A.anchored = 1
-				del(src)
-
-	//else
-	src.attack_hand(user)
-	return
-
 /obj/machinery/computer/prisoner/attack_ai(var/mob/user as mob)
 	user << "\red Access Denied"
 	if(user.icon_state == "ai-malf" && malf_access == 0)
diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm
index 0b777a41de..0a88095bde 100644
--- a/code/game/machinery/computer/medical.dm
+++ b/code/game/machinery/computer/medical.dm
@@ -1,34 +1,3 @@
-/obj/machinery/computer/med_data/attackby(I as obj, user as mob)
-	if(istype(I, /obj/item/weapon/screwdriver))
-		playsound(src.loc, 'Screwdriver.ogg', 50, 1)
-		if(do_after(user, 20))
-			if (src.stat & BROKEN)
-				user << "\blue The broken glass falls out."
-				var/obj/computerframe/A = new /obj/computerframe( src.loc )
-				new /obj/item/weapon/shard( src.loc )
-				var/obj/item/weapon/circuitboard/med_data/M = new /obj/item/weapon/circuitboard/med_data( A )
-				for (var/obj/C in src)
-					C.loc = src.loc
-				A.circuit = M
-				A.state = 3
-				A.icon_state = "3"
-				A.anchored = 1
-				del(src)
-			else
-				user << "\blue You disconnect the monitor."
-				var/obj/computerframe/A = new /obj/computerframe( src.loc )
-				var/obj/item/weapon/circuitboard/med_data/M = new /obj/item/weapon/circuitboard/med_data( A )
-				for (var/obj/C in src)
-					C.loc = src.loc
-				A.circuit = M
-				A.state = 4
-				A.icon_state = "4"
-				A.anchored = 1
-				del(src)
-	else
-		src.attack_hand(user)
-	return
-
 /obj/machinery/computer/med_data/attack_ai(user as mob)
 	return src.attack_hand(user)
 
diff --git a/code/game/machinery/computer/power.dm b/code/game/machinery/computer/power.dm
index c278b9b358..6f7b50210f 100644
--- a/code/game/machinery/computer/power.dm
+++ b/code/game/machinery/computer/power.dm
@@ -18,6 +18,36 @@ var/reportingpower = 0  //this tracks whether this power monitoring computer is
 		return
 	interact(user)
 
+/obj/machinery/power/monitor/attackby(I as obj, user as mob)
+	if(istype(I, /obj/item/weapon/screwdriver))
+		playsound(src.loc, 'Screwdriver.ogg', 50, 1)
+		if(do_after(user, 20))
+			if (src.stat & BROKEN)
+				user << "\blue The broken glass falls out."
+				var/obj/computerframe/A = new /obj/computerframe( src.loc )
+				new /obj/item/weapon/shard( src.loc )
+				var/obj/item/weapon/circuitboard/powermonitor/M = new /obj/item/weapon/circuitboard/powermonitor( A )
+				for (var/obj/C in src)
+					C.loc = src.loc
+				A.circuit = M
+				A.state = 3
+				A.icon_state = "3"
+				A.anchored = 1
+				del(src)
+			else
+				user << "\blue You disconnect the monitor."
+				var/obj/computerframe/A = new /obj/computerframe( src.loc )
+				var/obj/item/weapon/circuitboard/powermonitor/M = new /obj/item/weapon/circuitboard/powermonitor( A )
+				for (var/obj/C in src)
+					C.loc = src.loc
+				A.circuit = M
+				A.state = 4
+				A.icon_state = "4"
+				A.anchored = 1
+				del(src)
+	else
+		src.attack_hand(user)
+	return
 
 /obj/machinery/power/monitor/proc/interact(mob/user)
 
diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm
index b8e9176613..dc17e6cdfe 100644
--- a/code/game/machinery/computer/robot.dm
+++ b/code/game/machinery/computer/robot.dm
@@ -1,50 +1,3 @@
-/obj/machinery/computer/robotics
-	name = "Robotics Control"
-	icon = 'computer.dmi'
-	icon_state = "robot"
-	req_access = list(access_robotics)
-
-	var/id = 0.0
-	var/temp = null
-	var/status = 0
-	var/timeleft = 60
-	var/stop = 0.0
-	var/screen = 0 // 0 - Main Menu, 1 - Cyborg Status, 2 - Kill 'em All! -- In text
-
-/obj/machinery/computer/robotics/attackby(I as obj, user as mob)
-	if(istype(I, /obj/item/weapon/screwdriver))
-		playsound(src.loc, 'Screwdriver.ogg', 50, 1)
-		if(do_after(user, 20))
-			if (src.stat & BROKEN)
-				user << "\blue The broken glass falls out."
-				var/obj/computerframe/A = new /obj/computerframe( src.loc )
-				new /obj/item/weapon/shard( src.loc )
-				var/obj/item/weapon/circuitboard/robotics/M = new /obj/item/weapon/circuitboard/robotics( A )
-				for (var/obj/C in src)
-					C.loc = src.loc
-				M.id = src.id
-				A.circuit = M
-				A.state = 3
-				A.icon_state = "3"
-				A.anchored = 1
-				del(src)
-			else
-				user << "\blue You disconnect the monitor."
-				var/obj/computerframe/A = new /obj/computerframe( src.loc )
-				var/obj/item/weapon/circuitboard/robotics/M = new /obj/item/weapon/circuitboard/robotics( A )
-				for (var/obj/C in src)
-					C.loc = src.loc
-				M.id = src.id
-				A.circuit = M
-				A.state = 4
-				A.icon_state = "4"
-				A.anchored = 1
-				del(src)
-
-	//else
-	src.attack_hand(user)
-	return
-
 /obj/machinery/computer/robotics/attack_ai(var/mob/user as mob)
 	return src.attack_hand(user)
 
diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index 1b28921ba5..0a90965662 100644
--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -1,34 +1,3 @@
-/obj/machinery/computer/secure_data/attackby(I as obj, user as mob)
-	if(istype(I, /obj/item/weapon/screwdriver))
-		playsound(loc, 'Screwdriver.ogg', 50, 1)
-		if(do_after(user, 20))
-			if (stat & BROKEN)
-				user << "\blue The broken glass falls out."
-				var/obj/computerframe/A = new /obj/computerframe( loc )
-				new /obj/item/weapon/shard( loc )
-				var/obj/item/weapon/circuitboard/secure_data/M = new /obj/item/weapon/circuitboard/secure_data( A )
-				for (var/obj/C in src)
-					C.loc = loc
-				A.circuit = M
-				A.state = 3
-				A.icon_state = "3"
-				A.anchored = 1
-				del(src)
-			else
-				user << "\blue You disconnect the monitor."
-				var/obj/computerframe/A = new /obj/computerframe( loc )
-				var/obj/item/weapon/circuitboard/secure_data/M = new /obj/item/weapon/circuitboard/secure_data( A )
-				for (var/obj/C in src)
-					C.loc = loc
-				A.circuit = M
-				A.state = 4
-				A.icon_state = "4"
-				A.anchored = 1
-				del(src)
-	else
-		attack_hand(user)
-	return
-
 /obj/machinery/computer/secure_data/attack_ai(mob/user as mob)
 	return attack_hand(user)
 
diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm
index 24952c426e..2545b0875d 100644
--- a/code/game/machinery/teleporter.dm
+++ b/code/game/machinery/teleporter.dm
@@ -25,6 +25,37 @@
 	else
 		src.attack_hand()
 
+/obj/machinery/computer/teleporter/attackby(I as obj, user as mob)
+	if(istype(I, /obj/item/weapon/screwdriver))
+		playsound(src.loc, 'Screwdriver.ogg', 50, 1)
+		if(do_after(user, 20))
+			if (src.stat & BROKEN)
+				user << "\blue The broken glass falls out."
+				var/obj/computerframe/A = new /obj/computerframe( src.loc )
+				new /obj/item/weapon/shard( src.loc )
+				var/obj/item/weapon/circuitboard/teleporter/M = new /obj/item/weapon/circuitboard/teleporter( A )
+				for (var/obj/C in src)
+					C.loc = src.loc
+				A.circuit = M
+				A.state = 3
+				A.icon_state = "3"
+				A.anchored = 1
+				del(src)
+			else
+				user << "\blue You disconnect the monitor."
+				var/obj/computerframe/A = new /obj/computerframe( src.loc )
+				var/obj/item/weapon/circuitboard/teleporter/M = new /obj/item/weapon/circuitboard/teleporter( A )
+				for (var/obj/C in src)
+					C.loc = src.loc
+				A.circuit = M
+				A.state = 4
+				A.icon_state = "4"
+				A.anchored = 1
+				del(src)
+	else
+		src.attack_hand(user)
+	return
+
 /obj/machinery/computer/teleporter/attack_paw()
 	src.attack_hand()
 
diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm
index 6947f8f34a..1a437fa888 100644
--- a/code/game/mecha/mech_bay.dm
+++ b/code/game/mecha/mech_bay.dm
@@ -128,6 +128,7 @@
 	anchored = 1
 	icon = 'mech_bay.dmi'
 	icon_state = "recharge_comp"
+	circuit = "/obj/item/weapon/circuitboard/mech_bay_power_console"
 	var/autostart = 1
 	var/voltage = 45
 	var/turf/simulated/floor/mech_bay_recharge_floor/recharge_floor
@@ -171,37 +172,6 @@
 		if(recharge_port)
 			recharge_port.stop_charge()
 
-	attackby(I as obj, user as mob)
-		if(istype(I, /obj/item/weapon/screwdriver))
-			playsound(src.loc, 'Screwdriver.ogg', 50, 1)
-			if(do_after(user, 20))
-				if (src.stat & BROKEN)
-					user << "\blue The broken glass falls out."
-					var/obj/computerframe/A = new /obj/computerframe( src.loc )
-					new /obj/item/weapon/shard( src.loc )
-					var/obj/item/weapon/circuitboard/mech_bay_power_console/M = new /obj/item/weapon/circuitboard/mech_bay_power_console( A )
-					for (var/obj/C in src)
-						C.loc = src.loc
-					A.circuit = M
-					A.state = 3
-					A.icon_state = "3"
-					A.anchored = 1
-					del(src)
-				else
-					user << "\blue You disconnect the monitor."
-					var/obj/computerframe/A = new /obj/computerframe( src.loc )
-					var/obj/item/weapon/circuitboard/mech_bay_power_console/M = new /obj/item/weapon/circuitboard/mech_bay_power_console( A )
-					for (var/obj/C in src)
-						C.loc = src.loc
-					A.circuit = M
-					A.state = 4
-					A.icon_state = "4"
-					A.anchored = 1
-					del(src)
-		else
-			src.attack_hand(user)
-		return
-
 	attack_hand(mob/user as mob)
 		if(..()) return
 		var/output = "<html><head><title>[src.name]</title></head><body>"
diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm
index 15d5bfbc09..f13d29c87e 100644
--- a/code/game/mecha/mecha_control_console.dm
+++ b/code/game/mecha/mecha_control_console.dm
@@ -3,39 +3,11 @@
 	icon = 'computer.dmi'
 	icon_state = "mecha"
 	req_access = list(access_robotics)
+	circuit = "/obj/item/weapon/circuitboard/mecha_control"
 	var/list/located = list()
 	var/screen = 0
 	var/stored_data
 
-	attackby(I as obj, user as mob)
-		if(istype(I, /obj/item/weapon/screwdriver))
-			playsound(src.loc, 'Screwdriver.ogg', 50, 1)
-			if(do_after(user, 20))
-				if (src.stat & BROKEN)
-					user << "\blue The broken glass falls out."
-					var/obj/computerframe/A = new /obj/computerframe( src.loc )
-					new /obj/item/weapon/shard( src.loc )
-					var/obj/item/weapon/circuitboard/mecha_control/M = new /obj/item/weapon/circuitboard/mecha_control( A )
-					for (var/obj/C in src)
-						C.loc = src.loc
-					A.circuit = M
-					A.state = 3
-					A.icon_state = "3"
-					A.anchored = 1
-					del(src)
-				else
-					user << "\blue You disconnect the monitor."
-					var/obj/computerframe/A = new /obj/computerframe( src.loc )
-					var/obj/item/weapon/circuitboard/mecha_control/M = new /obj/item/weapon/circuitboard/mecha_control( A )
-					for (var/obj/C in src)
-						C.loc = src.loc
-					A.circuit = M
-					A.state = 4
-					A.icon_state = "4"
-					A.anchored = 1
-					del(src)
-		return
-
 	attack_ai(var/mob/user as mob)
 		return src.attack_hand(user)
 
diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm
index 18a455d012..a70e0ac004 100644
--- a/code/game/objects/items/candle.dm
+++ b/code/game/objects/items/candle.dm
@@ -27,6 +27,8 @@
 		light()
 	else if(istype(W, /obj/item/weapon/match) && W:lit)
 		light()
+	else if(istype(W, /obj/item/candle) && W:lit)
+		light()
 
 
 
@@ -63,6 +65,7 @@
 		lit = 0
 		update_icon()
 		sd_SetLuminosity(0)
+		user.sd_SetLuminosity(user.luminosity - CANDLE_LUM)
 
 /obj/item/candle/pickup(mob/user)
 	if(lit)
diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm
index ed6ca7d04f..1e24ab597e 100644
--- a/code/game/objects/items/trash.dm
+++ b/code/game/objects/items/trash.dm
@@ -45,4 +45,62 @@
 	candle
 		name = "candle"
 		icon = 'candle.dmi'
-		icon_state = "candle4"
\ No newline at end of file
+		icon_state = "candle4"
+
+
+/obj/item/trash/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	..()
+	if (istype(W, /obj/item/weapon/trashbag))
+		var/obj/item/weapon/trashbag/S = W
+		if (S.mode == 1)
+			for (var/obj/item/trash/O in locate(src.x,src.y,src.z))
+				if (S.contents.len < S.capacity)
+					S.contents += O;
+				else
+					user << "\blue The bag is full."
+					break
+			user << "\blue You pick up all trash."
+		else
+			if (S.contents.len < S.capacity)
+				S.contents += src;
+			else
+				user << "\blue The bag is full."
+		S.update_icon()
+	return
+
+/obj/item/weapon/trashbag
+	icon = 'trash.dmi'
+	icon_state = "trashbag0"
+	item_state = "trashbag"
+	name = "Trash bag"
+	var/mode = 0;  //0 = pick one at a time, 1 = pick all on tile
+	var/capacity = 25; //the number of trash it can carry.
+	flags = FPRINT | TABLEPASS | ONBELT
+	w_class = 1
+
+/obj/item/weapon/trashbag/update_icon()
+	if(contents.len == 0)
+		icon_state = "trashbag0"
+	else if(contents.len < 12)
+		icon_state = "trashbag1"
+	else if(contents.len < 25)
+		icon_state = "trashbag2"
+	else icon_state = "trashbag3"
+
+/obj/item/weapon/trashbag/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	..()
+	if (istype(W, /obj/item/trash))
+		var/obj/item/trash/O = W
+		src.contents += O;
+	return
+
+/obj/item/weapon/trashbag/verb/toggle_mode()
+	set name = "Switch Bag Method"
+	set category = "Object"
+
+	mode = !mode
+	switch (mode)
+		if(1)
+			usr << "The bag now picks up all trash in a tile at once."
+		if(0)
+			usr << "The bag now picks up one trash at a time."
\ No newline at end of file
diff --git a/code/game/research/designs.dm b/code/game/research/designs.dm
index 9dd11ed81c..54fbe8fd79 100644
--- a/code/game/research/designs.dm
+++ b/code/game/research/designs.dm
@@ -111,6 +111,15 @@ datum
 			materials = list("$glass" = 2000, "acid" = 20)
 			build_path = "/obj/item/weapon/circuitboard/med_data"
 
+		operating
+			name = "Circuit Design (Operating Computer)"
+			desc = "Allows for the construction of circuit boards used to build an operating computer console."
+			id = "operating"
+			req_tech = list("programming" = 2, "biotech" = 2)
+			build_type = IMPRINTER
+			materials = list("$glass" = 2000, "acid" = 20)
+			build_path = "/obj/item/weapon/circuitboard/operating"
+
 		pandemic
 			name = "Circuit Design (PanD.E.M.I.C. 2200)"
 			desc = "Allows for the construction of circuit boards used to build a PanD.E.M.I.C. 2200 console."
@@ -266,7 +275,7 @@ datum
 
 		mechapower
 			name = "Circuit Design (Mech Bay Power Control Console)"
-			desc = "Allows for the construction of circuit boards used to build an mech bay power control console."
+			desc = "Allows for the construction of circuit boards used to build a mech bay power control console."
 			id = "mechapower"
 			req_tech = list("programming" = 2, "powerstorage" = 3)
 			build_type = IMPRINTER
@@ -275,13 +284,40 @@ datum
 
 		rdconsole
 			name = "Circuit Design (R&D Console)"
-			desc = "Allows for the construction of circuit boards used to build an new R&D console."
+			desc = "Allows for the construction of circuit boards used to build a new R&D console."
 			id = "rdconsole"
-			req_tech = list("programming" = 6)
+			req_tech = list("programming" = 4)
 			build_type = IMPRINTER
 			materials = list("$glass" = 2000, "acid" = 20)
 			build_path = "/obj/item/weapon/circuitboard/rdconsole"
 
+		ordercomp
+			name = "Circuit Design (Supply ordering console)"
+			desc = "Allows for the construction of circuit boards used to build a Supply ordering console."
+			id = "ordercomp"
+			req_tech = list("programming" = 2)
+			build_type = IMPRINTER
+			materials = list("$glass" = 2000, "acid" = 20)
+			build_path = "/obj/item/weapon/circuitboard/ordercomp"
+
+		supplycomp
+			name = "Circuit Design (Supply shuttle console)"
+			desc = "Allows for the construction of circuit boards used to build a Supply shuttle console."
+			id = "supplycomp"
+			req_tech = list("programming" = 3)
+			build_type = IMPRINTER
+			materials = list("$glass" = 2000, "acid" = 20)
+			build_path = "/obj/item/weapon/circuitboard/supplycomp"
+
+		mining
+			name = "Circuit Design (Outpost Status Display)"
+			desc = "Allows for the construction of circuit boards used to build an outpost status display console."
+			id = "mining"
+			req_tech = list("programming" = 2)
+			build_type = IMPRINTER
+			materials = list("$glass" = 2000, "acid" = 20)
+			build_path = "/obj/item/weapon/circuitboard/mining"
+
 ///////////////////////////////////
 //////////AI Module Disks//////////
 ///////////////////////////////////
diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm
index 8388660ff7..124f042966 100644
--- a/code/game/supplyshuttle.dm
+++ b/code/game/supplyshuttle.dm
@@ -74,6 +74,7 @@ var/ordernum=0
 	icon = 'computer.dmi'
 	icon_state = "supply"
 	req_access = list(access_cargo)
+	circuit = "/obj/item/weapon/circuitboard/supplycomp"
 	var/temp = null
 	var/hacked = 0
 
@@ -81,6 +82,7 @@ var/ordernum=0
 	name = "Supply ordering console"
 	icon = 'computer.dmi'
 	icon_state = "request"
+	circuit = "/obj/item/weapon/circuitboard/ordercomp"
 	var/temp = null
 
 /obj/marker/supplymarker
@@ -208,31 +210,18 @@ var/ordernum=0
 
 	return
 
-/obj/machinery/computer/ordercomp/attackby(I as obj, user as mob)
-	return src.attack_hand(user)
-
 /obj/machinery/computer/ordercomp/attack_ai(var/mob/user as mob)
 	return src.attack_hand(user)
 
 /obj/machinery/computer/ordercomp/attack_paw(var/mob/user as mob)
 	return src.attack_hand(user)
 
-/obj/machinery/computer/supplycomp/attackby(I as obj, user as mob)
-	return src.attack_hand(user)
-
 /obj/machinery/computer/supplycomp/attack_ai(var/mob/user as mob)
 	return src.attack_hand(user)
 
 /obj/machinery/computer/supplycomp/attack_paw(var/mob/user as mob)
 	return src.attack_hand(user)
 
-/obj/machinery/computer/supplycomp/attackby(I as obj, user as mob)
-	if(istype(I,/obj/item/weapon/card/emag) && !hacked)
-		user << "\blue Special supplies unlocked."
-		src.hacked = 1
-	else
-		return src.attack_hand(user)
-
 /obj/machinery/computer/ordercomp/attack_hand(var/mob/user as mob)
 	if(..())
 		return
@@ -365,6 +354,41 @@ var/ordernum=0
 	onclose(user, "computer")
 	return
 
+/obj/machinery/computer/supplycomp/attackby(I as obj, user as mob)
+	if(istype(I,/obj/item/weapon/card/emag) && !hacked)
+		user << "\blue Special supplies unlocked."
+		src.hacked = 1
+		return
+	if(istype(I, /obj/item/weapon/screwdriver))
+		playsound(src.loc, 'Screwdriver.ogg', 50, 1)
+		if(do_after(user, 20))
+			if (src.stat & BROKEN)
+				user << "\blue The broken glass falls out."
+				var/obj/computerframe/A = new /obj/computerframe( src.loc )
+				new /obj/item/weapon/shard( src.loc )
+				var/obj/item/weapon/circuitboard/supplycomp/M = new /obj/item/weapon/circuitboard/supplycomp( A )
+				for (var/obj/C in src)
+					C.loc = src.loc
+				A.circuit = M
+				A.state = 3
+				A.icon_state = "3"
+				A.anchored = 1
+				del(src)
+			else
+				user << "\blue You disconnect the monitor."
+				var/obj/computerframe/A = new /obj/computerframe( src.loc )
+				var/obj/item/weapon/circuitboard/supplycomp/M = new /obj/item/weapon/circuitboard/supplycomp( A )
+				for (var/obj/C in src)
+					C.loc = src.loc
+				A.circuit = M
+				A.state = 4
+				A.icon_state = "4"
+				A.anchored = 1
+				del(src)
+	else
+		src.attack_hand(user)
+	return
+
 /obj/machinery/computer/supplycomp/Topic(href, href_list)
 	if(..())
 		return
diff --git a/icons/obj/candle.dmi b/icons/obj/candle.dmi
index 0a31f88bead957ba77c5c1094175332116f67a37..f4ca4df9422601d134ace96ca77e143a35e55d3a 100644
GIT binary patch
literal 2793
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

literal 7473
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
bb`Ihv6>{PZBkv~u0|jWQ!Jx<owom>KdBbhr

diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi
index d7d5fde3ba89245c9d8e8ea8b273f5143aea6abc..0862939d247d497cd112b5218195128207209582 100644
GIT binary patch
delta 3568
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

delta 2897
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

diff --git a/tgstation.dme b/tgstation.dme
index 7dcfa7f43e..2881f9cbdb 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -41,7 +41,6 @@
 #define FILE_DIR "code/game/gamemodes/revolution"
 #define FILE_DIR "code/game/gamemodes/sandbox"
 #define FILE_DIR "code/game/gamemodes/traitor"
-#define FILE_DIR "code/game/gamemodes/traitor_pair"
 #define FILE_DIR "code/game/gamemodes/wizard"
 #define FILE_DIR "code/game/jobs"
 #define FILE_DIR "code/game/machinery"