cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes remote explosive implants not showing up (#31878)

Browse Source 
* Fixes remote explosive implants not showing up

* Improved logging

* Typo

Co-authored-by: kanef <kanef9x@protonmail.com>
This commit is contained in:
kane-f
2022-01-19 23:45:39 +00:00
committed by GitHub
parent d82f5c1877
commit c20bd7fbd8
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/machinery/computer/prisoner.dm
View File

@@ -124,9 +124,9 @@
to_chat(R, "<span class='good'>You hear a voice in your head saying: '[warning]'</span>") to_chat(R, "<span class='good'>You hear a voice in your head saying: '[warning]'</span>")
else if(href_list["explode"]) else if(href_list["explode"])
var/obj/item/weapon/implant/I = locate(href_list["explode"]) var/obj/item/weapon/implant/explosive/remote/I = locate(href_list["explode"])
if(istype(I)) if(istype(I))
I.activate() I.activate(usr)
src.add_fingerprint(usr) src.add_fingerprint(usr)
src.updateUsrDialog() src.updateUsrDialog()

2
code/game/objects/items/weapons/implants/types/chemical_implant.dm
View File

@@ -7,11 +7,9 @@
..() ..()
create_reagents(50) create_reagents(50)
chemical_implants.Add(src) chemical_implants.Add(src)
remote_implants.Add(src)
/obj/item/weapon/implant/chem/Destroy() /obj/item/weapon/implant/chem/Destroy()
chemical_implants.Remove(src) chemical_implants.Remove(src)
remote_implants.Remove(src)
..() ..()
/obj/item/weapon/implant/chem/get_data() /obj/item/weapon/implant/chem/get_data()

16
code/game/objects/items/weapons/implants/types/explosive_implant.dm
View File

@@ -111,6 +111,14 @@
desc = "Injects \"chemicals\"." desc = "Injects \"chemicals\"."
icon_state = "implant" icon_state = "implant"
/obj/item/weapon/implant/explosive/remote/New()
..()
remote_implants.Add(src)
/obj/item/weapon/implant/explosive/remote/Destroy()
remote_implants.Remove(src)
..()
/obj/item/weapon/implant/explosive/remote/get_data() /obj/item/weapon/implant/explosive/remote/get_data()
return {" return {"
<b>Implant Specifications:</b><BR> <b>Implant Specifications:</b><BR>
@@ -127,21 +135,21 @@ the implant may become unstable and either pre-maturely inject the subject or si
/obj/item/weapon/implant/explosive/remote/Hear() /obj/item/weapon/implant/explosive/remote/Hear()
return return
/obj/item/weapon/implant/explosive/remote/activate() /obj/item/weapon/implant/explosive/remote/activate(mob/user)
if(malfunction == IMPLANT_MALFUNCTION_PERMANENT) if(malfunction == IMPLANT_MALFUNCTION_PERMANENT)
return return
if(iscarbon(imp_in)) if(iscarbon(imp_in))
var/mob/M = imp_in var/mob/M = imp_in
message_admins("Remote explosive implant triggered in [M] ([M.key]). (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[M.x];Y=[M.y];Z=[M.z]'>JMP</a>) ") message_admins("Remote explosive implant triggered in [M] ([M.key])[user ? "by [user] ([user.key])": ""]. (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[M.x];Y=[M.y];Z=[M.z]'>JMP</a>) ")
log_game("Remote explosive implant triggered in [M] ([M.key]).") log_game("Remote explosive implant triggered in [M] ([M.key])[user ? "by [user] ([user.key])": ""].")
to_chat(M, "You hear a faint *beep*.") to_chat(M, "You hear a faint *beep*.")
var/turf/T = get_turf(M) var/turf/T = get_turf(M)
M.gib() M.gib()
explosion(T, 1, 1, 3, 4, whodunnit = M) explosion(T, 1, 1, 3, 4, whodunnit = user)
T.hotspot_expose(3500, 125, surfaces = 1) T.hotspot_expose(3500, 125, surfaces = 1)
qdel(src) qdel(src)