From ea0abc0fba86a26e8bc4bf95df60786420ad0ff5 Mon Sep 17 00:00:00 2001 From: SoundScopes Date: Thu, 11 Dec 2014 15:35:29 +0000 Subject: [PATCH] Turf entering proc change thing --- code/WorkInProgress/Cael_Aislinn/Supermatter/Laser2.dm | 2 +- code/WorkInProgress/Cib/amorph/amorph.dm | 2 +- code/WorkInProgress/Mini/asay_trap.dm | 2 +- code/defines/obj/weapon.dm | 2 +- code/game/atoms.dm | 3 --- code/game/gamemodes/cult/cult_structures.dm | 2 +- code/game/objects/effects/decals/Cleanable/humans.dm | 2 +- code/game/objects/effects/effect_system.dm | 4 ++-- code/game/objects/effects/portals.dm | 2 +- code/game/objects/effects/step_triggers.dm | 2 +- code/game/objects/items/stacks/sheets/glass.dm | 2 +- code/game/objects/items/toys.dm | 2 +- code/game/objects/items/weapons/clown_items.dm | 4 ++-- code/modules/assembly/holder.dm | 8 ++++---- code/modules/assembly/infrared.dm | 2 +- code/modules/assembly/mousetrap.dm | 2 +- code/modules/flufftext/Hallucination.dm | 2 +- code/unused/traps.dm | 4 ++-- maps/RandomZLevels/wildwest.dm | 2 +- 19 files changed, 24 insertions(+), 27 deletions(-) diff --git a/code/WorkInProgress/Cael_Aislinn/Supermatter/Laser2.dm b/code/WorkInProgress/Cael_Aislinn/Supermatter/Laser2.dm index 38032c45..4a7779c3 100644 --- a/code/WorkInProgress/Cael_Aislinn/Supermatter/Laser2.dm +++ b/code/WorkInProgress/Cael_Aislinn/Supermatter/Laser2.dm @@ -111,7 +111,7 @@ src.hit() return -/obj/beam/e_beam/HasEntered(atom/movable/AM as mob|obj) +/obj/beam/e_beam/Crossed(atom/movable/AM as mob|obj) if (istype(AM, /obj/beam)) return spawn( 0 ) diff --git a/code/WorkInProgress/Cib/amorph/amorph.dm b/code/WorkInProgress/Cib/amorph/amorph.dm index dd1a678f..a83f87e5 100644 --- a/code/WorkInProgress/Cib/amorph/amorph.dm +++ b/code/WorkInProgress/Cib/amorph/amorph.dm @@ -435,7 +435,7 @@ // called when something steps onto an amorph // this could be made more general, but for now just handle mulebot -/mob/living/carbon/amorph/HasEntered(var/atom/movable/AM) +/mob/living/carbon/amorph/Crossed(var/atom/movable/AM) var/obj/machinery/bot/mulebot/MB = AM if(istype(MB)) MB.RunOver(src) diff --git a/code/WorkInProgress/Mini/asay_trap.dm b/code/WorkInProgress/Mini/asay_trap.dm index 4cbd9e3c..da48ac34 100644 --- a/code/WorkInProgress/Mini/asay_trap.dm +++ b/code/WorkInProgress/Mini/asay_trap.dm @@ -7,6 +7,6 @@ unacidable = 1 invisibility = 101 -/obj/effect/admin_log_trap/HasEntered(AM as mob|obj) +/obj/effect/admin_log_trap/Crossed(AM as mob|obj) if(istype(AM,/mob)) message_admins("[AM] ([AM:ckey]) stepped on an alerted tile in [get_area(src)]. Jump", admin_ref = 1) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 1e02d51c..d6c80012 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -173,7 +173,7 @@ icon_state = "beartrap[armed]" user << "[src] is now [armed ? "armed" : "disarmed"]" -/obj/item/weapon/legcuffs/beartrap/HasEntered(AM as mob|obj) +/obj/item/weapon/legcuffs/beartrap/Crossed(AM as mob|obj) if(armed) if(ishuman(AM)) if(isturf(src.loc)) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 03e64bf2..e01a0d08 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -71,9 +71,6 @@ /atom/proc/CheckExit() return 1 -/atom/proc/HasEntered(atom/movable/AM as mob|obj) - return - /atom/proc/HasProximity(atom/movable/AM as mob|obj) return diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm index 9334e0f8..0b8c0cf6 100644 --- a/code/game/gamemodes/cult/cult_structures.dm +++ b/code/game/gamemodes/cult/cult_structures.dm @@ -51,7 +51,7 @@ return return -/obj/effect/gateway/HasEntered(AM as mob|obj) +/obj/effect/gateway/Crossed(AM as mob|obj) spawn(0) return return \ No newline at end of file diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index 1aa12332..1a75555f 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -45,7 +45,7 @@ var/global/list/image/splatter_cache=list() if(basecolor == "rainbow") basecolor = "#[pick(list("FF0000","FF7F00","FFFF00","00FF00","0000FF","4B0082","8F00FF"))]" color = basecolor -/obj/effect/decal/cleanable/blood/HasEntered(mob/living/carbon/human/perp) +/obj/effect/decal/cleanable/blood/Crossed(mob/living/carbon/human/perp) if (!istype(perp)) return if(amount < 1) diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm index 8c147cca..eeecf150 100644 --- a/code/game/objects/effects/effect_system.dm +++ b/code/game/objects/effects/effect_system.dm @@ -216,7 +216,7 @@ steam.start() -- spawns the effect delete() return -/obj/effect/effect/smoke/HasEntered(mob/living/carbon/M as mob ) +/obj/effect/effect/smoke/Crossed(mob/living/carbon/M as mob ) ..() if(istype(M)) affect(M) @@ -549,7 +549,7 @@ steam.start() -- spawns the effect delete() -/obj/effect/effect/foam/HasEntered(var/atom/movable/AM) +/obj/effect/effect/foam/Crossed(var/atom/movable/AM) if(metal) return diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm index 990e8855..a8cc290c 100644 --- a/code/game/objects/effects/portals.dm +++ b/code/game/objects/effects/portals.dm @@ -16,7 +16,7 @@ return return -/obj/effect/portal/HasEntered(AM as mob|obj) +/obj/effect/portal/Crossed(AM as mob|obj) spawn(0) src.teleport(AM) return diff --git a/code/game/objects/effects/step_triggers.dm b/code/game/objects/effects/step_triggers.dm index 3acecd04..e8cd72b8 100644 --- a/code/game/objects/effects/step_triggers.dm +++ b/code/game/objects/effects/step_triggers.dm @@ -9,7 +9,7 @@ /obj/effect/step_trigger/proc/Trigger(var/atom/movable/A) return 0 -/obj/effect/step_trigger/HasEntered(H as mob|obj) +/obj/effect/step_trigger/Crossed(H as mob|obj) ..() if(!H) return diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 9519d262..21acd880 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -284,7 +284,7 @@ return return ..() -/obj/item/weapon/shard/HasEntered(AM as mob|obj) +/obj/item/weapon/shard/Crossed(AM as mob|obj) if(ismob(AM)) var/mob/M = AM M << "\red You step in the broken glass!" diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index de6ce1c8..945073ec 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -402,7 +402,7 @@ playsound(src, 'sound/effects/snap.ogg', 50, 1) del(src) -/obj/item/toy/snappop/HasEntered(H as mob|obj) +/obj/item/toy/snappop/Crossed(H as mob|obj) if((ishuman(H))) //i guess carp and shit shouldn't set them off var/mob/living/carbon/M = H if(M.m_intent == "run") diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index 264ec2dd..56fb023a 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -8,7 +8,7 @@ /* * Banana Peals */ -/obj/item/weapon/bananapeel/HasEntered(AM as mob|obj) +/obj/item/weapon/bananapeel/Crossed(AM as mob|obj) if (istype(AM, /mob/living/carbon)) var/mob/M = AM if (istype(M, /mob/living/carbon/human) && (isobj(M:shoes) && M:shoes.flags&NOSLIP)) @@ -23,7 +23,7 @@ /* * Soap */ -/obj/item/weapon/soap/HasEntered(AM as mob|obj) //EXACTLY the same as bananapeel for now, so it makes sense to put it in the same dm -- Urist +/obj/item/weapon/soap/Crossed(AM as mob|obj) //EXACTLY the same as bananapeel for now, so it makes sense to put it in the same dm -- Urist if (istype(AM, /mob/living/carbon)) var/mob/M = AM if (istype(M, /mob/living/carbon/human) && (isobj(M:shoes) && M:shoes.flags&NOSLIP)) diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index 8dc2e3fd..49550531 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -104,13 +104,13 @@ special_assembly.HasProximity(AM) - HasEntered(atom/movable/AM as mob|obj) + Crossed(atom/movable/AM as mob|obj) if(a_left) - a_left.HasEntered(AM) + a_left.Crossed(AM) if(a_right) - a_right.HasEntered(AM) + a_right.Crossed(AM) if(special_assembly) - special_assembly.HasEntered(AM) + special_assembly.Crossed(AM) on_found(mob/finder as mob) diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index fc22539b..e2f81bdc 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -251,7 +251,7 @@ hit() return -/obj/effect/beam/i_beam/HasEntered(atom/movable/AM as mob|obj) +/obj/effect/beam/i_beam/Crossed(atom/movable/AM as mob|obj) if(istype(AM, /obj/effect/beam)) return spawn(0) diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index aa58c54f..5055d062 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -81,7 +81,7 @@ ..() - HasEntered(AM as mob|obj) + Crossed(AM as mob|obj) if(armed) if(ishuman(AM)) var/mob/living/carbon/H = AM diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 18e4f291..6b6e3760 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -252,7 +252,7 @@ proc/check_panel(mob/M) return - HasEntered(var/mob/M, somenumber) + Crossed(var/mob/M, somenumber) if(M == my_target) step_away(src,my_target,2) if(prob(30)) diff --git a/code/unused/traps.dm b/code/unused/traps.dm index c7a715a1..9834bb77 100644 --- a/code/unused/traps.dm +++ b/code/unused/traps.dm @@ -21,7 +21,7 @@ if(the_trap.name == trap_name) connected_traps += the_trap //adding the trap with the matching name -/obj/effect/pressure_plate/HasEntered(atom/victim as mob|obj) +/obj/effect/pressure_plate/Crossed(atom/victim as mob|obj) if(victim.density && (trigger_type == "mob and obj" || (trigger_type == "mob" && istype(victim,/mob)) || (trigger_type == "obj" && istype(victim,/obj)))) for(var/obj/effect/trap/T in connected_traps) T.trigger(victim) @@ -44,7 +44,7 @@ ..() src:visibility = 0 //seriously, it keeps saying "undefined var" when I try to do it in the define -/obj/effect/trap/HasEntered(victim as mob|obj) +/obj/effect/trap/Crossed(victim as mob|obj) if(trigger_type == "mob and obj" || (trigger_type == "mob" && istype(victim,/mob)) || (trigger_type == "obj" && istype(victim,/obj))) trigger(victim) diff --git a/maps/RandomZLevels/wildwest.dm b/maps/RandomZLevels/wildwest.dm index e3450be8..6f77fd1a 100644 --- a/maps/RandomZLevels/wildwest.dm +++ b/maps/RandomZLevels/wildwest.dm @@ -113,7 +113,7 @@ /obj/effect/meatgrinder/New() icon_state = "blob" -/obj/effect/meatgrinder/HasEntered(AM as mob|obj) +/obj/effect/meatgrinder/Crossed(AM as mob|obj) Bumped(AM) /obj/effect/meatgrinder/Bumped(mob/M as mob|obj)