From a4037ad426f027da26b61c6949d00199402ff81a Mon Sep 17 00:00:00 2001 From: FalseIncarnate Date: Tue, 24 Jan 2017 19:47:18 -0500 Subject: [PATCH] Rigging Lights and Cells now works with Plasma Dust Light bulbs, light tubes, and power cells can now be rigged with plasma dust from grinding plasma sheets as well as the standard plasma reagent from a chem dispenser. Both reagents require at least 5u of the reagent to be injected at once to rig the bulb/tube/cell to explode. If a rigged cell is inserted into a stunprod, it only explodes when you actually attempt to stun something with it, not when you turn the prod on. This was unchanged, but I'm mentioning it so people don't think I changed that. Fixes #6238 :cl: tweak: Plasma dust can now be used to rig lights and power cells, like the plasma reagent, with explosive results. /:cl: --- code/modules/power/cell.dm | 2 +- code/modules/power/lighting.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index e2e97437b68..8a363e69808 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -80,7 +80,7 @@ to_chat(user, "You inject the solution into the power cell.") - if(S.reagents.has_reagent("plasma", 5)) + if(S.reagents.has_reagent("plasma", 5) || S.reagents.has_reagent("plasma_dust", 5)) rigged = 1 diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 7c702313ae4..7a566fbb023 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -674,7 +674,7 @@ to_chat(user, "You inject the solution into the [src].") - if(S.reagents.has_reagent("plasma", 5)) + if(S.reagents.has_reagent("plasma", 5) || S.reagents.has_reagent("plasma_dust", 5)) log_admin("LOG: [user.name] ([user.ckey]) injected a light with plasma, rigging it to explode.") message_admins("LOG: [user.name] ([user.ckey]) injected a light with plasma, rigging it to explode.")