cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-11 07:03:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cyborg Hypospray QOL tweak (#13403)

Browse Source 
* Borg Hypospray QOL fix

Cyborg Hypospray QOL fix

Cyborg's hypospay now replenished reagents in inactive modes once the active mode is full.

* code quality improvements

moved duplicate code into its own proc
return TRUE/FALSE instead of 1/0
replaced magic number with a define

* added a trailing newline

added

* small code improvement

robot is pased as a parameter
got rid of var/ part in parameters
This commit is contained in:
rebel228
2020-05-22 03:16:18 +03:00
committed by GitHub
parent 9ba2eae3ff
commit 0ef3a33fa4
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/borghydro.dm
+18 -5
View File
@@ -1,3 +1,4 @@
#define BORGHYPO_REFILL_VALUE 5
/obj/item/reagent_containers/borghypo
name = "Cyborg Hypospray"
@@ -46,18 +47,21 @@
/obj/item/reagent_containers/borghypo/process() //Every [recharge_time] seconds, recharge some reagents for the cyborg
charge_tick++
if(charge_tick < recharge_time) return 0
if(charge_tick < recharge_time)
return FALSE
charge_tick = 0
if(isrobot(loc))
var/mob/living/silicon/robot/R = loc
if(R && R.cell)
var/datum/reagents/RG = reagent_list[mode]
if(RG.total_volume < RG.maximum_volume) //Don't recharge reagents and drain power if the storage is full.
R.cell.use(charge_cost) //Take power from borg...
RG.add_reagent(reagent_ids[mode], 5) //And fill hypo with reagent.
if(!refill_borghypo(RG, reagent_ids[mode], R)) //If the storage is not full recharge reagents and drain power.
for(var/i in 1 to reagent_list.len) //if active mode is full loop through the list and fill the first one that is not full
RG = reagent_list[i]
if(refill_borghypo(RG, reagent_ids[i], R))
break
//update_icon()
return 1
return TRUE
// Use this to add more chemicals for the borghypo to produce.
/obj/item/reagent_containers/borghypo/proc/add_reagent(reagent)
@@ -69,6 +73,13 @@
var/datum/reagents/R = reagent_list[reagent_list.len]
R.add_reagent(reagent, 30)
/obj/item/reagent_containers/borghypo/proc/refill_borghypo(datum/reagents/RG, reagent_id, mob/living/silicon/robot/R)
if(RG.total_volume < RG.maximum_volume)
RG.add_reagent(reagent_id, BORGHYPO_REFILL_VALUE)
R.cell.use(charge_cost)
return TRUE
return FALSE
/obj/item/reagent_containers/borghypo/attack(mob/living/carbon/human/M, mob/user)
var/datum/reagents/R = reagent_list[mode]
if(!R.total_volume)
@@ -114,3 +125,5 @@
if(empty)
. += "<span class='notice'>It is currently empty. Allow some time for the internal syntheszier to produce more.</span>"
#undef BORGHYPO_REFILL_VALUE