Merge branch 'master' of https://github.com/PolarisSS13/Polaris into bayupdate

2026-01-05 23:13:06 +00:00 · 2016-01-30 08:49:35 +10:30
parent d5b904ca2a 34d76fdf6d
commit f31438bd77
75 changed files with 1804 additions and 402 deletions
--- a/code/modules/reagents/reagent_containers/food.dm
+++ b/code/modules/reagents/reagent_containers/food.dm
@@ -13,7 +13,7 @@

 /obj/item/weapon/reagent_containers/food/New()
 	..()
-	if (!pixel_x && !pixel_y)
+	if (isnull(center_of_mass) && !pixel_x && !pixel_y)
 		src.pixel_x = rand(-6.0, 6) //Randomizes postion
 		src.pixel_y = rand(-6.0, 6)

--- a/code/modules/reagents/reagent_containers/food/snacks.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks.dm
--- a/code/modules/reagents/reagent_containers/food/snacks/meat.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks/meat.dm
@@ -4,6 +4,7 @@
 	icon_state = "meat"
 	health = 180
 	filling_color = "#FF1C1C"
+	center_of_mass = list("x"=16, "y"=14)
 	New()
 		..()
 		reagents.add_reagent("protein", 9)