[MIRROR] Separates actions.dmi into multiple files (#2214)

* Separates actions.dmi into multiple files

* Delete beam_rifle.dm.rej

* Delete action.dm.rej
This commit is contained in:
CitadelStationBot
2017-08-03 08:09:39 -05:00
committed by kevinz000
parent cfa77cdc18
commit 1b22c5fe0c
50 changed files with 97 additions and 19 deletions
+1
View File
@@ -446,6 +446,7 @@
/datum/action/toggle_scope_zoom
name = "Toggle Scope"
check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_RESTRAINED|AB_CHECK_STUN|AB_CHECK_LYING
icon_icon = 'icons/mob/actions/actions_items.dmi'
button_icon_state = "sniper_zoom"
var/obj/item/weapon/gun/gun = null