Merge pull request #471 from skull132/master

Skull's Things, 29MAR2015

code/game/objects/items/devices/suit_cooling.dm

@@ -4,7 +4,8 @@
 	w_class = 4
 	icon = 'icons/obj/device.dmi'
 	icon_state = "suitcooler0"
-	slot_flags = SLOT_BACK	//you can carry it on your back if you want, but it won't do anything unless attached to suit storage
+	item_state = "suitcooler0"	//hacky, but yeah, works for now.
+	slot_flags = SLOT_BACK	//will now work while on back - Skull132
 
 	//copied from tank.dm
 	flags = FPRINT | TABLEPASS | CONDUCT
@@ -83,10 +84,10 @@
 
 	var/mob/living/carbon/human/H = M
 
-	if (!H.wear_suit || H.s_store != src)
-		return 0
+	if (H.wear_suit && (H.back == src || H.s_store == src))
+		return 1
 
-	return 1
+	return 0
 
 /obj/item/device/suit_cooling_unit/proc/turn_on()
 	if(!cell)

code/game/objects/items/weapons/dna_injector.dm

@@ -111,6 +111,9 @@
 
 	if (user)
 		if (istype(M, /mob/living/carbon/human))
+			var/mob/living/carbon/human/C = M
+			if (C.species.flags & (IS_SYNTHETIC | NO_SCAN))
+				return
 			if(!inuse)
 				var/obj/effect/equip_e/human/O = new /obj/effect/equip_e/human(  )
 				O.source = user

code/game/objects/items/weapons/weaponry.dm

@@ -173,7 +173,7 @@
 	attack_verb = list("jabbed","stabbed","ripped")
 
 /obj/item/weapon/canesword
-	name = "cane sword"
+	name = "thin sword"
 	sharp = 1
 	edge = 1
 	desc = "A thin, sharp blade with an elegant handle."
@@ -190,7 +190,7 @@
 
 //Using a modified cane, with a storage var, instead of a box. Because the box idea is meh, in terms of the interface.
 /obj/item/weapon/cane/syndie
-	var/sword		//For holding the blade
+	var/obj/item/weapon/canesword/sword	//For holding the blade
 	var/locked	//A small lock, so that you can't accidentally unsheathe it
 
 	New()
@@ -201,7 +201,9 @@
 	proc/unsheathe(mob/user as mob)
 		if(sword)
 			user.put_in_hands(sword)
-			user.visible_message("[user] takes the handle and draws a sword from inside the [src].", "You take the [src] by the handle and draw out a sharp blade from it.")
+			user.visible_message("\blue [user] takes the handle and draws a sword from inside the [src].", "\blue You take the [src] by the handle and draw out a sharp blade from it.")
+			sword.add_fingerprint(user)
+			add_fingerprint(user)
 			sword = null
 			icon_state = "cane_empty"
 			update_icon()
@@ -211,10 +213,10 @@
 			switch(locked)
 				if(1)
 					locked = 0
-					user << "You twist and unlock the sword handle from the [src]."
+					user << "\blue You twist and unlock the sword handle from the [src]."
 				if(0)
 					locked = 1
-					user << "You twist and lock the sword handle to the [src]."
+					user << "\blue You twist and lock the sword handle to the [src]."
 
 	attack_self(mob/user as mob)
 		if(iscarbon(user))
@@ -235,7 +237,7 @@
 			W.add_fingerprint(user)
 			add_fingerprint(user)
 			icon_state = "cane"
-			user << "You sheathe the sword, and lock its handle to the [src]."
+			user << "\blue You sheathe the sword, and lock its handle to the [src]."
 			locked = 1
 			update_icon()