From 16cc421e34901fc29c8a5bad234a76f31a8a9332 Mon Sep 17 00:00:00 2001
From: RKF45 <rkf45codes@gmail.com>
Date: Thu, 9 Jan 2014 23:45:08 +0100
Subject: [PATCH] Tiny objects on ears

---
 code/game/objects/items.dm        | 6 +++++-
 code/modules/clothing/clothing.dm | 2 +-
 code/modules/mob/mob.dm           | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index e93c1846c1..24e5479251 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -316,6 +316,8 @@
 					return 0
 				if( (slot_flags & SLOT_TWOEARS) && H.r_ear )
 					return 0
+				if( w_class < 2	)
+					return 1
 				return 1
 			if(slot_r_ear)
 				if(H.r_ear)
@@ -324,6 +326,8 @@
 					return 0
 				if( (slot_flags & SLOT_TWOEARS) && H.l_ear )
 					return 0
+				if( w_class < 2 )
+					return 1
 				return 1
 			if(slot_w_uniform)
 				if(H.w_uniform)
@@ -349,7 +353,7 @@
 						H << "\red You need a jumpsuit before you can attach this [name]."
 					return 0
 				if(slot_flags & SLOT_DENYPOCKET)
-					return
+					return 0
 				if( w_class <= 2 || (slot_flags & SLOT_POCKET) )
 					return 1
 			if(slot_r_store)
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 3e40aeb5d5..7d734339bb 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -28,7 +28,7 @@
 
 	return ..()
 
-//Ears: currently only used for headsets and earmuffs
+//Ears: headsets, earmuffs and tiny objects
 /obj/item/clothing/ears
 	name = "ears"
 	w_class = 1.0
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index c82489cf35..8b690fc3d6 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -344,7 +344,7 @@ var/list/slot_equipment_priority = list( \
 		usr << "\blue <B>You must be dead to use this!</B>"
 		return
 	if (ticker.mode.name == "meteor" || ticker.mode.name == "epidemic") //BS12 EDIT
-		usr << "\blue Respawn is disabled."
+		usr << "\blue Respawn is disabled for this roundtype."
 		return
 	else
 		var/deathtime = world.time - src.timeofdeath
@@ -362,7 +362,7 @@ var/list/slot_equipment_priority = list( \
 			pluralcheck = " [deathtimeminutes] minutes and"
 		var/deathtimeseconds = round((deathtime - deathtimeminutes * 600) / 10,1)
 		usr << "You have been dead for[pluralcheck] [deathtimeseconds] seconds."
-		
+
 		if (deathtime < 18000)
 			usr << "You must wait 30 minutes to respawn!"
 			return