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

Changes flour sacks to a condiment, so that players will be able to pour flour straight into beakers, instead of having to use the grinder first.

Browse Source
This commit is contained in:
Mustafa Kalash
2015-04-06 18:40:11 -04:00
parent 4a897e47b9
commit 177d968933
4 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/supplypacks.dm
+4 -4
View File
@@ -43,10 +43,10 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/datum/supply_packs/food
name = "Kitchen supply crate"
contains = list(/obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/weapon/reagent_containers/food/snacks/flour,
contains = list(/obj/item/weapon/reagent_containers/food/condiment/flour,
/obj/item/weapon/reagent_containers/food/condiment/flour,
/obj/item/weapon/reagent_containers/food/condiment/flour,
/obj/item/weapon/reagent_containers/food/condiment/flour,
/obj/item/weapon/reagent_containers/food/drinks/milk,
/obj/item/weapon/reagent_containers/food/drinks/milk,
/obj/item/weapon/storage/fancy/egg_box,
code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+1 -1
View File
@@ -19,7 +19,7 @@
New()
..()
for(var/i = 0, i < 6, i++)
new /obj/item/weapon/reagent_containers/food/snacks/flour(src)
new /obj/item/weapon/reagent_containers/food/condiment/flour(src)
new /obj/item/weapon/reagent_containers/food/condiment/sugar(src)
for(var/i = 0, i < 3, i++)
new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src)
code/modules/reagents/reagent_containers/food/condiment.dm
+14 -2
View File
@@ -83,7 +83,7 @@
user << "\blue You transfer [trans] units of the condiment to [target]."
on_reagent_change()
if(icon_state == "saltshakersmall" || icon_state == "peppermillsmall")
if(icon_state == "saltshakersmall" || icon_state == "peppermillsmall" || icon_state == "flour")
return
if(reagents.reagent_list.len > 0)
switch(reagents.get_master_reagent_id())
@@ -179,4 +179,16 @@
volume = 20
New()
..()
reagents.add_reagent("blackpepper", 20)
reagents.add_reagent("blackpepper", 20)
/obj/item/weapon/reagent_containers/food/condiment/flour
name = "flour sack"
desc = "A big bag of flour. Good for baking!"
icon = 'icons/obj/food.dmi'
icon_state = "flour"
item_state = "flour"
New()
..()
reagents.add_reagent("flour", 30)
src.pixel_x = rand(-10.0, 10)
src.pixel_y = rand(-10.0, 10)
code/modules/reagents/reagent_containers/food/snacks.dm
-12
View File
@@ -556,18 +556,6 @@
..()
reagents.add_reagent("protein", 2)
/obj/item/weapon/reagent_containers/food/snacks/flour
name = "flour sack"
desc = "A big bag of flour. Good for baking!"
icon = 'icons/obj/food.dmi'
icon_state = "flour"
item_state = "flour"
New()
..()
reagents.add_reagent("flour", 30)
src.pixel_x = rand(-10.0, 10)
src.pixel_y = rand(-10.0, 10)
/obj/item/weapon/reagent_containers/food/snacks/organ
name = "organ"
desc = "It's good for you."