cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 11:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ports new Proto-Kinetic Guns (#30813)

Browse Source 
* Ports new Proto-Kinetic Guns

* Linters

* Spellcheck

* Update kinetic_accelerator.dm

* Update code/modules/projectiles/guns/energy/kinetic_accelerator.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Projectile changes

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
PollardTheDragon
2025-11-22 14:32:59 -05:00
committed by GitHub
parent d6ed342a6d
commit a6359ea097
5 changed files with 127 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/machine_vending.dm
+8
View File
@@ -60,6 +60,10 @@
prize_list["Kinetic Weapons"] = list(
EQUIPMENT("Kinetic Accelerator", /obj/item/gun/energy/kinetic_accelerator, 750),
EQUIPMENT("Kinetic Crusher", /obj/item/kinetic_crusher, 750),
EQUIPMENT("Kinetic Railgun", /obj/item/gun/energy/kinetic_accelerator/railgun, 1500),
EQUIPMENT("Kinetic Repeater", /obj/item/gun/energy/kinetic_accelerator/repeater, 1500),
EQUIPMENT("Kinetic Shotgun", /obj/item/gun/energy/kinetic_accelerator/shotgun, 1500),
EQUIPMENT("Kinetic Shockwave", /obj/item/gun/energy/kinetic_accelerator/shockwave, 1500),
EQUIPMENT("KA Adjustable Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer/adjustable, 150),
EQUIPMENT("KA AoE Damage", /obj/item/borg/upgrade/modkit/aoe/mobs, 2000),
EQUIPMENT("KA Cooldown Decrease", /obj/item/borg/upgrade/modkit/cooldown, 1000),
@@ -396,6 +400,10 @@
prize_list["Kinetic Weapons"] = list(
EQUIPMENT("Kinetic Accelerator", /obj/item/gun/energy/kinetic_accelerator, 750),
EQUIPMENT("Kinetic Pistol", /obj/item/gun/energy/kinetic_accelerator/pistol, 500),
EQUIPMENT("Kinetic Railgun", /obj/item/gun/energy/kinetic_accelerator/railgun, 1500),
EQUIPMENT("Kinetic Repeater", /obj/item/gun/energy/kinetic_accelerator/repeater, 1500),
EQUIPMENT("Kinetic Shotgun", /obj/item/gun/energy/kinetic_accelerator/shotgun, 1500),
EQUIPMENT("Kinetic Shockwave", /obj/item/gun/energy/kinetic_accelerator/shockwave, 1500),
EQUIPMENT("KA Adjustable Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer/adjustable, 150),
EQUIPMENT("KA AoE Damage", /obj/item/borg/upgrade/modkit/aoe/mobs, 2000),
EQUIPMENT("KA Cooldown Decrease", /obj/item/borg/upgrade/modkit/cooldown, 1000),