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

Rename Bumped to CollidedWith (#2017)

Browse Source
This commit is contained in:
CitadelStationBot
2017-07-15 13:44:12 -05:00
committed by kevinz000
parent 738eaa1d54
commit 54da14ea6b
36 changed files with 102 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/fun_balloon.dm
+23 -22
View File
@@ -120,29 +120,29 @@
var/list/warp_points = list()
/obj/effect/forcefield/arena_shuttle/Bumped(mob/M as mob|obj)
/obj/effect/forcefield/arena_shuttle/CollidedWith(atom/movable/AM)
if(!isliving(AM))
return
if(!warp_points.len)
warp_points = get_area_turfs(/area/shuttle/escape)
for(var/turf/T in warp_points)
for(var/atom/movable/AM in T)
if(AM.density && AM.anchored)
for(var/atom/movable/TAM in T)
if(TAM.density && TAM.anchored)
warp_points -= T
break
if(!isliving(M))
return
var/mob/living/L = AM
if(L.pulling && istype(L.pulling, /obj/item/bodypart/head))
to_chat(L, "Your offering is accepted. You may pass.")
qdel(L.pulling)
var/turf/LA = pick(warp_points)
L.forceMove(LA)
L.hallucination = 0
to_chat(L, "<span class='reallybig redtext'>The battle is won. Your bloodlust subsides.</span>")
for(var/obj/item/weapon/twohanded/required/chainsaw/doomslayer/chainsaw in L)
qdel(chainsaw)
else
var/mob/living/L = M
if(L.pulling && istype(L.pulling, /obj/item/bodypart/head))
to_chat(L, "Your offering is accepted. You may pass.")
qdel(L.pulling)
var/turf/LA = pick(warp_points)
L.forceMove(LA)
L.hallucination = 0
to_chat(L, "<span class='reallybig redtext'>The battle is won. Your bloodlust subsides.</span>")
for(var/obj/item/weapon/twohanded/required/chainsaw/doomslayer/chainsaw in L)
qdel(chainsaw)
else
to_chat(L, "You are not yet worthy of passing. Drag a severed head to the barrier to be allowed entry to the hall of champions.")
to_chat(L, "You are not yet worthy of passing. Drag a severed head to the barrier to be allowed entry to the hall of champions.")
/obj/effect/landmark/shuttle_arena_safe
name = "hall of champions"
@@ -157,19 +157,20 @@
name = "portal"
var/list/warp_points = list()
/obj/effect/forcefield/arena_shuttle_entrance/Bumped(mob/M as mob|obj)
/obj/effect/forcefield/arena_shuttle_entrance/CollidedWith(atom/movable/AM)
if(!isliving(AM))
return
if(!warp_points.len)
for(var/obj/effect/landmark/shuttle_arena_entrance/S in GLOB.landmarks_list)
warp_points |= S
if(!isliving(M))
return
var/obj/effect/landmark/LA = pick(warp_points)
var/mob/living/M = AM
M.forceMove(get_turf(LA))
to_chat(M, "<span class='reallybig redtext'>You're trapped in a deadly arena! To escape, you'll need to drag a severed head to the escape portals.</span>")
spawn()
var/obj/effect/mine/pickup/bloodbath/B = new(M)
var/obj/effect/mine/pickup/bloodbath/B = new (M)
B.mineEffect(M)
code/modules/assembly/infrared.dm
+1 -1
View File
@@ -214,7 +214,7 @@
qdel(src)
return
/obj/effect/beam/i_beam/Bumped()
/obj/effect/beam/i_beam/CollidedWith(atom/movable/AM)
hit()
/obj/effect/beam/i_beam/Crossed(atom/movable/AM as mob|obj)
code/modules/awaymissions/capture_the_flag.dm
+1 -1
View File
@@ -588,7 +588,7 @@
/obj/effect/ctf/ammo/Collide(atom/movable/AM)
reload(AM)
/obj/effect/ctf/ammo/Bumped(atom/movable/AM)
/obj/effect/ctf/ammo/CollidedWith(atom/movable/AM)
reload(AM)
/obj/effect/ctf/ammo/proc/reload(mob/living/M)
code/modules/awaymissions/gateway.dm
+2 -2
View File
@@ -136,7 +136,7 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
update_icon()
//okay, here's the good teleporting stuff
/obj/machinery/gateway/centerstation/Bumped(atom/movable/AM)
/obj/machinery/gateway/centerstation/CollidedWith(atom/movable/AM)
if(!active)
return
if(!detect())
@@ -212,7 +212,7 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
return TRUE
return FALSE
/obj/machinery/gateway/centeraway/Bumped(atom/movable/AM)
/obj/machinery/gateway/centeraway/CollidedWith(atom/movable/AM)
if(!detect())
return
if(!active)
code/modules/awaymissions/mission_code/wildwest.dm
+8 -5
View File
@@ -91,16 +91,19 @@
icon_state = "blobpod"
var/triggered = 0
/obj/effect/meatgrinder/Crossed(AM)
Bumped(AM)
/obj/effect/meatgrinder/Crossed(atom/movable/AM)
CollidedWith(AM)
/obj/effect/meatgrinder/Bumped(mob/M)
/obj/effect/meatgrinder/CollidedWith(atom/movable/AM)
if(triggered)
return
if(!ishuman(AM))
return
if(ishuman(M) && M.stat != DEAD && M.ckey)
for(var/mob/O in viewers(world.view, src.loc))
var/mob/living/carbon/human/M = AM
if(M.stat != DEAD && M.ckey)
visible_message("<span class='warning'>[M] triggered the [src]!</span>")
triggered = 1
code/modules/food_and_drinks/kitchen_machinery/gibber.dm
+5 -4
View File
@@ -33,11 +33,12 @@
CRASH("Didn't find an input plate.")
return
/obj/machinery/gibber/autogibber/Bumped(atom/A)
if(!input_plate) return
/obj/machinery/gibber/autogibber/CollidedWith(atom/movable/AM)
if(!input_plate)
return
if(ismob(A))
var/mob/M = A
if(ismob(AM))
var/mob/M = AM
if(M.loc == input_plate)
M.loc = src
code/modules/mob/living/living.dm
+1 -1
View File
@@ -99,7 +99,7 @@
if(PushAM(AM))
return
/mob/living/Bumped(atom/movable/AM)
/mob/living/CollidedWith(atom/movable/AM)
..()
last_bumped = world.time
code/modules/mob/living/simple_animal/guardian/types/fire.dm
+1 -1
View File
@@ -27,7 +27,7 @@
..()
collision_ignite(AM)
/mob/living/simple_animal/hostile/guardian/fire/Bumped(AM as mob|obj)
/mob/living/simple_animal/hostile/guardian/fire/CollidedWith(atom/movable/AM)
..()
collision_ignite(AM)
code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+1 -1
View File
@@ -437,7 +437,7 @@ Difficulty: Very Hard
playsound(user, activation_sound, 100, 1)
return TRUE
/obj/machinery/anomalous_crystal/Bumped(atom/AM as mob|obj)
/obj/machinery/anomalous_crystal/CollidedWith(atom/movable/AM)
..()
if(ismob(AM))
ActivationReaction(AM, ACTIVATE_MOB_BUMP)
code/modules/power/singularity/singularity.dm
+2 -3
View File
@@ -107,9 +107,8 @@
return
/obj/singularity/Bumped(atom/A)
consume(A)
return
/obj/singularity/CollidedWith(atom/movable/AM)
consume(AM)
/obj/singularity/process()
code/modules/power/supermatter/supermatter.dm
+1 -1
View File
@@ -546,7 +546,7 @@
radiation_pulse(get_turf(src), 1, 1, 150, 1)
/obj/machinery/power/supermatter_shard/Bumped(atom/AM)
/obj/machinery/power/supermatter_shard/CollidedWith(atom/movable/AM)
if(isliving(AM))
AM.visible_message("<span class='danger'>\The [AM] slams into \the [src] inducing a resonance... [AM.p_their()] body starts to glow and catch flame before flashing into ash.</span>",\
"<span class='userdanger'>You slam into \the [src] as your ears are filled with unearthly ringing. Your last thought is \"Oh, fuck.\"</span>",\
code/modules/power/tesla/energy_ball.dm
+2 -2
View File
@@ -141,8 +141,8 @@ GLOBAL_LIST_INIT(blacklisted_tesla_types, typecacheof(list(/obj/machinery/atmosp
/obj/singularity/energy_ball/Collide(atom/A)
dust_mobs(A)
/obj/singularity/energy_ball/Bumped(atom/A)
dust_mobs(A)
/obj/singularity/energy_ball/CollidedWith(atom/movable/AM)
dust_mobs(AM)
/obj/singularity/energy_ball/orbit(obj/singularity/energy_ball/target)
if (istype(target))
code/modules/recycling/disposal-unit.dm
+1 -1
View File
@@ -458,7 +458,7 @@
..()
flush()
/obj/machinery/disposal/deliveryChute/Bumped(atom/movable/AM) //Go straight into the chute
/obj/machinery/disposal/deliveryChute/CollidedWith(atom/movable/AM) //Go straight into the chute
if(!AM.disposalEnterTry())
return
switch(dir)
code/modules/vehicles/vehicle.dm
+1 -1
View File
@@ -68,7 +68,7 @@
if(auto_door_open)
if(istype(M, /obj/machinery/door) && has_buckled_mobs())
for(var/m in buckled_mobs)
M.Bumped(m)
M.CollidedWith(m)
/obj/vehicle/Process_Spacemove(direction)