mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-30 15:37:36 +01:00
Adds 2 cybernetic implants, makes emag_act return TRUE (#23876)
* Adds 2 cybernetic implants, makes emag_act return TRUE * the rest of the fucking owl * yeah that would do it * remove this * Apply suggestions from code review Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * request changes, scaling burn damage, 3 tile range, lowers tech level * Apply suggestions from code review Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> * Update code/game/objects/structures/crates_lockers/crates.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> * Update scanners.dm * Apply suggestions from code review Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> * Lewcs good to them? * Apply suggestions from code review Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> * fuck me * there are no message admins in ba-sing --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
This commit is contained in:
co-authored by
Henri215
Burzah
DGamerL
Luc
parent
3c5cb36e81
commit
c398e4a617
@@ -181,6 +181,7 @@
|
||||
return
|
||||
to_chat(user, "<span class='warning'>You override [src]'s radiation storing protocols. It will now generate small doses of radiation, and stored rads are now projected into creatures you scan.</span>")
|
||||
emagged = TRUE
|
||||
return TRUE
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -24,11 +24,13 @@
|
||||
desc += " The screen only shows the word KILL flashing over and over."
|
||||
if(user)
|
||||
to_chat(user, "<span class='warning'>you short out the safeties on [src]</span>")
|
||||
return TRUE
|
||||
else
|
||||
emagged = FALSE
|
||||
desc = "Used to restart stopped hearts."
|
||||
if(user)
|
||||
to_chat(user, "<span class='warning'>You restore the safeties on [src]</span>")
|
||||
return TRUE
|
||||
|
||||
/obj/item/handheld_defibrillator/attack(mob/living/carbon/human/H, mob/user)
|
||||
if(!istype(H))
|
||||
|
||||
@@ -147,6 +147,7 @@
|
||||
emagged = !emagged
|
||||
playsound(loc, "sparks", 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
|
||||
update_appearance(UPDATE_NAME|UPDATE_ICON_STATE)
|
||||
return TRUE
|
||||
|
||||
/obj/item/lightreplacer/attack_self(mob/user)
|
||||
for(var/obj/machinery/light/target in user.loc)
|
||||
|
||||
@@ -107,4 +107,5 @@
|
||||
to_chat(user, "<span class='danger'>You short out [src]'s dampener circuits.</span>")
|
||||
emagged = TRUE
|
||||
span = "reallybig userdanger" // really obvious, but also really loud
|
||||
return TRUE
|
||||
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
emagged = TRUE
|
||||
syndicate = TRUE
|
||||
to_chat(user, "<span class='notice'>The This beacon now only be locked on to by emagged teleporters!</span>")
|
||||
return TRUE
|
||||
|
||||
/obj/item/radio/beacon/hear_talk()
|
||||
return
|
||||
|
||||
@@ -269,7 +269,7 @@ REAGENT SCANNER
|
||||
|
||||
var/implant_detect
|
||||
for(var/obj/item/organ/internal/O in H.internal_organs)
|
||||
if(O.is_robotic())
|
||||
if(O.is_robotic() && !O.stealth_level)
|
||||
implant_detect += "[H.name] is modified with a [O.name].<br>"
|
||||
if(implant_detect)
|
||||
msgs += "<span class='notice'>Detected cybernetic modifications:</span>"
|
||||
@@ -423,7 +423,7 @@ REAGENT SCANNER
|
||||
organ_found = null
|
||||
if(LAZYLEN(H.internal_organs))
|
||||
for(var/obj/item/organ/internal/O in H.internal_organs)
|
||||
if(!O.is_robotic() || istype(O, /obj/item/organ/internal/cyberimp))
|
||||
if(!O.is_robotic() || istype(O, /obj/item/organ/internal/cyberimp) || O.stealth_level <= 1)
|
||||
continue
|
||||
organ_found = TRUE
|
||||
msgs += "[capitalize(O.name)]: <font color='red'>[O.damage]</font>"
|
||||
@@ -434,6 +434,8 @@ REAGENT SCANNER
|
||||
organ_found = null
|
||||
if(LAZYLEN(H.internal_organs))
|
||||
for(var/obj/item/organ/internal/cyberimp/I in H.internal_organs)
|
||||
if(I.stealth_level > 1)
|
||||
continue
|
||||
organ_found = TRUE
|
||||
msgs += "[capitalize(I.name)]: <font color='red'>[I.crit_fail ? "CRITICAL FAILURE" : I.damage]</font>"
|
||||
if(!organ_found)
|
||||
|
||||
@@ -29,6 +29,7 @@
|
||||
if(!emagged)
|
||||
to_chat(user, "<span class='warning'>You overload \the [src]'s voice synthesizer.</span>")
|
||||
emagged = TRUE
|
||||
return TRUE
|
||||
|
||||
#undef USE_COOLDOWN
|
||||
|
||||
|
||||
@@ -427,3 +427,4 @@
|
||||
else
|
||||
to_chat(user, "<span class='warning'>You slide the emag into the dataport on [src] and short out the safeties.</span>")
|
||||
sabotaged = TRUE
|
||||
return TRUE
|
||||
|
||||
@@ -138,6 +138,7 @@
|
||||
safety = !safety
|
||||
..()
|
||||
update_icon(UPDATE_OVERLAYS)
|
||||
return TRUE
|
||||
|
||||
/obj/item/defibrillator/proc/toggle_paddles(mob/living/carbon/human/user)
|
||||
if(user.stat || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || !Adjacent(user))
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
return
|
||||
else if((istype(W, /obj/item/card/emag) || (istype(W, /obj/item/melee/energy/blade)) && !broken))
|
||||
emag_act(user)
|
||||
return
|
||||
return TRUE
|
||||
if(!locked)
|
||||
..()
|
||||
else
|
||||
|
||||
@@ -84,6 +84,7 @@
|
||||
to_chat(user, "You slice through the lock on [src].")
|
||||
else
|
||||
to_chat(user, "You short out the lock on [src].")
|
||||
return TRUE
|
||||
|
||||
/obj/item/storage/secure/AltClick(mob/user)
|
||||
if(!try_to_open())
|
||||
|
||||
@@ -121,7 +121,7 @@
|
||||
desc = "A kit with everything you need to hack into and disrupt the Station, AI, its cyborgs and the Security team. HACK THE PLANET!"
|
||||
items = list(
|
||||
/obj/item/melee/energy/sword/saber/blue, // 40TC
|
||||
/obj/item/card/emag, // 30TC
|
||||
/obj/item/autosurgeon/organ/syndicate/hackerman_deck, // 30TC
|
||||
/obj/item/door_remote/omni/access_tuner, // 30 TC, HACK EVERYTHING
|
||||
/obj/item/encryptionkey/syndicate, // 10TC
|
||||
/obj/item/encryptionkey/binary, // 25TC
|
||||
|
||||
@@ -132,7 +132,8 @@
|
||||
to_chat(user, "<span class='warning'>Nothing interesting happens!</span>")
|
||||
return
|
||||
to_chat(user, "<span class='notice'>You emag the barsign. Takeover in progress...</span>")
|
||||
addtimer(CALLBACK(src, PROC_REF(post_emag)), 100)
|
||||
addtimer(CALLBACK(src, PROC_REF(post_emag)), 10 SECONDS)
|
||||
return TRUE
|
||||
|
||||
/obj/structure/sign/barsign/proc/post_emag()
|
||||
if(broken || emagged)
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
locked = FALSE
|
||||
to_chat(user, "<span class='notice'>You break the lock on [src].</span>")
|
||||
update_icon()
|
||||
return TRUE
|
||||
|
||||
/obj/structure/closet/secure_closet/guncabinet/update_overlays()
|
||||
. = list()
|
||||
|
||||
@@ -74,6 +74,7 @@
|
||||
add_overlay("sparking")
|
||||
to_chat(user, "<span class='notice'>You break the lock on [src].</span>")
|
||||
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 1 SECONDS)
|
||||
return TRUE
|
||||
|
||||
/obj/structure/closet/secure_closet/attack_hand(mob/user)
|
||||
add_fingerprint(user)
|
||||
|
||||
@@ -259,8 +259,9 @@
|
||||
locked = FALSE
|
||||
broken = TRUE
|
||||
update_icon()
|
||||
do_sparks(2, 1, src)
|
||||
do_sparks(2, TRUE, src)
|
||||
to_chat(user, "<span class='notice'>You unlock \the [src].</span>")
|
||||
return TRUE
|
||||
|
||||
/obj/structure/closet/crate/secure/emp_act(severity)
|
||||
for(var/obj/O in src)
|
||||
|
||||
@@ -42,6 +42,7 @@
|
||||
|
||||
emagged = TRUE
|
||||
toggle_lock()
|
||||
return TRUE
|
||||
|
||||
/obj/structure/displaycase/examine(mob/user)
|
||||
. = ..()
|
||||
|
||||
Reference in New Issue
Block a user