Merge pull request NebulaSS13#5144 from out-of-phaze/codequality/loyalty-implants

Improve implant code quality

Author: MistakeNot4892

code/__defines/misc.dm

@@ -53,7 +53,7 @@
 #define      STATUS_HUD 2 // Alive, dead, diseased, etc.
 #define          ID_HUD 3 // The job asigned to your ID.
 #define      WANTED_HUD 4 // Wanted, released, paroled, security status.
-#define    IMPLOYAL_HUD 5 // Loyality implant.
+#define    IMPLOYAL_HUD 5 // Loyalty implant.
 #define     IMPCHEM_HUD 6 // Chemical implant.
 #define    IMPTRACK_HUD 7 // Tracking implant.
 #define SPECIALROLE_HUD 8 // AntagHUD image.

code/datums/config/config_types/config_game_world.dm

@@ -23,7 +23,8 @@
 		/decl/config/toggle/roundstart_level_generation,
 		/decl/config/toggle/lights_start_on,
 		/decl/config/toggle/on/cisnormativity,
-		/decl/config/enum/colored_coating_names
+		/decl/config/enum/colored_coating_names,
+		/decl/config/toggle/codex_requires_implant
 	)
 
 /decl/config/num/exterior_ambient_light
@@ -145,4 +146,8 @@
 		"none"       = CONFIG_COATING_COLOR_NONE,
 		"mixture"    = CONFIG_COATING_COLOR_MIXTURE,
 		"components" = CONFIG_COATING_COLOR_COMPONENTS
-	)
+	)
+
+/decl/config/toggle/codex_requires_implant
+	uid = "codex_requires_implant"
+	desc = "If true, humans require a codex implant to access the codex."

code/datums/uplink/uplink_sources.dm

@@ -68,21 +68,16 @@ var/global/list/default_uplink_source_priority = list(
 	name = "Implant"
 	desc = "Teleports an uplink implant into your head. Costs 20% of the initial TC amount."
 
-/decl/uplink_source/implant/setup_uplink_source(var/mob/living/human/H, var/amount)
-	if(!istype(H))
+/decl/uplink_source/implant/setup_uplink_source(var/mob/living/human/recipient, var/amount)
+	if(!istype(recipient))
 		return SETUP_FAILED
 
-	var/obj/item/organ/external/head = GET_EXTERNAL_ORGAN(H, BP_HEAD)
+	var/obj/item/organ/external/head = GET_EXTERNAL_ORGAN(recipient, BP_HEAD)
 	if(!head)
 		return SETUP_FAILED
 
-	var/obj/item/implant/uplink/U = new(H, round(amount * 0.8))
-	U.imp_in = H
-	U.implanted = TRUE
-	U.part = head
-	LAZYADD(head.implants, U)
-
-	U.implanted(H) // This proc handles the installation feedback
+	var/obj/item/implant/uplink/uplink_implant = new(recipient, round(amount * 0.8))
+	uplink_implant.implant_in_mob(recipient, recipient, head)
 
 /decl/uplink_source/unit
 	name = "Uplink Unit"

code/game/machinery/computer/prisoner.dm

@@ -7,76 +7,86 @@
 	icon_screen = "explosive"
 	light_color = "#a91515"
 	initial_access = list(access_armory)
-	var/screen = 0 // 0 - No Access Denied, 1 - Access allowed
+	var/locked = FALSE
 
 /obj/machinery/computer/prisoner/interface_interact(user)
 	interact(user)
 	return TRUE
 
 /obj/machinery/computer/prisoner/interact(var/mob/user)
-	var/dat
+	var/dat = list()
 	dat += "<B>Prisoner Implant Manager System</B><BR>"
-	if(screen == 0)
+	if(locked)
 		dat += "<HR><A href='byond://?src=\ref[src];lock=1'>Unlock Console</A>"
-	else if(screen == 1)
+	else
 		dat += "<HR>Chemical Implants<BR>"
-		var/turf/Tr = null
-		for(var/obj/item/implant/chem/C in global.chem_implants)
-			Tr = get_turf(C)
-			if((Tr) && !LEVELS_ARE_Z_CONNECTED(Tr.z, src.z))	continue // Out of range
-			if(!C.implanted) continue
-			dat += "[C.imp_in.name] | Remaining Units: [C.reagents.total_volume] | Inject: "
-			dat += "<A href='byond://?src=\ref[src];inject1=\ref[C]'>(<font color=red>(1)</font>)</A>"
-			dat += "<A href='byond://?src=\ref[src];inject5=\ref[C]'>(<font color=red>(5)</font>)</A>"
-			dat += "<A href='byond://?src=\ref[src];inject10=\ref[C]'>(<font color=red>(10)</font>)</A><BR>"
+		for(var/obj/item/implant/chem/chem_implant in global.chem_implants)
+			var/turf/implant_turf = get_turf(chem_implant)
+			if(implant_turf && !LEVELS_ARE_Z_CONNECTED(implant_turf.z, src.z))
+				continue // Out of range
+			if(!chem_implant.implanted)
+				continue
+			dat += "[chem_implant.imp_in.name] | Remaining Units: [chem_implant.reagents.total_volume] | Inject: "
+			dat += "<A href='byond://?src=\ref[src];inject=\ref[chem_implant];amount=1'>(<font color=red>(1)</font>)</A>"
+			dat += "<A href='byond://?src=\ref[src];inject=\ref[chem_implant];amount=5'>(<font color=red>(5)</font>)</A>"
+			dat += "<A href='byond://?src=\ref[src];inject=\ref[chem_implant];amount=10'>(<font color=red>(10)</font>)</A><BR>"
 			dat += "********************************<BR>"
 		dat += "<HR>Tracking Implants<BR>"
-		for(var/obj/item/implant/tracking/T in global.tracking_implants)
-			Tr = get_turf(T)
-			if((Tr) && !LEVELS_ARE_Z_CONNECTED(Tr.z, src.z))	continue // Out of range
-			if(!T.implanted) continue
-			var/loc_display = "Space"
-			var/mob/living/M = T.imp_in
-			if(!isspaceturf(M.loc))
-				var/turf/mob_loc = get_turf(M)
-				loc_display = mob_loc.loc
-			if(T.malfunction)
+		for(var/obj/item/implant/tracking/tracking_implant in global.tracking_implants)
+			var/turf/implant_turf = get_turf(tracking_implant)
+			if(implant_turf && !LEVELS_ARE_Z_CONNECTED(implant_turf.z, src.z))
+				continue // Out of range
+			if(!tracking_implant.implanted)
+				continue
+			var/area/tracked_area = get_area(tracking_implant)
+			var/loc_display = tracked_area.proper_name
+			if(tracking_implant.malfunction)
 				loc_display = pick(teleportlocs)
-			dat += "ID: [T.id] | Location: [loc_display]<BR>"
-			dat += "<A href='byond://?src=\ref[src];warn=\ref[T]'>(<font color=red><i>Message Holder</i></font>)</A> |<BR>"
+			dat += "ID: [tracking_implant.id] | Location: [loc_display]<BR>"
+			dat += "<A href='byond://?src=\ref[src];warn=\ref[tracking_implant]'>(<font color=red><i>Message Holder</i></font>)</A> |<BR>"
 			dat += "********************************<BR>"
 		dat += "<HR><A href='byond://?src=\ref[src];lock=1'>Lock Console</A>"
 
-	show_browser(user, dat, "window=computer;size=400x500")
+	show_browser(user, JOINTEXT(dat), "window=computer;size=400x500")
 	onclose(user, "computer")
 
 /obj/machinery/computer/prisoner/OnTopic(mob/user, href_list)
 	if((. = ..()))
 		return
-	. = TOPIC_REFRESH
 
-	if(href_list["inject1"])
-		var/obj/item/implant/I = locate(href_list["inject1"])
-		if(I)	I.activate(1)
-
-	else if(href_list["inject5"])
-		var/obj/item/implant/I = locate(href_list["inject5"])
-		if(I)	I.activate(5)
-
-	else if(href_list["inject10"])
-		var/obj/item/implant/I = locate(href_list["inject10"])
-		if(I)	I.activate(10)
+	if(href_list["inject"])
+		var/obj/item/implant/chem/chem_implant = locate(href_list["inject"])
+		if(!chem_implant)
+			return TOPIC_REFRESH // evidently their copy of the UI is out of date
+		if(!istype(chem_implant)) // exists but is not a chem implant
+			// warn that this is likely an href hacking attempt
+			PRINT_STACK_TRACE("Possible HREF hacking attempt, chem implant inject called on non-chem-implant!")
+			message_admins("Possible HREF hacking attempt, chem implant inject called on [href_list["inject"]] by [user] (ckey [(user.ckey)])!")
+			return TOPIC_HANDLED
+		var/amount_to_inject = clamp(text2num(href_list["amount"]), 1, 10) // don't let href hacking give more than 10 units at once
+		chem_implant.activate(amount_to_inject)
+		return TOPIC_HANDLED
 
 	else if(href_list["lock"])
 		if(allowed(user))
-			screen = !screen
+			locked = !locked
+			return TOPIC_REFRESH
 		else
 			to_chat(user, "Unauthorized Access.")
+			return TOPIC_HANDLED
 
 	else if(href_list["warn"])
 		var/warning = sanitize(input(user,"Message:","Enter your message here!",""))
-		if(!warning) return TOPIC_HANDLED
-		var/obj/item/implant/I = locate(href_list["warn"])
-		if(I?.imp_in)
-			var/mob/living/victim = I.imp_in
-			to_chat(victim, "<span class='notice'>You hear a voice in your head saying: '[warning]'</span>")
+		if(!warning)
+			return TOPIC_HANDLED
+		var/obj/item/implant/tracking/tracker = locate(href_list["warn"])
+		if(!tracker)
+			return TOPIC_REFRESH // evidently their copy of the UI is out of date
+		if(!istype(tracker)) // exists but is not a tracking implant
+			// warn that this is likely an href hacking attempt
+			PRINT_STACK_TRACE("Possible HREF hacking attempt, tracking implant warn called on non-tracking-implant!")
+			message_admins("Possible HREF hacking attempt, tracking implant warn called on [href_list["warn"]] by [user] (ckey [(user.ckey)])!")
+			return TOPIC_HANDLED
+		to_chat(tracker.imp_in, SPAN_NOTICE("You hear a voice in your head saying: '[warning]'"))
+		return TOPIC_HANDLED
+	return TOPIC_NOACTION

code/game/machinery/teleporter.dm

@@ -86,12 +86,13 @@
 	for(var/obj/item/radio/beacon/radio in global.radio_beacons)
 		if(!radio.functioning)
 			continue
-		var/turf/T = get_turf(radio)
-		if (!T)
+		var/turf/radio_turf = get_turf(radio)
+		if (!radio_turf)
 			continue
-		if(!isPlayerLevel(T.z))
+		if(!isPlayerLevel(radio_turf.z))
 			continue
-		var/tmpname = T.loc.name
+		var/area/radio_area = get_area(radio)
+		var/tmpname = radio_area.proper_name
 		if(areaindex[tmpname])
 			tmpname = "[tmpname] ([++areaindex[tmpname]])"
 		else
@@ -101,22 +102,21 @@
 	for (var/obj/item/implant/tracking/used_item in global.tracking_implants)
 		if (!used_item.implanted || !ismob(used_item.loc))
 			continue
+		var/mob/victim = used_item.loc
+		// Can only track dead people up to 10 minutes after death
+		if (victim.stat == DEAD && world.time > victim.timeofdeath + 10 MINUTES)
+			continue
+		var/turf/victim_turf = get_turf(victim)
+		if(!victim_turf)
+			continue
+		if(!isPlayerLevel(victim_turf.z))
+			continue
+		var/tmpname = victim.real_name
+		if(areaindex[tmpname])
+			tmpname = "[tmpname] ([++areaindex[tmpname]])"
 		else
-			var/mob/M = used_item.loc
-			if (M.stat == DEAD)
-				if (M.timeofdeath + 6000 < world.time)
-					continue
-			var/turf/T = get_turf(M)
-			if(!T)
-				continue
-			if(!isPlayerLevel(T.z))
-				continue
-			var/tmpname = M.real_name
-			if(areaindex[tmpname])
-				tmpname = "[tmpname] ([++areaindex[tmpname]])"
-			else
-				areaindex[tmpname] = 1
-			L[tmpname] = used_item
+			areaindex[tmpname] = 1
+		L[tmpname] = used_item
 
 	var/desc = input("Please select a location to lock in.", "Locking Computer") in L|null
 	if(!desc)
@@ -127,16 +127,16 @@
 	audible_message(SPAN_NOTICE("Locked in."))
 	return
 
-/obj/machinery/computer/teleporter/verb/set_id(t as text)
+/obj/machinery/computer/teleporter/verb/set_id(new_tag as text)
 	set category = "Object"
 	set name = "Set teleporter ID"
 	set src in oview(1)
 	set desc = "ID Tag:"
 
 	if(stat & (NOPOWER|BROKEN) || !isliving(usr))
 		return
-	if (t)
-		src.id = t
+	if (new_tag)
+		src.id = new_tag
 	return
 
 /obj/machinery/computer/teleporter/proc/target_lost()