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

Merge pull request #1090 from Hubblenaut/condiments

Browse Source 
Fixes condiment placement
This commit is contained in:
Datraen
2016-02-26 07:39:39 -05:00
parent 96550f8ee3 1a212ed96f
commit aa3dc42246
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/reagents/reagent_containers/food.dm
View File

@@ -13,12 +13,12 @@
/obj/item/weapon/reagent_containers/food/New() /obj/item/weapon/reagent_containers/food/New()
..() ..()
if (isnull(center_of_mass) && !pixel_x && !pixel_y) if (center_of_mass.len && !pixel_x && !pixel_y)
src.pixel_x = rand(-6.0, 6) //Randomizes postion src.pixel_x = rand(-6.0, 6) //Randomizes postion
src.pixel_y = rand(-6.0, 6) src.pixel_y = rand(-6.0, 6)
/obj/item/weapon/reagent_containers/food/afterattack(atom/A, mob/user, proximity, params) /obj/item/weapon/reagent_containers/food/afterattack(atom/A, mob/user, proximity, params)
if(proximity && params && istype(A, /obj/structure/table) && center_of_mass.len) if(center_of_mass.len && proximity && params && istype(A, /obj/structure/table))
//Places the item on a grid //Places the item on a grid
var/list/mouse_control = params2list(params) var/list/mouse_control = params2list(params)

1
code/modules/reagents/reagent_containers/food/condiment.dm
View File

@@ -42,6 +42,7 @@
var/trans = reagents.trans_to_obj(target, amount_per_transfer_from_this) var/trans = reagents.trans_to_obj(target, amount_per_transfer_from_this)
user << "<span class='notice'>You add [trans] units of the condiment to \the [target].</span>" user << "<span class='notice'>You add [trans] units of the condiment to \the [target].</span>"
else(..())
feed_sound(var/mob/user) feed_sound(var/mob/user)
playsound(user.loc, 'sound/items/drink.ogg', rand(10, 50), 1) playsound(user.loc, 'sound/items/drink.ogg', rand(10, 50), 1)