cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update mob.dm

Browse Source
This commit is contained in:
Novacat
2020-08-28 12:38:16 -04:00
committed by GitHub
parent fbf39daacf
commit 33b1eb1cdb
1 changed files with 1 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
code/modules/mob/mob.dm
View File

@@ -77,33 +77,6 @@
// message is the message output to anyone who can see e.g. "[src] does something!" // message is the message output to anyone who can see e.g. "[src] does something!"
// self_message (optional) is what the src mob sees e.g. "You do something!" // self_message (optional) is what the src mob sees e.g. "You do something!"
// blind_message (optional) is what blind people will hear e.g. "You hear something!" // blind_message (optional) is what blind people will hear e.g. "You hear something!"
<<<<<<< HEAD
/mob/visible_message(var/message, var/self_message, var/blind_message)
//VOREStation Edit
var/list/see
if(isbelly(loc))
var/obj/belly/B = loc
see = B.get_mobs_and_objs_in_belly()
else
see = get_mobs_and_objs_in_view_fast(get_turf(src),world.view,remote_ghosts = FALSE)
//VOREStation Edit End
var/list/seeing_mobs = see["mobs"]
var/list/seeing_objs = see["objs"]
for(var/obj in seeing_objs)
var/obj/O = obj
O.show_message(message, 1, blind_message, 2)
for(var/mob in seeing_mobs)
var/mob/M = mob
if(self_message && M == src)
M.show_message( self_message, 1, blind_message, 2)
else if(M.see_invisible >= invisibility && MOB_CAN_SEE_PLANE(M, plane))
M.show_message(message, 1, blind_message, 2)
else if(blind_message)
M.show_message(blind_message, 2)
=======
/mob/visible_message(var/message, var/self_message, var/blind_message, var/list/exclude_mobs = null) /mob/visible_message(var/message, var/self_message, var/blind_message, var/list/exclude_mobs = null)
if(self_message) if(self_message)
if(LAZYLEN(exclude_mobs)) if(LAZYLEN(exclude_mobs))
@@ -112,7 +85,6 @@
exclude_mobs = list(src) exclude_mobs = list(src)
src.show_message(self_message, 1, blind_message, 2) src.show_message(self_message, 1, blind_message, 2)
. = ..() . = ..()
>>>>>>> 5714d64... Actually adds (and TESTS) exclude_mobs parameter to visible_message (#7555)
// Returns an amount of power drawn from the object (-1 if it's not viable). // Returns an amount of power drawn from the object (-1 if it's not viable).
// If drain_check is set it will not actually drain power, just return a value. // If drain_check is set it will not actually drain power, just return a value.