Refactors human NPCs

_maps/map_files/generic/CentCom_minimal.dmm

@@ -2,29 +2,65 @@
 "a" = (
 /turf/open/floor/iron,
 /area/centcom/central_command_areas/control)
-"g" = (
-/obj/machinery/light/floor,
-/turf/open/floor/iron,
+"d" = (
+/turf/closed/wall/vampwall,
 /area/centcom/central_command_areas/control)
 "h" = (
 /turf/closed/indestructible/riveted,
 /area/centcom/central_command_areas/control)
+"p" = (
+/obj/machinery/light/floor,
+/obj/effect/landmark/npcbeacon,
+/turf/open/floor/iron,
+/area/centcom/central_command_areas/control)
+"s" = (
+/mob/living/carbon/human/npc/police/standing,
+/turf/open/floor/iron,
+/area/centcom/central_command_areas/control)
 "x" = (
 /obj/effect/landmark/error,
 /obj/effect/landmark/observer_start,
 /obj/effect/landmark/latejoin,
 /turf/open/floor/iron,
 /area/centcom/central_command_areas/control)
+"y" = (
+/obj/structure/vampdoor{
+	dir = 4
+	},
+/turf/open/floor/iron,
+/area/centcom/central_command_areas/control)
 "A" = (
 /turf/cordon,
 /area/space)
 "G" = (
 /turf/closed/indestructible/splashscreen,
 /area/space)
+"H" = (
+/obj/effect/landmark/npcbeacon,
+/obj/machinery/light/floor,
+/turf/open/floor/iron,
+/area/centcom/central_command_areas/control)
+"P" = (
+/obj/structure/vampdoor,
+/turf/open/floor/iron,
+/area/centcom/central_command_areas/control)
+"Q" = (
+/obj/effect/landmark/ai_avoid_turf,
+/turf/open/floor/carpet,
+/area/centcom/central_command_areas/control)
+"U" = (
+/mob/living/carbon/human/npc,
+/turf/open/floor/iron,
+/area/centcom/central_command_areas/control)
 "W" = (
 /obj/effect/landmark/start/new_player,
 /turf/cordon,
 /area/space)
+"Z" = (
+/obj/effect/landmark/ai_avoid_turf,
+/obj/effect/landmark/ai_avoid_turf,
+/turf/open/floor/carpet,
+/area/centcom/central_command_areas/control)
 
 (1,1,1) = {"
 A
@@ -144,9 +180,9 @@ a
 a
 a
 a
+Q
 a
-a
-a
+Q
 a
 a
 a
@@ -173,15 +209,15 @@ A
 h
 a
 a
+H
 a
 a
+Q
+p
+Q
 a
 a
-g
-a
-a
-a
-a
+H
 a
 a
 h
@@ -208,9 +244,9 @@ a
 a
 a
 a
-a
-a
-a
+Q
+Q
+Q
 a
 a
 a
@@ -268,17 +304,17 @@ A
 A
 h
 a
+Q
+Q
+Q
 a
 a
 a
 a
 a
-a
-a
-a
-a
-a
-a
+Q
+Q
+Q
 a
 h
 "}
@@ -301,15 +337,15 @@ A
 h
 a
 a
-g
-a
-a
+p
+Q
+U
 a
-g
+p
 x
 a
-a
-g
+Q
+p
 a
 a
 h
@@ -332,17 +368,17 @@ A
 A
 h
 a
+Q
+Q
+Q
 a
 a
+s
 a
 a
-a
-a
-a
-a
-a
-a
-a
+Z
+Q
+Q
 a
 h
 "}
@@ -363,19 +399,19 @@ A
 A
 A
 h
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+d
+d
+d
+d
+y
+d
+d
+d
+y
+d
+d
+d
+d
 h
 "}
 (12,1,1) = {"
@@ -400,11 +436,11 @@ a
 a
 a
 a
+Q
+Q
+Q
 a
-a
-a
-a
-a
+d
 a
 a
 a
@@ -429,15 +465,15 @@ A
 h
 a
 a
+H
 a
 a
+Q
+p
+Q
 a
-a
-g
-a
-a
-a
-a
+d
+H
 a
 a
 h
@@ -464,11 +500,11 @@ a
 a
 a
 a
+Q
 a
+Q
 a
-a
-a
-a
+d
 a
 a
 a
@@ -500,7 +536,7 @@ a
 a
 a
 a
-a
+P
 a
 a
 a
@@ -532,7 +568,7 @@ a
 a
 a
 a
-a
+d
 a
 a
 a

code/__DEFINES/~darkpack/factions.dm

@@ -7,5 +7,5 @@
 
 // City faction
 #define FACTION_CITY "city"
-
 #define FACTION_GAIA "gaia"
+#define FACTION_NPC "npc"

code/modules/admin/verbs/list_exposer.dm

@@ -36,7 +36,7 @@
 	for(var/entry in GLOB.human_list)
 		var/mob/living/carbon/human/subject = entry
 		if(subject.ckey)
-			data += "<tr><td>[subject]</td><td>[subject.dna.unique_enzymes]</td><td>[subject.get_bloodtype()?.name]</td></tr>"
+			data += "<tr><td>[subject.real_name]</td><td>[subject.dna.unique_enzymes]</td><td>[subject.get_bloodtype()?.name]</td></tr>" // DARKPACK EDIT, ORIGINAL: data += "<tr><td>[subject]</td><td>[subject.dna.unique_enzymes]</td><td>[subject.get_bloodtype()?.name]</td></tr>"
 	data += "</table>"
 
 	var/datum/browser/browser = new(usr, "DNA", "DNA Log", 440, 410)

modular_darkpack/modules/blood_drinking/code/drinksomeblood.dm

@@ -6,11 +6,6 @@
 		src.emote("moan")
 		Immobilize(30, TRUE)
 
-	if(isnpc(mob))
-		var/mob/living/carbon/human/npc/NPC = mob
-		NPC.danger_source = null
-		mob.Stun(40) //NPCs don't get to resist
-
 	if(mob.blood_volume <= BLOOD_VOLUME_BAD)
 		to_chat(src, span_warning("Your victim's heart beats only weakly. Death comes for them."))
 

modular_darkpack/modules/blood_drinking/code/overfeeding/handle_overfeeding.dm

@@ -1,13 +1,6 @@
 /mob/living/carbon/human/proc/handle_overfeeding(var/mob/living/carbon/human/human_mob)
 	human_mob.blood_volume = 0
 	if(human_mob.stat != DEAD)
-		if(isnpc(human_mob))
-			var/mob/living/carbon/human/npc/Npc = human_mob
-			Npc.last_attacker = null
-			killed_count = killed_count+1
-			if(killed_count >= 5)
-				SEND_SOUND(src, sound('modular_darkpack/modules/deprecated/sounds/humanity_loss.ogg', 0, 0, 75))
-				to_chat(src, span_userdanger("<b>POLICE ASSAULT IN PROGRESS</b>"))
 		SEND_SOUND(src, sound('modular_darkpack/modules/deprecated/sounds/feed_failed.ogg', 0, 0, 75))
 		to_chat(src, span_warning("This sad sacrifice for your own pleasure affects something deep in your mind."))
 		SEND_SIGNAL(src, COMSIG_PATH_HIT, -1, 0, FALSE)

modular_darkpack/modules/cars/code/car.dm

@@ -238,8 +238,6 @@
 	if(!locked)
 		to_chat(user, span_warning("The [src] is already unlocked."))
 		return
-	for(var/mob/living/carbon/human/npc/police/P in oviewers(DEFAULT_SIGHT_DISTANCE, src))
-		P.Aggro(user)
 	log_game("[user] tried lockpicking [src]")
 	var/total_lockpicking = user.st_get_stat(STAT_LARCENY)
 	if(CONFIG_GET(flag/punishing_zero_dots) && total_lockpicking < 1)
@@ -291,8 +289,6 @@
 		if(!driver && !length(passengers) && COOLDOWN_FINISHED(src, beep_cooldown) && locked)
 			COOLDOWN_START(src, beep_cooldown, 7 SECONDS)
 			playsound(src, 'modular_darkpack/modules/cars/sounds/signal.ogg', 50, FALSE)
-			for(var/mob/living/carbon/human/npc/police/P in oviewers(DEFAULT_SIGHT_DISTANCE, src))
-				P.Aggro(user)
 
 		if(prob(10) && locked)
 			playsound(src, 'modular_darkpack/modules/cars/sounds/open.ogg', 50, TRUE)
@@ -497,10 +493,6 @@
 		speed_in_pixels = 0
 		COOLDOWN_START(src, impact_delay, 2 SECONDS)
 
-	if(driver && istype(bumped_atom, /mob/living/carbon/human/npc))
-		var/mob/living/carbon/human/npc/NPC = bumped_atom
-		NPC.Aggro(driver, TRUE)
-
 	last_pos["x_pix"] = 0
 	last_pos["y_pix"] = 0
 	for(var/mob/living/L in src)
@@ -560,8 +552,6 @@
 		// Here lies the Car Backwards Long Jump - 2021-2025
 		var/turf/check_turf = get_turf_in_angle(true_movement_angle, src.loc, 3)
 
-		handle_npc_dodge(check_turf, true_movement_angle)
-
 		var/turf/hit_turf
 		var/list/in_line = get_line(src, check_turf)
 		for(var/turf/T in in_line)
@@ -610,28 +600,6 @@
 	animate(src, pixel_x = last_pos["x_pix"]+moved_x, pixel_y = last_pos["y_pix"]+moved_y, SScarpool.wait, 1)
 	update_last_pos(moved_x, moved_y)
 
-/obj/darkpack_car/proc/handle_npc_dodge(turf/target, angle)
-	for(var/turf/T in get_line(src, target))
-		var/list/unpassable = T.get_blocking_contents(FALSE, src)
-		if(!length(unpassable))
-			continue
-		for(var/mob/living/carbon/human/npc/NPC in unpassable)
-			if(COOLDOWN_FINISHED(NPC, car_dodge) && !HAS_TRAIT(NPC, TRAIT_INCAPACITATED))
-				var/list/dodge_direction = list(
-					SIMPLIFY_DEGREES(angle + 45),
-					SIMPLIFY_DEGREES(angle - 45),
-					SIMPLIFY_DEGREES(angle + 90),
-					SIMPLIFY_DEGREES(angle - 90),
-				)
-				for(var/dir_angle in dodge_direction)
-					if(get_step(NPC, angle2dir(dir_angle)).density)
-						dodge_direction.Remove(dir_angle)
-				if(length(dodge_direction))
-					step(NPC, angle2dir(pick(dodge_direction)), NPC.cached_multiplicative_slowdown)
-					COOLDOWN_START(NPC, car_dodge, 2 SECONDS)
-					if(prob(50))
-						NPC.realistic_say(pick(NPC.socialrole.car_dodged))
-
 /// Moves the client cameras of living inside of the car.
 /obj/darkpack_car/proc/move_car_riders(moved_x, moved_y)
 	for(var/mob/living/rider in src)