shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MIRROR] battery rig fix (#5282)

Browse Source 
* battery rig fix (#35254)

* fix

* oops

* Auto stash before rebase of "tgstation/master"

* remove double notification

* battery rig fix
This commit is contained in:
CitadelStationBot
2018-02-04 23:17:54 -06:00
committed by Poojawa
parent b29cec7f41
commit cb9c2b6124
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/cell.dm
+4 -8
View File
@@ -20,6 +20,7 @@
var/self_recharge = 0 //does it self recharge, over time, or not? var/self_recharge = 0 //does it self recharge, over time, or not?
var/ratingdesc = TRUE var/ratingdesc = TRUE
var/grown_battery = FALSE // If it's a grown that acts as a battery, add a wire overlay to it. var/grown_battery = FALSE // If it's a grown that acts as a battery, add a wire overlay to it.
container_type = INJECTABLE|DRAINABLE
/obj/item/stock_parts/cell/get_cell() /obj/item/stock_parts/cell/get_cell()
return src return src
@@ -27,6 +28,7 @@
/obj/item/stock_parts/cell/Initialize(mapload, override_maxcharge) /obj/item/stock_parts/cell/Initialize(mapload, override_maxcharge)
. = ..() . = ..()
START_PROCESSING(SSobj, src) START_PROCESSING(SSobj, src)
create_reagents(5)
if (override_maxcharge) if (override_maxcharge)
maxcharge = override_maxcharge maxcharge = override_maxcharge
charge = maxcharge charge = maxcharge
@@ -101,15 +103,9 @@
user.visible_message("<span class='suicide'>[user] is licking the electrodes of [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>") user.visible_message("<span class='suicide'>[user] is licking the electrodes of [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
return (FIRELOSS) return (FIRELOSS)
/obj/item/stock_parts/cell/attackby(obj/item/W, mob/user, params) /obj/item/stock_parts/cell/on_reagent_change(changetype)
rigged = reagents.has_reagent("plasma", 5)
..() ..()
if(istype(W, /obj/item/reagent_containers/syringe))
var/obj/item/reagent_containers/syringe/S = W
to_chat(user, "<span class='notice'>You inject the solution into the power cell.</span>")
if(S.reagents.has_reagent("plasma", 5))
rigged = 1
grind_results["plasma"] = 5
S.reagents.clear_reagents()
/obj/item/stock_parts/cell/proc/explode() /obj/item/stock_parts/cell/proc/explode()