Merge remote-tracking branch 'refs/remotes/tgstation/master' into Igotpaid30dollarstodothis

# Conflicts:
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi

code/modules/cargo/packs.dm

@@ -1370,7 +1370,7 @@
 	                /obj/item/toy/minimeteor,
 	                /obj/item/toy/carpplushie,
 	                /obj/item/weapon/coin/antagtoken,
-	                /obj/item/stack/tile/fakespace,
+	                /obj/item/stack/tile/fakespace/loaded,
 	                /obj/item/weapon/gun/projectile/shotgun/toy/crossbow,
 	                /obj/item/toy/redbutton)
 	crate_name = "toy crate"

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

@@ -855,12 +855,10 @@ SYNDICATE BLACK OPS
 	if(A.CanFly(H))
 		if(FLYING in A.specflags)
 			H << "<span class='notice'>You settle gently back onto the ground...</span>"
-			A.specflags -= FLYING
 			A.ToggleFlight(H,0)
 			H.update_canmove()
 		else
 			H << "<span class='notice'>You beat your wings and begin to hover gently above the ground...</span>"
-			A.specflags += FLYING
 			H.resting = 0
 			A.ToggleFlight(H,1)
 			H.update_canmove()
@@ -893,6 +891,7 @@ SYNDICATE BLACK OPS
 
 /datum/species/angel/spec_stun(mob/living/carbon/human/H,amount)
 	if(FLYING in specflags)
+		ToggleFlight(H,0)
 		flyslip(H)
 	. = ..()
 

code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm

@@ -157,7 +157,7 @@
 				sleep(1)
 
 /mob/living/simple_animal/hostile/megafauna/dragon/proc/swoop_attack(fire_rain = 0, atom/movable/manual_target)
-	if(stat)
+	if(stat || swooping)
 		return
 	swoop_cooldown = world.time + 200
 	var/swoop_target

code/modules/mob/living/simple_animal/hostile/retaliate/spaceman.dm

@@ -0,0 +1,23 @@
+/mob/living/simple_animal/hostile/retaliate/spaceman
+	name = "Spaceman"
+	desc = "What in the actual hell..?"
+	icon_state = "old"
+	icon_living = "old"
+	icon_dead = "old_dead"
+	icon_gib = "clown_gib"
+	turns_per_move = 5
+	response_help = "pokes"
+	response_disarm = "gently pushes aside"
+	response_harm = "punches"
+	a_intent = "harm"
+	maxHealth = 100
+	health = 100
+	speed = 0
+	harm_intent_damage = 8
+	melee_damage_lower = 10
+	melee_damage_upper = 10
+	attacktext = "hits"
+	attack_sound = 'sound/weapons/punch1.ogg'
+	environment_smash = 0
+	del_on_death = 0
+

code/modules/reagents/chemistry/reagents/drug_reagents.dm

@@ -1,5 +1,3 @@
-
-
 /datum/reagent/drug
 	name = "Drug"
 	id = "drug"
@@ -136,7 +134,7 @@
 
 /datum/reagent/drug/krokodil/addiction_act_stage4(mob/living/carbon/human/M)
 	CHECK_DNA_AND_SPECIES(M)
-	if(istype(M.dna.species, /datum/species/krokodil_addict))
+	if(!istype(M.dna.species, /datum/species/krokodil_addict))
 		M << "<span class='userdanger'>Your skin falls off easily!</span>"
 		M.adjustBruteLoss(50*REM, 0) // holy shit your skin just FELL THE FUCK OFF
 		M.set_species(/datum/species/krokodil_addict)

code/modules/telesci/gps.dm

@@ -32,8 +32,8 @@ var/list/GPS_list = list()
 		overlays += "working"
 
 /obj/item/device/gps/AltClick(mob/user)
-	if(!in_range(src, user))
-		return
+	if(!user.canUseTopic(src, be_close=TRUE))
+		return //user not valid to use gps
 	if(emped)
 		user << "It's busted!"
 	if(tracking)