Silicon Updates - AI Cores - Holograms - Borgs - On My!

code/_globalvars/lists/flavor_misc.dm

@@ -112,13 +112,22 @@ GLOBAL_LIST_INIT(ai_core_display_screens, sortList(list(
 	"Alien",
 	"Angel",
 	"Banned",
+	"Bee",
+	"Borb",
+	"Boy",
+	"BoxFort",
 	"Bliss",
 	"Blue",
+	"Catamari",
+	"Cheese",
 	"Clown",
+	"Darkmatter",
 	"Database",
 	"Dorf",
 	"Firewall",
+	"Fox",
 	"Fuzzy",
+	"Girl",
 	"Gentoo",
 	"Glitchman",
 	"Gondola",
@@ -127,25 +136,35 @@ GLOBAL_LIST_INIT(ai_core_display_screens, sortList(list(
 	"HAL 9000",
 	"Heartline",
 	"Helios",
+	"Hotdog",
 	"House",
 	"Inverted",
 	"Lamp",
+	"Liz",
 	"Matrix",
 	"Monochrome",
 	"Murica",
+	"Nadburn",
 	"Nanotrasen",
 	"Not Malf",
 	"President",
 	"Random",
 	"Rainbow",
+	"Rainbowslime",
+	"RandomGod",
 	"Red",
 	"Red October",
 	"Static",
 	"Syndicat Meow",
 	"Text",
+	"Terminal",
+	"Tiger",
 	"Too Deep",
 	"Triumvirate",
 	"Triumvirate-M",
+	"Voiddonut",
+	"Vox",
+	"YesMan",
 	"Weird")))
 
 /proc/resolve_ai_icon(input)

code/modules/mob/living/silicon/ai/ai.dm

@@ -676,7 +676,13 @@
 				"floating face" = 'icons/mob/ai.dmi',
 				"xeno queen" = 'icons/mob/alien.dmi',
 				"horror" = 'icons/mob/ai.dmi',
-				"clock" = 'icons/mob/ai.dmi'
+				"clock" = 'icons/mob/ai.dmi',
+				"holo-angel" = 'modular_pentest/icons/mob/aiholo.dmi',
+				"holo-borb" = 'modular_pentest/icons/mob/aiholo.dmi',
+				"holo-biggestfan" = 'modular_pentest/icons/mob/aiholo.dmi',
+				"holo-cloudkat" = 'modular_pentest/icons/mob/aiholo.dmi',
+				"holo-donut" = 'modular_pentest/icons/mob/aiholo.dmi',
+				"holo-frostphoenix" = 'modular_pentest/icons/mob/aiholo.dmi'
 				)
 
 			input = input("Please select a hologram:") as null|anything in sortList(icon_list)

modular_pentest/modules/robots/_robot_modules.dm

@@ -0,0 +1,257 @@
+/*
+		Replaces robot_modules.dm
+
+		Code to allow the selection of modules for borgs
+		Contains the general borg module selector code
+
+		For Types see the following:
+
+		Clown Borg Upgrades: clown_borg.dm
+		Default Borg Upgrades: default_borg.dm
+		Engineering Borg Upgrades: engi_borg.dm
+		Janitor Borg Upgrades: jani_borg.dm
+		Medical Borg Upgrades: med_borg.dm
+		Miner Borg Upgrades: miner_borg.dm
+		Ninja Borg Upgrades: ninja_borg.dm
+		Peacekeeper Borg Upgrades: peace_borg.dm
+		Security Borg Upgrades: sec_borg.dm
+		Service Borg Upgrades: serv_borg.dm
+		Syndicate Borg Upgeades: synd_borg.dm
+*/
+
+/obj/item/robot_module
+	name = "Default"
+	icon = 'icons/obj/module.dmi'
+	icon_state = "std_mod"
+	w_class = WEIGHT_CLASS_GIGANTIC
+	item_state = "electronic"
+	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
+	flags_1 = CONDUCT_1
+
+	var/list/basic_modules = list() //a list of paths, converted to a list of instances on New()
+	var/list/emag_modules = list() //ditto
+	var/list/modules = list() //holds all the usable modules
+	var/list/added_modules = list() //modules not inherient to the robot module, are kept when the module changes
+	var/list/storages = list()
+
+	var/cyborg_base_icon = "robot" //produces the icon for the borg and, if no special_light_key is set, the lights
+	var/special_light_key //if we want specific lights, use this instead of copying lights in the dmi
+
+	var/moduleselect_icon = "nomod"
+
+	var/can_be_pushed = TRUE
+	var/magpulsing = FALSE
+	var/clean_on_move = FALSE
+
+	var/did_feedback = FALSE
+
+	var/hat_offset = -3
+
+	var/list/ride_offset_x = list("north" = 0, "south" = 0, "east" = -6, "west" = 6)
+	var/list/ride_offset_y = list("north" = 4, "south" = 4, "east" = 3, "west" = 3)
+	var/ride_allow_incapacitated = TRUE
+	var/allow_riding = TRUE
+	var/canDispose = FALSE // Whether the borg can stuff itself into disposal
+
+	var/icon/cyborg_icon_override //WS Addition, need this shit to use VG icons
+
+/obj/item/robot_module/Initialize()
+	. = ..()
+	for(var/i in basic_modules)
+		var/obj/item/I = new i(src)
+		basic_modules += I
+		basic_modules -= i
+	for(var/i in emag_modules)
+		var/obj/item/I = new i(src)
+		emag_modules += I
+		emag_modules -= i
+
+/obj/item/robot_module/Destroy()
+	basic_modules.Cut()
+	emag_modules.Cut()
+	modules.Cut()
+	added_modules.Cut()
+	storages.Cut()
+	return ..()
+
+/obj/item/robot_module/emp_act(severity)
+	. = ..()
+	if(. & EMP_PROTECT_CONTENTS)
+		return
+	for(var/obj/O in modules)
+		O.emp_act(severity)
+	..()
+
+/obj/item/robot_module/proc/get_usable_modules()
+	. = modules.Copy()
+
+/obj/item/robot_module/proc/get_inactive_modules()
+	. = list()
+	var/mob/living/silicon/robot/R = loc
+	for(var/m in get_usable_modules())
+		if(!(m in R.held_items))
+			. += m
+
+/obj/item/robot_module/proc/get_or_create_estorage(storage_type)
+	for(var/datum/robot_energy_storage/S in storages)
+		if(istype(S, storage_type))
+			return S
+
+	return new storage_type(src)
+
+/obj/item/robot_module/proc/add_module(obj/item/I, nonstandard, requires_rebuild)
+	if(istype(I, /obj/item/stack))
+		var/obj/item/stack/S = I
+
+		if(is_type_in_list(S, list(/obj/item/stack/sheet/metal, /obj/item/stack/rods, /obj/item/stack/tile/plasteel)))
+			if(S.custom_materials && custom_materials.len)
+				if(S.custom_materials[SSmaterials.GetMaterialRef(/datum/material/iron)])
+					S.cost = S.custom_materials[SSmaterials.GetMaterialRef(/datum/material/iron)] * 0.25
+			S.source = get_or_create_estorage(/datum/robot_energy_storage/metal)
+
+		else if(istype(S, /obj/item/stack/sheet/glass))
+			S.cost = 500
+			S.source = get_or_create_estorage(/datum/robot_energy_storage/glass)
+
+		else if(istype(S, /obj/item/stack/medical))
+			S.cost = 250
+			S.source = get_or_create_estorage(/datum/robot_energy_storage/medical)
+
+		else if(istype(S, /obj/item/stack/cable_coil))
+			S.cost = 1
+			S.source = get_or_create_estorage(/datum/robot_energy_storage/wire)
+
+		else if(istype(S, /obj/item/stack/marker_beacon))
+			S.cost = 1
+			S.source = get_or_create_estorage(/datum/robot_energy_storage/beacon)
+
+		if(S && S.source)
+			S.custom_materials = null
+			S.is_cyborg = 1
+
+	if(I.loc != src)
+		I.forceMove(src)
+	modules += I
+	ADD_TRAIT(I, TRAIT_NODROP, CYBORG_ITEM_TRAIT)
+	I.mouse_opacity = MOUSE_OPACITY_OPAQUE
+	if(nonstandard)
+		added_modules += I
+	if(requires_rebuild)
+		rebuild_modules()
+	return I
+
+/obj/item/robot_module/proc/remove_module(obj/item/I, delete_after)
+	basic_modules -= I
+	modules -= I
+	emag_modules -= I
+	added_modules -= I
+	rebuild_modules()
+	if(delete_after)
+		qdel(I)
+
+/obj/item/robot_module/proc/respawn_consumable(mob/living/silicon/robot/R, coeff = 1)
+	for(var/datum/robot_energy_storage/st in storages)
+		st.energy = min(st.max_energy, st.energy + coeff * st.recharge_rate)
+
+	for(var/obj/item/I in get_usable_modules())
+		if(istype(I, /obj/item/assembly/flash))
+			var/obj/item/assembly/flash/F = I
+			F.times_used = 0
+			F.burnt_out = FALSE
+			F.update_appearance()
+		else if(istype(I, /obj/item/melee/baton))
+			var/obj/item/melee/baton/B = I
+			if(B.cell)
+				B.cell.charge = B.cell.maxcharge
+		else if(istype(I, /obj/item/gun/energy))
+			var/obj/item/gun/energy/EG = I
+			if(!EG.chambered)
+				EG.recharge_newshot() //try to reload a new shot.
+
+	R.toner = R.tonermax
+
+/obj/item/robot_module/proc/rebuild_modules() //builds the usable module list from the modules we have
+	var/mob/living/silicon/robot/R = loc
+	var/held_modules = R.held_items.Copy()
+	R.uneq_all()
+	modules = list()
+	for(var/obj/item/I in basic_modules)
+		add_module(I, FALSE, FALSE)
+	if(R.emagged)
+		for(var/obj/item/I in emag_modules)
+			add_module(I, FALSE, FALSE)
+	for(var/obj/item/I in added_modules)
+		add_module(I, FALSE, FALSE)
+	for(var/i in held_modules)
+		if(i)
+			R.activate_module(i)
+	if(R.hud_used)
+		R.hud_used.update_robot_modules_display()
+
+/obj/item/robot_module/proc/transform_to(new_module_type)
+	var/mob/living/silicon/robot/R = loc
+	var/obj/item/robot_module/RM = new new_module_type(R)
+	if(!RM.be_transformed_to(src))
+		qdel(RM)
+		return
+	R.module = RM
+	R.update_module_innate()
+	RM.rebuild_modules()
+	INVOKE_ASYNC(RM, PROC_REF(do_transform_animation))
+	qdel(src)
+	return RM
+
+/obj/item/robot_module/proc/be_transformed_to(obj/item/robot_module/old_module)
+	for(var/i in old_module.added_modules)
+		added_modules += i
+		old_module.added_modules -= i
+	did_feedback = old_module.did_feedback
+	return TRUE
+
+/obj/item/robot_module/proc/do_transform_animation()
+	var/mob/living/silicon/robot/R = loc
+	if(R.hat)
+		R.hat.forceMove(get_turf(R))
+		R.hat = null
+	R.cut_overlays()
+	R.setDir(SOUTH)
+	do_transform_delay()
+
+/obj/item/robot_module/proc/do_transform_delay()
+	var/mob/living/silicon/robot/R = loc
+	var/prev_lockcharge = R.lockcharge
+	sleep(1)
+	flick("[cyborg_base_icon]_transform", R)
+	R.notransform = TRUE
+	R.SetLockdown(1)
+	R.set_anchored(TRUE)
+	R.logevent("Chassis configuration has been set to [name].")
+	sleep(1)
+	for(var/i in 1 to 4)
+		playsound(R, pick('sound/items/drill_use.ogg', 'sound/items/jaws_cut.ogg', 'sound/items/jaws_pry.ogg', 'sound/items/welder.ogg', 'sound/items/ratchet.ogg'), 80, TRUE, -1)
+		sleep(7)
+	if(!prev_lockcharge)
+		R.SetLockdown(0)
+	R.setDir(SOUTH)
+	R.set_anchored(FALSE)
+	R.notransform = FALSE
+	R.updatehealth()
+	R.update_icons()
+	R.notify_ai(NEW_MODULE)
+	if(R.hud_used)
+		R.hud_used.update_robot_modules_display()
+	SSblackbox.record_feedback("tally", "cyborg_modules", 1, R.module)
+
+/**
+ * check_menu: Checks if we are allowed to interact with a radial menu
+ *
+ * Arguments:
+ * * user The mob interacting with a menu
+ */
+/obj/item/robot_module/proc/check_menu(mob/user)
+	if(!istype(user))
+		return FALSE
+	if(user.incapacitated() || !user.Adjacent(src))
+		return FALSE
+	return TRUE