Merge pull request #3715 from Michiyamenotehifunana/misc-bug-fixes

Fixes Mk.37Fs needing permits and Toy NEBs being able to turn into Dual Toyswords

code/citadel/cit_guns.dm

@@ -502,7 +502,7 @@
 	name = "foamag rifle"
 	desc = "A foam launching magnetic rifle. Ages 8 and up."
 	icon_state = "foamagrifle"
-	needs_permit = 0
+	needs_permit = FALSE
 	mag_type = /obj/item/ammo_box/magazine/toy/foamag
 	casing_ejector = FALSE
 	origin_tech = "combat=2;engineering=2;magnets=2"
@@ -1171,6 +1171,7 @@ obj/item/projectile/bullet/c10mm/soporific
 	icon_state = "p37_foam"
 	pin = /obj/item/device/firing_pin
 	spawnwithmagazine = TRUE
+	needs_permit = FALSE
 	mag_type = /obj/item/ammo_box/magazine/toy/pistol
 	can_suppress = FALSE
 	actions_types = list(/datum/action/item_action/pick_color)

code/citadel/cit_weapons.dm

@@ -72,6 +72,9 @@
 			blade_inhand.color = light_color
 			. += blade_inhand
 
+/obj/item/toy/sword/cx/attackby(obj/item/W, mob/living/user, params)
+	return	//NO MORE MAKING DUAL ESWORDS
+
 /*///autolathe memes/// I really need to stop doing this and find a proper way of adding in my toys
 
 /datum/design/toyneb