Skip to content

Commit

Permalink
Коробки с патронами на скаутскую винтовку. (#695)
Browse files Browse the repository at this point in the history
* pizdez br8 ammo box

* Update weapons.dm

* удаление иконок

* "/" момент

* Update code/modules/projectiles/magazines/misc.dm

Co-authored-by: Helg2 <[email protected]>
Signed-off-by: ChromosomeKiller <[email protected]>

* Update code/modules/projectiles/magazines/misc.dm

Co-authored-by: Helg2 <[email protected]>
Signed-off-by: ChromosomeKiller <[email protected]>

---------

Signed-off-by: ChromosomeKiller <[email protected]>
Co-authored-by: Helg2 <[email protected]>
  • Loading branch information
ChromosomeKiller and Helg2 authored Nov 26, 2024
1 parent 9909fe0 commit 303e687
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 0 deletions.
12 changes: 12 additions & 0 deletions code/modules/projectiles/magazines/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,18 @@
current_rounds = 150
max_rounds = 150

/obj/item/ammo_magazine/packet/scout_rifle/impact
name = "Box of A19 high velocity impact bullets"
desc = "A box containing 150 rounds of A19 impact high velocity."
icon_state = "box_tx8_impact"
default_ammo = /datum/ammo/bullet/rifle/tx8/impact

/obj/item/ammo_magazine/packet/scout_rifle/incendiary
name = "Box of A19 high velocity incendiary bullets"
desc = "A box containing 150 rounds of A19 incendiary high velocity."
icon_state = "box_tx8_incendiary"
default_ammo = /datum/ammo/bullet/rifle/tx8/incendiary

/obj/item/ammo_magazine/packet/sr81
name = "box of low-pressure 8.6x70mm"
desc = "A box containing 120 rounds of 8.6x70mm low velocity."
Expand Down
10 changes: 10 additions & 0 deletions code/modules/reqs/weapons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,21 @@
contains = list(/obj/item/ammo_magazine/rifle/tx8/impact)
cost = 40

/datum/supply_packs/weapons/scout_impact_box
name = "BR-8 scout rifle impact ammo box"
contains = list(/obj/item/ammo_magazine/packet/scout_rifle/impact)
cost = 100

/datum/supply_packs/weapons/scout_incendiary
name = "Br-8 scout rifle incendiary magazine"
contains = list(/obj/item/ammo_magazine/rifle/tx8/incendiary)
cost = 40

/datum/supply_packs/weapons/scout_incendiary_box
name = "BR-8 scout rifle incendiary ammo box"
contains = list(/obj/item/ammo_magazine/packet/scout_rifle/incendiary)
cost = 100

/datum/supply_packs/weapons/zx76
name = "ZX-76 Twin-Barrled Burst Shotgun"
contains = list(/obj/item/weapon/gun/shotgun/zx76)
Expand Down

0 comments on commit 303e687

Please sign in to comment.