Fixes Cit's Toys a little

Mk.37F no longer needs a permit, Non euplastic blade no longer can turn into dual toyswords
This commit is contained in:
Michiyamenotehifunana
2017-10-31 18:00:45 +08:00
parent e7179ba02d
commit beb27926b2
2 changed files with 5 additions and 1 deletions
+2 -1
View File
@@ -494,7 +494,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"
@@ -1158,6 +1158,7 @@ obj/item/projectile/bullet/c10mm/soporific
desc = "A licensed foam-firing reproduction of a handgun with a toggle-locking mechanism manufactured by CX Armories. This model is coated with a special polychromic material. Uses standard foam pistol magazines."
icon_state = "p37_foam"
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)
+3
View File
@@ -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