Merge pull request #3203 from Zuhayr/feature

Bugs.

code/game/objects/items/bodybag.dm

@@ -74,7 +74,10 @@
 			if(opened)	return 0
 			if(contents.len)	return 0
 			visible_message("[usr] folds up the [src.name]")
-			new/obj/item/bodybag(get_turf(src))
+			if(istype(src,/obj/structure/closet/body_bag/cryobag))
+				new/obj/item/bodybag/cryobag(get_turf(src))
+			else
+				new/obj/item/bodybag(get_turf(src))
 			spawn(0)
 				del(src)
 			return
@@ -92,7 +95,6 @@
 	icon = 'icons/obj/cryobag.dmi'
 	icon_state = "bodybag_folded"
 
-
 	attack_self(mob/user)
 		var/obj/structure/closet/body_bag/cryobag/R = new /obj/structure/closet/body_bag/cryobag(user.loc)
 		R.add_fingerprint(user)

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -154,6 +154,7 @@
 		new /obj/item/weapon/reagent_containers/spray/pepper(src)
 		new /obj/item/weapon/melee/baton(src)
 		new /obj/item/weapon/gun/energy/taser(src)
+		new /obj/item/weapon/storage/box/holobadge(src)
 		return
 
 

code/modules/clothing/under/ties.dm

@@ -290,3 +290,16 @@
 /obj/item/clothing/tie/holobadge/attack(mob/living/carbon/human/M, mob/living/user)
 	if(isliving(user))
 		user.visible_message("\red [user] invades [M]'s personal space, thrusting [src] into their face insistently.","\red You invade [M]'s personal space, thrusting [src] into their face insistently. You are the law.")
+
+/obj/item/weapon/storage/box/holobadge
+	name = "holobadge box"
+	desc = "A box claiming to contain holobadges."
+	New()
+		new /obj/item/clothing/tie/holobadge(src)
+		new /obj/item/clothing/tie/holobadge(src)
+		new /obj/item/clothing/tie/holobadge(src)
+		new /obj/item/clothing/tie/holobadge(src)
+		new /obj/item/clothing/tie/holobadge/cord(src)
+		new /obj/item/clothing/tie/holobadge/cord(src)
+		..()
+		return

code/modules/mob/living/carbon/monkey/monkey.dm

@@ -10,6 +10,7 @@
 	update_icon = 0		///no need to call regenerate_icon
 
 	var/obj/item/weapon/card/id/wear_id = null // Fix for station bounced radios -- Skie
+
 /mob/living/carbon/monkey/tajara
 	name = "farwa"
 	voice_name = "farwa"
@@ -28,7 +29,7 @@
 	voice_name = "stok"
 	voice_message = "hisses"
 	say_message = "hisses"
-	icon_state = "stok1"
+	icon_state = "stokkey1"
 
 /mob/living/carbon/monkey/unathi/New()
 	var/datum/reagents/R = new/datum/reagents(1000)

code/modules/mob/living/carbon/monkey/update_icons.dm

@@ -33,9 +33,9 @@
 		if("tajaran")
 			ico = "tajkey"
 		if("lizard")
-			ico = "stok"
+			ico = "stokkey"
 		if("skrell")
-			icon_state = "skrellkey"
+			ico = "skrellkey"
 	if(lying)
 		icon_state = ico + "0"
 		for(var/image/I in overlays_lying)

code/modules/mob/living/silicon/robot/robot.dm

@@ -698,7 +698,7 @@
 				for(var/V in components)
 					if(V == "power cell") continue
 					var/datum/robot_component/C = components[V]
-					if(C.installed == 1)
+					if(C.installed == 1 || C.installed == -1)
 						removable_components += V
 
 				var/remove = input(user, "Which component do you want to pry out?", "Remove Component") as null|anything in removable_components