cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 14:37:04 +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/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))