Merge branch 'master' into RemoveSetBackground

code/modules/mob/dead/new_player/new_player.dm

@@ -357,6 +357,11 @@
 			to_chat(humanc, "<span class='userdanger'><i>THERE CAN BE ONLY ONE!!!</i></span>")
 			humanc.make_scottish()
 
+		if(GLOB.summon_guns_triggered)
+			give_guns(humanc)
+		if(GLOB.summon_magic_triggered)
+			give_magic(humanc)
+
 	GLOB.joined_player_list += character.ckey
 
 	if(CONFIG_GET(flag/allow_latejoin_antagonists) && humanc)	//Borgs aren't allowed to be antags. Will need to be tweaked if we get true latejoin ais.

code/modules/mob/living/brain/MMI.dm

@@ -198,7 +198,7 @@
 		else
 			to_chat(user, "<span class='notice'>The MMI indicates the brain is active.</span>")
 
-/obj/item/device/mmi/relaymove()
+/obj/item/device/mmi/relaymove(mob/user)
 	return //so that the MMI won't get a warning about not being able to move if it tries to move
 
 /obj/item/device/mmi/syndie

code/modules/mob/living/carbon/alien/death.dm

@@ -1,8 +1,8 @@
 /mob/living/carbon/alien/spawn_gibs(with_bodyparts)
 	if(with_bodyparts)
-		new /obj/effect/gibspawner/xeno(get_turf(src))
+		new /obj/effect/gibspawner/xeno(drop_location())
 	else
-		new /obj/effect/gibspawner/xenobodypartless(get_turf(src))
+		new /obj/effect/gibspawner/xenobodypartless(drop_location())
 
 /mob/living/carbon/alien/gib_animation()
 	new /obj/effect/temp_visual/gib_animation(loc, "gibbed-a")

code/modules/mob/living/carbon/alien/larva/death.dm

@@ -8,9 +8,9 @@
 
 /mob/living/carbon/alien/larva/spawn_gibs(with_bodyparts)
 	if(with_bodyparts)
-		new /obj/effect/gibspawner/larva(get_turf(src))
+		new /obj/effect/gibspawner/larva(drop_location())
 	else
-		new /obj/effect/gibspawner/larvabodypartless(get_turf(src))
+		new /obj/effect/gibspawner/larvabodypartless(drop_location())
 
 /mob/living/carbon/alien/larva/gib_animation()
 	new /obj/effect/temp_visual/gib_animation(loc, "gibbed-l")

code/modules/mob/living/carbon/death.dm

@@ -13,14 +13,16 @@
 		SSticker.mode.check_win() //Calls the rounds wincheck, mainly for wizard, malf, and changeling now
 
 /mob/living/carbon/gib(no_brain, no_organs, no_bodyparts)
+	var/atom/Tsec = drop_location()
 	for(var/mob/M in src)
 		if(M in stomach_contents)
 			stomach_contents.Remove(M)
-		M.forceMove(loc)
+		M.forceMove(Tsec)
 		visible_message("<span class='danger'>[M] bursts out of [src]!</span>")
 	..()
 
 /mob/living/carbon/spill_organs(no_brain, no_organs, no_bodyparts)
+	var/atom/Tsec = drop_location()
 	if(!no_bodyparts)
 		if(no_organs)//so the organs don't get transfered inside the bodyparts we'll drop.
 			for(var/X in internal_organs)
@@ -35,7 +37,7 @@
 				var/org_zone = check_zone(O.zone) //both groin and chest organs.
 				if(org_zone == "chest")
 					O.Remove(src)
-					O.forceMove(get_turf(src))
+					O.forceMove(Tsec)
 					O.throw_at(get_edge_target_turf(src,pick(GLOB.alldirs)),rand(1,3),5)
 	else
 		for(var/X in internal_organs)
@@ -47,7 +49,7 @@
 				qdel(I)
 				continue
 			I.Remove(src)
-			I.forceMove(get_turf(src))
+			I.forceMove(Tsec)
 			I.throw_at(get_edge_target_turf(src,pick(GLOB.alldirs)),rand(1,3),5)
 
 
@@ -55,4 +57,4 @@
 	for(var/X in bodyparts)
 		var/obj/item/bodypart/BP = X
 		BP.drop_limb()
-		BP.throw_at(get_edge_target_turf(src,pick(GLOB.alldirs)),rand(1,3),5)
+		BP.throw_at(get_edge_target_turf(src,pick(GLOB.alldirs)),rand(1,3),5)

code/modules/mob/living/carbon/human/death.dm

@@ -6,9 +6,9 @@
 
 /mob/living/carbon/human/spawn_gibs(with_bodyparts)
 	if(with_bodyparts)
-		new /obj/effect/gibspawner/human(get_turf(src), dna, get_static_viruses())
+		new /obj/effect/gibspawner/human(drop_location(), dna, get_static_viruses())
 	else
-		new /obj/effect/gibspawner/humanbodypartless(get_turf(src), dna, get_static_viruses())
+		new /obj/effect/gibspawner/humanbodypartless(drop_location(), dna, get_static_viruses())
 
 /mob/living/carbon/human/spawn_dust(just_ash = FALSE)
 	if(just_ash)

code/modules/mob/living/carbon/human/human.dm

@@ -25,9 +25,10 @@
 	create_internal_organs() //most of it is done in set_species now, this is only for parent call
 
 	handcrafting = new()
-	AddComponent(/datum/component/redirect, list(COMSIG_COMPONENT_CLEAN_ACT), CALLBACK(src, .proc/clean_blood))
-
+	
 	. = ..()
+	
+	AddComponent(/datum/component/redirect, list(COMSIG_COMPONENT_CLEAN_ACT), CALLBACK(src, .proc/clean_blood))
 
 /mob/living/carbon/human/OpenCraftingMenu()
 	handcrafting.ui_interact(src)
@@ -1026,4 +1027,4 @@
 	race = /datum/species/zombie/infectious
 
 /mob/living/carbon/human/species/zombie/krokodil_addict
-	race = /datum/species/krokodil_addict
+	race = /datum/species/krokodil_addict

code/modules/mob/living/carbon/human/human_defense.dm

@@ -68,7 +68,10 @@
 					P.firer = src
 					P.yo = new_y - curloc.y
 					P.xo = new_x - curloc.x
-					P.Angle = null
+					var/new_angle_s = P.Angle + rand(120,240)
+					while(new_angle_s > 180)	// Translate to regular projectile degrees
+						new_angle_s -= 360
+					P.setAngle(new_angle_s)
 
 				return -1 // complete projectile permutation
 

code/modules/mob/living/death.dm

@@ -18,7 +18,7 @@
 	return
 
 /mob/living/proc/spawn_gibs()
-	new /obj/effect/gibspawner/generic(get_turf(src), null, get_static_viruses())
+	new /obj/effect/gibspawner/generic(drop_location(), null, get_static_viruses())
 
 /mob/living/proc/spill_organs()
 	return

code/modules/mob/living/inhand_holder.dm

@@ -63,7 +63,7 @@
 		qdel(src)
 	return TRUE
 
-/obj/item/clothing/head/mob_holder/relaymove()
+/obj/item/clothing/head/mob_holder/relaymove(mob/user)
 	release()
 
 /obj/item/clothing/head/mob_holder/container_resist()

code/modules/mob/living/living.dm

@@ -786,9 +786,10 @@
 	if(QDELETED(src))
 		return
 	if(butcher_results)
+		var/atom/Tsec = drop_location()
 		for(var/path in butcher_results)
 			for(var/i = 1; i <= butcher_results[path];i++)
-				new path(src.loc)
+				new path(Tsec)
 			butcher_results.Remove(path) //In case you want to have things like simple_animals drop their butcher results on gib, so it won't double up below.
 	visible_message("<span class='notice'>[user] butchers [src].</span>")
 	gib(0, 0, 1)
@@ -1034,7 +1035,7 @@
 	. = ..()
 	if(.)
 		if(client)
-			reset_perspective(destination)
+			reset_perspective()
 		update_canmove() //if the mob was asleep inside a container and then got forceMoved out we need to make them fall.
 
 /mob/living/proc/update_z(new_z) // 1+ to register, null to unregister

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

@@ -1,5 +1,5 @@
 /mob/living/silicon/spawn_gibs()
-	new /obj/effect/gibspawner/robot(get_turf(src))
+	new /obj/effect/gibspawner/robot(drop_location())
 
 /mob/living/silicon/spawn_dust()
 	new /obj/effect/decal/remains/robot(loc)

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

@@ -146,6 +146,10 @@
 				P.firer = src
 				P.yo = new_y - curloc.y
 				P.xo = new_x - curloc.x
+				var/new_angle_s = P.Angle + rand(120,240)
+				while(new_angle_s > 180)	// Translate to regular projectile degrees
+					new_angle_s -= 360
+				P.setAngle(new_angle_s)
 
 			return -1 // complete projectile permutation
 

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

@@ -244,9 +244,10 @@
 
 /mob/living/simple_animal/gib()
 	if(butcher_results)
+		var/atom/Tsec = drop_location()
 		for(var/path in butcher_results)
 			for(var/i = 1; i <= butcher_results[path];i++)
-				new path(src.loc)
+				new path(Tsec)
 	..()
 
 /mob/living/simple_animal/gib_animation()

code/modules/mob/living/status_procs.dm

@@ -150,6 +150,10 @@
 	if(!disabilities[disability])
 		return
 
+	if(!sources) // No defined source cures the disability entirely.
+		disabilities -= disability
+		return
+
 	if(!islist(sources))
 		sources = list(sources)
 
@@ -212,4 +216,4 @@
 	if(!has_disability(DISABILITY_HUSK))
 		status_flags |= DISFIGURED	//makes them unknown
 		update_body()
-	add_disability(DISABILITY_HUSK, source)
+	add_disability(DISABILITY_HUSK, source)