Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Jaggachi's Loadout 2 Electric Boogaloo #2640

Merged
merged 8 commits into from
Jul 16, 2023
Merged

Jaggachi's Loadout 2 Electric Boogaloo #2640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2454fb3
Update plasma_cit.dm
Jaggachi Jul 15, 2023
9c3ea6f
Merge branch 'ARF-SS13:master' into master
Jaggachi Jul 15, 2023
cf793ba
Update plasma_cit.dm
Jaggachi Jul 15, 2023
1011faf
Update __donator.dm
Jaggachi Jul 15, 2023
303af98
Update __donator.dm
Jaggachi Jul 15, 2023
016069d
Update beams.dm
Jaggachi Jul 15, 2023
2fbc90f
Update laser.dm
Jaggachi Jul 15, 2023
1c7a12c
Update plasma_cit.dm
Jaggachi Jul 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions code/modules/projectiles/ammunition/energy/laser.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,11 @@ also: most hitscan weapons have more charge than their normal projectile counter
projectile_type = /obj/item/projectile/beam/laser/lasgun/hitscan/focused
e_cost = 100

/obj/item/ammo_casing/energy/laser/AK470M
projectile_type = /obj/item/projectile/beam/laser/pistol/AK470M
e_cost = 165 //basically infinite shots
fire_sound = 'sound/f13weapons/WattzRifleFire.ogg'

/obj/item/ammo_casing/energy/laser/solar
projectile_type = /obj/item/projectile/beam/laser/solar
e_cost = 30 //basically infinite shots
Expand Down
22 changes: 21 additions & 1 deletion code/modules/projectiles/guns/energy/plasma_cit.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,24 @@
)
init_recoil = LASER_AUTORIFLE_RECOIL(1, 1)


/obj/item/gun/energy/laser/LaserAK/worn
name = "Laser AK470M"
desc = "An AK470 that was rebuilt with parts from a Freeblade blaster."
can_remove = 0
can_charge = 0
selfcharge = 1
icon_state = "LaserAK"
item_state = null
icon = 'modular_citadel/icons/obj/guns/VGguns.dmi'
cell_type = "/obj/item/stock_parts/cell/pulse/carbine"
ammo_type = list(/obj/item/projectile/beam/laser/pistol/AK470M)
ammo_x_offset = 4
lefthand_file = 'modular_citadel/icons/mob/citadel/guns_lefthand.dmi'
righthand_file = 'modular_citadel/icons/mob/citadel/guns_righthand.dmi'
weapon_class = WEAPON_CLASS_RIFLE
weapon_weight = GUN_ONE_HAND_ONLY
init_firemodes = list(
/datum/firemode/semi_auto,
/datum/firemode/automatic/rpm300
)
init_recoil = LASER_AUTORIFLE_RECOIL(1, 1)
7 changes: 7 additions & 0 deletions code/modules/projectiles/projectile/beams.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,13 @@
muzzle_type = /obj/effect/projectile/muzzle/laser
impact_type = /obj/effect/projectile/impact/laser

/obj/item/projectile/beam/laser/pistol/AK470M //AK470M
name = "laser beam"
damage = 20
icon_state = "arcane_barrage"
impact_effect_type = /obj/effect/temp_visual/impact_effect/purple_laser
light_color = LIGHT_COLOR_PURPLE

/obj/item/projectile/beam/laser/solar //Solar Scorcher
name = "solar scorcher beam"
damage = 28
Expand Down
13 changes: 12 additions & 1 deletion modular_citadel/code/modules/client/loadout/__donator.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,7 @@
new /obj/item/storage/box/gun/revolver/revolver44(src)

/datum/gear/donator/kits/jaggachi_5
name = "Army Service Kit"
name = "Soviet Service Kit"
path = /obj/item/storage/box/large/custom_kit/jaggachi_5
ckeywhitelist = list("jaggachi")

Expand All @@ -675,6 +675,17 @@
new /obj/item/gun/ballistic/automatic/pistol/automag(src)
new /obj/item/ammo_box/m44box(src)

/datum/gear/donator/kits/jaggachi_6
name = "Army Service Kit"
path = /obj/item/storage/box/large/custom_kit/jaggachi_6
ckeywhitelist = list("jaggachi")

/obj/item/storage/box/large/custom_kit/jaggachi_6/PopulateContents()
new /obj/item/clothing/under/soviet(src)
new /obj/item/clothing/suit/armor/light/duster/russian_coat(src)
new /obj/item/clothing/suit/armor/light/vest/russian(src)
new /obj/item/gun/energy/laser/LaserAK/worn(src)

// K


Expand Down