add: Б.O.Р.И.С. модуль. Теперь на парашизе.

code/__DEFINES/cooldowns.dm

@@ -53,6 +53,7 @@
 #define COOLDOWN_CIRCUIT_PATHFIND_DIF "circuit_pathfind_different"
 #define COOLDOWN_CIRCUIT_TARGET_INTERCEPT "circuit_target_intercept"
 #define COOLDOWN_CIRCUIT_VIEW_SENSOR "circuit_view_sensor"
+#define COOLDOWN_CIRCUIT_LASER "circuit_laser"
 
 // mob cooldowns
 #define COOLDOWN_YAWN_PROPAGATION "yawn_propagation_cooldown"

code/__DEFINES/hud.dm

@@ -55,6 +55,8 @@
 #define GLAND_HUD "25"
 /// Pressure coloring for tiles
 #define PRESSURE_HUD "26"
+/// AI shell status
+#define DIAG_AISHELL_STAT_HUD "27"
 /// Telepathy bubbles
 #define THOUGHT_HUD "thoughts_hud"
 /// Kidan pheromones hud

code/__DEFINES/mobs.dm

@@ -154,6 +154,11 @@
 #define ROBOT_NOTIFY_AI_CONNECTED 1 //New Cyborg
 #define ROBOT_NOTIFY_AI_MODULE 2 //New Module
 #define ROBOT_NOTIFY_AI_NAME 3 //New Name
+#define AI_NOTIFICATION_AI_SHELL 4 //New AI shell
+//'evacuate_ai()' proc danger levels
+#define DANGER_LVL_NONE "danger_level_none" //0% kill chance
+#define DANGER_LVL_MAY_DIE "danger_level_may_die" //50% kill chance
+#define DANGER_LVL_INSTA_DEATH "danher_level_insta_death" //100% kill chance
 //determines if a mob can smash through it
 #define ENVIRONMENT_SMASH_NONE 0
 #define ENVIRONMENT_SMASH_STRUCTURES 1 //crates, lockers, ect

code/__HELPERS/mobs.dm

@@ -798,7 +798,7 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
 	var/selected_borg_name = null
 	var/list/available_borgs = list()
 	for(var/mob/living/silicon/robot/borg in GLOB.player_list)
-		if(borg.stat == DEAD || borg.connected_ai || borg.scrambledcodes || isdrone(borg) || iscogscarab(borg) || isclocker(borg))
+		if(borg.stat == DEAD || borg.connected_ai || borg.scrambledcodes || isdrone(borg) || iscogscarab(borg) || isclocker(borg) || borg.shell)
 			continue
 		var/borg_name = "[borg.real_name] ([borg.modtype?.name] [borg.braintype])"
 		available_borgs[borg_name] = borg

code/_onclick/hud/_defines.dm

@@ -165,6 +165,8 @@
 #define ui_ai_up "TOP:-6,RIGHT-1"
 #define ui_ai_down "TOP:-6,RIGHT"
 
+#define ui_ai_connect_to_shell "BOTTOM:6,LEFT+3"
+
 // Bots
 #define ui_bot_radio "EAST-1:28,SOUTH:7"
 #define ui_bot_pull "EAST-2:26,SOUTH:7"

code/_onclick/hud/ai.dm

@@ -160,6 +160,15 @@
 		var/mob/living/silicon/ai/AI = usr
 		AI.move_down()
 
+/atom/movable/screen/ai/connect_to_shell
+	name = "Подключиться к оболочке"
+	icon_state = "AIshell"
+
+/atom/movable/screen/ai/connect_to_shell/Click()
+	if(isAI(usr))
+		var/mob/living/silicon/ai/AI = usr
+		AI.deploy_to_shell()
+
 /datum/hud/ai/New(mob/owner)
 	..()
 
@@ -259,3 +268,8 @@
 	using = new /atom/movable/screen/ai/move_down(null, src)
 	using.screen_loc = ui_ai_down
 	static_inventory += using
+
+//Connect to shell
+	using = new /atom/movable/screen/ai/connect_to_shell(null, src)
+	using.screen_loc = ui_ai_connect_to_shell
+	static_inventory += using

code/datums/rituals.dm

@@ -707,7 +707,7 @@
 		smoke.set_up(amount = 5, location = get_turf(human.loc))
 		smoke.start()
 
-		for(var/obj/item/obj as anything in human.get_equipped_items(TRUE, TRUE))
+		for(var/obj/item/obj as anything in human.get_equipped_items(INCLUDE_POCKETS | INCLUDE_HELD))
 			human.drop_item_ground(obj)
 
 	return

code/game/data_huds.dm

@@ -47,10 +47,10 @@
 	hud_icons = list(ID_HUD, IMPTRACK_HUD, IMPMINDSHIELD_HUD, IMPCHEM_HUD, WANTED_HUD)
 
 /datum/atom_hud/data/diagnostic
-	hud_icons = list(DIAG_HUD, DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_MECH_HUD, DIAG_BOT_HUD, DIAG_TRACK_HUD, DIAG_AIRLOCK_HUD)
+	hud_icons = list(DIAG_HUD, DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_MECH_HUD, DIAG_BOT_HUD, DIAG_TRACK_HUD, DIAG_AIRLOCK_HUD, DIAG_AISHELL_STAT_HUD)
 
 /datum/atom_hud/data/diagnostic/advanced
-	hud_icons = list(DIAG_HUD, DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_MECH_HUD, DIAG_BOT_HUD, DIAG_TRACK_HUD, DIAG_AIRLOCK_HUD, DIAG_PATH_HUD)
+	hud_icons = list(DIAG_HUD, DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_MECH_HUD, DIAG_BOT_HUD, DIAG_TRACK_HUD, DIAG_AIRLOCK_HUD, DIAG_PATH_HUD, DIAG_AISHELL_STAT_HUD)
 
 /datum/atom_hud/data/bot_path
 	// This hud exists so the bot can see itself, that's all

code/game/gamemodes/clockwork/clock_magic.dm

@@ -366,7 +366,7 @@
 			playsound(get_turf(src), 'sound/machines/airlockforced.ogg', 80, TRUE)
 			do_sparks(5, TRUE, target)
 			if(do_after(user, 9 SECONDS, candidate))
-				candidate.emp_act(EMP_HEAVY)
+				candidate.Stun(6 SECONDS)
 				candidate.ratvar_act(weak = TRUE)
 				SSticker?.score?.save_silicon_laws(candidate, user, "Ratvar act", log_all_laws = TRUE)
 				channeling = FALSE

code/game/gamemodes/cult/runes.dm

@@ -397,6 +397,13 @@ structure_check() searches for nearby cultist structures required for the invoca
 	playsound(offering, 'sound/misc/demon_consume.ogg', 100, TRUE)
 
 	if((ishuman(offering) || isrobot(offering) || isbrain(offering)) && offering.mind)
+		if(isrobot(offering))
+			var/mob/living/silicon/robot/robot = offering
+			if(robot.shell && robot.mainframe)
+				robot.evacuate_ai(DANGER_LVL_INSTA_DEATH)
+				robot.dust()
+				playsound(offering, 'sound/magic/disintegrate.ogg', 100, TRUE)
+				return TRUE
 		var/obj/item/soulstone/stone = new /obj/item/soulstone(get_turf(src))
 		stone.invisibility = INVISIBILITY_MAXIMUM // So it's not picked up during transfer_soul()
 		stone.transfer_soul("FORCE", offering, user) // If it cannot be added

code/game/gamemodes/shadowling/special_shadowling_abilities.dm

@@ -30,7 +30,7 @@ GLOBAL_LIST_INIT(possibleShadowlingNames, list("U'ruan", "Y`shej", "Nex", "Hel-u
 	user.visible_message(span_warning("Вещи [user] неожиданно начали сползать. С них стекает обильное количество фиолетовой жижи, которая формируется вокруг них."), \
 						span_shadowling("Вы сбрасываете одежду, которая может помешать вашему вылуплению и начинаете выделять смолу, которая защитит вас."))
 	user.Stun(35 SECONDS, TRUE)
-	for(var/obj/item/item as anything in user.get_equipped_items(TRUE, TRUE))
+	for(var/obj/item/item as anything in user.get_equipped_items(INCLUDE_POCKETS | INCLUDE_HELD))
 		user.drop_item_ground(item, force = TRUE)
 
 	sleep(5 SECONDS)
@@ -242,7 +242,7 @@ GLOBAL_LIST_INIT(possibleShadowlingNames, list("U'ruan", "Y`shej", "Nex", "Hel-u
  * Testing purpose.
  */
 /mob/living/carbon/human/proc/make_unhatched_shadowling()
-	for(var/obj/item/item as anything in get_equipped_items(TRUE, TRUE))
+	for(var/obj/item/item as anything in get_equipped_items(INCLUDE_POCKETS | INCLUDE_HELD))
 		drop_item_ground(item, force = TRUE)
 
 	var/newNameId = pick(GLOB.possibleShadowlingNames)

code/game/machinery/computer/law.dm

@@ -134,6 +134,10 @@
 	installed_module.transmit_instructions(current, user, reg_name)
 	to_chat(current, "These are your laws now:")
 	current.show_laws()
+	if(isAI(current))
+		var/mob/living/silicon/ai/AI = current
+		if(AI.deployed_shell)
+			AI.deployed_shell.show_laws()
 	for(var/mob/living/silicon/robot/R in GLOB.mob_list)
 		if(R.lawupdate && (R.connected_ai == current))
 			to_chat(R, "These are your laws now:")

code/game/machinery/computer/robot.dm

@@ -45,8 +45,6 @@
 		return FALSE
 	if(iscogscarab(R))
 		return FALSE
-	if(iscogscarab(R))
-		return FALSE
 	if(R.scrambledcodes)
 		return FALSE
 	if(!are_zs_connected(src, R))
@@ -162,6 +160,8 @@
 			synchronization = R.connected_ai,
 			is_hacked =  R.connected_ai && R.emagged,
 			hackable = can_hack(user, R),
+			is_shell = R.shell,
+			occupier = R.mainframe? R.mainframe.name : "None",
 		)
 		data["cyborgs"] += list(cyborg_data)
 	data["show_detonate_all"] = (data["auth"] && length(data["cyborgs"]) > 0 && ishuman(user))

code/game/machinery/recycler.dm

@@ -146,41 +146,40 @@
 	emergency_mode = FALSE
 	update_icon(UPDATE_ICON_STATE)
 
-/obj/machinery/recycler/proc/crush_living(mob/living/L)
+/obj/machinery/recycler/proc/crush_living(mob/living/target)
+	target.forceMove(loc)
 
-	L.forceMove(loc)
-
-	if(issilicon(L))
+	if(issilicon(target))
 		playsound(loc, 'sound/items/welder.ogg', 50, TRUE)
 	else
 		playsound(loc, 'sound/effects/splat.ogg', 50, TRUE)
 
 	var/gib = 1
 	// By default, the emagged recycler will gib all non-carbons. (human simple animal mobs don't count)
-	if(iscarbon(L))
+	if(iscarbon(target))
 		gib = 0
-		if(L.stat == CONSCIOUS)
-			L.say("ARRRRRRRRRRRGH!!!")
-		add_mob_blood(L)
+		if(target.stat == CONSCIOUS)
+			target.say("ARRRRRRRRRRRGH!!!")
+		add_mob_blood(target)
 
-	if(!blood && !issilicon(L))
+	if(!blood && !issilicon(target))
 		blood = 1
 		update_icon(UPDATE_ICON_STATE)
 
 	// Remove and recycle the equipped items
 	if(eat_victim_items)
-		for(var/obj/item/I in L.get_equipped_items(TRUE, TRUE))
-			if(L.drop_item_ground(I))
-				eat(I, sound = 0)
+		for(var/obj/item/item in target.get_equipped_items(INCLUDE_POCKETS | INCLUDE_HELD))
+			if(target.drop_item_ground(item))
+				eat(item, sound = 0)
 
 	// Instantly lie down, also go unconscious from the pain, before you die.
-	L.Paralyse(10 SECONDS)
+	target.Paralyse(10 SECONDS)
 
 	// For admin fun, var edit emagged to 2.
 	if(gib || emagged == 2)
-		L.gib()
+		target.gib()
 	else if(emagged == 1)
-		L.adjustBruteLoss(crush_damage)
+		target.adjustBruteLoss(crush_damage)
 
 /obj/machinery/recycler/verb/rotate()
 	set name = "Повернуть по часовой"

code/game/objects/items.dm

@@ -816,12 +816,12 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/g
  * Returns `TRUE` if the item is equipped by a mob, `FALSE` otherwise.
  * This might need some error trapping, not sure if get_equipped_items() is safe for non-human mobs.
  */
-/obj/item/proc/is_equipped(include_pockets = FALSE, include_hands = FALSE)
+/obj/item/proc/is_equipped(include_flags = NONE)
 	if(!ismob(loc))
 		return FALSE
 
 	var/mob/M = loc
-	if(src in M.get_equipped_items(include_pockets, include_hands))
+	if(src in M.get_equipped_items(include_flags))
 		return TRUE
 	else
 		return FALSE

code/game/objects/items/devices/traitordevices.dm

@@ -384,7 +384,7 @@ effective or pretty fucking useless.
 	playsound(destination, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
 	playsound(destination, 'sound/magic/disintegrate.ogg', 50, TRUE)
 	destination.ex_act(rand(EXPLODE_DEVASTATE, EXPLODE_HEAVY))
-	for(var/obj/item/thing as anything in user.get_equipped_items(TRUE, TRUE))
+	for(var/obj/item/thing as anything in user.get_equipped_items(INCLUDE_POCKETS | INCLUDE_HELD))
 		if(!user.drop_item_ground(thing))
 			qdel(thing)
 	to_chat(user, span_biggerdanger("You teleport into the wall, the teleporter tries to save you, but--"))