shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removes old height parameter from CanPass proc

Browse Source
This commit is contained in:
CitadelStationBot
2017-07-13 17:46:36 -05:00
parent da324257fe
commit 1da785ffb5
46 changed files with 57 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/spacevine.dm
+1 -1
View File
@@ -579,7 +579,7 @@
if(!override)
qdel(src)
/obj/structure/spacevine/CanPass(atom/movable/mover, turf/target, height=0)
/obj/structure/spacevine/CanPass(atom/movable/mover, turf/target)
if(isvineimmune(mover))
. = TRUE
else
code/modules/fields/turf_objects.dm
+2 -2
View File
@@ -23,7 +23,7 @@
name = "energy field"
desc = "Get off my turf!"
/obj/effect/abstract/proximity_checker/advanced/field_turf/CanPass(atom/movable/AM, turf/target, height)
/obj/effect/abstract/proximity_checker/advanced/field_turf/CanPass(atom/movable/AM, turf/target)
if(parent)
return parent.field_turf_canpass(AM, src, target)
return TRUE
@@ -47,7 +47,7 @@
name = "energy field edge"
desc = "Edgy description here."
/obj/effect/abstract/proximity_checker/advanced/field_edge/CanPass(atom/movable/AM, turf/target, height)
/obj/effect/abstract/proximity_checker/advanced/field_edge/CanPass(atom/movable/AM, turf/target)
if(parent)
return parent.field_edge_canpass(AM, src, target)
return TRUE
code/modules/holiday/halloween.dm
+1 -1
View File
@@ -171,7 +171,7 @@
/mob/living/simple_animal/shade/howling_ghost/adjustHealth()
. = 0
/mob/living/simple_animal/shade/howling_ghost/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
/mob/living/simple_animal/shade/howling_ghost/CanPass(atom/movable/mover, turf/target)
return 1
code/modules/holodeck/items.dm
+1 -1
View File
@@ -118,7 +118,7 @@
else
..()
/obj/structure/holohoop/CanPass(atom/movable/mover, turf/target, height=0)
/obj/structure/holohoop/CanPass(atom/movable/mover, turf/target)
if (isitem(mover) && mover.throwing)
var/obj/item/I = mover
if(istype(I, /obj/item/projectile))
code/modules/mob/dead/observer/observer.dm
+1 -1
View File
@@ -151,7 +151,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
updateallghostimages()
return ..()
/mob/dead/CanPass(atom/movable/mover, turf/target, height=0)
/mob/dead/CanPass(atom/movable/mover, turf/target)
return 1
/*
code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
+1 -1
View File
@@ -397,7 +397,7 @@ Difficulty: Hard
faction = list("mining", "boss")
weather_immunities = list("lava","ash")
/mob/living/simple_animal/hostile/asteroid/hivelordbrood/slaughter/CanPass(atom/movable/mover, turf/target, height = 0)
/mob/living/simple_animal/hostile/asteroid/hivelordbrood/slaughter/CanPass(atom/movable/mover, turf/target)
if(istype(mover, /mob/living/simple_animal/hostile/megafauna/bubblegum))
return 1
return 0
code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
+1 -1
View File
@@ -467,7 +467,7 @@ Difficulty: Hard
queue_smooth_neighbors(src)
return ..()
/obj/effect/temp_visual/hierophant/wall/CanPass(atom/movable/mover, turf/target, height = 0)
/obj/effect/temp_visual/hierophant/wall/CanPass(atom/movable/mover, turf/target)
if(QDELETED(caster))
return FALSE
if(mover == caster.pulledby)
code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm
+1 -1
View File
@@ -70,7 +70,7 @@
return
//if it's not our target, we ignore it
/mob/living/simple_animal/hostile/asteroid/curseblob/CanPass(atom/movable/mover, turf/target, height = 0)
/mob/living/simple_animal/hostile/asteroid/curseblob/CanPass(atom/movable/mover, turf/target)
if(mover == set_target)
return FALSE
if(istype(mover, /obj/item/projectile))
code/modules/mob/mob_movement.dm
+1 -3
View File
@@ -1,6 +1,4 @@
/mob/CanPass(atom/movable/mover, turf/target, height=0)
if(height==0)
return TRUE
/mob/CanPass(atom/movable/mover, turf/target)
if(istype(mover, /obj/item/projectile) || mover.throwing)
return (!density || lying)
if(mover.checkpass(PASSMOB))
code/modules/power/antimatter/shielding.dm
+1 -3
View File
@@ -72,9 +72,7 @@
return ..()
/obj/machinery/am_shielding/CanPass(atom/movable/mover, turf/target, height=0)
if(height==0)
return 1
/obj/machinery/am_shielding/CanPass(atom/movable/mover, turf/target)
return 0
code/modules/power/singularity/containment_field.dm
+1 -1
View File
@@ -86,7 +86,7 @@
/obj/machinery/field
var/hasShocked = FALSE //Used to add a delay between shocks. In some cases this used to crash servers by spawning hundreds of sparks every second.
/obj/machinery/field/CanPass(atom/movable/mover, turf/target, height=0)
/obj/machinery/field/CanPass(atom/movable/mover, turf/target)
if(hasShocked)
return FALSE
if(isliving(mover)) // Don't let mobs through
code/modules/power/turbine.dm
+1 -1
View File
@@ -98,7 +98,7 @@
// Crucial to make things work!!!!
// OLD FIX - explanation given down below.
// /obj/machinery/power/compressor/CanPass(atom/movable/mover, turf/target, height=0)
// /obj/machinery/power/compressor/CanPass(atom/movable/mover, turf/target)
// return !density
/obj/machinery/power/compressor/locate_machinery()
code/modules/recycling/disposal-unit.dm
+2 -2
View File
@@ -332,7 +332,7 @@
eject()
. = TRUE
/obj/machinery/disposal/bin/CanPass(atom/movable/mover, turf/target, height=0)
/obj/machinery/disposal/bin/CanPass(atom/movable/mover, turf/target)
if (isitem(mover) && mover.throwing)
var/obj/item/I = mover
if(istype(I, /obj/item/projectile))
@@ -345,7 +345,7 @@
visible_message("<span class='notice'>[I] bounces off of [src]'s rim!</span>")
return 0
else
return ..(mover, target, height)
return ..(mover, target)
/obj/machinery/disposal/bin/flush()
..()
code/modules/ruins/objects_and_mobs/necropolis_gate.dm
+1 -1
View File
@@ -56,7 +56,7 @@
/obj/structure/necropolis_gate/singularity_pull()
return 0
/obj/structure/necropolis_gate/CanPass(atom/movable/mover, turf/target, height=0)
/obj/structure/necropolis_gate/CanPass(atom/movable/mover, turf/target)
if(get_dir(loc, target) == dir)
return !density
return 1
code/modules/ruins/objects_and_mobs/sin_ruins.dm
+1 -3
View File
@@ -76,9 +76,7 @@
icon = 'icons/mob/blob.dmi'
color = rgb(145, 150, 0)
/obj/effect/gluttony/CanPass(atom/movable/mover, turf/target, height=0)//So bullets will fly over and stuff.
if(height==0)
return 1
/obj/effect/gluttony/CanPass(atom/movable/mover, turf/target)//So bullets will fly over and stuff.
if(ishuman(mover))
var/mob/living/carbon/human/H = mover
if(H.nutrition >= NUTRITION_LEVEL_FAT)
code/modules/shuttle/special.dm
+1 -1
View File
@@ -216,7 +216,7 @@
var/threshold = 500
var/static/list/approved_passengers = list()
/obj/effect/forcefield/luxury_shuttle/CanPass(atom/movable/mover, turf/target, height=0)
/obj/effect/forcefield/luxury_shuttle/CanPass(atom/movable/mover, turf/target)
if(mover in approved_passengers)
return 1
code/modules/spells/spell_types/forcewall.dm
+1 -1
View File
@@ -31,7 +31,7 @@
wizard = summoner
QDEL_IN(src, 300)
/obj/effect/forcefield/wizard/CanPass(atom/movable/mover, turf/target, height=0)
/obj/effect/forcefield/wizard/CanPass(atom/movable/mover, turf/target)
if(mover == wizard)
return 1
return 0