diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm index 1c7e0ac5b72..d25daa7a766 100644 --- a/code/modules/projectiles/guns/ballistic/rifle.dm +++ b/code/modules/projectiles/guns/ballistic/rifle.dm @@ -611,6 +611,14 @@ ) reskinnable_component = /datum/component/reskinnable/gras +/obj/item/gun/ballistic/rifle/antique/gras/laserfusil + name = "Fusil Energie" + desc = "A very old black powder cartridge gun of French lineage. How has it gotten here? Or survived this long? Someone tore out it's internals and built a laser musket into it." + icon_state = "madsenm47FE" + fire_sound = 'sound/f13weapons/lasmusket_fire.ogg' + mag_type = /obj/item/ammo_box/magazine/internal/shot/lasmusket/mosin + damage_multiplier = GUN_EXTRA_DAMAGE_0 + /* * * * * * * * * * * * Salvaged Eastern Rifle * Fixed-mag semi-auto rifle diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm index 8fa5b0eea0e..e4d196b0a40 100644 --- a/modular_citadel/code/modules/client/loadout/__donator.dm +++ b/modular_citadel/code/modules/client/loadout/__donator.dm @@ -695,15 +695,14 @@ new /obj/item/gun/ballistic/rifle/repeater/volcanic(src) /datum/gear/donator/kits/jaggachi_5 - name = "Army Service Kit" + name = "Laser Service Kit" path = /obj/item/storage/box/large/custom_kit/jaggachi_5 ckeywhitelist = list("jaggachi") /obj/item/storage/box/large/custom_kit/jaggachi_5/PopulateContents() new /obj/item/clothing/suit/armor/medium/combat/rusted(src) new /obj/item/clothing/head/helmet/f13/combat/rangerbroken(src) - new /obj/item/gun/ballistic/automatic/pistol/automag(src) - new /obj/item/ammo_box/m44box(src) + new /obj/item/gun/ballistic/rifle/antique/gras/laserfusil(src) /datum/gear/donator/kits/jaggachi_6 name = "Soviet Service Kit" diff --git a/modular_coyote/icons/objects/rifles.dmi b/modular_coyote/icons/objects/rifles.dmi index c2a15c3d283..0aef8e5e3e9 100644 Binary files a/modular_coyote/icons/objects/rifles.dmi and b/modular_coyote/icons/objects/rifles.dmi differ