From b798f040689c1aea147429789d4e14c88bfaf045 Mon Sep 17 00:00:00 2001 From: Backsea Date: Sun, 19 Nov 2023 18:06:49 -0600 Subject: [PATCH] i love fixing things --- code/datums/supply_packs/black_market.dm | 4 ++-- code/datums/supply_packs/spec_ammo.dm | 6 +++--- code/game/objects/items/props/helmetgarb.dm | 4 ++-- code/modules/client/preferences_gear.dm | 2 +- .../projectiles/guns/specialist/sniper.dm | 16 ++++++++-------- .../projectiles/magazines/specialist.dm | 6 +++--- .../weapons/guns/guns_by_faction/uscm.dmi | Bin 32125 -> 32125 bytes 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/code/datums/supply_packs/black_market.dm b/code/datums/supply_packs/black_market.dm index 1af965898548..36d890e2b3d5 100644 --- a/code/datums/supply_packs/black_market.dm +++ b/code/datums/supply_packs/black_market.dm @@ -749,8 +749,8 @@ This is where the RO can reclaim their lost honor and purchase the M44 custom, t dollar_cost = 10 containertype = /obj/structure/largecrate/black_market -/datum/supply_packs/contraband/deep_storage/xm42b_pipe - name = "10x99mm XM42B casing" +/datum/supply_packs/contraband/deep_storage/xm43e1_pipe + name = "10x99mm XM43E1 casing" contains = list(/obj/item/prop/helmetgarb/bullet_pipe) dollar_cost = 10 containertype = /obj/structure/largecrate/black_market diff --git a/code/datums/supply_packs/spec_ammo.dm b/code/datums/supply_packs/spec_ammo.dm index 7931a4d40204..e20a5de865a3 100644 --- a/code/datums/supply_packs/spec_ammo.dm +++ b/code/datums/supply_packs/spec_ammo.dm @@ -109,10 +109,10 @@ containername = "M42A Incendiary Magazine Crate" group = "Weapons Specialist Ammo" -//XM42B - Disabled during testing per request. +//XM43E1 - Disabled during testing per request. /* /datum/supply_packs/ammo_amr_marksman - name = "XM42B anti-materiel rifle marksman magazines crate (x5)" + name = "XM43E1 anti-materiel rifle marksman magazines crate (x5)" contains = list( /obj/item/ammo_magazine/sniper/anti_materiel, /obj/item/ammo_magazine/sniper/anti_materiel, @@ -122,7 +122,7 @@ ) cost = 30 containertype = /obj/structure/closet/crate/ammo - containername = "XM42B Anti-Materiel Magazine Crate" + containername = "XM43E1 Anti-Materiel Magazine Crate" group = "Specialist Ammo" */ //M4RA diff --git a/code/game/objects/items/props/helmetgarb.dm b/code/game/objects/items/props/helmetgarb.dm index b20c5671503e..a694d50e82f6 100644 --- a/code/game/objects/items/props/helmetgarb.dm +++ b/code/game/objects/items/props/helmetgarb.dm @@ -502,8 +502,8 @@ icon_state = "trimmed_wire" /obj/item/prop/helmetgarb/bullet_pipe - name = "10x99mm XM42B casing pipe" - desc = "The XM42B was an experimental weapons platform briefly fielded by the USCM and Wey-Yu PMC teams. It was manufactured by ARMAT systems at the Atlas weapons facility. Unfortunately the project had its funding pulled alongside the M5 integrated gasmask program. This spent casing has been converted into a pipe, but there is too much tar in the mouthpiece for it to be useable." + name = "10x99mm XM43E1 casing pipe" + desc = "The XM43E1 was an experimental weapons platform briefly fielded by the USCM and Wey-Yu PMC teams. It was manufactured by ARMAT systems at the Atlas weapons facility. Unfortunately the project had its funding pulled alongside the M5 integrated gasmask program. This spent casing has been converted into a pipe, but there is too much tar in the mouthpiece for it to be useable." icon_state = "bullet_pipe" /obj/item/prop/helmetgarb/chaplain_patch diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index 4b937b0135b3..629f507f01ed 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -350,7 +350,7 @@ var/global/list/gear_datums_by_name = list() path = /obj/item/prop/helmetgarb/trimmed_wire /datum/gear/helmet_garb/bullet_pipe - display_name = "10x99mm XM42B casing pipe" + display_name = "10x99mm XM43E1 casing pipe" path = /obj/item/prop/helmetgarb/bullet_pipe allowed_origins = USCM_ORIGINS diff --git a/code/modules/projectiles/guns/specialist/sniper.dm b/code/modules/projectiles/guns/specialist/sniper.dm index 1e6e114fd6d2..3fe2934259bf 100644 --- a/code/modules/projectiles/guns/specialist/sniper.dm +++ b/code/modules/projectiles/guns/specialist/sniper.dm @@ -337,12 +337,12 @@ damage_mult = BASE_BULLET_DAMAGE_MULT recoil = RECOIL_AMOUNT_TIER_5 -/obj/item/weapon/gun/rifle/sniper/XM42B - name = "\improper XM42B experimental anti-materiel rifle" +/obj/item/weapon/gun/rifle/sniper/XM43E1 + name = "\improper XM43E1 experimental anti-materiel rifle" desc = "An experimental anti-materiel rifle produced by Armat Systems, recently reacquired from the deep storage of an abandoned prototyping facility. This one in particular is currently undergoing field testing. Chambered in 10x99mm Caseless." icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi' - icon_state = "xm42b" - item_state = "xm42b" + icon_state = "xm43e1" + item_state = "xm43e1" unacidable = TRUE indestructible = 1 @@ -358,7 +358,7 @@ sniper_beam_icon = "laser_beam_intense" sniper_lockon_icon = "sniper_lockon_intense" -/obj/item/weapon/gun/rifle/sniper/XM42B/handle_starting_attachment() +/obj/item/weapon/gun/rifle/sniper/XM43E1/handle_starting_attachment() ..() var/obj/item/attachable/scope/variable_zoom/S = new(src) S.icon_state = "pmcscope" @@ -368,11 +368,11 @@ update_attachable(S.slot) -/obj/item/weapon/gun/rifle/sniper/XM42B/set_gun_attachment_offsets() +/obj/item/weapon/gun/rifle/sniper/XM43E1/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 32, "muzzle_y" = 18,"rail_x" = 15, "rail_y" = 19, "under_x" = 20, "under_y" = 15, "stock_x" = 20, "stock_y" = 15) -/obj/item/weapon/gun/rifle/sniper/XM42B/set_gun_config_values() +/obj/item/weapon/gun/rifle/sniper/XM43E1/set_gun_config_values() ..() set_fire_delay(FIRE_DELAY_TIER_6 * 6 )//Big boy damage, but it takes a lot of time to fire a shot. //Kaga: Adjusted from 56 (Tier 4, 7*8) -> 30 (Tier 6, 5*6) ticks. 95 really wasn't big-boy damage anymore, although I updated it to 125 to remain consistent with the other 10x99mm caliber weapon (M42C). Now takes only twice as long as the M42A. @@ -382,7 +382,7 @@ damage_mult = BASE_BULLET_DAMAGE_MULT recoil = RECOIL_AMOUNT_TIER_1 -/obj/item/weapon/gun/rifle/sniper/XM42B/set_bullet_traits() +/obj/item/weapon/gun/rifle/sniper/XM43E1/set_bullet_traits() LAZYADD(traits_to_give, list( BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_iff), BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_penetrating), diff --git a/code/modules/projectiles/magazines/specialist.dm b/code/modules/projectiles/magazines/specialist.dm index 821273247f66..761e77305254 100644 --- a/code/modules/projectiles/magazines/specialist.dm +++ b/code/modules/projectiles/magazines/specialist.dm @@ -27,14 +27,14 @@ default_ammo = /datum/ammo/bullet/sniper/flak ammo_band_color = AMMO_BAND_COLOR_IMPACT -//M42B Magazine +//XM43E1 Magazine /obj/item/ammo_magazine/sniper/anti_materiel - name = "\improper XM42B marksman magazine (10x99mm)" + name = "\improper XM43E1 marksman magazine (10x99mm)" desc = "A magazine of caseless 10x99mm anti-materiel rounds." max_rounds = 8 caliber = "10x99mm" default_ammo = /datum/ammo/bullet/sniper/anti_materiel - gun_type = /obj/item/weapon/gun/rifle/sniper/XM42B + gun_type = /obj/item/weapon/gun/rifle/sniper/XM43E1 //M42C magazine diff --git a/icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi b/icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi index 38fe8079a2e82ac10d40e4f170f2e46192d65c6c..a7586a656965cb5709ecf1c82680202a267728ee 100644 GIT binary patch delta 708 zcmV;#0z3Wv`T_m=0gzIE6?ENpikx8DXfcj#!?yo^2igucMgCH83DVD>zr6SS{BlV? zr?V_4w~H(|NMmcgBU8dZg~8xwy>TyON+K2vUS$3J;*Ni;6HbyTxwr@ho7z}1B{Udp zjZpIV{0=;1>&NAM-Ng-*K1d~Z?tE2}DDIU`62%MY#jFy>wY7DBy6M9L%8H8!f7dK7e$_P&%(vJgWNJ zt$O+8R7k95BvLf%JbU=a{X|Q|Ly6qo`^N1J%;AbfsT+rXMfI2Bk@RjoV|Az0szbn&k5A)?Z zdrEuvC*Z_GlVXIl?+=!yuTc=eY7En&}bT#|l^C&uDrT=5m2`ddU!yLiZ$f~xr z_FtW^3${kW;xzQ%Gq32_->P597}jJRnr9^&|F_IGuW#LcXXHUQ2OuG*Fcguq1wdTR qcpy4wd{>OR_zwA#kg_2SE=ii-lG{ZV`~f7bn#}-71emh}1A2P-Nmz^k delta 708 zcmV;#0z3Wv`T_m=0gzIE2)b@NMJAXwYK$Y>uGRf^Y@;gAD857 zI>~Z!JIjKDG`7+^GA8^>81#Ns8~04cBw|7DSyoTa?)bwx;UpQ8i;JMQsf;CKLWADc z2qll-KY&HHdYDgFZCp?3gH&?o&Q~Rg;$G<_QM`~|%qn4AQ(32f>n<#ythk6E2-GSu z3RL4Uh{1Y=g+V~`&k+W%@XuKBmjAHLEx`fIr+68p4oj;HE^>gp+Fl zVt}3ypyE4-Xrhv^;%YYOoWf|dW`3Wd(VDdt5(|18S&QFfOlaIc>6EMc`NQN}-aVut z9r{CR7^8mb1)>^%#zI7k`l)4hH%+@=Br4Pk5a^ME+SdTNO#`g8QUTNmr=qn+&bZKS zFbYtcUEkbic}hN0XYs%vMmzw5xKi<;DD^>_qO7%*{^Omj(2d+7aRBLzp>$rUcu;l^ zx9k)zr$S;iBaxz6<=Nsh?-N}kF|3iddtbY~fjL~USnJw(Y~@rS$%=q6Dgts8Avvl!Lq?b*hD5LTer5!e_6V6=<30^f4Q5Cd z7?Opx*2>mm_XG$UWLE>_o*Pk=d+W67!UD=^o-QXpJ6=U6tn~j?bizu5OfW~VF|w>| zrTq`*+k&l;us99<@5~!I^tb9aGKMu-i{@F$#{Vrg^Xpr;-x+z(^#Mr8DGWJswgB+u qj0fB~