Merge pull request #1543 from Citadel-Station-13/upstream-merge-28317

[MIRROR] Fixes #28182 (IED sprites are bugged)
2017-06-12 12:12:24 -05:00
parent cb57932787 dcaa6c5db4
commit 2c7dc70426
1 changed files with 2 additions and 0 deletions
@@ -33,6 +33,8 @@
 	..()
 	var/obj/item/weapon/reagent_containers/food/drinks/soda_cans/can = locate() in contents
 	if(can)
+		can.pixel_x = 0 //Reset the sprite's position to make it consistent with the rest of the IED
+		can.pixel_y = 0
 		var/mutable_appearance/can_underlay = new(can)
 		can_underlay.layer = FLOAT_LAYER
 		can_underlay.plane = FLOAT_PLANE