cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 23:17:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Power gloves deal stamina damage instead of weakening. (#19508)

Browse Source 
* No more weaken + Better description

* Better attack log

* Now also throws people

* Lower cooldown on request

* Commit farie's review

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
This commit is contained in:
BiancaWilkson
2022-11-05 13:45:37 +00:00
committed by GitHub
co-authored by Farie82
parent 923e4b933a
commit 7592bc64ce
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_onclick/click_override.dm
+6 -2
View File
@@ -73,9 +73,13 @@
beam_from.Beam(target_atom, icon_state = "lightning[rand(1, 12)]", icon = 'icons/effects/effects.dmi', time = 6)
if(isliving(target_atom))
var/mob/living/L = target_atom
var/surplus_power = C.surplus()
if(user.a_intent == INTENT_DISARM)
add_attack_logs(user, L, "shocked and weakened with power gloves")
L.Weaken(6 SECONDS)
add_attack_logs(user, L, "shocked with power gloves.")
L.adjustStaminaLoss(60)
L.Jitter(10 SECONDS)
var/atom/throw_target = get_edge_target_turf(user, get_dir(user, get_step_away(L, user)))
L.throw_at(throw_target, surplus_power / 100000, surplus_power / 100000) //100 kW surplus throws 1 tile, 200 throws 2, etc.
else
add_attack_logs(user, L, "electrocuted with[P.unlimited_power ? " unlimited" : null] power gloves")
if(P.unlimited_power)
code/datums/uplink_item.dm
+3 -1
View File
@@ -344,7 +344,9 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/jobspecific/powergloves
name = "Power Gloves"
desc = "Insulated gloves that can utilize the power of the station to deliver a short arc of electricity at a target. Must be standing on a powered cable to use."
desc = "Insulated gloves that can utilize the power of the station to deliver a short arc of electricity at a target. \
Must be standing on a powered cable to use. \
Activated by alt-clicking, or pressing the middle mouse button. Disarm intent will deal stamina damage and cause jittering, while harm intent will deal damage based on the power of the cable you're standing on."
reference = "PG"
item = /obj/item/clothing/gloves/color/yellow/power
cost = 10
code/modules/clothing/gloves/color.dm
+1 -1
View File
@@ -15,7 +15,7 @@
var/old_mclick_override
var/datum/middleClickOverride/power_gloves/mclick_override = new /datum/middleClickOverride/power_gloves
var/last_shocked = 0
var/shock_delay = 40
var/shock_delay = 3 SECONDS
var/unlimited_power = FALSE // Does this really need explanation?
var/shock_range = 7