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

[MIRROR] Rename Bump to Collide (#2002)

Browse Source 
* Rename Bump to Collide

* Delete bubblegum.dm.rej

* Update bubblegum.dm
This commit is contained in:
CitadelStationBot
2017-07-14 23:35:56 -05:00
committed by kevinz000
parent 80d06fe843
commit 2d3905457e
37 changed files with 78 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/clock_cult/clock_mobs/anima_fragment.dm
+1 -1
View File
@@ -49,7 +49,7 @@
/mob/living/simple_animal/hostile/clockwork/fragment/Process_Spacemove(movement_dir = 0)
return 1
/mob/living/simple_animal/hostile/clockwork/fragment/Bump(atom/movable/AM)
/mob/living/simple_animal/hostile/clockwork/fragment/Collide(atom/movable/AM)
. = ..()
if(movement_delay_time <= world.time && next_move <= world.time && isliving(AM) && !is_servant_of_ratvar(AM))
var/mob/living/L = AM
code/game/gamemodes/clock_cult/clock_structures/ratvar_the_clockwork_justicar.dm
+1 -1
View File
@@ -46,7 +46,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/Bump(atom/A)
/obj/structure/destructible/clockwork/massive/ratvar/Collide(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
code/game/gamemodes/clock_cult/clock_structures/taunting_trail.dm
+1 -1
View File
@@ -47,7 +47,7 @@
affect_mob(AM)
return ..()
/obj/structure/destructible/clockwork/taunting_trail/Bump(atom/movable/AM)
/obj/structure/destructible/clockwork/taunting_trail/Collide(atom/movable/AM)
affect_mob(AM)
return ..()
code/game/gamemodes/meteor/meteors.dm
+3 -3
View File
@@ -130,7 +130,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
SpinAnimation()
QDEL_IN(src, lifetime)
/obj/effect/meteor/Bump(atom/A)
/obj/effect/meteor/Collide(atom/A)
if(A)
ram_turf(get_turf(A))
playsound(src.loc, meteorsound, 40, 1)
@@ -295,7 +295,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
if(!isspaceturf(T))
new /obj/effect/decal/cleanable/blood(T)
/obj/effect/meteor/meaty/Bump(atom/A)
/obj/effect/meteor/meaty/Collide(atom/A)
A.ex_act(hitpwr)
get_hit()
@@ -334,7 +334,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
..()
explosion(src.loc, 5, 10, 15, 20, 0)
/obj/effect/meteor/tunguska/Bump()
/obj/effect/meteor/tunguska/Collide()
..()
if(prob(20))
explosion(src.loc,2,4,6,8)