Merge pull request #9862 from Zuhayr/dev

Fixes
This commit is contained in:
GinjaNinja32
2015-06-20 17:27:26 +01:00
5 changed files with 115 additions and 145 deletions
@@ -13,8 +13,8 @@
if(istype(W, /obj/item/weapon/crowbar))
new /obj/item/stack/material/wood(src)
var/turf/T = get_turf(src)
for(var/obj/O in contents)
O.loc = T
for(var/atom/movable/AM in contents)
if(AM.simulated) AM.loc = T
user.visible_message("<span class='notice'>[user] pries \the [src] open.</span>", \
"<span class='notice'>You pry open \the [src].</span>", \
"<span class='notice'>You hear splitting wood.</span>")
@@ -73,4 +73,4 @@
/obj/structure/largecrate/animal/chick
name = "chicken crate"
held_count = 5
held_type = /mob/living/simple_animal/chick
held_type = /mob/living/simple_animal/chick