From 2f62e3c55557be05bb69f945f4e04c49dfd10cf0 Mon Sep 17 00:00:00 2001
From: 81Denton <32391752+81Denton@users.noreply.github.com>
Date: Wed, 18 Jul 2018 05:24:47 +0200
Subject: [PATCH] Lets RCDs load reinforced glass and plasma rglass sheets
(#39170)
If RCDs can be loaded with glass/metal/plasteel, it only makes sense for them
to accept rglass and plasma rglass as well.
Rglass sheets add 6 matter (.5 metal, 1 glass). Plasma rglass sheets add 8
matter (1 metal, .5 glass, .5 plasma).
---
code/game/objects/items/RCD.dm | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm
index 627ce360f45..d17147eceb1 100644
--- a/code/game/objects/items/RCD.dm
+++ b/code/game/objects/items/RCD.dm
@@ -31,6 +31,8 @@ RLD
var/max_matter = 100
var/sheetmultiplier = 4 //Controls the amount of matter added for each glass/metal sheet, triple for plasteel
var/plasteelmultiplier = 3 //Plasteel is worth 3 times more than glass or metal
+ var/plasmarglassmultiplier = 2 //50% less plasma than in plasteel
+ var/rglassmultiplier = 1.5 //One metal sheet, half a glass sheet
var/no_ammo_message = "The \'Low Ammo\' light on the device blinks yellow."
var/has_ammobar = FALSE //controls whether or not does update_icon apply ammo indicator overlays
var/ammo_sections = 10 //amount of divisions in the ammo indicator overlay/number of ammo indicator states
@@ -65,7 +67,11 @@ RLD
else if(istype(W, /obj/item/stack/sheet/metal) || istype(W, /obj/item/stack/sheet/glass))
loaded = loadwithsheets(W, sheetmultiplier, user)
else if(istype(W, /obj/item/stack/sheet/plasteel))
- loaded = loadwithsheets(W, plasteelmultiplier*sheetmultiplier, user) //Plasteel is worth 3 times more than glass or metal
+ loaded = loadwithsheets(W, plasteelmultiplier*sheetmultiplier, user) //12 matter for 1 plasteel sheet
+ else if(istype(W, /obj/item/stack/sheet/plasmarglass))
+ loaded = loadwithsheets(W, plasmarglassmultiplier*sheetmultiplier, user) //8 matter for one plasma rglass sheet
+ else if(istype(W, /obj/item/stack/sheet/rglass))
+ loaded = loadwithsheets(W, rglassmultiplier*sheetmultiplier, user) //6 matter for one rglass sheet
if(loaded)
to_chat(user, "[src] now holds [matter]/[max_matter] matter-units.")
else