cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 06:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cigarettes and cigars can now be ground up in the All-In-One-Grinder (#24770)

Browse Source 
* Update reagentgrinder.dm

* Reagent transfer functionality

* Oops!

Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>

* Helper proc wooo

* smol

* grind

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update reagentgrinder.dm

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
CRUNCH
2024-04-06 23:40:47 +00:00
committed by GitHub
co-authored by Deniz DGamerL
parent 61c8d30697
commit 5f45d8c594
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+4 -4
View File
@@ -54,7 +54,8 @@
/obj/item/slime_extract = list(),
/obj/item/food = list(),
/obj/item/reagent_containers/pill = list(),
/obj/item/reagent_containers/patch = list()
/obj/item/reagent_containers/patch = list(),
/obj/item/clothing/mask/cigarette = list()
)
var/list/juice_items = list (
@@ -520,10 +521,9 @@
if(beaker.reagents.holder_full())
return
// Everything else - Transfers reagents from it into beaker
for(var/obj/item/reagent_containers/O in holdingitems)
// Everything else - Transfers reagents from the items into the beaker
for(var/obj/item/O in holdingitems)
O.reagents.trans_to(beaker, O.reagents.total_volume)
if(!O.reagents.total_volume)
remove_object(O)
if(beaker.reagents.holder_full())