diff --git a/code/datums/action.dm b/code/datums/action.dm
index bfc51b0411..304aa47baa 100644
--- a/code/datums/action.dm
+++ b/code/datums/action.dm
@@ -228,11 +228,6 @@
button_icon_state = "fireselect_no"
name = "Toggle Firemode"
-/datum/action/item_action/toggle_safety
- name = "Toggle Safety"
- icon_icon = 'icons/hud/actions.dmi'
- button_icon_state = "safety_on"
-
/datum/action/item_action/rcl_col
name = "Change Cable Color"
icon_icon = 'icons/mob/actions/actions_items.dmi'
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 50e1744f84..236143dc43 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -91,11 +91,6 @@
var/zoom_out_amt = 0
var/datum/action/item_action/toggle_scope_zoom/azoom
- //gun safeties
- var/safety = TRUE /// Internal variable for keeping track whether the safety is on or off
- var/has_gun_safety = FALSE/// Whether the gun actually has a gun safety
- var/datum/action/item_action/toggle_safety/toggle_safety_action
-
//Firemodes
var/datum/action/item_action/toggle_firemode/firemode_action
/// Current fire selection, can choose between burst, single, and full auto.
@@ -117,8 +112,6 @@
/obj/item/gun/ui_action_click(mob/user, action)
if(istype(action, /datum/action/item_action/toggle_firemode))
fire_select()
- else if(istype(action, /datum/action/item_action/toggle_safety))
- toggle_safety(user)
else if(istype(action, /datum/action/item_action/toggle_scope_zoom))
zoom(user, user.dir)
else if(istype(action, alight))
@@ -136,9 +129,6 @@
if(zoomable)
azoom = new (src)
- if(has_gun_safety)
- safety = TRUE
- toggle_safety_action = new(src)
if(burst_size > 1 && !(SELECT_BURST_SHOT in fire_select_modes))
fire_select_modes.Add(SELECT_BURST_SHOT)
@@ -170,8 +160,6 @@
QDEL_NULL(chambered)
if(azoom)
QDEL_NULL(azoom)
- if(toggle_safety_action)
- QDEL_NULL(toggle_safety_action)
if(firemode_action)
QDEL_NULL(firemode_action)
return ..()
@@ -198,8 +186,6 @@
. += "[bayonet] looks like it can be unscrewed from [src]."
else if(can_bayonet)
. += "It has a bayonet lug on it."
- if(has_gun_safety)
- . += "The safety is [safety ? "ON" : "OFF"]."
/obj/item/gun/proc/fire_select()
var/mob/living/carbon/human/user = usr
@@ -367,22 +353,6 @@
var/stam_cost = getstamcost(user)
process_fire(target, user, TRUE, params, null, bonus_spread, stam_cost)
-/obj/item/gun/proc/toggle_safety(mob/user, override)
- if(!has_gun_safety)
- return
- if(override)
- if(override == "off")
- safety = FALSE
- else
- safety = TRUE
- else
- safety = !safety
- toggle_safety_action.button_icon_state = "safety_[safety ? "on" : "off"]"
- toggle_safety_action.UpdateButtonIcon()
- playsound(src, 'sound/weapons/empty.ogg', 100, TRUE)
- user.visible_message("[user] toggles [src]'s safety [safety ? "ON" : "OFF"].",
- "You toggle [src]'s safety [safety ? "ON" : "OFF"].")
-
/obj/item/gun/can_trigger_gun(mob/living/user)
. = ..()
if(!.)
@@ -392,9 +362,6 @@
if(HAS_TRAIT(user, TRAIT_PACIFISM) && chambered?.harmful) // If the user has the pacifist trait, then they won't be able to fire [src] if the round chambered inside of [src] is lethal.
to_chat(user, " [src] is lethally chambered! You don't want to risk harming anyone...")
return FALSE
- if(has_gun_safety && safety)
- to_chat(user, "The safety is on!")
- return FALSE
/obj/item/gun/CheckAttackCooldown(mob/user, atom/target)
if((user.a_intent == INTENT_HARM) && user.Adjacent(target)) //melee
diff --git a/icons/hud/actions.dmi b/icons/hud/actions.dmi
deleted file mode 100644
index 5d718bc9e0..0000000000
Binary files a/icons/hud/actions.dmi and /dev/null differ