From bd26a6457449b14ff8e55eb6e860cae6f3234001 Mon Sep 17 00:00:00 2001 From: spaghetti Date: Tue, 31 Oct 2023 01:49:28 +0300 Subject: [PATCH 1/9] tweaks --- code/modules/projectiles/ammo_datums.dm | 4 +- code/modules/projectiles/guns/rifles.dm | 3 +- code/modules/reqs/supplypacks.dm | 4 +- .../code/modules/projectiles/guns/rifles.dm | 172 ++++++++++++++++++ .../projectiles/magazines/magazines.dm | 10 + .../code/modules/reqs/supplypacks.dm | 10 + modular_RUtgmc/icons/obj/items/ammo.dmi | Bin 48674 -> 49182 bytes 7 files changed, 198 insertions(+), 5 deletions(-) diff --git a/code/modules/projectiles/ammo_datums.dm b/code/modules/projectiles/ammo_datums.dm index 77fc5720a63cb..a2885bf743697 100644 --- a/code/modules/projectiles/ammo_datums.dm +++ b/code/modules/projectiles/ammo_datums.dm @@ -1270,7 +1270,7 @@ GLOBAL_LIST_INIT(no_sticky_resin, typecacheof(list(/obj/item/clothing/mask/faceh damage_falloff = 0.5 accurate_range = 25 accurate_range_min = 3 - +/* /datum/ammo/bullet/spottingrifle name = "smart spotting bullet" bullet_color = COLOR_SOFT_RED //Red bullets to indicate friendly fire restriction @@ -1337,7 +1337,7 @@ GLOBAL_LIST_INIT(no_sticky_resin, typecacheof(list(/obj/item/clothing/mask/faceh damage_type = BURN damage = 10 sundering = 0.5 - +*/ /datum/ammo/bullet/turret name = "autocannon bullet" bullet_color = COLOR_SOFT_RED diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm index bf8e941cfacc2..becee2088ed48 100644 --- a/code/modules/projectiles/guns/rifles.dm +++ b/code/modules/projectiles/guns/rifles.dm @@ -1252,6 +1252,7 @@ starting_attachment_types = list(/obj/item/attachable/stock/sgstock, /obj/item/attachable/sgbarrel, /obj/item/attachable/motiondetector, /obj/item/attachable/verticalgrip) //------------------------------------------------------- +/* //SG Target Rifle, has underbarreled spotting rifle that applies effects. /obj/item/weapon/gun/rifle/standard_smarttargetrifle @@ -1328,7 +1329,7 @@ accuracy_mult = 1.25 pixel_shift_x = 18 pixel_shift_y = 16 - +*/ //------------------------------------------------------- //Sectoid Rifle diff --git a/code/modules/reqs/supplypacks.dm b/code/modules/reqs/supplypacks.dm index ab44e76f76c02..d29121f2c3d47 100644 --- a/code/modules/reqs/supplypacks.dm +++ b/code/modules/reqs/supplypacks.dm @@ -617,10 +617,10 @@ WEAPONS contains = list(/obj/item/weapon/gun/rifle/standard_smarttargetrifle) cost = 400 -/datum/supply_packs/weapons/smarttarget_rifle_ammo +/*/datum/supply_packs/weapons/smarttarget_rifle_ammo name = "SG-62 smart target rifle ammo" contains = list(/obj/item/ammo_magazine/rifle/standard_smarttargetrifle) - cost = 35 + cost = 35*/ /datum/supply_packs/weapons/spotting_rifle_ammo name = "SG-153 spotting rifle ammo" diff --git a/modular_RUtgmc/code/modules/projectiles/guns/rifles.dm b/modular_RUtgmc/code/modules/projectiles/guns/rifles.dm index 1b9bfd409bd8f..98ef7b81073b6 100644 --- a/modular_RUtgmc/code/modules/projectiles/guns/rifles.dm +++ b/modular_RUtgmc/code/modules/projectiles/guns/rifles.dm @@ -54,3 +54,175 @@ accuracy_mult = 1.2 scatter = -5 scatter_unwielded = 60 + +//SG Target Rifle, has underbarreled spotting rifle that applies effects. + +/obj/item/weapon/gun/rifle/standard_smarttargetrifle + name = "\improper SG-62 Kauser-KT smart target rifle" + desc = "The Kauser-KT SG-62 is a IFF-capable rifle used by the TerraGov Marine Corps, coupled with a spotting rifle that is also IFF capable of applying various bullets with specialized ordnance, this is a gun with many answers to many situations... if you have the right ammo loaded. Requires special training and it cannot turn off IFF. It uses high velocity 10x27mm for the rifle and 12x66mm ammunition for the underslung rifle." + icon = 'icons/Marine/gun64.dmi' + icon_state = "sg62" + item_state = "sg62" + caliber = CALIBER_10x27_CASELESS //codex + max_shells = 40 //codex + aim_slowdown = 0.85 + wield_delay = 0.65 SECONDS + fire_sound = 'sound/weapons/guns/fire/t62.ogg' + dry_fire_sound = 'sound/weapons/guns/fire/m41a_empty.ogg' + unload_sound = 'sound/weapons/guns/interact/T42_unload.ogg' + reload_sound = 'sound/weapons/guns/interact/T42_reload.ogg' + default_ammo_type = /obj/item/ammo_magazine/rifle/standard_smarttargetrifle + allowed_ammo_types = list(/obj/item/ammo_magazine/rifle/standard_smarttargetrifle) + attachable_allowed = list( + /obj/item/attachable/reddot, + /obj/item/attachable/flashlight, + /obj/item/attachable/magnetic_harness, + /obj/item/attachable/scope/mini, + /obj/item/attachable/scope/marine, + /obj/item/weapon/gun/rifle/standard_spottingrifle, + /obj/item/attachable/stock/strstock, + /obj/item/attachable/motiondetector, + /obj/item/attachable/buildasentry, + /obj/item/attachable/shoulder_mount, + ) + + flags_gun_features = GUN_AMMO_COUNTER|GUN_WIELDED_FIRING_ONLY|GUN_IFF|GUN_SMOKE_PARTICLES + gun_firemode_list = list(GUN_FIREMODE_AUTOMATIC) + gun_skill_category = SKILL_SMARTGUN //Uses SG skill for the penalties. + attachable_offset = list("muzzle_x" = 12, "muzzle_y" = 22, "rail_x" = 15, "rail_y" = 22, "under_x" = 28, "under_y" = 16, "stock_x" = 12, "stock_y" = 14) + starting_attachment_types = list(/obj/item/weapon/gun/rifle/standard_spottingrifle, /obj/item/attachable/stock/strstock) + + fire_delay = 0.5 SECONDS + burst_amount = 0 + accuracy_mult_unwielded = 0.4 + accuracy_mult = 1.1 + scatter = 0 + scatter_unwielded = 20 + movement_acc_penalty_mult = 8 + + placed_overlay_iconstate = "smartgun" + +/obj/item/weapon/gun/rifle/standard_spottingrifle + name = "SG-153 spotting rifle" + desc = "An underslung spotting rifle, generally found ontop of another gun." + icon_state = "sg153" + icon = 'icons/Marine/gun64.dmi' + fire_sound = 'sound/weapons/guns/fire/spottingrifle.ogg' + caliber = CALIBER_12x7 + slot = ATTACHMENT_SLOT_UNDER + max_shells = 5 + default_ammo_type =/obj/item/ammo_magazine/rifle/standard_spottingrifle + allowed_ammo_types = list( + /obj/item/ammo_magazine/rifle/standard_spottingrifle, + /obj/item/ammo_magazine/rifle/standard_spottingrifle/highimpact, + /obj/item/ammo_magazine/rifle/standard_spottingrifle/heavyrubber, + /obj/item/ammo_magazine/rifle/standard_spottingrifle/plasmaloss, + /obj/item/ammo_magazine/rifle/standard_spottingrifle/tungsten, + /obj/item/ammo_magazine/rifle/standard_spottingrifle/incendiary, + /obj/item/ammo_magazine/rifle/standard_spottingrifle/flak, + ) + force = 5 + attachable_allowed = list() + actions_types = list() + gun_firemode_list = list(GUN_FIREMODE_SEMIAUTO) + flags_gun_features = GUN_IS_ATTACHMENT|GUN_WIELDED_FIRING_ONLY|GUN_ATTACHMENT_FIRE_ONLY|GUN_AMMO_COUNTER|GUN_IFF|GUN_SMOKE_PARTICLES + flags_attach_features = NONE + fire_delay = 1 SECONDS + accuracy_mult = 1.5 + pixel_shift_x = 18 + pixel_shift_y = 16 + +/datum/ammo/bullet/spottingrifle + name = "smart spotting bullet" + bullet_color = COLOR_SOFT_RED //Red bullets to indicate friendly fire restriction + hud_state = "spotrifle" + hud_state_empty = "smartgun_empty" + flags_ammo_behavior = AMMO_BALLISTIC|AMMO_SUNDERING + damage = 50 + penetration = 25 + sundering = 5 + shell_speed = 4 + max_range = 6 + +/datum/ammo/bullet/spottingrifle/highimpact + name = "smart high-impact spotting bullet" + hud_state = "spotrifle_impact" + damage = 10 + sundering = 0.5 + +/datum/ammo/bullet/spottingrifle/highimpact/on_hit_mob(mob/M,obj/projectile/P) + staggerstun(M, P, stagger = 1 SECONDS, slowdown = 1 SECONDS, max_range = 6) + +/datum/ammo/bullet/spottingrifle/heavyrubber + name = "smart heavy-rubber spotting bullet" + hud_state = "spotrifle_rubber" + damage = 10 + sundering = 0.5 + +/datum/ammo/bullet/spottingrifle/heavyrubber/on_hit_mob(mob/M,obj/projectile/P) + staggerstun(M, P, slowdown = 2 SECONDS, max_range = 6) + +/datum/ammo/bullet/spottingrifle/plasmaloss + name = "smart tanglefoot spotting bullet" + hud_state = "spotrifle_plasmaloss" + damage = 10 + sundering = 0.5 + + var/datum/effect_system/smoke_spread/smoke_system + +/datum/ammo/bullet/spottingrifle/plasmaloss/on_hit_mob(mob/living/victim, obj/projectile/proj) + if(isxeno(victim)) + var/mob/living/carbon/xenomorph/X = victim + X.use_plasma(20 + 0.2 * X.xeno_caste.plasma_max * X.xeno_caste.plasma_regen_limit) // This is draining 20%+20 flat per hit. + var/datum/effect_system/smoke_spread/plasmaloss/S = new + S.set_up(0, victim, 3) + S.start() + +/datum/ammo/bullet/spottingrifle/plasmaloss/on_hit_obj(obj/O, obj/projectile/P) + var/turf/T = get_turf(O) + drop_tg_smoke(T.density ? P.loc : T) + +/datum/ammo/bullet/spottingrifle/plasmaloss/on_hit_turf(turf/T, obj/projectile/P) + drop_tg_smoke(T.density ? P.loc : T) + +/datum/ammo/bullet/spottingrifle/plasmaloss/do_at_max_range(turf/T, obj/projectile/P) + drop_tg_smoke(T.density ? P.loc : T) + +/datum/ammo/bullet/spottingrifle/plasmaloss/set_smoke() + smoke_system = new /datum/effect_system/smoke_spread/plasmaloss() + +/datum/ammo/bullet/spottingrifle/plasmaloss/proc/drop_tg_smoke(turf/T) + if(T.density) + return + + set_smoke() + smoke_system.set_up(0, T, 3) + smoke_system.start() + smoke_system = null + +/datum/ammo/bullet/spottingrifle/tungsten + name = "smart tungsten spotting bullet" + hud_state = "spotrifle_tungsten" + damage = 10 + sundering = 0.5 + +/datum/ammo/bullet/spottingrifle/tungsten/on_hit_mob(mob/M,obj/projectile/P) + staggerstun(M, P, stun = 0.5 SECONDS, knockback = 1 SECONDS, max_range = 6) + +/datum/ammo/bullet/spottingrifle/flak + name = "smart flak spotting bullet" + hud_state = "spotrifle_flak" + damage = 60 + sundering = 0.5 + airburst_multiplier = 0.5 + +/datum/ammo/bullet/spottingrifle/flak/on_hit_mob(mob/victim, obj/projectile/proj) + airburst(victim, proj) + +/datum/ammo/bullet/spottingrifle/incendiary + name = "smart incendiary spotting bullet" + hud_state = "spotrifle_incend" + flags_ammo_behavior = AMMO_BALLISTIC|AMMO_INCENDIARY + damage_type = BURN + damage = 10 + sundering = 0.5 diff --git a/modular_RUtgmc/code/modules/projectiles/magazines/magazines.dm b/modular_RUtgmc/code/modules/projectiles/magazines/magazines.dm index 281ed3e821ecc..eec24f5309530 100644 --- a/modular_RUtgmc/code/modules/projectiles/magazines/magazines.dm +++ b/modular_RUtgmc/code/modules/projectiles/magazines/magazines.dm @@ -173,3 +173,13 @@ desc = "A packet containing 125 rounds of 10x20mm caseless." icon_state = "box_10x20mm_ap" default_ammo = /datum/ammo/bullet/smg/ap + +/obj/item/ammo_magazine/packet/sg62_rifle + name = "box of 10x27mm" + desc = "A box containing 200 rounds of 10x27mm caseless." + icon = 'modular_RUtgmc/icons/obj/items/ammo.dmi' + icon_state = "box_sg62" + default_ammo = /datum/ammo/bullet/smarttargetrifle + caliber = CALIBER_10x27_CASELESS + current_rounds = 200 + max_rounds = 200 diff --git a/modular_RUtgmc/code/modules/reqs/supplypacks.dm b/modular_RUtgmc/code/modules/reqs/supplypacks.dm index f05ae17f3712c..f3aeb7fe49786 100644 --- a/modular_RUtgmc/code/modules/reqs/supplypacks.dm +++ b/modular_RUtgmc/code/modules/reqs/supplypacks.dm @@ -175,3 +175,13 @@ name = "SG-85 Minigun Powerpack" contains = list(/obj/item/ammo_magazine/minigun_powerpack/smartgun) cost = 150 + +/datum/supply_packs/weapons/smarttarget_rifle_ammo + name = "SG-62 smart target rifle ammo" + contains = list(/obj/item/ammo_magazine/rifle/standard_smarttargetrifle) + cost = 25 + +/datum/supply_packs/weapons/box_10x27mm + name = "SG-62 smart target rifle ammo box" + contains = list(/obj/item/ammo_magazine/packet/sg62_rifle) + cost = 50 diff --git a/modular_RUtgmc/icons/obj/items/ammo.dmi b/modular_RUtgmc/icons/obj/items/ammo.dmi index 16133183aebdadfb6dc318feab04eae20d90cd33..579f728b81edbd7905366abef73c89379e0aa772 100644 GIT binary patch delta 6455 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 R%L+hhI$8#r#Ts^D{{zxUr(ysA delta 5943 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 HD)fH Date: Tue, 31 Oct 2023 01:52:19 +0300 Subject: [PATCH 2/9] upd --- modular_RUtgmc/code/modules/projectiles/guns/rifles.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_RUtgmc/code/modules/projectiles/guns/rifles.dm b/modular_RUtgmc/code/modules/projectiles/guns/rifles.dm index 98ef7b81073b6..838b4dc99cc3b 100644 --- a/modular_RUtgmc/code/modules/projectiles/guns/rifles.dm +++ b/modular_RUtgmc/code/modules/projectiles/guns/rifles.dm @@ -92,7 +92,7 @@ attachable_offset = list("muzzle_x" = 12, "muzzle_y" = 22, "rail_x" = 15, "rail_y" = 22, "under_x" = 28, "under_y" = 16, "stock_x" = 12, "stock_y" = 14) starting_attachment_types = list(/obj/item/weapon/gun/rifle/standard_spottingrifle, /obj/item/attachable/stock/strstock) - fire_delay = 0.5 SECONDS + fire_delay = 0.3 SECONDS burst_amount = 0 accuracy_mult_unwielded = 0.4 accuracy_mult = 1.1 From a629e6a0c3718de6173af3d94ca3bba23963a28c Mon Sep 17 00:00:00 2001 From: spaghetti Date: Tue, 31 Oct 2023 15:48:34 +0300 Subject: [PATCH 3/9] upd --- code/modules/projectiles/ammo_datums.dm | 4 ++-- code/modules/projectiles/guns/rifles.dm | 2 -- modular_RUtgmc/code/modules/projectiles/guns/rifles.dm | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/code/modules/projectiles/ammo_datums.dm b/code/modules/projectiles/ammo_datums.dm index a2885bf743697..77fc5720a63cb 100644 --- a/code/modules/projectiles/ammo_datums.dm +++ b/code/modules/projectiles/ammo_datums.dm @@ -1270,7 +1270,7 @@ GLOBAL_LIST_INIT(no_sticky_resin, typecacheof(list(/obj/item/clothing/mask/faceh damage_falloff = 0.5 accurate_range = 25 accurate_range_min = 3 -/* + /datum/ammo/bullet/spottingrifle name = "smart spotting bullet" bullet_color = COLOR_SOFT_RED //Red bullets to indicate friendly fire restriction @@ -1337,7 +1337,7 @@ GLOBAL_LIST_INIT(no_sticky_resin, typecacheof(list(/obj/item/clothing/mask/faceh damage_type = BURN damage = 10 sundering = 0.5 -*/ + /datum/ammo/bullet/turret name = "autocannon bullet" bullet_color = COLOR_SOFT_RED diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm index becee2088ed48..bc65617d1ddce 100644 --- a/code/modules/projectiles/guns/rifles.dm +++ b/code/modules/projectiles/guns/rifles.dm @@ -1252,7 +1252,6 @@ starting_attachment_types = list(/obj/item/attachable/stock/sgstock, /obj/item/attachable/sgbarrel, /obj/item/attachable/motiondetector, /obj/item/attachable/verticalgrip) //------------------------------------------------------- -/* //SG Target Rifle, has underbarreled spotting rifle that applies effects. /obj/item/weapon/gun/rifle/standard_smarttargetrifle @@ -1329,7 +1328,6 @@ accuracy_mult = 1.25 pixel_shift_x = 18 pixel_shift_y = 16 -*/ //------------------------------------------------------- //Sectoid Rifle diff --git a/modular_RUtgmc/code/modules/projectiles/guns/rifles.dm b/modular_RUtgmc/code/modules/projectiles/guns/rifles.dm index 838b4dc99cc3b..bb5033c430b28 100644 --- a/modular_RUtgmc/code/modules/projectiles/guns/rifles.dm +++ b/modular_RUtgmc/code/modules/projectiles/guns/rifles.dm @@ -92,7 +92,7 @@ attachable_offset = list("muzzle_x" = 12, "muzzle_y" = 22, "rail_x" = 15, "rail_y" = 22, "under_x" = 28, "under_y" = 16, "stock_x" = 12, "stock_y" = 14) starting_attachment_types = list(/obj/item/weapon/gun/rifle/standard_spottingrifle, /obj/item/attachable/stock/strstock) - fire_delay = 0.3 SECONDS + fire_delay = 0.4 SECONDS burst_amount = 0 accuracy_mult_unwielded = 0.4 accuracy_mult = 1.1 @@ -207,7 +207,7 @@ sundering = 0.5 /datum/ammo/bullet/spottingrifle/tungsten/on_hit_mob(mob/M,obj/projectile/P) - staggerstun(M, P, stun = 0.5 SECONDS, knockback = 1 SECONDS, max_range = 6) + staggerstun(M, P, stun = 1 SECONDS, knockback = 1, max_range = 6) /datum/ammo/bullet/spottingrifle/flak name = "smart flak spotting bullet" From e398c40cfa82b558fcda677187fcd3317e288e4e Mon Sep 17 00:00:00 2001 From: spaghetti Date: Tue, 31 Oct 2023 16:12:03 +0300 Subject: [PATCH 4/9] upd --- .../code/modules/projectiles/guns/rifles.dm | 117 ------------------ 1 file changed, 117 deletions(-) diff --git a/modular_RUtgmc/code/modules/projectiles/guns/rifles.dm b/modular_RUtgmc/code/modules/projectiles/guns/rifles.dm index bb5033c430b28..c49739befd3b3 100644 --- a/modular_RUtgmc/code/modules/projectiles/guns/rifles.dm +++ b/modular_RUtgmc/code/modules/projectiles/guns/rifles.dm @@ -58,116 +58,22 @@ //SG Target Rifle, has underbarreled spotting rifle that applies effects. /obj/item/weapon/gun/rifle/standard_smarttargetrifle - name = "\improper SG-62 Kauser-KT smart target rifle" - desc = "The Kauser-KT SG-62 is a IFF-capable rifle used by the TerraGov Marine Corps, coupled with a spotting rifle that is also IFF capable of applying various bullets with specialized ordnance, this is a gun with many answers to many situations... if you have the right ammo loaded. Requires special training and it cannot turn off IFF. It uses high velocity 10x27mm for the rifle and 12x66mm ammunition for the underslung rifle." - icon = 'icons/Marine/gun64.dmi' - icon_state = "sg62" - item_state = "sg62" - caliber = CALIBER_10x27_CASELESS //codex - max_shells = 40 //codex - aim_slowdown = 0.85 - wield_delay = 0.65 SECONDS - fire_sound = 'sound/weapons/guns/fire/t62.ogg' - dry_fire_sound = 'sound/weapons/guns/fire/m41a_empty.ogg' - unload_sound = 'sound/weapons/guns/interact/T42_unload.ogg' - reload_sound = 'sound/weapons/guns/interact/T42_reload.ogg' - default_ammo_type = /obj/item/ammo_magazine/rifle/standard_smarttargetrifle - allowed_ammo_types = list(/obj/item/ammo_magazine/rifle/standard_smarttargetrifle) - attachable_allowed = list( - /obj/item/attachable/reddot, - /obj/item/attachable/flashlight, - /obj/item/attachable/magnetic_harness, - /obj/item/attachable/scope/mini, - /obj/item/attachable/scope/marine, - /obj/item/weapon/gun/rifle/standard_spottingrifle, - /obj/item/attachable/stock/strstock, - /obj/item/attachable/motiondetector, - /obj/item/attachable/buildasentry, - /obj/item/attachable/shoulder_mount, - ) - - flags_gun_features = GUN_AMMO_COUNTER|GUN_WIELDED_FIRING_ONLY|GUN_IFF|GUN_SMOKE_PARTICLES - gun_firemode_list = list(GUN_FIREMODE_AUTOMATIC) - gun_skill_category = SKILL_SMARTGUN //Uses SG skill for the penalties. - attachable_offset = list("muzzle_x" = 12, "muzzle_y" = 22, "rail_x" = 15, "rail_y" = 22, "under_x" = 28, "under_y" = 16, "stock_x" = 12, "stock_y" = 14) - starting_attachment_types = list(/obj/item/weapon/gun/rifle/standard_spottingrifle, /obj/item/attachable/stock/strstock) - fire_delay = 0.4 SECONDS - burst_amount = 0 - accuracy_mult_unwielded = 0.4 - accuracy_mult = 1.1 - scatter = 0 - scatter_unwielded = 20 - movement_acc_penalty_mult = 8 - - placed_overlay_iconstate = "smartgun" /obj/item/weapon/gun/rifle/standard_spottingrifle - name = "SG-153 spotting rifle" - desc = "An underslung spotting rifle, generally found ontop of another gun." - icon_state = "sg153" - icon = 'icons/Marine/gun64.dmi' - fire_sound = 'sound/weapons/guns/fire/spottingrifle.ogg' - caliber = CALIBER_12x7 - slot = ATTACHMENT_SLOT_UNDER - max_shells = 5 - default_ammo_type =/obj/item/ammo_magazine/rifle/standard_spottingrifle - allowed_ammo_types = list( - /obj/item/ammo_magazine/rifle/standard_spottingrifle, - /obj/item/ammo_magazine/rifle/standard_spottingrifle/highimpact, - /obj/item/ammo_magazine/rifle/standard_spottingrifle/heavyrubber, - /obj/item/ammo_magazine/rifle/standard_spottingrifle/plasmaloss, - /obj/item/ammo_magazine/rifle/standard_spottingrifle/tungsten, - /obj/item/ammo_magazine/rifle/standard_spottingrifle/incendiary, - /obj/item/ammo_magazine/rifle/standard_spottingrifle/flak, - ) - force = 5 - attachable_allowed = list() - actions_types = list() - gun_firemode_list = list(GUN_FIREMODE_SEMIAUTO) - flags_gun_features = GUN_IS_ATTACHMENT|GUN_WIELDED_FIRING_ONLY|GUN_ATTACHMENT_FIRE_ONLY|GUN_AMMO_COUNTER|GUN_IFF|GUN_SMOKE_PARTICLES - flags_attach_features = NONE - fire_delay = 1 SECONDS accuracy_mult = 1.5 - pixel_shift_x = 18 - pixel_shift_y = 16 /datum/ammo/bullet/spottingrifle - name = "smart spotting bullet" - bullet_color = COLOR_SOFT_RED //Red bullets to indicate friendly fire restriction - hud_state = "spotrifle" - hud_state_empty = "smartgun_empty" - flags_ammo_behavior = AMMO_BALLISTIC|AMMO_SUNDERING - damage = 50 - penetration = 25 - sundering = 5 - shell_speed = 4 max_range = 6 -/datum/ammo/bullet/spottingrifle/highimpact - name = "smart high-impact spotting bullet" - hud_state = "spotrifle_impact" - damage = 10 - sundering = 0.5 /datum/ammo/bullet/spottingrifle/highimpact/on_hit_mob(mob/M,obj/projectile/P) staggerstun(M, P, stagger = 1 SECONDS, slowdown = 1 SECONDS, max_range = 6) -/datum/ammo/bullet/spottingrifle/heavyrubber - name = "smart heavy-rubber spotting bullet" - hud_state = "spotrifle_rubber" - damage = 10 - sundering = 0.5 - /datum/ammo/bullet/spottingrifle/heavyrubber/on_hit_mob(mob/M,obj/projectile/P) staggerstun(M, P, slowdown = 2 SECONDS, max_range = 6) /datum/ammo/bullet/spottingrifle/plasmaloss - name = "smart tanglefoot spotting bullet" - hud_state = "spotrifle_plasmaloss" - damage = 10 - sundering = 0.5 - var/datum/effect_system/smoke_spread/smoke_system /datum/ammo/bullet/spottingrifle/plasmaloss/on_hit_mob(mob/living/victim, obj/projectile/proj) @@ -200,29 +106,6 @@ smoke_system.start() smoke_system = null -/datum/ammo/bullet/spottingrifle/tungsten - name = "smart tungsten spotting bullet" - hud_state = "spotrifle_tungsten" - damage = 10 - sundering = 0.5 - /datum/ammo/bullet/spottingrifle/tungsten/on_hit_mob(mob/M,obj/projectile/P) staggerstun(M, P, stun = 1 SECONDS, knockback = 1, max_range = 6) -/datum/ammo/bullet/spottingrifle/flak - name = "smart flak spotting bullet" - hud_state = "spotrifle_flak" - damage = 60 - sundering = 0.5 - airburst_multiplier = 0.5 - -/datum/ammo/bullet/spottingrifle/flak/on_hit_mob(mob/victim, obj/projectile/proj) - airburst(victim, proj) - -/datum/ammo/bullet/spottingrifle/incendiary - name = "smart incendiary spotting bullet" - hud_state = "spotrifle_incend" - flags_ammo_behavior = AMMO_BALLISTIC|AMMO_INCENDIARY - damage_type = BURN - damage = 10 - sundering = 0.5 From 210eee379acbf931aff50a7a9bef419ca7a69f38 Mon Sep 17 00:00:00 2001 From: spaghetti Date: Tue, 31 Oct 2023 16:14:01 +0300 Subject: [PATCH 5/9] upd --- code/modules/reqs/supplypacks.dm | 4 ++-- modular_RUtgmc/code/modules/reqs/supplypacks.dm | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/code/modules/reqs/supplypacks.dm b/code/modules/reqs/supplypacks.dm index d29121f2c3d47..ab44e76f76c02 100644 --- a/code/modules/reqs/supplypacks.dm +++ b/code/modules/reqs/supplypacks.dm @@ -617,10 +617,10 @@ WEAPONS contains = list(/obj/item/weapon/gun/rifle/standard_smarttargetrifle) cost = 400 -/*/datum/supply_packs/weapons/smarttarget_rifle_ammo +/datum/supply_packs/weapons/smarttarget_rifle_ammo name = "SG-62 smart target rifle ammo" contains = list(/obj/item/ammo_magazine/rifle/standard_smarttargetrifle) - cost = 35*/ + cost = 35 /datum/supply_packs/weapons/spotting_rifle_ammo name = "SG-153 spotting rifle ammo" diff --git a/modular_RUtgmc/code/modules/reqs/supplypacks.dm b/modular_RUtgmc/code/modules/reqs/supplypacks.dm index f3aeb7fe49786..57b84865cabac 100644 --- a/modular_RUtgmc/code/modules/reqs/supplypacks.dm +++ b/modular_RUtgmc/code/modules/reqs/supplypacks.dm @@ -177,8 +177,6 @@ cost = 150 /datum/supply_packs/weapons/smarttarget_rifle_ammo - name = "SG-62 smart target rifle ammo" - contains = list(/obj/item/ammo_magazine/rifle/standard_smarttargetrifle) cost = 25 /datum/supply_packs/weapons/box_10x27mm From dfd9f1f2a108aa66f027a4bd67ee18a22ae9e35e Mon Sep 17 00:00:00 2001 From: spaghetti <48985748+definitelynotspaghetti@users.noreply.github.com> Date: Tue, 31 Oct 2023 16:21:32 +0300 Subject: [PATCH 6/9] upd --- code/modules/projectiles/guns/rifles.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm index bc65617d1ddce..bf8e941cfacc2 100644 --- a/code/modules/projectiles/guns/rifles.dm +++ b/code/modules/projectiles/guns/rifles.dm @@ -1328,6 +1328,7 @@ accuracy_mult = 1.25 pixel_shift_x = 18 pixel_shift_y = 16 + //------------------------------------------------------- //Sectoid Rifle From 21e3b66ee96c87d5cb995adf87efa50c977eb32f Mon Sep 17 00:00:00 2001 From: spaghetti <48985748+definitelynotspaghetti@users.noreply.github.com> Date: Tue, 31 Oct 2023 21:41:58 +0300 Subject: [PATCH 7/9] Upd --- modular_RUtgmc/code/modules/projectiles/guns/rifles.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modular_RUtgmc/code/modules/projectiles/guns/rifles.dm b/modular_RUtgmc/code/modules/projectiles/guns/rifles.dm index c49739befd3b3..5f622e998bab8 100644 --- a/modular_RUtgmc/code/modules/projectiles/guns/rifles.dm +++ b/modular_RUtgmc/code/modules/projectiles/guns/rifles.dm @@ -68,10 +68,10 @@ /datum/ammo/bullet/spottingrifle/highimpact/on_hit_mob(mob/M,obj/projectile/P) - staggerstun(M, P, stagger = 1 SECONDS, slowdown = 1 SECONDS, max_range = 6) + staggerstun(M, P, stagger = 3, slowdown = 1, max_range = 6) /datum/ammo/bullet/spottingrifle/heavyrubber/on_hit_mob(mob/M,obj/projectile/P) - staggerstun(M, P, slowdown = 2 SECONDS, max_range = 6) + staggerstun(M, P, slowdown = 2, max_range = 6) /datum/ammo/bullet/spottingrifle/plasmaloss var/datum/effect_system/smoke_spread/smoke_system From 9d935e938b894ec4ec4e1686a5836ffc7b7f3f7d Mon Sep 17 00:00:00 2001 From: spaghetti Date: Thu, 2 Nov 2023 14:07:50 +0300 Subject: [PATCH 8/9] upd --- .../code/modules/projectiles/guns/rifles.dm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modular_RUtgmc/code/modules/projectiles/guns/rifles.dm b/modular_RUtgmc/code/modules/projectiles/guns/rifles.dm index 5f622e998bab8..1d8e517a83de2 100644 --- a/modular_RUtgmc/code/modules/projectiles/guns/rifles.dm +++ b/modular_RUtgmc/code/modules/projectiles/guns/rifles.dm @@ -62,16 +62,17 @@ /obj/item/weapon/gun/rifle/standard_spottingrifle accuracy_mult = 1.5 + scatter = -5 /datum/ammo/bullet/spottingrifle - max_range = 6 - + accurate_range = 10 + max_range = 12 /datum/ammo/bullet/spottingrifle/highimpact/on_hit_mob(mob/M,obj/projectile/P) - staggerstun(M, P, stagger = 3, slowdown = 1, max_range = 6) + staggerstun(M, P, stagger = 3, slowdown = 1, max_range = 12) /datum/ammo/bullet/spottingrifle/heavyrubber/on_hit_mob(mob/M,obj/projectile/P) - staggerstun(M, P, slowdown = 2, max_range = 6) + staggerstun(M, P, slowdown = 3, max_range = 12) /datum/ammo/bullet/spottingrifle/plasmaloss var/datum/effect_system/smoke_spread/smoke_system @@ -107,5 +108,5 @@ smoke_system = null /datum/ammo/bullet/spottingrifle/tungsten/on_hit_mob(mob/M,obj/projectile/P) - staggerstun(M, P, stun = 1 SECONDS, knockback = 1, max_range = 6) + staggerstun(M, P, weaken = 2 SECONDS, stagger = 2, knockback = 1, max_range = 12) From 6d68cb42d8448b146902adce539a479fcceb126b Mon Sep 17 00:00:00 2001 From: spaghetti Date: Fri, 3 Nov 2023 15:12:26 +0300 Subject: [PATCH 9/9] upd --- modular_RUtgmc/code/modules/projectiles/guns/rifles.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modular_RUtgmc/code/modules/projectiles/guns/rifles.dm b/modular_RUtgmc/code/modules/projectiles/guns/rifles.dm index 1d8e517a83de2..8fb3d2c88cc29 100644 --- a/modular_RUtgmc/code/modules/projectiles/guns/rifles.dm +++ b/modular_RUtgmc/code/modules/projectiles/guns/rifles.dm @@ -69,7 +69,7 @@ max_range = 12 /datum/ammo/bullet/spottingrifle/highimpact/on_hit_mob(mob/M,obj/projectile/P) - staggerstun(M, P, stagger = 3, slowdown = 1, max_range = 12) + staggerstun(M, P, stagger = 3 SECONDS, slowdown = 1, max_range = 12) /datum/ammo/bullet/spottingrifle/heavyrubber/on_hit_mob(mob/M,obj/projectile/P) staggerstun(M, P, slowdown = 3, max_range = 12) @@ -108,5 +108,5 @@ smoke_system = null /datum/ammo/bullet/spottingrifle/tungsten/on_hit_mob(mob/M,obj/projectile/P) - staggerstun(M, P, weaken = 2 SECONDS, stagger = 2, knockback = 1, max_range = 12) + staggerstun(M, P, weaken = 2 SECONDS, stagger = 2 SECONDS, knockback = 1, max_range = 12)