diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index e2108364e9ac..b07d0d1116a4 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -2386,6 +2386,37 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/stock/type71/New() ..() +/obj/item/attachable/stock/m60 + name = "M60 stock" + desc = "This isn't supposed to be separated from the gun, how'd this happen?" + icon = 'icons/obj/items/weapons/guns/attachments/stock.dmi' + icon_state = "m60_stock" + attach_icon = "m60_stock" + slot = "stock" + wield_delay_mod = WIELD_DELAY_NONE + flags_attach_features = NO_FLAGS + melee_mod = 15 + size_mod = 0 + +/obj/item/attachable/stock/m60/New() + ..() + +/obj/item/attachable/stock/ppsh + name = "PPSh-17b stock" + desc = "This isn't supposed to be separated from the gun, how'd this happen?" + icon = 'icons/obj/items/weapons/guns/attachments/stock.dmi' + icon_state = "ppsh17b_stock" + attach_icon = "ppsh17b_stock" + slot = "stock" + wield_delay_mod = WIELD_DELAY_NONE + flags_attach_features = NO_FLAGS + melee_mod = 10 + size_mod = 0 + +/obj/item/attachable/stock/ppsh/New() + ..() + + /obj/item/attachable/stock/smg name = "submachinegun stock" desc = "A rare ARMAT stock distributed in small numbers to USCM forces. Compatible with the M39, this stock reduces recoil and improves accuracy, but at a reduction to handling and agility. Seemingly a bit more effective in a brawl" diff --git a/code/modules/projectiles/guns/boltaction.dm b/code/modules/projectiles/guns/boltaction.dm index a1b8705240a4..417ef39379f3 100644 --- a/code/modules/projectiles/guns/boltaction.dm +++ b/code/modules/projectiles/guns/boltaction.dm @@ -42,7 +42,7 @@ var/has_openbolt_icon = TRUE /obj/item/weapon/gun/boltaction/set_gun_attachment_offsets() - attachable_offset = list("muzzle_x" = 32, "muzzle_y" = 17,"rail_x" = 5, "rail_y" = 18, "under_x" = 25, "under_y" = 14, "stock_x" = 18, "stock_y" = 10) + attachable_offset = list("muzzle_x" = 32, "muzzle_y" = 17,"rail_x" = 5, "rail_y" = 18, "under_x" = 25, "under_y" = 14, "stock_x" = 17, "stock_y" = 8) /obj/item/weapon/gun/boltaction/Initialize(mapload, spawn_empty) . = ..() diff --git a/code/modules/projectiles/guns/misc.dm b/code/modules/projectiles/guns/misc.dm index 5503ab03a1da..0cefa2bf2f30 100644 --- a/code/modules/projectiles/guns/misc.dm +++ b/code/modules/projectiles/guns/misc.dm @@ -83,10 +83,15 @@ starting_attachment_types = list( /obj/item/attachable/m60barrel, /obj/item/attachable/bipod/m60, + /obj/item/attachable/stock/m60, ) start_semiauto = FALSE start_automatic = TRUE var/cover_open = FALSE //if the gun's feed-cover is open or not. + var/pos1 = 32 + var/pos2 = -32 + var/pos3 = 32 + var/pos4 = -32 /obj/item/weapon/gun/m60/Initialize(mapload, spawn_empty) @@ -95,7 +100,7 @@ load_into_chamber() /obj/item/weapon/gun/m60/set_gun_attachment_offsets() - attachable_offset = list("muzzle_x" = 34, "muzzle_y" = 16,"rail_x" = 0, "rail_y" = 0, "under_x" = 39, "under_y" = 7, "stock_x" = 0, "stock_y" = 0) + attachable_offset = list("muzzle_x" = 37, "muzzle_y" = 16, "rail_x" = 0, "rail_y" = 0, "under_x" = 27, "under_y" = 12, "stock_x" = 10, "stock_y" = 14) /obj/item/weapon/gun/m60/set_gun_config_values() @@ -147,9 +152,9 @@ /obj/item/weapon/gun/m60/update_icon() . = ..() if(cover_open) - overlays += "+[base_gun_icon]_cover_open" + overlays += image("+[base_gun_icon]_cover_open", pixel_x = -2, pixel_y = 8) else - overlays += "+[base_gun_icon]_cover_closed" + overlays += image("+[base_gun_icon]_cover_closed", pixel_x = -10, pixel_y = 0) /obj/item/weapon/gun/m60/able_to_fire(mob/living/user) . = ..() diff --git a/code/modules/projectiles/guns/revolvers.dm b/code/modules/projectiles/guns/revolvers.dm index 1c2adc2360a3..925c88285a58 100644 --- a/code/modules/projectiles/guns/revolvers.dm +++ b/code/modules/projectiles/guns/revolvers.dm @@ -498,7 +498,7 @@ desc = "A lean .38 made by Smith & Wesson. A timeless classic, from antiquity to the future. This specific model is known to be wildly inaccurate, yet extremely lethal." icon = 'icons/obj/items/weapons/guns/guns_by_faction/colony.dmi' icon_state = "sw357" - item_state = "ny762" //PLACEHOLDER + item_state = "sw357" fire_sound = 'sound/weapons/gun_44mag2.ogg' current_mag = /obj/item/ammo_magazine/internal/revolver/small force = 6 diff --git a/code/modules/projectiles/guns/smgs.dm b/code/modules/projectiles/guns/smgs.dm index 466a09612c54..45155d1836d7 100644 --- a/code/modules/projectiles/guns/smgs.dm +++ b/code/modules/projectiles/guns/smgs.dm @@ -265,10 +265,11 @@ fire_sound = 'sound/weapons/smg_heavy.ogg' current_mag = /obj/item/ammo_magazine/smg/ppsh flags_gun_features = GUN_CAN_POINTBLANK|GUN_ANTIQUE + starting_attachment_types = list(/obj/item/attachable/stock/ppsh) var/jammed = FALSE /obj/item/weapon/gun/smg/ppsh/set_gun_attachment_offsets() - attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 17,"rail_x" = 15, "rail_y" = 19, "under_x" = 26, "under_y" = 15, "stock_x" = 26, "stock_y" = 15) + attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 17,"rail_x" = 15, "rail_y" = 19, "under_x" = 26, "under_y" = 15, "stock_x" = 18, "stock_y" = 15) /obj/item/weapon/gun/smg/ppsh/set_gun_config_values() ..() diff --git a/icons/mob/humans/onmob/back.dmi b/icons/mob/humans/onmob/back.dmi index 128b05455d6e..f3bf5322b815 100644 Binary files a/icons/mob/humans/onmob/back.dmi and b/icons/mob/humans/onmob/back.dmi differ diff --git a/icons/mob/humans/onmob/items_lefthand_1.dmi b/icons/mob/humans/onmob/items_lefthand_1.dmi index cb80cb6cc10c..f2e5fb00b166 100644 Binary files a/icons/mob/humans/onmob/items_lefthand_1.dmi and b/icons/mob/humans/onmob/items_lefthand_1.dmi differ diff --git a/icons/mob/humans/onmob/items_righthand_1.dmi b/icons/mob/humans/onmob/items_righthand_1.dmi index 7bad7eb2c583..cdfe35167fc0 100644 Binary files a/icons/mob/humans/onmob/items_righthand_1.dmi and b/icons/mob/humans/onmob/items_righthand_1.dmi differ diff --git a/icons/mob/humans/onmob/suit_slot.dmi b/icons/mob/humans/onmob/suit_slot.dmi index a9142060ab75..cde35b456048 100644 Binary files a/icons/mob/humans/onmob/suit_slot.dmi and b/icons/mob/humans/onmob/suit_slot.dmi differ diff --git a/icons/obj/items/clothing/belts.dmi b/icons/obj/items/clothing/belts.dmi index ecbc5fb84969..74fff3f8067a 100644 Binary files a/icons/obj/items/clothing/belts.dmi and b/icons/obj/items/clothing/belts.dmi differ diff --git a/icons/obj/items/weapons/guns/ammo_by_faction/colony.dmi b/icons/obj/items/weapons/guns/ammo_by_faction/colony.dmi index 2adece3b1ab1..8d8ef7cb0163 100644 Binary files a/icons/obj/items/weapons/guns/ammo_by_faction/colony.dmi and b/icons/obj/items/weapons/guns/ammo_by_faction/colony.dmi differ diff --git a/icons/obj/items/weapons/guns/ammo_by_faction/upp.dmi b/icons/obj/items/weapons/guns/ammo_by_faction/upp.dmi index 7327bf6a611b..32a8aeec4d17 100644 Binary files a/icons/obj/items/weapons/guns/ammo_by_faction/upp.dmi and b/icons/obj/items/weapons/guns/ammo_by_faction/upp.dmi differ diff --git a/icons/obj/items/weapons/guns/attachments/barrel.dmi b/icons/obj/items/weapons/guns/attachments/barrel.dmi index 138b9b658fb6..2400465e4bf4 100644 Binary files a/icons/obj/items/weapons/guns/attachments/barrel.dmi and b/icons/obj/items/weapons/guns/attachments/barrel.dmi differ diff --git a/icons/obj/items/weapons/guns/attachments/rail.dmi b/icons/obj/items/weapons/guns/attachments/rail.dmi index 68cb2648ebd1..f53187160e92 100644 Binary files a/icons/obj/items/weapons/guns/attachments/rail.dmi and b/icons/obj/items/weapons/guns/attachments/rail.dmi differ diff --git a/icons/obj/items/weapons/guns/attachments/stock.dmi b/icons/obj/items/weapons/guns/attachments/stock.dmi index 0867f60d6430..9f28383c0bad 100644 Binary files a/icons/obj/items/weapons/guns/attachments/stock.dmi and b/icons/obj/items/weapons/guns/attachments/stock.dmi differ diff --git a/icons/obj/items/weapons/guns/attachments/under.dmi b/icons/obj/items/weapons/guns/attachments/under.dmi index 5a9be7542348..1138e0044c34 100644 Binary files a/icons/obj/items/weapons/guns/attachments/under.dmi and b/icons/obj/items/weapons/guns/attachments/under.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_faction/colony.dmi b/icons/obj/items/weapons/guns/guns_by_faction/colony.dmi index 17e7e6f221ae..c99968c54369 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_faction/colony.dmi and b/icons/obj/items/weapons/guns/guns_by_faction/colony.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_faction/upp.dmi b/icons/obj/items/weapons/guns/guns_by_faction/upp.dmi index 669efcfc59c4..dcdc441fcb53 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_faction/upp.dmi and b/icons/obj/items/weapons/guns/guns_by_faction/upp.dmi differ