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

Merge pull request #8401 from Ghommie/Ghommie-cit11

Browse Source 
Refactoring Implants' loc n°3
This commit is contained in:
kevinz000
2020-11-12 03:53:27 -03:00
committed by Dip
parent d41fad308a
commit 4bd370532d
34 changed files with 267 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/computer/cloning.dm
+1 -1
View File
@@ -231,7 +231,7 @@
dat += "<h4>[src.active_record.fields["name"]]</h4>"
dat += "Scan ID [src.active_record.fields["id"]] <a href='byond://?src=[REF(src)];clone=[active_record.fields["id"]]'>Clone</a><br>"
var/obj/item/implant/health/H = locate(src.active_record.fields["imp"])
var/obj/item/implant/health/H = locate(active_record.fields["imp"])
if ((H) && (istype(H)))
dat += "<b>Health Implant Data:</b><br />[H.sensehealth()]<br><br />"
code/game/machinery/computer/prisoner.dm
-1
View File
@@ -1 +0,0 @@
/obj/machinery/computer/prisoner
code/game/machinery/computer/prisoner/management.dm
+5 -5
View File
@@ -35,11 +35,11 @@
dat += "<HR>Chemical Implants<BR>"
var/turf/Tr = null
for(var/obj/item/implant/chem/C in GLOB.tracked_chem_implants)
Tr = get_turf(C)
if((Tr) && (Tr.z != src.z))
continue//Out of range
if(!C.imp_in)
continue
Tr = get_turf(C.imp_in)
if((Tr) && (Tr.z != src.z))
continue//Out of range
dat += "ID: [C.imp_in.name] | Remaining Units: [C.reagents.total_volume] <BR>"
dat += "| Inject: "
dat += "<A href='?src=[REF(src)];inject1=[REF(C)]'>(<font class='bad'>(1)</font>)</A>"
@@ -48,9 +48,9 @@
dat += "********************************<BR>"
dat += "<HR>Tracking Implants<BR>"
for(var/obj/item/implant/tracking/T in GLOB.tracked_implants)
if(!isliving(T.imp_in))
if(!T.imp_in || !isliving(T.imp_in))
continue
Tr = get_turf(T)
Tr = get_turf(T.imp_in)
if((Tr) && (Tr.z != src.z))
continue//Out of range
code/game/machinery/computer/teleporter.dm
+2 -2
View File
@@ -127,11 +127,11 @@
if(!I.imp_in || !I.allow_teleport || !isliving(I.imp_in))
continue
else
var/mob/living/M = I.loc
var/mob/living/M = I.imp_in
if(M.stat == DEAD)
if(M.timeofdeath + I.lifespan_postmortem < world.time)
continue
if(is_eligible(I))
if(is_eligible(M))
L[avoid_assoc_duplicate_keys(M.real_name, areaindex)] = I
var/desc = input("Please select a location to lock in.", "Locking Computer") as null|anything in L