Skip to content

Commit

Permalink
Merge pull request #3188 from Jaggachi/master
Browse files Browse the repository at this point in the history
Jaggis Laser Thingy
  • Loading branch information
Tk420634 authored Sep 27, 2023
2 parents 859ca94 + 69a3a90 commit c927576
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
8 changes: 8 additions & 0 deletions code/modules/projectiles/guns/ballistic/rifle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions modular_citadel/code/modules/client/loadout/__donator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Binary file modified modular_coyote/icons/objects/rifles.dmi
Binary file not shown.

0 comments on commit c927576

Please sign in to comment.