Merge pull request #5964 from Citadel-Station-13/upstream-merge-36459

[MIRROR] Clown Ops
This commit is contained in:
deathride58
2018-03-17 23:58:15 +00:00
committed by GitHub
30 changed files with 700 additions and 78 deletions
@@ -54,7 +54,7 @@
force = 0
throwforce = 0
mag_type = /obj/item/ammo_box/magazine/internal/shot/toy
clumsy_check = 0
clumsy_check = FALSE
item_flags = NONE
casing_ejector = FALSE
can_suppress = FALSE
@@ -87,6 +87,7 @@
item_flags = NONE
mag_type = /obj/item/ammo_box/magazine/toy/smgm45/riot
casing_ejector = FALSE
clumsy_check = FALSE
/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted //Use this for actual toys
pin = /obj/item/device/firing_pin
@@ -103,6 +104,7 @@
item_flags = NONE
mag_type = /obj/item/ammo_box/magazine/toy/m762/riot
casing_ejector = FALSE
clumsy_check = FALSE
/obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted //Use this for actual toys
pin = /obj/item/device/firing_pin