Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction

Conflicts:
	code/game/objects/items/devices/lightreplacer.dm
	code/game/objects/structures/crates_lockers/closets.dm
This commit is contained in:
phil235
2016-04-26 21:49:51 +02:00
committed by phil235
85 changed files with 1093 additions and 5082 deletions
@@ -71,6 +71,9 @@
return 0
if(buckled_mobs.len)
return 0
if(usr.incapacitated())
usr << "<span class='warning'>You can't do that right now!</span>"
return 0
usr.visible_message("[usr] collapses \the [src.name].", "<span class='notice'>You collapse \the [src.name].</span>")
new foldabletype(get_turf(src))
qdel(src)
@@ -216,6 +216,9 @@
if(over_object == usr && Adjacent(usr))
if(!item_chair || !ishuman(usr) || buckled_mobs.len || src.flags & NODECONSTRUCT)
return
if(usr.incapacitated())
usr << "<span class='warning'>You can't do that right now!</span>"
return
usr.visible_message("<span class='notice'>[usr] grabs \the [src.name].</span>", "<span class='notice'>You grab \the [src.name].</span>")
var/C = new item_chair(loc)
usr.put_in_hands(C)
@@ -19,6 +19,7 @@ LINEN BINS
item_color = "white"
burn_state = FLAMMABLE
dog_fashion = /datum/dog_fashion/head/ghost
/obj/item/weapon/bedsheet/attack(mob/living/M, mob/user)
if(!attempt_initiate_surgery(src, M, user))
@@ -251,7 +251,8 @@
"<span class='italics'>You hear welding.</span>")
update_icon()
else if(user.a_intent != "harm" && !(W.flags & NOBLUDGEON))
togglelock(user)
if(!toggle(user))
togglelock(user)
return 1
else
return ..()