Merge branch 'master' into wounds-part-2

This commit is contained in:
Timothy Teakettle
2020-08-02 18:10:31 +01:00
25 changed files with 169 additions and 124 deletions

View File

@@ -56,6 +56,7 @@
item_flags = NONE
casing_ejector = FALSE
can_suppress = FALSE
weapon_weight = WEAPON_MEDIUM
/obj/item/gun/ballistic/shotgun/toy/process_chamber(mob/living/user, empty_chamber = 0)
..()