From a3facf35abe77ee38d035f3c5172bb0c7655bfb7 Mon Sep 17 00:00:00 2001 From: AndroBetel <44546836+AndroBetel@users.noreply.github.com> Date: Sun, 28 Jul 2024 20:25:49 +0300 Subject: [PATCH] 21212 --- code/datums/skills/uscm.dm | 2 +- code/modules/gear_presets/clf.dm | 18 +++++++++--------- code/modules/projectiles/guns/boltaction.dm | 4 ++++ 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/code/datums/skills/uscm.dm b/code/datums/skills/uscm.dm index 6e7cf2e648..5fad7b217f 100644 --- a/code/datums/skills/uscm.dm +++ b/code/datums/skills/uscm.dm @@ -62,7 +62,7 @@ United States Colonial Marines SKILL_SPEC_WEAPONS = SKILL_SPEC_TRAINED, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, - SKILL_JTAC = SKILL_JTAC_BEGINNER + SKILL_JTAC = SKILL_JTAC_BEGINNER, ) /datum/skills/tl diff --git a/code/modules/gear_presets/clf.dm b/code/modules/gear_presets/clf.dm index e062081d38..581666cd14 100644 --- a/code/modules/gear_presets/clf.dm +++ b/code/modules/gear_presets/clf.dm @@ -181,7 +181,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/gray(new_human), WEAR_FACE) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/upp(new_human), WEAR_WAIST) - var/gun = pick("pps43", "mp5", "mp27") + var/gun = pick("pps43", "bolt", "mp27") switch(gun) if("pps43") new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/pps43/extended_mag(new_human), WEAR_J_STORE) @@ -190,15 +190,15 @@ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/pps43(new_human), WEAR_IN_BELT) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/pps43(new_human), WEAR_IN_BELT) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/pps43(new_human), WEAR_IN_BELT) - if("mp5") - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/mp5(new_human), WEAR_J_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5(new_human), WEAR_IN_BELT) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5(new_human), WEAR_IN_BELT) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5(new_human), WEAR_IN_BELT) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5(new_human), WEAR_IN_BELT) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5(new_human), WEAR_IN_BELT) + if("bolt") + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/boltaction/infantry(new_human), WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/boltaction(new_human), WEAR_IN_BELT) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/boltaction(new_human), WEAR_IN_BELT) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/boltaction(new_human), WEAR_IN_BELT) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/boltaction(new_human), WEAR_IN_BELT) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/boltaction(new_human), WEAR_IN_BELT) if("mp27") - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/mp27 (new_human), WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/mp27(new_human), WEAR_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp27(new_human), WEAR_IN_BELT) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp27(new_human), WEAR_IN_BELT) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp27(new_human), WEAR_IN_BELT) diff --git a/code/modules/projectiles/guns/boltaction.dm b/code/modules/projectiles/guns/boltaction.dm index 715aad26b6..8b1e9b408f 100644 --- a/code/modules/projectiles/guns/boltaction.dm +++ b/code/modules/projectiles/guns/boltaction.dm @@ -24,6 +24,7 @@ /obj/item/attachable/bayonet, /obj/item/attachable/bayonet/co2, /obj/item/attachable/bayonet/upp, + /obj/item/attachable/bayonet/upp_replica, /obj/item/attachable/scope, /obj/item/attachable/scope/mini, /obj/item/attachable/scope/mini/hunting, @@ -119,6 +120,9 @@ /obj/item/weapon/gun/boltaction/sniper starting_attachment_types = list(/obj/item/attachable/stock/hunting, /obj/item/attachable/scope) +/obj/item/weapon/gun/boltaction/infantry + starting_attachment_types = list(/obj/item/attachable/stock/hunting, /obj/item/attachable/bayonet/upp_replica) + /obj/item/weapon/gun/boltaction/vulture name = "\improper M707 \"Vulture\" anti-materiel rifle" desc = "The M707 is a crude but highly powerful rifle, designed for disabling lightly armored vehicles and hitting targets inside buildings. Its unwieldy scope and caliber necessitates a spotter to be fully effective, suffering severe scope drift without one."