diff --git a/code/modules/projectiles/guns/energy/cyborg.dm b/code/modules/projectiles/guns/energy/cyborg.dm index 78247e1555b..7beb5e25df4 100644 --- a/code/modules/projectiles/guns/energy/cyborg.dm +++ b/code/modules/projectiles/guns/energy/cyborg.dm @@ -28,8 +28,8 @@ icon_state = "taser" item_state = null //so the human update icon uses the icon_state instead. projectile_type = /obj/item/projectile/beam/stun - charge_cost = 400 - recharge_time = 7 //Time it takes for shots to recharge (in ticks) + charge_cost = 160 + recharge_time = 5 //Time it takes for shots to recharge (in ticks) /obj/item/gun/energy/robotic/disabler borg_flags = COUNTS_AS_ROBOT_GUN | COUNTS_AS_ROBOT_DISABLER diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index facbbf9dcf3..b3cd9a01944 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -9,7 +9,8 @@ icon_state = "taser" item_state = null //so the human update icon uses the icon_state instead. projectile_type = /obj/item/projectile/beam/stun - charge_cost = 480 + charge_cost = 160 + fire_delay = 4 /obj/item/gun/energy/taser/mounted name = "mounted taser gun" @@ -24,7 +25,7 @@ /obj/item/gun/energy/taser/mounted/cyborg name = "taser gun" - charge_cost = 400 + charge_cost = 160 recharge_time = 7 //Time it takes for shots to recharge (in ticks) /* diff --git a/code/modules/projectiles/guns/energy/stun_vr.dm b/code/modules/projectiles/guns/energy/stun_vr.dm deleted file mode 100644 index baa95373113..00000000000 --- a/code/modules/projectiles/guns/energy/stun_vr.dm +++ /dev/null @@ -1,9 +0,0 @@ -/obj/item/gun/energy/taser - charge_cost = 160 - fire_delay = 4 - -/obj/item/gun/energy/stunrevolver - charge_cost = 400 - -/obj/item/gun/energy/taser/mounted/cyborg - charge_cost = 160 \ No newline at end of file diff --git a/vorestation.dme b/vorestation.dme index cd19e141416..5ddbae54938 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -3865,7 +3865,6 @@ #include "code\modules\projectiles\guns\energy\special.dm" #include "code\modules\projectiles\guns\energy\special_vr.dm" #include "code\modules\projectiles\guns\energy\stun.dm" -#include "code\modules\projectiles\guns\energy\stun_vr.dm" #include "code\modules\projectiles\guns\energy\temperature.dm" #include "code\modules\projectiles\guns\energy\cell_loaded_vr\cell_loaded.dm" #include "code\modules\projectiles\guns\energy\cell_loaded_vr\ml3m.dm"