cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-26 10:03:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into ofBotsAndMobs

Browse Source
This commit is contained in:
Kelenius
2015-04-26 15:47:38 +03:00
parent 6d1614cb7a fdd041830a
commit baf19eb862
328 changed files with 8860 additions and 7586 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/modules/reagents/reagent_containers/food/condiment.dm
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)

12
code/modules/reagents/reagent_containers/food/snacks.dm
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."

2
code/modules/reagents/reagent_containers/spray.dm
View File

@@ -26,7 +26,7 @@
|| istype(A, /obj/item/weapon/reagent_containers) || istype(A, /obj/structure/sink) || istype(A, /obj/structure/janitorialcart))
return
if(istype(A, /obj/effect/proc_holder/spell))
if(istype(A, /spell))
return
if(istype(A, /obj/structure/reagent_dispensers) && get_dist(src,A) <= 1) //this block copypasted from reagent_containers/glass, for lack of a better solution