Rename DEBUG macro to DEBUG_MESSAGE, for compatibility with 512.1413

This commit is contained in:
Mordent
2018-03-22 17:06:23 -10:00
committed by ZeWaka
parent 4f7298e438
commit a396a9247a
48 changed files with 188 additions and 188 deletions
+2 -2
View File
@@ -271,7 +271,7 @@
if (slightly_random)
var/rand_var = (rand(10, 14) / 10)
DEBUG("rand_var [rand_var]")
DEBUG_MESSAGE("rand_var [rand_var]")
speed = speed * rand_var
animate(A, pixel_x = X1, time = speed, loop = loopnum, easing = LINEAR_EASING)
animate(pixel_x = X2, time = speed, loop = loopnum, easing = LINEAR_EASING)
@@ -311,7 +311,7 @@
pixel_x = (radius * sin(deg*J)), \
pixel_y = (radius * cos(deg*J)), \
time = (T + (time_diff*J/(laps*res))) / res )
DEBUG("Animating D: [deg], res: [res], px: [A.pixel_x], py: [A.pixel_y], T: [T], ActualTime:[(T + (time_diff*J/(laps*res)))], J/laps:[J/(laps*res)] TD:[(time_diff*J/(laps*res))]")
DEBUG_MESSAGE("Animating D: [deg], res: [res], px: [A.pixel_x], py: [A.pixel_y], T: [T], ActualTime:[(T + (time_diff*J/(laps*res)))], J/laps:[J/(laps*res)] TD:[(time_diff*J/(laps*res))]")
//T += time_diff //Modify the time with the calculated difference.
animate(pixel_x = 0, pixel_y = 0, time = 2)
+1 -1
View File
@@ -2266,7 +2266,7 @@ var/list/mechanics_telepads = new/list()
if(Gun.canshoot())
var/atom/target = getTarget()
if(target)
//DEBUG("Target: [log_loc(target)]. Src: [src]")
//DEBUG_MESSAGE("Target: [log_loc(target)]. Src: [src]")
Gun.shoot(target, get_turf(src), src)
else
src.visible_message("<span class='game say'><span class='name'>[src]</span> beeps, \"The [Gun.name] has no [istype(Gun, /obj/item/gun/energy) ? "charge" : "ammo"] remaining.\"</span>")
+12 -12
View File
@@ -443,7 +443,7 @@ proc/Create_Tommyname()
Topic(href, href_list)
..()
DEBUG("Received: [href]")
DEBUG_MESSAGE("Received: [href]")
if (href_list["ackref"] )
var/D = connecting[usr]
if(D)
@@ -471,7 +471,7 @@ proc/Create_Tommyname()
. = (sub in range(1, master))
proc/sendToSubscribers(var/data, var/handler)
DEBUG("Sending: [data] to [handler ? handler : "-nothing-"]")
DEBUG_MESSAGE("Sending: [data] to [handler ? handler : "-nothing-"]")
for(var/mob/M in subscribed_mobs)
if(validateSubscriber(M))
sendData(M, data, handler)
@@ -533,12 +533,12 @@ proc/Create_Tommyname()
var/paneldir2 = turn(extension_dir, -90)
var/list/turf/panelturfs = list()
var/turf/walker = get_turf(src)
DEBUG("Extending panel at [showCoords(src.x, src.y, src.z)]. extension_dir: [extension_dir] ([dir2text(extension_dir)]), paneldir1: [paneldir1] ([dir2text(paneldir1)]), paneldir2: [paneldir2] ([dir2text(paneldir2)])")
DEBUG_MESSAGE("Extending panel at [showCoords(src.x, src.y, src.z)]. extension_dir: [extension_dir] ([dir2text(extension_dir)]), paneldir1: [paneldir1] ([dir2text(paneldir1)]), paneldir2: [paneldir2] ([dir2text(paneldir2)])")
var/total_len = station_padding + controller_padding + (panel_space * (num_panels -1)) + num_panels * panel_width
DEBUG("Determined total length of panel to be [total_len] tiles.")
DEBUG_MESSAGE("Determined total length of panel to be [total_len] tiles.")
//Create the initial padding
DEBUG("Creating stationside padding.")
DEBUG_MESSAGE("Creating stationside padding.")
var/list/catwalk = list(/turf/simulated/floor/plating/airless/catwalk, /obj/grille/catwalk)
for(var/i = 0; i < station_padding;i++)
move_create_obj(catwalk, walker, extension_dir, extension_dir) //Then we walk outwards, creating stuff as we go along
@@ -550,7 +550,7 @@ proc/Create_Tommyname()
move_create_obj(list(new /obj/lattice{icon_state="lattice-dir-b"}), walker, paneldir2, paneldir1 | turn(extension_dir, 180))
*/
DEBUG("Creating panel segments.")
DEBUG_MESSAGE("Creating panel segments.")
//Create the panels themselves
for(var/i = 0; i < num_panels; i++)
for(var/j = 0; j < (panel_space + panel_width);j++)
@@ -558,13 +558,13 @@ proc/Create_Tommyname()
walker = get_step(walker, extension_dir)
if(j >= panel_space) panelturfs += walker
DEBUG("Creating controller padding")
DEBUG_MESSAGE("Creating controller padding")
for(var/i = 0; i < controller_padding; i++)
move_create_obj(catwalk, walker, extension_dir, extension_dir) //Then we walk outwards, creating stuff as we go along
walker = get_step(walker,extension_dir)
DEBUG("Creating solar panels")
DEBUG_MESSAGE("Creating solar panels")
var/list/solar_list = list(/turf/simulated/floor/airless/solar, /obj/machinery/power/solar)
for(var/turf/T in panelturfs)
spawn(0)
@@ -577,7 +577,7 @@ proc/Create_Tommyname()
move_create_obj(solar_list, w2, paneldir2, paneldir2)
w2 = get_step(w2, paneldir2)
DEBUG("Creating solar controller")
DEBUG_MESSAGE("Creating solar controller")
move_create_obj(list(/turf/simulated/floor/plating/airless, /obj/machinery/power/tracker), walker, extension_dir)
walker = get_step(walker,extension_dir)
spawn(0) move_create_obj(list(new /obj/lattice{icon_state="lattice-dir-b"}), walker, paneldir1, paneldir2)
@@ -677,7 +677,7 @@ proc/Create_Tommyname()
ipy = 32
DEBUG("Initial offsets calculated based on movedir: [movedir] ([dir2text(movedir)]) as ipx: [ipx], ipy: [ipy]")
DEBUG_MESSAGE("Initial offsets calculated based on movedir: [movedir] ([dir2text(movedir)]) as ipx: [ipx], ipy: [ipy]")
var/is_turf = 0
var/turf/T = get_step(startturf, movedir)
var/turf_type = null
@@ -714,7 +714,7 @@ proc/Create_Tommyname()
playsound(T, "sound/effects/airbridge_dpl.ogg", 50, 1)
sleep(animtime)
if(turf_type)
DEBUG("Creating [turf_type] at [showCoords(T.x, T.y, T.z)]")
DEBUG_MESSAGE("Creating [turf_type] at [showCoords(T.x, T.y, T.z)]")
var/turf/NT = new turf_type(T)
if(setdir) NT.dir = setdir
created_atoms += NT
@@ -734,7 +734,7 @@ proc/Create_Tommyname()
else if ( extension_dir & (EAST|WEST) )
.= abs(A.y - src.y)
DEBUG("get_dist from [showCoords(A.x, A.y, A.z)] returned: [.]")
DEBUG_MESSAGE("get_dist from [showCoords(A.x, A.y, A.z)] returned: [.]")
//The dummy object that imitates a turf
+15 -15
View File
@@ -523,57 +523,57 @@ this is already used where it needs to be used, you can probably ignore it.
//proc/animate_blood_damage(var/mob/some_idiot as mob, var/mob/some_jerk as mob)
/*
DEBUG("made it into proc")
DEBUG_MESSAGE("made it into proc")
if (!some_idiot || !ishuman(some_idiot)) // what're we gunna do here?
return 0
var/blood_color = DEFAULT_BLOOD_COLOR // default is #990000 atm, a dark-ish red.
if (ishuman(some_idiot)) // only humans have the blood_color var
DEBUG("some_idiot [some_idiot] is human")
DEBUG_MESSAGE("some_idiot [some_idiot] is human")
blood_color = some_idiot:blood_color // they might have ~extra-fab blood~ so we wanna use whatever color they have
var/anim_offset_y = 0 // vertical offset
var/anim_offset_x = 0 // horizontal offset
if (some_idiot.lying) // are we laying around on the floor like some kinda bum?
DEBUG("some_idiot [some_idiot] is lying down")
DEBUG_MESSAGE("some_idiot [some_idiot] is lying down")
if (some_jerk) // our attacker, if we've got one
switch (some_jerk.zone_sel.selecting) // where're they aiming?
if ("head")
DEBUG("some_jerk [some_jerk] is aiming at the head")
DEBUG_MESSAGE("some_jerk [some_jerk] is aiming at the head")
anim_offset_y = rand(-2,-10)
anim_offset_x = rand(6,12)
if ("chest" || "l_arm" || "r_arm")
DEBUG("some_jerk [some_jerk] is aiming at the chest/arms")
DEBUG_MESSAGE("some_jerk [some_jerk] is aiming at the chest/arms")
anim_offset_y = rand(-2,-12)
anim_offset_x = rand(8,15)
if ("l_leg" || "r_leg")
DEBUG("some_jerk [some_jerk] is aiming at the legs")
DEBUG_MESSAGE("some_jerk [some_jerk] is aiming at the legs")
anim_offset_y = rand(0,-12)
anim_offset_x = rand(-7,-15)
else // otherwise...
DEBUG("some_jerk not passed")
DEBUG_MESSAGE("some_jerk not passed")
anim_offset_y = rand(7,-12)
anim_offset_x = rand(8,-15)
else // if we aren't on the ground
DEBUG("some_idiot [some_idiot] is standing")
DEBUG_MESSAGE("some_idiot [some_idiot] is standing")
if (some_jerk)
switch (some_jerk.zone_sel.selecting)
if ("head")
DEBUG("some_jerk [some_jerk] is aiming at the head")
DEBUG_MESSAGE("some_jerk [some_jerk] is aiming at the head")
anim_offset_y = rand(8,14)
anim_offset_x = rand(-5,3)
if ("chest" || "l_arm" || "r_arm")
DEBUG("some_jerk [some_jerk] is aiming at the chest/arms")
DEBUG_MESSAGE("some_jerk [some_jerk] is aiming at the chest/arms")
anim_offset_y = rand(-5,6)
anim_offset_x = rand(-9,7)
if ("l_leg" || "r_leg")
DEBUG("some_jerk [some_jerk] is aiming at the legs")
DEBUG_MESSAGE("some_jerk [some_jerk] is aiming at the legs")
anim_offset_y = rand(-5,-15)
anim_offset_x = rand(-7,-5)
else
DEBUG("some_jerk not passed")
DEBUG_MESSAGE("some_jerk not passed")
anim_offset_y = rand(-15,14)
anim_offset_x = rand(-9,-7)
@@ -583,12 +583,12 @@ this is already used where it needs to be used, you can probably ignore it.
some_idiot:damage_animation:pixel_x = anim_offset_x
some_idiot:damage_animation:color = blood_color
some_idiot:damage_animation:transform = turn(some_idiot:damage_animation:transform, rand(0, 359))
DEBUG("anim y [some_idiot:damage_animation:pixel_y], anim x [some_idiot:damage_animation:pixel_x], blood color [some_idiot:damage_animation:color]")
DEBUG_MESSAGE("anim y [some_idiot:damage_animation:pixel_y], anim x [some_idiot:damage_animation:pixel_x], blood color [some_idiot:damage_animation:color]")
DEBUG("adding overlay")
DEBUG_MESSAGE("adding overlay")
some_idiot.overlays += some_idiot:damage_animation
spawn(15)
DEBUG("removing overlay")
DEBUG_MESSAGE("removing overlay")
some_idiot:damage_animation:icon_state = "blank"
some_idiot.overlays -= some_idiot:damage_animation
*/
+3 -3
View File
@@ -110,7 +110,7 @@
return
if(!loc)
return
//DEBUG("[AM] entered conveyor at [showCoords(src.x, src.y, src.z)] and is being moved.")
//DEBUG_MESSAGE("[AM] entered conveyor at [showCoords(src.x, src.y, src.z)] and is being moved.")
move_thing(AM)
/obj/machinery/conveyor/HasExited(var/atom/movable/AM, var/atom/newloc)
@@ -124,7 +124,7 @@
if(next_conveyor && next_conveyor.loc == newloc)
//Ok, they will soon walk() according to the new conveyor
//DEBUG("[AM] exited conveyor at [showCoords(src.x, src.y, src.z)] onto another conveyor! Wow!.")
//DEBUG_MESSAGE("[AM] exited conveyor at [showCoords(src.x, src.y, src.z)] onto another conveyor! Wow!.")
var/mob/M = AM
if(istype(M) && M.buckled == src) //Transfer the buckle
M.buckled = next_conveyor
@@ -134,7 +134,7 @@
else
//Stop walking, we left the belt
//DEBUG("[AM] exited conveyor at [showCoords(src.x, src.y, src.z)] onto the cold, hard floor.")
//DEBUG_MESSAGE("[AM] exited conveyor at [showCoords(src.x, src.y, src.z)] onto the cold, hard floor.")
var/mob/M = AM
if(istype(M) && M.buckled == src) //Unbuckle
M.buckled = null
+10 -10
View File
@@ -249,46 +249,46 @@
..()
src.add_fingerprint(usr)
if(stat & BROKEN)
DEBUG("[src] is broken")
DEBUG_MESSAGE("[src] is broken")
return
if(usr.stat || usr.restrained() || src.flushing)
DEBUG("[src] is flushing/usr.stat returned with someting/usr is restrained")
DEBUG_MESSAGE("[src] is flushing/usr.stat returned with someting/usr is restrained")
return
if (in_range(src, usr) && isturf(src.loc))
DEBUG("in range of [src] and it is on a turf")
DEBUG_MESSAGE("in range of [src] and it is on a turf")
usr.machine = src
if(href_list["close"])
DEBUG("closed [src]")
DEBUG_MESSAGE("closed [src]")
usr.machine = null
usr << browse(null, "window=disposal")
return
if(href_list["pump"])
if(text2num(href_list["pump"]))
DEBUG("[src] pump engaged")
DEBUG_MESSAGE("[src] pump engaged")
power_usage = 600
mode = 1
else
DEBUG("[src] pump disengaged")
DEBUG_MESSAGE("[src] pump disengaged")
power_usage = 100
mode = 0
update()
if(href_list["handle"])
DEBUG("[src] handle")
DEBUG_MESSAGE("[src] handle")
flush = text2num(href_list["handle"])
update()
if(href_list["eject"])
DEBUG("[src] eject")
DEBUG_MESSAGE("[src] eject")
eject()
else
if (!isturf(src.loc))
DEBUG("[src]'s loc is not a turf: [src.loc]")
DEBUG_MESSAGE("[src]'s loc is not a turf: [src.loc]")
if (!in_range(src, usr))
DEBUG("[src] and [usr] are too far apart: [src] [log_loc(src)], [usr] [log_loc(usr)]")
DEBUG_MESSAGE("[src] and [usr] are too far apart: [src] [log_loc(src)], [usr] [log_loc(usr)]")
usr << browse(null, "window=disposal")
usr.machine = null