Merge remote-tracking branch 'citadel/master' into combat_rework_experimental

This commit is contained in:
silicons
2020-09-21 03:13:51 -07:00
220 changed files with 12697 additions and 7656 deletions
@@ -8,7 +8,7 @@
/obj/item/gun/ballistic/revolver/Initialize()
. = ..()
if(!istype(magazine, /obj/item/ammo_box/magazine/internal/cylinder))
verbs -= /obj/item/gun/ballistic/revolver/verb/spin
verbs += /obj/item/gun/ballistic/revolver/verb/spin
/obj/item/gun/ballistic/revolver/chamber_round(spin = 1)
if(spin)