cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Portal fixes - adds oldloc to Crossed()

Browse Source
This commit is contained in:
Mark van Alphen
2019-07-15 20:16:17 +02:00
parent 10ef2311ab
commit fd579015b1
59 changed files with 77 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/assembly/bomb.dm
+2 -2
View File
@@ -77,9 +77,9 @@
if(bombassembly)
bombassembly.HasProximity(AM)
/obj/item/onetankbomb/Crossed(atom/movable/AM) //for mousetraps
/obj/item/onetankbomb/Crossed(atom/movable/AM, oldloc) //for mousetraps
if(bombassembly)
bombassembly.Crossed(AM)
bombassembly.Crossed(AM, oldloc)
/obj/item/onetankbomb/on_found(mob/finder) //for mousetraps
if(bombassembly)
code/modules/assembly/holder.dm
+3 -3
View File
@@ -85,11 +85,11 @@
a_right.HasProximity(AM)
/obj/item/assembly_holder/Crossed(atom/movable/AM)
/obj/item/assembly_holder/Crossed(atom/movable/AM, oldloc)
if(a_left)
a_left.Crossed(AM)
a_left.Crossed(AM, oldloc)
if(a_right)
a_right.Crossed(AM)
a_right.Crossed(AM, oldloc)
/obj/item/assembly_holder/on_found(mob/finder)
if(a_left)
code/modules/assembly/infrared.dm
+1 -1
View File
@@ -269,7 +269,7 @@
/obj/effect/beam/i_beam/Bumped()
hit()
/obj/effect/beam/i_beam/Crossed(atom/movable/AM)
/obj/effect/beam/i_beam/Crossed(atom/movable/AM, oldloc)
if(!isobj(AM) && !isliving(AM))
return
if(istype(AM, /obj/effect))
code/modules/assembly/mousetrap.dm
+1 -1
View File
@@ -93,7 +93,7 @@
return
..()
/obj/item/assembly/mousetrap/Crossed(atom/movable/AM)
/obj/item/assembly/mousetrap/Crossed(atom/movable/AM, oldloc)
if(armed)
if(ishuman(AM))
var/mob/living/carbon/H = AM
code/modules/awaymissions/mission_code/wildwest.dm
+1 -1
View File
@@ -140,7 +140,7 @@
/obj/effect/meatgrinder/New()
icon_state = "blobpod"
/obj/effect/meatgrinder/Crossed(AM as mob|obj)
/obj/effect/meatgrinder/Crossed(AM as mob|obj, oldloc)
Bumped(AM)
/obj/effect/meatgrinder/Bumped(mob/M as mob|obj)
code/modules/awaymissions/zvis.dm
+1 -1
View File
@@ -65,7 +65,7 @@
STOP_PROCESSING(SSobj, src)
return ..()
/obj/effect/portal_sensor/Crossed(A)
/obj/effect/portal_sensor/Crossed(A, oldloc)
trigger()
/obj/effect/portal_sensor/Uncrossed(A)
code/modules/events/spacevine.dm
+1 -1
View File
@@ -514,7 +514,7 @@
/obj/structure/spacevine/obj_destruction()
wither()
/obj/structure/spacevine/Crossed(mob/crosser)
/obj/structure/spacevine/Crossed(mob/crosser, oldloc)
if(isliving(crosser))
for(var/datum/spacevine_mutation/SM in mutations)
SM.on_cross(src, crosser)
code/modules/flufftext/Hallucination.dm
+1 -1
View File
@@ -589,7 +589,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
health -= P.force
return
/obj/effect/fake_attacker/Crossed(mob/M, somenumber)
/obj/effect/fake_attacker/Crossed(mob/M, oldloc)
if(M == my_target)
step_away(src,my_target,2)
if(prob(30))
code/modules/hydroponics/grown.dm
+1 -1
View File
@@ -151,7 +151,7 @@
T.on_consume(src, usr)
..()
/obj/item/reagent_containers/food/snacks/grown/Crossed(atom/movable/AM)
/obj/item/reagent_containers/food/snacks/grown/Crossed(atom/movable/AM, oldloc)
if(seed)
for(var/datum/plant_gene/trait/T in seed.genes)
T.on_cross(src, AM)
code/modules/hydroponics/grown/towercap.dm
+1 -1
View File
@@ -160,7 +160,7 @@
..()
StartBurning()
/obj/structure/bonfire/Crossed(atom/movable/AM)
/obj/structure/bonfire/Crossed(atom/movable/AM, oldloc)
if(burning)
Burn()
code/modules/hydroponics/growninedible.dm
+1 -1
View File
@@ -51,7 +51,7 @@
return 0
/obj/item/grown/Crossed(atom/movable/AM)
/obj/item/grown/Crossed(atom/movable/AM, oldloc)
if(seed)
for(var/datum/plant_gene/trait/T in seed.genes)
T.on_cross(src, AM)
code/modules/mining/lavaland/ash_flora.dm
+1 -1
View File
@@ -137,7 +137,7 @@
regrowth_time_low = 4800
regrowth_time_high = 7200
/obj/structure/flora/ash/cacti/Crossed(mob/AM)
/obj/structure/flora/ash/cacti/Crossed(mob/AM, oldloc)
if(ishuman(AM) && has_gravity(loc) && prob(70))
var/mob/living/carbon/human/H = AM
if(!H.shoes && !H.lying) //ouch, my feet.
code/modules/mining/ore.dm
+1 -1
View File
@@ -31,7 +31,7 @@
else if(W.isOn())
to_chat(user, "<span class='info'>Not enough fuel to smelt [src].</span>")
/obj/item/stack/ore/Crossed(atom/movable/AM)
/obj/item/stack/ore/Crossed(atom/movable/AM, oldloc)
var/obj/item/storage/bag/ore/OB
var/turf/simulated/floor/F = get_turf(src)
if(loc != F)
code/modules/mob/living/carbon/alien/special/facehugger.dm
+1 -1
View File
@@ -72,7 +72,7 @@ var/const/MAX_ACTIVE_TIME = 400
/obj/item/clothing/mask/facehugger/equipped(mob/M)
Attach(M)
/obj/item/clothing/mask/facehugger/Crossed(atom/target)
/obj/item/clothing/mask/facehugger/Crossed(atom/target, oldloc)
HasProximity(target)
return
code/modules/mob/living/carbon/human/human.dm
+1 -1
View File
@@ -455,7 +455,7 @@
popup.open()
/mob/living/carbon/human/Crossed(atom/movable/AM)
/mob/living/carbon/human/Crossed(atom/movable/AM, oldloc)
var/mob/living/simple_animal/bot/mulebot/MB = AM
if(istype(MB))
MB.RunOver(src)
code/modules/mob/living/simple_animal/bot/griefsky.dm
+1 -1
View File
@@ -48,7 +48,7 @@
..()
light_color = LIGHT_COLOR_PURE_RED //if you see a red one. RUN!!
/mob/living/simple_animal/bot/secbot/griefsky/Crossed(atom/movable/AM)
/mob/living/simple_animal/bot/secbot/griefsky/Crossed(atom/movable/AM, oldloc)
..()
if(ismob(AM) && AM == target)
var/mob/living/carbon/C = AM
code/modules/mob/living/simple_animal/bot/honkbot.dm
+1 -1
View File
@@ -298,7 +298,7 @@
target = user
mode = BOT_HUNT
/mob/living/simple_animal/bot/honkbot/Crossed(atom/movable/AM)
/mob/living/simple_animal/bot/honkbot/Crossed(atom/movable/AM, oldloc)
if(ismob(AM) && on) //only if its online
if(prob(30)) //you're far more likely to trip on a honkbot
var/mob/living/carbon/C = AM
code/modules/mob/living/simple_animal/bot/secbot.dm
+1 -1
View File
@@ -439,7 +439,7 @@ Auto Patrol: []"},
target = user
mode = BOT_HUNT
/mob/living/simple_animal/bot/secbot/Crossed(atom/movable/AM)
/mob/living/simple_animal/bot/secbot/Crossed(atom/movable/AM, oldloc)
if(ismob(AM) && target)
var/mob/living/carbon/C = AM
if(!istype(C) || !C || in_range(src, target))
code/modules/mob/living/simple_animal/friendly/cockroach.dm
+1 -1
View File
@@ -24,7 +24,7 @@
/mob/living/simple_animal/cockroach/can_die()
return ..() && !SSticker.cinematic //If the nuke is going off, then cockroaches are invincible. Keeps the nuke from killing them, cause cockroaches are immune to nukes.
/mob/living/simple_animal/cockroach/Crossed(var/atom/movable/AM)
/mob/living/simple_animal/cockroach/Crossed(var/atom/movable/AM, oldloc)
if(isliving(AM))
var/mob/living/A = AM
if(A.mob_size > MOB_SIZE_SMALL)
code/modules/mob/living/simple_animal/friendly/mouse.dm
+1 -1
View File
@@ -91,7 +91,7 @@
to_chat(src, "<span class='warning'>You are too small to pull anything.</span>")
return
/mob/living/simple_animal/mouse/Crossed(AM as mob|obj)
/mob/living/simple_animal/mouse/Crossed(AM as mob|obj, oldloc)
if(ishuman(AM))
if(!stat)
var/mob/M = AM
code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
+1 -1
View File
@@ -526,7 +526,7 @@ Difficulty: Hard
sleep(1.3) //slightly forgiving; the burst animation is 1.5 deciseconds
bursting = FALSE //we no longer damage crossers
/obj/effect/temp_visual/hierophant/blast/Crossed(atom/movable/AM)
/obj/effect/temp_visual/hierophant/blast/Crossed(atom/movable/AM, oldloc)
..()
if(bursting)
do_damage(get_turf(src))
code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm
+1 -1
View File
@@ -36,7 +36,7 @@
desc = "A thick vine, painful to the touch."
/obj/effect/ebeam/vine/Crossed(atom/movable/AM)
/obj/effect/ebeam/vine/Crossed(atom/movable/AM, oldloc)
if(isliving(AM))
var/mob/living/L = AM
if(!("vines" in L.faction))
code/modules/power/singularity/containment_field.dm
+1 -2
View File
@@ -33,11 +33,10 @@
return 0
/obj/machinery/field/containment/Crossed(mob/mover)
/obj/machinery/field/containment/Crossed(mob/mover, oldloc)
if(isliving(mover))
shock_field(mover)
/obj/machinery/field/containment/Crossed(obj/mover)
if(istype(mover, /obj/machinery) || istype(mover, /obj/structure) || istype(mover, /obj/mecha))
bump_field(mover)
code/modules/power/singularity/field_generator.dm
+1 -1
View File
@@ -287,7 +287,7 @@ field_generator power level display
fields += CF
G.fields += CF
for(var/mob/living/L in T)
CF.Crossed(L)
CF.Crossed(L, null)
connected_gens |= G
G.connected_gens |= src
code/modules/power/singularity/particle_accelerator/particle.dm
+1 -1
View File
@@ -39,7 +39,7 @@
var/obj/singularity/S = A
S.energy += energy
/obj/effect/accelerated_particle/Crossed(atom/A)
/obj/effect/accelerated_particle/Crossed(atom/A, oldloc)
if(isliving(A))
toxmob(A)
code/modules/power/supermatter/sm_shard.dm
+1 -1
View File
@@ -41,7 +41,7 @@
playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
return ..()
/obj/item/shard/supermatter/Crossed(AM as mob|obj)
/obj/item/shard/supermatter/Crossed(AM as mob|obj, oldloc)
if(ismob(AM))
var/mob/M = AM
to_chat(M, "<span class='danger'>You step on \the [src]!</span>")
code/modules/power/treadmill.dm
+1 -1
View File
@@ -25,7 +25,7 @@
/obj/machinery/power/treadmill/update_icon()
icon_state = speed ? "conveyor-1" : "conveyor0"
/obj/machinery/power/treadmill/Crossed(mob/living/M)
/obj/machinery/power/treadmill/Crossed(mob/living/M, oldloc)
if(anchored && !M.anchored)
if(!istype(M) || M.dir != dir)
throw_off(M)
code/modules/projectiles/projectile.dm
+1 -1
View File
@@ -281,7 +281,7 @@
Range()
sleep(1)
obj/item/projectile/Crossed(atom/movable/AM) //A mob moving on a tile with a projectile is hit by it.
obj/item/projectile/Crossed(atom/movable/AM, oldloc) //A mob moving on a tile with a projectile is hit by it.
..()
if(isliving(AM) && AM.density && !checkpass(PASSMOB))
Bump(AM, 1)
code/modules/reagents/reagent_containers/glass_containers.dm
+2 -2
View File
@@ -246,9 +246,9 @@
if(assembly)
assembly.HasProximity(AM)
/obj/item/reagent_containers/glass/beaker/Crossed(atom/movable/AM)
/obj/item/reagent_containers/glass/beaker/Crossed(atom/movable/AM, oldloc)
if(assembly)
assembly.Crossed(AM)
assembly.Crossed(AM, oldloc)
/obj/item/reagent_containers/glass/beaker/on_found(mob/finder) //for mousetraps
if(assembly)
code/modules/reagents/reagent_dispenser.dm
+2 -2
View File
@@ -187,9 +187,9 @@
if(rig)
rig.HasProximity(AM)
/obj/structure/reagent_dispensers/fueltank/Crossed(atom/movable/AM)
/obj/structure/reagent_dispensers/fueltank/Crossed(atom/movable/AM, oldloc)
if(rig)
rig.Crossed(AM)
rig.Crossed(AM, oldloc)
/obj/structure/reagent_dispensers/fueltank/hear_talk(mob/living/M, list/message_pieces)
if(rig)
code/modules/recycling/conveyor2.dm
+1 -1
View File
@@ -178,7 +178,7 @@ GLOBAL_LIST_INIT(conveyor_switches, list())
else if(still_stuff_to_move && !speed_process)
makeSpeedProcess()
/obj/machinery/conveyor/Crossed(atom/movable/AM)
/obj/machinery/conveyor/Crossed(atom/movable/AM, oldloc)
if(!speed_process && !AM.anchored)
makeSpeedProcess()
..()
code/modules/ruins/objects_and_mobs/necropolis_gate.dm
+2 -2
View File
@@ -266,7 +266,7 @@ GLOBAL_DATUM(necropolis_gate, /obj/structure/necropolis_gate/legion_gate)
/obj/structure/stone_tile/singularity_pull()
return
/obj/structure/stone_tile/Crossed(atom/movable/AM)
/obj/structure/stone_tile/Crossed(atom/movable/AM, oldloc)
if(falling || fallen)
return
var/turf/T = get_turf(src)
@@ -310,7 +310,7 @@ GLOBAL_DATUM(necropolis_gate, /obj/structure/necropolis_gate/legion_gate)
falling = FALSE
fallen = FALSE
/obj/structure/stone_tile/proc/crossed_effect(atom/movable/AM)
/obj/structure/stone_tile/proc/crossed_effect(atom/movable/AM, oldloc)
return
/obj/structure/stone_tile/block