adds gun safeties, remember to turn them off.

2022-09-16 19:24:21 -07:00
parent 29d16e5f30
commit 9ca985b769
24 changed files with 44 additions and 0 deletions
@@ -7,6 +7,7 @@
 	burst_size = 3
 	fire_delay = 2
 	fire_select_modes = list(SELECT_SEMI_AUTOMATIC, SELECT_BURST_SHOT, SELECT_FULLY_AUTOMATIC)
+	has_gun_safety = TRUE

 /obj/item/gun/ballistic/automatic/proto
 	name = "\improper Nanotrasen Saber SMG"
@@ -15,6 +15,7 @@
 	pin = null
 	no_pin_required = TRUE
 	trigger_guard = TRIGGER_GUARD_NONE //so ashwalkers can use it
+	has_gun_safety = FALSE //bows and arrows don't have safeties

 /obj/item/gun/ballistic/bow/shoot_with_empty_chamber()
 	return
@@ -10,6 +10,7 @@
 	fire_sound = 'sound/weapons/revolvershot.ogg'
 	casing_ejector = FALSE
 	w_class = WEIGHT_CLASS_TINY
+	has_gun_safety = TRUE

 /obj/item/gun/ballistic/derringer/get_ammo(countchambered = FALSE, countempties = TRUE)
 	var/boolets = 0 //legacy var name maturity
@@ -11,6 +11,7 @@
 	fire_sound = 'sound/weapons/grenadelaunch.ogg'
 	w_class = WEIGHT_CLASS_NORMAL
 	pin = /obj/item/firing_pin/implant/pindicate
+	has_gun_safety = FALSE

 /obj/item/gun/ballistic/revolver/grenadelauncher/unrestricted
 	pin = /obj/item/firing_pin
@@ -27,6 +28,7 @@
 	icon_state = "mecha_grenadelnchr"
 	mag_type = /obj/item/ammo_box/magazine/internal/cylinder/grenademulti
 	pin = /obj/item/firing_pin
+	has_gun_safety = FALSE

 /obj/item/gun/ballistic/revolver/grenadelauncher/cyborg/attack_self()
 	return
@@ -92,6 +94,7 @@
 	casing_ejector = FALSE
 	weapon_weight = WEAPON_HEAVY
 	magazine_wording = "rocket"
+	has_gun_safety = TRUE

 /obj/item/gun/ballistic/rocketlauncher/unrestricted
 	pin = /obj/item/firing_pin
@@ -20,6 +20,7 @@
 	w_class = WEIGHT_CLASS_BULKY
 	var/obj/item/stock_parts/cell/cell
 	var/cell_type = /obj/item/stock_parts/cell/magnetic
+	has_gun_safety = TRUE

 /obj/item/gun/ballistic/automatic/magrifle/Initialize(mapload)
 	. = ..()
@@ -6,6 +6,7 @@
 	fire_sound = "sound/weapons/revolvershot.ogg"
 	casing_ejector = FALSE
 	recoil = 0.5
+	has_gun_safety = TRUE

 /obj/item/gun/ballistic/revolver/Initialize(mapload)
 	. = ..()
@@ -15,6 +15,7 @@
 	var/clip_delay = CLICK_CD_MELEE
 	weapon_weight = WEAPON_HEAVY
 	sawn_item_state = "sawnshotgun"
+	has_gun_safety = TRUE

 /obj/item/gun/ballistic/shotgun/attackby(obj/item/A, mob/user, params)
 	. = ..()
@@ -13,6 +13,7 @@
 	clumsy_check = 0
 	item_flags = NONE
 	casing_ejector = FALSE
+	has_gun_safety = TRUE

 /obj/item/gun/ballistic/automatic/toy/unrestricted
 	pin = /obj/item/firing_pin