Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resprite of old guns #6804

Merged
merged 9 commits into from
Aug 23, 2024
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions code/modules/projectiles/gun_attachables.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
..()
Blundir marked this conversation as resolved.
Show resolved Hide resolved

/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()
..()
Blundir marked this conversation as resolved.
Show resolved Hide resolved


/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"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/guns/boltaction.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = 20, "stock_y" = 9)

/obj/item/weapon/gun/boltaction/Initialize(mapload, spawn_empty)
. = ..()
Expand Down
7 changes: 4 additions & 3 deletions code/modules/projectiles/guns/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
starting_attachment_types = list(
/obj/item/attachable/m60barrel,
/obj/item/attachable/bipod/m60,
/obj/item/attachable/stock/m60,
)
start_semiauto = FALSE
start_automatic = TRUE
Expand All @@ -95,7 +96,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()
Expand Down Expand Up @@ -147,9 +148,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)
. = ..()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/guns/revolvers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions code/modules/projectiles/guns/smgs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
..()
Expand Down Expand Up @@ -460,7 +461,7 @@
aim_slowdown = SLOWDOWN_ADS_NONE

/obj/item/weapon/gun/smg/mac15/set_gun_attachment_offsets()
attachable_offset = list("muzzle_x" = 32, "muzzle_y" = 20,"rail_x" = 16, "rail_y" = 22, "under_x" = 22, "under_y" = 16, "stock_x" = 22, "stock_y" = 16)
attachable_offset = list("muzzle_x" = 29, "muzzle_y" = 21,"rail_x" = 13, "rail_y" = 24, "under_x" = 19, "under_y" = 18, "stock_x" = 22, "stock_y" = 16)

/obj/item/weapon/gun/smg/mac15/set_gun_config_values()
..()
Expand Down
Binary file modified icons/mob/humans/onmob/back.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/items_lefthand_1.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/items_righthand_1.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/suit_slot.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/belts.dmi
Binary file not shown.
Binary file modified icons/obj/items/weapons/guns/ammo_by_faction/colony.dmi
Binary file not shown.
Binary file modified icons/obj/items/weapons/guns/ammo_by_faction/upp.dmi
Binary file not shown.
Binary file modified icons/obj/items/weapons/guns/attachments/barrel.dmi
Binary file not shown.
Binary file modified icons/obj/items/weapons/guns/attachments/rail.dmi
Binary file not shown.
Binary file modified icons/obj/items/weapons/guns/attachments/stock.dmi
Binary file not shown.
Binary file modified icons/obj/items/weapons/guns/attachments/under.dmi
Binary file not shown.
Binary file modified icons/obj/items/weapons/guns/guns_by_faction/colony.dmi
Binary file not shown.
Binary file modified icons/obj/items/weapons/guns/guns_by_faction/upp.dmi
Binary file not shown.
Loading