Merge pull request #3379 from Citadel-Station-13/upstream-merge-30570

[MIRROR] Flying mobs now clip past non flying mobs, various flightsuit/iontrail/movement tweaks/code improvements/bugfixes

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

@@ -66,9 +66,6 @@
 	var/obj/item/organ/lungs/mutantlungs = null
 	var/breathid = "o2"
 
-	//Flight and floating
-	var/override_float = 0
-	
 	var/obj/item/organ/brain/mutant_brain = /obj/item/organ/brain
 	var/obj/item/organ/eyes/mutanteyes = /obj/item/organ/eyes
 	var/obj/item/organ/ears/mutantears = /obj/item/organ/ears
@@ -77,6 +74,7 @@
 
 	var/obj/item/organ/liver/mutantliver
 	var/obj/item/organ/stomach/mutantstomach
+	var/override_float = FALSE
 
 	//Citadel snowflake
 	var/fixed_mut_color2 = ""
@@ -1758,4 +1756,4 @@
 
 #undef COLD_DAMAGE_LEVEL_1
 #undef COLD_DAMAGE_LEVEL_2
-#undef COLD_DAMAGE_LEVEL_3
+#undef COLD_DAMAGE_LEVEL_3

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

@@ -1,139 +1,139 @@
-/datum/species/angel
-	name = "Angel"
-	id = "angel"
-	default_color = "FFFFFF"
-	species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS)
-	mutant_bodyparts = list("tail_human", "ears", "wings")
-	default_features = list("mcolor" = "FFF", "tail_human" = "None", "ears" = "None", "wings" = "Angel")
-	use_skintones = 1
-	no_equip = list(slot_back)
-	blacklisted = 1
-	limbs_id = "human"
-	skinned_type = /obj/item/stack/sheet/animalhide/human
-
-	var/datum/action/innate/flight/fly
-
-/datum/species/angel/on_species_gain(mob/living/carbon/human/H, datum/species/old_species)
-	..()
-	if(H.dna && H.dna.species &&((H.dna.features["wings"] != "Angel") && ("wings" in H.dna.species.mutant_bodyparts)))
-		H.dna.features["wings"] = "Angel"
-		H.update_body()
-	if(ishuman(H) && !fly)
-		fly = new
-		fly.Grant(H)
-
-/datum/species/angel/on_species_loss(mob/living/carbon/human/H)
-	if(fly)
-		fly.Remove(H)
-	if(H.movement_type & FLYING)
-		H.movement_type &= ~FLYING
-	ToggleFlight(H,0)
-	if(H.dna && H.dna.species &&((H.dna.features["wings"] != "None") && ("wings" in H.dna.species.mutant_bodyparts)))
-		H.dna.features["wings"] = "None"
-		H.update_body()
-	..()
-
-/datum/species/angel/spec_life(mob/living/carbon/human/H)
-	HandleFlight(H)
-
-/datum/species/angel/proc/HandleFlight(mob/living/carbon/human/H)
-	if(H.movement_type & FLYING)
-		if(!CanFly(H))
-			ToggleFlight(H,0)
-			return 0
-		return 1
-	else
-		return 0
-
-/datum/species/angel/proc/CanFly(mob/living/carbon/human/H)
-	if(H.stat || H.IsStun() || H.IsKnockdown())
-		return 0
-	if(H.wear_suit && ((H.wear_suit.flags_inv & HIDEJUMPSUIT) && (!H.wear_suit.species_exception || !is_type_in_list(src, H.wear_suit.species_exception))))	//Jumpsuits have tail holes, so it makes sense they have wing holes too
-		to_chat(H, "Your suit blocks your wings from extending!")
-		return 0
-	var/turf/T = get_turf(H)
-	if(!T)
-		return 0
-
-	var/datum/gas_mixture/environment = T.return_air()
-	if(environment && !(environment.return_pressure() > 30))
-		to_chat(H, "<span class='warning'>The atmosphere is too thin for you to fly!</span>")
-		return 0
-	else
-		return 1
-
-/datum/action/innate/flight
-	name = "Toggle Flight"
-	check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_STUN
-	icon_icon = 'icons/mob/actions/actions_items.dmi'
-	button_icon_state = "flight"
-
-/datum/action/innate/flight/Activate()
-	var/mob/living/carbon/human/H = owner
-	var/datum/species/angel/A = H.dna.species
-	if(A.CanFly(H))
-		if(H.movement_type & FLYING)
-			to_chat(H, "<span class='notice'>You settle gently back onto the ground...</span>")
-			A.ToggleFlight(H,0)
-			H.update_canmove()
-		else
-			to_chat(H, "<span class='notice'>You beat your wings and begin to hover gently above the ground...</span>")
-			H.resting = 0
-			A.ToggleFlight(H,1)
-			H.update_canmove()
-
-/datum/species/angel/proc/flyslip(mob/living/carbon/human/H)
-	var/obj/buckled_obj
-	if(H.buckled)
-		buckled_obj = H.buckled
-
-	to_chat(H, "<span class='notice'>Your wings spazz out and launch you!</span>")
-
-	playsound(H.loc, 'sound/misc/slip.ogg', 50, 1, -3)
-
-	for(var/obj/item/I in H.held_items)
-		H.accident(I)
-
-	var/olddir = H.dir
-
-	H.stop_pulling()
-	if(buckled_obj)
-		buckled_obj.unbuckle_mob(H)
-		step(buckled_obj, olddir)
-	else
-		for(var/i=1, i<5, i++)
-			spawn (i)
-				step(H, olddir)
-				H.spin(1,1)
-	return 1
-
-
-/datum/species/angel/spec_stun(mob/living/carbon/human/H,amount)
-	if(H.movement_type & FLYING)
-		ToggleFlight(H,0)
-		flyslip(H)
-	. = ..()
-
-/datum/species/angel/negates_gravity(mob/living/carbon/human/H)
-	if(H.movement_type & FLYING)
-		return 1
-
-/datum/species/angel/space_move(mob/living/carbon/human/H)
-	if(H.movement_type & FLYING)
-		return 1
-
-/datum/species/angel/proc/ToggleFlight(mob/living/carbon/human/H,flight)
-	if(flight && CanFly(H))
-		stunmod = 2
-		speedmod = -1
-		H.movement_type |= FLYING
-		override_float = 1
-		H.pass_flags |= PASSTABLE
-		H.OpenWings()
-	else
-		stunmod = 1
-		speedmod = 0
-		H.movement_type &= ~FLYING
-		override_float = 0
-		H.pass_flags &= ~PASSTABLE
-		H.CloseWings()
+/datum/species/angel
+	name = "Angel"
+	id = "angel"
+	default_color = "FFFFFF"
+	species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS)
+	mutant_bodyparts = list("tail_human", "ears", "wings")
+	default_features = list("mcolor" = "FFF", "tail_human" = "None", "ears" = "None", "wings" = "Angel")
+	use_skintones = 1
+	no_equip = list(slot_back)
+	blacklisted = 1
+	limbs_id = "human"
+	skinned_type = /obj/item/stack/sheet/animalhide/human
+
+	var/datum/action/innate/flight/fly
+
+/datum/species/angel/on_species_gain(mob/living/carbon/human/H, datum/species/old_species)
+	..()
+	if(H.dna && H.dna.species &&((H.dna.features["wings"] != "Angel") && ("wings" in H.dna.species.mutant_bodyparts)))
+		H.dna.features["wings"] = "Angel"
+		H.update_body()
+	if(ishuman(H) && !fly)
+		fly = new
+		fly.Grant(H)
+
+/datum/species/angel/on_species_loss(mob/living/carbon/human/H)
+	if(fly)
+		fly.Remove(H)
+	if(H.movement_type & FLYING)
+		H.movement_type &= ~FLYING
+	ToggleFlight(H,0)
+	if(H.dna && H.dna.species &&((H.dna.features["wings"] != "None") && ("wings" in H.dna.species.mutant_bodyparts)))
+		H.dna.features["wings"] = "None"
+		H.update_body()
+	..()
+
+/datum/species/angel/spec_life(mob/living/carbon/human/H)
+	HandleFlight(H)
+
+/datum/species/angel/proc/HandleFlight(mob/living/carbon/human/H)
+	if(H.movement_type & FLYING)
+		if(!CanFly(H))
+			ToggleFlight(H,0)
+			return 0
+		return 1
+	else
+		return 0
+
+/datum/species/angel/proc/CanFly(mob/living/carbon/human/H)
+	if(H.stat || H.IsStun() || H.IsKnockdown())
+		return 0
+	if(H.wear_suit && ((H.wear_suit.flags_inv & HIDEJUMPSUIT) && (!H.wear_suit.species_exception || !is_type_in_list(src, H.wear_suit.species_exception))))	//Jumpsuits have tail holes, so it makes sense they have wing holes too
+		to_chat(H, "Your suit blocks your wings from extending!")
+		return 0
+	var/turf/T = get_turf(H)
+	if(!T)
+		return 0
+
+	var/datum/gas_mixture/environment = T.return_air()
+	if(environment && !(environment.return_pressure() > 30))
+		to_chat(H, "<span class='warning'>The atmosphere is too thin for you to fly!</span>")
+		return 0
+	else
+		return 1
+
+/datum/action/innate/flight
+	name = "Toggle Flight"
+	check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_STUN
+	icon_icon = 'icons/mob/actions/actions_items.dmi'
+	button_icon_state = "flight"
+
+/datum/action/innate/flight/Activate()
+	var/mob/living/carbon/human/H = owner
+	var/datum/species/angel/A = H.dna.species
+	if(A.CanFly(H))
+		if(H.movement_type & FLYING)
+			to_chat(H, "<span class='notice'>You settle gently back onto the ground...</span>")
+			A.ToggleFlight(H,0)
+			H.update_canmove()
+		else
+			to_chat(H, "<span class='notice'>You beat your wings and begin to hover gently above the ground...</span>")
+			H.resting = 0
+			A.ToggleFlight(H,1)
+			H.update_canmove()
+
+/datum/species/angel/proc/flyslip(mob/living/carbon/human/H)
+	var/obj/buckled_obj
+	if(H.buckled)
+		buckled_obj = H.buckled
+
+	to_chat(H, "<span class='notice'>Your wings spazz out and launch you!</span>")
+
+	playsound(H.loc, 'sound/misc/slip.ogg', 50, 1, -3)
+
+	for(var/obj/item/I in H.held_items)
+		H.accident(I)
+
+	var/olddir = H.dir
+
+	H.stop_pulling()
+	if(buckled_obj)
+		buckled_obj.unbuckle_mob(H)
+		step(buckled_obj, olddir)
+	else
+		for(var/i=1, i<5, i++)
+			spawn (i)
+				step(H, olddir)
+				H.spin(1,1)
+	return 1
+
+
+/datum/species/angel/spec_stun(mob/living/carbon/human/H,amount)
+	if(H.movement_type & FLYING)
+		ToggleFlight(H,0)
+		flyslip(H)
+	. = ..()
+
+/datum/species/angel/negates_gravity(mob/living/carbon/human/H)
+	if(H.movement_type & FLYING)
+		return 1
+
+/datum/species/angel/space_move(mob/living/carbon/human/H)
+	if(H.movement_type & FLYING)
+		return 1
+
+/datum/species/angel/proc/ToggleFlight(mob/living/carbon/human/H,flight)
+	if(flight && CanFly(H))
+		stunmod = 2
+		speedmod = -0.35
+		H.movement_type |= FLYING
+		override_float = TRUE
+		H.pass_flags |= PASSTABLE
+		H.OpenWings()
+	else
+		stunmod = 1
+		speedmod = 0
+		H.movement_type &= ~FLYING
+		override_float = FALSE
+		H.pass_flags &= ~PASSTABLE
+		H.CloseWings()

code/modules/mob/living/life.dm

@@ -5,6 +5,9 @@
 	if(digitalinvis)
 		handle_diginvis() //AI becomes unable to see mob
 
+	if((movement_type & FLYING) && !floating)	//TODO: Better floating
+		float(on = TRUE)
+
 	if (notransform)
 		return
 	if(!loc)

code/modules/mob/living/living.dm

@@ -105,8 +105,6 @@
 
 //Called when we bump onto a mob
 /mob/living/proc/MobCollide(mob/M)
-	//Even if we don't push/swap places, we "touched" them, so spread fire
-	spreadFire(M)
 
 	//Also diseases
 	for(var/thing in viruses)
@@ -120,7 +118,31 @@
 			ContactContractDisease(D)
 
 	if(now_pushing)
-		return 1
+		return TRUE
+
+	//TODO FOR LATER PRS: Make passing tables an automatic thing for flying and passable objects be determined better to prevent huge amounts of flags being set when mobs fly.
+	if((movement_type) ^ (M.movement_type))	//Fly past each other.
+		now_pushing = TRUE
+		var/old = pass_flags & PASSMOB
+		var/old_p = pulling? (pulling.pass_flags & PASSMOB) : NONE
+		var/atom/movable/cached = pulling
+		pass_flags |= PASSMOB
+		var/obj/item/I = cached
+		if(cached && (isliving(cached) || (istype(I) && (I.w_class < WEIGHT_CLASS_BULKY))))
+			var/mob/living/l = cached
+			if(l.mob_size <= mob_size)
+				cached.pass_flags |= PASSMOB
+		Move(get_turf(M))
+		if(!old)
+			pass_flags &= ~PASSMOB
+		if(cached && !old_p)
+			cached.pass_flags &= ~PASSMOB
+		cached = null
+		now_pushing = FALSE
+		return TRUE
+
+	//Even if we don't push/swap places, we "touched" them, so spread fire
+	spreadFire(M)
 
 	//Should stop you pushing a restrained person out of the way
 	if(isliving(M))
@@ -1028,4 +1050,4 @@
 
 /mob/living/proc/add_abilities_to_panel()
 	for(var/obj/effect/proc_holder/A in abilities)
-		statpanel("[A.panel]",A.get_panel_text(),A)
+		statpanel("[A.panel]",A.get_panel_text(),A)

code/modules/mob/mob_movement.dm

@@ -192,10 +192,10 @@
 
 	return .
 
-/mob/Moved(oldLoc, dir)
+/mob/Moved(oldLoc, dir, Forced = FALSE)
 	. = ..()
 	for(var/obj/O in contents)
-		O.on_mob_move(dir, src, oldLoc)
+		O.on_mob_move(dir, src, oldLoc, Forced)
 
 /mob/setDir(newDir)
 	. = ..()