Merge remote-tracking branch 'upstream/dev' into op-hideout

code/game/objects/structures/grille.dm

@@ -58,7 +58,9 @@
 		return
 
 /obj/structure/grille/attack_slime(mob/user as mob)
-	if(!istype(user, /mob/living/carbon/slime/adult))	return
+	var/mob/living/carbon/slime/S = user
+	if (!S.is_adult)
+		return
 
 	playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)
 	user.visible_message("<span class='warning'>[user] smashes against [src].</span>", \

code/game/objects/structures/inflatable.dm

@@ -103,7 +103,9 @@
 
 
 	attack_slime(mob/user as mob)
-		if(!isslimeadult(user)) return
+		var/mob/living/carbon/slime/S = user
+		if (!S.is_adult)
+			return
 		attack_generic(user, rand(10, 15))
 
 

code/game/objects/structures/mirror.dm

@@ -105,7 +105,9 @@
 
 
 /obj/structure/mirror/attack_slime(mob/user as mob)
-	if(!isslimeadult(user)) return
+	var/mob/living/carbon/slime/S = user
+	if (!S.is_adult)
+		return
 	if(shattered)
 		playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
 		return

code/game/objects/structures/stool_bed_chair_nest/chairs.dm

@@ -138,7 +138,7 @@
 	if(propelled)
 		var/mob/living/occupant = buckled_mob
 		unbuckle()
-		occupant.throw_at(A, 3, 2)
+		occupant.throw_at(A, 3, propelled)
 		occupant.apply_effect(6, STUN, 0)
 		occupant.apply_effect(6, WEAKEN, 0)
 		occupant.apply_effect(6, STUTTER, 0)

code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm

@@ -136,7 +136,12 @@
 	if(propelled || (pulling && (pulling.a_intent == "hurt")))
 		var/mob/living/occupant = buckled_mob
 		unbuckle()
-		occupant.throw_at(A, 3, 2)
+		
+		if (pulling && (pulling.a_intent == "hurt"))
+			occupant.throw_at(A, 3, 3, pulling)
+		else if (propelled)
+			occupant.throw_at(A, 3, propelled)
+		
 		occupant.apply_effect(6, STUN, 0)
 		occupant.apply_effect(6, WEAKEN, 0)
 		occupant.apply_effect(6, STUTTER, 0)

code/game/objects/structures/window.dm

@@ -155,7 +155,9 @@
 
 
 /obj/structure/window/attack_slime(mob/user as mob)
-	if(!isslimeadult(user)) return
+	var/mob/living/carbon/slime/S = user
+	if (!S.is_adult)
+		return
 	attack_generic(user, rand(10, 15))