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

code/__DEFINES/tools.dm

@@ -15,6 +15,7 @@
 #define TOOL_SCALPEL "scalpel"
 #define TOOL_SAW "saw"
 #define TOOL_KNIFE "knife" //luv me kuh-nyfe
+#define TOOL_CULTIVATOR "cultivator" // For Cyborg Botany Omni Tool Checks
 
 // If delay between the start and the end of tool operation is less than MIN_TOOL_SOUND_DELAY,
 // tool sound is only played when op is started. If not, it's played twice.

code/_globalvars/lists/flavor_misc.dm

@@ -112,13 +112,23 @@ 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",
+	"Fische",
+	"Fox",
 	"Fuzzy",
+	"Girl",
 	"Gentoo",
 	"Glitchman",
 	"Gondola",
@@ -127,25 +137,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/admin/verbs/borgpanel.dm

@@ -51,10 +51,24 @@
 		"scrambledcodes" = borg.scrambledcodes
 	)
 	.["upgrades"] = list()
-	for (var/upgradetype in subtypesof(/obj/item/borg/upgrade)-/obj/item/borg/upgrade/hypospray) //hypospray is a dummy parent for hypospray upgrades
-		var/obj/item/borg/upgrade/upgrade = upgradetype
-		if (initial(upgrade.module_type) && !is_type_in_list(borg.module, initial(upgrade.module_type))) // Upgrade requires a different module
-			continue
+	var/list/excluded_upgrades = list(
+		/obj/item/borg/upgrade/hypospray, //hypospray is a dummy parent for hypospray upgrades
+		/obj/item/borg/upgrade/transform,
+		/obj/item/borg/upgrade/rename,
+		/obj/item/borg/upgrade/restart,
+		/obj/item/borg/upgrade/modkit,
+	)
+	for (var/upgradetype in subtypesof(/obj/item/borg/upgrade)-excluded_upgrades)
+		var/obj/item/borg/upgrade/upgrade = new upgradetype()
+		if(upgrade.model_type) // Only show upgrades that can be given. Cannot initial() lists either.
+			// is_type_in_list() doesn't work, so this:
+			var/has_req_module = FALSE
+			for(var/req_model_type in upgrade.model_type)
+				if(borg.module.type == req_model_type)
+					has_req_module = TRUE
+					break
+			if(!has_req_module)
+				continue
 		var/installed = FALSE
 		if (locate(upgradetype) in borg)
 			installed = TRUE

code/modules/hydroponics/hydroponics.dm

@@ -573,7 +573,7 @@
 		to_chat(user, examine_block(msg))
 		return
 
-	else if(istype(O, /obj/item/cultivator))
+	else if(istype(O, /obj/item/cultivator) || istype(O, /obj/item/borg/cyborg_omnitool/botany) && O.tool_behaviour == TOOL_CULTIVATOR)
 		if(weedlevel > 0)
 			user.visible_message("[user] uproots the weeds.", "<span class='notice'>You remove the weeds from [src].</span>")
 			weedlevel = 0
@@ -589,7 +589,7 @@
 	else if(default_unfasten_wrench(user, O))
 		return
 
-	else if(istype(O, /obj/item/shovel/spade))
+	else if(istype(O, /obj/item/shovel/spade || istype(O, /obj/item/borg/cyborg_omnitool/botany) && O.tool_behaviour == TOOL_SHOVEL))
 		if(!myseed && !weedlevel)
 			to_chat(user, "<span class='warning'>[src] doesn't have any plants or weeds!</span>")
 			return
@@ -607,6 +607,7 @@
 				desc = initial(desc)
 			weedlevel = 0 //Has a side effect of cleaning up those nasty weeds
 			update_appearance()
+
 	else if(istype(O, /obj/item/gun/energy/floragun))
 		var/obj/item/gun/energy/floragun/flowergun = O
 		if(flowergun.cell.charge < REVOLUTION_CHARGE) // In case an admin var edits the gun or guns gain the ability to have their cell upgraded

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/modules/robots/icons/mob/aiholo.dmi',
+				"holo-borb" = 'modular_pentest/modules/robots/icons/mob/aiholo.dmi',
+				"holo-biggestfan" = 'modular_pentest/modules/robots/icons/mob/aiholo.dmi',
+				"holo-cloudkat" = 'modular_pentest/modules/robots/icons/mob/aiholo.dmi',
+				"holo-donut" = 'modular_pentest/modules/robots/icons/mob/aiholo.dmi',
+				"holo-frostphoenix" = 'modular_pentest/modules/robots/icons/mob/aiholo.dmi'
 				)
 
 			input = input("Please select a hologram:") as null|anything in sortList(icon_list)

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

@@ -230,7 +230,8 @@
 	"Medical" = /obj/item/robot_module/medical, \
 	"Miner" = /obj/item/robot_module/miner, \
 	"Janitor" = /obj/item/robot_module/janitor, \
-	"Service" = /obj/item/robot_module/butler)
+	"Service" = /obj/item/robot_module/butler, \
+	"Science" = /obj/item/robot_module/science)
 	if(!CONFIG_GET(flag/disable_peaceborg))
 		modulelist["Peacekeeper"] = /obj/item/robot_module/peacekeeper
 	if(!CONFIG_GET(flag/disable_secborg))
@@ -450,7 +451,7 @@
 	if(stat != DEAD && !(HAS_TRAIT(src, TRAIT_KNOCKEDOUT) || IsStun() || IsParalyzed() || low_power_mode)) //Not dead, not stunned.
 		if(!eye_lights)
 			eye_lights = new()
-		if(lamp_intensity > 2)
+		if(lamp_enabled)
 			eye_lights.icon_state = "[module.special_light_key ? "[module.special_light_key]":"[module.cyborg_base_icon]"]_l"
 		else
 			eye_lights.icon_state = "[module.special_light_key ? "[module.special_light_key]":"[module.cyborg_base_icon]"]_e"

code/modules/mob/living/silicon/robot/robot_defense.dm

@@ -186,7 +186,7 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real
 		var/obj/item/borg/upgrade/U = W
 		if(!opened)
 			to_chat(user, "<span class='warning'>You must access the cyborg's internals!</span>")
-		else if(!src.module && U.require_module)
+		else if(!src.module && U.require_model)
 			to_chat(user, "<span class='warning'>The cyborg must choose a module before it can be upgraded!</span>")
 		else if(U.locked)
 			to_chat(user, "<span class='warning'>The upgrade is locked and cannot be used yet!</span>")

code/modules/projectiles/guns/energy/kinetic_accelerator.dm

@@ -272,8 +272,8 @@
 	icon = 'icons/obj/objects.dmi'
 	icon_state = "modkit"
 	w_class = WEIGHT_CLASS_SMALL
-	require_module = 1
-	module_type = list(/obj/item/robot_module/miner)
+	require_model = TRUE
+	model_type = list(/obj/item/robot_module/miner)
 	var/denied_type = null
 	var/maximum_of_type = 1
 	var/cost = 30

code/modules/research/techweb/all_nodes.dm

@@ -340,9 +340,18 @@
 	display_name = "Cyborg Upgrades: Utility"
 	description = "Utility upgrades for cyborgs."
 	prereq_ids = list("adv_robotics")
-	design_ids = list("borg_upgrade_thrusters", "borg_upgrade_selfrepair", "borg_upgrade_expand", "borg_upgrade_disablercooler", "borg_upgrade_trashofholding", "borg_upgrade_advancedmop")
+	design_ids = list("borg_upgrade_thrusters", "borg_upgrade_selfrepair", "borg_upgrade_expand", "borg_upgrade_disablercooler")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2000)
-	export_price = 5000
+	export_price = 4000
+
+/datum/techweb_node/cyborg_upg_service
+	id = "cyborg_upg_service"
+	display_name = "Cyborg Upgrades: Janitor & Service"
+	description = "Upgrades for Service cyborgs."
+	prereq_ids = list("adv_robotics")
+	design_ids = list("borg_upgrade_trashofholding", "borg_upgrade_advancedmop", "borg_upgrade_plunger", "borg_upgrade_high_capacity_replacer", "borg_upgrade_broomer", "borg_upgrade_botany", "borg_upgrade_drink_apparatus", "borg_upgrade_rolling_table", "borg_upgrade_service_apparatus", "borg_upgrade_silicon_knife", "borg_upgrade_condiment_synthesizer")
+	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 3000)
+	export_price = 4000
 
 /datum/techweb_node/cyborg_upg_engiminer
 	id = "cyborg_upg_engiminer"
@@ -358,7 +367,7 @@
 	display_name = "Cyborg Upgrades: Medical"
 	description = "Medical upgrades for cyborgs."
 	prereq_ids = list("adv_biotech")
-	design_ids = list("borg_upgrade_defibrillator", "borg_upgrade_piercinghypospray", "borg_upgrade_expandedsynthesiser", "borg_upgrade_pinpointer", "borg_upgrade_surgicalprocessor", "borg_upgrade_beakerapp")
+	design_ids = list("borg_upgrade_defibrillator", "borg_upgrade_piercinghypospray", "borg_upgrade_expandedsynthesiser", "borg_upgrade_pinpointer", "borg_upgrade_surgicalprocessor", "borg_upgrade_beakerapp", "borg_upgrade_advancedmedscan")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2000)
 	export_price = 5000
 
@@ -369,7 +378,7 @@
 	prereq_ids = list("adv_robotics")
 	design_ids = list("aifixer", "aicore", "safeguard_module", "onehuman_module", "protectstation_module", "quarantine_module", "oxygen_module", "freeform_module",
 	"reset_module", "purge_module", "remove_module", "freeformcore_module", "asimov_module", "paladin_module", "tyrant_module", "overlord_module", "corporate_module",
-	"default_module", "borg_ai_control", "mecha_tracking_ai_control", "aiupload", "intellicard")
+	"default_module", "borg_ai_control", "mecha_tracking_ai_control", "aiupload", "intellicard", "borg_upgrade_survey_scanner")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
 	export_price = 5000
 

modular_pentest/master_files/code/game/pentest_proc.dm

@@ -0,0 +1,28 @@
+/*
+
+		Purpose of modularization:
+			Located here are custom created proc code that is not bound to any particular
+			Pentest submodule.
+
+			Editing code here could have drastic effects to downstream code.area
+
+			- Ossa
+
+
+*/
+
+
+/**
+ * Returns the atom(either itself or an internal module) that will interact/attack the target on behalf of us
+ * For example an object can have different `tool_behaviours` (e.g borg omni tool) but will return an internal reference of that tool to attack for us
+ * You can use it for general purpose polymorphism if you need a proxy atom to interact in a specific way
+ * with a target on behalf on this atom
+ *
+ * Currently used only in the object melee attack chain but can be used anywhere else or even moved up to the atom level if required
+ */
+
+// modular_pentest/master_files/code/game/_robot_omnitool.dm
+/obj/item/proc/get_proxy_attacker_for(atom/target, mob/user)
+	RETURN_TYPE(/obj/item)
+
+	return src