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

Makes borgs require to refill their metal, glass and reinforced glass manually instead of automatically from a cyborg recharger (#23944)

Browse Source 
* Makes some borg sheet types require manual refilling

* Oopsie

* Fixes ORM deductions + Reverts changes for drones

* Contra review

* Fixes module logic

* Update code/modules/mining/machine_redemption.dm

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* Update code/modules/mining/machine_redemption.dm

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* Update code/game/objects/items/stacks/sheets/sheet_types.dm

* Farie review

* Update code/modules/mining/machine_redemption.dm

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* Update code/modules/mining/machine_redemption.dm

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* Farie review

* I am an idiot

* Fixes a comment

* Update code/modules/mining/machine_redemption.dm

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* Farie Review

---------

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
This commit is contained in:
DGamerL
2024-03-14 19:46:30 +01:00
committed by GitHub
parent e4cd4f1a1f
commit c4412be390
11 changed files with 180 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/machine_redemption.dm
+38
View File
@@ -207,6 +207,12 @@
user.visible_message("<span class='notice'>[user] inserts [I] into [src].</span>",
"<span class='notice'>You insert [I] into [src].</span>")
return
else if(istype(I, /obj/item/gripper_engineering))
if(!try_refill_storage(user))
to_chat(user, "<span class='notice'>You fail to retrieve any sheets from [src].</span>")
return
return ..()
/obj/machinery/mineral/ore_redemption/crowbar_act(mob/user, obj/item/I)
@@ -506,6 +512,38 @@
"<span class='notice'>You insert [I] into [src].</span>")
return TRUE
/obj/machinery/mineral/ore_redemption/proc/try_refill_storage(mob/living/silicon/robot/robot)
. = FALSE
if(!istype(robot))
return
if(!istype(robot.module, /obj/item/robot_module/engineering)) // Should only happen for drones
return
for(var/datum/robot_storage/material/mat_store in robot.module.material_storages)
if(mat_store.amount == mat_store.max_amount) // Already full, no need to run a check
to_chat(robot, "<span class='notice'>[mat_store] could not be filled due to it already being full.</span>")
continue
var/datum/component/material_container/container_component = GetComponent(/datum/component/material_container)
for(var/mat_id in container_component.materials)
var/datum/material/stack = container_component.materials[mat_id] // Should have only `/datum/material` in the list
var/obj/item/stack/sheet/sheet = stack.sheet_type
if(ispath(mat_store.stack, sheet))
var/amount_to_add
var/total_stacks = stack.amount / MINERAL_MATERIAL_AMOUNT // To account for 1 sheet being 2000 units of metal
if(total_stacks >= (mat_store.max_amount - mat_store.amount))
amount_to_add = round(mat_store.max_amount - mat_store.amount)
to_chat(robot, "<span class='notice'>You refill [mat_store] to full.</span>")
else
amount_to_add = round(total_stacks) // In case we have half a sheet stored
to_chat(robot, "<span class='notice'>You refill [amount_to_add] sheets to [mat_store].</span>")
mat_store.amount += amount_to_add
remove_from_storage(stack, amount_to_add)
. = TRUE
break // We found our match for this material storage, so we go to the next one
/obj/machinery/mineral/ore_redemption/proc/remove_from_storage(datum/material/stack, sheet_amount)
return stack.amount -= sheet_amount * MINERAL_MATERIAL_AMOUNT
/**
* Called when an item is inserted manually as material.
*