Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fluff

Conflicts:
	code/modules/mob/living/silicon/robot/drone/drone.dm
This commit is contained in:
Markolie
2015-09-26 05:12:52 +02:00
72 changed files with 1387 additions and 1552 deletions
@@ -23,6 +23,8 @@
if (source.handcuffed)
var/obj/item/weapon/W = source.handcuffed
source.handcuffed = null
if(source.buckled && source.buckled.buckle_requires_restraints)
source.buckled.unbuckle_mob()
source.update_inv_handcuffed()
if (source.client)
source.client.screen -= W