Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45

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

@@ -49,7 +49,7 @@
 		else
 			padloc = "(UNKNOWN)"
 		src.log_talk(message, LOG_SAY, tag="HOLOPAD in [padloc]")
-		send_speech(message, 7, T, "robot", get_spans(), language)
+		send_speech(message, 7, T, "robot", language = language)
 		to_chat(src, "<i><span class='game say'>Holopad transmitted, <span class='name'>[real_name]</span> <span class='message robot'>\"[message]\"</span></span></i>")
 	else
 		to_chat(src, "No holopad connected.")

code/modules/mob/living/silicon/pai/pai_shell.dm

@@ -29,6 +29,13 @@
 		if(!L.temporarilyRemoveItemFromInventory(card))
 			to_chat(src, "<span class='warning'>Error: Unable to expand to mobile form. Chassis is restrained by some device or person.</span>")
 			return FALSE
+	if(istype(card.loc, /obj/item/integrated_circuit/input/pAI_connector))
+		var/obj/item/integrated_circuit/input/pAI_connector/C = card.loc
+		C.RemovepAI()
+		C.visible_message("<span class='notice'>[src] ejects itself from [C]!</span>")
+		playsound(src, 'sound/items/Crowbar.ogg', 50, 1)
+		C.installed_pai = null
+		C.push_data()
 	forceMove(get_turf(card))
 	card.forceMove(src)
 	if(client)

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

@@ -580,6 +580,19 @@
 	else
 		return ..()
 
+/mob/living/silicon/robot/crowbar_act(mob/living/user, obj/item/I) //TODO: make fucking everything up there in that attackby() proc use the proper tool_act() procs. But honestly, who has time for that? 'cause I know for sure that you, the person reading this, sure as hell doesn't.
+	var/validbreakout = FALSE
+	for(var/obj/item/dogborg/sleeper/S in held_items)
+		if(!LAZYLEN(S.contents))
+			continue
+		if(!validbreakout)
+			visible_message("<span class='notice'>[user] wedges [I] into the crevice separating [S] from [src]'s chassis, and begins to pry...</span>", "<span class='notice'>You wedge [I] into the crevice separating [S] from [src]'s chassis, and begin to pry...</span>")
+		validbreakout = TRUE
+		S.go_out()
+	if(validbreakout)
+		return TRUE
+	return ..()
+
 /mob/living/silicon/robot/verb/unlock_own_cover()
 	set category = "Robot Commands"
 	set name = "Unlock Cover"

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

@@ -119,7 +119,7 @@
 	if(I.loc != src)
 		I.forceMove(src)
 	modules += I
-	I.item_flags |= NODROP
+	ADD_TRAIT(I, TRAIT_NODROP, CYBORG_ITEM_TRAIT)
 	I.mouse_opacity = MOUSE_OPACITY_OPAQUE
 	if(nonstandard)
 		added_modules += I

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

@@ -1,14 +1,10 @@
-
-/mob/living/silicon/get_spans()
-	return ..() | SPAN_ROBOT
-
 /mob/living/proc/robot_talk(message)
 	log_talk(message, LOG_SAY)
 	var/desig = "Default Cyborg" //ezmode for taters
 	if(issilicon(src))
 		var/mob/living/silicon/S = src
 		desig = trim_left(S.designation + " " + S.job)
-	var/message_a = say_quote(message, get_spans())
+	var/message_a = say_quote(message)
 	var/rendered = "Robotic Talk, <span class='name'>[name]</span> <span class='message'>[message_a]</span>"
 	for(var/mob/M in GLOB.player_list)
 		if(M.binarycheck())

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

@@ -12,6 +12,7 @@
 	possible_a_intents = list(INTENT_HELP, INTENT_HARM)
 	mob_biotypes = list(MOB_ROBOTIC)
 	rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE
+	speech_span = SPAN_ROBOT
 
 	var/datum/ai_laws/laws = null//Now... THEY ALL CAN ALL HAVE LAWS
 	var/last_lawchange_announce = 0
@@ -69,6 +70,9 @@
 /mob/living/silicon/contents_explosion(severity, target)
 	return
 
+/mob/living/silicon/prevent_content_explosion()
+	return TRUE
+
 /mob/living/silicon/proc/cancelAlarm()
 	return