cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #38938 from ninjanomnom/b-b-bump

Browse Source 
Converts collide back to bump and fixes double bumping in another way
This commit is contained in:
Jordan Brown
2018-07-09 14:50:27 -04:00
committed by yogstation13-bot
parent 51c6eb55c9
commit 703d9c0943
72 changed files with 188 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/antagonists/clockcult/clock_effects/city_of_cogs_rift.dm
View File

@@ -40,7 +40,7 @@
/obj/effect/clockwork/city_of_cogs_rift/attack_hand(atom/movable/AM)
beckon(AM)
/obj/effect/clockwork/city_of_cogs_rift/CollidedWith(atom/movable/AM)
/obj/effect/clockwork/city_of_cogs_rift/Bumped(atom/movable/AM)
if(!QDELETED(AM))
if(isliving(AM))
var/mob/living/L = AM

2
code/modules/antagonists/clockcult/clock_effects/spatial_gateway.dm
View File

@@ -119,7 +119,7 @@
return
/obj/effect/clockwork/spatial_gateway/CollidedWith(atom/movable/AM)
/obj/effect/clockwork/spatial_gateway/Bumped(atom/movable/AM)
..()
if(!QDELETED(AM))
pass_through_gateway(AM, FALSE)

2
code/modules/antagonists/clockcult/clock_structures/ratvar_the_clockwork_justicar.dm
View File

@@ -47,7 +47,7 @@
R.visible_message("<span class='heavy_brass'>[R] forms, and its eyes blink open, glowing bright red!</span>")
R.key = O.key
/obj/structure/destructible/clockwork/massive/ratvar/Collide(atom/A)
/obj/structure/destructible/clockwork/massive/ratvar/Bump(atom/A)
var/turf/T = get_turf(A)
if(T == loc)
T = get_step(T, dir) //please don't run into a window like a bird, ratvar

4
code/modules/antagonists/clockcult/clock_structures/taunting_trail.dm
View File

@@ -43,11 +43,11 @@
affect_mob(AM)
return ..()
/obj/structure/destructible/clockwork/taunting_trail/CollidedWith(atom/movable/AM)
/obj/structure/destructible/clockwork/taunting_trail/Bumped(atom/movable/AM)
affect_mob(AM)
return ..()
/obj/structure/destructible/clockwork/taunting_trail/Collide(atom/movable/AM)
/obj/structure/destructible/clockwork/taunting_trail/Bump(atom/movable/AM)
affect_mob(AM)
return ..()

2
code/modules/antagonists/cult/cult_items.dm
View File

@@ -770,7 +770,7 @@
damage_type = BRUTE
impact_effect_type = /obj/effect/temp_visual/dir_setting/bloodsplatter
/obj/item/projectile/magic/arcane_barrage/blood/Collide(atom/target)
/obj/item/projectile/magic/arcane_barrage/blood/Bump(atom/target)
var/turf/T = get_turf(target)
playsound(T, 'sound/effects/splat.ogg', 50, TRUE)
if(iscultist(target))