cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2346 from CHOMPStationBot/upstream-merge-10802

Browse Source 
[MIRROR] Port several foods and food sprites
This commit is contained in:
Razgriz
2021-07-03 14:49:34 -07:00
committed by GitHub
parent dd4016eeb0 644c4ee3f8
commit 1a3c753f4a
16 changed files with 599 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/modules/reagents/reagent_containers/_reagent_containers.dm
View File

@@ -7,6 +7,7 @@
var/amount_per_transfer_from_this = 5
var/possible_transfer_amounts = list(5,10,15,25,30)
var/volume = 30
var/list/starts_with
/obj/item/weapon/reagent_containers/verb/set_APTFT() //set amount_per_transfer_from_this
set name = "Set transfer amount"
@@ -21,6 +22,16 @@
if(!possible_transfer_amounts)
src.verbs -= /obj/item/weapon/reagent_containers/verb/set_APTFT
create_reagents(volume)
if(starts_with)
var/total_so_far = 0
for(var/string in starts_with)
var/amt = starts_with[string] || 1
total_so_far += amt
reagents.add_reagent(string, amt)
if(total_so_far > volume)
warning("[src]([src.type]) starts with more reagents than it has total volume")
starts_with = null // it should gc, since it's just strings and numbers
/obj/item/weapon/reagent_containers/attack_self(mob/user as mob)
return