Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27503

code/game/objects/effects/proximity.dm

@@ -93,6 +93,4 @@
 
 /obj/effect/abstract/proximity_checker/Crossed(atom/movable/AM)
 	set waitfor = FALSE
-	var/atom/H = monitor.host
-	testing("HasProx: [H] -> [AM]")
-	H.HasProximity(AM)
+	monitor.host.HasProximity(AM)

code/game/objects/items/stacks/sheets/leather.dm

@@ -196,13 +196,6 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \
 		user.visible_message("[user] starts cutting hair off \the [src].", "<span class='notice'>You start cutting the hair off \the [src]...</span>", "<span class='italics'>You hear the sound of a knife rubbing against flesh.</span>")
 		if(do_after(user,50, target = src))
 			to_chat(user, "<span class='notice'>You cut the hair from this [src.singular_name].</span>")
-			//Try locating an exisitng stack on the tile and add to there if possible
-			for(var/obj/item/stack/sheet/hairlesshide/HS in user.loc)
-				if(HS.amount < 50)
-					HS.amount++
-					use(1)
-					break
-			//If it gets to here it means it did not find a suitable stack on the tile.
 			var/obj/item/stack/sheet/hairlesshide/HS = new(user.loc)
 			HS.amount = 1
 			use(1)
@@ -230,3 +223,9 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \
 			HS.amount = 1
 			wetness = initial(wetness)
 			src.use(1)
+
+/obj/item/stack/sheet/wetleather/microwave_act(obj/machinery/microwave/MW)
+	..()
+	var/obj/item/stack/sheet/leather/L = new(loc)
+	L.amount = amount
+	qdel(src)

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

@@ -51,6 +51,7 @@
 				M.updateappearance(mutations_overlay_update=1)
 		log_attack(log_msg)
 		return TRUE
+	return FALSE
 
 /obj/item/weapon/dnainjector/attack(mob/target, mob/user)
 	if(!user.IsAdvancedToolUser())
@@ -307,11 +308,11 @@
 
 /obj/item/weapon/dnainjector/timed/inject(mob/living/carbon/M, mob/user)
 	prepare()
+	if(M.stat == DEAD)	//prevents dead people from having their DNA changed
+		to_chat(user, "<span class='notice'>You can't modify [M]'s DNA while [M.p_theyre()] dead.</span>")
+		return FALSE
 
 	if(M.has_dna() && !(M.disabilities & NOCLONE))
-		if(M.stat == DEAD)	//prevents dead people from having their DNA changed
-			to_chat(user, "<span class='notice'>You can't modify [M]'s DNA while [M.p_theyre()] dead.</span>")
-			return
 		M.radiation += rand(20/(damage_coeff  ** 2),50/(damage_coeff  ** 2))
 		var/log_msg = "[key_name(user)] injected [key_name(M)] with the [name]"
 		var/endtime = world.time+duration
@@ -352,9 +353,9 @@
 				M.updateappearance(mutations_overlay_update=1)
 				M.dna.temporary_mutations[UI_CHANGED] = endtime
 		log_attack(log_msg)
+		return TRUE
 	else
-		to_chat(user, "<span class='notice'>It appears that [M] does not have compatible DNA.</span>")
-		return
+		return FALSE
 
 /obj/item/weapon/dnainjector/timed/hulk
 	name = "\improper DNA injector (Hulk)"

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

@@ -19,7 +19,9 @@
 	var/mob/living/carbon/human/H = imp_in
 	if(!ishuman(H))
 		return
-	if(istype(H.martial_art, /datum/martial_art/krav_maga))
+	if(!H.mind)
+		return
+	if(istype(H.mind.martial_art, /datum/martial_art/krav_maga))
 		style.remove(H)
 	else
 		style.teach(H,1)

code/game/objects/items/weapons/storage/belt.dm

@@ -247,10 +247,10 @@
 		)
 
 /obj/item/weapon/storage/belt/military
-	name = "military belt"
-	desc = "A syndicate belt designed to be used by boarding parties.  Its style is modeled after the hardsuits they wear."
-	icon_state = "militarybelt"
-	item_state = "military"
+	name = "chest rig"
+	desc = "A set of tactical webbing worn by Syndicate boarding parties."
+	icon_state = "explorer1"
+	item_state = "explorer1"
 	max_w_class = WEIGHT_CLASS_SMALL
 
 /obj/item/weapon/storage/belt/military/abductor

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -106,7 +106,7 @@
 	new /obj/item/device/flashlight/seclite(src)
 	new /obj/item/clothing/gloves/krav_maga/sec(src)
 	new /obj/item/weapon/door_remote/head_of_security(src)
-	new /obj/item/weapon/gun/ballistic/shotgun/automatic/dual_tube(src)
+	new /obj/item/weapon/gun/ballistic/shotgun/automatic/combat/compact(src)
 
 /obj/structure/closet/secure_closet/security
 	name = "security officer's locker"

code/game/objects/structures/ghost_role_spawners.dm

@@ -152,6 +152,8 @@
 		var/transfer_choice = alert("Transfer your soul to [src]? (Warning, your old body will die!)",,"Yes","No")
 		if(transfer_choice != "Yes")
 			return
+		if(QDELETED(src) || uses <= 0)
+			return
 		log_game("[user.ckey] golem-swapped into [src]")
 		user.visible_message("<span class='notice'>A faint light leaves [user], moving to [src] and animating it!</span>","<span class='notice'>You leave your old body behind, and transfer into [src]!</span>")
 		create(ckey = user.ckey, flavour = FALSE, name = user.real_name)