Revert "adds gun safeties, remember to turn them off."

This reverts commit 9ca985b769.
2022-09-17 06:47:26 -07:00
parent 64ce476764
commit 15006a5dfd
24 changed files with 0 additions and 44 deletions
@@ -161,7 +161,6 @@
 	var/datum/duel/duel
 	var/mutable_appearance/setting_overlay
 	var/hugbox = DUEL_HUGBOX_NONE
-	has_gun_safety = TRUE

 /obj/item/gun/energy/dueling/hugbox
 	hugbox = DUEL_HUGBOX_LETHAL
@@ -9,7 +9,6 @@
 	ammo_x_offset = 3
 	flight_x_offset = 15
 	flight_y_offset = 10
-	has_gun_safety = TRUE

 /obj/item/gun/energy/e_gun/mini
 	name = "miniature energy gun"
@@ -34,7 +34,6 @@
 	lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
 	ammo_type = list(/obj/item/ammo_casing/energy/kinetic/premium)
-	has_gun_safety = TRUE

 /obj/item/ammo_casing/energy/kinetic/premium
 	projectile_type = /obj/item/projectile/kinetic/premium
@@ -8,7 +8,6 @@
 	ammo_type = list(/obj/item/ammo_casing/energy/lasergun)
 	ammo_x_offset = 1
 	shaded_charge = 1
-	has_gun_safety = TRUE

 /obj/item/gun/energy/laser/practice
 	name = "practice laser gun"
@@ -93,7 +92,6 @@
 	selfcharge = EGUN_SELFCHARGE_BORG
 	cell_type = /obj/item/stock_parts/cell/secborg
 	charge_delay = 3
-	has_gun_safety = FALSE

 /obj/item/gun/energy/laser/cyborg/emp_act()
 	return
@@ -131,7 +129,6 @@
 	ammo_type = list(/obj/item/ammo_casing/energy/laser/accelerator)
 	pin = null
 	ammo_x_offset = 3
-	has_gun_safety = TRUE

 /obj/item/ammo_casing/energy/laser/accelerator
 	projectile_type = /obj/item/projectile/beam/laser/accelerator
@@ -10,7 +10,6 @@
 	selfcharge = EGUN_SELFCHARGE
 	cell_type = "/obj/item/stock_parts/cell/pulse"
 	icon = 'modular_citadel/icons/obj/guns/VGguns.dmi'
-	has_gun_safety = TRUE

 /obj/item/gun/energy/megabuster/proto
 	name = "Proto-buster"
@@ -8,7 +8,6 @@
 	selfcharge = EGUN_SELFCHARGE
 	can_flashlight = 0
 	trigger_guard = TRIGGER_GUARD_ALLOW_ALL // Has no trigger at all, uses neural signals instead
-	has_gun_safety = TRUE

 /obj/item/gun/energy/laser/mounted
 	name = "mounted laser"
@@ -19,4 +18,3 @@
 	force = 5
 	selfcharge = EGUN_SELFCHARGE
 	trigger_guard = TRIGGER_GUARD_ALLOW_ALL
-	has_gun_safety = TRUE
@@ -9,7 +9,6 @@
 	shaded_charge = 1
 	lefthand_file = 'modular_citadel/icons/mob/citadel/guns_lefthand.dmi'
 	righthand_file = 'modular_citadel/icons/mob/citadel/guns_righthand.dmi'
-	has_gun_safety = TRUE


 /obj/item/gun/energy/plasma/rifle
@@ -10,7 +10,6 @@
 	slot_flags = ITEM_SLOT_BACK
 	ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse, /obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser)
 	cell_type = "/obj/item/stock_parts/cell/pulse"
-	has_gun_safety = TRUE

 /obj/item/gun/energy/pulse/emp_act(severity)
 	return
@@ -11,7 +11,6 @@
 	ammo_x_offset = 3
 	flight_x_offset = 17
 	flight_y_offset = 9
-	has_gun_safety = TRUE

 /obj/item/gun/energy/ionrifle/emp_act(severity)
 	return
@@ -50,7 +49,6 @@
 	modifystate = 1
 	ammo_x_offset = 1
 	selfcharge = EGUN_SELFCHARGE
-	has_gun_safety = FALSE

 /obj/item/gun/energy/meteorgun
 	name = "meteor gun"
@@ -62,7 +60,6 @@
 	cell_type = "/obj/item/stock_parts/cell/potato"
 	clumsy_check = 0 //Admin spawn only, might as well let clowns use it.
 	selfcharge = EGUN_SELFCHARGE
-	has_gun_safety = TRUE

 /obj/item/gun/energy/meteorgun/pen
 	name = "meteor pen"
@@ -73,7 +70,6 @@
 	lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/items_righthand.dmi'
 	w_class = WEIGHT_CLASS_TINY
-	has_gun_safety = TRUE

 /obj/item/gun/energy/mindflayer
 	name = "\improper Mind Flayer"
@@ -82,7 +78,6 @@
 	item_state = null
 	ammo_type = list(/obj/item/ammo_casing/energy/mindflayer)
 	ammo_x_offset = 2
-	has_gun_safety = FALSE

 /obj/item/gun/energy/kinetic_accelerator/crossbow
 	name = "mini energy crossbow"
@@ -101,7 +96,6 @@
 	unique_frequency = TRUE
 	can_flashlight = 0
 	max_mod_capacity = 0
-	has_gun_safety = TRUE

 /obj/item/gun/energy/kinetic_accelerator/crossbow/halloween
 	name = "candy corn crossbow"
@@ -109,7 +103,6 @@
 	icon_state = "crossbow_halloween"
 	item_state = "crossbow"
 	ammo_type = list(/obj/item/ammo_casing/energy/bolt/halloween)
-	has_gun_safety = FALSE

 /obj/item/gun/energy/kinetic_accelerator/crossbow/large
 	name = "energy crossbow"
@@ -140,7 +133,6 @@
 	usesound = list('sound/items/welder.ogg', 'sound/items/welder2.ogg')
 	tool_behaviour = TOOL_WELDER
 	toolspeed = 0.7 //plasmacutters can be used as welders, and are faster than standard welders
-	has_gun_safety = FALSE

 /obj/item/gun/energy/plasmacutter/ComponentInitialize()
 	. = ..()
@@ -197,7 +189,6 @@
 	icon_state = "gravity_gun"
 	var/power = 4
 	var/firing_core = FALSE
-	has_gun_safety = TRUE

 /obj/item/gun/energy/gravity_gun/attackby(obj/item/C, mob/user)
 	if(istype(C, /obj/item/assembly/signaler/anomaly))
@@ -225,7 +216,6 @@
 	var/obj/effect/portal/p_orange
 	var/atmos_link = FALSE
 	var/firing_core = FALSE
-	has_gun_safety = TRUE

 /obj/item/gun/energy/wormhole_projector/attackby(obj/item/C, mob/user)
 	if(istype(C, /obj/item/assembly/signaler/anomaly))
@@ -315,7 +305,6 @@
 	ammo_type = list(/obj/item/ammo_casing/energy/c3dbullet)
 	can_charge = 0
 	use_cyborg_cell = 1
-	has_gun_safety = FALSE

 /obj/item/gun/energy/printer/ComponentInitialize()
 	. = ..()
@@ -345,7 +334,6 @@
 	desc = "A specialized ASMD laser-rifle, capable of flat-out disintegrating most targets in a single hit."
 	ammo_type = list(/obj/item/ammo_casing/energy/instakill)
 	force = 60
-	has_gun_safety = TRUE

 /obj/item/gun/energy/laser/instakill/red
 	desc = "A specialized ASMD laser-rifle, capable of flat-out disintegrating most targets in a single hit. This one has a red design."
@@ -374,7 +362,6 @@
 	cell_type = /obj/item/stock_parts/cell/super
 	ammo_type = list(/obj/item/ammo_casing/energy/emitter)
 	automatic_charge_overlays = FALSE
-	has_gun_safety = TRUE

 /obj/item/gun/energy/emitter/update_icon_state()
 	var/obj/item/ammo_casing/energy/shot = ammo_type[current_firemode_index]
@@ -390,4 +377,3 @@
 	icon_state = "decloner"
 	no_pin_required = TRUE
 	ammo_type = list(/obj/item/ammo_casing/energy/pickle)
-	has_gun_safety = FALSE