Skip to content

Commit

Permalink
Magnum skins (#13667)
Browse files Browse the repository at this point in the history
* item skins

* magnum skins

* cursed dmi tool issue

* removed f12 references

* someone fix the tool please god

* dmi tool pls
  • Loading branch information
Lumipharon authored Aug 9, 2023
1 parent e1eb1d5 commit 17bd636
Show file tree
Hide file tree
Showing 10 changed files with 118 additions and 12 deletions.
3 changes: 3 additions & 0 deletions code/game/objects/items/loot_box.dm
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@
/obj/item/weapon/karambit,
/obj/item/weapon/karambit/fade,
/obj/item/weapon/karambit/case_hardened,
/obj/item/storage/briefcase/standard_magnum/gold,
/obj/item/storage/briefcase/standard_magnum/silver,
/obj/item/storage/briefcase/standard_magnum/nickle,
)
rare_list = list(
/obj/vehicle/unmanned,
Expand Down
57 changes: 57 additions & 0 deletions code/game/objects/items/storage/briefcase.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,60 @@
w_class = WEIGHT_CLASS_BULKY
max_w_class = WEIGHT_CLASS_NORMAL
max_storage_space = 16

/obj/item/storage/briefcase/standard_magnum
name = "R-76 Magnum case"
desc = "A well made, expensive looking case, made to fit an R-76 Magnum and its accessories. For the discerning gun owner."
icon_state = "magnum_case"
item_state = "briefcase"
flags_atom = CONDUCT
force = 12
throw_speed = 1
throw_range = 4
w_class = WEIGHT_CLASS_BULKY
max_w_class = WEIGHT_CLASS_NORMAL
max_storage_space = 15
storage_slots = 9
storage_type_limits = list(/obj/item/weapon/gun = 1)
can_hold = list(
/obj/item/weapon/gun/revolver/standard_magnum,
/obj/item/attachable/stock/t76,
/obj/item/attachable/scope/standard_magnum,
/obj/item/ammo_magazine/revolver/standard_magnum,
)

/obj/item/storage/briefcase/standard_magnum/gold/Initialize(mapload)
. = ..()
new /obj/item/weapon/gun/revolver/standard_magnum/fancy/gold(src)
new /obj/item/attachable/scope/standard_magnum(src)
new /obj/item/attachable/stock/t76(src)
new /obj/item/attachable/compensator(src)
new /obj/item/ammo_magazine/revolver/standard_magnum(src)
new /obj/item/ammo_magazine/revolver/standard_magnum(src)
new /obj/item/ammo_magazine/revolver/standard_magnum(src)
new /obj/item/ammo_magazine/revolver/standard_magnum(src)
new /obj/item/ammo_magazine/revolver/standard_magnum(src)

/obj/item/storage/briefcase/standard_magnum/silver/Initialize(mapload)
. = ..()
new /obj/item/weapon/gun/revolver/standard_magnum/fancy/silver(src)
new /obj/item/attachable/scope/standard_magnum(src)
new /obj/item/attachable/stock/t76(src)
new /obj/item/attachable/compensator(src)
new /obj/item/ammo_magazine/revolver/standard_magnum(src)
new /obj/item/ammo_magazine/revolver/standard_magnum(src)
new /obj/item/ammo_magazine/revolver/standard_magnum(src)
new /obj/item/ammo_magazine/revolver/standard_magnum(src)
new /obj/item/ammo_magazine/revolver/standard_magnum(src)

/obj/item/storage/briefcase/standard_magnum/nickle/Initialize(mapload)
. = ..()
new /obj/item/weapon/gun/revolver/standard_magnum/fancy/nickle(src)
new /obj/item/attachable/scope/standard_magnum(src)
new /obj/item/attachable/stock/t76(src)
new /obj/item/attachable/compensator(src)
new /obj/item/ammo_magazine/revolver/standard_magnum(src)
new /obj/item/ammo_magazine/revolver/standard_magnum(src)
new /obj/item/ammo_magazine/revolver/standard_magnum(src)
new /obj/item/ammo_magazine/revolver/standard_magnum(src)
new /obj/item/ammo_magazine/revolver/standard_magnum(src)
34 changes: 23 additions & 11 deletions code/modules/projectiles/gun_attachables.dm
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,13 @@ inaccurate. Don't worry if force is ever negative, it won't runtime.
recoil_mod = -2
scatter_unwielded_mod = -3
recoil_unwielded_mod = -2
variants_by_parent_type = list(/obj/item/weapon/gun/rifle/som = "comp_big", /obj/item/weapon/gun/smg/som = "comp_big", /obj/item/weapon/gun/shotgun/som = "comp_big", /obj/item/weapon/gun/shotgun/pump/t35 = "comp_big")
variants_by_parent_type = list(
/obj/item/weapon/gun/rifle/som = "comp_big",
/obj/item/weapon/gun/smg/som = "comp_big",
/obj/item/weapon/gun/shotgun/som = "comp_big",
/obj/item/weapon/gun/shotgun/pump/t35 = "comp_big",
/obj/item/weapon/gun/revolver/standard_magnum = "t76comp"
)


/obj/item/attachable/sniperbarrel
Expand Down Expand Up @@ -672,7 +678,7 @@ inaccurate. Don't worry if force is ever negative, it won't runtime.
/obj/item/attachable/scope
name = "rail scope"
icon_state = "sniperscope"
desc = "A rail mounted zoom sight scope. Allows zoom by activating the attachment. Use F12 if your HUD doesn't come back."
desc = "A rail mounted zoom sight scope. Allows zoom by activating the attachment."
slot = ATTACHMENT_SLOT_RAIL
aim_speed_mod = 0.5 //Extra slowdown when aiming
wield_delay_mod = 0.4 SECONDS
Expand All @@ -698,19 +704,19 @@ inaccurate. Don't worry if force is ever negative, it won't runtime.

/obj/item/attachable/scope/marine
name = "T-47 rail scope"
desc = "A marine standard mounted zoom sight scope. Allows zoom by activating the attachment. Use F12 if your HUD doesn't come back."
desc = "A marine standard mounted zoom sight scope. Allows zoom by activating the attachment."
icon_state = "marinescope"

/obj/item/attachable/scope/nightvision
name = "T-46 Night vision scope"
icon_state = "nvscope"
desc = "A rail-mounted night vision scope developed by Roh-Easy industries for the TGMC. Allows zoom by activating the attachment. Use F12 if your HUD doesn't come back."
desc = "A rail-mounted night vision scope developed by Roh-Easy industries for the TGMC. Allows zoom by activating the attachment."
has_nightvision = TRUE

/obj/item/attachable/scope/optical
name = "T-49 Optical imaging scope"
icon_state = "imagerscope"
desc = "A rail-mounted scope designed for the AR-55 and GL-54. Features low light optical imaging capabilities and assists with precision aiming. Allows zoom by activating the attachment. Use F12 if your HUD doesn't come back."
desc = "A rail-mounted scope designed for the AR-55 and GL-54. Features low light optical imaging capabilities and assists with precision aiming. Allows zoom by activating the attachment."
has_nightvision = TRUE
aim_speed_mod = 0.3
wield_delay_mod = 0.2 SECONDS
Expand All @@ -721,7 +727,13 @@ inaccurate. Don't worry if force is ever negative, it won't runtime.
/obj/item/attachable/scope/mosin
name = "Mosin nagant rail scope"
icon_state = "mosinscope"
desc = "A Mosin specific mounted zoom sight scope. Allows zoom by activating the attachment. Use F12 if your HUD doesn't come back."
desc = "A Mosin specific mounted zoom sight scope. Allows zoom by activating the attachment."

/obj/item/attachable/scope/standard_magnum
name = "R-76 rail scope"
desc = "A custom rail mounted zoom sight scope designed specifically for the R-76 Magnum. Allows zoom by activating the attachment."
icon = 'icons/Marine/attachments_64.dmi'
icon_state = "t76scope"

/obj/item/attachable/scope/unremovable
flags_attach_features = ATTACH_ACTIVATION
Expand All @@ -741,7 +753,7 @@ inaccurate. Don't worry if force is ever negative, it won't runtime.
icon_state = "tl127_scope"
aim_speed_mod = 0
wield_delay_mod = 0
desc = "A rail mounted zoom sight scope specialized for the SR-127 sniper rifle. Allows zoom by activating the attachment. Use F12 if your HUD doesn't come back."
desc = "A rail mounted zoom sight scope specialized for the SR-127 sniper rifle. Allows zoom by activating the attachment."

/obj/item/attachable/scope/unremovable/heavymachinegun
name = "HMG-08 long range ironsights"
Expand All @@ -753,7 +765,7 @@ inaccurate. Don't worry if force is ever negative, it won't runtime.
/obj/item/attachable/scope/unremovable/mmg
name = "MG-27 rail scope"
icon_state = "miniscope"
desc = "A small rail mounted zoom sight scope. Allows zoom by activating the attachment. Use F12 if your HUD doesn't come back."
desc = "A small rail mounted zoom sight scope. Allows zoom by activating the attachment."
wield_delay_mod = 0.2 SECONDS
aim_speed_mod = 0.2
scoped_accuracy_mod = SCOPE_RAIL_MINI
Expand Down Expand Up @@ -857,13 +869,13 @@ inaccurate. Don't worry if force is ever negative, it won't runtime.

/obj/item/attachable/scope/unremovable/laser_sniper_scope
name = "Terra Experimental laser sniper rifle rail scope"
desc = "A marine standard mounted zoom sight scope made for the Terra Experimental laser sniper rifle otherwise known as TE-S abbreviated, allows zoom by activating the attachment. Use F12 if your HUD doesn't come back."
desc = "A marine standard mounted zoom sight scope made for the Terra Experimental laser sniper rifle otherwise known as TE-S abbreviated, allows zoom by activating the attachment."
icon_state = "tes"

/obj/item/attachable/scope/mini
name = "mini rail scope"
icon_state = "miniscope"
desc = "A small rail mounted zoom sight scope. Allows zoom by activating the attachment. Use F12 if your HUD doesn't come back."
desc = "A small rail mounted zoom sight scope. Allows zoom by activating the attachment."
slot = ATTACHMENT_SLOT_RAIL
wield_delay_mod = 0.2 SECONDS
accuracy_unwielded_mod = -0.05
Expand All @@ -883,7 +895,7 @@ inaccurate. Don't worry if force is ever negative, it won't runtime.

/obj/item/attachable/scope/antimaterial
name = "antimaterial rail scope"
desc = "A rail mounted zoom sight scope specialized for the antimaterial Sniper Rifle . Allows zoom by activating the attachment. Can activate its targeting laser while zoomed to take aim for increased damage and penetration. Use F12 if your HUD doesn't come back."
desc = "A rail mounted zoom sight scope specialized for the antimaterial Sniper Rifle . Allows zoom by activating the attachment. Can activate its targeting laser while zoomed to take aim for increased damage and penetration."
icon_state = "antimat"
scoped_accuracy_mod = SCOPE_RAIL_SNIPER
has_nightvision = TRUE
Expand Down
36 changes: 35 additions & 1 deletion code/modules/projectiles/guns/revolvers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -295,8 +295,9 @@
/obj/item/attachable/lace,
/obj/item/attachable/shoulder_mount,
/obj/item/attachable/stock/t76,
/obj/item/attachable/scope/standard_magnum,
)
attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 19,"rail_x" = 15, "rail_y" = 23, "under_x" = 22, "under_y" = 15, "stock_x" = 9, "stock_y" = 18)
attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 19,"rail_x" = 15, "rail_y" = 23, "under_x" = 22, "under_y" = 15, "stock_x" = 10, "stock_y" = 18)
windup_delay = 0.5 SECONDS
aim_slowdown = 0.1
windup_sound = 'sound/weapons/guns/fire/t76_start.ogg'
Expand All @@ -312,6 +313,39 @@

starting_attachment_types = list(/obj/item/attachable/stock/t76)

/obj/item/weapon/gun/revolver/standard_magnum/fancy
starting_attachment_types = list()
attachable_allowed = list(
/obj/item/attachable/bayonet,
/obj/item/attachable/reddot,
/obj/item/attachable/flashlight,
/obj/item/attachable/heavy_barrel,
/obj/item/attachable/extended_barrel,
/obj/item/attachable/lasersight,
/obj/item/attachable/lace,
/obj/item/attachable/shoulder_mount,
/obj/item/attachable/stock/t76,
/obj/item/attachable/scope/standard_magnum,
/obj/item/attachable/compensator,
)

/obj/item/weapon/gun/revolver/standard_magnum/fancy/gold
desc = "A gold plated R-76 magnum, to ensure it's incredibly expensive as well as incredibly impractical. The R-76 magnum is an absolute beast of a handgun used by the TGMC, rumors say it was created as a money laundering scheme by some general due to the sheer inpracticality of this firearm. Hits hard, recommended to be used with its stock attachment. Chambered in 12.7mm."
icon_state = "g_t76"
item_state = "g_t76"
fire_animation = "g_t76_fire"

/obj/item/weapon/gun/revolver/standard_magnum/fancy/silver
desc = "A silver plated R-76 magnum, to ensure it's incredibly expensive as well as incredibly impractical. The R-76 magnum is an absolute beast of a handgun used by the TGMC, rumors say it was created as a money laundering scheme by some general due to the sheer inpracticality of this firearm. Hits hard, recommended to be used with its stock attachment. Chambered in 12.7mm."
icon_state = "s_t76"
item_state = "s_t76"
fire_animation = "s_t76_fire"

/obj/item/weapon/gun/revolver/standard_magnum/fancy/nickle
desc = "A nickle plated R-76 magnum, for a more tasteful finish. The R-76 magnum is an absolute beast of a handgun used by the TGMC, rumors say it was created as a money laundering scheme by some general due to the sheer inpracticality of this firearm. Hits hard, recommended to be used with its stock attachment. Chambered in 12.7mm."
icon_state = "n_t76"
item_state = "n_t76"
fire_animation = "n_t76_fire"

//Single action revolvers below
//---------------------------------------------------
Expand Down
Binary file modified icons/Marine/attachments_64.dmi
Binary file not shown.
Binary file modified icons/Marine/gun64.dmi
Binary file not shown.
Binary file modified icons/Marine/marine-weapons.dmi
Binary file not shown.
Binary file modified icons/mob/items_lefthand_1.dmi
Binary file not shown.
Binary file modified icons/mob/items_righthand_1.dmi
Binary file not shown.
Binary file modified icons/obj/items/storage/storage.dmi
Binary file not shown.

0 comments on commit 17bd636

Please sign in to comment.