Merge pull request #6709 from VOREStation/aro-mistake

Fix way too many vorestation edits

code/_onclick/click.dm

@@ -134,12 +134,6 @@
 	// A is a turf or is on a turf, or in something on a turf (pen in a box); but not something in something on a turf (pen in a box in a backpack)
 	sdepth = A.storage_depth_turf()
 	if(isturf(A) || isturf(A.loc) || (sdepth != -1 && sdepth <= 1))
-		//VOREStation Edit begin: SHADEKIN
-		var/mob/SK = src
-		if(istype(SK))
-			if(SK.shadekin_phasing_check())
-				return
-		//VOREStation Edit end: SHADEKIN
 		if(A.Adjacent(src) || (W && W.attack_can_reach(src, A, W.reach)) ) // see adjacent.dm
 			if(W)
 				// Return 1 in attackby() to prevent afterattack() effects (when safely moving items for example)
@@ -188,6 +182,9 @@
 
 /mob/living/UnarmedAttack(var/atom/A, var/proximity_flag)
 
+	if(is_incorporeal())
+		return 0
+
 	if(!ticker)
 		to_chat(src, "You cannot attack people before the game has started.")
 		return 0

code/datums/beam.dm

@@ -138,12 +138,8 @@
 	return
 
 /obj/effect/ebeam/deadly/Crossed(atom/A)
-	//VOREStation Edit begin: SHADEKIN
+	if(A.is_incorporeal())
-	var/mob/SK = A
+		return
-	if(istype(SK))
-		if(SK.shadekin_phasing_check())
-			return
-	//VOREStation Edit end: SHADEKIN
 	..()
 	A.ex_act(1)
 
@@ -163,12 +159,8 @@
 		on_contact(A)
 
 /obj/effect/ebeam/reactive/Crossed(atom/A)
-	//VOREStation Edit begin: SHADEKIN
+	if(A.is_incorporeal())
-	var/mob/SK = A
+		return
-	if(istype(SK))
-		if(SK.shadekin_phasing_check())
-			return
-	//VOREStation Edit end: SHADEKIN
 	..()
 	on_contact(A)
 

code/game/atoms.dm

@@ -519,6 +519,9 @@
 		return TRUE
 	return FALSE
 
+/atom/proc/is_incorporeal()
+	return FALSE
+
 /atom/proc/drop_location()
 	var/atom/L = loc
 	if(!L)

code/game/gamemodes/cult/cult_structures.dm

@@ -132,22 +132,6 @@
 	anchored = 1.0
 	var/spawnable = null
 
-/obj/effect/gateway/Bumped(mob/M as mob|obj)
-	spawn(0)
-		return
-	return
-
-/obj/effect/gateway/Crossed(AM as mob|obj)
-	//VOREStation Edit begin: SHADEKIN
-	var/mob/SK = AM
-	if(istype(SK))
-		if(SK.shadekin_phasing_check())
-			return
-	//VOREStation Edit end: SHADEKIN
-	spawn(0)
-		return
-	return
-
 /obj/effect/gateway/active
 	light_range=5
 	light_color="#ff0000"
@@ -176,12 +160,8 @@
 		qdel(src)
 
 /obj/effect/gateway/active/Crossed(var/atom/A)
-	//VOREStation Edit begin: SHADEKIN
+	if(A.is_incorporeal())
-	var/mob/SK = A
+		return
-	if(istype(SK))
-		if(SK.shadekin_phasing_check())
-			return
-	//VOREStation Edit end: SHADEKIN
 	if(!istype(A, /mob/living))
 		return
 

code/game/objects/effects/chem/foam.dm

@@ -74,12 +74,8 @@
 			qdel(src)
 
 /obj/effect/effect/foam/Crossed(var/atom/movable/AM)
-	//VOREStation Edit begin: SHADEKIN
+	if(AM.is_incorporeal())
-	var/mob/SK = AM
+		return
-	if(istype(SK))
-		if(SK.shadekin_phasing_check())
-			return
-	//VOREStation Edit end: SHADEKIN
 	if(metal)
 		return
 	if(istype(AM, /mob/living))

code/game/objects/effects/decals/Cleanable/humans.dm

@@ -70,12 +70,8 @@ var/global/list/image/splatter_cache=list()
 		desc = initial(desc)
 
 /obj/effect/decal/cleanable/blood/Crossed(mob/living/carbon/human/perp)
-	//VOREStation Edit begin: SHADEKIN
+	if(perp.is_incorporeal())
-	var/mob/SK = perp
+		return
-	if(istype(SK))
-		if(SK.shadekin_phasing_check())
-			return
-	//VOREStation Edit end: SHADEKIN
 	if (!istype(perp))
 		return
 	if(amount < 1)

code/game/objects/effects/effect_system.dm

@@ -185,12 +185,8 @@ steam.start() -- spawns the effect
 				qdel(src)
 
 /obj/effect/effect/smoke/Crossed(mob/living/carbon/M as mob )
-	//VOREStation Edit begin: SHADEKIN
+	if(M.is_incorporeal())
-	var/mob/SK = M
+		return
-	if(istype(SK))
-		if(SK.shadekin_phasing_check())
-			return
-	//VOREStation Edit end: SHADEKIN
 	..()
 	if(istype(M))
 		affect(M)

code/game/objects/effects/mines.dm

@@ -35,13 +35,9 @@
 		explode()
 	..()
 
-/obj/effect/mine/Crossed(AM as mob|obj)
+/obj/effect/mine/Crossed(atom/movable/AM as mob|obj)
-	//VOREStation Edit begin: SHADEKIN
+	if(AM.is_incorporeal())
-	var/mob/SK = AM
+		return
-	if(istype(SK))
-		if(SK.shadekin_phasing_check())
-			return
-	//VOREStation Edit end: SHADEKIN
 	Bumped(AM)
 
 /obj/effect/mine/Bumped(mob/M as mob|obj)

code/game/objects/effects/portals.dm

@@ -20,13 +20,9 @@ GLOBAL_LIST_BOILERPLATE(all_portals, /obj/effect/portal)
 		return
 	return
 
-/obj/effect/portal/Crossed(AM as mob|obj)
+/obj/effect/portal/Crossed(atom/movable/AM as mob|obj)
-	//VOREStation Edit begin: SHADEKIN
+	if(AM.is_incorporeal())
-	var/mob/SK = AM
+		return
-	if(istype(SK))
-		if(SK.shadekin_phasing_check())
-			return
-	//VOREStation Edit end: SHADEKIN
 	if(istype(AM,/mob) && !(istype(AM,/mob/living)))
 		return	//do not send ghosts, zshadows, ai eyes, etc
 	spawn(0)

code/game/objects/effects/step_triggers.dm

@@ -12,13 +12,9 @@
 /obj/effect/step_trigger/proc/Trigger(var/atom/movable/A)
 	return 0
 
-/obj/effect/step_trigger/Crossed(H as mob|obj)
+/obj/effect/step_trigger/Crossed(atom/movable/H as mob|obj)
-	//VOREStation Edit begin: SHADEKIN
+	if(H.is_incorporeal())
-	var/mob/SK = H
+		return
-	if(istype(SK))
-		if(SK.shadekin_phasing_check())
-			return
-	//VOREStation Edit end: SHADEKIN
 	..()
 	if(!H)
 		return

code/game/objects/items/devices/PDA/PDA.dm

@@ -1468,13 +1468,9 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	QDEL_NULL(src.pai)
 	return ..()
 
-/obj/item/device/pda/clown/Crossed(AM as mob|obj) //Clown PDA is slippery.
+/obj/item/device/pda/clown/Crossed(atom/movable/AM as mob|obj) //Clown PDA is slippery.
-	//VOREStation Edit begin: SHADEKIN
+	if(AM.is_incorporeal())
-	var/mob/SK = AM
+		return
-	if(istype(SK))
-		if(SK.shadekin_phasing_check())
-			return
-	//VOREStation Edit end: SHADEKIN
 	if (istype(AM, /mob/living))
 		var/mob/living/M = AM
 

code/game/objects/items/toys.dm

@@ -355,13 +355,9 @@
 		playsound(src, 'sound/effects/snap.ogg', 50, 1)
 		qdel(src)
 
-/obj/item/toy/snappop/Crossed(H as mob|obj)
+/obj/item/toy/snappop/Crossed(atom/movable/H as mob|obj)
-	//VOREStation Edit begin: SHADEKIN
+	if(H.is_incorporeal())
-	var/mob/SK = H
+		return
-	if(istype(SK))
-		if(SK.shadekin_phasing_check())
-			return
-	//VOREStation Edit end: SHADEKIN
 	if((ishuman(H))) //i guess carp and shit shouldn't set them off
 		var/mob/living/carbon/M = H
 		if(M.m_intent == "run")

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

@@ -8,13 +8,9 @@
 /*
  * Banana Peals
  */
-/obj/item/weapon/bananapeel/Crossed(AM as mob|obj)
+/obj/item/weapon/bananapeel/Crossed(atom/movable/AM as mob|obj)
-	//VOREStation Edit begin: SHADEKIN
+	if(AM.is_incorporeal())
-	var/mob/SK = AM
+		return
-	if(istype(SK))
-		if(SK.shadekin_phasing_check())
-			return
-	//VOREStation Edit end: SHADEKIN
 	if (istype(AM, /mob/living))
 		var/mob/living/M = AM
 		M.slip("the [src.name]",4)
@@ -29,13 +25,9 @@
 /obj/item/weapon/soap/proc/wet()
 	reagents.add_reagent("cleaner", 5)
 
-/obj/item/weapon/soap/Crossed(AM as mob|obj)
+/obj/item/weapon/soap/Crossed(atom/movable/AM as mob|obj)
-	//VOREStation Edit begin: SHADEKIN
+	if(AM.is_incorporeal())
-	var/mob/SK = AM
+		return
-	if(istype(SK))
-		if(SK.shadekin_phasing_check())
-			return
-	//VOREStation Edit end: SHADEKIN
 	if (istype(AM, /mob/living))
 		var/mob/living/M =	AM
 		M.slip("the [src.name]",3)

code/game/objects/items/weapons/material/shards.dm

@@ -106,14 +106,10 @@
 		qdel(src)
 	return
 
-/obj/item/weapon/material/shard/Crossed(AM as mob|obj)
+/obj/item/weapon/material/shard/Crossed(atom/movable/AM as mob|obj)
 	..()
-	//VOREStation Edit begin: SHADEKIN
+	if(AM.is_incorporeal())
-	var/mob/SK = AM
+		return
-	if(istype(SK))
-		if(SK.shadekin_phasing_check())
-			return
-	//VOREStation Edit end: SHADEKIN
 	if(isliving(AM))
 		var/mob/M = AM
 

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

@@ -107,13 +107,9 @@
 	deployed = 0
 	can_buckle = initial(can_buckle)
 
-/obj/item/weapon/beartrap/Crossed(AM as mob|obj)
+/obj/item/weapon/beartrap/Crossed(atom/movable/AM as mob|obj)
-	//VOREStation Edit begin: SHADEKIN
+	if(AM.is_incorporeal())
-	var/mob/SK = AM
+		return
-	if(istype(SK))
-		if(SK.shadekin_phasing_check())
-			return
-	//VOREStation Edit end: SHADEKIN
 	if(deployed && isliving(AM))
 		var/mob/living/L = AM
 		if(L.m_intent == "run")

code/game/objects/structures/catwalk.dm

@@ -87,14 +87,8 @@
 	return ..()
 
 /obj/structure/catwalk/Crossed()
-	//VOREStation Edit begin: SHADEKIN
-	var/mob/SK = usr
-	if(istype(SK))
-		if(SK.shadekin_phasing_check())
-			return
-	//VOREStation Edit end: SHADEKIN
 	. = ..()
-	if(isliving(usr))
+	if(isliving(usr) && !usr.is_incorporeal())
 		playsound(src, pick('sound/effects/footstep/catwalk1.ogg', 'sound/effects/footstep/catwalk2.ogg', 'sound/effects/footstep/catwalk3.ogg', 'sound/effects/footstep/catwalk4.ogg', 'sound/effects/footstep/catwalk5.ogg'), 25, 1)
 
 /obj/structure/catwalk/CheckExit(atom/movable/O, turf/target)

code/modules/assembly/holder.dm

@@ -104,12 +104,8 @@
 
 
 /obj/item/device/assembly_holder/Crossed(atom/movable/AM as mob|obj)
-	//VOREStation Edit begin: SHADEKIN
+	if(AM.is_incorporeal())
-	var/mob/SK = AM
+		return
-	if(istype(SK))
-		if(SK.shadekin_phasing_check())
-			return
-	//VOREStation Edit end: SHADEKIN
 	if(a_left)
 		a_left.Crossed(AM)
 	if(a_right)

code/modules/assembly/infrared.dm

@@ -242,12 +242,8 @@
 	return
 
 /obj/effect/beam/i_beam/Crossed(atom/movable/AM as mob|obj)
-	//VOREStation Edit begin: SHADEKIN
+	if(AM.is_incorporeal())
-	var/mob/SK = AM
+		return
-	if(istype(SK))
-		if(SK.shadekin_phasing_check())
-			return
-	//VOREStation Edit end: SHADEKIN
 	if(istype(AM, /obj/effect/beam))
 		return
 	spawn(0)

code/modules/assembly/mousetrap.dm

@@ -82,13 +82,9 @@
 	..()
 
 
-/obj/item/device/assembly/mousetrap/Crossed(AM as mob|obj)
+/obj/item/device/assembly/mousetrap/Crossed(atom/movable/AM as mob|obj)
-	//VOREStation Edit begin: SHADEKIN
+	if(AM.is_incorporeal())
-	var/mob/SK = AM
+		return
-	if(istype(SK))
-		if(SK.shadekin_phasing_check())
-			return
-	//VOREStation Edit end: SHADEKIN
 	if(armed)
 		if(ishuman(AM))
 			var/mob/living/carbon/H = AM

code/modules/hydroponics/grown.dm

@@ -157,12 +157,8 @@
 	overlays |= plant_icon
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/Crossed(var/mob/living/M)
-	//VOREStation Edit begin: SHADEKIN
+	if(M.is_incorporeal())
-	var/mob/SK = M
+		return
-	if(istype(SK))
-		if(SK.shadekin_phasing_check())
-			return
-	//VOREStation Edit end: SHADEKIN
 	if(seed && seed.get_trait(TRAIT_JUICY) == 2)
 		if(istype(M))
 

code/modules/hydroponics/spreading/spreading_response.dm

@@ -20,12 +20,8 @@
 	manual_unbuckle(user)
 
 /obj/effect/plant/Crossed(atom/movable/O)
-	//VOREStation Edit begin: SHADEKIN
+	if(O.is_incorporeal())
-	var/mob/SK = O
+		return
-	if(istype(SK))
-		if(SK.shadekin_phasing_check())
-			return
-	//VOREStation Edit end: SHADEKIN
 	if(isliving(O))
 		trodden_on(O)
 

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

@@ -243,12 +243,8 @@
 // this handles mulebots and vehicles
 // and now mobs on fire
 /mob/living/carbon/human/Crossed(var/atom/movable/AM)
-	//VOREStation Edit begin: SHADEKIN
+	if(AM.is_incorporeal())
-	var/mob/SK = AM
+		return
-	if(istype(SK))
-		if(SK.shadekin_phasing_check())
-			return
-	//VOREStation Edit end: SHADEKIN
 	if(istype(AM, /mob/living/bot/mulebot))
 		var/mob/living/bot/mulebot/MB = AM
 		MB.runOver(src)

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

@@ -224,10 +224,8 @@
 
 // Handle footstep sounds
 /mob/living/carbon/human/handle_footstep(var/turf/T)
-	//VOREStation Edit begin: SHADEKIN
+	if(is_incorporeal())
-	if(shadekin_phasing_check())
 		return
-	//VOREStation Edit end: SHADEKIN
 	if(!config.footstep_volume || !T.footstep_sounds || !T.footstep_sounds.len)
 		return
 	// Future Upgrades - Multi species support

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

@@ -618,10 +618,8 @@
 	//Stuff like the xenomorph's plasma regen happens here.
 	species.handle_environment_special(src)
 
-	//VOREStation Edit begin: SHADEKIN
+	if(is_incorporeal())
-	if(shadekin_phasing_check())
 		return
-	//VOREStation Edit end: SHADEKIN
 
 	//Moved pressure calculations here for use in skip-processing check.
 	var/pressure = environment.return_pressure()

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

@@ -1,5 +1,10 @@
 /datum/power/shadekin
 
+/mob/living/carbon/human/is_incorporeal()
+	if(ability_flags & AB_PHASE_SHIFTED) //Shadekin
+		return TRUE
+	return ..()
+
 /////////////////////
 ///  PHASE SHIFT  ///
 /////////////////////
@@ -62,6 +67,7 @@
 	//Shifting in
 	if(ability_flags & AB_PHASE_SHIFTED)
 		ability_flags &= ~AB_PHASE_SHIFTED
+		mouse_opacity = 2
 		name = real_name
 		for(var/belly in vore_organs)
 			var/obj/belly/B = belly
@@ -108,6 +114,7 @@
 	//Shifting out
 	else
 		ability_flags |= AB_PHASE_SHIFTED
+		mouse_opacity = 0
 		custom_emote(1,"phases out!")
 		name = "Something"
 
@@ -130,47 +137,6 @@
 		density = FALSE
 		force_max_speed = TRUE
 
-/mob/living/carbon/human/UnarmedAttack()
-	if(shadekin_phasing_check())
-		return FALSE	//Nope.
-
-	. = ..()
-
-/mob/living/carbon/human/can_fall()
-	if(shadekin_phasing_check())
-		return FALSE	//Nope!
-
-	return ..()
-
-/mob/living/carbon/human/zMove(direction)
-	if(shadekin_phasing_check())
-		var/turf/destination = (direction == UP) ? GetAbove(src) : GetBelow(src)
-		if(destination)
-			forceMove(destination)
-		return TRUE		//Yup.
-
-	return ..()
-
-/mob/proc/shadekin_phasing_check()
-	var/mob/living/simple_mob/shadekin/s_SK = src
-	if(istype(s_SK))
-		if(s_SK.ability_flags & AB_PHASE_SHIFTED)
-			return TRUE
-	var/mob/living/carbon/human/h_SK = src
-	if(istype(h_SK))
-		if(h_SK.ability_flags & AB_PHASE_SHIFTED)
-			return TRUE
-	return FALSE
-
-/*
-/mob/living/carbon/human/MouseDrop_T(atom/dropping, mob/user)
-	if(ability_flags & AB_PHASE_SHIFTED)
-		return FALSE	//Nope!
-
-	return ..()
-*/
-
-
 //////////////////////////
 ///  REGENERATE OTHER  ///
 //////////////////////////

code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm

@@ -54,13 +54,9 @@
 	icon_rest = "mouse_[body_color]_sleep"
 	desc = "A small [body_color] rodent, often seen hiding in maintenance areas and making a nuisance of itself."
 
-/mob/living/simple_mob/animal/passive/mouse/Crossed(AM as mob|obj)
+/mob/living/simple_mob/animal/passive/mouse/Crossed(atom/movable/AM as mob|obj)
-	//VOREStation Edit begin: SHADEKIN
+	if(AM.is_incorporeal())
-	var/mob/SK = AM
+		return
-	if(istype(SK))
-		if(SK.shadekin_phasing_check())
-			return
-	//VOREStation Edit end: SHADEKIN
 	if( ishuman(AM) )
 		if(!stat)
 			var/mob/M = AM

code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_procs.dm

@@ -19,6 +19,7 @@
 	//Shifting in
 	if(ability_flags & AB_PHASE_SHIFTED)
 		ability_flags &= ~AB_PHASE_SHIFTED
+		mouse_opacity = 2
 		name = real_name
 		for(var/belly in vore_organs)
 			var/obj/belly/B = belly
@@ -70,6 +71,7 @@
 	//Shifting out
 	else
 		ability_flags |= AB_PHASE_SHIFTED
+		mouse_opacity = 0
 		custom_emote(1,"phases out!")
 		real_name = name
 		name = "Something"

code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm

@@ -245,6 +245,11 @@
 	if((. = ..()))
 		handle_shade()
 
+/mob/living/simple_mob/shadekin/is_incorporeal()
+	if(ability_flags & AB_PHASE_SHIFTED)
+		return TRUE
+	return FALSE
+
 /mob/living/simple_mob/shadekin/handle_atmos()
 	if(ability_flags & AB_PHASE_SHIFTED)
 		return

code/modules/mob/mob_movement.dm

@@ -389,10 +389,8 @@
 ///Return 1 for movement 0 for none
 /mob/proc/Process_Spacemove(var/check_drift = 0)
 
-	//VOREStation Edit begin: SHADEKIN
+	if(is_incorporeal())
-	if(shadekin_phasing_check())
 		return
-	//VOREStation Edit end: SHADEKIN
 
 	if(!Check_Dense_Object()) //Nothing to push off of so end here
 		update_floating(0)

code/modules/multiz/movement.dm

@@ -29,6 +29,10 @@
 		to_chat(src, "<span class='notice'>There is nothing of interest in this direction.</span>")
 		return 0
 
+	if(is_incorporeal())
+		forceMove(destination)
+		return 1
+
 	if(!start.CanZPass(src, direction))
 		to_chat(src, "<span class='warning'>\The [start] is in the way.</span>")
 		return 0
@@ -273,6 +277,8 @@
 		return FALSE
 
 /mob/living/can_fall()
+	if(is_incorporeal())
+		return FALSE
 	if(hovering)
 		return FALSE
 	return ..()

code/modules/projectiles/projectile.dm

@@ -219,12 +219,8 @@
 	Range()
 
 /obj/item/projectile/Crossed(atom/movable/AM) //A mob moving on a tile with a projectile is hit by it.
-	//VOREStation Edit begin: SHADEKIN
+	if(AM.is_incorporeal())
-	var/mob/SK = AM
+		return
-	if(istype(SK))
-		if(SK.shadekin_phasing_check())
-			return
-	//VOREStation Edit end: SHADEKIN
 	..()
 	if(isliving(AM) && !(pass_flags & PASSMOB))
 		var/mob/living/L = AM