From d5013a1c5bcf13a02176ac48fd3f06e33ff5cc9f Mon Sep 17 00:00:00 2001 From: irRegularGuy646 Date: Sat, 15 Jul 2023 00:51:07 -0400 Subject: [PATCH 1/3] adds HEI and SAPHEI 20mm --- .../damagetype/ranged/bullet/sniper_20.dm | 22 +++++++++++++++++++ code/_core/obj/item/bullet/sniper_20.dm | 17 +++++++++++++- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/code/_core/datum/damagetype/ranged/bullet/sniper_20.dm b/code/_core/datum/damagetype/ranged/bullet/sniper_20.dm index 07ba585f5a..8cb0509722 100644 --- a/code/_core/datum/damagetype/ranged/bullet/sniper_20.dm +++ b/code/_core/datum/damagetype/ranged/bullet/sniper_20.dm @@ -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, + ) diff --git a/code/_core/obj/item/bullet/sniper_20.dm b/code/_core/obj/item/bullet/sniper_20.dm index a7c74137d1..b09ccad21c 100644 --- a/code/_core/obj/item/bullet/sniper_20.dm +++ b/code/_core/obj/item/bullet/sniper_20.dm @@ -30,5 +30,20 @@ /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 \ No newline at end of file + 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." + rarity = RARITY_RARE + damage_type_bullet = /damagetype/ranged/bullet/sniper_20/hei + jam_chance = 25 + penetrations = 0 + +/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." + damage_type_bullet = /damagetype/ranged/bullet/sniper_20/hei/sap From 8f282ddc889e4ed820bd3f21703ec178040d99f3 Mon Sep 17 00:00:00 2001 From: irRegularGuy646 Date: Sat, 15 Jul 2023 01:06:48 -0400 Subject: [PATCH 2/3] makes jamming guaranteed for new ammo --- code/_core/obj/item/bullet/sniper_20.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/_core/obj/item/bullet/sniper_20.dm b/code/_core/obj/item/bullet/sniper_20.dm index b09ccad21c..09c3a00080 100644 --- a/code/_core/obj/item/bullet/sniper_20.dm +++ b/code/_core/obj/item/bullet/sniper_20.dm @@ -40,7 +40,7 @@ desc_extended = "For guns that require 20x117mm ammo. This one is packed with explosives and an incendiary mixture. Its payload makes cycling unreliable, however." rarity = RARITY_RARE damage_type_bullet = /damagetype/ranged/bullet/sniper_20/hei - jam_chance = 25 + jam_chance = 100 penetrations = 0 /obj/item/bullet_cartridge/sniper_20/hei/sap From b3a773ef43d32711ea2ac3919fa73404763e1e4c Mon Sep 17 00:00:00 2001 From: irRegularGuy646 Date: Sat, 15 Jul 2023 02:01:25 -0400 Subject: [PATCH 3/3] adds sprites and magazines --- code/_core/obj/item/bullet/sniper_20.dm | 3 +++ code/_core/obj/item/magazine/sniper_20mm.dm | 17 ++++++++++++++++- icons/obj/item/bullet/20mm_hei.dmi | Bin 0 -> 522 bytes icons/obj/item/bullet/20mm_saphei.dmi | Bin 0 -> 522 bytes icons/obj/item/magazine/20mm_sniper.dmi | Bin 394 -> 533 bytes 5 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 icons/obj/item/bullet/20mm_hei.dmi create mode 100644 icons/obj/item/bullet/20mm_saphei.dmi diff --git a/code/_core/obj/item/bullet/sniper_20.dm b/code/_core/obj/item/bullet/sniper_20.dm index 09c3a00080..21589b40d6 100644 --- a/code/_core/obj/item/bullet/sniper_20.dm +++ b/code/_core/obj/item/bullet/sniper_20.dm @@ -38,12 +38,15 @@ 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 diff --git a/code/_core/obj/item/magazine/sniper_20mm.dm b/code/_core/obj/item/magazine/sniper_20mm.dm index a3588f4b15..a6b0ca9d31 100644 --- a/code/_core/obj/item/magazine/sniper_20mm.dm +++ b/code/_core/obj/item/magazine/sniper_20mm.dm @@ -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 diff --git a/icons/obj/item/bullet/20mm_hei.dmi b/icons/obj/item/bullet/20mm_hei.dmi new file mode 100644 index 0000000000000000000000000000000000000000..01ead588869534091037a17c39521ee051de4b38 GIT binary patch literal 522 zcmV+l0`>igP)fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM z;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3K9+sWc}iwM2=FGbOXA7${)K#hF%=n41b= zqbZ9wBvzpju?mfeRcJ!2!s3F|Je(d-zCT9~`^9-{BfNRt+V$ovc8 zbNmNKdH)YEA4O{)6D5BdHaj09MO%Bz!wEc$v^egq2QD}8Fw*jRp1L6~!NW*#k;yx& zynKCTqN=zDLokeC0Il(os#HmqtFg|k9gU$Kl~NXqRbvcvl(vSRQZUdU&Jfg5Vg)*r z+W|itDEhep1i7Wrh@zhxK#*G+jVNb1ZUwmsJz)byKR19Nw=^2zxQeM|Y6qLf&4?NN zYN&Lr{)R`b{)T6*@m^{0p$C7~U_epya{~ynOM->}L^J@CT@o|W8{l~7FO!vK)&Kwi M07*qoM6N<$g8Zx3)Bpeg literal 0 HcmV?d00001 diff --git a/icons/obj/item/bullet/20mm_saphei.dmi b/icons/obj/item/bullet/20mm_saphei.dmi new file mode 100644 index 0000000000000000000000000000000000000000..5f8fdfae623b1c2b257fd9ba5377082bfe39381a GIT binary patch literal 522 zcmV+l0`>igP)2Gm00DGTPE!Ct z=GbNc004n{R9JLGWpiV4X>fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM z;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3K9+sWc}iwM2=FGbOXA7${)K#hF%=n41b= zqbZ9wBvzpju?mfeRcJ!2!s3F|Je(d-zCT9~`^9-{BfNRt+V$ovc8 zbNmNKdH)YEA4O{)6D5BdHaj09MO%Bz!wEc$v^egq2QD}8Fw*jRp1L6~!NW*#k;yx& zynKCTqN=zDLokeC0Il(os#HmqtFg|k9gU$Kl~NXqRbvcvl(vSRQZUdU&Jfg5Vg)*r z+W|itDEhep1i7Wrh@zhxK#*G+jVNb1ZUwmsJz)byKR19Nw=^2zxQeM|Y6qLf&4?NN zYN&Lr{)R`b{)T6*@m^{0p$C7~U_epya{~ynOM->}L^J@CT@o|W8{l~7FO!vK)&Kwi M07*qoM6N<$g5(L<`I?&ele^XQE z|KC8lDZ83!1L98*Y@pii_J_7Akz5&bJiSXK2LJ#75I6tZ^!fis`+@ZNpZ!3vfzbFI z%IkC8RZ=eBfcO)LH^6=X0000$|NsBxI-G~@kNEy){=eNlx#tIB_X`8xmmkf<8wich r&7(fc*df%+wQ`6Ynj|Vjdb(00000NkvXXu0mjfKK7_g delta 257 zcmbQr(#5RW8Q|y6%O%Cdz`(%k>ERLtq!WPHfrA-HUV7DJ1ElOHs%jW$YHAwj>#L}! zXlrR18yQJUODiZSFf=e2pD}(nM?Mg!jIkuhFPOpM*^M+Hr)uKV{Q5cDw6u5p+SzcJ zg`wHWYw{)iMSp-&#hxyXArY-_uX}Pe7znsr*Fo% zOV}A0JXB8BKG?yZBzER>jmr}G>G2=_+CQ*k_%K71-&J_Y{+^WSK>HayUHx3vIVCg! E00}o>mjD0&