Fixed vars getting set twice in the same class (#19294)

Fixed vars getting set twice in the same class
This commit is contained in:
Fluffy
2024-06-02 23:13:31 +00:00
committed by GitHub
parent 0dc6f03a46
commit aeb27e21e1
78 changed files with 93 additions and 132 deletions
@@ -91,7 +91,6 @@
knife_x_offset = 23
knife_y_offset = 13
fire_delay = 25
w_class = ITEMSIZE_LARGE
accuracy = -3
scoped_accuracy = 4
@@ -452,11 +452,10 @@
item_state = "l6closedmag"
w_class = ITEMSIZE_LARGE
force = 10
slot_flags = 0
slot_flags = SLOT_BACK
max_shells = 50
caliber = "a762"
origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 1, TECH_ILLEGAL = 2)
slot_flags = SLOT_BACK
ammo_type = "/obj/item/ammo_casing/a762"
allowed_magazines = list(/obj/item/ammo_magazine/a762)
fire_sound = 'sound/weapons/gunshot/gunshot_saw.ogg'
@@ -562,9 +561,6 @@
is_wieldable = TRUE
can_bayonet = TRUE
magazine_type = /obj/item/ammo_magazine/c762/dpra
allowed_magazines = list(/obj/item/ammo_magazine/c762/dpra)
@@ -639,7 +635,6 @@
suppressor_y_offset = null
handle_casings = DELETE_CASINGS
max_shells = 30
allowed_magazines = list(/obj/item/ammo_magazine/submachinemag/assassin)
/obj/item/gun/projectile/automatic/tommygun/assassin/update_icon()
..()
@@ -46,7 +46,6 @@
desc = "A small gas-powered dartgun, capable of delivering chemical cocktails swiftly across short distances."
icon = 'icons/obj/guns/dartgun.dmi'
icon_state = "dartgun-empty"
icon_state = "dartgun-empty"
caliber = "dart"
fire_sound = 'sound/weapons/click.ogg'
fire_sound_text = "a metallic click"
@@ -329,7 +329,7 @@
name = "gauss thumper"
desc = "An outdated gauss weapon which sees sparing use in modern times."
w_class = ITEMSIZE_NORMAL
slot_flags = 0
slot_flags = SLOT_BACK
magazine_type = /obj/item/ammo_magazine/gauss
allowed_magazines = list(/obj/item/ammo_magazine/gauss)
icon = 'icons/obj/guns/gauss_thumper.dmi'
@@ -342,7 +342,6 @@
handle_casings = DELETE_CASINGS
force = 15
slot_flags = SLOT_BACK
can_bayonet = TRUE
knife_x_offset = 23
knife_y_offset = 13