Merge pull request #441 from SamCroswell/master

Quick-Equip Hotkey Fix, Pulse Rifle Icon Fix

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

@@ -30,7 +30,7 @@ RCD
 
 
 	New()
-		desc = "A RCD. It currently holds [matter]/100 matter-units."
+		desc = "A RCD. It currently holds [matter]/[max_matter] matter-units."
 		src.spark_system = new /datum/effect/effect/system/spark_spread
 		spark_system.set_up(5, 0, src)
 		spark_system.attach(src)
@@ -44,9 +44,9 @@ RCD
 			if((matter + R.ammoamt) > max_matter)
 				user << "<span class='notice'>The RCD cant hold any more matter-units.</span>"
 				return
+			matter += R.ammoamt
 			user.drop_item()
 			del(W)
-			matter += R.ammoamt
 			playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
 			user << "<span class='notice'>The RCD now holds [matter]/[max_matter] matter-units.</span>"
 			desc = "A RCD. It currently holds [matter]/[max_matter] matter-units."
@@ -168,7 +168,7 @@ RCD
 	if(matter < amount)
 		return 0
 	matter -= amount
-	desc = "A RCD. It currently holds [matter]/100 matter-units."
+	desc = "A RCD. It currently holds [matter]/[max_matter] matter-units."
 	return 1
 
 /obj/item/weapon/rcd/proc/checkResource(var/amount, var/mob/user)

code/modules/mob/living/carbon/human/inventory.dm

@@ -11,8 +11,10 @@
 			return
 
 		if(istype(I, /obj/item/clothing/head/helmet/space/rig)) // If the item to be equipped is a rigid suit helmet
-			src << "\red You must fasten the helmet to a hardsuit first. (Target the head and use on a hardsuit)" // Stop eva helms equipping.
-			return 0
+			var/obj/item/clothing/head/helmet/space/rig/C = I
+			if(C.rig_restrict_helmet)
+				src << "\red You must fasten the helmet to a hardsuit first. (Target the head and use on a hardsuit)" // Stop eva helms equipping.
+				return 0
 
 		if(H.equip_to_appropriate_slot(I))
 			if(hand)