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

Adds special 20mm ammo #649

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all 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
22 changes: 22 additions & 0 deletions code/_core/datum/damagetype/ranged/bullet/sniper_20.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,25 @@
/damagetype/ranged/bullet/sniper_20/du
damage_mod = DU_MUL
penetration_mod = DU_MUL

/damagetype/ranged/bullet/sniper_20/hei
attack_damage_base = list(
PIERCE = 350,
BLUNT = 150,
BOMB = 350, //it explodes inside of you
HEAT = 150
)
attack_damage_penetration = list(
PIERCE = 200,
BLUNT = 200,
BOMB = 50,
HEAT = 10,
)
/damagetype/ranged/bullet/sniper_20/hei/sap
damage_mod = ARMOR_DAM_MUL
attack_damage_penetration = list(
PIERCE = 200,
BLUNT = 200,
BOMB = 100,
HEAT = 100,
)
20 changes: 19 additions & 1 deletion code/_core/obj/item/bullet/sniper_20.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,23 @@

/obj/item/bullet_cartridge/sniper_20/du
name = "\improper DU 20x117mm sniper round"
desc_extended = "For guns that require 20x117mm ammo. This one has a depleted uranium tip."
rarity = RARITY_RARE
damage_type_bullet = /damagetype/ranged/bullet/sniper_20/du
damage_type_bullet = /damagetype/ranged/bullet/sniper_20/du

/obj/item/bullet_cartridge/sniper_20/hei
name = "\improper HEI 20x117mm sniper round"
desc = "For when you absolutely, positively, without a doubt want something to die."
desc_extended = "For guns that require 20x117mm ammo. This one is packed with explosives and an incendiary mixture. Its payload makes cycling unreliable, however."
icon = 'icons/obj/item/bullet/20mm_hei.dmi'
rarity = RARITY_RARE
damage_type_bullet = /damagetype/ranged/bullet/sniper_20/hei
jam_chance = 100
penetrations = 0
value = 10

/obj/item/bullet_cartridge/sniper_20/hei/sap
name = "\improper SAPHEI 20x117mm sniper round"
desc_extended = "For guns that require 20x117mm ammo. This one is packed with explosives, an incendiary mixture and a tungsten penetrator. Its payload makes cycling unreliable, however."
icon = 'icons/obj/item/bullet/20mm_saphei.dmi'
damage_type_bullet = /damagetype/ranged/bullet/sniper_20/hei/sap
17 changes: 16 additions & 1 deletion code/_core/obj/item/magazine/sniper_20mm.dm
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,24 @@
value = 40

/obj/item/magazine/sniper_20mm/du
name = "20x117mm DU sniper magazine"
ammo = /obj/item/bullet_cartridge/sniper_20/du
icon_state = "20_DU"
prem_restock_ammo = /obj/item/bullet_cartridge/sniper_20
rarity = RARITY_RARE
value = 120
value_burgerbux = 1

/obj/item/magazine/sniper_20mm/hei
name = "20x117mm HEI sniper magazine"
ammo = /obj/item/bullet_cartridge/sniper_20/hei
icon_state = "20_HEI"
rarity = RARITY_RARE
value = 120
value_burgerbux = 1
/obj/item/magazine/sniper_20mm/hei/sap
name = "20x117mm SAPHEI sniper magazine"
ammo = /obj/item/bullet_cartridge/sniper_20/hei/sap
icon_state = "20_SAPHEI"
rarity = RARITY_RARE
value = 120
value_burgerbux = 1
Binary file added icons/obj/item/bullet/20mm_hei.dmi
Binary file not shown.
Binary file added icons/obj/item/bullet/20mm_saphei.dmi
Binary file not shown.
Binary file modified icons/obj/item/magazine/20mm_sniper.dmi
Binary file not shown.