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/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