From 1eff3dcdb5b776dc61adadae674e81724c9924d5 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 5 Feb 2019 21:11:18 -0500 Subject: [PATCH] [Ready] Gives large compressed matter its own name and desc, Also ports Tg #41256 (#7953) * Update RCD.dm * Ports Tg#41256 * . --- code/game/objects/items/RCD.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm index 795871d3b5..7881c277ff 100644 --- a/code/game/objects/items/RCD.dm +++ b/code/game/objects/items/RCD.dm @@ -76,6 +76,10 @@ RLD 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 + else if(istype(W, /obj/item/stack/rods)) + loaded = loadwithsheets(W, sheetmultiplier * 0.5, user) // 2 matter for 1 rod, as 2 rods are produced from 1 metal + else if(istype(W, /obj/item/stack/tile/plasteel)) + loaded = loadwithsheets(W, sheetmultiplier * 0.25, user) // 1 matter for 1 floortile, as 4 tiles are produced from 1 metal if(loaded) to_chat(user, "[src] now holds [matter]/[max_matter] matter-units.") else @@ -475,6 +479,8 @@ RLD var/ammoamt = 40 /obj/item/rcd_ammo/large + name = "large compressed matter cartridge" + desc = "Highly compressed matter for the RCD. Has four times the matter packed into the same space as a normal cartridge." materials = list(MAT_METAL=48000, MAT_GLASS=32000) ammoamt = 160