Bug fixes, give roboticist toolbelt, AI recall shuttle option

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

@@ -110,7 +110,7 @@ var/list/ai_list = list()
 	if (istype(loc, /turf))
 		verbs.Add(/mob/living/silicon/ai/proc/ai_network_change, \
 		/mob/living/silicon/ai/proc/ai_statuschange, /mob/living/silicon/ai/proc/ai_hologram_change, \
-		/mob/living/silicon/ai/proc/toggle_camera_light, /mob/living/silicon/ai/proc/botcall, /mob/living/silicon/ai/proc/control_integrated_radio, /mob/living/silicon/ai/proc/control_hud, /mob/living/silicon/ai/proc/change_arrival_message, /mob/living/silicon/ai/proc/ai_store_location, /mob/living/silicon/ai/proc/ai_goto_location, /mob/living/silicon/ai/proc/ai_remove_location, /mob/living/silicon/ai/proc/nano_crew_monitor)
+		/mob/living/silicon/ai/proc/toggle_camera_light, /mob/living/silicon/ai/proc/botcall, /mob/living/silicon/ai/proc/control_integrated_radio, /mob/living/silicon/ai/proc/control_hud, /mob/living/silicon/ai/proc/change_arrival_message, /mob/living/silicon/ai/proc/ai_store_location, /mob/living/silicon/ai/proc/ai_goto_location, /mob/living/silicon/ai/proc/ai_remove_location, /mob/living/silicon/ai/proc/nano_crew_monitor, /mob/living/silicon/ai/proc/ai_cancel_call)
 
 	if(!safety)//Only used by AIize() to successfully spawn an AI.
 		if (!B)//If there is no player/brain inside.
@@ -125,7 +125,7 @@ var/list/ai_list = list()
 					verbs.Remove(,/mob/living/silicon/ai/proc/ai_call_shuttle,/mob/living/silicon/ai/proc/ai_camera_track, \
 					/mob/living/silicon/ai/proc/ai_camera_list, /mob/living/silicon/ai/proc/ai_network_change, \
 					/mob/living/silicon/ai/proc/ai_statuschange, /mob/living/silicon/ai/proc/ai_hologram_change, \
-					/mob/living/silicon/ai/proc/toggle_camera_light,/mob/living/silicon/ai/verb/pick_icon,/mob/living/silicon/ai/proc/control_hud, /mob/living/silicon/ai/proc/change_arrival_message)
+					/mob/living/silicon/ai/proc/toggle_camera_light,/mob/living/silicon/ai/verb/pick_icon,/mob/living/silicon/ai/proc/control_hud, /mob/living/silicon/ai/proc/change_arrival_message, /mob/living/silicon/ai/proc/ai_cancel_call)
 					laws = new /datum/ai_laws/alienmov
 				else
 					B.brainmob.mind.transfer_to(src)
@@ -330,8 +330,26 @@ var/list/ai_list = list()
 		var/obj/machinery/computer/communications/C = locate() in machines
 		if(C)
 			C.post_status("shuttle")
-
 	return
+	
+/mob/living/silicon/ai/proc/ai_cancel_call()
+	set name = "Recall Emergency Shuttle"
+	set category = "AI Commands"
+	
+	if(src.stat == 2)
+		src << "You can't send the shuttle back because you are dead!"
+		return
+		
+	if(check_unable(AI_CHECK_WIRELESS))
+		return
+
+	var/confirm = alert("Are you sure you want to recall the shuttle?", "Confirm Shuttle Recall", "Yes", "No")		
+	
+	if(check_unable(AI_CHECK_WIRELESS))
+		return	
+	
+	if(confirm == "Yes")
+		cancel_call_proc(src)
 
 /mob/living/silicon/ai/cancel_camera()
 	src.view_core()
@@ -349,25 +367,6 @@ var/list/ai_list = list()
 
 /mob/living/silicon/ai/update_canmove()
 	return 0
-
-
-/mob/living/silicon/ai/proc/ai_cancel_call()
-	set category = "Malfunction"
-	
-	if(src.stat == 2)
-		src << "You can't send the shuttle back because you are dead!"
-		return
-		
-	if(check_unable(AI_CHECK_WIRELESS))
-		return
-
-	var/confirm = alert("Are you sure you want to recall the shuttle?", "Confirm Shuttle Recall", "Yes", "No")		
-	
-	if(check_unable(AI_CHECK_WIRELESS))
-		return	
-	
-	if(confirm == "Yes")
-		cancel_call_proc(src)
 		
 /mob/living/silicon/ai/proc/announcement()
 	set name = "Announcement"

code/modules/mob/living/simple_animal/friendly/corgi.dm

@@ -25,7 +25,15 @@
 	var/obj/item/inventory_back
 	var/facehugger
 
-/mob/living/simple_animal/corgi/Life()
+/mob/living/simple_animal/corgi/New()
+	..()
+	regenerate_icons()
+
+/mob/living/simple_animal/corgi/Die()
+	..()
+	regenerate_icons()
+
+/mob/living/simple_animal/corgi/revive()
 	..()
 	regenerate_icons()
 
@@ -33,7 +41,7 @@
 	user.set_machine(src)
 	if(user.stat) return
 
-	var/dat = 	"<div align='center'><b>Inventory of [name]</b></div><p>"
+	var/dat = 	"<div align='center'><b>Inventory of [real_name]</b></div><p>"
 	if(inventory_head)
 		dat +=	"<br><b>Head:</b> [inventory_head] (<a href='?src=\ref[src];remove_inv=head'>Remove</a>)"
 	else
@@ -85,6 +93,7 @@
 					SetLuminosity(0)
 					inventory_head.loc = src.loc
 					inventory_head = null
+					regenerate_icons()
 				else
 					usr << "\red There is nothing to remove from its [remove_from]."
 					return
@@ -92,6 +101,7 @@
 				if(inventory_back)
 					inventory_back.loc = src.loc
 					inventory_back = null
+					regenerate_icons()
 				else
 					usr << "\red There is nothing to remove from its [remove_from]."
 					return
@@ -163,6 +173,7 @@
 					usr.drop_item()
 
 					place_on_head(item_to_add)
+					regenerate_icons()
 
 			if("back")
 				if(inventory_back)
@@ -383,7 +394,7 @@
 		..()
 
 /mob/living/simple_animal/corgi/regenerate_icons()
-	overlays = list()
+	overlays.Cut()
 
 	if(inventory_head)
 		var/head_icon_state = inventory_head.icon_state
@@ -472,7 +483,7 @@
 	var/emagged = 0
 
 /mob/living/simple_animal/corgi/Ian/borgi/emag_act(user as mob)
-	if (!emagged)
+	if(!emagged)
 		emagged = 1
 		visible_message("<span class='warning'>[user] swipes a card through [src].</span>", "<span class='notice'>You overload [src]s internal reactor.</span>")
 		spawn (1000)

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -29,6 +29,7 @@
 	var/response_disarm = "shoves"
 	var/response_harm   = "hits"
 	var/harm_intent_damage = 3
+	var/force_threshold = 0 //Minimum force required to deal any damage
 
 	//Temperature effect
 	var/minbodytemp = 250
@@ -372,7 +373,6 @@
 
 /mob/living/simple_animal/attackby(var/obj/item/O as obj, var/mob/user as mob)  //Marker -Agouri
 	if(istype(O, /obj/item/stack/medical))
-
 		if(stat != DEAD)
 			var/obj/item/stack/medical/MED = O
 			if(health < maxHealth)
@@ -399,20 +399,22 @@
 		if(istype(O, /obj/item/weapon/kitchenknife) || istype(O, /obj/item/weapon/butch))
 			harvest()
 	else
+		var/damage = 0
 		if(O.force)
-			var/damage = O.force
-			if (O.damtype == STAMINA)
-				damage = 0
-			adjustBruteLoss(damage)
-			for(var/mob/M in viewers(src, null))
-				if ((M.client && !( M.blinded )))
-					M.show_message("\red \b "+"[src] has been attacked with [O] by [user]. ")
+			if(O.force >= force_threshold)
+				damage = O.force
+				if (O.damtype == STAMINA)
+					damage = 0
+				visible_message("<span class='danger'>[user] has [O.attack_verb.len ? "[pick(O.attack_verb)]": "attacked"] [src] with [O]!</span>",\
+								"<span class='userdanger'>[user] has [O.attack_verb.len ? "[pick(O.attack_verb)]": "attacked"] you with [O]!</span>")
+			else
+				visible_message("<span class='danger'>[O] bounces harmlessly off of [src].</span>",\
+								"<span class='userdanger'>[O] bounces harmlessly off of [src].</span>")
+			playsound(loc, O.hitsound, 50, 1, -1)
 		else
-			usr << "\red This weapon is ineffective, it does no damage."
-			for(var/mob/M in viewers(src, null))
-				if ((M.client && !( M.blinded )))
-					M.show_message("\red [user] gently taps [src] with [O]. ")
-
+			user.visible_message("<span class='warning'>[user] gently taps [src] with [O].</span>",\
+								"<span class='warning'>This weapon is ineffective, it does no damage.</span>")
+		adjustBruteLoss(damage)
 
 
 /mob/living/simple_animal/movement_delay()

code/modules/mob/mob_transformation_simple.dm

@@ -30,7 +30,7 @@
 
 	if(!M || !ismob(M))
 		usr << "Type path is not a mob (new_type = [new_type]) in change_mob_type(). Contact a coder."
-		del(M)
+		qdel(M)
 		return
 
 	if( istext(new_name) )
@@ -43,12 +43,12 @@
 	if(src.dna)
 		M.dna = src.dna.Clone()
 
-	if(mind)
+	if(mind && istype(M, /mob/living))
 		mind.transfer_to(M)
 	else
 		M.key = key
 
 	if(delete_old_mob)
 		spawn(1)
-			del(src)
+			qdel(src)
 	return M