cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes a handful of weapons shooting the wrong projectile, phase weapon nerf, floragun buff, one merc nerf. (#8791)

Browse Source
This commit is contained in:
tacoguy7765093
2024-08-22 05:48:46 -05:00
committed by GitHub
parent 3977bad5a9
commit d3167feb2c
7 changed files with 60 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/projectiles/guns/energy/phase.dm
View File

@@ -10,7 +10,7 @@
item_state = "phasecarbine"
wielded_item_state = "phasecarbine-wielded"
slot_flags = SLOT_BACK|SLOT_BELT
charge_cost = 80 //Chompedit Bringing charge cost down for all phase weapons.
charge_cost = 160 //Chompedit Bringing charge cost down for all phase weapons. 15 shots on normal cell
projectile_type = /obj/item/projectile/energy/phase
one_handed_penalty = 15
recoil_mode = 0 //CHOMP Addition: Removes recoil for micros.
@@ -27,7 +27,7 @@
one_handed_penalty = 0
/obj/item/weapon/gun/energy/locked/phasegun/unlocked/mounted/cyborg
charge_cost = 80 //ChompEdit Reduced from 480 to 200, further reduced to 80 to match normal phase guns
charge_cost = 160 //ChompEdit Reduced from 480 to 200, further reduced to 80 to match normal phase guns
recharge_time = 16 //ChompEdit set up to 16 due to lower charge cost
/obj/item/weapon/gun/energy/locked/phasegun/pistol
@@ -37,7 +37,7 @@
item_state = "taser" //I don't have an in-hand sprite, taser will be fine
w_class = ITEMSIZE_NORMAL
slot_flags = SLOT_BELT|SLOT_HOLSTER
charge_cost = 80 //Chompedit Bringing charge cost down for all phase weapons.
charge_cost = 160 //Chompedit Bringing charge cost down for all phase weapons. 15 shots on normal cell
projectile_type = /obj/item/projectile/energy/phase/light
one_handed_penalty = 0
move_delay = 0 // CHOMPEdit: Pistols have move_delay of 0
@@ -54,7 +54,7 @@
use_external_power = 1
/obj/item/weapon/gun/energy/locked/phasegun/pistol/unlocked/mounted/cyborg
charge_cost = 80 //Chompedit, bringing in line with normal phase weapons
charge_cost = 160 //Chompedit, bringing in line with normal phase weapons
recharge_time = 7
@@ -62,11 +62,11 @@
name = "EW31 Orion" //ChompEDIT
desc = "The RayZar EW31 Orion, also known as the 'phase rifle', is a specialist energy-based weapon intended for use against hostile wildlife. This one has a safety interlock that prevents firing while in proximity to the facility." //ChompEDIT
icon_state = "phaserifle"
item_state = "phaserifle"
item_state = "phaserifle"
wielded_item_state = "phaserifle-wielded"
w_class = ITEMSIZE_LARGE
slot_flags = SLOT_BACK
charge_cost = 80 //Chompedit Bringing charge cost down for all phase weapons.
charge_cost = 160 //Chompedit Bringing charge cost down for all phase weapons. 15 shots on normal cell
projectile_type = /obj/item/projectile/energy/phase/heavy
accuracy = 15
one_handed_penalty = 30
@@ -85,7 +85,7 @@
wielded_item_state = "phasecannon-wielded" //TODO: New Sprites
w_class = ITEMSIZE_HUGE // This thing is big.
slot_flags = SLOT_BACK
charge_cost = 80 //Chompedit Bringing charge cost down for all phase weapons.
charge_cost = 160 //Chompedit Bringing charge cost down for all phase weapons. 15 shots on normal cell
projectile_type = /obj/item/projectile/energy/phase/heavy/cannon
accuracy = 15
one_handed_penalty = 65

1
code/modules/projectiles/guns/projectile/zz_ballistics_ch.dm
View File

@@ -1008,6 +1008,7 @@
auto_loading_type = OPEN_BOLT
muzzle_velocity = 860
one_handed_penalty = 90
fire_sound = 'sound/weapons/serdy/strela.ogg'
//commented this out because it seems to be breaking the Kord -- Ocelot
/*