diff --git a/code/WorkInProgress/AnimationLibrary.dm b/code/WorkInProgress/AnimationLibrary.dm index 0ff5277..adc8210 100644 --- a/code/WorkInProgress/AnimationLibrary.dm +++ b/code/WorkInProgress/AnimationLibrary.dm @@ -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) diff --git a/code/WorkInProgress/MechanicMadness.dm b/code/WorkInProgress/MechanicMadness.dm index 26bf8a0..ed08ed7 100644 --- a/code/WorkInProgress/MechanicMadness.dm +++ b/code/WorkInProgress/MechanicMadness.dm @@ -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("[src] beeps, \"The [Gun.name] has no [istype(Gun, /obj/item/gun/energy) ? "charge" : "ammo"] remaining.\"") diff --git a/code/WorkInProgress/SpyGuyStuff.dm b/code/WorkInProgress/SpyGuyStuff.dm index fc6f8c8..695ae45 100644 --- a/code/WorkInProgress/SpyGuyStuff.dm +++ b/code/WorkInProgress/SpyGuyStuff.dm @@ -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 diff --git a/code/WorkInProgress/blood_system.dm b/code/WorkInProgress/blood_system.dm index 1b46150..25a5675 100644 --- a/code/WorkInProgress/blood_system.dm +++ b/code/WorkInProgress/blood_system.dm @@ -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 */ diff --git a/code/WorkInProgress/recycling/conveyor.dm b/code/WorkInProgress/recycling/conveyor.dm index 98c69a4..0582f2c 100644 --- a/code/WorkInProgress/recycling/conveyor.dm +++ b/code/WorkInProgress/recycling/conveyor.dm @@ -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 diff --git a/code/WorkInProgress/recycling/disposal_chute.dm b/code/WorkInProgress/recycling/disposal_chute.dm index 1a3766d..6199873 100644 --- a/code/WorkInProgress/recycling/disposal_chute.dm +++ b/code/WorkInProgress/recycling/disposal_chute.dm @@ -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 diff --git a/code/_macros.dm b/code/_macros.dm index a9ab32b..41cff33 100644 --- a/code/_macros.dm +++ b/code/_macros.dm @@ -50,7 +50,7 @@ // pick strings from cache-- code/procs/string_cache.dm #define pick_string(filename, key) pick(strings(filename, key)) -#define DEBUG(x) if (debug_messages) message_coders(x) +#define DEBUG_MESSAGE(x) if (debug_messages) message_coders(x) #define __red(x) text("[]", x) #define __blue(x) text("[]", x) #define __green(x) text("[]", x) diff --git a/code/admin/playsound.dm b/code/admin/playsound.dm index 22589af..7df3f70 100644 --- a/code/admin/playsound.dm +++ b/code/admin/playsound.dm @@ -30,7 +30,7 @@ var/global/admin_sound_channel = 660 for (var/client/C in clients) C.verbs += /client/verb/stop_the_music C << sound(uploaded_sound,volume=vol,wait=0,channel=admin_sound_channel) - DEBUG("Playing sound for [C] on channel [admin_sound_channel]") + DEBUG_MESSAGE("Playing sound for [C] on channel [admin_sound_channel]") if (src.djmode) if (src.stealth) boutput(world, "Now Playing: [S]") else boutput(world, "[src.alt_key ? "[src.fakekey]" : "[src.key]"] played: [S]") @@ -43,7 +43,7 @@ var/global/admin_sound_channel = 660 sleep(-1) for (var/client/C in clients) C << sound(uploaded_sound,volume=vol,wait=0,channel=admin_sound_channel) - DEBUG("Playing sound for [C] on channel [admin_sound_channel]") + DEBUG_MESSAGE("Playing sound for [C] on channel [admin_sound_channel]") if (src.djmode) /*if (src.stealth) boutput(world, "Now Playing: [S]") else */ @@ -59,7 +59,7 @@ var/global/admin_sound_channel = 660 for (var/client/C in clients) C.verbs += /client/verb/stop_the_music C << sound(uploaded_sound,volume=vol,wait=0,channel=admin_sound_channel) - DEBUG("Playing sound for [C] on channel [admin_sound_channel]") + DEBUG_MESSAGE("Playing sound for [C] on channel [admin_sound_channel]") move_admin_sound_channel() if (src.djmode) if (src.stealth) boutput(world, "Now Playing (your volume: [vol]): [S]") @@ -113,7 +113,7 @@ var/global/admin_sound_channel = 660 boutput(C, "[src.key] played (your volume: 0): [S]") continue C << sound(uploaded_sound,wait=0,channel=admin_sound_channel,volume=vol) - DEBUG("Playing sound for [C] on channel [admin_sound_channel]") + DEBUG_MESSAGE("Playing sound for [C] on channel [admin_sound_channel]") if (src.djmode || src.non_admin_dj) boutput(C, "[src.key] played (your volume: [vol]): [S]") sleep(1) @@ -193,7 +193,7 @@ var/global/admin_sound_channel = 660 src.verbs -= /client/verb/stop_the_music var/mute_channel = 660 for (var/i=0, i<11, i++) - DEBUG("Muting sound channel [mute_channel] for [src]") + DEBUG_MESSAGE("Muting sound channel [mute_channel] for [src]") src << sound(null,channel=mute_channel) mute_channel ++ spawn(50) @@ -201,10 +201,10 @@ var/global/admin_sound_channel = 660 /proc/move_admin_sound_channel() if (admin_sound_channel <= 669) - DEBUG("Increasing admin_sound_channel from [admin_sound_channel] to [(admin_sound_channel+1)]") + DEBUG_MESSAGE("Increasing admin_sound_channel from [admin_sound_channel] to [(admin_sound_channel+1)]") admin_sound_channel ++ - DEBUG("admin_sound_channel now [admin_sound_channel]") + DEBUG_MESSAGE("admin_sound_channel now [admin_sound_channel]") else - DEBUG("Resetting admin_sound_channel from [admin_sound_channel]") + DEBUG_MESSAGE("Resetting admin_sound_channel from [admin_sound_channel]") admin_sound_channel = 660 - DEBUG("admin_sound_channel now [admin_sound_channel]") \ No newline at end of file + DEBUG_MESSAGE("admin_sound_channel now [admin_sound_channel]") \ No newline at end of file diff --git a/code/datums/abilities/predator.dm b/code/datums/abilities/predator.dm index 6314a6b..4fb70a0 100644 --- a/code/datums/abilities/predator.dm +++ b/code/datums/abilities/predator.dm @@ -189,16 +189,16 @@ new_skull.set_loc(H) H.organHolder.skull = new_skull qdel(S) - //DEBUG("[H]'s skull: [new_skull.type] (V: [new_skull.value], D: [new_skull.preddesc])") + //DEBUG_MESSAGE("[H]'s skull: [new_skull.type] (V: [new_skull.value], D: [new_skull.preddesc])") else qdel(new_skull) S.value = skull_value S.preddesc = skull_desc - //DEBUG("[H]'s skull: [S.type] (V: [S.value], D: [S.preddesc])") + //DEBUG_MESSAGE("[H]'s skull: [S.type] (V: [S.value], D: [S.preddesc])") else S.value = skull_value S.preddesc = skull_desc - //DEBUG("[H]'s skull: [S.type] (V: [S.value], D: [S.preddesc])") + //DEBUG_MESSAGE("[H]'s skull: [S.type] (V: [S.value], D: [S.preddesc])") return #undef default_skull_value diff --git a/code/datums/abilities/wrestler.dm b/code/datums/abilities/wrestler.dm index c89d565..e65cab0 100644 --- a/code/datums/abilities/wrestler.dm +++ b/code/datums/abilities/wrestler.dm @@ -241,7 +241,7 @@ R = src.cooldown * 2.5 // Chems with severe stamina penalty exist, so this should be capped. CD = max((src.cooldown / 2.5), R) // About the same minimum as the old wrestling belt procs. - //DEBUG("Default CD: [src.cooldown]. Modifier: [R]. Actual CD: [CD].") + //DEBUG_MESSAGE("Default CD: [src.cooldown]. Modifier: [R]. Actual CD: [CD].") return CD doCooldown() diff --git a/code/datums/chemistry/Reagents-ExplosiveFire.dm b/code/datums/chemistry/Reagents-ExplosiveFire.dm index 4abe597..79c8207 100644 --- a/code/datums/chemistry/Reagents-ExplosiveFire.dm +++ b/code/datums/chemistry/Reagents-ExplosiveFire.dm @@ -244,7 +244,7 @@ datum else if (holder.my_atom.loc.fingerprintslast) // Backpacks etc. our_fingerprints = holder.my_atom.loc.fingerprintslast - //DEBUG("Heat-triggered smoke powder reaction: our user is [our_user ? "[our_user]" : "*null*"].[our_fingerprints ? " Fingerprints: [our_fingerprints]" : ""]") + //DEBUG_MESSAGE("Heat-triggered smoke powder reaction: our user is [our_user ? "[our_user]" : "*null*"].[our_fingerprints ? " Fingerprints: [our_fingerprints]" : ""]") if (our_user && ismob(our_user)) logTheThing("combat", our_user, null, "Heat-triggered [src.name] chemical reaction [log_reagents(holder.my_atom)] at [T ? "[log_loc(T)]" : "null"].") else diff --git a/code/datums/chemistry/Reagents-Misc.dm b/code/datums/chemistry/Reagents-Misc.dm index f6a64cb..03c8602 100644 --- a/code/datums/chemistry/Reagents-Misc.dm +++ b/code/datums/chemistry/Reagents-Misc.dm @@ -1494,14 +1494,14 @@ datum var/dir_temp = pick("L", "R") var/speed_temp = text2num("[rand(1,6)].[rand(0,9)]") animate_spin(M, dir_temp, speed_temp) - DEBUG("Spun [M]: [dir_temp], [speed_temp]") // <- What's this? + DEBUG_MESSAGE("Spun [M]: [dir_temp], [speed_temp]") // <- What's this? /* reaction_obj(var/obj/O, var/volume) if (volume >= 10) var/dir_temp = pick("L", "R") var/speed_temp = text2num("[rand(1,6)].[rand(0,9)]") animate_spin(O, dir_temp, speed_temp) - DEBUG("Spun [O]: [dir_temp], [speed_temp]") + DEBUG_MESSAGE("Spun [O]: [dir_temp], [speed_temp]") */ on_add() if (istype(holder) && istype(holder.my_atom) && hascall(holder.my_atom,"add_stam_mod_regen")) diff --git a/code/datums/chemistry/tools/patches.dm b/code/datums/chemistry/tools/patches.dm index 3afe6c3..d087d48 100644 --- a/code/datums/chemistry/tools/patches.dm +++ b/code/datums/chemistry/tools/patches.dm @@ -59,7 +59,7 @@ attack(mob/M as mob, mob/user as mob) if (src.in_use) - //DEBUG("[src] in use") + //DEBUG_MESSAGE("[src] in use") return if (src.borg == 1 && !issilicon(user)) diff --git a/code/datums/datalogger.dm b/code/datums/datalogger.dm index 0b7f5f5..8793d96 100644 --- a/code/datums/datalogger.dm +++ b/code/datums/datalogger.dm @@ -33,7 +33,7 @@ var/global/datum/datalogger/game_stats if(!(p in stats)) return null stats[p]++ - //DEBUG("[p] = [stats[p]]") + //DEBUG_MESSAGE("[p] = [stats[p]]") return 1 Decrement(var/p) if(!(p in stats)) diff --git a/code/datums/effects/system/foam_spread.dm b/code/datums/effects/system/foam_spread.dm index 99cdcc0..00a9c79 100644 --- a/code/datums/effects/system/foam_spread.dm +++ b/code/datums/effects/system/foam_spread.dm @@ -33,7 +33,7 @@ spawn(0) var/obj/effects/foam/F = locate() in location if(F) - DEBUG("Located [F] in [location]") + DEBUG_MESSAGE("Located [F] in [location]") F.amount += amount F.amount = min(F.amount, 27) return diff --git a/code/datums/objective.dm b/code/datums/objective.dm index 69267d4..e1b7a39 100644 --- a/code/datums/objective.dm +++ b/code/datums/objective.dm @@ -629,7 +629,7 @@ proc/create_fluff(var/datum/mind/target) set_up() trophycount = min(10, (ticker.minds.len - 1)) - //DEBUG("Found [ticker.minds.len] minds.") + //DEBUG_MESSAGE("Found [ticker.minds.len] minds.") explanation_text = "Take at least [trophycount] trophies. The skulls of worthy opponents are more valuable with regard to this objective." check_completion() @@ -637,7 +637,7 @@ proc/create_fluff(var/datum/mind/target) if (owner.current) trophyvalue = owner.current.get_skull_value() - //DEBUG("Objective: [trophycount]. Total trophy value: [trophyvalue].") + //DEBUG_MESSAGE("Objective: [trophycount]. Total trophy value: [trophyvalue].") if (trophyvalue >= trophycount) return 1 diff --git a/code/datums/preferences.dm b/code/datums/preferences.dm index 1f6e9fe..48e62bb 100644 --- a/code/datums/preferences.dm +++ b/code/datums/preferences.dm @@ -1081,15 +1081,15 @@ datum/preferences var/adj = 0 if (copytext(hcolor, 1, 2) == "#") adj = 1 - DEBUG("HAIR initial: [hcolor]") + DEBUG_MESSAGE("HAIR initial: [hcolor]") var/hR_adj = num2hex(hex2num(copytext(hcolor, 1 + adj, 3 + adj)) + rand(-25,25)) - DEBUG("HAIR R: [hR_adj]") + DEBUG_MESSAGE("HAIR R: [hR_adj]") var/hG_adj = num2hex(hex2num(copytext(hcolor, 3 + adj, 5 + adj)) + rand(-5,5)) - DEBUG("HAIR G: [hG_adj]") + DEBUG_MESSAGE("HAIR G: [hG_adj]") var/hB_adj = num2hex(hex2num(copytext(hcolor, 5 + adj, 7 + adj)) + rand(-10,10)) - DEBUG("HAIR B: [hB_adj]") + DEBUG_MESSAGE("HAIR B: [hB_adj]") var/return_color = "#" + hR_adj + hG_adj + hB_adj - DEBUG("HAIR final: [return_color]") + DEBUG_MESSAGE("HAIR final: [return_color]") return return_color /proc/randomize_eye_color(var/ecolor) @@ -1098,15 +1098,15 @@ datum/preferences var/adj = 0 if (copytext(ecolor, 1, 2) == "#") adj = 1 - DEBUG("EYE initial: [ecolor]") + DEBUG_MESSAGE("EYE initial: [ecolor]") var/eR_adj = num2hex(hex2num(copytext(ecolor, 1 + adj, 3 + adj)) + rand(-10,10)) - DEBUG("EYE R: [eR_adj]") + DEBUG_MESSAGE("EYE R: [eR_adj]") var/eG_adj = num2hex(hex2num(copytext(ecolor, 3 + adj, 5 + adj)) + rand(-10,10)) - DEBUG("EYE G: [eG_adj]") + DEBUG_MESSAGE("EYE G: [eG_adj]") var/eB_adj = num2hex(hex2num(copytext(ecolor, 5 + adj, 7 + adj)) + rand(-10,10)) - DEBUG("EYE B: [eB_adj]") + DEBUG_MESSAGE("EYE B: [eB_adj]") var/return_color = "#" + eR_adj + eG_adj + eB_adj - DEBUG("EYE final: [return_color]") + DEBUG_MESSAGE("EYE final: [return_color]") return return_color var/global/list/feminine_hstyles = list("Mohawk" = "mohawk",\ diff --git a/code/datums/shuttle_controller.dm b/code/datums/shuttle_controller.dm index a74bf57..4401a64 100644 --- a/code/datums/shuttle_controller.dm +++ b/code/datums/shuttle_controller.dm @@ -208,7 +208,7 @@ datum/shuttle_controller if (ishuman(M)) var/mob/living/carbon/human/H = M bonus_stun = (H && H.buckled && H.on_chair) - DEBUG("[M] is human and bonus_stun is [bonus_stun]") + DEBUG_MESSAGE("[M] is human and bonus_stun is [bonus_stun]") if (!M.buckled || bonus_stun) M.stunned += 2 M.weakened += 4 @@ -241,9 +241,9 @@ datum/shuttle_controller particleMaster.SpawnSystem(new /datum/particleSystem/warp_star(S, particle_location.star_dir)) spawn(0) - DEBUG("Now moving shuttle!") + DEBUG_MESSAGE("Now moving shuttle!") start_location.move_contents_to(end_location) - DEBUG("Done moving shuttle!") + DEBUG_MESSAGE("Done moving shuttle!") settimeleft(SHUTTLETRANSITTIME) boutput(world, "The Emergency Shuttle has left for CentCom! It will arrive in [timeleft()/60] minute[s_es(timeleft()/60)]!") //online = 0 diff --git a/code/mob.dm b/code/mob.dm index 1001e9d..93a6f7e 100644 --- a/code/mob.dm +++ b/code/mob.dm @@ -696,7 +696,7 @@ if (second_message && M == second_target && M != first_target) msg = second_message M.show_message(msg, 1, blind_message, 2) - //DEBUG("[M] recieves message: "[msg]"") + //DEBUG_MESSAGE("[M] recieves message: "[msg]"") // it was about time we had this instead of just visible_message() /atom/proc/audible_message(var/message) @@ -2608,7 +2608,7 @@ if (eyeblind != 0) src.eye_blind = max(0, src.eye_blind + eyeblind) - //DEBUG("Eye damage applied: [amount]. Tempblind: [tempblind == 0 ? "N" : "Y"]") + //DEBUG_MESSAGE("Eye damage applied: [amount]. Tempblind: [tempblind == 0 ? "N" : "Y"]") return 1 /mob/proc/get_eye_blurry() @@ -2628,7 +2628,7 @@ upper_cap = cap src.eye_blurry = max(0, min(src.eye_blurry + amount, upper_cap)) - //DEBUG("Amount is [amount], new eye blurry is [src.eye_blurry], cap is [upper_cap]") + //DEBUG_MESSAGE("Amount is [amount], new eye blurry is [src.eye_blurry], cap is [upper_cap]") return 1 /mob/proc/get_ear_damage(var/tempdeaf = 0) @@ -2689,7 +2689,7 @@ else if (eardeaf > 0 && deaf_bypass == 0 && suppress_message == 0) boutput(src, "The ringing overpowers your ability to hear momentarily.") - //DEBUG("Ear damage applied: [amount]. Tempdeaf: [tempdeaf == 0 ? "N" : "Y"]") + //DEBUG_MESSAGE("Ear damage applied: [amount]. Tempdeaf: [tempdeaf == 0 ? "N" : "Y"]") return 1 // No natural healing can occur if ear damage is above this threshold. Didn't want to make it yet another mob parent var. diff --git a/code/mob/living.dm b/code/mob/living.dm index 955889f..63e5cb4 100644 --- a/code/mob/living.dm +++ b/code/mob/living.dm @@ -594,7 +594,7 @@ R1.talk_into(src, messages, null, A.name, lang_id) italics = 1 skip_open_mics_in_range = 1 // First AI intercom broadcasts everything by default. - //DEBUG("AI radio #1 triggered. Message: [message]") + //DEBUG_MESSAGE("AI radio #1 triggered. Message: [message]") else src.show_text("Mainframe radio inoperable or unavailable.", "red") if ("internal 2") @@ -602,7 +602,7 @@ R2.talk_into(src, messages, null, A.name, lang_id) italics = 1 skip_open_mics_in_range = 1 - //DEBUG("AI radio #2 triggered. Message: [message]") + //DEBUG_MESSAGE("AI radio #2 triggered. Message: [message]") else src.show_text("Mainframe radio inoperable or unavailable.", "red") if ("internal 3") @@ -610,7 +610,7 @@ R3.talk_into(src, messages, null, A.name, lang_id) italics = 1 skip_open_mics_in_range = 1 - //DEBUG("AI radio #3 triggered. Message: [message]") + //DEBUG_MESSAGE("AI radio #3 triggered. Message: [message]") else src.show_text("Mainframe radio inoperable or unavailable.", "red") @@ -1067,5 +1067,5 @@ src.static_image.override = 1 src.static_image.loc = src mob_static_icons.Add(src.static_image) - DEBUG(bicon(src.static_image)) + DEBUG_MESSAGE(bicon(src.static_image)) return src.static_image diff --git a/code/mob/living/carbon/human.dm b/code/mob/living/carbon/human.dm index d484be5..1660a58 100644 --- a/code/mob/living/carbon/human.dm +++ b/code/mob/living/carbon/human.dm @@ -418,7 +418,7 @@ for (var/obj/item/implant/health/H in src.implant) if (istype(H) && !H.reported_death) - DEBUG("[src] calling to report death") + DEBUG_MESSAGE("[src] calling to report death") H.death_alert() #ifdef DATALOGGER @@ -4529,7 +4529,7 @@ if (probably_my_record) probably_my_record.fields["h_imp"] = "[H.sensehealth()]" if (src.health <= 0 && !H.reported_health) - DEBUG("[src] calling to report crit") + DEBUG_MESSAGE("[src] calling to report crit") H.health_alert() if (src.health > 0 && H.reported_health) // we're out of crit, let our implant alert people again @@ -5580,7 +5580,7 @@ if (istype(I, /obj/item/clothing/mask)) var/obj/item/clothing/M = I if ((src.mutantrace && !src.mutantrace.uses_human_clothes && !M.compatible_species.Find(src.mutantrace.name)) || (!ismonkey(src) && M.monkey_clothes)) - //DEBUG("[src] can't wear [I].") + //DEBUG_MESSAGE("[src] can't wear [I].") return 0 else return 1 @@ -5597,7 +5597,7 @@ if (istype(I, /obj/item/clothing/head)) var/obj/item/clothing/H = I if ((src.mutantrace && !src.mutantrace.uses_human_clothes && !H.compatible_species.Find(src.mutantrace.name)) || (!ismonkey(src) && H.monkey_clothes)) - //DEBUG("[src] can't wear [I].") + //DEBUG_MESSAGE("[src] can't wear [I].") return 0 else return 1 @@ -5605,7 +5605,7 @@ if (istype(I, /obj/item/clothing/shoes)) var/obj/item/clothing/SH = I if ((src.mutantrace && !src.mutantrace.uses_human_clothes && !SH.compatible_species.Find(src.mutantrace.name)) || (!ismonkey(src) && SH.monkey_clothes)) - //DEBUG("[src] can't wear [I].") + //DEBUG_MESSAGE("[src] can't wear [I].") return 0 else return 1 @@ -5613,7 +5613,7 @@ if (istype(I, /obj/item/clothing/suit)) var/obj/item/clothing/SU = I if ((src.mutantrace && !src.mutantrace.uses_human_clothes && !SU.compatible_species.Find(src.mutantrace.name)) || (!ismonkey(src) && SU.monkey_clothes)) - //DEBUG("[src] can't wear [I].") + //DEBUG_MESSAGE("[src] can't wear [I].") return 0 else return 1 @@ -5621,7 +5621,7 @@ if (istype(I, /obj/item/clothing/under)) var/obj/item/clothing/U = I if ((src.mutantrace && !src.mutantrace.uses_human_clothes && !U.compatible_species.Find(src.mutantrace.name)) || (!ismonkey(src) && U.monkey_clothes)) - //DEBUG("[src] can't wear [I].") + //DEBUG_MESSAGE("[src] can't wear [I].") return 0 else return 1 diff --git a/code/mob/living/carbon/human/procs/damage.dm b/code/mob/living/carbon/human/procs/damage.dm index f60414b..9074bec 100644 --- a/code/mob/living/carbon/human/procs/damage.dm +++ b/code/mob/living/carbon/human/procs/damage.dm @@ -694,7 +694,7 @@ if (eyeblind != 0) src.eye_blind = max(0, src.eye_blind + eyeblind) - //DEBUG("Eye damage applied: [amount]. Tempblind: [tempblind == 0 ? "N" : "Y"]") + //DEBUG_MESSAGE("Eye damage applied: [amount]. Tempblind: [tempblind == 0 ? "N" : "Y"]") return 1 /mob/living/carbon/human/get_brute_damage() diff --git a/code/mob/living/silicon/ai.dm b/code/mob/living/silicon/ai.dm index c10fa14..b9a22e4 100644 --- a/code/mob/living/silicon/ai.dm +++ b/code/mob/living/silicon/ai.dm @@ -1357,7 +1357,7 @@ var/list/ai_emotions = list("Happy" = "ai_happy",\ /mob/living/silicon/ai/proc/set_color(var/color) - DEBUG("Setting colour on [src] to [color]") + DEBUG_MESSAGE("Setting colour on [src] to [color]") if (length(color) == 7) faceColor = color var/colors = GetColors(src.faceColor) diff --git a/code/obj/critter/automaton.dm b/code/obj/critter/automaton.dm index 7a9e79d..e4419cb 100644 --- a/code/obj/critter/automaton.dm +++ b/code/obj/critter/automaton.dm @@ -319,19 +319,19 @@ var/global/the_automaton = null if (the_sun) if (!src.spin_lock) src.spin_lock = pick("L", "R") - DEBUG("HAINE DEBUG: spin set to [src.spin_lock]") + DEBUG_MESSAGE("HAINE DEBUG: spin set to [src.spin_lock]") var/final_spin = 1000 - min(src.sun_spin, 999) - DEBUG("HAINE DEBUG: final spin set to [final_spin]") + DEBUG_MESSAGE("HAINE DEBUG: final spin set to [final_spin]") animate_spin(the_sun, src.spin_lock, final_spin, -1) if (src.sun_spin >= 990) src.sun_spin += 1 - DEBUG("HAINE DEBUG: spin now [src.sun_spin]") + DEBUG_MESSAGE("HAINE DEBUG: spin now [src.sun_spin]") else if (src.sun_spin >= 900) src.sun_spin += 10 - DEBUG("HAINE DEBUG: spin now [src.sun_spin]") + DEBUG_MESSAGE("HAINE DEBUG: spin now [src.sun_spin]") else src.sun_spin += 100 - DEBUG("HAINE DEBUG: spin now [src.sun_spin]") + DEBUG_MESSAGE("HAINE DEBUG: spin now [src.sun_spin]") else user.visible_message("[src] studies [ST] for a moment. It hands it back.") diff --git a/code/obj/critter/critter_parent.dm b/code/obj/critter/critter_parent.dm index 71a90b5..f64bd2f 100644 --- a/code/obj/critter/critter_parent.dm +++ b/code/obj/critter/critter_parent.dm @@ -145,7 +145,7 @@ proc/wake_from_hibernation() if(task != "hibernating") return - //DEBUG("[src] woke from hibernation at [showCoords(src.x, src.y, src.z)] in [registered_area ? registered_area.name : "nowhere"] due to [usr ? usr : "some mysterious fucking reason"]") + //DEBUG_MESSAGE("[src] woke from hibernation at [showCoords(src.x, src.y, src.z)] in [registered_area ? registered_area.name : "nowhere"] due to [usr ? usr : "some mysterious fucking reason"]") //Ok, now we look to see if we should get murdlin' task = "sleeping" hibernate_check = 20 //20 sleep_checks @@ -166,7 +166,7 @@ task = "hibernating" registered_area.registered_critters |= src anchored = 1 - //DEBUG("[src] started hibernating at [showCoords(src.x, src.y, src.z)] in [registered_area ? registered_area.name : "nowhere"].") + //DEBUG_MESSAGE("[src] started hibernating at [showCoords(src.x, src.y, src.z)] in [registered_area ? registered_area.name : "nowhere"].") //critters -= src //Stop processing this critter diff --git a/code/obj/displaycase.dm b/code/obj/displaycase.dm index 1ac9dda..ecafff3 100644 --- a/code/obj/displaycase.dm +++ b/code/obj/displaycase.dm @@ -322,5 +322,5 @@ src.our_projectile = /datum/projectile/laser/old src.our_projectile2 = /datum/projectile/laser/old_burst - //DEBUG("[src.name]'s quality_counter: [quality_counter]") + //DEBUG_MESSAGE("[src.name]'s quality_counter: [quality_counter]") return \ No newline at end of file diff --git a/code/obj/item/card.dm b/code/obj/item/card.dm index 2e5e164..0021cb7 100644 --- a/code/obj/item/card.dm +++ b/code/obj/item/card.dm @@ -155,7 +155,7 @@ GAUNTLET CARDS all_accesses -= new_access if (istype(src, /obj/item/card/id/syndicate)) // Nuke ops unable to exit their station (Convair880). src.access += access_syndicate_shuttle - DEBUG("[get_access_desc(new_access)] added to [src]") + DEBUG_MESSAGE("[get_access_desc(new_access)] added to [src]") src.emagged = 1 /obj/item/card/id/verb/read() diff --git a/code/obj/item/device/cloak_gen.dm b/code/obj/item/device/cloak_gen.dm index c22a13e..62b0d9d 100644 --- a/code/obj/item/device/cloak_gen.dm +++ b/code/obj/item/device/cloak_gen.dm @@ -22,14 +22,14 @@ // For whatever reason, disposing() is never called for this item and I couldn't find out why (Convair880). Del() - //DEBUG("Del() was called for [src].") + //DEBUG_MESSAGE("Del() was called for [src].") if (src.active) src.turn_off() ..() return disposing() - //DEBUG("Disposing() was called for [src] at [log_loc(src)].") + //DEBUG_MESSAGE("Disposing() was called for [src] at [log_loc(src)].") if (src.active) src.turn_off() ..() diff --git a/code/obj/item/device/energy_shield_gen.dm b/code/obj/item/device/energy_shield_gen.dm index d20e5c1..01ccd46 100644 --- a/code/obj/item/device/energy_shield_gen.dm +++ b/code/obj/item/device/energy_shield_gen.dm @@ -17,14 +17,14 @@ // For whatever reason, disposing() is never called for this item. Ditto for the cloak generator (Convair880). Del() - //DEBUG("Del() was called for [src].") + //DEBUG_MESSAGE("Del() was called for [src].") if (src.active) src.turn_off() ..() return disposing() - //DEBUG("Disposing() was called for [src] at [log_loc(src)].") + //DEBUG_MESSAGE("Disposing() was called for [src] at [log_loc(src)].") if (src.active) src.turn_off() ..() diff --git a/code/obj/item/device/radio.dm b/code/obj/item/device/radio.dm index 1932fed..652b1c7 100644 --- a/code/obj/item/device/radio.dm +++ b/code/obj/item/device/radio.dm @@ -198,7 +198,7 @@ Frequency: usr << browse(null, "window=radio") /obj/item/device/radio/talk_into(mob/M as mob, messages, secure, real_name, lang_id) - // According to a pair of DEBUG calls set up for testing, no radio jammer check for the src radio was performed. + // According to a pair of DEBUG_MESSAGE calls set up for testing, no radio jammer check for the src radio was performed. // As improbable as this sounds, there are bug reports too to back up the findings. So uhm... if (src.radio_connection.check_for_jammer(src) != 0) return @@ -272,7 +272,7 @@ Frequency: else heard_garbled += R - //DEBUG("Message transmitted. Frequency: [display_freq]. Source: [src] at [log_loc(src)]. Receiver: [R] at [log_loc(R)].") + //DEBUG_MESSAGE("Message transmitted. Frequency: [display_freq]. Source: [src] at [log_loc(src)]. Receiver: [R] at [log_loc(R)].") var/rendered @@ -354,10 +354,10 @@ Frequency: if (message) // Simple frequency match. The only check that used to be here. if (src.frequency == R.frequency) - //DEBUG("Match found for transmission from [R] at [log_loc(R)] (simple frequency match)") + //DEBUG_MESSAGE("Match found for transmission from [R] at [log_loc(R)] (simple frequency match)") return 1 - // Secure channel lookup when R.frequency != src.frequency. According to DEBUG calls set up for testing, + // Secure channel lookup when R.frequency != src.frequency. According to DEBUG_MESSAGE calls set up for testing, // this meant the receiving radio would decline the message even though both share a secure channel. else if (src.secure_connections && istype(src.secure_connections) && src.secure_connections.len && freq && istype(freq)) var/list/datum/radio_frequency/RF = list() @@ -368,7 +368,7 @@ Frequency: // Secure channel match. Easy. if (RF.Find(freq) && freq.devices.Find(src)) - //DEBUG("Match found for transmission from [R] at [log_loc(R)] (list/devices match)") + //DEBUG_MESSAGE("Match found for transmission from [R] at [log_loc(R)] (list/devices match)") return 1 // Sender didn't use a secure channel prefix, giving us the 145.9 radio frequency datum. @@ -377,7 +377,7 @@ Frequency: if (src.secure_frequencies && istype(src.secure_frequencies) && src.secure_frequencies.len) for (var/freq2 in src.secure_frequencies) if (isnum(src.secure_frequencies["[freq2]"]) && src.secure_frequencies["[freq2]"] == R.frequency) - //DEBUG("Match found for transmission from [R] at [log_loc(R)] (frequency compare)") + //DEBUG_MESSAGE("Match found for transmission from [R] at [log_loc(R)] (frequency compare)") return 1 return 0 diff --git a/code/obj/item/device/transfer_valve.dm b/code/obj/item/device/transfer_valve.dm index 49ac333..fb04f07 100644 --- a/code/obj/item/device/transfer_valve.dm +++ b/code/obj/item/device/transfer_valve.dm @@ -192,7 +192,7 @@ if(!B || !T) return var/power = min(T.air_contents.return_pressure() / TANK_RUPTURE_PRESSURE, 2) - DEBUG("Power: [power]") + DEBUG_MESSAGE("Power: [power]") if(power < 0.30) //Really weak return diff --git a/code/obj/item/gun/ammo.dm b/code/obj/item/gun/ammo.dm index 1bb7241..a9eee28 100644 --- a/code/obj/item/gun/ammo.dm +++ b/code/obj/item/gun/ammo.dm @@ -89,7 +89,7 @@ check = 1 if (!check) return 0 - //DEBUG("Couldn't swap [K]'s ammo ([K.ammo.type]) with [A.type].") + //DEBUG_MESSAGE("Couldn't swap [K]'s ammo ([K.ammo.type]) with [A.type].") // The gun may have been fired; eject casings if so. K.ejectcasings() @@ -108,7 +108,7 @@ usr.put_in_hand_or_drop(ammoDrop) K.ammo.amount_left = 0 // Make room for the new ammo. K.ammo.loadammo(A, K) // Let the other proc do the work for us. - //DEBUG("Swapped [K]'s ammo with [A.type]. There are [A.amount_left] round left over.") + //DEBUG_MESSAGE("Swapped [K]'s ammo with [A.type]. There are [A.amount_left] round left over.") return 2 else @@ -132,7 +132,7 @@ ammoGun.icon = A.icon ammoGun.icon_state = A.icon_state ammoGun.ammo_type = A.ammo_type - //DEBUG("Swapped [K]'s ammo with [A.type].") + //DEBUG_MESSAGE("Swapped [K]'s ammo with [A.type].") qdel(K.ammo) // Make room for the new ammo. qdel(A) // We don't need you anymore. ammoGun.set_loc(K) @@ -185,7 +185,7 @@ qdel(K.ammo) ammoGun.set_loc(K) K.ammo = ammoGun - //DEBUG("Equalized [K]'s ammo type to [A.type]") + //DEBUG_MESSAGE("Equalized [K]'s ammo type to [A.type]") while ((A.amount_left > 0) && (K.ammo.amount_left < K.max_ammo_capacity)) A.amount_left-- @@ -197,7 +197,7 @@ K.update_icon() K.ammo.update_icon() if (A.delete_on_reload) - //DEBUG("[K]: [A.type] (now empty) was deleted on partial reload.") + //DEBUG_MESSAGE("[K]: [A.type] (now empty) was deleted on partial reload.") qdel(A) // No duplicating empty magazines, please (Convair880). return 4 // Couldn't fully reload the gun. if ((A.amount_left >= 0) && (K.ammo.amount_left == K.max_ammo_capacity)) @@ -206,7 +206,7 @@ K.ammo.update_icon() if (A.amount_left == 0) if (A.delete_on_reload) - //DEBUG("[K]: [A.type] (now empty) was deleted on full reload.") + //DEBUG_MESSAGE("[K]: [A.type] (now empty) was deleted on full reload.") qdel(A) // No duplicating empty magazines, please (Convair880). return 5 // Full reload or ammo left over. diff --git a/code/obj/item/gun/kinetic.dm b/code/obj/item/gun/kinetic.dm index 468202a..2155cd3 100644 --- a/code/obj/item/gun/kinetic.dm +++ b/code/obj/item/gun/kinetic.dm @@ -133,7 +133,7 @@ ammoHand.add_fingerprint(user) user.visible_message("[user] unloads [src].", "You unload [src].") - //DEBUG("Unloaded [src]'s ammo manually.") + //DEBUG_MESSAGE("Unloaded [src]'s ammo manually.") return return ..() @@ -146,7 +146,7 @@ if(T) if (src.current_projectile.casing && (src.sanitycheck(1, 0) == 1)) var/number_of_casings = max(1, src.current_projectile.shot_number) - //DEBUG("Ejected [number_of_casings] casings from [src].") + //DEBUG_MESSAGE("Ejected [number_of_casings] casings from [src].") for (var/i = 1, i <= number_of_casings, i++) var/obj/item/casing/C = new src.current_projectile.casing(T) C.forensic_ID = src.forensic_ID @@ -164,7 +164,7 @@ if(T) if (src.current_projectile.casing && (src.sanitycheck(1, 0) == 1)) var/number_of_casings = max(1, src.current_projectile.shot_number) - //DEBUG("Ejected [number_of_casings] casings from [src].") + //DEBUG_MESSAGE("Ejected [number_of_casings] casings from [src].") for (var/i = 1, i <= number_of_casings, i++) var/obj/item/casing/C = new src.current_projectile.casing(T) C.forensic_ID = src.forensic_ID @@ -179,7 +179,7 @@ if ((src.casings_to_eject > 0) && src.current_projectile.casing && (src.sanitycheck(1, 0) == 1)) var/turf/T = get_turf(src) if(T) - //DEBUG("Ejected [src.casings_to_eject] [src.current_projectile.casing] from [src].") + //DEBUG_MESSAGE("Ejected [src.casings_to_eject] [src.current_projectile.casing] from [src].") var/obj/item/casing/C = null while (src.casings_to_eject > 0) C = new src.current_projectile.casing(T) diff --git a/code/obj/item/implant.dm b/code/obj/item/implant.dm index adb019c..f93533c 100644 --- a/code/obj/item/implant.dm +++ b/code/obj/item/implant.dm @@ -144,7 +144,7 @@ IMPLANT GUN return var/myarea = get_area(src) src.message = "HEALTH ALERT: [src.owner] in [myarea]: [src.sensehealth()]" - //DEBUG("implant reporting crit") + //DEBUG_MESSAGE("implant reporting crit") src.send_message() src.reported_health = 1 @@ -155,12 +155,12 @@ IMPLANT GUN return var/myarea = get_area(src) src.message = "DEATH ALERT: [src.owner] in [myarea]" - //DEBUG("implant reporting death") + //DEBUG_MESSAGE("implant reporting death") src.send_message() src.reported_death = 1 proc/send_message() - DEBUG("sending message: [src.message]") + DEBUG_MESSAGE("sending message: [src.message]") if (message && mailgroup && radio_connection) var/datum/signal/newsignal = get_free_signal() newsignal.source = src @@ -174,7 +174,7 @@ IMPLANT GUN newsignal.data["sender"] = src.net_id radio_connection.post_signal(src, newsignal) - //DEBUG("message sent to [src.mailgroup]") + //DEBUG_MESSAGE("message sent to [src.mailgroup]") if (message && mailgroup2 && radio_connection) var/datum/signal/newsignal = get_free_signal() @@ -189,7 +189,7 @@ IMPLANT GUN newsignal.data["sender"] = src.net_id radio_connection.post_signal(src, newsignal) - //DEBUG("message sent to [src.mailgroup2]") + //DEBUG_MESSAGE("message sent to [src.mailgroup2]") /obj/item/implant/freedom name = "freedom implant" diff --git a/code/obj/item/stickers.dm b/code/obj/item/stickers.dm index 392fc2f..f0fcbf6 100644 --- a/code/obj/item/stickers.dm +++ b/code/obj/item/stickers.dm @@ -29,12 +29,12 @@ sticker.icon_state = src.icon_state var/pox = src.pixel_x var/poy = src.pixel_y - DEBUG("pox [pox] poy [poy]") + DEBUG_MESSAGE("pox [pox] poy [poy]") if (params) if (islist(params) && params["icon-y"] && params["icon-x"]) pox = text2num(params["icon-x"]) - 16 //round(A.bound_width/2) poy = text2num(params["icon-y"]) - 16 //round(A.bound_height/2) - DEBUG("pox [pox] poy [poy]") + DEBUG_MESSAGE("pox [pox] poy [poy]") //pox = minmax(-round(A.bound_width/2), pox, round(A.bound_width/2)) //poy = minmax(-round(A.bound_height/2), pox, round(A.bound_height/2)) sticker.pixel_x = pox diff --git a/code/obj/machinery/bot/cleanbot.dm b/code/obj/machinery/bot/cleanbot.dm index f4385eb..a8954ee 100644 --- a/code/obj/machinery/bot/cleanbot.dm +++ b/code/obj/machinery/bot/cleanbot.dm @@ -225,7 +225,7 @@ // We're still idling. if (src.idle && world.time < src.idle + src.idle_delay) - //DEBUG("Sleeping. [log_loc(src)]") + //DEBUG_MESSAGE("Sleeping. [log_loc(src)]") return // Invalid targets may not be unreachable anymore. Clear list periodically. @@ -233,10 +233,10 @@ src.targets_invalid = list() src.lubed_turfs = list() src.clear_invalid_targets = world.time - //DEBUG("[src.emagged ? "(E) " : ""]Cleared target_invalid. [log_loc(src)]") + //DEBUG_MESSAGE("[src.emagged ? "(E) " : ""]Cleared target_invalid. [log_loc(src)]") if (src.frustration >= 8) - //DEBUG("[src.emagged ? "(E) " : ""]Selecting new target (frustration). [log_loc(src)]") + //DEBUG_MESSAGE("[src.emagged ? "(E) " : ""]Selecting new target (frustration). [log_loc(src)]") if (src.target && !(src.target in src.targets_invalid)) src.targets_invalid += src.target src.frustration = 0 @@ -255,40 +255,40 @@ if (src.emagged) for (var/turf/simulated/floor/F in view(7, src)) if (F in targets_invalid) - //DEBUG("[src.emagged ? "(E) " : ""]Acquiring target failed (target_invalid). [F] [log_loc(F)]") + //DEBUG_MESSAGE("[src.emagged ? "(E) " : ""]Acquiring target failed (target_invalid). [F] [log_loc(F)]") continue if (F in cleanbottargets) - //DEBUG("[src.emagged ? "(E) " : ""]Acquiring target failed (other bot target). [F] [log_loc(F)]") + //DEBUG_MESSAGE("[src.emagged ? "(E) " : ""]Acquiring target failed (other bot target). [F] [log_loc(F)]") continue if (F in src.lubed_turfs) - //DEBUG("[src.emagged ? "(E) " : ""]Acquiring target failed (lubed). [F] [log_loc(F)]") + //DEBUG_MESSAGE("[src.emagged ? "(E) " : ""]Acquiring target failed (lubed). [F] [log_loc(F)]") continue for (var/atom/A in F.contents) if (A.density && !(A.flags & ON_BORDER) && !istype(A, /obj/machinery/door) && !ismob(A)) if (!(F in src.targets_invalid)) - //DEBUG("[src.emagged ? "(E) " : ""]Acquiring target failed (density). [F] [log_loc(F)]") + //DEBUG_MESSAGE("[src.emagged ? "(E) " : ""]Acquiring target failed (density). [F] [log_loc(F)]") src.targets_invalid += F continue src.target = F - //DEBUG("[src.emagged ? "(E) " : ""]Target acquired. [F] [log_loc(F)]") + //DEBUG_MESSAGE("[src.emagged ? "(E) " : ""]Target acquired. [F] [log_loc(F)]") break else for (var/obj/decal/cleanable/D in view(7, src)) if (D in targets_invalid) - //DEBUG("[src.emagged ? "(E) " : ""]Acquiring target failed (target_invalid). [D] [log_loc(D)]") + //DEBUG_MESSAGE("[src.emagged ? "(E) " : ""]Acquiring target failed (target_invalid). [D] [log_loc(D)]") continue if (D in cleanbottargets) - //DEBUG("[src.emagged ? "(E) " : ""]Acquiring target failed (other bot target). [D] [log_loc(D)]") + //DEBUG_MESSAGE("[src.emagged ? "(E) " : ""]Acquiring target failed (other bot target). [D] [log_loc(D)]") continue src.target = D - //DEBUG("[src.emagged ? "(E) " : ""]Target acquired. [D] [log_loc(D)]") + //DEBUG_MESSAGE("[src.emagged ? "(E) " : ""]Target acquired. [D] [log_loc(D)]") break // Still couldn't find one? Abort and retry later. if (!src.target || src.target == null) - //DEBUG("[src.emagged ? "(E) " : ""]Acquiring target failed (no valid targets). [log_loc(src)]") + //DEBUG_MESSAGE("[src.emagged ? "(E) " : ""]Acquiring target failed (no valid targets). [log_loc(src)]") src.idle = world.time return @@ -302,14 +302,14 @@ if (!isturf(src.loc) || !T || !isturf(T) || T.density) if (!(src.target in src.targets_invalid)) src.targets_invalid += src.target - //DEBUG("[src.emagged ? "(E) " : ""]Acquiring target failed (target density). [T] [log_loc(T)]") + //DEBUG_MESSAGE("[src.emagged ? "(E) " : ""]Acquiring target failed (target density). [T] [log_loc(T)]") src.target = null return if (istype(T, /turf/space)) if (!(src.target in src.targets_invalid)) src.targets_invalid += src.target - //DEBUG("[src.emagged ? "(E) " : ""]Acquiring target failed (space tile). [T] [log_loc(T)]") + //DEBUG_MESSAGE("[src.emagged ? "(E) " : ""]Acquiring target failed (space tile). [T] [log_loc(T)]") src.target = null return @@ -317,7 +317,7 @@ if (A.density && !(A.flags & ON_BORDER) && !istype(A, /obj/machinery/door) && !ismob(A)) if (!(src.target in src.targets_invalid)) src.targets_invalid += src.target - //DEBUG("[src.emagged ? "(E) " : ""]Acquiring target failed (obstruction). [T] [log_loc(T)]") + //DEBUG_MESSAGE("[src.emagged ? "(E) " : ""]Acquiring target failed (obstruction). [T] [log_loc(T)]") src.target = null return @@ -326,7 +326,7 @@ if (!src.path) // Woops, couldn't find a path. if (!(src.target in src.targets_invalid)) src.targets_invalid += src.target - //DEBUG("[src.emagged ? "(E) " : ""]Pathfinding failed. [T] [log_loc(T)]") + //DEBUG_MESSAGE("[src.emagged ? "(E) " : ""]Pathfinding failed. [T] [log_loc(T)]") src.target = null return @@ -350,7 +350,7 @@ src.path -= src.path[1] else src.frustration++ - //DEBUG("[src.emagged ? "(E) " : ""]Moving towards target. [src.target] [log_loc(src.target)]") + //DEBUG_MESSAGE("[src.emagged ? "(E) " : ""]Moving towards target. [src.target] [log_loc(src.target)]") if (src.target) if (src.loc == get_turf(src.target)) @@ -372,7 +372,7 @@ src.icon_state = "cleanbot-c" src.visible_message("[src] begins to clean the [target.name].") src.cleaning = 1 - //DEBUG("[src.emagged ? "(E) " : ""]Cleaning target. [src.target] [log_loc(src.target)]") + //DEBUG_MESSAGE("[src.emagged ? "(E) " : ""]Cleaning target. [src.target] [log_loc(src.target)]") spawn(50) if (src) diff --git a/code/obj/machinery/sleeper.dm b/code/obj/machinery/sleeper.dm index 746ef04..8ea302f 100644 --- a/code/obj/machinery/sleeper.dm +++ b/code/obj/machinery/sleeper.dm @@ -405,7 +405,7 @@ if (world.timeofday > A.last_reagent_dose + 1500) probability = 10 if (prob(probability)) - //DEBUG("Healed [M]'s [A.associated_reagent] addiction.") + //DEBUG_MESSAGE("Healed [M]'s [A.associated_reagent] addiction.") M.show_text("You no longer feel reliant on [A.associated_reagent]!", "blue") M.ailments -= A qdel(A) @@ -414,7 +414,7 @@ if (src.emagged) var/our_poison = pick(src.med_emag) if (M.reagents.get_reagent_amount(our_poison) == 0) - //DEBUG("Injected occupant with [our_poison] at [log_loc(src)].") + //DEBUG_MESSAGE("Injected occupant with [our_poison] at [log_loc(src)].") M.reagents.add_reagent(our_poison, 2) else if (M.health < -25 && M.reagents.get_reagent_amount(src.med_crit) == 0) @@ -463,7 +463,7 @@ if ((poison + 2.5) > 5) inject_p = max(0, (2.5 - poison)) src.occupant.reagents.add_reagent(our_poison, inject_p) - //DEBUG("Injected occupant with [inject_p] units of [our_poison] at [log_loc(src)].") + //DEBUG_MESSAGE("Injected occupant with [inject_p] units of [our_poison] at [log_loc(src)].") if (manual_injection == 1) logTheThing("station", user_feedback, src.occupant, "manually injects %target% with [our_poison] ([inject_p]) from an emagged sleeper at [log_loc(src)].") else diff --git a/code/obj/machinery/status_display.dm b/code/obj/machinery/status_display.dm index 0a509d9..7a2761c 100644 --- a/code/obj/machinery/status_display.dm +++ b/code/obj/machinery/status_display.dm @@ -150,7 +150,7 @@ var/list/status_display_text_images = list() repeat_update = 1 */ if(text_ticker.len) - DEBUG("Updating text display index: [ticker_index], len: [text_ticker.len]") + DEBUG_MESSAGE("Updating text display index: [ticker_index], len: [text_ticker.len]") update_display_lines(,,text_ticker[ticker_index]) ticker_index = ((ticker_index + 1) % text_ticker.len) else @@ -214,7 +214,7 @@ var/list/status_display_text_images = list() temp.overlays += texticon(line1, 23, -9) temp.overlays += texticon(line2, 23, -17) - DEBUG("Line 1: [line1], Line 2: [line2]") + DEBUG_MESSAGE("Line 1: [line1], Line 2: [line2]") text_ticker += temp @@ -252,7 +252,7 @@ var/list/status_display_text_images = list() proc/update_display_lines(var/line1, var/line2, var/image/override = null) if(override) //Ok, we're gonna use our own image entirely, sidestepping the image building process - DEBUG("[UpdateOverlays(override, "text") ? "Success" : "Failure"]") + DEBUG_MESSAGE("[UpdateOverlays(override, "text") ? "Success" : "Failure"]") return if(line1 == lastdisplayline1 && line2 == lastdisplayline2) diff --git a/code/obj/random_spawners.dm b/code/obj/random_spawners.dm index 88ad591..f5c4dce 100644 --- a/code/obj/random_spawners.dm +++ b/code/obj/random_spawners.dm @@ -23,7 +23,7 @@ for (var/new_item in src.guaranteed) if (!ispath(new_item)) logTheThing("debug", src, null, "has a non-path item in its guaranteed list, [new_item]") - DEBUG("[src] has a non-path item in its guaranteed list, [new_item]") + DEBUG_MESSAGE("[src] has a non-path item in its guaranteed list, [new_item]") continue var/amt = 1 if (isnum(guaranteed[new_item])) @@ -40,7 +40,7 @@ var/new_item = pick(src.items2spawn) if (!ispath(new_item)) logTheThing("debug", src, null, "has a non-path item in its spawn list, [new_item]") - DEBUG("[src] has a non-path item in its spawn list, [new_item]") + DEBUG_MESSAGE("[src] has a non-path item in its spawn list, [new_item]") continue new new_item(src.loc) diff --git a/code/obj/stool.dm b/code/obj/stool.dm index 0685e99..b066934 100644 --- a/code/obj/stool.dm +++ b/code/obj/stool.dm @@ -1033,7 +1033,7 @@ if (!net || (net && (power < 2000000))) H.shock(src, 2000000, "chest", 0.3, 1) // Nope or not enough juice, use fixed values instead (around 80 BURN per shock). else - //DEBUG("Shocked [H] with [power]") + //DEBUG_MESSAGE("Shocked [H] with [power]") src.electrocute(H, 100, net, 1) // We are, great. Let that global proc calculate the damage. else H.shock(src, 2500, "chest", 1, 1) diff --git a/code/obj/vehicle.dm b/code/obj/vehicle.dm index 88fa054..a52dd1d 100644 --- a/code/obj/vehicle.dm +++ b/code/obj/vehicle.dm @@ -828,7 +828,7 @@ Contains: in_bump = 0 return if(ismob(AM)) - DEBUG("Bumped [AM] and gonna bowl 'em over.") + DEBUG_MESSAGE("Bumped [AM] and gonna bowl 'em over.") bumpstun(AM) // eject_rider(2) diff --git a/code/obj/window.dm b/code/obj/window.dm index 63c8c19..fdadc77 100644 --- a/code/obj/window.dm +++ b/code/obj/window.dm @@ -44,7 +44,7 @@ if (src.health_multiplier != 1 && src.health_multiplier > 0) src.health_max = src.health_max * src.health_multiplier src.health = src.health_max - //DEBUG ("[src.name] [log_loc(src)] has [health] health / [health_max] max health ([health_multiplier] multiplier).") + //DEBUG_MESSAGE("[src.name] [log_loc(src)] has [health] health / [health_max] max health ([health_multiplier] multiplier).") return diff --git a/code/procs/gamehelpers.dm b/code/procs/gamehelpers.dm index 7c3fe60..d7e7a88 100644 --- a/code/procs/gamehelpers.dm +++ b/code/procs/gamehelpers.dm @@ -473,14 +473,14 @@ var/obj/item/dummy/click_dummy = new if(T.x < src_min_x || !src_min_x) src_min_x = T.x if(T.y < src_min_y || !src_min_y) src_min_y = T.y - DEBUG("src_min_x = [src_min_x], src_min_y = [src_min_y]") + DEBUG_MESSAGE("src_min_x = [src_min_x], src_min_y = [src_min_y]") var/trg_min_x = 0 var/trg_min_y = 0 for (var/turf/T in turfs_trg) if(T.x < trg_min_x || !trg_min_x) trg_min_x = T.x if(T.y < trg_min_y || !trg_min_y) trg_min_y = T.y - DEBUG("trg_min_x = [src_min_x], trg_min_y = [src_min_y]") + DEBUG_MESSAGE("trg_min_x = [src_min_x], trg_min_y = [src_min_y]") var/list/refined_src = new/list() for(var/turf/T in turfs_src) @@ -521,7 +521,7 @@ var/obj/item/dummy/click_dummy = new if (!istype(O, /obj) || istype(O, /obj/forcefield)) continue O.set_loc(X) for(var/mob/M in T) - DEBUG("Moving mob [M] from [T] to [X].") + DEBUG_MESSAGE("Moving mob [M] from [T] to [X].") if(!istype(M,/mob)) continue M.set_loc(X) diff --git a/code/procs/helpers.dm b/code/procs/helpers.dm index c76b884..e2d047b 100644 --- a/code/procs/helpers.dm +++ b/code/procs/helpers.dm @@ -1750,7 +1750,7 @@ var/list/english_num = list("0" = "zero", "1" = "one", "2" = "two", "3" = "three if (!num || !english_num.len) return - DEBUG("get_english_num recieves num \"[num]\"") + DEBUG_MESSAGE("get_english_num recieves num \"[num]\"") if (istext(num)) num = text2num(num) @@ -1802,7 +1802,7 @@ var/list/english_num = list("0" = "zero", "1" = "one", "2" = "two", "3" = "three num_return = "[get_english_num(thousands)] thousand, [get_english_num(hundreds)]" if (num_return) - DEBUG("get_english_num returns num \"[num_return]\"") + DEBUG_MESSAGE("get_english_num returns num \"[num_return]\"") return num_return /proc/mutual_attach(var/atom/A as turf|obj|mob, var/atom/B as turf|obj|mob) @@ -1836,7 +1836,7 @@ var/list/english_num = list("0" = "zero", "1" = "one", "2" = "two", "3" = "three var/hR = hex2num(copytext(hex, 1 + adj, 3 + adj)) var/hG = hex2num(copytext(hex, 3 + adj, 5 + adj)) var/hB = hex2num(copytext(hex, 5 + adj, 7 + adj)) - //DEBUG("hex2rgb translates [hex] to r[hR] g[hG] b[hB]") + //DEBUG_MESSAGE("hex2rgb translates [hex] to r[hR] g[hG] b[hB]") return rgb(hR,hG,hB,255) // This function counts a passed job. @@ -2047,7 +2047,7 @@ proc/countJob(rank) is_immune = 1 //if (is_immune == 1) - // DEBUG("[L] is immune to damage, aborting.") + // DEBUG_MESSAGE("[L] is immune to damage, aborting.") return is_immune // Their antag status is revoked on death/implant removal/expiration, but we still want them to show up in the game over stats (Convair880). @@ -2166,7 +2166,7 @@ proc/countJob(rank) var/mob/our_mob for (var/mob/M in mobs) if ((!isnull(M.ckey) && !isnull(target)) && findtext(M.ckey, target)) - //DEBUG("Whois: match found for [target], it's [M].") + //DEBUG_MESSAGE("Whois: match found for [target], it's [M].") our_mob = M break if (our_mob) return our_mob diff --git a/code/procs/mob_procs.dm b/code/procs/mob_procs.dm index 6f2f4f4..b0e282a 100644 --- a/code/procs/mob_procs.dm +++ b/code/procs/mob_procs.dm @@ -325,7 +325,7 @@ if (animation_duration <= 0) return - //DEBUG("Apply_flash() called for [src] at [log_loc(src)]. Safe: [safety == 1 ? "Y" : "N"], AD: [animation_duration], W: [weak], S: [stun], MS: [misstep], EB [eyes_blurry], ED: [eyes_damage], EB: [eye_tempblind], B: [burn], UP: [uncloak_prob]") + //DEBUG_MESSAGE("Apply_flash() called for [src] at [log_loc(src)]. Safe: [safety == 1 ? "Y" : "N"], AD: [animation_duration], W: [weak], S: [stun], MS: [misstep], EB [eyes_blurry], ED: [eyes_damage], EB: [eye_tempblind], B: [burn], UP: [uncloak_prob]") // Stun target mob. if (safety == 0) @@ -451,7 +451,7 @@ if (DO_NOTHING) return - //DEBUG("Apply_sonic_stun() called for [src] at [log_loc(src)]. W: [weak], S: [stun], MS: [misstep], SL: [slow], DI: [drop_item], ED: [ears_damage], EF: [ear_tempdeaf]") + //DEBUG_MESSAGE("Apply_sonic_stun() called for [src] at [log_loc(src)]. W: [weak], S: [stun], MS: [misstep], SL: [slow], DI: [drop_item], ED: [ears_damage], EF: [ear_tempdeaf]") // Stun target mob. boutput(src, "You hear an extremely loud noise!") @@ -861,7 +861,7 @@ for (var/image/I in src.client.images) if (!I) continue if (I.icon == 'icons/mob/antag_overlays.dmi') - //DEBUG("Deleted overlay ([I.icon_state]) from [src].") + //DEBUG_MESSAGE("Deleted overlay ([I.icon_state]) from [src].") qdel(I) if (remove) @@ -1040,8 +1040,8 @@ if (can_see.len > 0) //logTheThing("debug", src, null, "Convair880 antag overlay: [can_see.len] added with parameters all ([see_everything]), T ([see_traitors]), S ([see_nukeops]), W ([see_wizards]), R ([see_revs]), SP ([see_special])") - //DEBUG("Overlay parameters for [src]: all ([see_everything]), T ([see_traitors]), S ([see_nukeops]), W ([see_wizards]), R ([see_revs]), SP ([see_special])") - //DEBUG("Added [can_see.len] overlays to [src].") + //DEBUG_MESSAGE("Overlay parameters for [src]: all ([see_everything]), T ([see_traitors]), S ([see_nukeops]), W ([see_wizards]), R ([see_revs]), SP ([see_special])") + //DEBUG_MESSAGE("Added [can_see.len] overlays to [src].") src.client.images.Add(can_see) src.last_overlay_refresh = world.time diff --git a/code/procs/scanprocs.dm b/code/procs/scanprocs.dm index f15ec9a..6090ac1 100644 --- a/code/procs/scanprocs.dm +++ b/code/procs/scanprocs.dm @@ -423,7 +423,7 @@ pressure = check_me.return_pressure() total_moles = check_me.total_moles() - //DEBUG("[A] contains: [pressure] kPa, [total_moles] moles.") + //DEBUG_MESSAGE("[A] contains: [pressure] kPa, [total_moles] moles.") var/data = "" diff --git a/code/procs/surgery.dm b/code/procs/surgery.dm index 8d9f34c..274217d 100644 --- a/code/procs/surgery.dm +++ b/code/procs/surgery.dm @@ -115,7 +115,7 @@ else screw_up_prob = max(5, min(100, screw_up_prob)) // otherwise there'll always be a slight chance - DEBUG("[patient]'s surgery (performed by [surgeon]) has screw_up_prob set to [screw_up_prob]") + DEBUG_MESSAGE("[patient]'s surgery (performed by [surgeon]) has screw_up_prob set to [screw_up_prob]") return screw_up_prob @@ -167,7 +167,7 @@ /mob/living/carbon/human/get_surgery_status(var/zone) if (!src.organHolder) - DEBUG("get_surgery_status failed due to [src] having no organHolder") + DEBUG_MESSAGE("get_surgery_status failed due to [src] having no organHolder") return 0 var/datum/organHolder/oH = src.organHolder @@ -202,7 +202,7 @@ else if (!surgery_limb) return_thing ++ - //DEBUG("get_surgery_status for [src] returning [return_thing]") + //DEBUG_MESSAGE("get_surgery_status for [src] returning [return_thing]") return return_thing /obj/item/proc/defibrillate(var/mob/living/carbon/human/patient as mob, var/mob/living/user as mob, var/emagged = 0, var/faulty = 0, var/obj/item/cell/cell = null) @@ -255,7 +255,7 @@ patient.stunned += min(0.002 * adjust, 10) patient.weakened += min(0.002 * adjust, 10) patient.stuttering += min(0.005 * adjust, 25) - DEBUG("[src]'s defibrillate(): adjust = [adjust], paralysis + [min(0.001 * adjust, 5)], stunned + [min(0.002 * adjust, 10)], weakened + [min(0.002 * adjust, 10)], stuttering + [min(0.005 * adjust, 25)]") + DEBUG_MESSAGE("[src]'s defibrillate(): adjust = [adjust], paralysis + [min(0.001 * adjust, 5)], stunned + [min(0.002 * adjust, 10)], weakened + [min(0.002 * adjust, 10)], stuttering + [min(0.005 * adjust, 25)]") else if (faulty) patient.paralysis += 1 @@ -323,7 +323,7 @@ var/damage_low = calc_surgery_damage(surgeon, screw_up_prob, rand(5,15)/*, src.adj1, src.adj2*/) var/damage_high = calc_surgery_damage(surgeon, screw_up_prob, rand(15,25)/*, src.adj1, src.adj2*/) - DEBUG("[patient]'s surgery (performed by [surgeon]) damage_low is [damage_low], damage_high is [damage_high]") + DEBUG_MESSAGE("[patient]'s surgery (performed by [surgeon]) damage_low is [damage_low], damage_high is [damage_high]") /* ---------- SCALPEL - HEAD ---------- */ @@ -705,7 +705,7 @@ var/damage_low = calc_surgery_damage(surgeon, screw_up_prob, rand(10,20)/*, src.adj1, src.adj2*/) var/damage_high = calc_surgery_damage(surgeon, screw_up_prob, rand(20,30)/*, src.adj1, src.adj2*/) - DEBUG("[patient]'s surgery (performed by [surgeon]) damage_low is [damage_low], damage_high is [damage_high]") + DEBUG_MESSAGE("[patient]'s surgery (performed by [surgeon]) damage_low is [damage_low], damage_high is [damage_high]") /* ---------- SAW - HEAD ---------- */ @@ -1299,7 +1299,7 @@ var/damage_low = calc_surgery_damage(surgeon, screw_up_prob, rand(5,15)/*, src.adj1, src.adj2*/) var/damage_high = calc_surgery_damage(surgeon, screw_up_prob, rand(15,25)/*, src.adj1, src.adj2*/) - DEBUG("[patient]'s surgery (performed by [surgeon]) damage_low is [damage_low], damage_high is [damage_high]") + DEBUG_MESSAGE("[patient]'s surgery (performed by [surgeon]) damage_low is [damage_low], damage_high is [damage_high]") /* ---------- SPOON - EYES ---------- */ diff --git a/code/sound.dm b/code/sound.dm index 9018899..ada74f6 100644 --- a/code/sound.dm +++ b/code/sound.dm @@ -97,14 +97,14 @@ if(istext(soundin)) S = unpool(/sound) S.file = csound(soundin) - //DEBUG("Created sound [S.file] from csound - soundin is text([soundin])") + //DEBUG_MESSAGE("Created sound [S.file] from csound - soundin is text([soundin])") else if (isfile(soundin)) S = unpool(/sound) S.file = soundin// = sound(soundin) - //DEBUG("Created sound [S.file] from file - soundin is file") + //DEBUG_MESSAGE("Created sound [S.file] from file - soundin is file") else if (istype(soundin, /sound)) S = soundin - //DEBUG("Used input sound: [S.file]") + //DEBUG_MESSAGE("Used input sound: [S.file]") S.wait = 0 //No queue S.channel = 0 //Any channel @@ -149,14 +149,14 @@ if(istext(soundin)) S = unpool(/sound) S.file = csound(soundin) - //DEBUG("Created sound [S.file] from csound - soundin is text([soundin])") + //DEBUG_MESSAGE("Created sound [S.file] from csound - soundin is text([soundin])") else if (isfile(soundin)) S = unpool(/sound) S.file = soundin// = sound(soundin) - //DEBUG("Created sound [S.file] from file - soundin is file") + //DEBUG_MESSAGE("Created sound [S.file] from file - soundin is file") else if (istype(soundin, /sound)) S = soundin - //DEBUG("Used input sound: [S.file]") + //DEBUG_MESSAGE("Used input sound: [S.file]") /* var/sound/S