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

Makes the power biochip more normal to use, and makes it use TG cool downs. (#27781)

Browse Source 
* Makes the shock implant more normal to use, and makes it use TG cooldowns

* i forgot uplink descriptions

* contrabang review

* comment clean
This commit is contained in:
1080pCat
2025-01-06 16:30:26 +00:00
committed by GitHub
parent b1b8cc8056
commit f740a7771a
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_onclick/click_override.dm
+4 -6
View File
@@ -45,14 +45,12 @@
/datum/middle_click_override/shock_implant
/datum/middle_click_override/shock_implant/onClick(atom/A, mob/living/carbon/human/user)
if(A == user || user.a_intent == INTENT_HELP || user.a_intent == INTENT_GRAB)
return FALSE
if(user.incapacitated())
if(user.incapacitated() || A == user)
return FALSE
var/obj/item/bio_chip/shock/P = locate() in user
if(!P)
return
if(world.time < P.last_shocked + P.shock_delay)
if(!COOLDOWN_FINISHED(P, last_shocked))
to_chat(user, "<span class='warning'>The powerchip is still recharging.</span>")
return FALSE
var/turf/T = get_turf(user)
@@ -76,7 +74,7 @@
if(isliving(target_atom))
var/mob/living/L = target_atom
var/powergrid = C.get_available_power() //We want available power, so the station being conservative doesn't mess with the power biochip / dark bundle users
if(user.a_intent == INTENT_DISARM)
if(user.a_intent == INTENT_DISARM || user.a_intent == INTENT_HELP)
add_attack_logs(user, L, "shocked with power bio-chip.")
L.apply_damage(60, STAMINA)
L.Jitter(10 SECONDS)
@@ -110,7 +108,7 @@
A = target_atom
next_shocked.Cut()
P.last_shocked = world.time
COOLDOWN_START(P, last_shocked, P.shock_delay)
return TRUE
/**
code/datums/uplink_items/uplink_traitor.dm
+1 -1
View File
@@ -218,7 +218,7 @@
name = "Power Bio-Chip"
desc = "A Bio-Chip 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. Can be toggled on / off via the action button."
Activated by alt-clicking, or pressing the middle mouse button. Help/disarm intent will deal stamina damage and cause jittering, while harm/grab intent will deal damage based on the power of the cable you're standing on. Can be toggled on / off via the action button."
reference = "PG"
item = /obj/item/bio_chip_implanter/shock
cost = 50
code/game/objects/items/weapons/bio_chips/bio_chip_shock.dm
+2 -2
View File
@@ -6,10 +6,10 @@
origin_tech = "combat=5;magnets=3;biotech=4;syndicate=2"
implant_data = /datum/implant_fluff/shock
implant_state = "implant-syndicate"
var/enabled = TRUE
var/enabled = FALSE
var/old_mclick_override
var/datum/middle_click_override/shock_implant/mclick_override = new /datum/middle_click_override/shock_implant
var/last_shocked = 0
COOLDOWN_DECLARE(last_shocked)
var/shock_delay = 3 SECONDS
var/unlimited_power = FALSE // Does this really need explanation?
var/shock_range = 7