From 0e38e1ff39331500ab64f11ae401fb804f3a474f Mon Sep 17 00:00:00 2001
From: lolman360 <22850904+lolman360@users.noreply.github.com>
Date: Sat, 18 Jul 2020 16:03:32 +1000
Subject: [PATCH 1/4] e

---
 code/game/objects/items/RSF.dm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/game/objects/items/RSF.dm b/code/game/objects/items/RSF.dm
index 01b351edd0..e2bbdf0f04 100644
--- a/code/game/objects/items/RSF.dm
+++ b/code/game/objects/items/RSF.dm
@@ -26,6 +26,11 @@ RSF
 /obj/item/rsf/cyborg
 	matter = 30
 
+/obj/item/rsf/cyborg/Initialize()
+	if(matter > 30)
+		matter = 30
+	..()
+
 /obj/item/rsf/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/rcd_ammo))
 		if((matter + 10) > 30)

From f84b044f341167cbf63e4e80ee6719d58d76240a Mon Sep 17 00:00:00 2001
From: lolman360 <22850904+lolman360@users.noreply.github.com>
Date: Sat, 18 Jul 2020 16:05:57 +1000
Subject: [PATCH 2/4] Update robot_modules.dm

---
 code/modules/mob/living/silicon/robot/robot_modules.dm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index ccf38a547b..4bff48a650 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -779,9 +779,8 @@
 		/obj/item/toy/crayon/spraycan/borg,
 		/obj/item/hand_labeler/borg,
 		/obj/item/razor,
-		/obj/item/rsf,
-		/obj/item/instrument/violin,
-		/obj/item/instrument/guitar,
+		/obj/item/rsf/cyborg,
+		/obj/item/instrument/synthesizer,
 		/obj/item/reagent_containers/dropper,
 		/obj/item/lighter,
 		/obj/item/storage/bag/tray,

From f696a461afcc30ddbc327ce73b23f69df89de943 Mon Sep 17 00:00:00 2001
From: lolman360 <22850904+lolman360@users.noreply.github.com>
Date: Sat, 18 Jul 2020 16:10:25 +1000
Subject: [PATCH 3/4] Update RSF.dm

---
 code/game/objects/items/RSF.dm | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/code/game/objects/items/RSF.dm b/code/game/objects/items/RSF.dm
index e2bbdf0f04..79fa080269 100644
--- a/code/game/objects/items/RSF.dm
+++ b/code/game/objects/items/RSF.dm
@@ -26,10 +26,6 @@ RSF
 /obj/item/rsf/cyborg
 	matter = 30
 
-/obj/item/rsf/cyborg/Initialize()
-	if(matter > 30)
-		matter = 30
-	..()
 
 /obj/item/rsf/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/rcd_ammo))
@@ -69,15 +65,16 @@ RSF
 		return
 	if (!(istype(A, /obj/structure/table) || isfloorturf(A)))
 		return
-
-	if(matter < 1)
-		to_chat(user, "<span class='warning'>\The [src] doesn't have enough matter left.</span>")
-		return
 	if(iscyborg(user))
+		matter = 30 //borgs dont actually use the matter so this is mostly just so it doesnt fail the next check incase of shennanigans
 		var/mob/living/silicon/robot/R = user
 		if(!R.cell || R.cell.charge < 200)
 			to_chat(user, "<span class='warning'>You do not have enough power to use [src].</span>")
 			return
+	if(matter < 1)
+		to_chat(user, "<span class='warning'>\The [src] doesn't have enough matter left.</span>")
+		return
+
 
 	var/turf/T = get_turf(A)
 	playsound(src.loc, 'sound/machines/click.ogg', 10, 1)

From 55ed77a89d1513139bc8e605cd1dd0943e6581bf Mon Sep 17 00:00:00 2001
From: lolman360 <22850904+lolman360@users.noreply.github.com>
Date: Sat, 18 Jul 2020 16:15:47 +1000
Subject: [PATCH 4/4] Update robot_modules.dm

---
 code/modules/mob/living/silicon/robot/robot_modules.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 4bff48a650..cd3601942c 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -780,7 +780,7 @@
 		/obj/item/hand_labeler/borg,
 		/obj/item/razor,
 		/obj/item/rsf/cyborg,
-		/obj/item/instrument/synthesizer,
+		/obj/item/instrument/piano_synth,
 		/obj/item/reagent_containers/dropper,
 		/obj/item/lighter,
 		/obj/item/storage/bag/tray,