cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-07-16 01:22:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11329 from PsiOmegaDelta/151018-FlashRestoration

Browse Source 
Relocates synth flash recharge code.
This commit is contained in:
Chinsky
2015-10-24 18:59:02 +03:00
parent 7080020997 64176f1c4e
commit 28637334d4
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/robot_modules.dm
+11 -8
View File
@@ -88,6 +88,14 @@ var/global/list/robot_modules = list(
return
/obj/item/weapon/robot_module/proc/respawn_consumable(var/mob/living/silicon/robot/R, var/rate)
var/obj/item/device/flash/F = locate() in src.modules
if(F.broken)
F.broken = 0
F.times_used = 0
F.icon_state = "flash"
else if(F.times_used)
F.times_used--
if(!synths || !synths.len)
return
@@ -271,7 +279,6 @@ var/global/list/robot_modules = list(
return
/obj/item/weapon/robot_module/medical/crisis/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
var/obj/item/weapon/reagent_containers/syringe/S = locate() in src.modules
if(S.mode == 2)
S.reagents.clear_reagents()
@@ -424,13 +431,7 @@ var/global/list/robot_modules = list(
return
/obj/item/weapon/robot_module/security/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
var/obj/item/device/flash/F = locate() in src.modules
if(F.broken)
F.broken = 0
F.times_used = 0
F.icon_state = "flash"
else if(F.times_used)
F.times_used--
..()
var/obj/item/weapon/gun/energy/taser/mounted/cyborg/T = locate() in src.modules
if(T.power_supply.charge < T.power_supply.maxcharge)
T.power_supply.give(T.charge_cost * amount)
@@ -464,6 +465,7 @@ var/global/list/robot_modules = list(
return
/obj/item/weapon/robot_module/janitor/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
..()
var/obj/item/device/lightreplacer/LR = locate() in src.modules
LR.Charge(R, amount)
if(src.emag)
@@ -547,6 +549,7 @@ var/global/list/robot_modules = list(
src.emag = new /obj/item/weapon/stamp/denied(src)
/obj/item/weapon/robot_module/general/butler/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
..()
var/obj/item/weapon/reagent_containers/food/condiment/enzyme/E = locate() in src.modules
E.reagents.add_reagent("enzyme", 2 * amount)
if(src.emag)