From bcb474627b5fdeca8a7d8f69b7ff79ab5743240f Mon Sep 17 00:00:00 2001
From: SandPoot <43283559+SandPoot@users.noreply.github.com>
Date: Thu, 20 Aug 2020 17:53:37 -0300
Subject: [PATCH] Bluespace miner update + a little fix for borgdrakes* (#52)

---
 code/datums/chatmessage.dm                    |   2 +-
 .../modules/mining/machine_bluespaceminer.dm  |  35 +++++++++++++++++-
 .../icons/obj/machines/mining_machines.dmi    | Bin 0 -> 1636 bytes
 3 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 sandcode/icons/obj/machines/mining_machines.dmi

diff --git a/code/datums/chatmessage.dm b/code/datums/chatmessage.dm
index 094f97556b..68c621da9b 100644
--- a/code/datums/chatmessage.dm
+++ b/code/datums/chatmessage.dm
@@ -172,7 +172,7 @@
 	//dogborg check sandstorm thingy thing.
 	var/mob/living/silicon/robot/R = owner
 	if(iscyborg(R)) //without this it would check for module on every mob speaking, and you would NOT remove this unless you love runtimes
-		if(R.module.dogborg == TRUE)
+		if(R.module.dogborg == TRUE || R.dogborg == TRUE) //BOYS, WHAT THE HELL, GREAT INCONSISTENCY!
 			message.pixel_x = 16
 		else
 			message.pixel_x = 0
diff --git a/sandcode/code/modules/mining/machine_bluespaceminer.dm b/sandcode/code/modules/mining/machine_bluespaceminer.dm
index 1592cfd1b1..93909c6c74 100644
--- a/sandcode/code/modules/mining/machine_bluespaceminer.dm
+++ b/sandcode/code/modules/mining/machine_bluespaceminer.dm
@@ -1,8 +1,8 @@
 /obj/machinery/mineral/bluespace_miner
 	name = "bluespace mining machine"
 	desc = "A machine that uses the magic of Bluespace to slowly generate materials and add them to a linked ore silo."
-	icon = 'icons/obj/machines/mining_machines.dmi'
-	icon_state = "stacker"
+	icon = 'sandcode/icons/obj/machines/mining_machines.dmi'
+	icon_state = "bsminer"
 	density = TRUE
 	circuit = /obj/item/circuitboard/machine/bluespace_miner
 	layer = BELOW_OBJ_LAYER
@@ -31,6 +31,7 @@
 		. += "<span class='warning'>Ore silo access is on hold, please contact the quartermaster.</span>"
 
 /obj/machinery/mineral/bluespace_miner/process()
+	update_icon_state()
 	if(!materials?.silo || materials?.on_hold())
 		return
 	var/datum/component/material_container/mat_container = materials.mat_container
@@ -53,3 +54,33 @@
 				total_amount += amt
 		return (total_amount - total_amount_saved)
 	return FALSE
+
+/obj/machinery/mineral/bluespace_miner/update_icon_state()
+	if(!powered())
+		if(!panel_open)
+			icon_state = "bsminer-unpowered"
+		else
+			icon_state = "bsminer-unpowered-maintenance"
+	else
+		if(!panel_open)
+			icon_state = "bsminer"
+		else
+			icon_state = "bsminer-maintenance"
+
+/obj/machinery/mineral/bluespace_miner/crowbar_act(mob/living/user, obj/item/I)
+	. = ..()
+	if(default_deconstruction_crowbar(I, FALSE))
+		return TRUE
+	
+/obj/machinery/mineral/bluespace_miner/screwdriver_act(mob/living/user, obj/item/screwdriver/I)
+	. = TRUE
+	if(..())
+		return
+	if(!state_open)
+		if(powered())
+			if(default_deconstruction_screwdriver(user, "bsminer-maintenance", "bsminer", I))
+				return TRUE
+		else if(!powered())
+			if(default_deconstruction_screwdriver(user, "bsminer-unpowered-maintenance", "bsminer-unpowered", I))
+				return TRUE
+	return FALSE
diff --git a/sandcode/icons/obj/machines/mining_machines.dmi b/sandcode/icons/obj/machines/mining_machines.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..a324a9ec7f756c7e551dddb5767b93b3565d084d
GIT binary patch
literal 1636
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

literal 0
HcmV?d00001