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

gun fixes, jaggachi and aldric #2648

Merged
merged 7 commits into from
Jul 16, 2023
Merged

gun fixes, jaggachi and aldric #2648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b020d29
trying a fix
jinxynii Jul 16, 2023
dad31c7
Update laser.dm
jinxynii Jul 16, 2023
92b2580
Update plasma_cit.dm
jinxynii Jul 16, 2023
b67ca58
ass
jinxynii Jul 16, 2023
c6d87fd
Update laser.dm
jinxynii Jul 16, 2023
6154fb9
Update plasmaf13.dm
jinxynii Jul 16, 2023
26491fc
Update plasmaf13.dm
jinxynii Jul 16, 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
2 changes: 1 addition & 1 deletion code/modules/projectiles/ammunition/energy/laser.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ also: most hitscan weapons have more charge than their normal projectile counter

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

/obj/item/ammo_casing/energy/laser/solar
Expand Down
18 changes: 18 additions & 0 deletions code/modules/projectiles/guns/energy/laser.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,6 +632,24 @@
/datum/firemode/semi_auto/slow
)

/obj/item/gun/energy/laser/LaserAK/worn
name = "Laser AK470M"
desc = "An AK470 that was rebuilt with spare parts found around the wastes."
icon_state = "LaserAK"
item_state = null
icon = 'modular_citadel/icons/obj/guns/VGguns.dmi'
cell_type = "/obj/item/stock_parts/cell/ammo/mfc"
ammo_type = list(/obj/item/ammo_casing/energy/laser/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)

//AER9 Laser rifle
/obj/item/gun/energy/laser/aer9
Expand Down
22 changes: 0 additions & 22 deletions 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 @@ -84,25 +84,3 @@
/datum/firemode/automatic/rpm300
)
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)
4 changes: 4 additions & 0 deletions code/modules/projectiles/guns/energy/plasmaf13.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,8 @@
desc = "A burst-fire energy weapon that fires a torrential stream of toroidal plasma towards an unlucky target. This ones glows purple and has the words; Pick a god and pray. etched into the side."
ammo_type = list(/obj/item/ammo_casing/energy/plasma/pistol/eve/caster)
cell_type = /obj/item/stock_parts/cell/ammo/mfc
lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi'
righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi'
can_scope = FALSE
equipsound = 'sound/f13weapons/equipsounds/plasequip.ogg'
weapon_class = WEAPON_CLASS_CARBINE
Expand All @@ -186,6 +188,8 @@
desc = "A burst-fire energy weapon that fires a torrential stream of toroidal plasma towards an unfortunate soul."
ammo_type = list(/obj/item/ammo_casing/energy/plasma/pistol/caster)
cell_type = /obj/item/stock_parts/cell/ammo/mfc
lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi'
righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi'
can_scope = FALSE
equipsound = 'sound/f13weapons/equipsounds/plasequip.ogg'
weapon_class = WEAPON_CLASS_CARBINE
Expand Down
Loading