Merge branch 'master' of github.com:Baystation12/Baystation12

Conflicts:
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/carbon/human/life.dm

code/game/objects/items/weapons/RCD.dm

@@ -72,7 +72,7 @@ RCD
 
 
 	afterattack(atom/A, mob/user as mob)
-		if(istype(A,/area/shuttle)||istype(A,/turf/space/transit))//Nanotrasen Matter Jammer TM -Sieve
+		if(istype(A,/area/shuttle)||istype(A,/turf/space/transit))//NanoTrasen Matter Jammer TM -Sieve
 			disabled = 1
 		else
 			disabled = 0
@@ -168,7 +168,7 @@ RCD
 /obj/item/weapon/rcd/industrial
 	name = "industrial rapid construction device"
 	max_matter = 60
-	
+
 	New()
 		matter = max_matter
 		return ..()

code/game/objects/items/weapons/grenades.dm

@@ -510,15 +510,15 @@ CRITTER GRENADE
 	deliveryamt = 5
 	origin_tech = "materials=3;magnets=4;syndicate=4"
 
-/obj/item/weapon/spawnergrenade/spesscarp
+/obj/item/weapon/spawnergrenade/carp
 	name = "carp delivery grenade"
-	spawner_type = /obj/effect/critter/spesscarp
+	spawner_type = /mob/living/simple_animal/carp
 	deliveryamt = 5
 	origin_tech = "materials=3;magnets=4;syndicate=4"
 
-/obj/item/weapon/spawnergrenade/elitespesscarp
+/obj/item/weapon/spawnergrenade/elitecarp
 	name = "elite carp delivery grenade"
-	spawner_type = /obj/effect/critter/spesscarp/elite
+	spawner_type = /mob/living/simple_animal/carp/elite
 	deliveryamt = 2
 	origin_tech = "materials=3;magnets=4;syndicate=4"
 

code/game/objects/items/weapons/implants/implanter.dm

@@ -114,8 +114,7 @@
 	..()
 
 /obj/item/weapon/implanter/compressed/afterattack(atom/A, mob/user as mob)
-	if(istype(A,/obj/item))
-		var/obj/item/weapon/implant/compressed/c = imp
-		c.scanned = A
+	if(istype(A,/obj/item) && imp)
+		imp:scanned = A
 		A.loc.contents.Remove(A)
 		update()

code/game/objects/items/weapons/manuals.dm

@@ -313,7 +313,7 @@ It is caused by the unexpected circumstances after awakening in cryo (if cloned
 				<li>Internal armor is plasteel for additional strength.</li>
 				<li>External armor must be installed in 2 parts, totaling 10 sheets.</li>
 				<li>Completed mech is more resiliant against fire, and is a bit more durable overall</li>
-				<li>Nanotrasen is determined to the safety of its <s>investments</s> employees.</li>
+				<li>NanoTrasen is determined to the safety of its <s>investments</s> employees.</li>
 				</ol>
 				</body>
 				</html>

code/game/objects/items/weapons/surgery_tools.dm

@@ -304,8 +304,8 @@ CIRCULAR SAW
 
 	var/mob/living/carbon/human/H = M
 	var/datum/organ/external/S = H.organs[user.zone_sel.selecting]
-	if(isnull(S))
-		CRASH("External organ S is null in surgery_tools.dm")
+	if(user.zone_sel.selecting == "mouth" || user.zone_sel.selecting == "eyes")
+		S = H.organs["head"]
 
 	if(((user.zone_sel.selecting == "l_arm") || (user.zone_sel.selecting == "r_arm") || (user.zone_sel.selecting == "l_leg") || (user.zone_sel.selecting == "r_leg")) & (istype(M, /mob/living/carbon/human)))
 		if(S.status & ORGAN_DESTROYED)
@@ -449,8 +449,6 @@ CIRCULAR SAW
 				return ..()
 			M:brain_op_stage = 0
 			S.open = 1
-			if(!try_bone_surgery(M, user))
-				return ..()
 		else
 			return ..()