diff --git a/_std/_setup.dm b/_std/_setup.dm index 888008a..8a15edf 100644 --- a/_std/_setup.dm +++ b/_std/_setup.dm @@ -995,35 +995,46 @@ var/list/RARITY_COLOR = list( #define MINUTES *600 #define HOURS *36000 +#define SECOND *10 +#define MINUTE *600 +#define HOUR *36000 + #define WATTS *1 #define METERS *1 #define KILOGRAMS *1 -#define AMPERE *1 +#define AMPERES *1 #define KELVIN *1 +#define MOLES *1 +#define CANDELAS *1 + +#define WATT *1 +#define METER *1 +#define KILOGRAM *1 +#define AMPERE *1 #define MOLE *1 #define CANDELA *1 -#define YOTTA *10**24 -#define ZETTA *10**21 -#define EXA *10**18 -#define PETA *10**15 -#define TERA *10**12 -#define GIGA *10**9 -#define MEGA *10**6 -#define KILO *10**3 -#define HECTO *10**2 -#define DEKA *10**1 +#define YOTTA *(10**24) +#define ZETTA *(10**21) +#define EXA *(10**18) +#define PETA *(10**15) +#define TERA *(10**12) +#define GIGA *(10**9) +#define MEGA *(10**6) +#define KILO *(10**3) +#define HECTO *(10**2) +#define DEKA *(10**1) -#define DECI *10**-1 -#define CENTI *10**-2 -#define MILLI *10**-3 -#define MICRO *10**-6 -#define NANO *10**-9 -#define PICO *10**-12 -#define FEMTO *10**-15 -#define ATTO *10**-18 -#define ZEPTO *10**-21 -#define YOCTO *10**-24 +#define DECI *(10**-1) +#define CENTI *(10**-2) +#define MILLI *(10**-3) +#define MICRO *(10**-6) +#define NANO *(10**-9) +#define PICO *(10**-12) +#define FEMTO *(10**-15) +#define ATTO *(10**-18) +#define ZEPTO *(10**-21) +#define YOCTO *(10**-24) //Auditing //Whether or not a potentially suspicious action gets denied by the code. diff --git a/code/WorkInProgress/AbilityItem.dm b/code/WorkInProgress/AbilityItem.dm index 108c60b..d150587 100644 --- a/code/WorkInProgress/AbilityItem.dm +++ b/code/WorkInProgress/AbilityItem.dm @@ -35,7 +35,7 @@ E.special = 1 the_mob.transforming = 1 - SPAWN_DBG(30) if (the_mob) the_mob.transforming = 0 + SPAWN_DBG(3 SECONDS) if (the_mob) the_mob.transforming = 0 sleep(30) var/theturf @@ -49,7 +49,7 @@ for(var/i=0, i<9, i++) if (!E.reagents || E.reagents.total_volume <= 0) break var/obj/effects/spray/S = new/obj/effects/spray(theturf) - SPAWN_DBG(150) qdel(S) + SPAWN_DBG(15 SECONDS) qdel(S) S.dir = direction S.original_dir = direction direction = turn(direction,45) @@ -224,7 +224,7 @@ for(var/i=0, i<15, i++) var/obj/effect/smoketemp/A = unpool(/obj/effect/smoketemp) A.set_loc(the_mob.loc) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src = null // Detatch this from the parent proc so we get to stay alive if the shoes blow up. if(A) pool(A) @@ -252,7 +252,7 @@ if(!the_mob) break var/obj/effect/smoketemp/A = unpool(/obj/effect/smoketemp) A.set_loc(the_mob.loc) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src = null if(A) pool(A) @@ -665,7 +665,7 @@ heh += src boutput(world, "heh len = [heh.len]") if(!the_mob) - SPAWN_DBG(30) check_abilities() + SPAWN_DBG(3 SECONDS) check_abilities() return if(!(src in the_mob.get_equipped_items())) @@ -675,7 +675,7 @@ clear_buttons() show_buttons() - SPAWN_DBG(10) check_abilities() + SPAWN_DBG(1 SECOND) check_abilities() */ proc/clear_buttons() diff --git a/code/WorkInProgress/AnimationLibrary.dm b/code/WorkInProgress/AnimationLibrary.dm index 5808cac..c249b2b 100644 --- a/code/WorkInProgress/AnimationLibrary.dm +++ b/code/WorkInProgress/AnimationLibrary.dm @@ -291,7 +291,7 @@ animate(M.attack_particle, pixel_x = M.get_hand_pixel_x(), pixel_y = M.get_hand_pixel_y(), time = 1, easing = LINEAR_EASING) animate(transform = t_size, time = 1, easing = LINEAR_EASING, flags = ANIMATION_PARALLEL) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) animate(M.attack_particle, alpha = 0, time = 1, flags = ANIMATION_PARALLEL) @@ -422,7 +422,7 @@ which = get_dir(usr,A) if (!which) which = pick(alldirs) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) if (A) var/ipx = A.pixel_x var/ipy = A.pixel_y @@ -794,7 +794,7 @@ E.alpha = 0 animate(E,transform = matrix(0.5, MATRIX_SCALE), time = 20, alpha = 255, pixel_y = 27, easing = ELASTIC_EASING) animate(time = 5, alpha = 0, pixel_y = -16, easing = CIRCULAR_EASING) - SPAWN_DBG(30) qdel(E) + SPAWN_DBG(3 SECONDS) qdel(E) return /proc/animate_horizontal_wiggle(var/atom/A, var/loopnum = 5, speed = 10, X1 = 3, X2 = -3, var/slightly_random = 1) @@ -901,7 +901,7 @@ swirl.set_loc(target_turf) swirl.pixel_y = 10 playsound(target_turf, "sound/effects/teleport.ogg", 50, 1) - SPAWN_DBG(15) + SPAWN_DBG(1.5 SECONDS) if (swirl) swirl.pixel_y = 0 pool(swirl) @@ -917,7 +917,7 @@ return var/obj/decal/residual_energy/e = unpool(/obj/decal/residual_energy) e.set_loc(target_turf) - SPAWN_DBG(100) + SPAWN_DBG(10 SECONDS) if (e) pool(e) return @@ -943,7 +943,7 @@ animate(teleporter, transform = null, time = 9, alpha = 255, pixel_y = 0, easing = ELASTIC_EASING) //HAXXX sorry - kyle if (istype(teleporter, /mob/dead/observer)) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) animate_bumble(teleporter) diff --git a/code/WorkInProgress/AphsStuff.dm b/code/WorkInProgress/AphsStuff.dm index 392b01f..1f9378b 100644 --- a/code/WorkInProgress/AphsStuff.dm +++ b/code/WorkInProgress/AphsStuff.dm @@ -107,7 +107,7 @@ src.icon_state = "oldai_mem-1" sleep(10) src.icon_state = "oldai_mem-2" - SPAWN_DBG(50) src.icon_state = "oldai_mem-1" + SPAWN_DBG(5 SECONDS) src.icon_state = "oldai_mem-1" if(ai) ai.load_tape(tape_no) else src.visible_message("[user] prods the databank's tape slot with [W]. Nothing happens.",1) diff --git a/code/WorkInProgress/Azungarstuff.dm b/code/WorkInProgress/Azungarstuff.dm index 1881d22..ebef71f 100644 --- a/code/WorkInProgress/Azungarstuff.dm +++ b/code/WorkInProgress/Azungarstuff.dm @@ -70,7 +70,7 @@ return_if_overlay_or_effect(O) if (O.throwing && !isliving(O)) - SPAWN_DBG(8) + SPAWN_DBG(8 DECI SECONDS) if (O && O.loc == src) melt_away(O) return @@ -132,7 +132,7 @@ boutput(M, "You get too close to the edge of the lava and spontaniously combust from the heat!") visible_message("[M] gets too close to the edge of the lava and their internal wiring suffers a major burn!") M.changeStatus("stunned", 6 SECONDS) - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) if(M.loc == src) if (ishuman(M)) var/mob/living/carbon/human/H = M @@ -826,7 +826,7 @@ src.visible_message("[src] bites and claws at [src.target]!") random_brute_damage(src.target, rand(3,5)) random_burn_damage(src.target, rand(2,3)) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src.attacking = 0 @@ -910,7 +910,7 @@ light.set_brightness(0.7) light.enable() - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) animate(src, alpha=130, color="#DDDDDD", time=7, loop=-1) animate(alpha=180, color="#FFFFFF", time=1) animate(src, pixel_y=10, time=15, flags=ANIMATION_PARALLEL, easing=SINE_EASING, loop=-1) @@ -1128,7 +1128,7 @@ playsound(H.loc, "swing_hit", 50, 1) usr.say("I AM THE LAW!") prob_clonk = min(prob_clonk + 5, 40) - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) prob_clonk = max(prob_clonk - 5, 0) return ..(hit_atom) @@ -1154,7 +1154,7 @@ busy = 1 showswirl(user.loc) playsound(src, 'sound/effects/teleport.ogg', 60, 1) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) teleport(user) busy = 0 @@ -1224,7 +1224,7 @@ src.visible_message("[src] bites and claws at [src.target]!") random_brute_damage(src.target, rand(3,5)) random_burn_damage(src.target, rand(2,3)) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src.attacking = 0 CritterDeath() diff --git a/code/WorkInProgress/DrMelonsStuff.dm b/code/WorkInProgress/DrMelonsStuff.dm index 6ada099..d32fc11 100644 --- a/code/WorkInProgress/DrMelonsStuff.dm +++ b/code/WorkInProgress/DrMelonsStuff.dm @@ -27,7 +27,7 @@ src.visible_message("The [src] splutters to a halt.") playsound(src, 'sound/machines/ding.ogg', 50, 1) else - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) var/datum/chemical_reaction/smoke/S = new S.on_reaction(reagents) reagents.total_volume -= 5 @@ -238,7 +238,7 @@ var/moveto = locate(M.x + rand(-1,1),M.y + rand(-1, 1),src.z) //make the mops move if (istype(moveto, /turf/simulated/floor) || istype(moveto, /turf/simulated/floor/shuttle) || istype(moveto, /turf/simulated/aprilfools/floor) || istype(moveto, /turf/unsimulated/floor) || istype(moveto, /turf/unsimulated/aprilfools)) step_towards(M, moveto) - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) src.visible_message("Thankfully, [src] settles down.") else for (var/obj/item/mop/M in orange(5,src)) diff --git a/code/WorkInProgress/HaineWhatever.dm b/code/WorkInProgress/HaineWhatever.dm index 47b88aa..fbb5b38 100644 --- a/code/WorkInProgress/HaineWhatever.dm +++ b/code/WorkInProgress/HaineWhatever.dm @@ -31,7 +31,7 @@ var/obj/machinery/disposal/mail/mail_chute = D mail_chute.Topic("?rescan=1", params2list("rescan=1")) - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) for(var/dest in mail_chute.destinations) var/obj/item/disposal_test_dummy/mail_test/MD = new /obj/item/disposal_test_dummy/mail_test(mail_chute, sleep_time) MD.source_disposal = mail_chute @@ -97,7 +97,7 @@ destination_disposal = locate(/obj/machinery/disposal/mail) in src.loc if(destination_disposal && destination_disposal.mail_tag == destination_tag) success = 1 - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) die() ..() @@ -1244,7 +1244,7 @@ var/list/special_parrot_species = list("ikea" = /datum/species_info/parrot/kea/i if (src.bioHolder) src.bioHolder.mobAppearance = AH - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src.bioHolder.mobAppearance.UpdateMob() /* ._.-'~'-._.-'~'-._.-'~'-._.-'~'-._.-'~'-._.-'~'-._.-'~'-._. */ @@ -1294,7 +1294,7 @@ var/list/special_parrot_species = list("ikea" = /datum/species_info/parrot/kea/i playsound(user.loc, src.hitsound, 50, 1) user.TakeDamage("head", 150, 0) user.updatehealth() - SPAWN_DBG(500) + SPAWN_DBG(50 SECONDS) if (user && !isdead(user)) user.suiciding = 0 return 1 @@ -1346,7 +1346,7 @@ var/list/special_parrot_species = list("ikea" = /datum/species_info/parrot/kea/i bling.set_loc(T) bling.throwforce = 8 src.cash_amt = max(src.cash_amt-src.shot_cost, 0) - SPAWN_DBG(15) + SPAWN_DBG(1.5 SECONDS) if (bling) bling.throwforce = 1 bling.throw_at(target, 8, 2) diff --git a/code/WorkInProgress/Hydrothings.dm b/code/WorkInProgress/Hydrothings.dm index 07396ac..cee3ab9 100644 --- a/code/WorkInProgress/Hydrothings.dm +++ b/code/WorkInProgress/Hydrothings.dm @@ -401,7 +401,7 @@ obj/item/gnomechompski/elf playsound(user, "sound/voice/animal/hoot.ogg", 70, 1) for(var/mob/O in AIviewers(user, null)) if (O.client) O.show_message("HOOT! [user] explodes revealing an owl within.", 1, "You hear an owl.", 2) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) user.owlgib() return 1 else @@ -1262,7 +1262,7 @@ obj/critter/madnessowl/switchblade SPAWN_DBG(0) src.visible_message("[src] goes [pick("on a rampage", "into a bloodlust", "berserk", "hog wild", "feral")]!") playsound(src.loc, "sound/voice/animal/hoot.ogg", 70, 1) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) if(!spazzing) src.spaz() src.set_loc(M.loc) src.frenzied = 20 @@ -1289,7 +1289,7 @@ var/list/owlery_sounds = list('sound/voice/animal/hoot.ogg','sound/ambience/owlz New() ..() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) process() proc/process() diff --git a/code/WorkInProgress/ItemSpecials.dm b/code/WorkInProgress/ItemSpecials.dm index 030d86f..aa96f01 100644 --- a/code/WorkInProgress/ItemSpecials.dm +++ b/code/WorkInProgress/ItemSpecials.dm @@ -1082,7 +1082,7 @@ desc = "Pop out a flame 1 tile away from you in a direction." var/time = 6 SECONDS - var/tiny_time = 1 SECONDS + var/tiny_time = 1 SECOND onAdd() if(master) @@ -1252,7 +1252,7 @@ var/secondhit_delay = 1 var/stamina_damage = 80 - var/obj/item/katana/K + var/obj/item/katana/K var/reversed = 0 onAdd() @@ -1274,10 +1274,10 @@ var/turf/T1 = get_turf(user) var/turf/T2 = null var/turf/T3 = null - var/turf/T4 = null + var/turf/T4 = null //This steps the user to his destination and gets the turfs needed for drawing the effects and where the attack hits - var/stopped = 0 + var/stopped = 0 if (step(user, direction)) T2 = get_turf(user) else @@ -1324,7 +1324,7 @@ flick(K.end.icon_state, K.end) //Reset the effects after they're drawn and put back into master for re-use later - SPAWN_DBG(8) + SPAWN_DBG(8 DECI SECONDS) K.start.loc = master K.mid1.loc = master K.mid2.loc = master @@ -1407,7 +1407,7 @@ if(A in attacked) continue if(isTarget(A)) A.attackby(master, user, params, 1) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) A.attackby(master, user, params, 1) attacked += A hit = 1 @@ -1556,7 +1556,7 @@ icon_state = "clash" pixel_x = 0 pixel_y = 0 - + pooled() ..() transform = null @@ -1624,7 +1624,7 @@ setup(atom/location, forced = 0) loc = location if (del_self) - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) pool(src) was_clashed(var/playsound = 1) diff --git a/code/WorkInProgress/KingInYellow.dm b/code/WorkInProgress/KingInYellow.dm index 19ff921..6da1bab 100644 --- a/code/WorkInProgress/KingInYellow.dm +++ b/code/WorkInProgress/KingInYellow.dm @@ -40,7 +40,7 @@ loc = location effect = image('icons/effects/effects.dmi', src, "ykingvanish", 4) trg << effect - SPAWN_DBG(3) qdel(src) + SPAWN_DBG(3 DECI SECONDS) qdel(src) else qdel(src) @@ -60,7 +60,7 @@ showimg = image('icons/misc/critter.dmi', src, "kingyellow", 3) target << showimg src.dir = get_dir(src, target) - SPAWN_DBG(5) update() + SPAWN_DBG(5 DECI SECONDS) update() attackby(obj/item/W as obj, mob/user as mob) vanish() @@ -73,11 +73,11 @@ if(!(src in view(7, target)) && (world.time - created) > 40) vanish() if(get_dist(src,target) <= 2) vanish() src.dir = get_dir(src, target) - SPAWN_DBG(5) update() + SPAWN_DBG(5 DECI SECONDS) update() proc/vanish() new/obj/kingyellow_vanish(src.loc, target) - SPAWN_DBG(3) qdel(src) + SPAWN_DBG(3 DECI SECONDS) qdel(src) /obj/item/book_kinginyellow name = "\"The King In Yellow\"" @@ -101,7 +101,7 @@ if(oovTile != null && curr_phantom == null) curr_phantom = new/obj/kingyellow_phantom(oovTile, L) - SPAWN_DBG(30) work() + SPAWN_DBG(3 SECONDS) work() return examine() diff --git a/code/WorkInProgress/MechanicMadness.dm b/code/WorkInProgress/MechanicMadness.dm index 9a1c6c9..6c5d483 100644 --- a/code/WorkInProgress/MechanicMadness.dm +++ b/code/WorkInProgress/MechanicMadness.dm @@ -65,7 +65,7 @@ var/list/mechanics_telepads = new/list() proc/fireInput(var/name, var/datum/mechanicsMessage/msg) if(!inputs.Find(name)) return var/path = inputs[name] - SPAWN_DBG(1) call(master, path)(msg) + SPAWN_DBG(1 DECI SECOND) call(master, path)(msg) return //Fire an outgoing connection with given value. Try to re-use incoming messages for outgoing signals whenever possible! @@ -541,7 +541,7 @@ var/list/mechanics_telepads = new/list() if(M == src || M.anchored || isAI(M)) continue M.set_loc(src) flushit() - SPAWN_DBG(20) ready = 1 + SPAWN_DBG(2 SECONDS) ready = 1 return proc/flushit() @@ -568,7 +568,7 @@ var/list/mechanics_telepads = new/list() AM.set_loc(src.loc) AM.pipe_eject(0) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) if(AM) AM.throw_at(target, 5, 1) @@ -591,7 +591,7 @@ var/list/mechanics_telepads = new/list() if(level == 2 || !ready) return if(input) ready = 0 - SPAWN_DBG(50) ready = 1 + SPAWN_DBG(5 SECONDS) ready = 1 flick("comp_tprint1",src) playsound(src.loc, "sound/machines/printer_thermal.ogg", 60, 0) var/obj/item/paper/thermal/P = new/obj/item/paper/thermal(src.loc) @@ -651,7 +651,7 @@ var/list/mechanics_telepads = new/list() boutput(user, "This scanner only accepts thermal paper.") return ready = 0 - SPAWN_DBG(30) ready = 1 + SPAWN_DBG(3 SECONDS) ready = 1 flick("comp_pscan1",src) playsound(src.loc, "sound/machines/twobeep2.ogg", 90, 0) var/obj/item/paper/P = W @@ -817,7 +817,7 @@ var/list/mechanics_telepads = new/list() if(level != 2 && ready) if(ishuman(user) && user.bioHolder) ready = 0 - SPAWN_DBG(30) ready = 1 + SPAWN_DBG(3 SECONDS) ready = 1 flick("comp_hscan1",src) playsound(src.loc, "sound/machines/twobeep2.ogg", 90, 0) var/sendstr = (send_name ? user.real_name : md5(user.bioHolder.Uid)) @@ -887,7 +887,7 @@ var/list/mechanics_telepads = new/list() icon_state = "[under_floor ? "u":""]comp_accel1" active = 1 SPAWN_DBG(0) drivecurrent() - SPAWN_DBG(5) drivecurrent() + SPAWN_DBG(5 DECI SECONDS) drivecurrent() sleep(30) if(src) icon_state = "[under_floor ? "u":""]comp_accel" @@ -1592,7 +1592,7 @@ var/list/mechanics_telepads = new/list() proc/relay(var/datum/mechanicsMessage/input) if(level == 2 || !ready) return ready = 0 - SPAWN_DBG(30) ready = 1 + SPAWN_DBG(3 SECONDS) ready = 1 flick("[under_floor ? "u":""]comp_relay1", src) if(changesig) input.signal = mechanics.outputSignal @@ -1667,7 +1667,7 @@ var/list/mechanics_telepads = new/list() if(!converted.len || !ready) return ready = 0 - SPAWN_DBG(30) ready = 1 + SPAWN_DBG(3 SECONDS) ready = 1 var/datum/signal/sendsig = get_free_signal() @@ -1707,7 +1707,7 @@ var/list/mechanics_telepads = new/list() pingsignal.data["data"] = "Wifi Component" pingsignal.transmission_method = TRANSMISSION_RADIO - SPAWN_DBG(5) //Send a reply for those curious jerks + SPAWN_DBG(5 DECI SECONDS) //Send a reply for those curious jerks src.radio_connection.post_signal(src, pingsignal, src.range) else if(signal.data["command"] == "sendmsg" && signal.data["data"]) @@ -2181,7 +2181,7 @@ var/list/mechanics_telepads = new/list() proc/activate(var/datum/mechanicsMessage/input) if(level == 2 || !ready) return ready = 0 - SPAWN_DBG(30) ready = 1 + SPAWN_DBG(3 SECONDS) ready = 1 flick("[under_floor ? "u":""]comp_tele1", src) particleMaster.SpawnSystem(new /datum/particleSystem/tpbeam(get_turf(src.loc))) playsound(src.loc, "sound/mksounds/boost.ogg", 50, 1) @@ -2457,7 +2457,7 @@ var/list/mechanics_telepads = new/list() proc/fire(var/datum/mechanicsMessage/input) if(level == 2 || !ready) return ready = 0 - SPAWN_DBG(20) ready = 1 + SPAWN_DBG(2 SECONDS) ready = 1 if(input) componentSay("[input.signal]") return @@ -2683,7 +2683,7 @@ var/list/mechanics_telepads = new/list() fire(var/datum/mechanicsMessage/input) if(charging || !ready) return ready = 0 - SPAWN_DBG(30) ready = 1 + SPAWN_DBG(3 SECONDS) ready = 1 return ..() updateIcon() diff --git a/code/WorkInProgress/MechanicsNetworkCon.dm b/code/WorkInProgress/MechanicsNetworkCon.dm index d4f7e23..fdcbedb 100644 --- a/code/WorkInProgress/MechanicsNetworkCon.dm +++ b/code/WorkInProgress/MechanicsNetworkCon.dm @@ -47,7 +47,7 @@ proc/spacket(var/datum/mechanicsMessage/input) if(!ready) return ready = 0 - SPAWN_DBG(20) ready = 1 + SPAWN_DBG(2 SECONDS) ready = 1 post_raw(input.signal) return @@ -148,7 +148,7 @@ src.host_id = null src.old_host_id = null src.post_status(rem_host, "command","term_disconnect") - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.post_status(rem_host, "command","term_connect","device",src.device_tag) return @@ -166,7 +166,7 @@ if((signal.data["address_1"] != src.net_id)) if((signal.data["address_1"] == "ping") && ((signal.data["net"] == null) || ("[signal.data["net"]]" == "[src.net_number]")) && signal.data["sender"]) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.post_status(target, "command", "ping_reply", "device", src.device_tag, "netid", src.net_id, "net", "[net_number]") if(self_only) return @@ -181,7 +181,7 @@ //WHAT IS THIS, HOW COULD THIS HAPPEN?? src.host_id = null src.updateUsrDialog() - SPAWN_DBG(3) + SPAWN_DBG(3 DECI SECONDS) src.post_status(target, "command","term_disconnect") return @@ -193,7 +193,7 @@ if(signal.data["data"] != "noreply") src.post_status(target, "command","term_connect","data","noreply","device",src.device_tag) src.updateUsrDialog() - SPAWN_DBG(2) //Sign up with the driver (if a mainframe contacted us) + SPAWN_DBG(2 DECI SECONDS) //Sign up with the driver (if a mainframe contacted us) src.post_status(target,"command","term_message","data","command=register&data=MECHNET") return diff --git a/code/WorkInProgress/MportsStuff.dm b/code/WorkInProgress/MportsStuff.dm index fedcf8b..8384790 100644 --- a/code/WorkInProgress/MportsStuff.dm +++ b/code/WorkInProgress/MportsStuff.dm @@ -36,7 +36,7 @@ src.info = "" if("Remove") - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) qdel(src) if("Change Icon") @@ -85,7 +85,7 @@ src.info = "" if("Remove") - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) qdel(src) diff --git a/code/WorkInProgress/NanneksStuff.dm b/code/WorkInProgress/NanneksStuff.dm index 497334a..91933bb 100644 --- a/code/WorkInProgress/NanneksStuff.dm +++ b/code/WorkInProgress/NanneksStuff.dm @@ -194,7 +194,7 @@ This works src.icon = make_icon_with_turf(the_turf) - SPAWN_DBG(5) src.Life() + SPAWN_DBG(5 DECI SECONDS) src.Life() else logTheThing("admin", null, null, "[src]/(%coords([src.x], [src.y], [src.z])%) not defined properly with ID = [src.id] and PTP = [src.pointer]") diff --git a/code/WorkInProgress/NewVote.dm b/code/WorkInProgress/NewVote.dm index cb0fa17..a822622 100644 --- a/code/WorkInProgress/NewVote.dm +++ b/code/WorkInProgress/NewVote.dm @@ -160,7 +160,7 @@ var/const/recently_time = 6000 // 10 mins end_vote() return curr_win = get_winner() - SPAWN_DBG(20) process() + SPAWN_DBG(2 SECONDS) process() proc/show_to(var/client/C) if(C in open_votes) return diff --git a/code/WorkInProgress/Phaser.dm b/code/WorkInProgress/Phaser.dm index 2d8681e..100d2c5 100644 --- a/code/WorkInProgress/Phaser.dm +++ b/code/WorkInProgress/Phaser.dm @@ -383,7 +383,7 @@ var/const/PHASER_SNIPER = 256 O.dest = get_turf(target) O.origin = user O.impactsounds = shot_impactsounds.Copy() - SPAWN_DBG(15) qdel(O) + SPAWN_DBG(1.5 SECONDS) qdel(O) if(shot_overlays.len) for(var/S in shot_overlays) @@ -496,7 +496,7 @@ var/const/PHASER_SNIPER = 256 var/obj/OV = unpool(/obj/effects/sparks) OV.set_loc(T) OV.dir = pick(alldirs) - SPAWN_DBG(20) if (OV) pool(OV) + SPAWN_DBG(2 SECONDS) if (OV) pool(OV) if(34 to 66) playsound(O.loc, "sound/effects/exlow.ogg", 65, 1) for(var/turf/simulated/floor/T in view(O.range,O.loc)) @@ -504,7 +504,7 @@ var/const/PHASER_SNIPER = 256 OV.icon = 'icons/effects/effects.dmi' OV.icon_state = "empdisable" OV.dir = pick(alldirs) - SPAWN_DBG(3) qdel(OV) + SPAWN_DBG(3 DECI SECONDS) qdel(OV) if(prob(O.power/2) || !O.range) T.burn_tile() if(67 to 100) @@ -554,7 +554,7 @@ var/const/PHASER_SNIPER = 256 boutput(usr, "Your phaser overloads."); overloading = 1 playsound(usr, "sound/weapons/phaseroverload.ogg", 65, 1) - SPAWN_DBG(60) + SPAWN_DBG(6 SECONDS) var/turf/curr = get_turf(src) curr.hotspot_expose(700,125) explosion(src, curr, 0, 0, 2, 4) diff --git a/code/WorkInProgress/Railgun.dm b/code/WorkInProgress/Railgun.dm index 8c325ba..bd327b4 100644 --- a/code/WorkInProgress/Railgun.dm +++ b/code/WorkInProgress/Railgun.dm @@ -58,7 +58,7 @@ // var/turf/T = O.loc // for(var/atom/A in T.contents) // boutput(src, "There is a [A.name] at this location.") - SPAWN_DBG(5) pool(O) + SPAWN_DBG(5 DECI SECONDS) pool(O) if(istype(target_r, /obj/railgun_trg_dummy)) qdel(target_r) diff --git a/code/WorkInProgress/SpyGuyStuff.dm b/code/WorkInProgress/SpyGuyStuff.dm index d1d8849..6a2c38f 100644 --- a/code/WorkInProgress/SpyGuyStuff.dm +++ b/code/WorkInProgress/SpyGuyStuff.dm @@ -69,7 +69,7 @@ Fibre wire H.changeStatus("weakened", 10 SECONDS) - SPAWN_DBG(70) + SPAWN_DBG(7 SECONDS) if(!H) being_mean = 0 return @@ -90,7 +90,7 @@ Fibre wire else //How the fuck did we even get here?? H.ghostize() - SPAWN_DBG(15) playsound(src.loc, 'sound/effects/ghostlaugh.ogg', 70, 1) + SPAWN_DBG(1.5 SECONDS) playsound(src.loc, 'sound/effects/ghostlaugh.ogg', 70, 1) flick("skull_ominous_explode", src) sleep(30) qdel(src) @@ -118,7 +118,7 @@ proc/Create_Tommyname() else T.key = src.key - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) qdel(src) /mob/living/carbon/human/proc/tommyize_reshape() @@ -160,7 +160,7 @@ proc/Create_Tommyname() if(src.bioHolder) src.bioHolder.mobAppearance = AH src.bioHolder.AddEffect("accent_tommy") - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src.bioHolder.mobAppearance.UpdateMob() ////////////////////////////// diff --git a/code/WorkInProgress/TempEngine.dm b/code/WorkInProgress/TempEngine.dm index 8cf200a..e95c72b 100644 --- a/code/WorkInProgress/TempEngine.dm +++ b/code/WorkInProgress/TempEngine.dm @@ -142,7 +142,7 @@ window = new(src) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) circ1 = locate(/obj/machinery/atmospherics/binary/circulatorTemp) in get_step(src,WEST) circ2 = locate(/obj/machinery/atmospherics/binary/circulatorTemp/right) in get_step(src,EAST) if(!circ1 || !circ2) @@ -242,7 +242,7 @@ else if (genlev && !running) playsound(src.loc, sound_tractorrev, 55, 0) running = 1 - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) spam_limiter = 0 window.UpdateTEG() @@ -349,7 +349,7 @@ W.smash() for (var/mob/living/M in range(6, src.loc)) shake_camera(M, 3, 2) - M.changeStatus("weakened", 1 SECONDS) + M.changeStatus("weakened", 1 SECOND) for (var/atom/A in range(rand(1,3), src.loc)) if (istype(A, /turf/simulated)) A.pixel_x = rand(-1,1) @@ -407,7 +407,7 @@ var/list/affected = DrawLine(last, target, /obj/line_obj/elec ,'icons/obj/projectiles.dmi',"WholeLghtn",1,1,"HalfStartLghtn","HalfEndLghtn",OBJ_LAYER,1,PreloadedIcon='icons/effects/LghtLine.dmi') for(var/obj/O in affected) - SPAWN_DBG(6) pool(O) + SPAWN_DBG(6 DECI SECONDS) pool(O) //var/turf/currTurf = get_turf(target) //currTurf.hotspot_expose(2000, 400) diff --git a/code/WorkInProgress/WiresStuff.dm b/code/WorkInProgress/WiresStuff.dm index 504e867..95a41f6 100644 --- a/code/WorkInProgress/WiresStuff.dm +++ b/code/WorkInProgress/WiresStuff.dm @@ -31,7 +31,7 @@ // create a blank icon at the appropriate size var/icon/canvas = icon('icons/misc/flatBlank.dmi') canvas.Crop(1, 1, areaW * iconWidth, areaH * iconHeight) - + var/turf/startT = C.mob.loc var/startX = startT.x var/startY = startT.y @@ -69,7 +69,7 @@ // ignore things we don't want in the final image. lighting etc if (thing.invisibility || istype(thing, /obj/overlay/tile_effect)) continue - + // TODO: handle large items (multi-tile things) // TODO: handle pixel offsets somehow @@ -118,7 +118,7 @@ var/global/deathConfettiActive = 0 /mob/proc/deathConfetti() particleMaster.SpawnSystem(new /datum/particleSystem/confetti(src.loc)) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) playsound(src.loc, "sound/voice/yayyy.ogg", 50, 1) /client/proc/toggle_death_confetti() @@ -220,7 +220,7 @@ var/global/deathConfettiActive = 0 var/hardRebootFilePath = "data/hard-reboot" var/hardRebootFileExists = fexists(hardRebootFilePath) var/logMessage = "" - + if (hardRebootFileExists && alert("A hard reboot is already queued, would you like to remove it?",, "Yes", "No") == "Yes") fdel(hardRebootFilePath) logMessage = "removed a server hard reboot" diff --git a/code/WorkInProgress/ZeWakasStuff.dm b/code/WorkInProgress/ZeWakasStuff.dm index cefc1d4..f61b3b0 100644 --- a/code/WorkInProgress/ZeWakasStuff.dm +++ b/code/WorkInProgress/ZeWakasStuff.dm @@ -3,6 +3,7 @@ * 90 101 87 97 107 97 39 115 83 116 117 102 102 */ +//foo //everything here is wip, this can also be ascertained by the location of this file @@ -165,7 +166,7 @@ src.attacking = 1 src.visible_message("[src] bites [src.target] viciously!") random_brute_damage(src.target, rand(5,15)) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src.attacking = 0 ////////////////////////////// Underworld Stuff @@ -248,4 +249,4 @@ smoke.start() src.activated = 1 P.in_use = 0 - return \ No newline at end of file + return diff --git a/code/WorkInProgress/actuallyKeelinsStuff.dm b/code/WorkInProgress/actuallyKeelinsStuff.dm index bcfc21c..49a70d2 100644 --- a/code/WorkInProgress/actuallyKeelinsStuff.dm +++ b/code/WorkInProgress/actuallyKeelinsStuff.dm @@ -309,7 +309,7 @@ var/list/electiles = list() light.set_brightness(0.5) light.attach(src) light.enable() - SPAWN_DBG(6) + SPAWN_DBG(6 DECI SECONDS) if (target_tag) var/atom/target = locate(target_tag) if(target) @@ -360,7 +360,7 @@ var/list/electiles = list() src.visible_message("The portal collapses in on itself!") var/obj/sparks = unpool(/obj/effects/sparks) sparks.set_loc(get_turf(src)) - SPAWN_DBG(20) if (sparks) pool(sparks) + SPAWN_DBG(2 SECONDS) if (sparks) pool(sparks) qdel(src) return @@ -373,7 +373,7 @@ var/list/electiles = list() src.visible_message("The portal collapses in on itself!") var/obj/sparks = unpool(/obj/effects/sparks) sparks.set_loc(get_turf(src)) - SPAWN_DBG(20) if (sparks) pool(sparks) + SPAWN_DBG(2 SECONDS) if (sparks) pool(sparks) qdel(src) return */ @@ -734,27 +734,27 @@ var/list/electiles = list() pixel_y = -16 blend_mode = 2 New() - SPAWN_DBG(100) + SPAWN_DBG(10 SECONDS) name = "growing wormhole" desc = "a slowly growing wormhole" icon_state = "whole-growing" blend_mode = 2 - SPAWN_DBG(200) + SPAWN_DBG(20 SECONDS) name = "stable wormhole" desc = "a wormhole leading who-knows-where" icon_state = "whole" blend_mode = 1 - SPAWN_DBG(300) + SPAWN_DBG(30 SECONDS) name = "massive wormhole" desc = "a huge wormhole leading to unknown space" icon_state = "whole-massive" blend_mode = 1 - SPAWN_DBG(400) + SPAWN_DBG(40 SECONDS) name = "unstable wormhole" desc = "an unstable wormhole, about to collapse" icon_state = "whole-unstable" blend_mode = 1 - SPAWN_DBG(500) + SPAWN_DBG(50 SECONDS) qdel(src) ..() @@ -767,7 +767,7 @@ var/list/electiles = list() layer = EFFECTS_LAYER_1 New() - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) qdel(src) ..() @@ -814,7 +814,7 @@ var/list/electiles = list() var/image/I = image(S) I.appearance_flags = 0 src.overlays += image(S) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) qdel(src) ..() @@ -1459,7 +1459,7 @@ var/list/electiles = list() pixels += P qdel(A) - SPAWN_DBG(70) + SPAWN_DBG(7 SECONDS) for(var/datum/D in pixels) pool(D) @@ -1981,7 +1981,7 @@ var/list/electiles = list() T:break_tile() else T:burn_tile() - SPAWN_DBG(6) qdel(B) + SPAWN_DBG(6 DECI SECONDS) qdel(B) sleep(3) sleep(1) @@ -2369,7 +2369,7 @@ var/list/electiles = list() return var/turf/fire_target_tile = get_step(get_step(get_step(get_step(src, src.dir), src.dir), direction), direction) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) playsound(src, "sound/weapons/rocket.ogg", 50, 1) var/obj/item/rpg_rocket/R = new @@ -2383,7 +2383,7 @@ var/list/electiles = list() R.process() - SPAWN_DBG(25) ready = 1 + SPAWN_DBG(2.5 SECONDS) ready = 1 */ /obj/movable_area_controller @@ -2708,7 +2708,7 @@ var/list/electiles = list() playsound(H.loc, "swing_hit", 50, 1) prob_clonk = min(prob_clonk + 5, 40) - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) prob_clonk = max(prob_clonk - 5, 0) return ..(hit_atom) @@ -2835,7 +2835,7 @@ var/list/electiles = list() light.set_brightness(0.5) light.attach(src) light.enable() - SPAWN_DBG(6) + SPAWN_DBG(6 DECI SECONDS) if (target_tag) target = locate(target_tag) @@ -2846,7 +2846,7 @@ var/list/electiles = list() src.visible_message("The portal collapses in on itself!") var/obj/sparks = unpool(/obj/effects/sparks) sparks.set_loc(get_turf(src)) - SPAWN_DBG(20) if (sparks) pool(sparks) + SPAWN_DBG(2 SECONDS) if (sparks) pool(sparks) qdel(src) @@ -2913,7 +2913,7 @@ var/list/electiles = list() unpooled(var/poolname) ..() - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) var/atom/myloc = loc if(myloc && !istype(myloc,/turf/space)) my_dir = pick(alldirs) @@ -2942,13 +2942,13 @@ var/list/electiles = list() possible += current if(!possible.len) - SPAWN_DBG(30) update() + SPAWN_DBG(3 SECONDS) update() return var/turf/picked = pick(possible) if(src.loc.invisibility) src.loc.invisibility = 0 src.set_loc(picked) - SPAWN_DBG(5) picked.invisibility = 100 + SPAWN_DBG(5 DECI SECONDS) picked.invisibility = 100 SPAWN_DBG(rand(50,80)) update() @@ -2988,7 +2988,7 @@ var/list/electiles = list() var/list/possible = find_suitable_tiles() if(!possible.len) - SPAWN_DBG(30) update() + SPAWN_DBG(3 SECONDS) update() return var/turf/picked = pick(possible) @@ -2997,7 +2997,7 @@ var/list/electiles = list() src.set_loc(picked) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) picked.invisibility = 100 picked.opacity = 1 @@ -3103,7 +3103,7 @@ var/list/electiles = list() user.end_chair_flip_targeting() if(suiciding || deadly) src.visible_message("[user.name] dives headfirst at the [target.name]!") - SPAWN_DBG(3) //give them time to land + SPAWN_DBG(3 DECI SECONDS) //give them time to land if (user) user.TakeDamage("head", 200, 0) user.updatehealth() @@ -3124,7 +3124,7 @@ var/list/electiles = list() suiciding = 1 //reset in attack_hand() at the same time as in_use attack_hand(user) - SPAWN_DBG(500) + SPAWN_DBG(50 SECONDS) if (src) src.suiciding = 0 if (user && !isdead(user)) @@ -3163,7 +3163,7 @@ var/list/lag_list = new/list() var/before = world.timeofday sleep(1) add_and_average( (world.timeofday - before) ) - SPAWN_DBG(5) lag_loop() + SPAWN_DBG(5 DECI SECONDS) lag_loop() /proc/get_lag_average() boutput(usr, "[average_tenth] at [lag_list.len] samples.") @@ -3323,7 +3323,7 @@ var/list/lag_list = new/list() update() rebuild_icon() - SPAWN_DBG(5) update() + SPAWN_DBG(5 DECI SECONDS) update() /obj/spook var/active = 0 @@ -3344,7 +3344,7 @@ var/list/lag_list = new/list() proc/loop() if(active) - SPAWN_DBG(30) loop() + SPAWN_DBG(3 SECONDS) loop() return @@ -3352,7 +3352,7 @@ var/list/lag_list = new/list() if(prob(20)) spook(L) break - SPAWN_DBG(20) loop() + SPAWN_DBG(2 SECONDS) loop() proc/spook(var/mob/living/L) if (narrator_mode) @@ -3368,7 +3368,7 @@ var/list/lag_list = new/list() src.invisibility = 100 src.set_loc(startloc) walk(src,0) - SPAWN_DBG(100) active = 0 + SPAWN_DBG(10 SECONDS) active = 0 /datum/engibox_mode @@ -3717,7 +3717,7 @@ var/list/lag_list = new/list() New() ..() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) process() proc/process() diff --git a/code/WorkInProgress/banshark.dm b/code/WorkInProgress/banshark.dm index a2600e0..b7422d5 100644 --- a/code/WorkInProgress/banshark.dm +++ b/code/WorkInProgress/banshark.dm @@ -100,7 +100,7 @@ Bump(M as turf|obj|mob) M:density = 0 - SPAWN_DBG(4) + SPAWN_DBG(4 DECI SECONDS) M:density = 1 sleep(1) var/turf/T = get_turf(M) @@ -121,7 +121,7 @@ else if (get_dist(src, src.sharktarget2) <= 1) for(var/mob/O in AIviewers(src, null)) O.show_message("[src] bites [sharktarget2]!", 1) - sharktarget2.changeStatus("weakened", 1 SECONDS) + sharktarget2.changeStatus("weakened", 1 SECOND) sharktarget2.changeStatus("stunned", 10 SECONDS) playsound(src.loc, 'sound/impact_sounds/Metal_Hit_Heavy_1.ogg', 50, 1, -1) banproc() @@ -167,7 +167,7 @@ Bump(M as turf|obj|mob) M:density = 0 - SPAWN_DBG(4) + SPAWN_DBG(4 DECI SECONDS) M:density = 1 sleep(1) var/turf/T = get_turf(M) @@ -179,7 +179,7 @@ if (get_dist(src, src.sharktarget2) <= 1) for(var/mob/O in AIviewers(src, null)) O.show_message("[src] bites [sharktarget2]!", 1) - sharktarget2.changeStatus("weakened", 1 SECONDS) + sharktarget2.changeStatus("weakened", 1 SECOND) sharktarget2.changeStatus("stunned", 10 SECONDS) playsound(src.loc, 'sound/impact_sounds/Metal_Hit_Heavy_1.ogg', 50, 1, -1) gibproc() diff --git a/code/WorkInProgress/bowling.dm b/code/WorkInProgress/bowling.dm index 35afef5..fc63072 100644 --- a/code/WorkInProgress/bowling.dm +++ b/code/WorkInProgress/bowling.dm @@ -56,7 +56,7 @@ if(!air_contents) air_contents = unpool(/datum/gas_mixture) - + disposing() if(air_contents) pool(air_contents) @@ -97,7 +97,7 @@ AM.set_loc(src.loc) AM.pipe_eject(0) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) if(AM) AM.throw_at(target, 5, 1) diff --git a/code/WorkInProgress/computerx/computerx.dm b/code/WorkInProgress/computerx/computerx.dm index ec958c0..aa59849 100644 --- a/code/WorkInProgress/computerx/computerx.dm +++ b/code/WorkInProgress/computerx/computerx.dm @@ -40,7 +40,7 @@ var/compx_gridx_max = 5 if(!compx_grid_spacer) compx_grid_spacer = new - SPAWN_DBG(4) + SPAWN_DBG(4 DECI SECONDS) if(ispath(src.setup_starting_drive)) new src.setup_starting_drive(src) @@ -303,7 +303,7 @@ var/compx_gridx_max = 5 src.updateUsrDialog() src.host_program = null - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) //src.restarting = 0 src.post_system() diff --git a/code/WorkInProgress/computerx/peripherals.dm b/code/WorkInProgress/computerx/peripherals.dm index 6dd6b39..97265ff 100644 --- a/code/WorkInProgress/computerx/peripherals.dm +++ b/code/WorkInProgress/computerx/peripherals.dm @@ -254,7 +254,7 @@ var/broadcast_range = src.range if(src.setup_netmode_norange) broadcast_range = 0 - SPAWN_DBG(5) //Send a reply for those curious jerks + SPAWN_DBG(5 DECI SECONDS) //Send a reply for those curious jerks src.radio_connection.post_signal(src, pingsignal, broadcast_range) return //Just toss out the rest of the signal then I guess @@ -288,7 +288,7 @@ New() ..() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) if(src.host && !src.link) //Wait for the map to load and hook up if installed() hasn't done it. src.check_connection() //Let's blindy attempt to generate a unique network ID! @@ -372,7 +372,7 @@ pingsignal.data["address_1"] = signal.data["sender"] pingsignal.data["command"] = "ping_reply" pingsignal.transmission_method = TRANSMISSION_WIRE - SPAWN_DBG(5) //Send a reply for those curious jerks + SPAWN_DBG(5 DECI SECONDS) //Send a reply for those curious jerks src.link.post_signal(src, pingsignal) return //Just toss out the rest of the signal then I guess @@ -468,7 +468,7 @@ if(!print_data) src.printing = 0 return - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) var/obj/item/paper/P = new /obj/item/paper( src.host.loc ) P.info = print_data if(print_title) @@ -498,7 +498,7 @@ if(!print_data) src.printing = 0 return - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) var/obj/item/paper/P = new /obj/item/paper( src.host.loc ) P.info = print_data if(print_title) @@ -660,7 +660,7 @@ newrec.fields["access"] = jointext(src.authid.access, ";") newrec.fields["balance"] = src.authid.money - SPAWN_DBG(4) + SPAWN_DBG(4 DECI SECONDS) send_command("card_authed", newrec) return newrec @@ -677,7 +677,7 @@ newrec.fields["registered"] = src.authid.registered newrec.fields["assignment"] = src.authid.assignment newrec.fields["balance"] = src.authid.money - SPAWN_DBG(4) + SPAWN_DBG(4 DECI SECONDS) send_command("card_authed", newrec) return newrec @@ -688,13 +688,13 @@ //We need correct PIN numbers you jerks. if(text2num(rec.fields["pin"]) != src.authid.pin) - SPAWN_DBG(4) + SPAWN_DBG(4 DECI SECONDS) send_command("card_bad_pin") return var/charge_amount = text2num(rec.fields["amount"]) if(!charge_amount || (charge_amount <= 0) || charge_amount > src.authid.money) - SPAWN_DBG(4) + SPAWN_DBG(4 DECI SECONDS) send_command("card_bad_charge") return @@ -717,7 +717,7 @@ var/datum/signal/newrec = new newrec.fields["access"] = new_access */ - SPAWN_DBG(4) + SPAWN_DBG(4 DECI SECONDS) send_command("card_add") return @@ -737,7 +737,7 @@ var/datum/signal/newrec = new newrec.fields["access"] = rem_access */ - SPAWN_DBG(4) + SPAWN_DBG(4 DECI SECONDS) send_command("card_remove") return diff --git a/code/WorkInProgress/construction/supply_controller.dm b/code/WorkInProgress/construction/supply_controller.dm index d07a752..1c340cd 100644 --- a/code/WorkInProgress/construction/supply_controller.dm +++ b/code/WorkInProgress/construction/supply_controller.dm @@ -607,7 +607,7 @@ New() ..() - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) recheck() proc/is_sellable(var/obj/O) diff --git a/code/WorkInProgress/construction/tools.dm b/code/WorkInProgress/construction/tools.dm index b9e3414..c96d39a 100644 --- a/code/WorkInProgress/construction/tools.dm +++ b/code/WorkInProgress/construction/tools.dm @@ -6,7 +6,7 @@ density = 1 anchored = 1 New() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) var/obj/term = new /obj/machinery/power/terminal(get_step(get_turf(src), dir)) term.dir = get_dir(get_turf(term), src) new /obj/machinery/power/smes(get_turf(src)) diff --git a/code/WorkInProgress/cryospawn.dm b/code/WorkInProgress/cryospawn.dm index e7c618d..b2ff7ba 100644 --- a/code/WorkInProgress/cryospawn.dm +++ b/code/WorkInProgress/cryospawn.dm @@ -4,7 +4,7 @@ /obj/cryotron_spawner New() ..() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) #ifdef RP_MODE new /obj/cryotron(src.loc) #endif @@ -96,7 +96,7 @@ flick("cryotron_go_down", src) //sleep(19) - SPAWN_DBG(19) + SPAWN_DBG(1.9 SECONDS) if (!thePerson) busy = 0 return (folks_to_spawn.len != 0) @@ -107,7 +107,7 @@ O.set_loc(firstLoc) //sleep(10) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) if (!thePerson) busy = 0 return (folks_to_spawn.len != 0) @@ -125,7 +125,7 @@ A.announce_arrival(thePerson.real_name, thePerson.mind.assigned_role) //#endif //sleep(9) - SPAWN_DBG(9) + SPAWN_DBG(9 DECI SECONDS) busy = 0 return (folks_to_spawn.len != 0) diff --git a/code/WorkInProgress/customcritter.dm b/code/WorkInProgress/customcritter.dm index b8bd0ce..3e336e5 100644 --- a/code/WorkInProgress/customcritter.dm +++ b/code/WorkInProgress/customcritter.dm @@ -149,7 +149,7 @@ tokenized_message(chase_text, target) play_optional_sound(chase_sound) if (stun_prob) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) if (get_dist(src, target) <= 1) if (prob(stun_prob)) M.changeStatus("stunned", 3 SECONDS) @@ -187,7 +187,7 @@ for (var/datum/critterEvent/E in events) if (E.attachment_point == EVENT_ATTACHMENT_POINT_MELEE) E.trigger() - SPAWN_DBG(25) + SPAWN_DBG(2.5 SECONDS) src.attacking = 0 CritterDeath() diff --git a/code/WorkInProgress/explosion_particles.dm b/code/WorkInProgress/explosion_particles.dm index 03cb012..d991dda 100644 --- a/code/WorkInProgress/explosion_particles.dm +++ b/code/WorkInProgress/explosion_particles.dm @@ -76,7 +76,7 @@ var/datum/effects/system/expl_particles/P = new/datum/effects/system/expl_particles() P.set_up(10,location) P.start() - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) var/datum/effects/system/harmless_smoke_spread/S = new/datum/effects/system/harmless_smoke_spread() S.set_up(3,0,location,null) S.start() diff --git a/code/WorkInProgress/fission/engine.dm b/code/WorkInProgress/fission/engine.dm index fa0a5ee..f637629 100644 --- a/code/WorkInProgress/fission/engine.dm +++ b/code/WorkInProgress/fission/engine.dm @@ -28,7 +28,7 @@ ENGINE New() ..() - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) setupLinks() @@ -315,7 +315,7 @@ REACTOR T:air:trace_gases = list() T:air:trace_gases += rad - SPAWN_DBG(8) + SPAWN_DBG(8 DECI SECONDS) meltdown = 2.0 diff --git a/code/WorkInProgress/fission/rods.dm b/code/WorkInProgress/fission/rods.dm index b3ae9d7..fdec926 100644 --- a/code/WorkInProgress/fission/rods.dm +++ b/code/WorkInProgress/fission/rods.dm @@ -98,7 +98,7 @@ if(locate(src.loc)) new /obj/item/rod/fuel/neptunium/TwoThreeNine(src.loc) qdel(src) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) process() /***************************************** @@ -166,5 +166,5 @@ if(locate(src.loc)) new /obj/item/rod/fuel/plutonium/TwoThreeNine(src.loc) qdel(src) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) process() \ No newline at end of file diff --git a/code/WorkInProgress/infernal_contracts.dm b/code/WorkInProgress/infernal_contracts.dm index eac74e8..6732f7d 100644 --- a/code/WorkInProgress/infernal_contracts.dm +++ b/code/WorkInProgress/infernal_contracts.dm @@ -172,7 +172,7 @@ else return - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) qdel(src) /obj/item/pen/fancy/satan @@ -249,7 +249,7 @@ make_my_stuff() ..() - SPAWN_DBG(5) //to give the buylist enough time to assign a merchant var to the briefcase + SPAWN_DBG(5 DECI SECONDS) //to give the buylist enough time to assign a merchant var to the briefcase var/list/contracts = list(/obj/item/contract/yeti, /obj/item/contract/genetic/demigod, /obj/item/contract/vampire, @@ -384,7 +384,7 @@ boutput(user, "The depleted contract vanishes in a puff of smoke!") playsound(src.loc, pick('sound/voice/creepywhisper_1.ogg', 'sound/voice/creepywhisper_2.ogg', 'sound/voice/creepywhisper_3.ogg'), 50, 1) spawncontract(badguy, 0, 0) //huzzah for efficient code - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) qdel(src) attack(mob/M as mob, mob/user as mob, def_zone) @@ -410,7 +410,7 @@ M.visible_message("[user] forces [M] to sign [src]!") logTheThing("combat", user, M, "forces [M] to sign a [src] at [log_loc(user)].") MagicEffect(M, user) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) src.inuse = 0 soulcheck(user) else @@ -432,7 +432,7 @@ if(user.mind) user.mind.damned = 1 MagicEffect(user, src.merchant) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) soulcheck(src.merchant) else user.visible_message("[user] looks puzzled as [he_or_she(user)] realizes [his_or_her(user)] pen isn't evil enough to sign [src]!") @@ -450,7 +450,7 @@ obj/item/contract/satan user.visible_message("[user] signs [his_or_her(user)]name in blood upon [src]!") logTheThing("admin", user, null, "signed a satan contract at [log_loc(user)]!") user.sellsoul() - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) user.satanclownize() boutput(user, "Note that you are not an antagonist (unless you were already one), you simply have some of the powers of one.") if (src.limiteduse == 1) @@ -470,7 +470,7 @@ obj/item/contract/macho user.visible_message("[user] signs [his_or_her(user)] name in slim jims upon [src]!") logTheThing("admin", user, null, "signed a macho contract at [log_loc(user)]!") user.sellsoul() - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) user.machoize(1) boutput(user, "Note that you are not an antagonist (unless you were already one), you simply have some of the powers of one.") if (src.limiteduse == 1) @@ -491,7 +491,7 @@ obj/item/contract/wrestle user.visible_message("[user] signs [his_or_her(user)] name in cocaine upon [src]!") logTheThing("admin", user, null, "signed a wrestler contract at [log_loc(user)]!") user.sellsoul() - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) user.mind.special_role = "Faustian Wrestler" sleep(1) user.make_wrestler(1) @@ -522,7 +522,7 @@ obj/item/contract/yeti user.visible_message("[user] signs [his_or_her(user)] name in blood upon [src]!") logTheThing("admin", user, null, "signed a yeti contract at [log_loc(user)]!") user.sellsoul() - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) user.makesuperyeti() boutput(user, "Note that you are not an antagonist (unless you were already one), you simply have some of the powers of one.") if (src.limiteduse == 1) @@ -543,7 +543,7 @@ obj/item/contract/genetic logTheThing("admin", user, null, "signed a genetic modifiying contract at [log_loc(user)]!") user.sellsoul() boutput(user, "Note that you are not an antagonist (unless you were already one), you simply have some of the powers of one.") - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) user.bioHolder.AddEffect("activator", 0, 0, 1) user.bioHolder.AddEffect("mutagenic_field", 0, 0, 1) boutput(user, "You have finally achieved your full potential! Mom would so proud!") @@ -552,7 +552,7 @@ obj/item/contract/genetic boutput(user, "You feel an upwelling of additional power!") user:unkillable = 1 user.bioHolder.AddEffect("mutagenic_field_prenerf", 0, 0, 1) - SPAWN_DBG(2) + SPAWN_DBG(2 DECI SECONDS) boutput(user, "You have ascended beyond mere humanity!") user.mind.special_role = "Genetic Demigod" ticker.mode.Agimmicks.Add(user) @@ -578,7 +578,7 @@ obj/item/contract/horse if (total_souls_value >= 20) //20 souls needed to start the end-times. Sufficiently difficult? boutput(user, "NEIGH!") src.endtimes() - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) soulcheck(user) return else @@ -597,7 +597,7 @@ obj/item/contract/horse user.visible_message("[user] signs [his_or_her(user)] name with [his_or_her(user)] own blood inside [src]!") logTheThing("admin", user, null, "signed a horse contract at [log_loc(user)]!") user.sellsoul() - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) user.horse() user.traitHolder.addTrait("soggy") boutput(user, "NEIGH") @@ -650,7 +650,7 @@ obj/item/contract/vampire user.visible_message("[user] signs [his_or_her(user)] name in blood upon [src]!") logTheThing("admin", user, null, "signed a vampire contract at [log_loc(user)]!") user.sellsoul() - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) user.mind.special_role = "vampire" user.make_vampire(1) ticker.mode.Agimmicks.Add(user) @@ -671,7 +671,7 @@ obj/item/contract/juggle user.visible_message("[user] signs [his_or_her(user)] name in blood upon [src]!") logTheThing("admin", user, null, "signed a juggle contract at [log_loc(user)]!") user.sellsoul() - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) user.bioHolder.AddEffect("juggler", 0, 0, 1) if (src.limiteduse == 1) src.used++ @@ -689,7 +689,7 @@ obj/item/contract/fart user.visible_message("[user] signs [his_or_her(user)] name in blood upon [src]!") logTheThing("admin", user, null, "signed a fart contract at [log_loc(user)]!") user.sellsoul() - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) user.bioHolder.AddEffect("linkedfart", 0, 0, 1) if (src.limiteduse == 1) src.used++ @@ -707,7 +707,7 @@ obj/item/contract/bee user.visible_message("[user] signs [his_or_her(user)] name in blood upon [src]!") logTheThing("admin", user, null, "signed a bee contract at [log_loc(user)]!") user.sellsoul() - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) user.bioHolder.AddEffect("drunk_bee", 0, 0, 1) if (src.limiteduse == 1) src.used++ @@ -725,7 +725,7 @@ obj/item/contract/rested user.visible_message("[user] signs [his_or_her(user)] name in blood upon [src]!") logTheThing("admin", user, null, "signed a sleep contract at [log_loc(user)]!") user.sellsoul() - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) user.bioHolder.AddEffect("drunk_pentetic", 0, 0, 1) user.bioHolder.AddEffect("regenerator_super", 0, 0, 1) user.bioHolder.AddEffect("narcolepsy_super", 0, 0, 1) //basically, the signer's very vulnerable but exceptionally difficult to actually kill. @@ -747,7 +747,7 @@ obj/item/contract/reversal user.visible_message("[user] signs [his_or_her(user)] name in blood upon [src]!") logTheThing("admin", user, null, "signed a damage reversal contract at [log_loc(user)]!") user.sellsoul() - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) user.bioHolder.AddEffect("breathless_contract", 0, 0, 1) user.traitHolder.addTrait("reversal") boutput(user, "You feel like you could take a shotgun blast to the face without getting a scratch on you!") @@ -767,7 +767,7 @@ obj/item/contract/chemical user.visible_message("[user] signs [his_or_her(user)] name in blood upon [src]!") logTheThing("admin", user, null, "signed a chemical contract at [log_loc(user)]!") user.sellsoul() - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) user.bioHolder.AddEffect("drunk_random", 0, 0, 1) if (src.limiteduse == 1) src.used++ @@ -787,7 +787,7 @@ obj/item/contract/hair user.visible_message("[user] signs [his_or_her(user)] name in blood upon [src]!") logTheThing("admin", user, null, "signed a hair contract at [log_loc(user)]!") user.sellsoul() - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) for(var/mob/living/carbon/human/H in mobs) if (H == user || isdiabolical(H)) continue @@ -809,14 +809,14 @@ obj/item/contract/greed user.visible_message("[user] signs [his_or_her(user)] name in blood upon [src]!") logTheThing("admin", user, null, "signed a greed contract at [log_loc(user)]!") user.sellsoul() - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) var/obj/item/spacecash/random/tourist/S = unpool(/obj/item/spacecash/random/tourist) S.setup(user.loc) boutput(user, "Some money appears at your feet. What, did you expect some sort of catch or trick?") var/wealthy = rand(1,2) if (wealthy == 1) - SPAWN_DBG(100) + SPAWN_DBG(10 SECONDS) boutput(user, "What, not enough for you? Fine.") var/turf/T = get_turf(user) if (T) @@ -828,7 +828,7 @@ obj/item/contract/greed else new /obj/item/coin(T) if (wealthy == 2) - SPAWN_DBG(100) + SPAWN_DBG(10 SECONDS) boutput(user, "Well, you were right.") var/mob/living/carbon/human/H = user H.become_gold_statue(1) diff --git a/code/WorkInProgress/mantaObjects.dm b/code/WorkInProgress/mantaObjects.dm index 198740a..33429db 100644 --- a/code/WorkInProgress/mantaObjects.dm +++ b/code/WorkInProgress/mantaObjects.dm @@ -448,6 +448,9 @@ var/obj/manta_speed_lever/mantaLever = null return ..() attack_hand(mob/user as mob) + if (isAI(usr)) + boutput(user, "You'd touch the door, if only you had hands.") + return if (broken == 1) user.shock(src, rand(5000, 15000), "chest", 1) if (!src.open) @@ -697,7 +700,7 @@ var/obj/manta_speed_lever/mantaLever = null flick("englrt1", src) playsound(src, 'sound/machines/lrteleport.ogg', 60, 1) animate_teleport(user) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) teleport(user) busy = 0 diff --git a/code/WorkInProgress/multiContext.dm b/code/WorkInProgress/multiContext.dm index 4ff6eb7..2678569 100644 --- a/code/WorkInProgress/multiContext.dm +++ b/code/WorkInProgress/multiContext.dm @@ -565,7 +565,7 @@ var/list/globalContextActions = null execute(var/atom/target, var/mob/user) if (user && istype(user, /mob/dead/observer)) var/mob/dead/observer/ghost = user - spawn(1) + spawn(1 DECI SECOND) ghost.go_to_vr() ..() @@ -577,7 +577,7 @@ var/list/globalContextActions = null execute(var/atom/target, var/mob/user) if (user && istype(user, /mob/dead/observer)) var/mob/dead/observer/ghost = user - spawn(1) + spawn(1 DECI SECOND) ghost.respawn_as_animal() ..() @@ -588,7 +588,7 @@ var/list/globalContextActions = null execute(var/atom/target, var/mob/user) if (user && istype(user, /mob/dead/observer)) var/mob/dead/observer/ghost = user - spawn(1) + spawn(1 DECI SECOND) ghost.enter_ghostdrone_queue() ..() @@ -600,7 +600,7 @@ var/list/globalContextActions = null execute(var/atom/target, var/mob/user) if (user && istype(user, /mob/dead/observer)) var/mob/dead/observer/ghost = user - spawn(1) + spawn(1 DECI SECOND) ghost.go_to_deadbar() ..() diff --git a/code/WorkInProgress/optics/beam.dm b/code/WorkInProgress/optics/beam.dm index b2ce9f1..7c1ab74 100644 --- a/code/WorkInProgress/optics/beam.dm +++ b/code/WorkInProgress/optics/beam.dm @@ -42,7 +42,7 @@ next.prev = src next.master = src.master else - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) propagate() diff --git a/code/WorkInProgress/previouslyKeelinsStuff.dm b/code/WorkInProgress/previouslyKeelinsStuff.dm index 81f6096..dd38f67 100644 --- a/code/WorkInProgress/previouslyKeelinsStuff.dm +++ b/code/WorkInProgress/previouslyKeelinsStuff.dm @@ -316,7 +316,7 @@ var/reverse_mode = 0 proc/loop() if (!active) - SPAWN_DBG(10) loop() + SPAWN_DBG(1 SECOND) loop() return if (prob(1) && prob(50) && ismob(src.loc)) @@ -332,7 +332,7 @@ var/reverse_mode = 0 if (prob(3) && prob(50)) var/obj/o = new/obj/spook( get_turf(src) ) - SPAWN_DBG(600) qdel(o) + SPAWN_DBG(1 MINUTE) qdel(o) if (prob(25)) for(var/obj/storage/L in range(6, get_turf(src))) @@ -343,11 +343,11 @@ var/reverse_mode = 0 for(var/obj/stool/chair/L in range(6, get_turf(src))) if (prob(15)) L.rotate() - SPAWN_DBG(10) loop() + SPAWN_DBG(1 SECOND) loop() return pickup(var/mob/living/M) - SPAWN_DBG(600) active = 1 + SPAWN_DBG(1 MINUTE) active = 1 attack_self(var/mob/user) if (user != loc) @@ -381,7 +381,7 @@ var/reverse_mode = 0 var/datum/mind/M = user.mind if (M) //Why would this happen? Why wouldn't it happen? M.transfer_to(O) - SPAWN_DBG(600) + SPAWN_DBG(1 MINUTE) if (M && oldmob) var/mob/newmob = M.current M.transfer_to(oldmob) @@ -396,20 +396,20 @@ var/reverse_mode = 0 boutput(user, "You can feel the power of the relic coursing through you...") user:TakeDamage("chest", 0, 50) user.bioHolder.AddEffect("telekinesis") - SPAWN_DBG(1200) + SPAWN_DBG(2 MINUTES) using = 0 user.bioHolder.RemoveEffect("telekinesis") if ("Use the relic's power to heal your wounds") var/obj/shield/s = new/obj/shield( get_turf(src) ) s.name = "energy" SPAWN_DBG(13) qdel(s) - user.changeStatus("stunned", 1 SECONDS) + user.changeStatus("stunned", 1 SECOND) user.take_toxin_damage(-INFINITY) user:HealDamage("All", 1000, 1000) if (prob(75)) boutput(user, "The relic crumbles into nothingness...") qdel(src) - SPAWN_DBG(600) using = 0 + SPAWN_DBG(1 MINUTE) using = 0 if ("Attempt to absorb the relic's power") if (prob(1)) user.bioHolder.AddEffect("telekinesis", 0, 0, 1) //because really @@ -580,7 +580,7 @@ var/reverse_mode = 0 boutput(O, "[my_target] stumbles around.") /obj/fake_attacker/New(location, target) - SPAWN_DBG(300) qdel(src) + SPAWN_DBG(30 SECONDS) qdel(src) src.my_target = target step_away(src,my_target,2) process() @@ -614,14 +614,14 @@ var/reverse_mode = 0 fake_blood(my_target) if (prob(15)) step_away(src,my_target,2) - SPAWN_DBG(5) .() + SPAWN_DBG(5 DECI SECONDS) .() /proc/fake_blood(var/mob/target) var/obj/overlay/O = new/obj/overlay(target.loc) O.name = "blood" var/image/I = image('icons/effects/blood.dmi',O,"floor[rand(1,7)]",O.dir,1) target << I - SPAWN_DBG(300) + SPAWN_DBG(30 SECONDS) qdel(O) return diff --git a/code/WorkInProgress/racing.dm b/code/WorkInProgress/racing.dm index d056ede..0893b18 100644 --- a/code/WorkInProgress/racing.dm +++ b/code/WorkInProgress/racing.dm @@ -30,7 +30,7 @@ R.speed = R.base_speed - R.turbo R.drive(R.dir, R.speed) R.overlays += image('icons/mob/robots.dmi', "up-speed") - SPAWN_DBG(15) + SPAWN_DBG(1.5 SECONDS) R.speed = R.base_speed if (R.driving) R.drive(R.dir, 2) R.overlays -= image('icons/mob/robots.dmi', "up-speed") @@ -79,7 +79,7 @@ src.set_loc(spawnloc) src.dir = spawndir source_car = sourcecar - SPAWN_DBG(75) + SPAWN_DBG(7.5 SECONDS) playsound(src, "sound/mksounds/itemdestroy.ogg",45, 0) qdel(src) move_process() @@ -95,7 +95,7 @@ if (src.qdeled || src.pooled) return step(src,dir) - SPAWN_DBG(1) move_process() + SPAWN_DBG(1 DECI SECOND) move_process() /obj/super_racing_butt/ name = "superbutt" @@ -110,7 +110,7 @@ src.set_loc(spawnloc) src.dir = spawndir source_car = sourcecar - SPAWN_DBG(75) + SPAWN_DBG(7.5 SECONDS) playsound(src, "sound/mksounds/itemdestroy.ogg",45, 0) qdel(src) move_process() @@ -135,10 +135,10 @@ if(target) step_towards(src,target) - SPAWN_DBG(1) move_process() + SPAWN_DBG(1 DECI SECOND) move_process() else step(src, src.dir) - SPAWN_DBG(1) move_process() + SPAWN_DBG(1 DECI SECOND) move_process() /obj/racing_trap_banana/ name = "banana peel" @@ -446,14 +446,14 @@ // if(istype(src,/obj/racing_clowncar)) //what the fuck? src is a power up, why would it be a clown car icon_state = "clowncar_boost" - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) speed = base_speed if (driving) drive(dir, speed) icon_state = "clowncar" // else // R.overlays += image('icons/mob/robots.dmi', "up-speed") -// SPAWN_DBG(50) +// SPAWN_DBG(5 SECONDS) // R.speed = R.base_speed // if (R.driving) R.drive(R.dir, 2) // R.overlays -= image('icons/mob/robots.dmi', "up-speed") diff --git a/code/WorkInProgress/recycling/conveyor.dm b/code/WorkInProgress/recycling/conveyor.dm index 17c57a0..0a60d51 100644 --- a/code/WorkInProgress/recycling/conveyor.dm +++ b/code/WorkInProgress/recycling/conveyor.dm @@ -325,7 +325,7 @@ if(SOUTHWEST) divert_to = SOUTH divert_from = WEST - SPAWN_DBG(2) + SPAWN_DBG(2 DECI SECONDS) // wait for map load then find the conveyor in this turf conv = locate() in src.loc if(conv) // divert_from dir must match possible conveyor movement @@ -426,7 +426,7 @@ conveyor_switches += src update() - SPAWN_DBG(5) // allow map load + SPAWN_DBG(5 DECI SECONDS) // allow map load conveyors = list() for(var/obj/machinery/conveyor/C in machines) if(C.id == id) diff --git a/code/WorkInProgress/recycling/disposal.dm b/code/WorkInProgress/recycling/disposal.dm index 168c3fa..4c955be 100644 --- a/code/WorkInProgress/recycling/disposal.dm +++ b/code/WorkInProgress/recycling/disposal.dm @@ -70,7 +70,7 @@ loc = D.trunk active = 1 dir = DOWN - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) process() // spawn off the movement process return @@ -285,7 +285,7 @@ for(var/atom/movable/AM in H) AM.set_loc(T) AM.pipe_eject(direction) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) if(AM) AM.throw_at(target, 100, 1) H.vent_gas(T) @@ -299,7 +299,7 @@ AM.set_loc(T) AM.pipe_eject(0) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) if(AM) AM.throw_at(target, 5, 1) LAGCHECK(LAG_REALTIME) @@ -341,7 +341,7 @@ // otherswise, do normal expel from turf expel(H, T, 0) - SPAWN_DBG(2) // delete pipe after 2 ticks to ensure expel proc finished + SPAWN_DBG(2 DECI SECONDS) // delete pipe after 2 ticks to ensure expel proc finished qdel(src) @@ -1259,7 +1259,7 @@ bioHolder.active = 1 bioHolder.dir = biodir - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) bioHolder.process() return nonBioPipe @@ -1319,7 +1319,7 @@ for(var/atom/movable/AM in H) AM.set_loc(src.loc) AM.pipe_eject(dir) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) AM.throw_at(stuff_chucking_target, 3, 1) H.vent_gas(src.loc) pool(H) @@ -1390,7 +1390,7 @@ for (var/atom/movable/AM in things_to_dump) AM.set_loc(src.loc) AM.pipe_eject(dir) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) AM.throw_at(stuff_chucking_target, 3, 1) if (H.contents.len < 1) H.vent_gas(src.loc) @@ -1600,7 +1600,7 @@ New() ..() dpdir = dir - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) getlinked() update() @@ -1718,9 +1718,9 @@ New() ..() - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) target = get_ranged_target_turf(src, dir, 10) - SPAWN_DBG(8) + SPAWN_DBG(8 DECI SECONDS) if(radio_controller) radio_connection = radio_controller.add_object(src, "[frequency]") if(!src.net_id) @@ -1776,7 +1776,7 @@ for(var/atom/movable/AM in H) AM.set_loc(src.loc) AM.pipe_eject(dir) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) AM.throw_at(target, 3, 1) LAGCHECK(LAG_REALTIME) H.vent_gas(src.loc) @@ -1857,7 +1857,7 @@ for(var/atom/movable/AM in H) AM.set_loc(src.loc) AM.pipe_eject(dir) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) AM.throw_at(target, 10, 10) //This is literally the only thing that was changed in this, otherwise it booted them way too close. LAGCHECK(LAG_REALTIME) H.vent_gas(src.loc) diff --git a/code/WorkInProgress/recycling/disposal_chute.dm b/code/WorkInProgress/recycling/disposal_chute.dm index 750ae1c..ad5c569 100644 --- a/code/WorkInProgress/recycling/disposal_chute.dm +++ b/code/WorkInProgress/recycling/disposal_chute.dm @@ -33,7 +33,7 @@ // find the attached trunk (if present) and init gas resvr. New() ..() - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) if (src) trunk = locate() in src.loc if(!trunk) @@ -226,7 +226,7 @@ proc/go_out(mob/user) user.set_loc(src.loc) if (!user.hasStatus("weakened")) - user.changeStatus("weakened", 1 SECONDS) + user.changeStatus("weakened", 1 SECOND) user.force_laydown_standup() update() return @@ -504,7 +504,7 @@ AM.set_loc(src.loc) AM.pipe_eject(0) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) if(AM) AM.throw_at(target, 5, 1) @@ -526,7 +526,7 @@ if (user) //ZeWaka: Fix for null.loc make_cleanable( /obj/decal/cleanable/blood,user.loc) user.updatehealth() - SPAWN_DBG(500) + SPAWN_DBG(50 SECONDS) if (user && !isdead(user)) user.suiciding = 0 return 1 @@ -607,7 +607,7 @@ New() ..() - SPAWN_DBG(8) + SPAWN_DBG(8 DECI SECONDS) if(radio_controller) radio_connection = radio_controller.add_object(src, "[frequency]") if(!src.net_id) diff --git a/code/WorkInProgress/recycling/mail_chute.dm b/code/WorkInProgress/recycling/mail_chute.dm index 612d287..30b320b 100644 --- a/code/WorkInProgress/recycling/mail_chute.dm +++ b/code/WorkInProgress/recycling/mail_chute.dm @@ -25,7 +25,7 @@ if (src.autoname == 1 && !isnull(src.mail_tag)) src.name = "mail chute ([src.mail_tag])" - SPAWN_DBG(100) + SPAWN_DBG(10 SECONDS) if (src) if (radio_controller) radio_connection = radio_controller.add_object(src, "[frequency]") @@ -116,7 +116,7 @@ signal.transmission_method = TRANSMISSION_RADIO signal.data["command"] = "mail_inquire" - SPAWN_DBG(4) + SPAWN_DBG(4 DECI SECONDS) if (radio_connection) radio_connection.post_signal(src, signal) if(href_list["handle"]) diff --git a/code/WorkInProgress/recycling/scrap.dm b/code/WorkInProgress/recycling/scrap.dm index 1e2bf7a..edc5a2b 100644 --- a/code/WorkInProgress/recycling/scrap.dm +++ b/code/WorkInProgress/recycling/scrap.dm @@ -245,7 +245,7 @@ // when dropped, try to make a pile if scrap is already there /obj/item/scrap/dropped() - SPAWN_DBG(2) // delay to allow drop postprocessing (since src may be destroyed) + SPAWN_DBG(2 DECI SECONDS) // delay to allow drop postprocessing (since src may be destroyed) for(var/obj/item/scrap/S in oview(0,src)) // excludes src itself S.add_scrap(src) diff --git a/code/WorkInProgress/rewardsLocker.dm b/code/WorkInProgress/rewardsLocker.dm index 1636bed..dbd0fe3 100644 --- a/code/WorkInProgress/rewardsLocker.dm +++ b/code/WorkInProgress/rewardsLocker.dm @@ -623,7 +623,7 @@ animate_emote(usr, /obj/effect/smug) usr.verbs -= /proc/smugproc usr.verbs += /proc/smugprocCD - SPAWN_DBG(300) + SPAWN_DBG(30 SECONDS) boutput(usr, "You can now be smug again! Go hog wild.") usr.verbs += /proc/smugproc usr.verbs -= /proc/smugprocCD diff --git a/code/WorkInProgress/silo.dm b/code/WorkInProgress/silo.dm index d9005d7..5b14b21 100644 --- a/code/WorkInProgress/silo.dm +++ b/code/WorkInProgress/silo.dm @@ -45,7 +45,7 @@ HasEntered(atom/movable/A) if (ismob(A)) src.collapsing++ - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) collapse_timer() if (src.collapsing) playsound(src.loc, 'sound/effects/creaking_metal1.ogg', 25, 1) @@ -65,5 +65,5 @@ qdel(src) if (src.collapsing) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src.collapse_timer() diff --git a/code/WorkInProgress/simroom.dm b/code/WorkInProgress/simroom.dm index 6988fd8..a3a18dd 100644 --- a/code/WorkInProgress/simroom.dm +++ b/code/WorkInProgress/simroom.dm @@ -17,7 +17,7 @@ /* /obj/machinery/sim/transmitter/New() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) Connect() ..() */ diff --git a/code/WorkInProgress/sniper.dm b/code/WorkInProgress/sniper.dm index 3bbcabe..b4f1989 100644 --- a/code/WorkInProgress/sniper.dm +++ b/code/WorkInProgress/sniper.dm @@ -23,7 +23,7 @@ /proc/start_hallucinating(var/mob/M) for(var/turf/T in world) if(prob(4) && istype(T)) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) explosion(src, T, 3, 1) */ diff --git a/code/WorkInProgress/telescope/quantumTelescope.dm b/code/WorkInProgress/telescope/quantumTelescope.dm index 8787659..c5a2a2b 100644 --- a/code/WorkInProgress/telescope/quantumTelescope.dm +++ b/code/WorkInProgress/telescope/quantumTelescope.dm @@ -51,7 +51,7 @@ TODO: Enforce ping rate limit here as well in case someone futzes with the javas onclose(user, "telescope", src) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) callJsFunc(user, "setRef", list("\ref[src]")) //This is shit but without it, it calls the JS before the window is open and doesn't work. (Is this still true?!?!) rebuildEventList(user) callJsFunc(using, "showFooterMsg", list("Left-Click: Ping , Right-Click: Clear map")) diff --git a/code/WorkInProgress/telescope/telescopeMisc.dm b/code/WorkInProgress/telescope/telescopeMisc.dm index 1e6619d..8ae9c4f 100644 --- a/code/WorkInProgress/telescope/telescopeMisc.dm +++ b/code/WorkInProgress/telescope/telescopeMisc.dm @@ -71,7 +71,7 @@ var/list/magnet_locations = list() if(ismob(M)) var/mob/O = M O.changeStatus("stunned", 2 SECONDS) - SPAWN_DBG(6) M.set_loc(target) + SPAWN_DBG(6 DECI SECONDS) M.set_loc(target) SPAWN_DBG(10) busy = 0 if(href_list["recieve"]) @@ -87,7 +87,7 @@ var/list/magnet_locations = list() if(ismob(M)) var/mob/O = M O.changeStatus("stunned", 2 SECONDS) - SPAWN_DBG(6) M.set_loc(src.loc) + SPAWN_DBG(6 DECI SECONDS) M.set_loc(src.loc) SPAWN_DBG(10) busy = 0 ////////////////////////////////////////////////// @@ -207,7 +207,7 @@ var/list/magnet_locations = list() if(prob(20) && alive) src.visible_message("[src] begins to reassemble!") var/turf/T = src.loc - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) new/obj/critter/gunbot/drone/buzzdrone/naniteswarm(T) if(src) qdel(src) diff --git a/code/WorkInProgress/torpedoes.dm b/code/WorkInProgress/torpedoes.dm index 64dd9bf..11c2d1b 100644 --- a/code/WorkInProgress/torpedoes.dm +++ b/code/WorkInProgress/torpedoes.dm @@ -64,7 +64,7 @@ R.add_reagent("sarin", 50) smoke_reaction(R, 7, get_turf(src)) qdel(src) - SPAWN_DBG(300) qdel(R) + SPAWN_DBG(30 SECONDS) qdel(R) return /obj/machinery/torpedo_tube/syndicate @@ -248,7 +248,7 @@ tube.pixel_y = 16 underlays.Add(tube) - SPAWN_DBG(10) //You might wonder what is going on here. IF I DON'T SPAWN THIS THE DIRECTION IS NOT SET IS WHAT'S GOING ON HERE. + SPAWN_DBG(1 SECOND) //You might wonder what is going on here. IF I DON'T SPAWN THIS THE DIRECTION IS NOT SET IS WHAT'S GOING ON HERE. dir = NORTH rebuildOverlays() diff --git a/code/WorkInProgress/tug.dm b/code/WorkInProgress/tug.dm index 26bc879..9c73791 100644 --- a/code/WorkInProgress/tug.dm +++ b/code/WorkInProgress/tug.dm @@ -80,7 +80,7 @@ if (istype(crate)) crate.close() C.set_loc(src.loc) - SPAWN_DBG(2) + SPAWN_DBG(2 DECI SECONDS) if (C && C.loc == src.loc) C.set_loc(src) load = C @@ -99,7 +99,7 @@ load.layer = initial(load.layer) load.set_loc(src.loc) if (T) - SPAWN_DBG(2) + SPAWN_DBG(2 DECI SECONDS) if (load) load.set_loc(T) load = null diff --git a/code/WorkInProgress/ud5/urs_dungeon.dm b/code/WorkInProgress/ud5/urs_dungeon.dm index 7fa2cb6..a9bfe94 100644 --- a/code/WorkInProgress/ud5/urs_dungeon.dm +++ b/code/WorkInProgress/ud5/urs_dungeon.dm @@ -12,9 +12,9 @@ New() ..() - spawn(1) + spawn(1 DECI SECOND) src.link_elements() - spawn(10) + spawn(1 SECOND) qdel(src) proc/link_elements() @@ -144,7 +144,7 @@ New() ..() if(start_on) - spawn(10) + spawn(1 SECOND) src.trigger("on") trigger_actions() @@ -180,7 +180,7 @@ #if ASS_JAM New() ..() - spawn(1) + spawn(1 DECI SECOND) for(var/obj/adventurepuzzle/invisible/target_link/T) if (T.id == "UD-LANDING-ZONE") target = get_turf(T) @@ -189,7 +189,7 @@ equipped(var/mob/user, var/slot) var/mob/living/carbon/human/H = user if(istype(H) && slot == "eyes") - spawn(10) + spawn(1 SECOND) enter_urs_dungeon(user) return @@ -233,7 +233,7 @@ equipped(var/mob/user, var/slot) var/mob/living/carbon/human/H = user if(istype(H) && slot == "eyes") - spawn(10) + spawn(1 SECOND) exit_urs_dungeon(user) return diff --git a/code/WorkInProgress/warcrimes.dm b/code/WorkInProgress/warcrimes.dm index 490cc44..6f4465a 100644 --- a/code/WorkInProgress/warcrimes.dm +++ b/code/WorkInProgress/warcrimes.dm @@ -263,7 +263,7 @@ area/adventure/urs_dungeon/john_talk = list("This place smells like my bro.","Hu bioHolder.mobAppearance.underwear = "briefs" bioHolder.mobAppearance.u_color = "#996633" - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) bioHolder.mobAppearance.UpdateMob() src.equip_if_possible(new /obj/item/clothing/shoes/thong(src), slot_shoes) @@ -455,7 +455,7 @@ area/adventure/urs_dungeon/john_talk = list("This place smells like my bro.","Hu say("I think my [pick(JOHN_friends)] [pick(JOHN_friendActions)].") if (prob(25) && shittybills.len > 0) - SPAWN_DBG(35) + SPAWN_DBG(3.5 SECONDS) var/mob/living/carbon/human/biker/MB = pick(shittybills) switch (speech_type) if (4) @@ -482,7 +482,7 @@ area/adventure/urs_dungeon/john_talk = list("This place smells like my bro.","Hu attackby(obj/item/W, mob/M) if (istype(W, /obj/item/paper/tug/invoice)) boutput(M, "You show [W] to [src] ") - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) say("One of them [pick(JOHN_people)] folks from the station helped us raise the cash. Lil bro been dreamin bout it fer years.") return if (istype(W, /obj/item/reagent_containers/food/snacks) || (istype(W, /obj/item/clothing/mask/cigarette/cigarillo) && !gotsmokes)) @@ -493,7 +493,7 @@ area/adventure/urs_dungeon/john_talk = list("This place smells like my bro.","Hu src.drop_item() src.put_in_hand_or_drop(W) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) say("Oh? [W] eh?") say(pick("No kiddin' fer me?","I guess I could go fer a quick one yeah!","Oh dang dang dang! Haven't had one of these babies in a while!","Well I never get tired of those!","You're offering this to me? Don't mind if i do, [pick(JOHN_people)]")) src.a_intent = INTENT_HELP // pacify a juicer with food, obviously @@ -657,7 +657,7 @@ var/bombini_saved = 0 for(var/obj/machinery/computer/shuttle_bus/embedded/B in machines) T = get_turf(B) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) playsound(T, "sound/effects/ship_charge.ogg", 60, 1) sleep(30) playsound(T, "sound/machines/weaponoverload.ogg", 60, 1) @@ -682,7 +682,7 @@ var/bombini_saved = 0 shake_camera(M, 10, 4) T = get_turf(src) - SPAWN_DBG(250) + SPAWN_DBG(25 SECONDS) playsound(T, "sound/effects/flameswoosh.ogg", 70, 1) call_shuttle() diff --git a/code/WorkInProgress/wizardset.dm b/code/WorkInProgress/wizardset.dm index 373b3cb..9fd9a6e 100644 --- a/code/WorkInProgress/wizardset.dm +++ b/code/WorkInProgress/wizardset.dm @@ -194,7 +194,7 @@ var/global/datum/wizard_zone_controller/wizard_zone_controller src.RL_SetOpacity(1) src.set_density(1) flick("wizard_false_wall_closing", src) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src.icon_state = "wizard_false_wall" src.opening = 0 @@ -206,7 +206,7 @@ var/global/datum/wizard_zone_controller/wizard_zone_controller src.opening = 1 flick("wizard_false_wall_opening", src) src.icon_state = "wizard_floor" - SPAWN_DBG(12) + SPAWN_DBG(1.2 SECONDS) src.set_density(0) src.opening = 0 src.RL_SetOpacity(0) diff --git a/code/WorkInProgress/zamujasa.dm b/code/WorkInProgress/zamujasa.dm index 8a0a0db..75e8d5b 100644 --- a/code/WorkInProgress/zamujasa.dm +++ b/code/WorkInProgress/zamujasa.dm @@ -365,7 +365,7 @@ var/active = 0 New() - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) gunsim = locate() in world attack_hand(mob/user as mob) diff --git a/code/_plane.dm b/code/_plane.dm index 49d4a7f..d3d34a9 100644 --- a/code/_plane.dm +++ b/code/_plane.dm @@ -1,5 +1,8 @@ #define PLANE_FLOOR -10 +#define PLANE_NOSHADOW_BELOW -1 #define PLANE_DEFAULT 0 +#define PLANE_NOSHADOW_ABOVE 1 +#define PLANE_HIDDENGAME 2 #define PLANE_LIGHTING 10 #define PLANE_SELFILLUM 20 #define PLANE_AICAMERA 22 diff --git a/code/_vox.dm b/code/_vox.dm index 295c2aa..a705d38 100644 --- a/code/_vox.dm +++ b/code/_vox.dm @@ -21,7 +21,7 @@ var/flags New(var/id, var/file, var/flags) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) src.id = id src.ogg = file(file) src.flags = flags diff --git a/code/area.dm b/code/area.dm index 76a589c..50592aa 100644 --- a/code/area.dm +++ b/code/area.dm @@ -167,7 +167,7 @@ var/mob/M = A if (M.client) if (sound_loop) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) if (M && (get_area(M).sound_group != src.sound_group)) M.client.playAmbience(src, AMBIENCE_LOOPING, 0) //pass 0 to cancel @@ -3067,7 +3067,7 @@ area/station/security/visitation else luminosity = 0 - SPAWN_DBG(15) + SPAWN_DBG(1.5 SECONDS) src.power_change() // all machines set to current power level, also updates lighting icon diff --git a/code/atom.dm b/code/atom.dm index 9e8033a..d1414ad 100644 --- a/code/atom.dm +++ b/code/atom.dm @@ -388,7 +388,7 @@ icon = 'icons/mob/mob.dmi' /atom/movable/overlay/gibs/proc/delaydispose() - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) if (src) dispose(src) diff --git a/code/atom/throwing.dm b/code/atom/throwing.dm index 368f963..f60f839 100644 --- a/code/atom/throwing.dm +++ b/code/atom/throwing.dm @@ -181,7 +181,7 @@ else if(isturf(hit_atom)) var/turf/T = hit_atom if(T.density) - //SPAWN_DBG(2) step(src, turn(src.dir, 180)) + //SPAWN_DBG(2 DECI SECONDS) step(src, turn(src.dir, 180)) if(ismob(src)) src:throw_impacted(hit_atom) /*if(istype(hit_atom, /turf/simulated/wall) && isitem(src)) var/turf/simulated/wall/W = hit_atom diff --git a/code/client.dm b/code/client.dm index 5ac28e3..a9ab210 100644 --- a/code/client.dm +++ b/code/client.dm @@ -491,7 +491,7 @@ /client/proc/checkScreenAspect(list/params) if (params.len) if ((params["screenW"]/params["screenH"]) == (4/3)) - SPAWN_DBG(60) + SPAWN_DBG(6 SECONDS) if(alert(src, "You appear to be using a 4:3 aspect ratio! The Horizontal Split option is reccomended for your display. Activate Horizontal Split?",,"Yes","No") == "Yes") set_splitter_orientation(0) winset( src, "menu", "horiz_split.is-checked=true" ) @@ -1042,7 +1042,7 @@ var/global/curr_day = null /client/verb/set_tg_controls() set hidden = 1 set name = "set-tg-controls" - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) set_controls(!tg_controls) @@ -1077,7 +1077,7 @@ var/global/curr_day = null /client/verb/set_tg_layout() set hidden = 1 set name = "set-tg-layout" - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) set_layout(!tg_layout) /client/verb/set_fps() diff --git a/code/datums/abilities/critter/frenzy.dm b/code/datums/abilities/critter/frenzy.dm index d6c859b..4d20eac 100644 --- a/code/datums/abilities/critter/frenzy.dm +++ b/code/datums/abilities/critter/frenzy.dm @@ -47,7 +47,7 @@ MT.canmove = 0 if (MT.loc) holder.owner.set_loc(MT.loc) - holder.owner.changeStatus("stunned", 1 SECONDS) + holder.owner.changeStatus("stunned", 1 SECOND) if (holder.owner.getStatusDuration("stunned") || holder.owner.getStatusDuration("weakened") || holder.owner.getStatusDuration("paralysis")) break playsound(get_turf(holder.owner), "sound/voice/animal/wendigo_maul.ogg", 80, 1) diff --git a/code/datums/abilities/critter/gibstare.dm b/code/datums/abilities/critter/gibstare.dm index cb73710..2300bef 100644 --- a/code/datums/abilities/critter/gibstare.dm +++ b/code/datums/abilities/critter/gibstare.dm @@ -34,7 +34,7 @@ var/mob/ownerMob = owner playsound(ownerMob.loc, "sound/weapons/phaseroverload.ogg", 100, 1) boutput(target, "You feel a horrible pain in your head!") - target.changeStatus("stunned", 1 SECONDS) + target.changeStatus("stunned", 1 SECOND) onEnd() ..() diff --git a/code/datums/abilities/critter/mark.dm b/code/datums/abilities/critter/mark.dm index 3e1f3d2..3f6ecf9 100644 --- a/code/datums/abilities/critter/mark.dm +++ b/code/datums/abilities/critter/mark.dm @@ -35,7 +35,7 @@ E.marked_target = M // TODO: NOT THIS, THERE MUST BE A BETTER WAY - SPAWN_DBG(600) // 60 second timeout for marks + SPAWN_DBG(1 MINUTE) // 60 second timeout for marks if(E.marked_target && E.marked_target == M) boutput(E, "Our mark on [E.marked_target] has faded.") E.marked_target = null diff --git a/code/datums/abilities/critter/powerkick.dm b/code/datums/abilities/critter/powerkick.dm index 8416b7f..ff2a529 100644 --- a/code/datums/abilities/critter/powerkick.dm +++ b/code/datums/abilities/critter/powerkick.dm @@ -36,8 +36,8 @@ playsound(ow.loc, "sound/impact_sounds/Generic_Hit_Heavy_1.ogg", 40, 1) - ow.changeStatus("stunned", 1 SECONDS) - ow.changeStatus("weakened", 1 SECONDS) + ow.changeStatus("stunned", 1 SECOND) + ow.changeStatus("weakened", 1 SECOND) switch (ow.smash_through(O, list("window", "grille", "table"), 0)) if (0) @@ -80,14 +80,14 @@ random_brute_damage(target, 10) playsound(M.loc, "swing_hit", 60, 1) - ow.changeStatus("stunned", 1 SECONDS) - ow.changeStatus("weakened", 1 SECONDS) + ow.changeStatus("stunned", 1 SECOND) + ow.changeStatus("weakened", 1 SECOND) var/turf/T = get_edge_target_turf(M, get_dir(M, get_step_away(target, M))) if (T && isturf(T)) SPAWN_DBG(0) M.throw_at(T, 5, 2) - M.changeStatus("stunned", 1 SECONDS) + M.changeStatus("stunned", 1 SECOND) logTheThing("combat", M, target, "uses Power Kick on %target% at [log_loc(M)].") return 0 diff --git a/code/datums/abilities/critter/singularity.dm b/code/datums/abilities/critter/singularity.dm index 627cedb..607edcb 100644 --- a/code/datums/abilities/critter/singularity.dm +++ b/code/datums/abilities/critter/singularity.dm @@ -112,7 +112,7 @@ holder.owner.show_message("You emit a wave of radiation!") for(var/mob/living/L in orange(7, holder.owner)) - L.changeStatus("radiation", 1 SECONDS) + L.changeStatus("radiation", 1 SECOND) L.updatehealth() L.show_text("You feel odd.", "red") diff --git a/code/datums/abilities/critter/slam.dm b/code/datums/abilities/critter/slam.dm index fefed0d..6902e9d 100644 --- a/code/datums/abilities/critter/slam.dm +++ b/code/datums/abilities/critter/slam.dm @@ -50,7 +50,7 @@ dummy.pixel_y = O.pixel_y dummy.dir = O.dir animate(dummy, alpha=0, time=3) - SPAWN_DBG(3) + SPAWN_DBG(3 DECI SECONDS) qdel(dummy) on_hit(atom/hit, angle, var/obj/projectile/O) @@ -75,7 +75,7 @@ var/kbdir = angle_to_dir(angle) step(H, kbdir, 2) if (prob(10)) - SPAWN_DBG(2) + SPAWN_DBG(2 DECI SECONDS) step(H, kbdir, 2) else if (ismob(hit)) var/mob/M = hit diff --git a/code/datums/abilities/critter/small_animal.dm b/code/datums/abilities/critter/small_animal.dm index 44fb235..28da56b 100644 --- a/code/datums/abilities/critter/small_animal.dm +++ b/code/datums/abilities/critter/small_animal.dm @@ -223,6 +223,6 @@ D.anchored = 1 D.layer = EFFECTS_LAYER_2 holder.owner.attached_objs += D - SPAWN_DBG(40) + SPAWN_DBG(4 SECONDS) qdel(D) diff --git a/code/datums/abilities/critter/spider.dm b/code/datums/abilities/critter/spider.dm index be94913..b435a8e 100644 --- a/code/datums/abilities/critter/spider.dm +++ b/code/datums/abilities/critter/spider.dm @@ -93,7 +93,7 @@ MT.canmove = 0 if (MT.loc) holder.owner.set_loc(MT.loc) - holder.owner.changeStatus("stunned", 1 SECONDS) + holder.owner.changeStatus("stunned", 1 SECOND) if (holder.owner.getStatusDuration("stunned") || holder.owner.getStatusDuration("weakened") || holder.owner.getStatusDuration("paralysis")) break if (istype(S)) @@ -168,7 +168,7 @@ while (drain > 0 && H && H.stat && !H.disposed) if (H.loc && holder.owner.loc != H.loc) break - holder.owner.changeStatus("stunned", 1 SECONDS) + holder.owner.changeStatus("stunned", 1 SECOND) if (holder.owner.getStatusDuration("stunned") || holder.owner.getStatusDuration("weakened") || holder.owner.getStatusDuration("paralysis")) break holder.owner.HealDamage("All", 1, 1) @@ -311,7 +311,7 @@ MT.canmove = 0 if (MT.loc) holder.owner.set_loc(MT.loc) - holder.owner.changeStatus("stunned", 1 SECONDS) + holder.owner.changeStatus("stunned", 1 SECOND) if (holder.owner.getStatusDuration("stunned") || holder.owner.getStatusDuration("weakened") || holder.owner.getStatusDuration("paralysis")) break playsound(get_turf(holder.owner), "sound/impact_sounds/flesh_break_1.ogg", 50, 1) @@ -349,7 +349,7 @@ cast(atom/T) var/obj/item/reagent_containers/food/snacks/ingredient/egg/critter/clown/ammo = new(holder.owner.loc) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) ammo.throw_at(T, 32, 2) doCooldown() diff --git a/code/datums/abilities/flock/flockmind.dm b/code/datums/abilities/flock/flockmind.dm index cd767e6..d6cad3a 100644 --- a/code/datums/abilities/flock/flockmind.dm +++ b/code/datums/abilities/flock/flockmind.dm @@ -156,14 +156,14 @@ if(..()) return 1 if(!istype(target)) - return 1 + return 1 // sanity check: don't remove our last complex drone var/mob/living/intangible/flock/flockmind/F = holder.owner if(F && F.flock) if(F.flock.getComplexDroneCount() == 1) - boutput(holder.owner, "That's your last complex drone. Diffracting it would be suicide.") + boutput(holder.owner, "That's your last complex drone. Diffracting it would be suicide.") return 1 - boutput(holder.owner, "You diffract the drone.") + boutput(holder.owner, "You diffract the drone.") target.split_into_bits() @@ -189,7 +189,7 @@ sleep(15) for(var/obj/machinery/door/airlock/A in targets) // open the door - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) A.open() else boutput(holder.owner, "No targets in range that can be opened via radio.") diff --git a/code/datums/abilities/kudzumen.dm b/code/datums/abilities/kudzumen.dm index 25ee128..daae3c0 100644 --- a/code/datums/abilities/kudzumen.dm +++ b/code/datums/abilities/kudzumen.dm @@ -166,10 +166,10 @@ icon_state = "guide" targeted = 1 target_anything = 1 - cooldown = 1 SECONDS + cooldown = 1 SECOND pointCost = 2 max_range = 2 - + cast(atom/tar) var/turf/T = get_turf(tar) if (isturf(T)) @@ -276,7 +276,7 @@ C.take_toxin_damage(-25) C.take_oxygen_deprivation(-25) C.take_brain_damage(-25) - C.remove_ailments() + C.remove_ailments() //Transfer nutrients to our brethren. var/mob/living/carbon/human/H = target if (istype(H) && istype(H.mutantrace, /datum/mutantrace/kudzu) && istype(H.abilityHolder, /datum/abilityHolder/kudzu)) diff --git a/code/datums/abilities/revenant.dm b/code/datums/abilities/revenant.dm index c64021d..ab9c25a 100644 --- a/code/datums/abilities/revenant.dm +++ b/code/datums/abilities/revenant.dm @@ -302,7 +302,7 @@ current_prob *= 0.75 thrown += O animate_float(O) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) for (var/obj/O in thrown) O.throw_at(target, 32, 2) @@ -325,7 +325,7 @@ if (M != holder.owner && !M.traitHolder.hasTrait("training_chaplain") && !check_target_immunity(M)) M.changeStatus("weakened", 2 SECONDS) animate_revenant_shockwave(T, 1, 3) - SPAWN_DBG(3) + SPAWN_DBG(3 DECI SECONDS) for (var/mob/living/carbon/human/M in T) if (M != holder.owner && !M.traitHolder.hasTrait("training_chaplain") && !check_target_immunity(M)) M.changeStatus("weakened", 6 SECONDS) @@ -342,7 +342,7 @@ T:to_plating() else T:break_tile() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) T.pixel_y = 0 T.transform = null @@ -484,7 +484,7 @@ if (!RH || !istype(RH, /datum/abilityHolder/revenant/)) return - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) var/iterations = 0 while (holder.owner.loc == location && isalive(holder.owner) && !holder.owner.equipped()) iterations++ diff --git a/code/datums/abilities/vampire/glare.dm b/code/datums/abilities/vampire/glare.dm index 4b603a2..20cd276 100644 --- a/code/datums/abilities/vampire/glare.dm +++ b/code/datums/abilities/vampire/glare.dm @@ -43,7 +43,7 @@ E.setup(M.loc) playsound(M.loc,"sound/effects/glare.ogg", 50, 1, pitch = 1, extrarange = -4) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) var/obj/itemspecialeffect/glare/EE = unpool(/obj/itemspecialeffect/glare) EE.color = "#FFFFFF" EE.setup(target.loc) diff --git a/code/datums/abilities/vampire/screech.dm b/code/datums/abilities/vampire/screech.dm index e367245..40d034a 100644 --- a/code/datums/abilities/vampire/screech.dm +++ b/code/datums/abilities/vampire/screech.dm @@ -37,7 +37,7 @@ if (level == 2) //add effect - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) var/obj/itemspecialeffect/screech/EE = unpool(/obj/itemspecialeffect/screech) EE.color = "#AAAAFF" EE.setup(M.loc) @@ -52,7 +52,7 @@ if (i > 20) break else - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) var/obj/itemspecialeffect/screech/EE = unpool(/obj/itemspecialeffect/screech) EE.color = "#FFFFFF" EE.setup(M.loc) diff --git a/code/datums/abilities/vampire/vampire_bite.dm b/code/datums/abilities/vampire/vampire_bite.dm index bfb52b8..3a50efb 100644 --- a/code/datums/abilities/vampire/vampire_bite.dm +++ b/code/datums/abilities/vampire/vampire_bite.dm @@ -146,7 +146,7 @@ HH.changeStatus("paralysis", 100) else if (prob(65)) - HH.changeStatus("weakened", 1 SECONDS) + HH.changeStatus("weakened", 1 SECOND) HH.stuttering = min(HH.stuttering + 3, 10) if (istype(H)) H.blood_tracking_output() diff --git a/code/datums/abilities/werewolf.dm b/code/datums/abilities/werewolf.dm index 88aae05..cf725b3 100644 --- a/code/datums/abilities/werewolf.dm +++ b/code/datums/abilities/werewolf.dm @@ -40,7 +40,7 @@ if (!src.getStatusDuration("weakened") && !src.getStatusDuration("paralysis")) boutput(src, "You suddenly feel very weak.") src.emote("collapse") - SPAWN_DBG(80) + SPAWN_DBG(8 SECONDS) if (!src.getStatusDuration("weakened")) src.emote("collapse") boutput(src, "Your body feels as if it's on fire! You think it's... IT'S CHANGING! You should probably get somewhere private!") diff --git a/code/datums/abilities/werewolf/werewolf_defense.dm b/code/datums/abilities/werewolf/werewolf_defense.dm index 8069c05..02f11f7 100644 --- a/code/datums/abilities/werewolf/werewolf_defense.dm +++ b/code/datums/abilities/werewolf/werewolf_defense.dm @@ -47,7 +47,7 @@ H.delStatus("burning") H.visible_message("[H] deafening howl completely extinguishes the fire on it!") - //SPAWN_DBG(80) + //SPAWN_DBG(8 SECONDS) // playsound(H.loc, 'sound/voice/animal/werewolf_howl.ogg', 70, 1, 0, 0.7) H.stance = "defensive" diff --git a/code/datums/abilities/wizard/blind.dm b/code/datums/abilities/wizard/blind.dm index 5e6fa97..cb1f50d 100644 --- a/code/datums/abilities/wizard/blind.dm +++ b/code/datums/abilities/wizard/blind.dm @@ -38,7 +38,7 @@ B.set_density(0) B.layer = MOB_EFFECT_LAYER target.canmove = 0 - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) qdel(B) target.canmove = 1 boutput(target, "Your eyes cry out in pain!") @@ -57,13 +57,13 @@ target.changeStatus("weakened", 2 SECONDS) if (!blindProtected) target.bioHolder.AddEffect("bad_eyesight") - SPAWN_DBG(450) + SPAWN_DBG(45 SECONDS) if (target) target.bioHolder.RemoveEffect("bad_eyesight") target.take_eye_damage(blindProtected ? 5 : 10, 1) target.change_eye_blurry(blindProtected ? 10 : 20) else boutput(holder.owner, "Your spell doesn't last as long without a staff to focus it!") - target.changeStatus("weakened", 1 SECONDS) + target.changeStatus("weakened", 1 SECOND) if (!blindProtected) target.bioHolder.AddEffect("bad_eyesight") SPAWN_DBG(300) diff --git a/code/datums/abilities/wizard/doppelganger.dm b/code/datums/abilities/wizard/doppelganger.dm index a7c80ce..4a97824 100644 --- a/code/datums/abilities/wizard/doppelganger.dm +++ b/code/datums/abilities/wizard/doppelganger.dm @@ -50,7 +50,7 @@ step(P, the_dir) sleep(2) - SPAWN_DBG(100) + SPAWN_DBG(10 SECONDS) holder.owner.set_loc(D.loc) qdel(D) qdel(P) @@ -94,4 +94,4 @@ src.x-- src.can_move = 0 - SPAWN_DBG(2) src.can_move = 1 + SPAWN_DBG(2 DECI SECONDS) src.can_move = 1 diff --git a/code/datums/abilities/wizard/forcewall.dm b/code/datums/abilities/wizard/forcewall.dm index a8335a0..dd3f70d 100644 --- a/code/datums/abilities/wizard/forcewall.dm +++ b/code/datums/abilities/wizard/forcewall.dm @@ -37,7 +37,7 @@ if (holder.owner.wizard_spellpower()) forcefield4 = new /obj/forcefield(locate(holder.owner.x,holder.owner.y + 2,holder.owner.z)) if (holder.owner.wizard_spellpower()) forcefield5 = new /obj/forcefield(locate(holder.owner.x,holder.owner.y - 2,holder.owner.z)) - SPAWN_DBG(300) + SPAWN_DBG(30 SECONDS) qdel(forcefield1) qdel(forcefield2) qdel(forcefield3) diff --git a/code/datums/abilities/wizard/iceburst.dm b/code/datums/abilities/wizard/iceburst.dm index 93cab88..fe59b58 100644 --- a/code/datums/abilities/wizard/iceburst.dm +++ b/code/datums/abilities/wizard/iceburst.dm @@ -63,7 +63,7 @@ var/obj/decal/icefloor/B = new /obj/decal/icefloor(A.loc) //B.sd_SetLuminosity(1) //B.sd_SetColor(0, 0.1, 0.8) - SPAWN_DBG(200) + SPAWN_DBG(20 SECONDS) qdel (B) step_to(A,M,0) if (get_dist(A,M) == 0) diff --git a/code/datums/abilities/wizard/knock.dm b/code/datums/abilities/wizard/knock.dm index b2c251b..53d390f 100644 --- a/code/datums/abilities/wizard/knock.dm +++ b/code/datums/abilities/wizard/knock.dm @@ -22,15 +22,15 @@ else boutput(holder.owner, "Your spell only works at point blank without a staff to focus it!") for(var/obj/machinery/door/G in oview(SPrange, holder.owner)) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) G.open() for(var/obj/storage/F in oview(SPrange, holder.owner)) if (F.locked) F.locked = 0 - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) F.open() for(var/mob/living/silicon/robot/E in oview(SPrange, holder.owner)) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) E.spellopen() for(var/obj/machinery/bot/B in oview(SPrange, holder.owner)) B.locked = 0 diff --git a/code/datums/abilities/wizard/magicmissile.dm b/code/datums/abilities/wizard/magicmissile.dm index 34d00cd..6fe420e 100644 --- a/code/datums/abilities/wizard/magicmissile.dm +++ b/code/datums/abilities/wizard/magicmissile.dm @@ -62,7 +62,7 @@ B.anchored = 1 B.set_density(0) B.layer = EFFECTS_LAYER_BASE - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) qdel(B) step_to(A,M,0) if (get_dist(A,M) == 0) diff --git a/code/datums/abilities/wizard/magshield.dm b/code/datums/abilities/wizard/magshield.dm index 1790f78..15669fe 100644 --- a/code/datums/abilities/wizard/magshield.dm +++ b/code/datums/abilities/wizard/magshield.dm @@ -27,7 +27,7 @@ boutput(holder.owner, "You are surrounded by a magical barrier!") holder.owner.visible_message("[holder.owner] is encased in a protective shield.") playsound(holder.owner,"sound/effects/MagShieldUp.ogg",50,1) - SPAWN_DBG(100) + SPAWN_DBG(10 SECONDS) if(holder.owner && holder.owner.spellshield) holder.owner.spellshield = 0 holder.owner.underlays -= shield_overlay diff --git a/code/datums/abilities/wizard/phaseshift.dm b/code/datums/abilities/wizard/phaseshift.dm index 3a4d3fc..482689d 100644 --- a/code/datums/abilities/wizard/phaseshift.dm +++ b/code/datums/abilities/wizard/phaseshift.dm @@ -128,7 +128,7 @@ src.y-- src.x-- src.canmove = 0 - SPAWN_DBG(2) src.canmove = 1 + SPAWN_DBG(2 DECI SECONDS) src.canmove = 1 /obj/dummy/spell_invis/ex_act(blah) return diff --git a/code/datums/abilities/wizard/shockwave.dm b/code/datums/abilities/wizard/shockwave.dm index ceab0d7..a5bf268 100644 --- a/code/datums/abilities/wizard/shockwave.dm +++ b/code/datums/abilities/wizard/shockwave.dm @@ -72,4 +72,4 @@ src.Scale(0,0) animate(src, matrix(1.4, MATRIX_SCALE), time = 6, color = "#ffdddd", easing = LINEAR_EASING) animate(time = 2, alpha = 0) - SPAWN_DBG(8) qdel(src) + SPAWN_DBG(8 DECI SECONDS) qdel(src) diff --git a/code/datums/abilities/wraith.dm b/code/datums/abilities/wraith.dm index 0cfca2c..3e9f6dd 100644 --- a/code/datums/abilities/wraith.dm +++ b/code/datums/abilities/wraith.dm @@ -316,7 +316,7 @@ current_prob *= 0.35 // very steep. probably grabs 3 or 4 objects per cast -- much less effective than revenant command thrown += O animate_float(O) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) for (var/obj/O in thrown) O.throw_at(T, 32, 2) @@ -519,7 +519,7 @@ if(!(A in centerview)) continue //if (A == holder.owner) continue var/obj/smokeDummy/D = new(A) - SPAWN_DBG(150) + SPAWN_DBG(15 SECONDS) qdel(D) particleMaster.SpawnSystem(new/datum/particleSystem/areaSmoke("#ffffff", 30, trgloc)) return 0 @@ -556,7 +556,7 @@ for(var/obj/machinery/door/G in range(10, holder.owner)) if (prob(c_prob)) c_prob *= 0.4 - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) if (G.density) G.open() else @@ -565,7 +565,7 @@ for(var/obj/storage/F in range(10, holder.owner)) if (prob(c_prob)) c_prob *= 0.4 - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) if (F.open) F.close() else diff --git a/code/datums/abilities/wrestler/drop.dm b/code/datums/abilities/wrestler/drop.dm index 285cf18..b6bfb28 100644 --- a/code/datums/abilities/wrestler/drop.dm +++ b/code/datums/abilities/wrestler/drop.dm @@ -103,7 +103,7 @@ else random_brute_damage(target, 15) - target.changeStatus("weakened", 1 SECONDS) + target.changeStatus("weakened", 1 SECOND) target.changeStatus("stunned", 2 SECONDS) target.force_laydown_standup() diff --git a/code/datums/browserOutput.dm b/code/datums/browserOutput.dm index 03694e9..5204f01 100644 --- a/code/datums/browserOutput.dm +++ b/code/datums/browserOutput.dm @@ -92,7 +92,7 @@ var/global src.owner << browse(grabResource("html/browserOutput.html"), "window=browseroutput") if (src.loadAttempts < 5) //To a max of 5 load attempts - SPAWN_DBG(200) //20 seconds + SPAWN_DBG(20 SECONDS) //20 seconds if (src.owner && !src.loaded) src.loadAttempts++ src.load() @@ -126,7 +126,7 @@ var/global else src.sendClientData() /* WIRE TODO: Fix this so the CDN dying doesn't break everyone - SPAWN_DBG(600) //60 seconds + SPAWN_DBG(1 MINUTE) //60 seconds if (!src.cookieSent) //Client has very likely futzed with their local html/js chat file out(src.owner, "
Chat file tampering detected. Closing connection.
") del(src.owner) diff --git a/code/datums/controllers/action_controls.dm b/code/datums/controllers/action_controls.dm index 58ce2ef..ece7ca8 100644 --- a/code/datums/controllers/action_controls.dm +++ b/code/datums/controllers/action_controls.dm @@ -136,7 +136,7 @@ var/datum/action_controller/actions if (owner != null && islist(A.attached_objs)) A.attached_objs.Remove(bar) A.attached_objs.Remove(border) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) if (bar) pool(bar) bar = null diff --git a/code/datums/controllers/process/blob.dm b/code/datums/controllers/process/blob.dm index f61e123..077b828 100644 --- a/code/datums/controllers/process/blob.dm +++ b/code/datums/controllers/process/blob.dm @@ -6,7 +6,7 @@ datum/controller/process/blob setup() name = "Blob" - schedule_interval = 31 // 3.1 seconds + schedule_interval = 31 // 3.1 SECOND detailed_count = new diff --git a/code/datums/controllers/process/fluid_spawner.dm b/code/datums/controllers/process/fluid_spawner.dm index c980584..1698650 100644 --- a/code/datums/controllers/process/fluid_spawner.dm +++ b/code/datums/controllers/process/fluid_spawner.dm @@ -39,7 +39,7 @@ datum/controller/process/fluid_turfs src.processing_fluid_turfs = global.processing_fluid_turfs - SPAWN_DBG(200) + SPAWN_DBG(20 SECONDS) if (clients.len >= OSHAN_LIGHT_OVERLOAD) do_light_gen = 0 diff --git a/code/datums/controllers/process/kudzu.dm b/code/datums/controllers/process/kudzu.dm index 25624a9..0574f3a 100644 --- a/code/datums/controllers/process/kudzu.dm +++ b/code/datums/controllers/process/kudzu.dm @@ -13,14 +13,14 @@ datum/controller/process/kudzu doWork() if (count == 7) count = 0 - //make kudzu men converting cacoons for all dead humans + //make kudzu men converting cocoons for all dead humans for (var/mob/M in mobs) //dnr I dunno !((M && M.mind) || !(M && M.mind && M.mind.dnr)) if (M.stat == 2 && isturf(M.loc) && M.loc.temp_flags & HAS_KUDZU && ishuman(M)) var/mob/living/carbon/human/H = M if (istype(H.mutantrace, /datum/mutantrace/kudzu)) continue - //make cacoon + //make cocoon var/obj/icecube/kudzu/cube = new /obj/icecube/kudzu(get_turf(M), M) M.set_loc(cube) cube.visible_message("[M] is covered by the vines!") diff --git a/code/datums/controllers/process/mob_ui.dm b/code/datums/controllers/process/mob_ui.dm index 4197578..b5b45a8 100644 --- a/code/datums/controllers/process/mob_ui.dm +++ b/code/datums/controllers/process/mob_ui.dm @@ -2,7 +2,7 @@ datum/controller/process/mob_ui setup() name = "Mob UI" - schedule_interval = 1 SECONDS + schedule_interval = 1 SECOND doWork() for(var/mob/M in mobs) diff --git a/code/datums/controllers/process/ticker.dm b/code/datums/controllers/process/ticker.dm index cad377c..5a636be 100644 --- a/code/datums/controllers/process/ticker.dm +++ b/code/datums/controllers/process/ticker.dm @@ -8,7 +8,7 @@ datum/controller/process/ticker ticker = new /datum/controller/gameticker() // start the pregame process - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) ticker.pregame() doWork() ticker.process() \ No newline at end of file diff --git a/code/datums/controllers/sea_hotspot_controls.dm b/code/datums/controllers/sea_hotspot_controls.dm index 30f915f..1de2a99 100644 --- a/code/datums/controllers/sea_hotspot_controls.dm +++ b/code/datums/controllers/sea_hotspot_controls.dm @@ -296,7 +296,7 @@ if (phenomena_flags & PH_QUAKE) shake_camera(M, 5, 0.5) random_brute_damage(M, 3) - M.changeStatus("weakened", 1 SECONDS) + M.changeStatus("weakened", 1 SECOND) M.show_text("The ground quakes and rumbles violently!") LAGCHECK(LAG_HIGH) @@ -324,7 +324,7 @@ //hey recurse at this arbitrary heat value, thanks if (heat > 8000 + (8000 * recursion)) - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) LAGCHECK(LAG_HIGH) src.do_phenomena( recursion++, heat - (9000 + (9000 * recursion)) ) @@ -498,7 +498,7 @@ speech_bubble.icon_state = "[val]" UpdateOverlays(speech_bubble, "speech_bubble") - SPAWN_DBG(15) + SPAWN_DBG(1.5 SECONDS) UpdateOverlays(null, "speech_bubble") @@ -893,7 +893,7 @@ for (var/mob/M in src.loc) random_brute_damage(M, 40) - M.changeStatus("weakened", 1 SECONDS) + M.changeStatus("weakened", 1 SECOND) M.emote("scream") playsound(M.loc, "sound/impact_sounds/Flesh_Break_1.ogg", 70, 1) diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 49d99f1..c40b4ab 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -48,7 +48,7 @@ G.fields["dna"] = H.bioHolder.Uid G.fields["p_stat"] = "Active" G.fields["m_stat"] = "Stable" - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) if (H && G) var/icon/I = H.build_flat_icon(SOUTH) if (istype(I)) @@ -226,7 +226,7 @@ var/issuer_byond_key = null New() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) statlog_ticket(src, usr) /datum/fine @@ -248,7 +248,7 @@ New() generate_ID() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) for(var/datum/data/record/B in data_core.bank) //gross if(B.fields["name"] == target) bank_record = B @@ -271,7 +271,7 @@ else paid_amount += bank_record.fields["current_money"] bank_record.fields["current_money"] = 0 - SPAWN_DBG(300) process_payment() + SPAWN_DBG(30 SECONDS) process_payment() /datum/fine/proc/process_payment() if(bank_record.fields["current_money"] >= (amount-paid_amount)) @@ -281,7 +281,7 @@ else paid_amount += bank_record.fields["current_money"] bank_record.fields["current_money"] = 0 - SPAWN_DBG(300) process_payment() + SPAWN_DBG(30 SECONDS) process_payment() /datum/fine/proc/generate_ID() if(!ID) ID = (data_core.fines.len + 1) \ No newline at end of file diff --git a/code/datums/effects/system/ion_trail_follow.dm b/code/datums/effects/system/ion_trail_follow.dm index 1c58901..5ab18e0 100644 --- a/code/datums/effects/system/ion_trail_follow.dm +++ b/code/datums/effects/system/ion_trail_follow.dm @@ -37,12 +37,12 @@ I.pixel_y = yoffset SPAWN_DBG( 20 ) if (I && !I.disposed) pool(I) - SPAWN_DBG(2) + SPAWN_DBG(2 DECI SECONDS) if(src.on) src.processing = 1 src.start() else - SPAWN_DBG(2) + SPAWN_DBG(2 DECI SECONDS) if(src.on) src.processing = 1 src.start() diff --git a/code/datums/effects/system/mustard_gas_spread.dm b/code/datums/effects/system/mustard_gas_spread.dm index 3ee1f47..6d42714 100644 --- a/code/datums/effects/system/mustard_gas_spread.dm +++ b/code/datums/effects/system/mustard_gas_spread.dm @@ -45,7 +45,7 @@ for(i=0, i
-
+
get gear

You have [gang.spendable_points] points to spend!
@@ -807,7 +807,7 @@ "} - dat += {" + dat += {"
@@ -818,7 +818,7 @@ "} for (var/datum/gang_item/GI in buyable_items) dat += "" - + dat += "
Name Price
[GI.name][GI.price][GI.desc][GI.class1][GI.class2]
" HTML = dat @@ -870,7 +870,7 @@ src.overlays -= default_screen_overlay src.overlays += overlay - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src.overlays -= overlay src.overlays += default_screen_overlay @@ -939,7 +939,7 @@ score += O.reagents.get_reagent_amount("krokodil") score += O.reagents.get_reagent_amount("catdrugs") score += O.reagents.get_reagent_amount("methamphetamine")*1.5 //meth - + return round(score) proc/cash_amount() @@ -965,7 +965,7 @@ if(istype(ticker.mode,/datum/game_mode/gang) && damage_warning_timeout == 0) ticker.mode:broadcast_to_gang("Your locker is under attack!",src.gang) damage_warning_timeout = 1 - SPAWN_DBG(600) + SPAWN_DBG(1 MINUTE) damage_warning_timeout = 0 if(health <= 0) @@ -1345,12 +1345,12 @@ proc/get_gang_gear(var/mob/living/carbon/human/user) //items purchasable from gangs /datum/gang_item - var/name = "commodity" // Name of the item + var/name = "commodity" // Name of the item var/desc = "item" //Description for item var/class1 = "" //This should be general category: weapon, clothing/armor, misc var/class2 = "" //This should be the gang item style: Street Gang, Western Gang, Space Gang - var/item_path = null // Type Path of the item - var/price = 100 // + var/item_path = null // Type Path of the item + var/price = 100 // /datum/gang_item/street class1 = "Street Gang" /datum/gang_item/thirties_chicago @@ -1576,7 +1576,7 @@ proc/get_gang_gear(var/mob/living/carbon/human/user) ..() if (!ishuman(src.owner)) return - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) qdel(src) /obj/item/implanter/gang diff --git a/code/datums/gamemodes/mixed.dm b/code/datums/gamemodes/mixed.dm index 585d239..11f8769 100644 --- a/code/datums/gamemodes/mixed.dm +++ b/code/datums/gamemodes/mixed.dm @@ -282,12 +282,12 @@ if ("spy_thief") objective_set_path = /datum/objective_set/spy_theft - SPAWN_DBG(10) //dumb delay to avoid race condition where spy assignment bugs + SPAWN_DBG(1 SECOND) //dumb delay to avoid race condition where spy assignment bugs equip_spy_theft(traitor.current) if (!src.spy_market) src.spy_market = new /datum/game_mode/spy_theft - SPAWN_DBG(50) //Some possible bounty items (like organs) need some time to get set up properly and be assigned names + SPAWN_DBG(5 SECONDS) //Some possible bounty items (like organs) need some time to get set up properly and be assigned names src.spy_market.build_bounty_list() src.spy_market.update_bounty_readouts() diff --git a/code/datums/gamemodes/revolution.dm b/code/datums/gamemodes/revolution.dm index 02d6cf4..cc7f331 100644 --- a/code/datums/gamemodes/revolution.dm +++ b/code/datums/gamemodes/revolution.dm @@ -89,7 +89,7 @@ command_alert("Revolution heads have been identified. Please stand by for hostile employee termination.", "Emergency Riot Update") SPAWN_DBG(3000) // 5 minutes until everyone dies command_alert("You may feel a slight burning sensation.", "Emergency Riot Update") - SPAWN_DBG(100) // welp + SPAWN_DBG(10 SECONDS) // welp for(var/mob/living/carbon/M in mobs) M.gib() endthisshit = 1 @@ -97,7 +97,7 @@ /datum/game_mode/revolution/proc/equip_revolutionary(mob/living/carbon/human/rev_mob) equip_traitor(rev_mob) - var/the_slot = "" + //var/the_slot = "" /* if (!rev_mob.w_uniform) diff --git a/code/datums/gamemodes/spy_theft.dm b/code/datums/gamemodes/spy_theft.dm index d5388a8..7e0465a 100644 --- a/code/datums/gamemodes/spy_theft.dm +++ b/code/datums/gamemodes/spy_theft.dm @@ -171,7 +171,7 @@ objective_set_path = pick(typesof(/datum/objective_set/spy_theft)) new objective_set_path(spy) - SPAWN_DBG(10) //dumb delay to avoid race condition where spy assignment bugs (can't find PDA) + SPAWN_DBG(1 SECOND) //dumb delay to avoid race condition where spy assignment bugs (can't find PDA) equip_spy_theft(spy.current) var/obj_count = 1 @@ -181,7 +181,7 @@ //spy_name_list += spy.current.real_name - SPAWN_DBG(50) //Some possible bounty items (like organs) need some time to get set up properly and be assigned names + SPAWN_DBG(5 SECONDS) //Some possible bounty items (like organs) need some time to get set up properly and be assigned names build_bounty_list() SPAWN_DBG (rand(waittime_l, waittime_h)) diff --git a/code/datums/gameticker.dm b/code/datums/gameticker.dm index 10614c0..e6454e3 100644 --- a/code/datums/gameticker.dm +++ b/code/datums/gameticker.dm @@ -301,7 +301,7 @@ var/global/current_state = GAME_STATE_WORLD_INIT var/mob/living/carbon/human/H = pick(HL) if(istype(H)) skull_key_assigned = 1 - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) if(H.organHolder && H.organHolder.skull) H.organHolder.skull.key = new /obj/item/device/key/skull (H.organHolder.skull) logTheThing("debug", H, null, "has the dubious pleasure of having a key embedded in their skull.") diff --git a/code/datums/gauntlet/crittergauntlet.dm b/code/datums/gauntlet/crittergauntlet.dm index acf3d37..1cc0635 100644 --- a/code/datums/gauntlet/crittergauntlet.dm +++ b/code/datums/gauntlet/crittergauntlet.dm @@ -189,7 +189,7 @@ SPAWN_DBG(0) S.open() allow_processing = 1 - SPAWN_DBG(1200) + SPAWN_DBG(2 MINUTES) if (state == 1 && current_match_id == spawned_match_id) announceAll("Game did not start after 2 minutes. Resetting arena.") resetArena() @@ -338,7 +338,7 @@ new /obj/item/extinguisher/virtual(target) new /obj/item/card/id/gauntlet(target, forwhom) var/obj/item/artifact/activator_key/A = new /obj/item/artifact/activator_key(target) - SPAWN_DBG(25) + SPAWN_DBG(2.5 SECONDS) A.name = "Artifact Activator Key" proc/spawnMeds(var/turf/target) @@ -361,7 +361,7 @@ critters_left -= name New() - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) viewing = locate() in world staging = locate() in world for (var/area/gauntlet/G in world) @@ -600,7 +600,7 @@ var/global/datum/arena/gauntletController/gauntlet_controller = new() var/T = pick(gauntlet_controller.spawnturfs) var/obj/O = new ST(T) showswirl(T) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) O.ArtifactActivated() forcewall @@ -981,7 +981,7 @@ var/global/datum/arena/gauntletController/gauntlet_controller = new() var/turf/target = pick(gauntlet_controller.spawnturfs) target.overlays += marker - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) if (!D2) return D2.set_loc(target) diff --git a/code/datums/gauntlet/podcolosseum.dm b/code/datums/gauntlet/podcolosseum.dm index 1ae1dd3..36d5b26 100644 --- a/code/datums/gauntlet/podcolosseum.dm +++ b/code/datums/gauntlet/podcolosseum.dm @@ -180,7 +180,7 @@ SPAWN_DBG(0) S.open() allow_processing = 1 - SPAWN_DBG(1200) + SPAWN_DBG(2 MINUTES) if (state == 1 && current_match_id == spawned_match_id) announceAll("Game did not start after 2 minutes. Resetting arena.") resetArena() @@ -371,7 +371,7 @@ resetting = 0 New() - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) viewing = locate() in world staging = locate() in world for (var/area/colosseum/G in world) @@ -1224,7 +1224,7 @@ proc/get_colosseum_message(var/name, var/message) update_indicators(INDICATOR_ALL) add_indicators(M) may_exit = 0 - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) may_exit = 1 proc/on_exit(var/mob/M) @@ -1420,7 +1420,7 @@ proc/get_colosseum_message(var/name, var/message) if(dying) return dying = 1 - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) src.visible_message("[src] is breaking apart!") new /obj/effects/explosion (src.loc) var/sound/expl_sound = sound('sound/effects/Explosion1.ogg') @@ -1451,7 +1451,7 @@ proc/get_colosseum_message(var/name, var/message) remove_indicators(piloting) piloting = null M.set_loc(Q) - SPAWN_DBG(2) + SPAWN_DBG(2 DECI SECONDS) var/dx = rand(-10, 10) var/dy = rand(-10, 10) var/turf/T = locate(Q.x + dx, Q.y + dy, Q.z) diff --git a/code/datums/hud/cinematic.dm b/code/datums/hud/cinematic.dm index 284ae16..1dff7ec 100644 --- a/code/datums/hud/cinematic.dm +++ b/code/datums/hud/cinematic.dm @@ -7,7 +7,7 @@ if ("nuke") var/obj/screen/hud/anim = create_screen("cinematic", "", 'icons/effects/station_explosion.dmi', "start_nuke", "1:6, 1:50", 99) clients << sound('sound/misc/airraid_loop_short.ogg') - SPAWN_DBG(35)//45) + SPAWN_DBG(3.5 SECONDS)//45) anim.icon_state = "explode" sleep(10) clients << sound('sound/effects/kaboom.ogg') @@ -17,7 +17,7 @@ del(src)*/ if ("malf") var/obj/screen/hud/anim = create_screen("cinematic", "", 'icons/effects/station_explosion.dmi', "start_malf", "1:6, 1:50", 99) - SPAWN_DBG(35)//45) + SPAWN_DBG(3.5 SECONDS)//45) anim.icon_state = "explode" sleep(10) clients << sound('sound/effects/kaboom.ogg') diff --git a/code/datums/ircbot.dm b/code/datums/ircbot.dm index 88789fc..06112c9 100644 --- a/code/datums/ircbot.dm +++ b/code/datums/ircbot.dm @@ -15,7 +15,7 @@ var/global/datum/ircbot/ircbot = new /datum/ircbot() New() if (!src.load()) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) if (!src.loaded) src.load() @@ -62,7 +62,7 @@ var/global/datum/ircbot/ircbot = new /datum/ircbot() if (src.debugging) src.logDebug("Export, message queued due to unloaded config") - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) if (!src.loaded) src.load() return "queued" diff --git a/code/datums/mutantraces.dm b/code/datums/mutantraces.dm index 18cf6b9..667ca5f 100644 --- a/code/datums/mutantraces.dm +++ b/code/datums/mutantraces.dm @@ -378,7 +378,7 @@ mob.emote_allowed = 0 message = "[mob] screams with \his mind! Guh, that's creepy!" playsound(get_turf(mob), "sound/voice/screams/Psychic_Scream_1.ogg", 80, 0, 0, max(0.7, min(1.2, 1.0 + (30 - mob.bioHolder.age)/60))) - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) mob.emote_allowed = 1 return message else @@ -478,7 +478,7 @@ mob.emote_allowed = 0 message = "[mob] moans!" playsound(get_turf(mob), "sound/voice/Zgroan[pick("1","2","3","4")].ogg", 80, 0, 0, max(0.7, min(1.2, 1.0 + (30 - mob.bioHolder.age)/60))) - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) mob.emote_allowed = 1 return message else @@ -486,7 +486,7 @@ onDeath() mob.show_message("You can feel your flesh re-assembling. You will rise once more. (This will take about one minute.)") - SPAWN_DBG(450) + SPAWN_DBG(45 SECONDS) if (mob) if (!mob.organHolder.brain || !mob.organHolder.skull || !mob.organHolder.head) mob.show_message("You fail to rise, your brain has been destroyed.") @@ -621,7 +621,7 @@ mob.emote_allowed = 0 message = "[mob] moans!" playsound(get_turf(mob), "sound/voice/Zgroan[pick("1","2","3","4")].ogg", 80, 0, 0, max(0.7, min(1.2, 1.0 + (30 - mob.bioHolder.age)/60))) - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) mob.emote_allowed = 1 return message else @@ -832,14 +832,14 @@ mob.emote_allowed = 0 message = "[mob] howls [pick("ominously", "eerily", "hauntingly", "proudly", "loudly")]!" playsound(get_turf(mob), "sound/voice/animal/werewolf_howl.ogg", 80, 0, 0, max(0.7, min(1.2, 1.0 + (30 - mob.bioHolder.age)/60))) - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) mob.emote_allowed = 1 if("burp") if(mob.emote_allowed) mob.emote_allowed = 0 message = "[mob] belches." playsound(get_turf(mob), "sound/voice/burp_alien.ogg", 60, 1) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) mob.emote_allowed = 1 return message @@ -999,7 +999,7 @@ for (var/i = 0, i < 4, i++) src.mob.pixel_x-= 1 sleep(1) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) var/beeMax = 15 for (var/obj/critter/domestic_bee/responseBee in range(7, src.mob)) if (!responseBee.alive) @@ -1020,7 +1020,7 @@ if (src.mob.traitHolder && src.mob.traitHolder.hasTrait("happyfeet")) if (prob(33)) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) for (var/mob/living/carbon/human/responseMonkey in range(1, src.mob)) // they don't have to be monkeys, but it's signifying monkey code if (responseMonkey.stat || responseMonkey.getStatusDuration("paralysis") || responseMonkey.sleeping || responseMonkey.getStatusDuration("stunned") || (responseMonkey == src.mob)) continue @@ -1051,7 +1051,7 @@ . = "[mob] screams!" playsound(get_turf(mob), src.sound_monkeyscream, 80, 0, 0, mob.get_age_pitch()) - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) if (mob) mob.emote_allowed = 1 if ("fart") @@ -1100,7 +1100,7 @@ #ifdef DATALOGGER game_stats.Increment("farts") #endif - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) mob.emote_allowed = 1 @@ -1164,7 +1164,7 @@ return "gurgles" onDeath() - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) if (mob) mob.visible_message("[mob] starts convulsing violently!", "You feel as if your body is tearing itself apart!") mob.changeStatus("weakened", 150) @@ -1290,7 +1290,7 @@ mob.emote_allowed = 0 message = "[mob] croaks." playsound(get_turf(mob), "sound/voice/farts/frogfart.ogg", 60, 1) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) if (mob) mob.emote_allowed = 1 return message else ..() diff --git a/code/datums/pixel_projectile.dm b/code/datums/pixel_projectile.dm index 30af437..b48a197 100644 --- a/code/datums/pixel_projectile.dm +++ b/code/datums/pixel_projectile.dm @@ -199,7 +199,7 @@ atom/disposing() turf/New() ..() - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) for(var/A in contents) collidable_change(A, 1) diff --git a/code/datums/preferences.dm b/code/datums/preferences.dm index 4bfe247..af677c5 100644 --- a/code/datums/preferences.dm +++ b/code/datums/preferences.dm @@ -2092,7 +2092,7 @@ var/global/list/female_screams = list("female", "femalescream1", "femalescream2" if (H && H.organHolder && H.organHolder.head && H.organHolder.head.donor_appearance) // aaaa H.organHolder.head.donor_appearance.CopyOther(AH) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) AH.UpdateMob() if (H) H.set_face_icon_dirty() diff --git a/code/datums/sims.dm b/code/datums/sims.dm index b956323..e7554cb 100644 --- a/code/datums/sims.dm +++ b/code/datums/sims.dm @@ -257,7 +257,7 @@ H.vomit() H.visible_message("[H] throws up all over \himself. Gross!") boutput(H, "You are [pick("disgusted", "revolted", "repelled", "sickened", "nauseated")] by [holder.owner]'s [pick("smell", "odor", "body odor", "scent", "fragrance", "bouquet", "savour", "tang", "whiff")]!") - holder.owner.changeStatus("stunned", 1 SECONDS) + holder.owner.changeStatus("stunned", 1 SECOND) holder.owner.visible_message("[holder.owner] throws up all over \himself. Gross!") holder.owner.vomit() showOwner("You are [pick("disgusted", "revolted", "repelled", "sickened", "nauseated")] by your own [pick("smell", "odor", "body odor", "scent", "fragrance", "bouquet", "savour", "tang", "whiff")]!") @@ -485,7 +485,7 @@ New() ..() - SPAWN_DBG(10) //Give it some time to finish creating the simsController because fak + SPAWN_DBG(1 SECOND) //Give it some time to finish creating the simsController because fak for (var/M in childrentypesof(/datum/simsMotive)) motives[M] = new M(1) #ifdef RP_MODE diff --git a/code/datums/special_r.dm b/code/datums/special_r.dm index a363f1b..acd8ac9 100644 --- a/code/datums/special_r.dm +++ b/code/datums/special_r.dm @@ -30,7 +30,7 @@ datum/special_respawn if(!check) break r_number ++ - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) if(player && !player:client) qdel(player) @@ -76,7 +76,7 @@ datum/special_respawn //M.ckey = player:ckey r_number ++ - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) if(player && !player:client) qdel(player) else @@ -97,7 +97,7 @@ datum/special_respawn player.mind.transfer_to(M) r_number ++ - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) if(player && !player:client) qdel(player) else @@ -119,7 +119,7 @@ datum/special_respawn r_number++ SPAWN_DBG(rand(1,10)) M.set_clothing_icon_dirty() - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) if(player && !player:client) qdel(player) else @@ -143,7 +143,7 @@ datum/special_respawn check = spawn_character_human("The Welder",player,B,"Welder") if(!check) return - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) if(trashstation == "Yes") creepify_station() bust_lights() @@ -167,7 +167,7 @@ datum/special_respawn if(!check) break r_number ++ - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) if(player && !player:client) qdel(player) message_admins("[r_number] officers spawned.") @@ -184,7 +184,7 @@ datum/special_respawn var/check = spawn_character_alien(player,location) if(!check) break - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) if(player && !player:client) qdel(player) return 1 @@ -214,7 +214,7 @@ datum/special_respawn if(!check) break r_number ++ - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) if(player && !player:client) qdel(player) @@ -235,7 +235,7 @@ datum/special_respawn check = spawn_character_human("The Smiling Man",player,B,"Smiling Man") if(!check) return - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) if(player && !player:client) qdel(player) @@ -282,7 +282,7 @@ datum/special_respawn //mob.key = player.key ^*/ mob.mind.special_role = equip - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) if (mob) eq_mob(equip,mob) mob.set_clothing_icon_dirty() diff --git a/code/datums/traits.dm b/code/datums/traits.dm index e79b4e8..7a1c863 100644 --- a/code/datums/traits.dm +++ b/code/datums/traits.dm @@ -210,7 +210,7 @@ category = "body" onAdd(var/mob/owner) - SPAWN_DBG(40) //Fuck this. Fuck the way limbs are added with a delay. FUCK IT + SPAWN_DBG(4 SECONDS) //Fuck this. Fuck the way limbs are added with a delay. FUCK IT if(ishuman(owner)) var/mob/living/carbon/human/H = owner if(H.limbs != null) @@ -232,7 +232,7 @@ category = "body" onAdd(var/mob/owner) - SPAWN_DBG(40) + SPAWN_DBG(4 SECONDS) if(ishuman(owner)) var/mob/living/carbon/human/H = owner if(H.limbs != null) diff --git a/code/datums/traits_disused.dm b/code/datums/traits_disused.dm index 8d078e3..9bbd610 100644 --- a/code/datums/traits_disused.dm +++ b/code/datums/traits_disused.dm @@ -162,7 +162,7 @@ curr.can_scramble = 0 str += " [curr.name]" - SPAWN_DBG(40) owner.add_memory(str) //FUCK THIS SPAWN FUCK FUUUCK + SPAWN_DBG(4 SECONDS) owner.add_memory(str) //FUCK THIS SPAWN FUCK FUUUCK return /obj/trait/goodgenes @@ -186,7 +186,7 @@ curr = owner.bioHolder.effects[curr_id] str += " [curr.name]" - SPAWN_DBG(40) owner.add_memory(str) //FUCK THIS SPAWN FUCK FUUUCK + SPAWN_DBG(4 SECONDS) owner.add_memory(str) //FUCK THIS SPAWN FUCK FUUUCK return diff --git a/code/datums/updateQueueWorker.dm b/code/datums/updateQueueWorker.dm index 81f0028..b660be4 100644 --- a/code/datums/updateQueueWorker.dm +++ b/code/datums/updateQueueWorker.dm @@ -56,7 +56,7 @@ datum/updateQueueWorker/proc/doWork() uq_dbg("tick went into overtime with world.cpu = [world.cpu], deferred next update to next tick [1+(world.time / world.tick_lag)]") - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) doWork() else SPAWN_DBG(0) // Execute anonymous function immediately as if we were in a while loop... @@ -86,7 +86,7 @@ datum/updateQueueWorker/proc/kill() * we'll forcibly delete it, causing the anonymous function it was * running to be terminated. Hasta la vista, baby. */ - SPAWN_DBG(300) + SPAWN_DBG(30 SECONDS) del(src) datum/updateQueueWorker/proc/start() diff --git a/code/mob.dm b/code/mob.dm index e1258db..83c1c56 100644 --- a/code/mob.dm +++ b/code/mob.dm @@ -356,7 +356,7 @@ src.update_cursor() src.update_keymap() - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) if (src && src.client) //Wire: fix for runtime error: Cannot execute null.setup macros(). src.client.setup_macros() @@ -2302,7 +2302,7 @@ eyeblind = 5 src.change_eye_blurry(5) src.bioHolder.AddEffect("bad_eyesight") - SPAWN_DBG(100) + SPAWN_DBG(10 SECONDS) src.bioHolder.RemoveEffect("bad_eyesight") if (25 to INFINITY) @@ -2678,11 +2678,11 @@ animation.master = src animation.icon_state = "ungibbed" src = null //Detach this, what if we get deleted before the animation ends?? - SPAWN_DBG(7) //Length of animation. + SPAWN_DBG(7 DECI SECONDS) //Length of animation. newbody.set_loc(animation.loc) qdel(animation) src.anchored = 1 // Stop running into the lava every half second jeez! - SPAWN_DBG(40) + SPAWN_DBG(4 SECONDS) src.anchored = 0 return diff --git a/code/mob/dead.dm b/code/mob/dead.dm index 04391ed..c092254 100644 --- a/code/mob/dead.dm +++ b/code/mob/dead.dm @@ -131,7 +131,7 @@ message = "[src] does \an [pick("spooky", "eerie", "frightening", "terrifying", "ghoulish", "ghostly", "haunting", "morbid")] flip!" animate(src) // stop the animation animate_spin(src, prob(50) ? "R" : "L", 1, 0) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) animate_bumble(src) if ("wave","salute","nod") diff --git a/code/mob/dead/ai-camera.dm b/code/mob/dead/ai-camera.dm index 5ba3744..403b7b4 100644 --- a/code/mob/dead/ai-camera.dm +++ b/code/mob/dead/ai-camera.dm @@ -358,7 +358,7 @@ ..() if(mainframe) mainframe.cancel_camera() - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) src.return_mainframe() verb/ai_call_shuttle() diff --git a/code/mob/dead/hhghost.dm b/code/mob/dead/hhghost.dm index 48eb238..54f17d8 100644 --- a/code/mob/dead/hhghost.dm +++ b/code/mob/dead/hhghost.dm @@ -29,7 +29,7 @@ for(var/image/I in orbicons) boutput(src, I) - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) updateOrbs() return @@ -39,7 +39,7 @@ src.client.images.Cut() for(var/image/I in orbicons) boutput(src, I) - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) updateOrbs() return diff --git a/code/mob/dead/observer.dm b/code/mob/dead/observer.dm index 89ddda7..ccbbe23 100644 --- a/code/mob/dead/observer.dm +++ b/code/mob/dead/observer.dm @@ -192,7 +192,7 @@ if (M.client && isliving(M) && !M.unobservable) candidates += M if (candidates.len) - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) src.insert_observer(pick(candidates)) #endif @@ -229,7 +229,7 @@ updateButtons() - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) if (src.mind && istype(src.mind.purchased_bank_item, /datum/bank_purchaseable/golden_ghost)) src.setMaterial(getMaterial("gold")) //#ifdef HALLOWEEN diff --git a/code/mob/living/carbon/cube.dm b/code/mob/living/carbon/cube.dm index 38e32c2..0619533 100644 --- a/code/mob/living/carbon/cube.dm +++ b/code/mob/living/carbon/cube.dm @@ -118,7 +118,7 @@ else playsound(get_turf(src), src.sound_scream, 80, 0, 0, src.get_age_pitch()) - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) src.emote_allowed = 1 return "screams!" else @@ -270,7 +270,7 @@ New() ..() real_name = pick("Krampus", "Krampus 3.0", "The Krampmeister", "The Krampster") //For deadchat - SPAWN_DBG(20) //I do not know where the hell you get a bioholder from =I + SPAWN_DBG(2 SECONDS) //I do not know where the hell you get a bioholder from =I if(src.bioHolder) src.bioHolder.age = 110 // people were somehow being shit even as a meatcube, so i'm removing the small mercy they had with being unpoppable - cirr diff --git a/code/mob/living/carbon/human.dm b/code/mob/living/carbon/human.dm index 6a1f07e..45fd8dd 100644 --- a/code/mob/living/carbon/human.dm +++ b/code/mob/living/carbon/human.dm @@ -269,7 +269,7 @@ if (!r_arm) r_arm = new /obj/item/parts/human_parts/arm/right(holder) if (!l_leg) l_leg = new /obj/item/parts/human_parts/leg/left(holder) if (!r_leg) r_leg = new /obj/item/parts/human_parts/leg/right(holder) - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) if (holder && !l_arm || !r_arm || !l_leg || !r_leg) logTheThing("debug", holder, null, "SpyGuy/Limbs: [src] is missing limbs after creation for some reason - recreating.") create() @@ -754,7 +754,7 @@ src.unkillable = 0 //Don't want this lying around to repeatedly die or whatever. src.spell_soulguard = 0 // clear this as well src = null //Detach this, what if we get deleted before the animation ends?? - SPAWN_DBG(7) //Length of animation. + SPAWN_DBG(7 DECI SECONDS) //Length of animation. newbody.set_loc(animation.loc) qdel(animation) else @@ -767,7 +767,7 @@ return /mob/living/carbon/human/movement_delay(var/atom/move_target = 0, running = 0) - var/baseSpeed = 1.28 // 1.2 run, 2 walk, 0.75 sprint were base + var/baseSpeed = 1.3 // 1.2 run, 2 walk, 0.75 sprint were base var/runScaling = 0.2 //change this to affect how powerful sprinting is, ie what percent of extra tally is maintained over the minSpeed var/tally = baseSpeed @@ -1160,7 +1160,7 @@ var/mob/living/carbon/C = item logTheThing("combat", src, C, "throws %target% at [log_loc(src)].") if ( ishuman(C) && !C.getStatusDuration("weakened")) - C.changeStatus("weakened", 1 SECONDS) + C.changeStatus("weakened", 1 SECOND) else // Added log_reagents() call for drinking glasses. Also the location (Convair880). logTheThing("combat", src, null, "throws [item] [item.is_open_container() ? "[log_reagents(item)]" : ""] at [log_loc(src)].") @@ -1484,7 +1484,7 @@ /* if (src.ckey == "wonkmin") //If you mention this i will shank you. - SPAWN_DBG(150) + SPAWN_DBG(15 SECONDS) src.make_critter(/mob/living/critter/small_animal/bird/owl/large/hooter) */ return @@ -1797,7 +1797,7 @@ //mbc FUCK why doesn't this have any parent to call speech_bubble.icon_state = "speech" UpdateOverlays(speech_bubble, "speech_bubble") - SPAWN_DBG(15) + SPAWN_DBG(1.5 SECONDS) UpdateOverlays(null, "speech_bubble") /mob/living/carbon/human/var/const @@ -2339,7 +2339,7 @@ var/loc = usr.loc - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) if (usr.loc != loc || H.loc != loc) boutput(usr, "Your consumption of [H] was interrupted!") return @@ -2552,7 +2552,7 @@ if (src.shoes) src.drop_from_slot(src.shoes) make_cleanable(/obj/decal/cleanable/ash,src.loc) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) src.elecgib() else boutput(src, "[origin] blasts you with an arc flash!") @@ -2767,7 +2767,7 @@ flick("spidergib", animation) src.visible_message("A swarm of spiders erupts from [src]'s mouth and devours them! OH GOD!", "A swarm of spiders erupts from your mouth! OH GOD!", "You hear a vile chittering sound.") playsound(src.loc, 'sound/impact_sounds/Slimy_Hit_4.ogg', 100, 1) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) make_cleanable(/obj/decal/cleanable/vomit/spiders,src.loc) for (var/I = 0, I < 4, I++) new /obj/critter/spider/baby(src.loc) @@ -2778,7 +2778,7 @@ if (animation) animation.delaydispose() - SPAWN_DBG(15) + SPAWN_DBG(1.5 SECONDS) qdel(src) /mob/living/carbon/human/get_equipped_items() @@ -3268,7 +3268,7 @@ else // If it's not an "item", deal medium damage src.show_text("[src.chest_item] was shat out, that's got to hurt!") - src.changeStatus("stunned", 1 SECONDS) + src.changeStatus("stunned", 1 SECOND) src.TakeDamage("chest", 20, 0, 0, DAMAGE_BLUNT) take_bleeding_damage(src, src, 5) // added log - cirr diff --git a/code/mob/living/carbon/human/gimmick.dm b/code/mob/living/carbon/human/gimmick.dm index 94500f1..8e806c6 100644 --- a/code/mob/living/carbon/human/gimmick.dm +++ b/code/mob/living/carbon/human/gimmick.dm @@ -64,7 +64,7 @@ abilityHolder.addAbility(/datum/targetable/gimmick/reveal) abilityHolder.addAbility(/datum/targetable/gimmick/movefloor) abilityHolder.addAbility(/datum/targetable/gimmick/floorgrab) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) abilityHolder.updateButtons() // Come to collect a poor unfortunate soul @@ -105,7 +105,7 @@ abilityHolder.addAbility(/datum/targetable/gimmick/highway2hell) abilityHolder.addAbility(/datum/targetable/gimmick/reveal) abilityHolder.addAbility(/datum/targetable/gimmick/movefloor) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) bioHolder.mobAppearance.UpdateMob() abilityHolder.updateButtons() @@ -128,7 +128,7 @@ abilityHolder.addAbility(/datum/targetable/gimmick/spooky) abilityHolder.addAbility(/datum/targetable/gimmick/Jestershift) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) bioHolder.mobAppearance.UpdateMob() abilityHolder.updateButtons() @@ -171,7 +171,7 @@ mob/living/carbon/human/cluwne/satan/megasatan //someone can totally use this fo src.equip_if_possible(new /obj/item/clothing/under/rank/chaplain(src), slot_w_uniform) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) bioHolder.mobAppearance.UpdateMob() /mob/living/carbon/human/fatherjack @@ -186,7 +186,7 @@ mob/living/carbon/human/cluwne/satan/megasatan //someone can totally use this fo src.equip_if_possible(new /obj/item/clothing/under/misc/chaplain(src), slot_w_uniform) src.traitHolder.addTrait("training_chaplain") - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) bioHolder.mobAppearance.UpdateMob() Life(datum/controller/process/mobs/parent) @@ -199,7 +199,7 @@ mob/living/carbon/human/cluwne/satan/megasatan //someone can totally use this fo attackby(obj/item/W, mob/M) if (istype(W, /obj/item/paper/postcard/owlery)) boutput(M, "You show [W] to [src] ") - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) say("Aye! Bill won't stop talking about it!") return ..() @@ -331,7 +331,7 @@ proc/empty_mouse_params()//TODO MOVE THIS!!! /* proc/n() keys_changed(KEY_FORWARD, KEY_FORWARD) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) keys_changed(0,0xFFFF) proc/s() src.process_move(SOUTH) @@ -345,7 +345,7 @@ proc/empty_mouse_params()//TODO MOVE THIS!!! src.process_move(SOUTHWEST) proc/ne() keys_changed(KEY_FORWARD|KEY_RIGHT, KEY_FORWARD|KEY_RIGHT) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) keys_changed(0,KEY_FORWARD|KEY_BACKWARD|KEY_RIGHT|KEY_LEFT) proc/se() src.process_move(SOUTHEAST) @@ -362,7 +362,7 @@ proc/empty_mouse_params()//TODO MOVE THIS!!! bioHolder.bloodType = "A-" bioHolder.mobAppearance.gender = "male" bioHolder.mobAppearance.underwear = "briefs" - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) bioHolder.mobAppearance.UpdateMob() src.equip_if_possible(new /obj/item/clothing/shoes/brown(src), slot_shoes) @@ -407,7 +407,7 @@ proc/empty_mouse_params()//TODO MOVE THIS!!! //FUCK I AM GOOG GOOD GOOD CODER - SPAWN_DBG(500) + SPAWN_DBG(50 SECONDS) if (!twitch_mob || !twitch_mob.client) for (var/client/C in clients) if (C.ckey == TWITCH_BOT_CKEY) @@ -418,7 +418,7 @@ proc/empty_mouse_params()//TODO MOVE THIS!!! - SPAWN_DBG(1000) + SPAWN_DBG(100 SECONDS) if (!twitch_mob || !twitch_mob.client) for (var/client/C in clients) if (C.ckey == TWITCH_BOT_CKEY) @@ -571,7 +571,7 @@ proc/empty_mouse_params()//TODO MOVE THIS!!! say("I think my [pick(BILL_friends)] [pick(BILL_friendActions)].") /* commenting out the bartender stuff because he aint around much. replacing with john bill retorts. if (prob(10)) - SPAWN_DBG(40) + SPAWN_DBG(4 SECONDS) for (var/mob/living/carbon/human/npc/diner_bartender/BT in all_hearers(7, src)) switch (speech_type) if (4) @@ -593,7 +593,7 @@ proc/empty_mouse_params()//TODO MOVE THIS!!! */ if (johnbills.len > 0 && prob(25)) - SPAWN_DBG(40) + SPAWN_DBG(4 SECONDS) var/mob/living/carbon/human/john/MJ = pick(johnbills) switch (speech_type) if (4) @@ -621,12 +621,12 @@ proc/empty_mouse_params()//TODO MOVE THIS!!! attackby(obj/item/W, mob/M) if (istype(W, /obj/item/paper/tug/invoice)) boutput(M, "You show [W] to [src] ") - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) say("Hard to believe, but I think my [pick(BILL_friends)] would be proud to see it.") return if (istype(W, /obj/item/paper/postcard/owlery)) boutput(M, "You show [W] to [src] ") - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) say("Yep, can't wait to go on that trip! That [pick(JOHN_insults)] oughta be here soon!") return if (istype(W, /obj/item/ursium/U)) @@ -636,7 +636,7 @@ proc/empty_mouse_params()//TODO MOVE THIS!!! var/obj/item/ursium/antiU/aU = W boutput(M, "You show [W] to [src] ") say("Whoa nelly! Mind if i have a taste?") - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) M.visible_message("[src] touches the [W]! Something isnt right! ") aU:annihilation(2 * aU.ursium) return @@ -686,7 +686,7 @@ proc/empty_mouse_params()//TODO MOVE THIS!!! src.gender = "male" src.real_name = "Myke" - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) bioHolder.mobAppearance.UpdateMob() src.equip_if_possible(new /obj/item/clothing/shoes/red(src), slot_shoes) @@ -730,7 +730,7 @@ proc/empty_mouse_params()//TODO MOVE THIS!!! src.bioHolder.mobAppearance.s_tone = pick("#FAD7D0", "#BD8A57", "#935D37") src.real_name = "[pick(prob(150); "W", "V")][pick(prob(150); "a", "au", "o", "e")][pick(prob(150); "l", "ll")][pick(prob(150); "d", "t")][pick(prob(150); "o", "oh", "a", "e")]" - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) bioHolder.mobAppearance.UpdateMob() var/shoes = text2path("/obj/item/clothing/shoes/" + pick("black","brown","red")) @@ -784,7 +784,7 @@ proc/empty_mouse_params()//TODO MOVE THIS!!! bioHolder.mobAppearance.customization_first_color = "#F6D646" bioHolder.mobAppearance.gender = "male" bioHolder.mobAppearance.underwear = "boxers" - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) bioHolder.mobAppearance.UpdateMob() src.equip_if_possible(new /obj/item/clothing/shoes/orange(src), slot_shoes) @@ -795,7 +795,7 @@ proc/empty_mouse_params()//TODO MOVE THIS!!! attackby(obj/item/W, mob/M) if (istype(W, /obj/item/paper/postcard/owlery)) boutput(M, "You show [W] to [src] ") - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) say("Oh yeah sure, I seen it. That ol- how would he say it, [pick(BILL_insults)]? He won't stop going on and on and on...") ..() @@ -826,7 +826,7 @@ proc/empty_mouse_params()//TODO MOVE THIS!!! bioHolder.mobAppearance.gender = "male" bioHolder.mobAppearance.s_tone = "#FAD7D0" bioHolder.AddEffect("accent_tommy") - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) bioHolder.mobAppearance.UpdateMob() src.equip_if_possible(new /obj/item/clothing/shoes/black {cant_drop = 1; cant_other_remove = 1; cant_self_remove = 1} (src), slot_shoes) @@ -869,7 +869,7 @@ proc/empty_mouse_params()//TODO MOVE THIS!!! bioHolder.mobAppearance.gender = "male" bioHolder.mobAppearance.underwear = "boxers" real_name = "[pick("Chut","Brendt","Franko","Steephe","Geames","Whitney","Thom","Cheddar")] \"Big Yank\" Whitney" - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) bioHolder.mobAppearance.UpdateMob() src.equip_if_possible(new /obj/item/clothing/shoes/orange(src), slot_shoes) @@ -890,7 +890,7 @@ proc/empty_mouse_params()//TODO MOVE THIS!!! attackby(obj/item/W, mob/M) if (istype(W, /obj/item/paper/tug/invoice)) boutput(M, "You show [W] to [src] ") - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) say(pick("Brudder, I did that job months ago. Fuck outta here with that.","Oh come on, quit wastin my time [pick(JOHN_insults)].")) return ..() diff --git a/code/mob/living/carbon/human/machoman.dm b/code/mob/living/carbon/human/machoman.dm index 4a51f02..69a0f07 100644 --- a/code/mob/living/carbon/human/machoman.dm +++ b/code/mob/living/carbon/human/machoman.dm @@ -20,7 +20,7 @@ var/list/snd_macho_idle = list('sound/voice/macho/macho_alert16.ogg', 'sound/voi src.bioHolder.mobAppearance.customization_first = "Dreadlocks" src.bioHolder.mobAppearance.customization_second = "Full Beard" - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src.bioHolder.mobAppearance.UpdateMob() //src.mind = new @@ -143,7 +143,7 @@ var/list/snd_macho_idle = list('sound/voice/macho/macho_alert16.ogg', 'sound/voi src.visible_message("[src] parries [M]'s attack, knocking them to the ground!") M.changeStatus("weakened", 10 SECONDS) playsound(src.loc, "sound/impact_sounds/Generic_Shove_1.ogg", 65, 1) - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) playsound(src.loc, pick(snd_macho_rage), 60, 0, 0, src.get_age_pitch()) return @@ -212,7 +212,7 @@ var/list/snd_macho_idle = list('sound/voice/macho/macho_alert16.ogg', 'sound/voi src.visible_message("[src] crushes [G.affecting]'s body into bits!") G.affecting.gib() qdel(G) - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) playsound(src.loc, pick(snd_macho_rage), 50, 0, 0, src.get_age_pitch()) src.visible_message("[src] lets out an angry warcry!") break @@ -239,7 +239,7 @@ var/list/snd_macho_idle = list('sound/voice/macho/macho_alert16.ogg', 'sound/voi src.visible_message("[src] crushes [G.affecting]'s body into bits!") G.affecting.gib() qdel(G) - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) playsound(src.loc, pick(snd_macho_rage), 50, 0, 0, src.get_age_pitch()) src.visible_message("[src] lets out an angry warcry!") break @@ -368,7 +368,7 @@ var/list/snd_macho_idle = list('sound/voice/macho/macho_alert16.ogg', 'sound/voi O.icon_state = "explosion" SPAWN_DBG(35) qdel(O) random_brute_damage(H, 50) - H.changeStatus("weakened", 1 SECONDS) + H.changeStatus("weakened", 1 SECOND) H.pixel_x = 0 H.pixel_y = 0 H.transforming = 0 @@ -377,7 +377,7 @@ var/list/snd_macho_idle = list('sound/voice/macho/macho_alert16.ogg', 'sound/voi src.pixel_y = 0 src.transforming = 0 src.set_density(1) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.verbs += /mob/living/carbon/human/machoman/verb/macho_leap verb/macho_rend() @@ -461,7 +461,7 @@ var/list/snd_macho_idle = list('sound/voice/macho/macho_alert16.ogg', 'sound/voi H.gib() src.transforming = 0 src.verbs += /mob/living/carbon/human/machoman/verb/macho_rend - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) playsound(src.loc, pick(snd_macho_rage), 50, 0, 0, src.get_age_pitch()) src.visible_message("[src] gloats and boasts!") @@ -554,7 +554,7 @@ var/list/snd_macho_idle = list('sound/voice/macho/macho_alert16.ogg', 'sound/voi src.transforming = 0 src.bioHolder.RemoveEffect("fire_resist") playsound(src.loc, pick(snd_macho_rage), 50, 0, 0, src.get_age_pitch()) - SPAWN_DBG(1200) // holy shit the micro man spam from ONE macho man is awful + SPAWN_DBG(2 MINUTES) // holy shit the micro man spam from ONE macho man is awful src.verbs += /mob/living/carbon/human/machoman/verb/macho_minions */ verb/macho_piledriver() @@ -630,7 +630,7 @@ var/list/snd_macho_idle = list('sound/voice/macho/macho_alert16.ogg', 'sound/voi O.pixel_y = -96 O.icon = 'icons/effects/214x246.dmi' O.icon_state = "explosion" - SPAWN_DBG(35) qdel(O) + SPAWN_DBG(3.5 SECONDS) qdel(O) random_brute_damage(H, 50) H.changeStatus("weakened", 10 SECONDS) src.verbs += /mob/living/carbon/human/machoman/verb/macho_piledriver @@ -699,7 +699,7 @@ var/list/snd_macho_idle = list('sound/voice/macho/macho_alert16.ogg', 'sound/voi O.icon = 'icons/effects/214x246.dmi' O.icon_state = "explosion" O.fingerprintslast = src.key - SPAWN_DBG(35) qdel(O) + SPAWN_DBG(3.5 SECONDS) qdel(O) explosion(O, H.loc, 1, 2, 3, 4, 1) H.gib() src.verbs += /mob/living/carbon/human/machoman/verb/macho_superthrow @@ -956,7 +956,7 @@ var/list/snd_macho_idle = list('sound/voice/macho/macho_alert16.ogg', 'sound/voi did_it = 1 else src.show_text("Man, this poor sucker ain't got a heart to punch, whatta chump.", "blue") - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) if (!src.stat) src.emote("sigh") @@ -1054,7 +1054,7 @@ var/list/snd_macho_idle = list('sound/voice/macho/macho_alert16.ogg', 'sound/voi src.transforming = 0 src.bioHolder.RemoveEffect("fire_resist") src.mouse_opacity = 1 - SPAWN_DBG(600) + SPAWN_DBG(1 MINUTE) if (siren) siren.repeat = 0 siren.status = SOUND_UPDATE @@ -1135,7 +1135,7 @@ var/list/snd_macho_idle = list('sound/voice/macho/macho_alert16.ogg', 'sound/voi O.show_message("[src] charges at [M]!", 1) if (prob(50)) playsound(src.loc, pick(snd_macho_rage), 50, 1, 0, 1.75) - M.changeStatus("stunned", 1 SECONDS) + M.changeStatus("stunned", 1 SECOND) if (prob(25)) M.changeStatus("weakened", 2 SECONDS) random_brute_damage(M, rand(1,2)) @@ -1217,7 +1217,7 @@ var/list/snd_macho_idle = list('sound/voice/macho/macho_alert16.ogg', 'sound/voi H.bodytemperature = H.base_body_temp else target.visible_message("[target] shoves \his face deep into [src]!") - SPAWN_DBG(25) + SPAWN_DBG(2.5 SECONDS) target.visible_message("[target]'s pupils dilate.") target.changeStatus("stunned", 10 SECONDS) @@ -1253,7 +1253,7 @@ var/list/snd_macho_idle = list('sound/voice/macho/macho_alert16.ogg', 'sound/voi O.pixel_y = -96 O.icon = 'icons/effects/214x246.dmi' O.icon_state = "explosion" - SPAWN_DBG(35) qdel(O) + SPAWN_DBG(3.5 SECONDS) qdel(O) for (var/mob/N in viewers(user)) shake_camera(N, 8, 3) SPAWN_DBG(0) diff --git a/code/mob/living/carbon/human/monkeys.dm b/code/mob/living/carbon/human/monkeys.dm index ff26f02..ae68f94 100644 --- a/code/mob/living/carbon/human/monkeys.dm +++ b/code/mob/living/carbon/human/monkeys.dm @@ -5,7 +5,7 @@ New() ..() - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) if (!src.disposed) cust_one_state = "None" src.bioHolder.AddEffect("monkey") @@ -21,7 +21,7 @@ gender = "male" New() ..() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src.equip_if_possible(new /obj/item/clothing/under/color/blue(src), slot_w_uniform) /mob/living/carbon/human/npc/monkey/mrs_muggles @@ -30,7 +30,7 @@ gender = "female" New() ..() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src.equip_if_possible(new /obj/item/clothing/under/color/magenta(src), slot_w_uniform) /mob/living/carbon/human/npc/monkey/mr_rathen @@ -39,7 +39,7 @@ gender = "male" New() ..() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src.equip_if_possible(new /obj/item/clothing/under/rank/engineer(src), slot_w_uniform) /mob/living/carbon/human/npc/monkey/albert @@ -48,7 +48,7 @@ gender = "male" New() ..() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src.equip_if_possible(new /obj/item/clothing/suit/space(src), slot_wear_suit) src.equip_if_possible(new /obj/item/clothing/head/helmet/space(src), slot_head) @@ -58,7 +58,7 @@ gender = "male" New() ..() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src.equip_if_possible(new /obj/item/clothing/suit/space/syndicate(src), slot_wear_suit) src.equip_if_possible(new /obj/item/clothing/head/helmet/space(src), slot_head) @@ -68,7 +68,7 @@ gender = "male" New() ..() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src.equip_if_possible(new /obj/item/clothing/mask/horse_mask/cursed/monkey(src), slot_wear_mask) /mob/living/carbon/human/npc/monkey/tanhony @@ -77,7 +77,7 @@ gender = "female" New() ..() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src.equip_if_possible(new /obj/item/clothing/head/paper_hat(src), slot_head) /mob/living/carbon/human/npc/monkey/krimpus @@ -86,7 +86,7 @@ gender = "female" New() ..() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src.equip_if_possible(new /obj/item/clothing/under/rank/hydroponics(src), slot_w_uniform) /mob/living/carbon/human/npc/monkey/stirstir @@ -95,7 +95,7 @@ gender = "male" New() ..() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src.equip_if_possible(new /obj/item/clothing/under/color/orange(src), slot_w_uniform) src.equip_if_possible(new /obj/item/clothing/head/beret/prisoner(src), slot_head) @@ -111,7 +111,7 @@ New() ..() npcmonkeypals += src - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) if (!src.disposed) src.bioHolder.mobAppearance.customization_first = "None" src.cust_one_state = "None" @@ -175,7 +175,7 @@ src.was_harmed(A) else walk_away(src, A, 10, 1) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) walk(src, 0) proc/done_with_you(var/atom/T as mob|obj) @@ -341,7 +341,7 @@ New() ..() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) var/head = pick(/obj/item/clothing/head/bandana/red, /obj/item/clothing/head/bandana/random_color) src.equip_if_possible(new head(src), slot_head) @@ -353,7 +353,7 @@ New() ..() - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) if (!src.disposed) cust_one_state = "None" src.bioHolder.AddEffect("seamonkey") @@ -372,7 +372,7 @@ ai_aggression_timeout = null New() ..() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(src), slot_glasses) src.equip_if_possible(new /obj/item/clothing/under(src), slot_w_uniform) @@ -385,7 +385,7 @@ ai_aggression_timeout = null New() ..() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(src), slot_glasses) src.equip_if_possible(new /obj/item/gun/kinetic/detectiverevolver(src), slot_l_hand) src.equip_if_possible(new /obj/item/clothing/under(src), slot_w_uniform) @@ -399,7 +399,7 @@ ai_aggression_timeout = null New() ..() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src.equip_if_possible(new /obj/item/clothing/head/crown(src), slot_head) /mob/living/carbon/human/npc/monkey/sea/lab @@ -408,7 +408,7 @@ gender = "female" New() ..() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src.equip_if_possible(new /obj/item/clothing/glasses/regular(src), slot_glasses) src.equip_if_possible(new /obj/item/clothing/under/rank/scientist(src), slot_w_uniform) @@ -419,6 +419,6 @@ gender = "male" New() ..() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src.equip_if_possible(new /obj/item/clothing/under/suit(src), src.slot_w_uniform) src.equip_if_possible(new /obj/item/clothing/shoes/black(src), src.slot_shoes) diff --git a/code/mob/living/carbon/human/normal.dm b/code/mob/living/carbon/human/normal.dm index 1ddd50f..1f7fdc0 100644 --- a/code/mob/living/carbon/human/normal.dm +++ b/code/mob/living/carbon/human/normal.dm @@ -4,7 +4,7 @@ SPAWN_DBG(0) randomize_look(src, 1, 1, 1, 1, 1, 1) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) set_clothing_icon_dirty() /mob/living/carbon/human/normal/assistant diff --git a/code/mob/living/carbon/human/npc.dm b/code/mob/living/carbon/human/npc.dm index 0d61e63..a7154a6 100644 --- a/code/mob/living/carbon/human/npc.dm +++ b/code/mob/living/carbon/human/npc.dm @@ -15,9 +15,9 @@ src.mind = new(src) if (src.name == "human") randomize_look(src, 1, 1, 1, 1, 1, 0) // change gender/bloodtype/age/name/underwear, keep bioeffects - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) set_clothing_icon_dirty() - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) ai_init() /mob/living/carbon/human/npc/assistant @@ -163,7 +163,7 @@ if(src.canmove && !ai_busy) ai_busy = 1 src.visible_message("[src] attempts to remove the handcuffs!") - SPAWN_DBG(1200) + SPAWN_DBG(2 MINUTES) ai_busy = 0 if(src.handcuffed && !ai_incapacitated()) src.visible_message("[src] manages to remove the handcuffs!") @@ -173,7 +173,7 @@ ai_move() if(ai_target) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) ai_move() action_delay += 10 else diff --git a/code/mob/living/carbon/human/procs/Life.dm b/code/mob/living/carbon/human/procs/Life.dm index 0c67bc0..82670d5 100644 --- a/code/mob/living/carbon/human/procs/Life.dm +++ b/code/mob/living/carbon/human/procs/Life.dm @@ -71,7 +71,7 @@ if(doThumps) return doThumps = 1 Thumper_thump(1) - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) while(src.doThumps) Thumper_thump(0) sleep(20) @@ -686,7 +686,7 @@ if (bioHolder) bioHolder.OnLife() if (src.bomberman == 1) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) new /obj/bomberman(get_turf(src)) proc/breathe() diff --git a/code/mob/living/carbon/human/procs/damage.dm b/code/mob/living/carbon/human/procs/damage.dm index 0753b26..9c5c7e4 100644 --- a/code/mob/living/carbon/human/procs/damage.dm +++ b/code/mob/living/carbon/human/procs/damage.dm @@ -229,7 +229,7 @@ src.changeStatus("radiation", damage SECONDS) if (src.add_stam_mod_regen("projectile", -5)) - SPAWN_DBG(300) + SPAWN_DBG(30 SECONDS) src.remove_stam_mod_regen("projectile") if (D_TOXIC) @@ -281,7 +281,7 @@ src.flash(30) if (isdead(src) && src.client) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) src.gib(1) return @@ -348,7 +348,7 @@ switch (severity) if (1.0) b_loss += max(500 - reduction, 0) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) src.gib(1) return @@ -499,7 +499,7 @@ visible_message("The blob has knocked [src] off-balance!") drop_item() if (prob(50)) - src.changeStatus("weakened", 1 SECONDS) + src.changeStatus("weakened", 1 SECOND) if ("r_leg") if (temp) temp.take_damage(damage, 0) @@ -507,7 +507,7 @@ visible_message("The blob has knocked [src] off-balance!") drop_item() if (prob(50)) - src.changeStatus("weakened", 1 SECONDS) + src.changeStatus("weakened", 1 SECOND) src.UpdateDamageIcon() return @@ -746,7 +746,7 @@ eyeblind = 5 src.change_eye_blurry(5) src.bioHolder.AddEffect("bad_eyesight") - SPAWN_DBG(100) + SPAWN_DBG(10 SECONDS) src.bioHolder.RemoveEffect("bad_eyesight") if (25 to INFINITY) diff --git a/code/mob/living/carbon/human/procs/emote.dm b/code/mob/living/carbon/human/procs/emote.dm index 0e0c0b9..74f5a85 100644 --- a/code/mob/living/carbon/human/procs/emote.dm +++ b/code/mob/living/carbon/human/procs/emote.dm @@ -193,7 +193,7 @@ playsound(get_turf(src), 'sound/vox/uguu.ogg', 80, 0, 0, src.get_age_pitch()) else playsound(get_turf(src), 'sound/voice/uguu.ogg', 80, 0, 0, src.get_age_pitch()) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src.gib() new /obj/item/clothing/mask/anime(src.loc) return @@ -254,7 +254,7 @@ if (istype(src.head, /obj/item/clothing/head/fedora)) var/obj/item/clothing/head/fedora/hat = src.head message = "[src] tips \his [hat] and [pick("winks", "smiles", "grins", "smirks")].
[src] [pick("says", "states", "articulates", "implies", "proclaims", "proclamates", "promulgates", "exclaims", "exclamates", "extols", "predicates")], "M'lady."" - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) hat.set_loc(src.loc) src.head = null src.gib() @@ -1036,7 +1036,7 @@ // todo: add context-sensitive break dancing and some other goofy shit - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) var/beeMax = 15 for (var/obj/critter/domestic_bee/responseBee in range(7, src)) if (!responseBee.alive) @@ -1058,7 +1058,7 @@ if (src.traitHolder && src.traitHolder.hasTrait("happyfeet")) if (prob(33)) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) for (var/mob/living/carbon/human/responseMonkey in range(1, src)) // they don't have to be monkeys, but it's signifying monkey code if (responseMonkey.stat || responseMonkey.getStatusDuration("paralysis") || responseMonkey.sleeping || responseMonkey.getStatusDuration("stunned") || (responseMonkey == src)) continue @@ -1263,7 +1263,7 @@ //playsound(get_turf(src), src.sound_malescream, 80, 0, 0, src.get_age_pitch()) //else playsound(get_turf(src), src.sound_scream, 80, 0, 0, src.get_age_pitch()) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) var/possumMax = 15 for (var/obj/critter/opossum/responsePossum in range(4, src)) if (!responsePossum.alive) @@ -1451,7 +1451,7 @@ if (src.getStatusDuration("food_space_farts")) src.inertia_dir = src.dir step(src, inertia_dir) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) src.inertia_dir = src.dir step(src, inertia_dir) diff --git a/code/mob/living/carbon/human/welder.dm b/code/mob/living/carbon/human/welder.dm index 0f2431f..7f95d8e 100644 --- a/code/mob/living/carbon/human/welder.dm +++ b/code/mob/living/carbon/human/welder.dm @@ -90,7 +90,7 @@ var/mob/dead/observer/O = new/mob/dead/observer(src) src.mind.transfer_to(O) O.make_welder() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) if(!src.client) qdel(src) @@ -101,7 +101,7 @@ var/mob/living/carbon/human/welder/mob = new /mob/living/carbon/human/welder(src.loc) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) var/obj/item/device/radio/R = new /obj/item/device/radio/headset(mob) mob.equip_if_possible(R, mob.slot_ears) mob.equip_if_possible(new /obj/item/clothing/gloves/black(mob), mob.slot_gloves) @@ -129,7 +129,7 @@ mob.make_welder() mob.welder_damage = src.welder_damage - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) if(!src.client) del(src) @@ -152,7 +152,7 @@ set desc= "Opens some doors" for(var/obj/machinery/door/G in oview(3)) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) G.open() /mob/living/carbon/human/welder/proc/welder_portal() @@ -208,9 +208,9 @@ var/number_left = 5 /obj/hellportal/New() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) new /obj/effects/void_break(src.loc) - SPAWN_DBG(15) + SPAWN_DBG(1.5 SECONDS) critter_spam() /obj/hellportal/proc/critter_spam() diff --git a/code/mob/living/critter.dm b/code/mob/living/critter.dm index a0a8311..a49ded9 100644 --- a/code/mob/living/critter.dm +++ b/code/mob/living/critter.dm @@ -114,7 +114,7 @@ src.organHolder = new/datum/organHolder/critter(src, custom_brain_type) ..() - SPAWN_DBG(5) //mbc what the fuck. i dont know why but if i don't spawn, no abilities even show up + SPAWN_DBG(5 DECI SECONDS) //mbc what the fuck. i dont know why but if i don't spawn, no abilities even show up if (abilityHolder) abilityHolder.updateButtons() @@ -340,7 +340,7 @@ var/mob/living/carbon/C = item logTheThing("combat", src, C, "throws %target% at [log_loc(src)].") if ( ishuman(C) ) - C.changeStatus("weakened", 1 SECONDS) + C.changeStatus("weakened", 1 SECOND) else // Added log_reagents() call for drinking glasses. Also the location (Convair880). logTheThing("combat", src, null, "throws [item] [item.is_open_container() ? "[log_reagents(item)]" : ""] at [log_loc(src)].") diff --git a/code/mob/living/critter/aquatic.dm b/code/mob/living/critter/aquatic.dm index b36d588..69232b8 100644 --- a/code/mob/living/critter/aquatic.dm +++ b/code/mob/living/critter/aquatic.dm @@ -206,7 +206,7 @@ switch (act) if ("flip") if (src.emote_check(voluntary, 50) && !src.water_need) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) animate_bumble(src) return null if ("dance") @@ -442,7 +442,7 @@ src.pixel_x-= 2 src.dir = turn(src.dir, 90) sleep(2) - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) for (var/mob/living/M in oview(src, 7)) M.reagents.add_reagent(pick("cyanide","neurotoxin","venom","histamine","jenkem","lsd"), 5) return "[src] does a sinister dance." @@ -456,7 +456,7 @@ if (src.emote_check(voluntary, 300)) src.health_brute_vuln = 0.1 src.health_burn_vuln = 0.5 - SPAWN_DBG(100) + SPAWN_DBG(10 SECONDS) if (src) src.health_brute_vuln = 0.5 src.health_burn_vuln = 3 diff --git a/code/mob/living/critter/bee.dm b/code/mob/living/critter/bee.dm index 70d3a18..9f694ec 100644 --- a/code/mob/living/critter/bee.dm +++ b/code/mob/living/critter/bee.dm @@ -69,7 +69,7 @@ switch (act) if ("flip") if (src.emote_check(voluntary, 50) && !src.shrunk) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) animate_bumble(src) return null if ("snap","buzz") @@ -134,7 +134,7 @@ LAGCHECK(LAG_HIGH) if (fellow_bee && fellow_bee.alive) fellow_bee.aggressive = 1 - SPAWN_DBG(7) + SPAWN_DBG(7 DECI SECONDS) fellow_bee.aggressive = 0 ..() @@ -515,7 +515,7 @@ if (MT.loc != holder.owner) holder.owner.visible_message("[holder.owner] swallows [MT] whole!") MT.set_loc(holder.owner) - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) var/obj/icecube/honeycube = new /obj/icecube(src) MT.set_loc(honeycube) honeycube.name = "block of honey" @@ -562,7 +562,7 @@ playsound(get_turf(holder.owner), 'sound/voice/animal/buzz.ogg', 100, 1) boutput(MT, "You feel a horrible pain in your head!") MT.changeStatus("stunned", 2 SECONDS) - SPAWN_DBG(25) + SPAWN_DBG(2.5 SECONDS) if ((get_dist(holder.owner, MT) <= 6) && !isdead(holder.owner)) MT.visible_message("[MT] clutches their temples!") MT.emote("scream") @@ -842,7 +842,7 @@ user.u_equip(W) W.set_loc(src) user.visible_message("[user] feeds [W] to [src]!","You feed [W] to [src]. Fuck!") - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) W.icon_state = "key_gold" W.desc += " It appears to be covered in honey. Gross." src.visible_message("[src] regurgitates [W]!") diff --git a/code/mob/living/critter/changeling_critters.dm b/code/mob/living/critter/changeling_critters.dm index 8e6e5bf..73fffe5 100644 --- a/code/mob/living/critter/changeling_critters.dm +++ b/code/mob/living/critter/changeling_critters.dm @@ -146,7 +146,7 @@ src.icon_state = "[icon_prefix]handspider-flip" animate_handspider_flipoff(src, prob(50) ? "L" : "R", 1, 0) - SPAWN_DBG(7) + SPAWN_DBG(7 DECI SECONDS) //Adding check for icon_state in case they die mid-flipoff (heck) if(!isdead(src)) src.icon_state = "[icon_prefix]handspider" //Flipoff diff --git a/code/mob/living/critter/drone.dm b/code/mob/living/critter/drone.dm index c1b2651..284f092 100644 --- a/code/mob/living/critter/drone.dm +++ b/code/mob/living/critter/drone.dm @@ -60,7 +60,7 @@ return dying = 1 overlays += image('icons/obj/ship.dmi', "dying-overlay") - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) ghostize() var/turf/L = get_turf(src) for (var/T in loot_table) diff --git a/code/mob/living/critter/flock/flockbit.dm b/code/mob/living/critter/flock/flockbit.dm index 4da9fed..f080160 100644 --- a/code/mob/living/critter/flock/flockbit.dm +++ b/code/mob/living/critter/flock/flockbit.dm @@ -11,13 +11,13 @@ flags = TABLEPASS /mob/living/critter/flock/bit/New(var/datum/flock/F=null) - ..(F) + ..(F) // ai setup src.ai = new /datum/aiHolder/flock/bit() src.ai.owner = src - SPAWN_DBG(10) // aaaaaaa + SPAWN_DBG(1 SECOND) // aaaaaaa animate_bumble(src) src.zone_sel.change_hud_style('icons/mob/flock_ui.dmi') @@ -28,7 +28,7 @@ if(isflock(user)) var/special_desc = "###=- Ident confirmed, data packet received." special_desc += "
ID: [src.real_name]" - special_desc += "
Flock: [src.flock ? src.flock.name : "none"]" + special_desc += "
Flock: [src.flock ? src.flock.name : "none"]" special_desc += "
System Integrity: [round(src.get_health_percentage()*100)]%" special_desc += "
Cognition: PREDEFINED" special_desc += "
###=-" @@ -94,7 +94,7 @@ return "[src] chimes." if ("flip") if (src.emote_check(voluntary, 50) && !src.shrunk) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) animate_bumble(src) // start the floaty animation again (stolen from bees of course) return null return null diff --git a/code/mob/living/critter/flock/flockdrone.dm b/code/mob/living/critter/flock/flockdrone.dm index d3ea5f3..3dd6279 100644 --- a/code/mob/living/critter/flock/flockdrone.dm +++ b/code/mob/living/critter/flock/flockdrone.dm @@ -42,7 +42,7 @@ src.ai = new /datum/aiHolder/flock/drone() src.ai.owner = src - SPAWN_DBG(30) // aaaaaaa + SPAWN_DBG(3 SECONDS) // aaaaaaa src.zone_sel.change_hud_style('icons/mob/flock_ui.dmi') src.name = "[pick_string("flockmind.txt", "flockdrone_name_adj")] [pick_string("flockmind.txt", "flockdrone_name_noun")]" @@ -585,7 +585,7 @@ B = new(get_turf(src), F = src.flock) if(src.flock) src.flock.registerUnit(B) - SPAWN_DBG(2) + SPAWN_DBG(2 DECI SECONDS) B.loc = pick(candidate_turfs) sleep(1) // make sure the animation finishes // finally, away with us diff --git a/code/mob/living/critter/flockcritter_parent.dm b/code/mob/living/critter/flockcritter_parent.dm index 8d37f49..c37bccf 100644 --- a/code/mob/living/critter/flockcritter_parent.dm +++ b/code/mob/living/critter/flockcritter_parent.dm @@ -1,8 +1,8 @@ /mob/living/critter/flock - var/resources = 0 + var/resources = 0 name = "concept of a bird machine" desc = "Well, that's a thing." - icon = 'icons/misc/featherzone.dmi' + icon = 'icons/misc/featherzone.dmi' density = 0 say_language = "feather" voice_name = "synthetic chirps" @@ -12,7 +12,7 @@ speechverb_ask = "inquires" speechverb_gasp = "clatters" speechverb_stammer = "buzzes" - custom_gib_handler = /proc/flockdronegibs + custom_gib_handler = /proc/flockdronegibs custom_vomit_type = /obj/decal/cleanable/flockdrone_debris/fluid // HEALTHS var/health_brute = 1 @@ -45,7 +45,7 @@ // flockless drones act differently src.flock = F // wait for like one tick for the unit to set up properly before registering - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) if(!isnull(src.flock)) src.flock.registerUnit(src) @@ -111,12 +111,12 @@ playsound(get_turf(src), "sound/weapons/rev_flash_startup.ogg", 40, 1, -3) boutput(src, "\[SYSTEM: Fire detected in critical systems. Integrated extinguishing systems are engaging.\]") src.extinguishing = 1 - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) var/obj/fire_foam/F = (locate(/obj/fire_foam) in src.loc) if (!F) F = unpool(/obj/fire_foam) F.set_loc(src.loc) - SPAWN_DBG(100) + SPAWN_DBG(10 SECONDS) if (F && !F.disposed) pool(F) playsound(get_turf(src), "sound/effects/spray.ogg", 50, 1, -3) @@ -287,7 +287,7 @@ onUpdate() ..() - var/mob/living/critter/flock/drone/F = owner + var/mob/living/critter/flock/drone/F = owner if (F && !F.can_afford(100)) interrupt(INTERRUPT_ALWAYS) F.canmove = 1 diff --git a/code/mob/living/critter/hastur.dm b/code/mob/living/critter/hastur.dm index a926909..435d85b 100644 --- a/code/mob/living/critter/hastur.dm +++ b/code/mob/living/critter/hastur.dm @@ -162,7 +162,7 @@ var/HasturPresent = 0 M.visible_message(pick("[M] reveals their true form for a moment and -COMPLETELY- devours [target]!","Huge mouth emerges underneath [M]'s robes and DEVOURS [target]!","[M] growls angrily as they reveal their true form, completely devouring [target]!")) playsound(M.loc, pick('sound/misc/hastur/devour1.ogg','sound/misc/hastur/devour2.ogg','sound/misc/hastur/devour3.ogg','sound/misc/hastur/devour4.ogg'), 90,1) flick("hastur-devour", M) - spawn(7) + spawn(7 DECI SECONDS) target.gib() target.icon_state = "lost" target.name = "Soulless [target.real_name]" @@ -184,7 +184,7 @@ var/HasturPresent = 0 M.updateOverlaysClient(M.client) boutput(M, pick("The reality around you fades out..","Suddenly your mind feels extremely frail and vulnerable..","Your sanity starts to fail you...")) playsound(M, "sound/ambience/spooky/Void_Song.ogg", 50, 1) - spawn(620) + spawn(62 SECONDS) M.removeOverlayComposition(/datum/overlayComposition/insanity) M.updateOverlaysClient(M.client) diff --git a/code/mob/living/critter/martian.dm b/code/mob/living/critter/martian.dm index bcd73de..d2fdf34 100644 --- a/code/mob/living/critter/martian.dm +++ b/code/mob/living/critter/martian.dm @@ -281,7 +281,7 @@ proc/martian_speak(var/mob/speaker, var/message as text, var/speak_as_admin=0) New() ..() // TEMPORARY THING TO ESTABLISH THESE DUDES AS EXPLICITLY ANTAGS OK - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) SHOW_MARTIAN_TIPS(src) boutput(src, "

You are a Martian Infiltrator!

") boutput(src, "Find a safe place to start building a base with your teammates!") diff --git a/code/mob/living/critter/mechmonstrosity.dm b/code/mob/living/critter/mechmonstrosity.dm index 7d56f4a..9bb2397 100644 --- a/code/mob/living/critter/mechmonstrosity.dm +++ b/code/mob/living/critter/mechmonstrosity.dm @@ -512,7 +512,7 @@ playsound(src.loc, "punch", 30, 1, -2) random_brute_damage(M, rand(10,15)) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src.attacking = 0 CritterDeath(mob/M) diff --git a/code/mob/living/critter/small_animal.dm b/code/mob/living/critter/small_animal.dm index 47abd85..4e8d17a 100644 --- a/code/mob/living/critter/small_animal.dm +++ b/code/mob/living/critter/small_animal.dm @@ -317,7 +317,7 @@ todo: add more small animals! death(var/gibbed) if (!gibbed && prob(5)) - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) if (src && isdead(src)) src.visible_message("[src] comes back to life, good thing [he_or_she(src)] has 9 lives!") src.full_heal() @@ -487,7 +487,7 @@ todo: add more small animals! src.setStatus("weakened", 100) src.visible_message("[src] flops on [his_or_her(src)] back! Scratch that belly!",\ "You flop on your back!") - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) if (src && !isdead(src)) src.delStatus("paralysis") src.changeStatus("stunned", 10 SECONDS) @@ -745,7 +745,7 @@ todo: add more small animals! if (src.emote_check(voluntary, 30)) if (src.icon_state_poof) src.icon_state = src.icon_state_poof - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) if (src && !isdead(src)) src.icon_state = src.species if (prob(3)) @@ -766,7 +766,7 @@ todo: add more small animals! if (prob(3)) SPAWN_DBG(0) src.create_feather() - SPAWN_DBG(38) + SPAWN_DBG(3.8 SECONDS) if (src && !isdead(src)) src.icon_state = src.species return "[src] dances!" @@ -987,7 +987,7 @@ var/list/mob_bird_species = list("smallowl" = /mob/living/critter/small_animal/b M.drop_item() W.set_loc(src) - SPAWN_DBG(600) + SPAWN_DBG(1 MINUTE) src.visible_message("The [src] suddenly regurgitates something!") playsound(get_turf(src), pick('sound/impact_sounds/Slimy_Splat_1.ogg','sound/misc/meat_plop.ogg'), 100, 1) make_cleanable( /obj/decal/cleanable/greenpuke,src.loc) @@ -1020,7 +1020,7 @@ var/list/mob_bird_species = list("smallowl" = /mob/living/critter/small_animal/b M.drop_item() W.set_loc(src) - SPAWN_DBG(600) + SPAWN_DBG(1 MINUTE) src.visible_message("The [src] suddenly regurgitates something!") playsound(get_turf(src), pick('sound/impact_sounds/Slimy_Splat_1.ogg','sound/misc/meat_plop.ogg'), 100, 1) make_cleanable( /obj/decal/cleanable/greenpuke,src.loc) @@ -1778,7 +1778,7 @@ var/list/mob_bird_species = list("smallowl" = /mob/living/critter/small_animal/b switch (act) if ("flip","dance") if (src.emote_check(voluntary, 50) && !src.shrunk) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) animate_bumble(src) return null if ("snap","buzz") @@ -2173,7 +2173,7 @@ var/list/mob_bird_species = list("smallowl" = /mob/living/critter/small_animal/b if ("scream","chitter") if (src.emote_check(voluntary, 50)) src.icon_state = "lobsterman-screech" - SPAWN_DBG(15) + SPAWN_DBG(1.5 SECONDS) if (src && !isdead(src)) src.icon_state = start_icon playsound(get_turf(src), "sound/voice/animal/bugchitter.ogg", 80, 1,0,0,0.8) @@ -2182,7 +2182,7 @@ var/list/mob_bird_species = list("smallowl" = /mob/living/critter/small_animal/b if ("dance","flap") if (src.emote_check(voluntary, 50)) src.icon_state = "lobsterman-clack" - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) if (src && !isdead(src)) src.icon_state = start_icon return "[src] clacks their claws!" @@ -2229,7 +2229,7 @@ var/list/mob_bird_species = list("smallowl" = /mob/living/critter/small_animal/b if ("dance") if (src.emote_check(voluntary, 50)) src.icon_state = pick("boogie-d1","boogie-d2","boogie-d3") - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) if (src && !isdead(src)) src.icon_state = initial(icon_state) var/msg = pick("beeps and boops","does a little dance","gets down tonight","is feeling funky","is out of control","gets up to get down","busts a groove","begins clicking and whirring","emits an excited bloop","can't contain itself","can dance if it wants to") diff --git a/code/mob/living/silicon/ai.dm b/code/mob/living/silicon/ai.dm index b2a06a7..3c0a63a 100644 --- a/code/mob/living/silicon/ai.dm +++ b/code/mob/living/silicon/ai.dm @@ -192,7 +192,7 @@ var/list/ai_emotions = list("Happy" = "ai_happy",\ src.brain.name = "neural net processor" src.brain.owner = src.mind - SPAWN_DBG(6) + SPAWN_DBG(6 DECI SECONDS) src.net_id = format_net_id("\ref[src]") if(!src.link) @@ -252,7 +252,7 @@ var/list/ai_emotions = list("Happy" = "ai_happy",\ playsound(src.loc, "sound/items/Ratchet.ogg", 50, 1) src.visible_message("[user.name] begins undoing [src.name]'s CPU bolts.") var/turf/T = user.loc - SPAWN_DBG(60) + SPAWN_DBG(6 SECONDS) if (user.loc != T || !can_act(user)) boutput(user, "You were interrupted!") return @@ -262,7 +262,7 @@ var/list/ai_emotions = list("Happy" = "ai_happy",\ playsound(src.loc, "sound/items/Ratchet.ogg", 50, 1) src.visible_message("[user.name] begins affixing [src.name]'s CPU bolts.") var/turf/T = user.loc - SPAWN_DBG(60) + SPAWN_DBG(6 SECONDS) if (user.loc != T || !can_act(user)) boutput(user, "You were interrupted!") return @@ -936,7 +936,7 @@ var/list/ai_emotions = list("Happy" = "ai_happy",\ //flick("ai-flip", src) if(faceEmotion != "ai-red") UpdateOverlays(SafeGetOverlayImage("actual_face", 'icons/mob/ai.dmi', "[faceEmotion]-flip", src.layer+0.2), "actual_face") - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) UpdateOverlays(SafeGetOverlayImage("actual_face", 'icons/mob/ai.dmi', faceEmotion, src.layer+0.2), "actual_face") @@ -955,7 +955,7 @@ var/list/ai_emotions = list("Happy" = "ai_happy",\ if (T && isturf(T)) SPAWN_DBG(0) M.throw_at(T, 100, 2) - M.changeStatus("weakened", 1 SECONDS) + M.changeStatus("weakened", 1 SECOND) M.changeStatus("stunned", 2 SECONDS) break @@ -1040,7 +1040,7 @@ var/list/ai_emotions = list("Happy" = "ai_happy",\ #ifdef DATALOGGER game_stats.Increment("farts") #endif - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src.emote_allowed = 1 else src.show_text("Invalid Emote: [act]") @@ -1161,7 +1161,7 @@ var/list/ai_emotions = list("Happy" = "ai_happy",\ var/success = 0 //src.show_text("System will now attempt to restore local power. Stand by...") // jesus christ shut up - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) var/obj/machinery/power/apc/APC = get_local_apc(src) if (APC) if (istype(APC.cell,/obj/item/cell/)) @@ -1182,7 +1182,7 @@ var/list/ai_emotions = list("Happy" = "ai_happy",\ // src.show_text("Local APC unit not found. System will re-try shortly.", "red") if (!success) - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) src.aiRestorePowerRoutine = 1 else src.aiRestorePowerRoutine = 0 @@ -1554,7 +1554,7 @@ var/list/ai_emotions = list("Happy" = "ai_happy",\ src.deployed_shell = null src.deployed_to_eyecam = 0 src.eyecam.set_loc(src.loc) - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) if (ismob(user)) // bluhh who the fuck knows, this at least checks that user isn't null as well if (isshell(user)) var/mob/living/silicon/hivebot/H = user @@ -1800,7 +1800,7 @@ var/list/ai_emotions = list("Happy" = "ai_happy",\ //Otherwise, ff they aren't addressing us, ignore them if(signal.data["address_1"] != src.net_id) if((signal.data["address_1"] == "ping") && signal.data["sender"]) - SPAWN_DBG(5) //Send a reply for those curious jerks + SPAWN_DBG(5 DECI SECONDS) //Send a reply for those curious jerks src.post_status(target, "command", "ping_reply", "device", "MAINFRAME_AI", "netid", src.net_id) return @@ -1815,7 +1815,7 @@ var/list/ai_emotions = list("Happy" = "ai_happy",\ //something might be wrong here, disconnect them! src.terminals.Remove(target) boutput(src, "--- Connection closed with [target]!") - SPAWN_DBG(3) + SPAWN_DBG(3 DECI SECONDS) src.post_status(target, "command","term_disconnect") return @@ -1828,7 +1828,7 @@ var/list/ai_emotions = list("Happy" = "ai_happy",\ if(target in src.terminals) src.terminals.Remove(target) boutput(src, "--- [target] has closed the connection!!") - SPAWN_DBG(3) + SPAWN_DBG(3 DECI SECONDS) src.post_status(target, "command","term_disconnect") return diff --git a/code/mob/living/silicon/ai/mobile.dm b/code/mob/living/silicon/ai/mobile.dm index b3dd198..0503fea 100644 --- a/code/mob/living/silicon/ai/mobile.dm +++ b/code/mob/living/silicon/ai/mobile.dm @@ -25,7 +25,7 @@ src.cell = new /obj/item/cell(src) src.cell.maxcharge = setup_charge_maximum src.cell.charge = src.cell.maxcharge - SPAWN_DBG(6) + SPAWN_DBG(6 DECI SECONDS) var/obj/overlay/U1 = new U1.icon = src.icon U1.icon_state = "aitrack" @@ -229,7 +229,7 @@ New() ..() - SPAWN_DBG(6) + SPAWN_DBG(6 DECI SECONDS) var/obj/overlay/U1 = new U1.icon = src.icon U1.icon_state = "railtrack" diff --git a/code/mob/living/silicon/ghostdrone.dm b/code/mob/living/silicon/ghostdrone.dm index 7b659ad..683071c 100644 --- a/code/mob/living/silicon/ghostdrone.dm +++ b/code/mob/living/silicon/ghostdrone.dm @@ -981,7 +981,7 @@ O.show_message("[message]", m_type) if (m_anim) //restart our passive animation - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) animate_bumble(src, floatspeed = 15, Y1 = 2, Y2 = -2) return @@ -1067,7 +1067,7 @@ return src.emote(copytext(message, 2),1) UpdateOverlays(speech_bubble, "speech_bubble") - SPAWN_DBG(15) + SPAWN_DBG(1.5 SECONDS) UpdateOverlays(null, "speech_bubble") return src.drone_broadcast(message) @@ -1164,7 +1164,7 @@ if (limiter.canISpawn(/obj/effects/sparks)) var/obj/sparks = unpool(/obj/effects/sparks) sparks.set_loc(get_turf(src)) - SPAWN_DBG(20) if (sparks) pool(sparks) + SPAWN_DBG(2 SECONDS) if (sparks) pool(sparks) ex_act(severity) if (src.nodamage) return @@ -1347,7 +1347,7 @@ if (M.mind) M.Browse(grabResource("html/ghostdrone.html"),"window=ghostdrone;size=600x440;title=Ghostdrone Help") - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) G.show_laws_drone() theMind.transfer_to(G) diff --git a/code/mob/living/silicon/hivebot.dm b/code/mob/living/silicon/hivebot.dm index 30647f8..9df0fff 100644 --- a/code/mob/living/silicon/hivebot.dm +++ b/code/mob/living/silicon/hivebot.dm @@ -64,7 +64,7 @@ src.radio = new /obj/item/device/radio(src) src.ears = src.radio - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) if (!src.cell) src.cell = new /obj/item/cell/shell_cell/charged (src) src.camera = new /obj/machinery/camera(src) @@ -379,7 +379,7 @@ #ifdef DATALOGGER game_stats.Increment("farts") #endif - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src.emote_allowed = 1 else src.show_text("Invalid Emote: [act]") @@ -1006,7 +1006,7 @@ Frequency: hud = new(src) src.attach_hud(hud) bioHolder = new/datum/bioHolder( src ) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) if (src.module) qdel(src.module) if (ticker && ticker.mode && istype(ticker.mode, /datum/game_mode/construction)) diff --git a/code/mob/living/silicon/hivebot/mainframe.dm b/code/mob/living/silicon/hivebot/mainframe.dm index ded968b..80b3a22 100644 --- a/code/mob/living/silicon/hivebot/mainframe.dm +++ b/code/mob/living/silicon/hivebot/mainframe.dm @@ -83,7 +83,7 @@ /mob/living/silicon/hive_mainframe/proc/return_to(var/mob/user) if(user.mind) user.mind.transfer_to(src) - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) if (user) user:shell = 1 user:real_name = "Robot [pick(rand(1, 999))]" @@ -117,7 +117,7 @@ return else if(src.mind) - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) target_shell:mainframe = src target_shell:dependent = 1 target_shell:real_name = src.name diff --git a/code/mob/living/silicon/robot.dm b/code/mob/living/silicon/robot.dm index b07be4c..c40ff13 100644 --- a/code/mob/living/silicon/robot.dm +++ b/code/mob/living/silicon/robot.dm @@ -573,7 +573,7 @@ #ifdef DATALOGGER game_stats.Increment("farts") #endif - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src.emote_allowed = 1 else src.show_text("Invalid Emote: [act]") @@ -740,7 +740,7 @@ src.flash(30) if (isdead(src) && src.client) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) src.gib(1) return @@ -763,7 +763,7 @@ var/damage = 0 switch(severity) if(1.0) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) src.gib(1) return if(2.0) damage = 40 @@ -775,7 +775,7 @@ if (istype(cell,/obj/item/cell/erebite) && fire_protect != 1) src.visible_message("[src]'s erebite cell violently detonates!") explosion(cell, src.loc, 1, 2, 4, 6, 1) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) qdel (src.cell) src.cell = null @@ -908,7 +908,7 @@ if (istype(cell,/obj/item/cell/erebite)) src.visible_message("[src]'s erebite cell violently detonates!") explosion(cell, src.loc, 1, 2, 4, 6, 1) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) qdel (src.cell) src.cell = null update_bodypart() @@ -930,7 +930,7 @@ if (istype(cell,/obj/item/cell/erebite)) src.visible_message("[src]'s erebite cell violently detonates!") explosion(cell, src.loc, 1, 2, 4, 6, 1) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) qdel (src.cell) src.cell = null @@ -1146,7 +1146,7 @@ if (oldmob) if(inafterlifebar(oldmob) || isVRghost(oldmob)) boutput(oldmob, "You feel yourself being pulled out of your current plane of existence!") - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) qdel(oldmob) else if (isalive(oldmob)) // if they're not in the afterlife bar or a VR ghost and still alive, then maybe don't pull them into this borg return diff --git a/code/mob/melee_attack_procs.dm b/code/mob/melee_attack_procs.dm index 60d42cb..b848000 100644 --- a/code/mob/melee_attack_procs.dm +++ b/code/mob/melee_attack_procs.dm @@ -1122,7 +1122,7 @@ if (src.is_hulk()) SPAWN_DBG(0) if (prob(20)) - target.changeStatus("stunned", 1 SECONDS) + target.changeStatus("stunned", 1 SECOND) step_away(target,src,15) sleep(3) step_away(target,src,15) diff --git a/code/mob/new_player.dm b/code/mob/new_player.dm index caf1331..1b24eea 100644 --- a/code/mob/new_player.dm +++ b/code/mob/new_player.dm @@ -224,7 +224,7 @@ mob/new_player close_spawn_windows() latejoin.activated = 1 src.mind.transfer_to(S) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) S.choose_name() qdel(src) else diff --git a/code/mob/suicide.dm b/code/mob/suicide.dm index 6bf7160..cad048f 100644 --- a/code/mob/suicide.dm +++ b/code/mob/suicide.dm @@ -58,14 +58,14 @@ if (src.client) // fix for "Cannot modify null.suicide" src.client.suicide = 1 src.suicide_can_succumb = 1 - SPAWN_DBG(150) + SPAWN_DBG(15 SECONDS) src.suicide_can_succumb = 0 logTheThing("combat", src, null, "commits suicide") do_suicide() // <------ put mob unique behaviour here in an override!!!! if (src.suicide_alert) message_attack("[key_name(src)] commits suicide shortly after joining.") src.suicide_alert = 0 - SPAWN_DBG(200) + SPAWN_DBG(20 SECONDS) src.suiciding = 0 return else @@ -132,7 +132,7 @@ src.visible_message("[src] jumps off of the chair straight onto [his_or_her(src)] head!") src.TakeDamage("head", 200, 0) src.updatehealth() - SPAWN_DBG(500) + SPAWN_DBG(50 SECONDS) if (src && !isdead(src)) src.suiciding = 0 src.pixel_y = 0 @@ -142,7 +142,7 @@ return else if (istype(selection)) selection.suicide(src) - SPAWN_DBG(500) + SPAWN_DBG(50 SECONDS) if (src && !isdead(src)) src.suiciding = 0 else @@ -150,7 +150,7 @@ src.visible_message("[src] is holding [his_or_her(src)] breath. It looks like [he_or_she(src)]'s trying to commit suicide.") src.take_oxygen_deprivation(175) src.updatehealth() - SPAWN_DBG(200) //in case they get revived by cryo chamber or something stupid like that, let them suicide again in 20 seconds + SPAWN_DBG(20 SECONDS) //in case they get revived by cryo chamber or something stupid like that, let them suicide again in 20 seconds if (src && !isdead(src)) src.suiciding = 0 return @@ -159,7 +159,7 @@ /mob/living/silicon/ai/do_suicide() src.visible_message("[src] is powering down. It looks like \he's trying to commit suicide.") src.unlock_medal("Damned", 1) - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) src.death() /mob/living/silicon/robot/do_suicide() @@ -167,7 +167,7 @@ src.visible_message("[src] is clutching its head strangely!") SPAWN_DBG(20) R.emote("scream") - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) //src.visible_message("[src] has torn out its head!") //playsound(R.loc, "sound/impact_sounds/Machinery_Break_1.ogg", 40, 1) /* diff --git a/code/mob/transform_procs.dm b/code/mob/transform_procs.dm index 2d645eb..3ef87b0 100644 --- a/code/mob/transform_procs.dm +++ b/code/mob/transform_procs.dm @@ -215,7 +215,7 @@ ticker.minds += W.mind W.mind.key = key W.mind.current = W - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) qdel(selfmob) return W @@ -519,7 +519,7 @@ ticker.minds += W.mind W.mind.key = key W.mind.current = W - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) qdel(src) return W diff --git a/code/mob/wraith.dm b/code/mob/wraith.dm index 2d6f21f..5744284 100644 --- a/code/mob/wraith.dm +++ b/code/mob/wraith.dm @@ -152,7 +152,7 @@ boutput(src, "You have been defeated...for now. The strain of banishment has weakened you, and you will not survive another.") src.justdied = 1 src.set_loc(pick(latejoin)) - SPAWN_DBG(150) //15 seconds + SPAWN_DBG(15 SECONDS) //15 seconds src.justdied = 0 else boutput(src, "Your connection with the mortal realm is severed. You have been permanently banished.") @@ -313,7 +313,7 @@ if (salted && !src.density && !src.justdied) src.makeCorporeal() boutput(src, "You have passed over salt! You now interact with the mortal realm...") - SPAWN_DBG(600) //one minute + SPAWN_DBG(1 MINUTE) //one minute src.makeIncorporeal() return diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 87a2771..2832821 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -10,7 +10,7 @@ var/global/noir = 0 //////////////////////////////// /proc/message_admins(var/text, var/asay = 0, var/irc = 0) - var/rendered = "[irc ? "ADMIN IRC:" : "ADMIN LOG:"] [text]" + var/rendered = "[irc ? "DISCORD:" : "ADMIN LOG:"] [text]" for (var/client/C in clients) if(!C.holder) continue @@ -399,7 +399,7 @@ var/global/noir = 0 return addPlayerNote(player, usr.ckey, the_note) - SPAWN_DBG(20) src.viewPlayerNotes(player) + SPAWN_DBG(2 SECONDS) src.viewPlayerNotes(player) logTheThing("admin", usr, null, "added a note for [player]: [the_note]") logTheThing("diary", usr, null, "added a note for [player]: [the_note]", "admin") diff --git a/code/modules/admin/admin_holder.dm b/code/modules/admin/admin_holder.dm index b748e3b..8783f56 100644 --- a/code/modules/admin/admin_holder.dm +++ b/code/modules/admin/admin_holder.dm @@ -24,7 +24,7 @@ New() ..() - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) if (src.owner) var/client/C = src.owner C.chatOutput.getContextFlag() diff --git a/code/modules/admin/atom_verbs.dm b/code/modules/admin/atom_verbs.dm index 7499593..402977c 100644 --- a/code/modules/admin/atom_verbs.dm +++ b/code/modules/admin/atom_verbs.dm @@ -13,7 +13,7 @@ var/global/atom_emergency_stop = 0 logTheThing("admin", usr, null, "used the emergency stop command for atom verbs.") logTheThing("diary", usr, null, "used the emergency stop command for atom verbs.", "admin") message_admins("[key_name(usr)] used the emergency stop command for atom verbs.") - SPAWN_DBG(100) // after 10 seconds, turn it off + SPAWN_DBG(10 SECONDS) // after 10 seconds, turn it off atom_emergency_stop = 0 message_admins("The emergency stop for atom verbs has turned off again.") else diff --git a/code/modules/admin/buildmodes/adventure/element_link.dm b/code/modules/admin/buildmodes/adventure/element_link.dm index f7f475a..3206296 100644 --- a/code/modules/admin/buildmodes/adventure/element_link.dm +++ b/code/modules/admin/buildmodes/adventure/element_link.dm @@ -15,9 +15,9 @@ if(triggerable) triggerable_id = triggerable triggerable = null - spawn(1) + spawn(1 DECI SECOND) src.link_elements() - spawn(10) + spawn(1 SECOND) qdel(src) proc/link_elements() diff --git a/code/modules/admin/buildmodes/adventure/elements/button.dm b/code/modules/admin/buildmodes/adventure/elements/button.dm index 6229b6f..3b70f96 100644 --- a/code/modules/admin/buildmodes/adventure/elements/button.dm +++ b/code/modules/admin/buildmodes/adventure/elements/button.dm @@ -41,7 +41,7 @@ button.button_type = button_type button.set_density(button.density) button.triggered = selected_triggerable.Copy() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) button.color = color_rgb else if (pa.Find("right")) if (istype(object, /obj/adventurepuzzle/triggerable)) @@ -80,7 +80,7 @@ pressed = 1 icon_state = "button_[button_type]_pressed" post_trigger() - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) icon_state = "button_[button_type]_unpressed" pressed = 0 diff --git a/code/modules/admin/buildmodes/adventure/elements/door.dm b/code/modules/admin/buildmodes/adventure/elements/door.dm index 1ba398e..40d5970 100644 --- a/code/modules/admin/buildmodes/adventure/elements/door.dm +++ b/code/modules/admin/buildmodes/adventure/elements/door.dm @@ -24,7 +24,7 @@ door.door_type = door_type if (door_type == "glass" || door_type == "runes") door.opacity = 0 - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) door.color = color_rgb else if (pa.Find("right")) if (istype(object, /obj/adventurepuzzle/triggerable/door)) @@ -93,7 +93,7 @@ src.set_density(1) flick("door_[door_type]_closing", src) src.icon_state = "door_[door_type]_closed" - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src.opening = 0 proc/open() @@ -105,7 +105,7 @@ return src.opening = 1 flick("door_[door_type]_opening", src) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src.set_density(0) if (opacity != 0) orig_opacity = opacity diff --git a/code/modules/admin/buildmodes/adventure/elements/door/multiactivated.dm b/code/modules/admin/buildmodes/adventure/elements/door/multiactivated.dm index 2e31f3b..fefa8a0 100644 --- a/code/modules/admin/buildmodes/adventure/elements/door/multiactivated.dm +++ b/code/modules/admin/buildmodes/adventure/elements/door/multiactivated.dm @@ -20,7 +20,7 @@ door.act_needed = act_needed if (door_type == "glass" || door_type == "runes") door.opacity = 0 - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) door.color = color_rgb else if (pa.Find("right")) if (istype(object, /obj/adventurepuzzle/triggerable/door)) diff --git a/code/modules/admin/buildmodes/adventure/elements/door/timed.dm b/code/modules/admin/buildmodes/adventure/elements/door/timed.dm index f61ea01..7811457 100644 --- a/code/modules/admin/buildmodes/adventure/elements/door/timed.dm +++ b/code/modules/admin/buildmodes/adventure/elements/door/timed.dm @@ -20,7 +20,7 @@ door.time_limit = door_delay if (door_type == "glass" || door_type == "runes") door.opacity = 0 - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) door.color = color_rgb else if (pa.Find("right")) if (istype(object, /obj/adventurepuzzle/triggerable/door)) diff --git a/code/modules/admin/buildmodes/adventure/elements/key.dm b/code/modules/admin/buildmodes/adventure/elements/key.dm index da76cba..ee4e157 100644 --- a/code/modules/admin/buildmodes/adventure/elements/key.dm +++ b/code/modules/admin/buildmodes/adventure/elements/key.dm @@ -38,7 +38,7 @@ key.icon_state = "key_[key_type]" key.triggered = selected_triggerable.Copy() key.oneshot = oneshot - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) key.color = color_rgb else if (pa.Find("right")) if (istype(object, /obj/adventurepuzzle/triggerable)) diff --git a/code/modules/admin/buildmodes/adventure/elements/pressurepad.dm b/code/modules/admin/buildmodes/adventure/elements/pressurepad.dm index ba8591b..96910a3 100644 --- a/code/modules/admin/buildmodes/adventure/elements/pressurepad.dm +++ b/code/modules/admin/buildmodes/adventure/elements/pressurepad.dm @@ -39,7 +39,7 @@ button.pad_type = button_type button.triggered = selected_triggerable.Copy() button.triggered_unpress = selected_triggerable_untrigger.Copy() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) button.color = color_rgb else if (pa.Find("right")) if (istype(object, /obj/adventurepuzzle/triggerable)) @@ -97,7 +97,7 @@ return pressed = 1 flick("pressure_[pad_type]_pressing", src) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) icon_state = "pressure_[pad_type]_pressed" post_trigger() @@ -106,7 +106,7 @@ return pressed = 0 flick("pressure_[pad_type]_unpressing", src) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) icon_state = "pressure_[pad_type]_unpressed" post_untrigger() diff --git a/code/modules/admin/buildmodes/adventure/elements/remote.dm b/code/modules/admin/buildmodes/adventure/elements/remote.dm index 8eb9a2a..a1a89ba 100644 --- a/code/modules/admin/buildmodes/adventure/elements/remote.dm +++ b/code/modules/admin/buildmodes/adventure/elements/remote.dm @@ -32,7 +32,7 @@ var/obj/item/adventurepuzzle/triggerer/remotecontrol/key = new /obj/item/adventurepuzzle/triggerer/remotecontrol(T) key.name = key_name key.triggered = selected_triggerable.Copy() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) key.color = color_rgb else if (pa.Find("right")) if (istype(object, /obj/adventurepuzzle/triggerable)) diff --git a/code/modules/admin/buildmodes/adventure/elements/speaker.dm b/code/modules/admin/buildmodes/adventure/elements/speaker.dm index 2e0aef3..1824312 100644 --- a/code/modules/admin/buildmodes/adventure/elements/speaker.dm +++ b/code/modules/admin/buildmodes/adventure/elements/speaker.dm @@ -33,7 +33,7 @@ if (speaker_type == "invisible") speaker.invisibility = 20 else - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) speaker.color = color_rgb else if (pa.Find("right")) if (istype(object, /obj/adventurepuzzle/triggerable/speaker)) diff --git a/code/modules/admin/buildmodes/adventure/elements/switch.dm b/code/modules/admin/buildmodes/adventure/elements/switch.dm index 9f075b7..4609a77 100644 --- a/code/modules/admin/buildmodes/adventure/elements/switch.dm +++ b/code/modules/admin/buildmodes/adventure/elements/switch.dm @@ -42,7 +42,7 @@ button.set_density(button_density) button.triggered = selected_triggerable.Copy() button.triggered_unpress = selected_triggerable_untrigger.Copy() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) button.color = color_rgb else if (pa.Find("right")) if (istype(object, /obj/adventurepuzzle/triggerable)) diff --git a/code/modules/admin/buildmodes/adventure/elements/trap/lightning.dm b/code/modules/admin/buildmodes/adventure/elements/trap/lightning.dm index 7d2696e..3daa1ca 100644 --- a/code/modules/admin/buildmodes/adventure/elements/trap/lightning.dm +++ b/code/modules/admin/buildmodes/adventure/elements/trap/lightning.dm @@ -83,7 +83,7 @@ attack_amt = 1 var/list/affected = DrawLine(target, src, /obj/line_obj/elec ,'icons/obj/projectiles.dmi',"WholeLghtn",1,1,"HalfStartLghtn","HalfEndLghtn",OBJ_LAYER,1,PreloadedIcon='icons/effects/LghtLine.dmi') for(var/obj/OB in affected) - SPAWN_DBG(6) + SPAWN_DBG(6 DECI SECONDS) pool(OB) for (var/mob/living/M in get_turf(target)) if (damage < 500) @@ -97,7 +97,7 @@ attack_amt = 1 var/list/affected = DrawLine(M, src, /obj/line_obj/elec ,'icons/obj/projectiles.dmi',"WholeLghtn",1,1,"HalfStartLghtn","HalfEndLghtn",OBJ_LAYER,1,PreloadedIcon='icons/effects/LghtLine.dmi') for(var/obj/OB in affected) - SPAWN_DBG(6) + SPAWN_DBG(6 DECI SECONDS) pool(OB) if (damage < 500) M.TakeDamage("chest", 0, damage, 0, DAMAGE_BURN) diff --git a/code/modules/admin/buildmodes/adventure/target_link.dm b/code/modules/admin/buildmodes/adventure/target_link.dm index 9f99b39..66734e5 100644 --- a/code/modules/admin/buildmodes/adventure/target_link.dm +++ b/code/modules/admin/buildmodes/adventure/target_link.dm @@ -5,7 +5,7 @@ New() ..() - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) src.target_me() proc/target_me() diff --git a/code/modules/admin/buildmodes/spawn_single.dm b/code/modules/admin/buildmodes/spawn_single.dm index 2727df2..ebc43fe 100644 --- a/code/modules/admin/buildmodes/spawn_single.dm +++ b/code/modules/admin/buildmodes/spawn_single.dm @@ -39,7 +39,7 @@ change the direction of created objects.
mtx.Translate(0, 64) pad.transform = mtx animate(pad, alpha = 255, transform = mtx.Reset(), time = 5, easing=SINE_EASING) - SPAWN_DBG(7) + SPAWN_DBG(7 DECI SECONDS) swirl.loc = T flick("portswirl", swirl) diff --git a/code/modules/admin/buildmodes/spawn_wide.dm b/code/modules/admin/buildmodes/spawn_wide.dm index cf77f1b..380a58f 100644 --- a/code/modules/admin/buildmodes/spawn_wide.dm +++ b/code/modules/admin/buildmodes/spawn_wide.dm @@ -58,7 +58,7 @@ change the direction of created objects.
mtx.Translate(0, 64) pad.transform = mtx animate(pad, alpha = 255, transform = mtx.Reset(), time = 5, easing=SINE_EASING) - SPAWN_DBG(7) + SPAWN_DBG(7 DECI SECONDS) swirl.loc = Q flick("portswirl", swirl) @@ -92,7 +92,7 @@ change the direction of created objects.
mtx.Translate(0, 64) pad.transform = mtx animate(pad, alpha = 255, transform = mtx.Reset(), time = 5, easing=SINE_EASING) - SPAWN_DBG(7) + SPAWN_DBG(7 DECI SECONDS) swirl.loc = Q flick("portswirl", swirl) diff --git a/code/modules/admin/debug.dm b/code/modules/admin/debug.dm index d03ed2a..b3a9063 100644 --- a/code/modules/admin/debug.dm +++ b/code/modules/admin/debug.dm @@ -391,7 +391,7 @@ var/global/debug_messages = 0 if(ishuman(M)) logTheThing("admin", src, M, "has mobile-AIized %target%") logTheThing("diary", src, M, "has mobile-AIized %target%", "admin") - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) M:AIize(1) else @@ -459,7 +459,7 @@ var/global/debug_messages = 0 if(ishuman(M) && M.mind != null) logTheThing("admin", src, M, "has made %target% a changeling.") logTheThing("diary", src, M, "has made %target% a changeling.", "admin") - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) M.mind.absorbed_dna[M.bioHolder] = M.real_name M.make_changeling() else @@ -1190,7 +1190,7 @@ var/datum/flock/testflock proc/edit(var/client/user) var/editor = grabResource("html/admin/color_matrix.html") user.Browse(editor, "window=colormatrix;can_close=1") - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) callJsFunc(usr, "setRef", list("\ref[src]")) //This is shit but without it, it calls the JS before the window is open and doesn't work. Topic(href, href_list) diff --git a/code/modules/admin/diagnostics.dm b/code/modules/admin/diagnostics.dm index c84ddd2..796cc81 100644 --- a/code/modules/admin/diagnostics.dm +++ b/code/modules/admin/diagnostics.dm @@ -229,7 +229,8 @@ if(!group.gencolor) group.gencolor = rgb( rand(1,255),rand(1,255),rand(1,255) ) theImage.color = group.gencolor - theImage.desc = "Group \ref[group]
O2=[group.air.oxygen]
Nitrogen=[group.air.nitrogen]
CO2=[group.air.carbon_dioxide]
Plasma=[group.air.toxins]
Temperature=[group.air.temperature]" + theImage.desc = "Group \ref[group]
O2=[group.air.oxygen]
Nitrogen=[group.air.nitrogen]
CO2=[group.air.carbon_dioxide]
Plasma=[group.air.toxins]
Temperature=[group.air.temperature]
Spaced=[group.spaced]" + if (group.spaced) theImage.overlays += image('icons/misc/air_debug.dmi', icon_state = "spaced") var/list/borders_space = list() for(var/turf/spaceses in group.space_borders) if(get_dist(spaceses, theTurf) == 1) diff --git a/code/modules/admin/gibverbs.dm b/code/modules/admin/gibverbs.dm index 66a4aba..44c1206 100644 --- a/code/modules/admin/gibverbs.dm +++ b/code/modules/admin/gibverbs.dm @@ -22,7 +22,7 @@ O.pixel_y = -96 O.icon = 'icons/effects/214x246.dmi' O.icon_state = "explosion" - //SPAWN_DBG(5) + //SPAWN_DBG(5 DECI SECONDS) M.gib() SPAWN_DBG(35) if (O) @@ -44,7 +44,7 @@ logTheThing("diary", usr, M, "has partygibbed %target%", "admin") message_admins("[key_name(usr)] has partygibbed [key_name(M)]") - SPAWN_DBG(5) M.partygib() + SPAWN_DBG(5 DECI SECONDS) M.partygib() /client/proc/cmd_admin_owlgib(mob/M as mob in world) set category = null @@ -61,7 +61,7 @@ logTheThing("diary", usr, M, "has owlgibbed %target%", "admin") message_admins("[key_name(usr)] has owlgibbed [key_name(M)]") - SPAWN_DBG(5) M.owlgib() + SPAWN_DBG(5 DECI SECONDS) M.owlgib() /client/proc/cmd_admin_firegib(mob/M as mob in world) set category = null @@ -78,7 +78,7 @@ logTheThing("diary", usr, M, "has firegibbed %target%", "admin") message_admins("[key_name(usr)] has firegibbed [key_name(M)]") - SPAWN_DBG(5) M.firegib() + SPAWN_DBG(5 DECI SECONDS) M.firegib() /client/proc/cmd_admin_elecgib(mob/M as mob in world) set category = null @@ -95,7 +95,7 @@ logTheThing("diary", usr, M, "has elecgibbed %target%", "admin") message_admins("[key_name(usr)] has elecgibbed [key_name(M)]") - SPAWN_DBG(5) M.elecgib() + SPAWN_DBG(5 DECI SECONDS) M.elecgib() /client/proc/cmd_admin_icegib(mob/M as mob in world) set category = null @@ -116,7 +116,7 @@ logTheThing("diary", usr, M, "has icegibbed %target%", "admin") message_admins("[key_name(usr)] has icegibbed [key_name(M)]") - SPAWN_DBG(5) M:become_ice_statue() + SPAWN_DBG(5 DECI SECONDS) M:become_ice_statue() /client/proc/cmd_admin_goldgib(mob/M as mob in world) set category = null @@ -138,7 +138,7 @@ message_admins("[key_name(usr)] has goldgibbed [key_name(M)]") M.desc = "A very fancy statue of a shitty player." - SPAWN_DBG(5) M:become_gold_statue() + SPAWN_DBG(5 DECI SECONDS) M:become_gold_statue() /client/proc/cmd_admin_spidergib(mob/M as mob in world) set category = null @@ -159,7 +159,7 @@ logTheThing("diary", usr, M, "has spidergibbed %target%", "admin") message_admins("[key_name(usr)] has spidergibbed [key_name(M)]") - SPAWN_DBG(5) M:spidergib() + SPAWN_DBG(5 DECI SECONDS) M:spidergib() /client/proc/cmd_admin_implodegib(mob/M as mob in world) set category = null @@ -180,7 +180,7 @@ logTheThing("diary", usr, M, "has imploded %target%", "admin") message_admins("[key_name(usr)] has imploded [key_name(M)]") - SPAWN_DBG(5) M:implode() + SPAWN_DBG(5 DECI SECONDS) M:implode() /client/proc/cmd_admin_cluwnegib(mob/M as mob in world) set category = null @@ -200,7 +200,7 @@ logTheThing("diary", usr, M, "has set a floor cluwne upon %target%", "admin") message_admins("[key_name(usr)] has set a floor cluwne upon [key_name(M)]") - SPAWN_DBG(5) M.cluwnegib(duration) + SPAWN_DBG(5 DECI SECONDS) M.cluwnegib(duration) /client/proc/cmd_admin_admindamn(mob/M as mob in world) set category = null @@ -218,7 +218,7 @@ logTheThing("diary", usr, M, "has damned %target% to hell", "admin") message_admins("[key_name(usr)] has damned [key_name(M)]") - SPAWN_DBG(5) M.damn() + SPAWN_DBG(5 DECI SECONDS) M.damn() /client/proc/cmd_admin_adminundamn(mob/M as mob in world) set category = null @@ -236,7 +236,7 @@ logTheThing("diary", usr, M, "has undamned %target% from hell", "admin") message_admins("[key_name(usr)] has undamned [key_name(M)]") - SPAWN_DBG(5) M.un_damn() + SPAWN_DBG(5 DECI SECONDS) M.un_damn() /client/proc/cmd_admin_gib_self() set name = "gibself" @@ -253,7 +253,7 @@ O.icon = 'icons/effects/214x246.dmi' O.icon_state = "explosion" O.mouse_opacity = 0 - SPAWN_DBG(35) + SPAWN_DBG(3.5 SECONDS) qdel(O) src.mob.gib() @@ -384,7 +384,7 @@ Bump(M as turf|obj|mob) M:density = 0 - SPAWN_DBG(4) + SPAWN_DBG(4 DECI SECONDS) M:density = 1 sleep(1) var/turf/T = get_turf(M) @@ -467,7 +467,7 @@ Bump(M as turf|obj|mob) M:density = 0 - SPAWN_DBG(4) + SPAWN_DBG(4 DECI SECONDS) M:density = 1 sleep(1) var/turf/T = get_turf(M) diff --git a/code/modules/antagonists/blob/blob_abilities.dm b/code/modules/antagonists/blob/blob_abilities.dm index f297450..f8bf33e 100644 --- a/code/modules/antagonists/blob/blob_abilities.dm +++ b/code/modules/antagonists/blob/blob_abilities.dm @@ -595,7 +595,7 @@ var/destination_z = current_target_z - 6 animate(H, time = 10, alpha = 1, pixel_z = destination_z, easing = LINEAR_EASING) SPAWN_DBG(0) - sleep(1 SECONDS) + sleep(1 SECOND) H.lying = 1 H.skeletonize() H.transforming = 0 diff --git a/code/modules/atmospherics/FEA_turf_tile.dm b/code/modules/atmospherics/FEA_turf_tile.dm index 388a44d..519928c 100644 --- a/code/modules/atmospherics/FEA_turf_tile.dm +++ b/code/modules/atmospherics/FEA_turf_tile.dm @@ -377,29 +377,6 @@ turf possible_fire_spreads = list() possible_fire_spreads += enemy_tile else -/* var/obj/movable/floor/movable_on_enemy = locate(/obj/movable/floor) in enemy_tile - - if(movable_on_enemy) - if(movable_on_enemy.parent && movable_on_enemy.parent.group_processing) //apply tile to group sharing - if(movable_on_enemy.parent.current_cycle < current_cycle) - if(movable_on_enemy.parent.air.check_gas_mixture(air)) - connection_difference = air.share(movable_on_enemy.parent.air) - - else - movable_on_enemy.parent.suspend_group_processing() - - if(movable_on_enemy.archived_cycle < archived_cycle) //archive bordering tile information if not already done - movable_on_enemy.archive() - connection_difference = air.share(movable_on_enemy.air) - //group processing failed so interact with individual tile - else - if(movable_on_enemy.archived_cycle < archived_cycle) //archive bordering tile information if not already done - movable_on_enemy.archive() - - if(movable_on_enemy.current_cycle < current_cycle) - connection_difference = share_air_with_tile(movable_on_enemy) - - else*/ connection_difference = mimic_air_with_tile(enemy_tile) //bordering a tile with fixed air properties diff --git a/code/modules/atmospherics/machinery/binary/dp_vent_pump.dm b/code/modules/atmospherics/machinery/binary/dp_vent_pump.dm index abf7789..b5f9267 100644 --- a/code/modules/atmospherics/machinery/binary/dp_vent_pump.dm +++ b/code/modules/atmospherics/machinery/binary/dp_vent_pump.dm @@ -198,5 +198,5 @@ external_pressure_bound = number if(signal.data["tag"]) - SPAWN_DBG(5) broadcast_status() + SPAWN_DBG(5 DECI SECONDS) broadcast_status() update_icon() \ No newline at end of file diff --git a/code/modules/atmospherics/machinery/binary/pump.dm b/code/modules/atmospherics/machinery/binary/pump.dm index 2f5754f..049525c 100644 --- a/code/modules/atmospherics/machinery/binary/pump.dm +++ b/code/modules/atmospherics/machinery/binary/pump.dm @@ -118,7 +118,7 @@ obj/machinery/atmospherics/binary/pump switch(signal.data["command"]) if("broadcast_status") - SPAWN_DBG(5) broadcast_status() + SPAWN_DBG(5 DECI SECONDS) broadcast_status() if("power_on") on = 1 @@ -136,7 +136,7 @@ obj/machinery/atmospherics/binary/pump target_pressure = number if(signal.data["tag"]) - SPAWN_DBG(5) broadcast_status() + SPAWN_DBG(5 DECI SECONDS) broadcast_status() update_icon() diff --git a/code/modules/atmospherics/machinery/binary/volume_pump.dm b/code/modules/atmospherics/machinery/binary/volume_pump.dm index d388db3..83fa95f 100644 --- a/code/modules/atmospherics/machinery/binary/volume_pump.dm +++ b/code/modules/atmospherics/machinery/binary/volume_pump.dm @@ -115,7 +115,7 @@ obj/machinery/atmospherics/binary/volume_pump transfer_rate = number if(signal.data["tag"]) - SPAWN_DBG(5) broadcast_status() + SPAWN_DBG(5 DECI SECONDS) broadcast_status() update_icon() obj/machinery/atmospherics/binary/volume_pump/attackby(obj/weapon as obj, mob/user as mob) diff --git a/code/modules/atmospherics/machinery/mixer.dm b/code/modules/atmospherics/machinery/mixer.dm index a0958c2..b32e618 100644 --- a/code/modules/atmospherics/machinery/mixer.dm +++ b/code/modules/atmospherics/machinery/mixer.dm @@ -302,7 +302,7 @@ obj/machinery/atmospherics/mixer target_pressure = 0 if (signal.data["tag"]) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) if (src) src.report_status() src.update_icon() diff --git a/code/modules/atmospherics/machinery/unary/outlet_injector.dm b/code/modules/atmospherics/machinery/unary/outlet_injector.dm index f39b650..fa148b2 100644 --- a/code/modules/atmospherics/machinery/unary/outlet_injector.dm +++ b/code/modules/atmospherics/machinery/unary/outlet_injector.dm @@ -123,7 +123,7 @@ volume_rate = number if(signal.data["tag"]) - SPAWN_DBG(5) broadcast_status() + SPAWN_DBG(5 DECI SECONDS) broadcast_status() update_icon() hide(var/i) //to make the little pipe section invisible, the icon changes. diff --git a/code/modules/atmospherics/machinery/unary/vent_pump.dm b/code/modules/atmospherics/machinery/unary/vent_pump.dm index 153c307..a38817a 100644 --- a/code/modules/atmospherics/machinery/unary/vent_pump.dm +++ b/code/modules/atmospherics/machinery/unary/vent_pump.dm @@ -235,7 +235,7 @@ external_pressure_bound = number if("refresh") - SPAWN_DBG(5) broadcast_status() + SPAWN_DBG(5 DECI SECONDS) broadcast_status() hide(var/i) //to make the little pipe section invisible, the icon changes. diff --git a/code/modules/atmospherics/portable/canister.dm b/code/modules/atmospherics/portable/canister.dm index e18f961..5f41584 100644 --- a/code/modules/atmospherics/portable/canister.dm +++ b/code/modules/atmospherics/portable/canister.dm @@ -274,7 +274,7 @@ del(src.det) //Otherwise canister bombs detonate after rupture if (!destroyed) rupturing = 1 - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src.visible_message("[src] hisses ominously!") playsound(src.loc, "sound/machines/hiss.ogg", 55, 1) sleep(50) diff --git a/code/modules/chemistry/Chemistry-Machinery.dm b/code/modules/chemistry/Chemistry-Machinery.dm index ea09328..10e81ad 100644 --- a/code/modules/chemistry/Chemistry-Machinery.dm +++ b/code/modules/chemistry/Chemistry-Machinery.dm @@ -56,7 +56,7 @@ B.set_loc(src) else roboworking = user - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) robot_disposal_check() boutput(user, "You add the beaker to the machine!") @@ -219,7 +219,7 @@ src.updateUsrDialog() - SPAWN_DBG(10) active() + SPAWN_DBG(1 SECOND) active() proc/robot_disposal_check() // Without this, the heater might occasionally show that a beaker is still inserted @@ -241,7 +241,7 @@ beaker = null set_inactive() else - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) robot_disposal_check() proc/set_inactive() diff --git a/code/modules/chemistry/Chemistry-Tools.dm b/code/modules/chemistry/Chemistry-Tools.dm index 4f9e39f..2670158 100644 --- a/code/modules/chemistry/Chemistry-Tools.dm +++ b/code/modules/chemistry/Chemistry-Tools.dm @@ -173,7 +173,7 @@ src.reagents.reaction(target,TOUCH) else src.reagents.reaction(target, TOUCH, min(src.amount_per_transfer_from_this,src.reagents.total_volume)) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) if (src.splash_all_contents) src.reagents.clear_reagents() else src.reagents.remove_any(src.amount_per_transfer_from_this) can_mousedrop = 1 @@ -263,7 +263,7 @@ if (src.splash_all_contents) src.reagents.reaction(target,TOUCH) else src.reagents.reaction(target, TOUCH, min(src.amount_per_transfer_from_this,src.reagents.total_volume)) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) if (src.splash_all_contents) src.reagents.clear_reagents() else src.reagents.remove_any(src.amount_per_transfer_from_this) can_mousedrop = 1 diff --git a/code/modules/chemistry/Reagents-Base.dm b/code/modules/chemistry/Reagents-Base.dm index 867455d..6807de5 100644 --- a/code/modules/chemistry/Reagents-Base.dm +++ b/code/modules/chemistry/Reagents-Base.dm @@ -401,7 +401,7 @@ datum if(holder) var/list/covered = holder.covered_turf() for(var/turf/t in covered) - SPAWN_DBG(1) fireflash(t, min(max(0,((volume/covered.len)/15)),6)) + SPAWN_DBG(1 DECI SECOND) fireflash(t, min(max(0,((volume/covered.len)/15)),6)) holder.del_reagent(id) return @@ -805,7 +805,7 @@ datum T.wet_overlay = mutable_appearance('icons/effects/water.dmi', "wet_floor") T.UpdateOverlays(T.wet_overlay, "wet_overlay") - SPAWN_DBG(800) + SPAWN_DBG(80 SECONDS) if (istype(T)) T.wet = 0 T.UpdateOverlays(null, "wet_overlay") diff --git a/code/modules/chemistry/Reagents-Drugs.dm b/code/modules/chemistry/Reagents-Drugs.dm index 5d30a9a..9be0ffc 100644 --- a/code/modules/chemistry/Reagents-Drugs.dm +++ b/code/modules/chemistry/Reagents-Drugs.dm @@ -51,7 +51,7 @@ datum H.cust_two_state = "tramp" H.set_face_icon_dirty() boutput(M, "You feel gruff!") - SPAWN_DBG(3) + SPAWN_DBG(3 DECI SECONDS) M.visible_message("[M.name] has a wild look in their eyes!") if(check < 60) if(H.getStatusDuration("paralysis")) H.delStatus("paralysis") @@ -716,7 +716,7 @@ datum boutput(M, "The Emergency Shuttle has docked with the station! You have 3 minutes to board the Emergency Shuttle.") if(2) boutput(M, "Restarting world! Initiated by Administrator!") - SPAWN_DBG(20) M.playsound_local(M.loc, pick('sound/misc/NewRound.ogg', 'sound/misc/NewRound2.ogg', 'sound/misc/NewRound3.ogg', 'sound/misc/NewRound4.ogg'), 50, 1) + SPAWN_DBG(2 SECONDS) M.playsound_local(M.loc, pick('sound/misc/NewRound.ogg', 'sound/misc/NewRound2.ogg', 'sound/misc/NewRound3.ogg', 'sound/misc/NewRound4.ogg'), 50, 1) if(3) switch (rand(1,4)) if(1) diff --git a/code/modules/chemistry/Reagents-ExplosiveFire.dm b/code/modules/chemistry/Reagents-ExplosiveFire.dm index 998cc9b..561d3dc 100644 --- a/code/modules/chemistry/Reagents-ExplosiveFire.dm +++ b/code/modules/chemistry/Reagents-ExplosiveFire.dm @@ -28,7 +28,6 @@ datum var/SD = size_divisor var/list/covered = holder.covered_turf() - src = null if (covered.len > 9) volume = (volume/covered.len) @@ -255,7 +254,7 @@ datum var/myid = id var/datum/reagents/myholder = holder var/vol = volume - spawn(1) + spawn(1 DECI SECOND) myholder.smoke_start(vol) //moved to a proc in Chemistry-Holder.dm so that the instant reaction and powder can use the same proc myholder.del_reagent(myid) @@ -281,7 +280,7 @@ datum var/myid = id var/datum/reagents/myholder = holder var/vol = volume - spawn(1) + spawn(1 DECI SECOND) myholder.smoke_start(vol,classic = 1) //moved to a proc in Chemistry-Holder.dm so that the instant reaction and powder can use the same proc myholder.del_reagent(myid) diff --git a/code/modules/chemistry/Reagents-FoodDrink.dm b/code/modules/chemistry/Reagents-FoodDrink.dm index c12d20e..9becd9b 100644 --- a/code/modules/chemistry/Reagents-FoodDrink.dm +++ b/code/modules/chemistry/Reagents-FoodDrink.dm @@ -583,7 +583,7 @@ datum old_glasses.layer = initial(old_glasses.layer) else qdel(H.glasses) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) if (H) var/obj/item/clothing/glasses/eyepatch/E = new /obj/item/clothing/glasses/eyepatch(H) E.name = "Pirate Eyepatch" @@ -1032,7 +1032,7 @@ datum if(istype(L) && L.getStatusDuration("burning")) L.changeStatus("burning", 1000 * mult) if (prob(50)) - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) //Roast up the player if (M) boutput(M, "IT BURNS!!!!") @@ -1452,7 +1452,7 @@ datum if(prob(0.2 * volume)) M.emote("scream") boutput(M, "Oh. God.") - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) if (M) M:become_ice_statue() ..() @@ -3609,7 +3609,7 @@ datum if(istype(L) && L.getStatusDuration("burning")) L.changeStatus("burning", 1000 * mult) if(prob(50)) - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) //Roast up the player if (M) boutput(M, "IT BURNS!!!!") diff --git a/code/modules/chemistry/Reagents-Misc.dm b/code/modules/chemistry/Reagents-Misc.dm index f8a3bb5..9551ad6 100644 --- a/code/modules/chemistry/Reagents-Misc.dm +++ b/code/modules/chemistry/Reagents-Misc.dm @@ -557,7 +557,7 @@ datum reaction_turf(var/turf/T, var/volume) if (T.icon == 'icons/turf/floors.dmi' && volume >= 5) - SPAWN_DBG(15) + SPAWN_DBG(1.5 SECONDS) T.icon_state = "grimy" src = null return @@ -597,7 +597,7 @@ datum if (!F) F = unpool(/obj/fire_foam) F.set_loc(target) - SPAWN_DBG(200) + SPAWN_DBG(20 SECONDS) if (F && !F.disposed) pool(F) return @@ -710,7 +710,7 @@ datum if (istype(T)) if (T.wet >= 3) return T.wet = 3 - SPAWN_DBG(800) + SPAWN_DBG(80 SECONDS) if (istype(T)) T.wet = 0 T.UpdateOverlays(null, "wet_overlay") @@ -962,7 +962,7 @@ datum if (volume >= 3) if (locate(/obj/decal/icefloor) in target) return var/obj/decal/icefloor/B = new /obj/decal/icefloor(target) - SPAWN_DBG(800) + SPAWN_DBG(80 SECONDS) if (B) B.dispose() @@ -1041,7 +1041,7 @@ datum if (volume >= 5) for (var/obj/decal/bloodtrace/B in T) B.invisibility = 0 - SPAWN_DBG(300) + SPAWN_DBG(30 SECONDS) if (B) B.invisibility = 101 for (var/obj/item/W in T) @@ -1052,7 +1052,7 @@ datum I.Blend(new /icon('icons/effects/blood.dmi', "lum-item"),ICON_MULTIPLY) I.Blend(new /icon(W.icon, W.icon_state),ICON_UNDERLAY) W.icon = I - SPAWN_DBG(300) + SPAWN_DBG(30 SECONDS) if (W && icon_old) W.icon = icon_old @@ -1112,7 +1112,7 @@ datum make_cleanable(/obj/decal/cleanable/oil/streak,T) if (20 to INFINITY) make_cleanable(/obj/decal/cleanable/oil,T) - SPAWN_DBG(200) + SPAWN_DBG(20 SECONDS) T.wet = 0 T.UpdateOverlays(null, "wet_overlay") @@ -1214,7 +1214,7 @@ datum if (11) M.lying = 0 if (12 to INFINITY) - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) if (!M.reagents.has_reagent("montaguone_extra")) M.lying = 1 M.emote("deathgasp") @@ -1457,13 +1457,13 @@ datum src = null if (method == INGEST) boutput(M, "Aaaagh! It tastes fucking horrendous!") - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) M.visible_message("[M] pukes violently!") M.vomit() else boutput(M, "Oh god! It smells horrific! What the fuck IS this?!") if (prob(50)) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) M.visible_message("[M] pukes violently!") M.vomit() return @@ -1917,7 +1917,7 @@ datum if(method == TOUCH) boutput(M, "It feels like you got smudged with oil paints.") M.color = col - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) boutput(M, "Oh god it's not coming off! You're tinted like this forever!") reaction_turf(var/turf/T, var/volume) @@ -3184,7 +3184,7 @@ datum if (istype(T)) if (T.wet >= 2) return T.wet = 2 - SPAWN_DBG(800) + SPAWN_DBG(80 SECONDS) if (istype(T)) T.wet = 0 T.UpdateOverlays(null, "wet_overlay") @@ -3589,7 +3589,7 @@ datum Bump(M as turf|obj|mob) M:density = 0 - SPAWN_DBG(4) + SPAWN_DBG(4 DECI SECONDS) M:density = 1 //Apparently this is a horrible stinky line of code by don't blame me, this is all the gibshark codes fault. sleep(1) var/turf/T = get_turf(M) diff --git a/code/modules/chemistry/tools/balloons.dm b/code/modules/chemistry/tools/balloons.dm index 9d20cff..36a406c 100644 --- a/code/modules/chemistry/tools/balloons.dm +++ b/code/modules/chemistry/tools/balloons.dm @@ -144,7 +144,7 @@ if ("bee") A.color = "#FFDD00" H.losebreath ++ - //SPAWN_DBG(40) + //SPAWN_DBG(4 SECONDS) //H.losebreath -- qdel(src) diff --git a/code/modules/chemistry/tools/bombs.dm b/code/modules/chemistry/tools/bombs.dm index 57c16d4..f279818 100644 --- a/code/modules/chemistry/tools/bombs.dm +++ b/code/modules/chemistry/tools/bombs.dm @@ -54,7 +54,7 @@ src.triggering_device:sense() break - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) prox_check() /obj/item/assembly/chem_bomb/dropped() diff --git a/code/modules/chemistry/tools/dispensers.dm b/code/modules/chemistry/tools/dispensers.dm index 56598e2..2f44d35 100644 --- a/code/modules/chemistry/tools/dispensers.dm +++ b/code/modules/chemistry/tools/dispensers.dm @@ -100,7 +100,7 @@ attackby(obj/item/W as obj, mob/user as mob) ..(W, user) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) if (src && src.reagents) if (src.reagents.total_volume <= 1) qdel(src) @@ -131,7 +131,7 @@ attackby(obj/item/W as obj, mob/user as mob) ..(W, user) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) if (src && src.reagents) if (src.reagents.total_volume <= 1) qdel(src) @@ -237,7 +237,7 @@ var/mob/living/L = user L.changeStatus("burning", 100) user.updatehealth() - SPAWN_DBG(500) + SPAWN_DBG(50 SECONDS) if (user && !isdead(user)) user.suiciding = 0 return 1 diff --git a/code/modules/chemistry/tools/food_and_drink.dm b/code/modules/chemistry/tools/food_and_drink.dm index c6958ff..76c59bb 100644 --- a/code/modules/chemistry/tools/food_and_drink.dm +++ b/code/modules/chemistry/tools/food_and_drink.dm @@ -574,7 +574,7 @@ if (src.splash_all_contents) src.reagents.reaction(target,TOUCH) else src.reagents.reaction(target, TOUCH, src.amount_per_transfer_from_this) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) if (src.splash_all_contents) src.reagents.clear_reagents() else src.reagents.remove_any(src.amount_per_transfer_from_this) can_mousedrop = 1 @@ -727,7 +727,7 @@ blood_slash(user, 25) user.TakeDamage("head", 150, 0, 0, DAMAGE_CUT) user.updatehealth() - SPAWN_DBG(500) + SPAWN_DBG(50 SECONDS) if (user && !isdead(user)) user.suiciding = 0 return 1 diff --git a/code/modules/chemistry/tools/grenades.dm b/code/modules/chemistry/tools/grenades.dm index 8ca1f8a..b897a7a 100644 --- a/code/modules/chemistry/tools/grenades.dm +++ b/code/modules/chemistry/tools/grenades.dm @@ -150,7 +150,7 @@ src.state = 1 src.icon_state = icon_state_armed playsound(get_turf(src), "sound/weapons/armbomb.ogg", 75, 1, -3) - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) if (src && !src.disposed) a = get_area(src) if(a.sanctuary) return @@ -185,7 +185,7 @@ invisibility = 100 //Why am i doing this? if (src.master) src.master.invisibility = 100 - SPAWN_DBG(50) //To make sure all reagents can work + SPAWN_DBG(5 SECONDS) //To make sure all reagents can work if (src.master) qdel(src.master) if (src) qdel(src) //correctly before deleting the grenade. diff --git a/code/modules/chemistry/tools/patches.dm b/code/modules/chemistry/tools/patches.dm index 4939108..a5c0ea2 100644 --- a/code/modules/chemistry/tools/patches.dm +++ b/code/modules/chemistry/tools/patches.dm @@ -437,7 +437,7 @@ P.attack(H, user, user.zone_sel && user.zone_sel.selecting ? user.zone_sel.selecting : null) update_overlay() - SPAWN_DBG(60) + SPAWN_DBG(6 SECONDS) update_overlay() diff --git a/code/modules/economy/persistent_bank_purchases.dm b/code/modules/economy/persistent_bank_purchases.dm index ded1b31..a54f587 100644 --- a/code/modules/economy/persistent_bank_purchases.dm +++ b/code/modules/economy/persistent_bank_purchases.dm @@ -318,7 +318,7 @@ var/global/list/persistent_bank_purchaseables = list(\ Create(var/mob/living/M) if (ishuman(M)) var/mob/living/carbon/human/H = M - SPAWN_DBG(60) + SPAWN_DBG(6 SECONDS) if (H.limbs) if (H.limbs.l_arm) H.limbs.l_arm.delete() diff --git a/code/modules/economy/shady_robot.dm b/code/modules/economy/shady_robot.dm index 96ce83e..0396ace 100644 --- a/code/modules/economy/shady_robot.dm +++ b/code/modules/economy/shady_robot.dm @@ -106,7 +106,7 @@ rare_products -= C //so we don't get duplicates proc/process() - SPAWN_DBG(300) + SPAWN_DBG(30 SECONDS) if(prob(20) && !scan) teleport() process() diff --git a/code/modules/economy/shippingmarket.dm b/code/modules/economy/shippingmarket.dm index b59d7ec..bb98677 100644 --- a/code/modules/economy/shippingmarket.dm +++ b/code/modules/economy/shippingmarket.dm @@ -112,7 +112,7 @@ if (prob(T.chance_leave)) T.hidden = 1 - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) // 20% chance to shuffle out generic traders for a new one // Do this after a short delay so QMs can finish any last-second deals var/removed_count = 0 diff --git a/code/modules/economy/trader.dm b/code/modules/economy/trader.dm index f6e9e27..d6dde10 100644 --- a/code/modules/economy/trader.dm +++ b/code/modules/economy/trader.dm @@ -510,7 +510,7 @@ if (O:locked) user.show_text("[src] stares at the locked [O], unamused. Maybe you should make sure the thing's open, first.", "red") return - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) user.visible_message("[src] rummages through [user]'s [O].") playsound(src.loc, "rustle", 60, 1) var/cratevalue = null diff --git a/code/modules/events/gimmick/bigfart.dm b/code/modules/events/gimmick/bigfart.dm index 1039ebd..f58006b 100644 --- a/code/modules/events/gimmick/bigfart.dm +++ b/code/modules/events/gimmick/bigfart.dm @@ -23,7 +23,7 @@ if (fart_attack == 1) return fart_attack = 1 - SPAWN_DBG(120) + SPAWN_DBG(12 SECONDS) fart_attack = 0 if (random_events.announce_events) var/sensortext = pick("sensors", "technicians", "probes", "satellites", "monitors", 20; "neckbeards") diff --git a/code/modules/events/gimmick/kudzu.dm b/code/modules/events/gimmick/kudzu.dm index b0b89f2..ddb3c0d 100644 --- a/code/modules/events/gimmick/kudzu.dm +++ b/code/modules/events/gimmick/kudzu.dm @@ -112,7 +112,7 @@ CanPass(atom/A, turf/T) //kudzumen can pass through dense kudzu - if (current_stage == 3) + if (current_stage == 3) if (ishuman(A) && istype(A:mutantrace, /datum/mutantrace/kudzu)) animate_door_squeeze(A) return 1 @@ -338,10 +338,10 @@ //For making kudzumen /obj/icecube/kudzu - name = "vine cacoon" - desc = "That is a cacoon of vines." + name = "vine cocoon" + desc = "That is a cocoon of vines." icon = 'icons/misc/kudzu_plus.dmi' - icon_state = "cacoon" + icon_state = "cocoon" health = 10 steam_on_death = 0 var/const/bulb_time = 20 SECONDS //how long it takes a bulb to form @@ -370,12 +370,12 @@ if (!H.ckey && H.last_client && !H.last_client.mob.mind.dnr) if ((!istype(H.last_client.mob,/mob/living) && !istype(H.last_client.mob,/mob/wraith)) || inafterlifebar(H.last_client.mob)) H.ckey = H.last_client.ckey - + H.set_mutantrace(/datum/mutantrace/kudzu) natural_opening = 1 SHOW_KUDZU_TIPS(H) qdel(src) - else + else qdel(src) disposing() diff --git a/code/modules/events/gimmick/skeletons.dm b/code/modules/events/gimmick/skeletons.dm index 91bd25a..9eb95c4 100644 --- a/code/modules/events/gimmick/skeletons.dm +++ b/code/modules/events/gimmick/skeletons.dm @@ -42,7 +42,7 @@ var/ohshittext = pick("en route for collision with", "rapidly approaching", "heading towards") command_alert("Our [sensortext] have [pickuptext] \a [anomlytext] [ohshittext] the station. Be wary of closets.", "Anomaly Alert") - spawn(1) + spawn(1 DECI SECOND) for(var/i = 0, i 0) var/obj/storage/temp = pick(closets) diff --git a/code/modules/events/meteor_shower.dm b/code/modules/events/meteor_shower.dm index 127070d..92449d0 100644 --- a/code/modules/events/meteor_shower.dm +++ b/code/modules/events/meteor_shower.dm @@ -248,7 +248,7 @@ var/global/meteor_shower_active = 0 if (src.loc == last_tile) walk_towards(src, target, speed, pix_speed) last_tile = src.loc - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) process() proc/check_hits() @@ -288,7 +288,7 @@ var/global/meteor_shower_active = 0 proc/shatter() playsound(src.loc, sound_explode, 50, 1) if (explodes) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) explosion(src, get_turf(src), exp_dev, exp_hvy, exp_lit, exp_fsh) var/atom/source = src src = null @@ -333,7 +333,7 @@ var/global/meteor_shower_active = 0 shatter() playsound(src.loc, sound_explode, 50, 1) if (explodes) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) explosion(src, get_turf(src), exp_dev, exp_hvy, exp_lit, exp_fsh) for(var/A in alldirs) if(prob(15)) diff --git a/code/modules/events/minor/artifact.dm b/code/modules/events/minor/artifact.dm index 8a4efbe..2154997 100644 --- a/code/modules/events/minor/artifact.dm +++ b/code/modules/events/minor/artifact.dm @@ -12,6 +12,6 @@ var/obj/decal/teleport_swirl/swirl = unpool(/obj/decal/teleport_swirl) swirl.set_loc(T) - SPAWN_DBG(15) + SPAWN_DBG(1.5 SECONDS) pool(swirl) return \ No newline at end of file diff --git a/code/modules/events/supply_drop.dm b/code/modules/events/supply_drop.dm index 9ac2bc7..a9f8cc3 100644 --- a/code/modules/events/supply_drop.dm +++ b/code/modules/events/supply_drop.dm @@ -75,7 +75,7 @@ pixel_y = -32 New() - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) qdel(src) ..() @@ -255,7 +255,7 @@ icon_state = "lootb2" flick("lootb1", src) - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) var/mob/living/carbon/human/H = usr var/obj/item/I = makeRandomLootTrash() if(istype(H)) @@ -273,7 +273,7 @@ var/mob/living/carbon/human/dude = usr dude.put_in_hand_or_drop(I) - SPAWN_DBG(25) + SPAWN_DBG(2.5 SECONDS) del(B) del(S) del(P) diff --git a/code/modules/fluids/fluid_tests.dm b/code/modules/fluids/fluid_tests.dm index 2b8b64a..d0cdf61 100644 --- a/code/modules/fluids/fluid_tests.dm +++ b/code/modules/fluids/fluid_tests.dm @@ -5,11 +5,11 @@ /mob/living/proc/ttt()//just flicker images as a test src.show_submerged_image(rand(0,4)) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) src.ttt() /obj/proc/ttt()//just flicker images as a test src.show_submerged_image(rand(0,4)) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) src.ttt() \ No newline at end of file diff --git a/code/modules/fluids/fluid_turf.dm b/code/modules/fluids/fluid_turf.dm index 67ef6e5..f58488d 100644 --- a/code/modules/fluids/fluid_turf.dm +++ b/code/modules/fluids/fluid_turf.dm @@ -267,7 +267,7 @@ try_build_turf_list() if (L && L.len) - SPAWN_DBG(3)//you can 'jump' over a hole by running real fast or being thrown!! + SPAWN_DBG(3 DECI SECONDS)//you can 'jump' over a hole by running real fast or being thrown!! if (istype(AM.loc, /turf/space/fluid/warp_z5)) visible_message("[AM] falls down [src]!") if (ismob(AM)) @@ -434,7 +434,7 @@ for(var/obj/machinery/computer/sea_elevator/C in machines) active = 1 C.visible_message("The elevator begins to move!") - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) call_shuttle() if (href_list["close"]) @@ -457,7 +457,7 @@ var/area/start_location = locate(/area/shuttle/sea_elevator/upper) var/area/end_location = locate(/area/shuttle/sea_elevator/lower) for(var/mob/M in end_location) // oh dear, stay behind the yellow line kids - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) random_brute_damage(M, 30) M.changeStatus("weakened", 5 SECONDS) M.emote("scream") diff --git a/code/modules/food_and_drink/discount_dans.dm b/code/modules/food_and_drink/discount_dans.dm index 0f643e8..e11f955 100644 --- a/code/modules/food_and_drink/discount_dans.dm +++ b/code/modules/food_and_drink/discount_dans.dm @@ -169,7 +169,7 @@ reagents.add_reagent("thalmerite",2) reagents.add_reagent("oxygen", 2) reagents.handle_reactions() - SPAWN_DBG(100) + SPAWN_DBG(10 SECONDS) reagents.del_reagent("thalmerite") boutput(user, "The cup emits a soft clack as the heater triggers.") return diff --git a/code/modules/food_and_drink/ice_cream.dm b/code/modules/food_and_drink/ice_cream.dm index 0591b12..77ac2e3 100644 --- a/code/modules/food_and_drink/ice_cream.dm +++ b/code/modules/food_and_drink/ice_cream.dm @@ -68,7 +68,7 @@ user.changeStatus("paralysis", icecount*10) //in case the damage isn't enough to crit user.bodytemperature -= 100 user.updatehealth() - SPAWN_DBG(500) + SPAWN_DBG(50 SECONDS) if (user && !isdead(user)) user.suiciding = 0 return 1 diff --git a/code/modules/food_and_drink/plants.dm b/code/modules/food_and_drink/plants.dm index 6fb174c..ef9483d 100644 --- a/code/modules/food_and_drink/plants.dm +++ b/code/modules/food_and_drink/plants.dm @@ -100,7 +100,7 @@ src.visible_message("[src] splats onto the floor messily!") playsound(src.loc, "sound/impact_sounds/Slimy_Splat_1.ogg", 100, 1) var/obj/decal/cleanable/tomatosplat/splat = new /obj/decal/cleanable/tomatosplat(T) - src.reagents.trans_to(splat,5) + if (splat) src.reagents.trans_to(splat,5) //could be deleted immediately pool(src) /obj/item/reagent_containers/food/snacks/plant/tomato/explosive @@ -183,7 +183,7 @@ src.visible_message("[src] pops violently!") playsound(src.loc, "sound/effects/pop.ogg", 50, 1) flick("cornsplode", src) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) new /obj/item/reagent_containers/food/snacks/popcorn(get_turf(src)) pool(src) diff --git a/code/modules/food_and_drink/snacks.dm b/code/modules/food_and_drink/snacks.dm index 70002af..8ca1be5 100644 --- a/code/modules/food_and_drink/snacks.dm +++ b/code/modules/food_and_drink/snacks.dm @@ -1147,7 +1147,7 @@ user.visible_message("[user] accidentally inhales part of a [src], blocking their windpipe!") user.take_oxygen_deprivation(123) user.updatehealth() - SPAWN_DBG(500) + SPAWN_DBG(50 SECONDS) if (user && !isdead(user)) user.suiciding = 0 return 1 @@ -1824,7 +1824,7 @@ New() ..() - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) if (isturf(src.loc)) for (var/x = 1, x <= 4, x++) new /obj/item/reagent_containers/food/snacks/tortilla_chip(src.loc) @@ -1861,7 +1861,7 @@ New() ..() - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) if (isturf(src.loc)) for (var/x = 1, x <= 4, x++) new /obj/item/reagent_containers/food/snacks/wonton_wrapper(src.loc) diff --git a/code/modules/holiday/halloween.dm b/code/modules/holiday/halloween.dm index 1c83afe..a7a436f 100644 --- a/code/modules/holiday/halloween.dm +++ b/code/modules/holiday/halloween.dm @@ -426,7 +426,7 @@ src.desc = "A one use - polaroid camera. [pictures_left] photos left." boutput(user, "[pictures_left] photos left.") can_use = 0 - SPAWN_DBG(50) can_use = 1 + SPAWN_DBG(5 SECONDS) can_use = 1 */ /mob/living/carbon/wall/halloween @@ -440,7 +440,7 @@ if(src.gender == MALE) playsound(get_turf(src), "sound/voice/screams/male_scream.ogg", 100, 0, 0, 0.91) else playsound(get_turf(src), "sound/voice/screams/female_scream.ogg", 100, 0, 0, 0.9) - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) src.emote_allowed = 1 return "screams!" else @@ -559,7 +559,7 @@ user.show_text("You feel a spooky rumbling in your guts! Maybe you ate a ghoooooost?!","#8218A8") if (C.bioHolder) C.bioHolder.age += 125 - SPAWN_DBG(600) + SPAWN_DBG(1 MINUTE) C.bioHolder.age -= 125 if("NULL MOSS NOOK") // Anagram: SKULL MONSOON particleMaster.SpawnSystem(new /datum/particleSystem/skull_rain(get_turf(user))) @@ -572,7 +572,7 @@ user.blend_mode = 2 user.alpha = 150 user.show_text("You feel extra spooky!","#8218A8") - SPAWN_DBG(1200) + SPAWN_DBG(2 MINUTES) user.blend_mode = 0 user.alpha = 255 else diff --git a/code/modules/holiday/spacemas.dm b/code/modules/holiday/spacemas.dm index ed4212a..99d471d 100644 --- a/code/modules/holiday/spacemas.dm +++ b/code/modules/holiday/spacemas.dm @@ -148,7 +148,7 @@ var/static/list/santa_snacks = list(/obj/item/reagent_containers/food/drinks/egg if(prob(5) && limiter.canISpawn(/obj/effects/sparks)) var/obj/sparks = unpool(/obj/effects/sparks) sparks.set_loc(src.loc) - SPAWN_DBG(20) if (sparks) pool(sparks) + SPAWN_DBG(2 SECONDS) if (sparks) pool(sparks) /obj/machinery/bot/guardbot/xmas name = "Jinglebuddy" @@ -324,7 +324,7 @@ var/list/seal_names = list("Fluffles","Ronan","Selena","Selkie","Ukog","Ategev", for (var/obj/critter/walrus/W in view(7,src)) if(W.alive) W.aggressive = 1 - SPAWN_DBG(7) + SPAWN_DBG(7 DECI SECONDS) W.aggressive = 0 attack_hand(var/mob/user as mob) @@ -344,7 +344,7 @@ var/list/seal_names = list("Fluffles","Ronan","Selena","Selkie","Ukog","Ategev", if(!src.defensive) src.visible_message("[src] [pick("groans","yelps")]!", 1) walk_away(src,user,10,1) - SPAWN_DBG(7) walk(src,0) + SPAWN_DBG(7 DECI SECONDS) walk(src,0) else src.visible_message("[user] [pick("hugs","pets","caresses","boops","squeezes")] [src]!", 1) if(prob(80)) @@ -363,7 +363,7 @@ var/list/seal_names = list("Fluffles","Ronan","Selena","Selkie","Ukog","Ategev", src.visible_message("[src] [pick("groans","yelps")]!", 1) src.visible_message("[src] gets frightened by [W]!", 1) walk_away(src,user,10,1) - SPAWN_DBG(10) walk(src,0) + SPAWN_DBG(1 SECOND) walk(src,0) return if(prob(5)) @@ -377,7 +377,7 @@ var/list/seal_names = list("Fluffles","Ronan","Selena","Selkie","Ukog","Ategev", else src.visible_message("[src] [pick("groans","yelps")]!", 1) walk_away(src,user,10,1) - SPAWN_DBG(4) walk(src,0) + SPAWN_DBG(4 DECI SECONDS) walk(src,0) ..() /obj/critter/walrus @@ -423,7 +423,7 @@ var/list/seal_names = list("Fluffles","Ronan","Selena","Selkie","Ukog","Ategev", src.attacking = 1 M.visible_message("[src] drives its tusks through [src.target]!") random_brute_damage(M, rand(8,16)) - SPAWN_DBG(20) src.attacking = 0 + SPAWN_DBG(2 SECONDS) src.attacking = 0 ChaseAttack(mob/M) @@ -469,7 +469,7 @@ var/list/seal_names = list("Fluffles","Ronan","Selena","Selkie","Ukog","Ategev", else if (!src.on_fire && burning == 1) src.visible_message("[src] catches on fire! Oh shit!") src.on_fire = 1 - SPAWN_DBG(600) + SPAWN_DBG(1 MINUTE) if (src.on_fire) src.visible_message("[src] burns down and collapses into a sad pile of ash. Spacemas is ruined!!!") for (var/turf/simulated/floor/T in range(1,src)) @@ -520,7 +520,7 @@ var/list/seal_names = list("Fluffles","Ronan","Selena","Selkie","Ukog","Ategev", proc/hit(var/mob/living/M as mob, var/message = 1) if (!M || !isliving(M)) return - M.changeStatus("stunned", 1 SECONDS) + M.changeStatus("stunned", 1 SECOND) M.take_eye_damage(rand(0, 2)) M.change_eye_blurry(25) M.make_dizzy(rand(0, 5)) @@ -659,7 +659,7 @@ var/list/seal_names = list("Fluffles","Ronan","Selena","Selkie","Ukog","Ategev", bioHolder.mobAppearance.customization_second_color = "#FFFFFF" bioHolder.mobAppearance.customization_third_color = "#FFFFFF" - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) bioHolder.mobAppearance.UpdateMob() real_name = "Santa Claus" @@ -697,7 +697,7 @@ var/list/seal_names = list("Fluffles","Ronan","Selena","Selkie","Ukog","Ategev", src.visible_message("[src] calls on the power of Spacemas to heal everyone!") for (var/mob/living/M in view(src,5)) M.HealDamage("All", 30, 30) - SPAWN_DBG(600) + SPAWN_DBG(1 MINUTE) boutput(src, "You may now use your healing spell again.") src.verbs += /mob/living/carbon/human/santa/verb/santa_heal @@ -728,7 +728,7 @@ var/list/seal_names = list("Fluffles","Ronan","Selena","Selkie","Ukog","Ategev", sleep(2) src.transforming = 0 - SPAWN_DBG(1200) + SPAWN_DBG(2 MINUTES) boutput(src, "You may now summon gifts again.") src.verbs += /mob/living/carbon/human/santa/verb/santa_gifts @@ -761,7 +761,7 @@ var/list/seal_names = list("Fluffles","Ronan","Selena","Selkie","Ukog","Ategev", sleep(1) src.transforming = 0 - SPAWN_DBG(800) + SPAWN_DBG(80 SECONDS) boutput(src, "You may now summon snacks again.") src.verbs += /mob/living/carbon/human/santa/verb/santa_food @@ -780,7 +780,7 @@ var/list/seal_names = list("Fluffles","Ronan","Selena","Selkie","Ukog","Ategev", for (var/mob/living/M in view(src,5)) if (M.bioHolder) M.bioHolder.AddEffect("cold_resist", 0, 60) - SPAWN_DBG(800) + SPAWN_DBG(80 SECONDS) boutput(src, "You may now use your warmth spell again.") src.verbs += /mob/living/carbon/human/santa/verb/santa_warmth @@ -817,7 +817,7 @@ var/list/seal_names = list("Fluffles","Ronan","Selena","Selkie","Ukog","Ategev", L+=T src.loc = pick(L) - SPAWN_DBG(300) + SPAWN_DBG(30 SECONDS) boutput(src, "You may now teleport again.") src.verbs += /mob/living/carbon/human/santa/verb/santa_teleport @@ -865,7 +865,7 @@ var/list/seal_names = list("Fluffles","Ronan","Selena","Selkie","Ukog","Ategev", bioHolder.mobAppearance.customization_first = "None" bioHolder.mobAppearance.customization_second = "None" bioHolder.mobAppearance.customization_third = "None" - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) bioHolder.mobAppearance.UpdateMob() src.mind = new @@ -951,7 +951,7 @@ var/list/seal_names = list("Fluffles","Ronan","Selena","Selkie","Ukog","Ategev", playsound(src.loc, "sound/voice/animal/bull.ogg", 80, 1, 0, 0.4) src.visible_message("[src] goes completely apeshit!") src.verbs -= /mob/living/carbon/human/krampus/verb/krampus_rampage - SPAWN_DBG(300) + SPAWN_DBG(30 SECONDS) src.stance = "normal" boutput(src, "Your rage burns out for a while.") SPAWN_DBG(1800) @@ -995,7 +995,7 @@ var/list/seal_names = list("Fluffles","Ronan","Selena","Selkie","Ukog","Ategev", playsound(X.loc, "fleshbr1.ogg", 50, 1, -1) src.transforming = 0 - SPAWN_DBG(600) + SPAWN_DBG(1 MINUTE) boutput(src, "You may now leap again.") src.verbs += /mob/living/carbon/human/krampus/verb/krampus_leap @@ -1022,7 +1022,7 @@ var/list/seal_names = list("Fluffles","Ronan","Selena","Selkie","Ukog","Ategev", for (var/turf/T in range(src,3)) animate_shake(T,5,rand(3,8),rand(3,8)) - SPAWN_DBG(600) + SPAWN_DBG(1 MINUTE) boutput(src, "You may now stomp again.") src.verbs += /mob/living/carbon/human/krampus/verb/krampus_stomp @@ -1083,7 +1083,7 @@ var/list/seal_names = list("Fluffles","Ronan","Selena","Selkie","Ukog","Ategev", usr.put_in_hand_or_drop(G) G.affecting = M M.grabbed_by += G - M.changeStatus("stunned", 1 SECONDS) + M.changeStatus("stunned", 1 SECOND) G.state = 1 G.update_icon() src.dir = get_dir(src, M) diff --git a/code/modules/hydroponics/plant_mutations.dm b/code/modules/hydroponics/plant_mutations.dm index f25504e..74a0979 100644 --- a/code/modules/hydroponics/plant_mutations.dm +++ b/code/modules/hydroponics/plant_mutations.dm @@ -391,7 +391,7 @@ B.anchored = 1 B.set_density(0) B.layer = 5 // TODO what layer should this be on? - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) qdel(B) B=null var/radrange = 1 diff --git a/code/modules/hydroponics/plants_weed.dm b/code/modules/hydroponics/plants_weed.dm index 1d4a973..3cf9c51 100644 --- a/code/modules/hydroponics/plants_weed.dm +++ b/code/modules/hydroponics/plants_weed.dm @@ -143,7 +143,7 @@ B.anchored = 1 B.set_density(0) B.layer = 5 // TODO What layer should this be on? - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) qdel(B) B=null var/radstrength = 5 @@ -207,7 +207,7 @@ POT.visible_message("[POT] begins to bubble and expand!") playsound(POT.loc, "sound/effects/bubbles.ogg", 50, 1) - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) POT.visible_message("[POT] bursts, sending toxic goop everywhere!") playsound(POT.loc, "sound/impact_sounds/Slimy_Splat_1.ogg", 50, 1) diff --git a/code/modules/materials/Mat_MaterialProcs.dm b/code/modules/materials/Mat_MaterialProcs.dm index 0d080d7..53563b1 100644 --- a/code/modules/materials/Mat_MaterialProcs.dm +++ b/code/modules/materials/Mat_MaterialProcs.dm @@ -62,7 +62,7 @@ triggerOnEntered(var/atom/owner, var/atom/entering) /datum/materialProc/ffart_pickup execute(var/mob/M, var/obj/item/I) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) M.remove_item(I) I.set_loc(get_turf(I)) return @@ -184,7 +184,7 @@ triggerOnEntered(var/atom/owner, var/atom/entering) if(prob(8)) M.visible_message("[M.name] scratches at an itch.") random_brute_damage(M, 1) - M.changeStatus("stunned", 1 SECONDS) + M.changeStatus("stunned", 1 SECOND) M.emote("grumble") if(prob(8)) boutput(M, "So itchy!") @@ -503,7 +503,7 @@ triggerOnEntered(var/atom/owner, var/atom/entering) if(temp < T0C + 100) return - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) if(location && location.material && location.material.mat_id == "miracle") location.visible_message("[location] bends and twists, changing colors rapidly.") var/chosen = pick(prob(100); "mauxite",prob(100); "pharosium",prob(100); "cobryl",prob(100); "bohrum",prob(80); "cerenkite",prob(50); "syreline",prob(20); "slag",prob(3); "spacelag",prob(5); "soulsteel",prob(100); "molitz",prob(50); "claretine",prob(5); "erebite",prob(10); "quartz",prob(5); "uqill",prob(10); "telecrystal",prob(1); "starstone",prob(5); "blob",prob(8); "koshmarite",prob(20); "chitin",prob(4); "pizza",prob(15); "beewool",prob(6); "ectoplasm") diff --git a/code/modules/materials/Mat_Mining.dm b/code/modules/materials/Mat_Mining.dm index b05b78d..bc3435a 100644 --- a/code/modules/materials/Mat_Mining.dm +++ b/code/modules/materials/Mat_Mining.dm @@ -106,7 +106,7 @@ var/obj/meleeeffect/pick/DA = new/obj/meleeeffect/pick(start) - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) qdel(DA) var/list/extra_dmg = list() @@ -115,7 +115,7 @@ for(var/turf/T in extra_dmg) if(istype(T,/turf/simulated/wall/asteroid)) var/obj/meleeeffect/conc/conc = new/obj/meleeeffect/conc(T) - SPAWN_DBG(10) qdel(conc) + SPAWN_DBG(1 SECOND) qdel(conc) T:change_health(-(round(power/7))) if(istype(start,/turf/simulated/wall/asteroid)) @@ -175,7 +175,7 @@ animate(EA,alpha=0, time=5) animate(EB,alpha=0, time=5) - SPAWN_DBG(6) + SPAWN_DBG(6 DECI SECONDS) qdel(EA) qdel(EB) @@ -188,7 +188,7 @@ for(var/turf/T in extra_dmg) if(istype(T,/turf/simulated/wall/asteroid)) var/obj/meleeeffect/conc/conc = new/obj/meleeeffect/conc(T) - SPAWN_DBG(10) qdel(conc) + SPAWN_DBG(1 SECOND) qdel(conc) T:change_health(-(round(power/7))) if(istype(start,/turf/simulated/wall/asteroid)) @@ -235,7 +235,7 @@ var/obj/meleeeffect/hammer/DB = new/obj/meleeeffect/hammer(middle) var/obj/meleeeffect/hammer/DC = new/obj/meleeeffect/hammer(end) - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) qdel(DA) qdel(DB) qdel(DC) @@ -248,7 +248,7 @@ for(var/turf/T in extra_dmg) if(istype(T,/turf/simulated/wall/asteroid)) var/obj/meleeeffect/conc/conc = new/obj/meleeeffect/conc(T) - SPAWN_DBG(10) qdel(conc) + SPAWN_DBG(1 SECOND) qdel(conc) T:change_health(-(round(power/7))) if(istype(start,/turf/simulated/wall/asteroid)) @@ -308,7 +308,7 @@ D.dir = attackDir animate(D, pixel_x = anim_x, pixel_y = anim_y, time = 5, easing = QUAD_EASING) - SPAWN_DBG(20) qdel(D) + SPAWN_DBG(2 SECONDS) qdel(D) var/list/extra_dmg = list() if(blasting) @@ -318,7 +318,7 @@ for(var/turf/T in extra_dmg) if(istype(T,/turf/simulated/wall/asteroid)) var/obj/meleeeffect/conc/conc = new/obj/meleeeffect/conc(T) - SPAWN_DBG(10) qdel(conc) + SPAWN_DBG(1 SECOND) qdel(conc) T:change_health(-(round(power/7))) if(istype(start,/turf/simulated/wall/asteroid)) diff --git a/code/modules/materials/Mat_Processing.dm b/code/modules/materials/Mat_Processing.dm index 93951d1..35c2791 100644 --- a/code/modules/materials/Mat_Processing.dm +++ b/code/modules/materials/Mat_Processing.dm @@ -505,7 +505,7 @@ if(components.len > 0) light.enable() playsound(src.loc, sound_zap, 40, 1) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) playsound(src.loc, sound_bubble, 40, 1) if(components.len == 1) boutput(user, "You activate the [src].") @@ -532,7 +532,7 @@ output.generation++ logTheThing("station", user, null, "creates a [output] bar (Material: [output.mat_id]) with the [src] at [log_loc(src)].") // Sorry for code duplication, but I'm regularly seeing runtime errors for some reason if this proc is called after handleSlag (Convair880). handleSlag() - SPAWN_DBG(8) + SPAWN_DBG(8 DECI SECONDS) playsound(src.loc, sound_hiss, 45, 1) light.disable() else diff --git a/code/modules/medical/blood_system.dm b/code/modules/medical/blood_system.dm index ed1effd..1213a58 100644 --- a/code/modules/medical/blood_system.dm +++ b/code/modules/medical/blood_system.dm @@ -222,6 +222,9 @@ this is already used where it needs to be used, you can probably ignore it. */ //BLOOD_DEBUG("[H] processes bleeding: increase_chance now [increase_chance], increase_amount now [increase_amount]") + if (H.lying) + increase_chance -= rand(0,15) + if (H.reagents) var/anticoag_amt = H.reagents.get_reagent_amount("heparin") if (anticoag_amt) diff --git a/code/modules/medical/disabilities/clumsy.dm b/code/modules/medical/disabilities/clumsy.dm index a6664ee..cfdacc9 100644 --- a/code/modules/medical/disabilities/clumsy.dm +++ b/code/modules/medical/disabilities/clumsy.dm @@ -21,8 +21,8 @@ M.hand = h if (prob(3)) M.visible_message("[M.name] stumbles and falls!") - M.changeStatus("stunned", 1 SECONDS) - M.changeStatus("weakened", 1 SECONDS) + M.changeStatus("stunned", 1 SECOND) + M.changeStatus("weakened", 1 SECOND) if (ishuman(M) && prob(25)) var/mob/living/carbon/human/H = M if(!istype(H.head, /obj/item/clothing/head/helmet)) diff --git a/code/modules/medical/diseases/flatline.dm b/code/modules/medical/diseases/flatline.dm index 3d7d2b3..71ddd75 100644 --- a/code/modules/medical/diseases/flatline.dm +++ b/code/modules/medical/diseases/flatline.dm @@ -27,12 +27,12 @@ H.cure_disease(D) src.robo_restart = 1 if (H.organHolder.heart.emagged) - SPAWN_DBG(200) + SPAWN_DBG(20 SECONDS) src.robo_restart = 0 else - SPAWN_DBG(300) + SPAWN_DBG(30 SECONDS) src.robo_restart = 0 - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) boutput(H, "Your cyberheart returns to its normal rhythm!") return @@ -40,24 +40,24 @@ H.cure_disease(D) src.robo_restart = 1 if (H.organHolder.heart.emagged) - SPAWN_DBG(200) + SPAWN_DBG(20 SECONDS) src.robo_restart = 0 else - SPAWN_DBG(300) + SPAWN_DBG(30 SECONDS) src.robo_restart = 0 - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) boutput(H, "Your cyberheart returns to its normal rhythm!") return else src.robo_restart = 1 if (H.organHolder.heart.emagged) - SPAWN_DBG(200) + SPAWN_DBG(20 SECONDS) src.robo_restart = 0 else - SPAWN_DBG(300) + SPAWN_DBG(30 SECONDS) src.robo_restart = 0 - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) boutput(H, "Your cyberheart fails to return to its normal rhythm!") else if (H.get_oxygen_deprivation()) diff --git a/code/modules/medical/diseases/headspider.dm b/code/modules/medical/diseases/headspider.dm index 5eb59a9..154e332 100644 --- a/code/modules/medical/diseases/headspider.dm +++ b/code/modules/medical/diseases/headspider.dm @@ -52,7 +52,7 @@ affected_mob.show_message("You feel a mild stabbing pain in your chest!") affected_mob.TakeDamage("chest", 10, 0, 0, DAMAGE_STAB) affected_mob.updatehealth() - move_spider_out(surgeon, affected_mob) + move_spider_out(surgeon, affected_mob) return 1 /datum/ailment/parasite/headspider/proc/move_spider_out(var/mob/living/surgeon, var/mob/living/M) @@ -138,7 +138,7 @@ logTheThing("combat", affected_mob, null, "'s headspider successfully assumes control of new host at [log_loc(affected_mob)].") D.stealth_asymptomatic = 1 //Retain the disease but don't actually do anything with it - SPAWN_DBG(1200) //Disease stays for two minutes after a complete infection, then it removes itself. + SPAWN_DBG(2 MINUTES) //Disease stays for two minutes after a complete infection, then it removes itself. affected_mob.cure_disease_by_path(/datum/ailment/parasite/headspider) return diff --git a/code/modules/medical/diseases/heartfailure.dm b/code/modules/medical/diseases/heartfailure.dm index 0ee459c..e0eaeec 100644 --- a/code/modules/medical/diseases/heartfailure.dm +++ b/code/modules/medical/diseases/heartfailure.dm @@ -33,7 +33,7 @@ src.robo_restart = 1 SPAWN_DBG(oH.heart.emagged ? 200 : 300) src.robo_restart = 0 - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) if (H) H.cure_disease(D) boutput(H, "Your cyberheart returns to its normal rhythm!") @@ -42,7 +42,7 @@ src.robo_restart = 1 SPAWN_DBG(oH.heart.emagged ? 200 : 300) src.robo_restart = 0 - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) if (H) H.cure_disease(D) boutput(H, "Your cyberheart returns to its normal rhythm!") @@ -51,7 +51,7 @@ src.robo_restart = 1 SPAWN_DBG(oH.heart.emagged ? 200 : 300) src.robo_restart = 0 - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) if (H) boutput(H, "Your cyberheart fails to return to its normal rhythm!") diff --git a/code/modules/medical/diseases/malady.dm b/code/modules/medical/diseases/malady.dm index 5121f08..d2d10d4 100644 --- a/code/modules/medical/diseases/malady.dm +++ b/code/modules/medical/diseases/malady.dm @@ -449,7 +449,7 @@ D.robo_restart = 1 SPAWN_DBG(oH.heart.emagged ? 200 : 300) D.robo_restart = 0 - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) if (H) H.cure_disease(D) boutput(H, "Your cyberheart returns to its normal rhythm!") @@ -459,7 +459,7 @@ SPAWN_DBG(oH.heart.emagged ? 200 : 300) if (D) //ZeWaka: Fix for null.robo_restart D.robo_restart = 0 - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) if (H) H.cure_disease(D) boutput(H, "Your cyberheart returns to its normal rhythm!") @@ -469,7 +469,7 @@ SPAWN_DBG(oH.heart.emagged ? 200 : 300) if (D) D.robo_restart = 0 - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) if (H) boutput(H, "Your cyberheart fails to return to its normal rhythm!") @@ -538,12 +538,12 @@ H.cure_disease(D) D.robo_restart = 1 if (H.organHolder.heart.emagged) - SPAWN_DBG(200) + SPAWN_DBG(20 SECONDS) D.robo_restart = 0 else - SPAWN_DBG(300) + SPAWN_DBG(30 SECONDS) D.robo_restart = 0 - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) boutput(H, "Your cyberheart returns to its normal rhythm!") return @@ -551,28 +551,28 @@ H.cure_disease(D) D.robo_restart = 1 if (H.organHolder.heart.emagged) - SPAWN_DBG(200) + SPAWN_DBG(20 SECONDS) if (D) //ZeWaka: Fix for null.robo_restart x4 D.robo_restart = 0 else - SPAWN_DBG(300) + SPAWN_DBG(30 SECONDS) if (D) D.robo_restart = 0 - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) boutput(H, "Your cyberheart returns to its normal rhythm!") return else D.robo_restart = 1 if (H.organHolder.heart.emagged) - SPAWN_DBG(200) + SPAWN_DBG(20 SECONDS) if (D) D.robo_restart = 0 else - SPAWN_DBG(300) + SPAWN_DBG(30 SECONDS) if (D) D.robo_restart = 0 - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) boutput(H, "Your cyberheart fails to return to its normal rhythm!") else if (H.get_oxygen_deprivation()) diff --git a/code/modules/medical/diseases/organ_diseases/appendicitis.dm b/code/modules/medical/diseases/organ_diseases/appendicitis.dm index ea48f80..079e016 100644 --- a/code/modules/medical/diseases/organ_diseases/appendicitis.dm +++ b/code/modules/medical/diseases/organ_diseases/appendicitis.dm @@ -25,7 +25,7 @@ //handle robopancreas failuer. should do some stuff I guess // else if (H.organHolder.pancreas && H.organHolder.pancreas.robotic && !H.organHolder.heart.health > 0) - + if (prob(D.stage * 30)) H.organHolder.appendix.take_damage(0, 0, D.stage) switch (D.stage) diff --git a/code/modules/medical/genetics/bioEffects/powers.dm b/code/modules/medical/genetics/bioEffects/powers.dm index 49f9e65..5181e77 100644 --- a/code/modules/medical/genetics/bioEffects/powers.dm +++ b/code/modules/medical/genetics/bioEffects/powers.dm @@ -72,14 +72,14 @@ var/obj/decal/icefloor/B B = new /obj/decal/icefloor(T) - SPAWN_DBG(800) + SPAWN_DBG(80 SECONDS) if (B) B.dispose() if (linked_power.power) for (var/turf/TF in orange(1,T)) B = new /obj/decal/icefloor(TF) - SPAWN_DBG(800) + SPAWN_DBG(80 SECONDS) B.dispose() for (var/mob/living/L in T.contents) @@ -447,7 +447,7 @@ playsound(owner.loc, "sound/impact_sounds/Slimy_Hit_4.ogg", 50, 1) owner.visible_message("[owner] touches [target], then begins to shifts and contort!") - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) if(H && owner) playsound(owner.loc, "sound/impact_sounds/Flesh_Break_2.ogg", 50, 1) owner.bioHolder.CopyOther(H.bioHolder, copyAppearance = 1, copyPool = 0, copyEffectBlocks = 0, copyActiveEffects = 0) @@ -1295,7 +1295,7 @@ owner.visible_message("[owner] appears in a burst of blue light!") playsound(owner.loc, "sound/effects/ghost2.ogg", 50, 0) - SPAWN_DBG(7) + SPAWN_DBG(7 DECI SECONDS) animate(owner, alpha = 255, time = 5, easing = LINEAR_EASING) animate(color = "#FFFFFF", time = 5, easing = LINEAR_EASING) active = 0 @@ -1334,7 +1334,7 @@ playsound(owner.loc, "sound/effects/ghost2.ogg", 50, 0) animate(owner, color = "#0000FF", time = 5, easing = LINEAR_EASING) animate(alpha = 0, time = 5, easing = LINEAR_EASING) - SPAWN_DBG(7) + SPAWN_DBG(7 DECI SECONDS) var/obj/dummy/spell_invis/invis_object = new /obj/dummy/spell_invis(get_turf(owner)) invis_object.canmove = 0 owner.set_loc(invis_object) @@ -1351,7 +1351,7 @@ owner.visible_message("[owner] appears in a burst of blue light!") playsound(owner.loc, "sound/effects/ghost2.ogg", 50, 0) - SPAWN_DBG(7) + SPAWN_DBG(7 DECI SECONDS) animate(owner, alpha = 255, time = 5, easing = LINEAR_EASING) animate(color = "#FFFFFF", time = 5, easing = LINEAR_EASING) P.active = 0 @@ -1661,7 +1661,7 @@ current_prob *= modifier // very steep. probably grabs 3 or 4 objects per cast -- much less effective than revenant command thrown += O animate_float(O) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) for (var/obj/O in thrown) O.throw_at(T, 32, 2) @@ -1683,7 +1683,7 @@ current_prob *= modifier // very steep. probably grabs 3 or 4 objects per cast -- much less effective than revenant command thrown += O animate_float(O) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) for (var/obj/O in thrown) O.throw_at(owner, 32, 2) @@ -2047,7 +2047,7 @@ owner.visible_message("[thrown_limb][linked_power.power ? " violently " : " "]bursts off of its socket and flies towards [target]!") logTheThing("combat", owner, target, "shoot_limb [!linked_power.safety ? "Accidently" : ""] at [ismob(target)].") - spawn(10) + spawn(1 SECOND) if (thrown_limb) thrown_limb.throwforce = tmp_force diff --git a/code/modules/medical/genetics/geneticsMachines.dm b/code/modules/medical/genetics/geneticsMachines.dm index 89e073f..944a31b 100644 --- a/code/modules/medical/genetics/geneticsMachines.dm +++ b/code/modules/medical/genetics/geneticsMachines.dm @@ -29,7 +29,7 @@ var/list/genetics_computers = list() /obj/machinery/computer/genetics/New() ..() genetics_computers += src - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.scanner = locate(/obj/machinery/genetics_scanner, orange(1,src)) return return diff --git a/code/modules/medical/genetics/geneticsScanner.dm b/code/modules/medical/genetics/geneticsScanner.dm index a518d84..a2ab4ee 100644 --- a/code/modules/medical/genetics/geneticsScanner.dm +++ b/code/modules/medical/genetics/geneticsScanner.dm @@ -18,7 +18,7 @@ var/list/genescanner_addresses = list() New() ..() - SPAWN_DBG(8) + SPAWN_DBG(8 DECI SECONDS) if(radio_controller) radio_connection = radio_controller.add_object(src, "[frequency]") if(!src.net_id) @@ -485,7 +485,7 @@ var/list/genescanner_addresses = list() if(!usercl || !target_mob) qdel(src) return - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) src.process() return diff --git a/code/modules/medical/genetics/portaclone.dm b/code/modules/medical/genetics/portaclone.dm index 584b766..21f60fb 100644 --- a/code/modules/medical/genetics/portaclone.dm +++ b/code/modules/medical/genetics/portaclone.dm @@ -22,7 +22,7 @@ if(computer) computer.portable = 1 if(pod1) pod1.portable = 1 - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) computer.scanner = scanner computer.pod1 = pod1 diff --git a/code/modules/medical/pathology/pathogen_machines.dm b/code/modules/medical/pathology/pathogen_machines.dm index bcdcf1e..512d8dd 100644 --- a/code/modules/medical/pathology/pathogen_machines.dm +++ b/code/modules/medical/pathology/pathogen_machines.dm @@ -414,7 +414,7 @@ ..() gui = new("html/pathoComp.html", "pathology", "size=900x800", src) gui.validate_user = 1 - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) rescan() proc/rescan() @@ -1155,7 +1155,7 @@ src.reagents.my_atom = src flags |= NOSPLASH if (!pathogen_controller || !pathogen_controller.cure_bases || !pathogen_controller.cure_bases.len) - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) for (var/C in pathogen_controller.cure_bases) src.reagents.add_reagent(C, 1) else diff --git a/code/modules/medical/pathology/pathogen_symptoms.dm b/code/modules/medical/pathology/pathogen_symptoms.dm index 5d61d75..314ab58 100644 --- a/code/modules/medical/pathology/pathogen_symptoms.dm +++ b/code/modules/medical/pathology/pathogen_symptoms.dm @@ -640,7 +640,7 @@ datum/pathogeneffects/malevolent/serious_paranoia if (prob(50)) boutput(M, "[O] points at [M].") var/point = new /obj/decal/point(get_turf(M)) - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) qdel(point) boutput(M, "[O] [action], \"[what]\"") @@ -1061,7 +1061,7 @@ datum/pathogeneffects/malevolent/capacitor if (load > 4e6) M.visible_message("[M] releases a burst of lightning into the air!", "You discharge your energy into the air. It leaves your skin burned to a fine crisp.", "You hear a burst of electricity.") M.TakeDamage("chest", 0, 30) - M.changeStatus("stunned", 1 SECONDS) + M.changeStatus("stunned", 1 SECOND) for (var/mob/V in orange(4, M)) electrocute(V, load / 10) else if (load > 1e6) @@ -1083,7 +1083,7 @@ datum/pathogeneffects/malevolent/capacitor for (var/mob/V in orange(2, M)) electrocute(V, load / 10) else if (load > 5000) - M.changeStatus("stunned", 1 SECONDS) + M.changeStatus("stunned", 1 SECOND) M.visible_message("[M] releases a few sparks into the air.", "You discharge your energy into the air.", "You hear a burst of electricity.") for (var/mob/V in orange(1, M)) electrocute(V, load / 10) @@ -1680,7 +1680,7 @@ datum/pathogeneffects/malevolent/seriouschills else M.bodytemperature -= 20 M.show_message("You feel pretty damn cold.") - M.changeStatus("stunned", 1 SECONDS) + M.changeStatus("stunned", 1 SECOND) M.emote("shiver") if (5) @@ -1737,7 +1737,7 @@ datum/pathogeneffects/malevolent/seriouschills/ultimate else M.bodytemperature -= 30 M.show_message("You pretty damn cold.") - M.changeStatus("stunned", 1 SECONDS) + M.changeStatus("stunned", 1 SECOND) M.emote("shiver") if (5) diff --git a/code/modules/medical/pathology/pathogen_tools.dm b/code/modules/medical/pathology/pathogen_tools.dm index b88b44d..6651445 100644 --- a/code/modules/medical/pathology/pathogen_tools.dm +++ b/code/modules/medical/pathology/pathogen_tools.dm @@ -281,7 +281,7 @@ New() ..() - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) var/datum/pathogen/P = unpool(/datum/pathogen) P.create_weak() var/datum/reagents/RE = src.reagents diff --git a/code/modules/medical/surgery_procs.dm b/code/modules/medical/surgery_procs.dm index a715c57..232adb4 100644 --- a/code/modules/medical/surgery_procs.dm +++ b/code/modules/medical/surgery_procs.dm @@ -728,9 +728,9 @@ 5.0 = snip -> 6.0 || cut -> 7.0 || saw -> 8.0 6.0 = snip is remove pancreas || cut is remove spleen 7.0 = snip is remove kidneys - 8.0 = cut -> 9.0 + 8.0 = cut -> 9.0 9.0 = saw is remove heart - + remove lungs = snip -> saw -> snip -> Right/Left hands for removing R/L lungs remove appendix = snip -> snip -> snip remove liver = snip -> snip -> cut @@ -897,7 +897,7 @@ take_bleeding_damage(patient, surgeon, damage_low) else surgeon.show_text("You clamp the bleeders with the hemostat.", "blue") - + logTheThing("combat", surgeon, patient, "removed %target%'s spleen with [src].") patient.updatehealth() patient.organHolder.drop_organ("spleen") @@ -964,7 +964,7 @@ if (surgeon.bioHolder.HasEffect("clumsy") && prob(50)) surgeon.visible_message("[surgeon] mishandles [src] and cuts [him_or_her(surgeon)]self!",\ "You mishandle [src] and cut yourself!") - surgeon.changeStatus("weakened", 1 SECONDS) + surgeon.changeStatus("weakened", 1 SECOND) var/damage = rand(10, 20) random_brute_damage(surgeon, damage) take_bleeding_damage(surgeon, damage) @@ -1296,7 +1296,7 @@ if (3.0) playsound(get_turf(patient), "sound/impact_sounds/Slimy_Cut_1.ogg", 50, 1) - + if (!patient.organHolder || !patient.organHolder.get_organ("heart")) src.surgeryConfusion(patient, surgeon, damage_low) return 1 @@ -1830,7 +1830,7 @@ /* ------------ SNIP ----------- */ /* ============================= */ -/obj/item/proc/snip_surgery(var/mob/living/carbon/human/patient as mob, var/mob/living/surgeon as mob) +/obj/item/proc/snip_surgery(var/mob/living/carbon/human/patient as mob, var/mob/living/surgeon as mob) if (!surgeryCheck(patient, surgeon)) return 0 @@ -1864,7 +1864,7 @@ DEBUG_MESSAGE("[patient]'s surgery (performed by [surgeon]) damage_low is [damage_low], damage_high is [damage_high]") /* ---------- SNIP - chest ---------- */ - if (surgeon.zone_sel.selecting == "chest") + if (surgeon.zone_sel.selecting == "chest") if (patient.organHolder.chest) switch (patient.organHolder.chest.op_stage) if (0.0) diff --git a/code/modules/medical/surgery_tools.dm b/code/modules/medical/surgery_tools.dm index 6dc9c58..618dcb6 100644 --- a/code/modules/medical/surgery_tools.dm +++ b/code/modules/medical/surgery_tools.dm @@ -67,7 +67,7 @@ CONTAINS: playsound(user.loc, src.hitsound, 50, 1) user.TakeDamage("head", 150, 0) user.updatehealth() - SPAWN_DBG(500) + SPAWN_DBG(50 SECONDS) if (user && !isdead(user)) user.suiciding = 0 return 1 @@ -129,7 +129,7 @@ CONTAINS: playsound(user.loc, src.hitsound, 50, 1) user.TakeDamage("head", 150, 0) user.updatehealth() - SPAWN_DBG(500) + SPAWN_DBG(50 SECONDS) if (user && !isdead(user)) user.suiciding = 0 return 1 @@ -189,7 +189,7 @@ CONTAINS: playsound(user.loc, src.hitsound, 50, 1) user.TakeDamage("head", 150, 0) user.updatehealth() - SPAWN_DBG(500) + SPAWN_DBG(50 SECONDS) if (user && !isdead(user)) user.suiciding = 0 return 1 @@ -371,7 +371,7 @@ CONTAINS: playsound(src.loc, "sound/impact_sounds/Energy_Hit_3.ogg", 75, 1) src.charged = 0 set_icon_state("[src.icon_base]-shock") - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) set_icon_state("[src.icon_base]-off") SPAWN_DBG(src.charge_time) src.charged = 1 @@ -398,7 +398,7 @@ CONTAINS: if (!src.user_can_suicide(user)) return 0 if (src.defibrillate(user, user, src.emagged, src.makeshift, src.cell, 1)) - SPAWN_DBG(500) + SPAWN_DBG(50 SECONDS) if (user && !isdead(user)) user.suiciding = 0 else @@ -481,7 +481,7 @@ CONTAINS: user.visible_message("[user] rapidly sews [his_or_her(user)] mouth and nose closed with [src]! Holy shit, how?!") user.take_oxygen_deprivation(160) user.updatehealth() - SPAWN_DBG(500) + SPAWN_DBG(50 SECONDS) if (user && !isdead(user)) user.suiciding = 0 return 1 @@ -894,7 +894,7 @@ CONTAINS: O.set_loc(get_turf(src)) for (var/mob/M in src) M.changeStatus("weakened", 2 SECONDS) - SPAWN_DBG(3) + SPAWN_DBG(3 DECI SECONDS) M.set_loc(get_turf(src)) src.open = 1 src.update_icon() @@ -1287,7 +1287,7 @@ keeping this here because I want to make something else with it eventually falling.set_loc(get_turf(src)) src.vis_contents -= falling - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) if(falling) falling.throw_at(target, 1, 1) diff --git a/code/modules/networks/computer3/comm_dish.dm b/code/modules/networks/computer3/comm_dish.dm index fe609e2..5b12a63 100644 --- a/code/modules/networks/computer3/comm_dish.dm +++ b/code/modules/networks/computer3/comm_dish.dm @@ -20,7 +20,7 @@ New() ..() comm_dishes += src - SPAWN_DBG(6) + SPAWN_DBG(6 DECI SECONDS) if(!src.link) var/turf/T = get_turf(src) var/obj/machinery/power/data_terminal/test_link = locate() in T @@ -113,7 +113,7 @@ post_reply(error_text, target_id) if(!error_text || !target_id) return - SPAWN_DBG(3) + SPAWN_DBG(3 DECI SECONDS) src.post_status(target_id, "command", "device_reply", "status", error_text) return @@ -140,7 +140,7 @@ //Otherwise, ff they aren't addressing us, ignore them if(signal.data["address_1"] != src.net_id) if((signal.data["address_1"] == "ping") && signal.data["sender"]) - SPAWN_DBG(5) //Send a reply for those curious jerks + SPAWN_DBG(5 DECI SECONDS) //Send a reply for those curious jerks src.post_status(target, "command", "ping_reply", "device", "PNET_COM_ARRAY", "netid", src.net_id) return @@ -181,14 +181,14 @@ if(target in src.terminals) //something might be wrong here, disconnect them! src.terminals.Remove(target) - SPAWN_DBG(3) + SPAWN_DBG(3 DECI SECONDS) src.post_status(target, "command","term_disconnect") return src.terminals.Add(target) //Accept the connection! src.post_status(target, "command","term_connect","data","noreply","device","PNET_COM_ARRAY") src.updateUsrDialog() - SPAWN_DBG(2) //Hello! + SPAWN_DBG(2 DECI SECONDS) //Hello! src.post_status(target,"command","term_message","data","command=register") return @@ -209,7 +209,7 @@ .["[add_zero("[x]",2)]"] = "[mtitle]" - SPAWN_DBG(3) + SPAWN_DBG(3 DECI SECONDS) src.post_status(target, "command","term_message","data",list2params(.),"render","multiline") return @@ -240,7 +240,7 @@ filesig.data["address_1"] = target filesig.data["sender"] = src.net_id - SPAWN_DBG(3) + SPAWN_DBG(3 DECI SECONDS) src.link.post_signal(src, filesig) /* @@ -262,7 +262,7 @@ if(!listdat) listdat = "No messages available." - SPAWN_DBG(3) + SPAWN_DBG(3 DECI SECONDS) src.post_status(target, "command","term_message","data",listdat,"render","multiline") return @@ -294,7 +294,7 @@ filesig.data["address_1"] = target filesig.data["sender"] = src.net_id - SPAWN_DBG(3) + SPAWN_DBG(3 DECI SECONDS) src.link.post_signal(src, filesig) */ return diff --git a/code/modules/networks/computer3/computer3.dm b/code/modules/networks/computer3/computer3.dm index 67ce7d3..2be80fe 100644 --- a/code/modules/networks/computer3/computer3.dm +++ b/code/modules/networks/computer3/computer3.dm @@ -266,7 +266,7 @@ light.set_brightness(0.4) light.attach(src) - SPAWN_DBG(4) + SPAWN_DBG(4 DECI SECONDS) if(ispath(src.setup_starting_peripheral1)) new src.setup_starting_peripheral1(src) //Peripherals add themselves automatically if spawned inside a computer3 @@ -880,7 +880,7 @@ function lineEnter (ev) src.temp_add = "Restarting system...
" src.updateUsrDialog() playsound(src.loc, 'sound/machines/keypress.ogg', 50, 1, 5) - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) src.restarting = 0 src.post_system() @@ -977,7 +977,7 @@ function lineEnter (ev) New() ..() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) if(!luggable) src.luggable = new luggable_type (src) src.luggable.case = src diff --git a/code/modules/networks/computer3/mainframe2/_base_os.dm b/code/modules/networks/computer3/mainframe2/_base_os.dm index 1886674..17fa0a6 100644 --- a/code/modules/networks/computer3/mainframe2/_base_os.dm +++ b/code/modules/networks/computer3/mainframe2/_base_os.dm @@ -109,7 +109,7 @@ var/global/list/generic_exit_list = list("command"=DWAINE_COMMAND_EXIT) src.ping_accept = 4 src.master.timeout = 1 src.master.timeout_alert = 0 - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.master.post_status("ping","data","DWAINE","net","[src.master.net_number]") //Run "init" program, if present. @@ -488,7 +488,7 @@ var/global/list/generic_exit_list = list("command"=DWAINE_COMMAND_EXIT) src.master.timeout_alert = 0 src.master.timeout = 5 src.ping_accept = 5 - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) src.master.post_status("ping","data","DWAINE","net","[src.master.net_number]") return ESIG_SUCCESS @@ -832,7 +832,7 @@ var/global/list/generic_exit_list = list("command"=DWAINE_COMMAND_EXIT) if (src.rescan_timer <= 0) src.rescan_timer = initial(src.rescan_timer) src.ping_accept = 4 - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) src.master.post_status("ping","data","DWAINE","net","[src.master.net_number]") return diff --git a/code/modules/networks/computer3/mainframe2/artifact_res.dm b/code/modules/networks/computer3/mainframe2/artifact_res.dm index c6c3d5c..ea8dadb 100644 --- a/code/modules/networks/computer3/mainframe2/artifact_res.dm +++ b/code/modules/networks/computer3/mainframe2/artifact_res.dm @@ -621,7 +621,7 @@ driverID &= ~ESIG_DATABIT signal_program(1, list("command"=DWAINE_COMMAND_DMSG, "target"=driverID, "dcommand"="poke", "field"=current_field, "value"=valueToAdjust)) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) signal_program(1, list("command"=DWAINE_COMMAND_DMSG, "target"=driverID, "dcommand"="peek", "field"=current_field)) return @@ -944,7 +944,7 @@ ..() entries = list("","","","","|cLoading...","","","") - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.net_id = generate_net_id(src) if(!src.link) @@ -976,7 +976,7 @@ if(signal.data["address_1"] != src.net_id) if((signal.data["address_1"] == "ping") && ((signal.data["net"] == null) || ("[signal.data["net"]]" == "[src.net_number]")) && signal.data["sender"]) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.post_status(target, "command", "ping_reply", "device", src.device_tag, "netid", src.net_id, "net", "[net_number]") return @@ -991,7 +991,7 @@ src.host_id = null src.entries[5] = "No Connection" src.updateUsrDialog(REASON_ALERT) - SPAWN_DBG(3) + SPAWN_DBG(3 DECI SECONDS) src.post_status(target, "command","term_disconnect") return @@ -1399,7 +1399,7 @@ DEBUG_OUT(6) src.post_status(old, "command", "term_connect", "device", src.device_tag) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) if (!old_host_id) old_host_id = old diff --git a/code/modules/networks/computer3/mainframe2/base_program.dm b/code/modules/networks/computer3/mainframe2/base_program.dm index f559d7b..68f0da0 100644 --- a/code/modules/networks/computer3/mainframe2/base_program.dm +++ b/code/modules/networks/computer3/mainframe2/base_program.dm @@ -78,7 +78,7 @@ src.holder.root.holder = src src.holder.root.name = "root" - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) src.master.post_status(termid, "command", "term_message", "data", message, "render", render) return 0 @@ -101,7 +101,7 @@ src.holder.root.holder = src src.holder.root.name = "root" - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) src.master.post_file(termid, "data", exdata, file) return 0 diff --git a/code/modules/networks/computer3/mainframe2/logreader.dm b/code/modules/networks/computer3/mainframe2/logreader.dm index a9b9685..e1bcda3 100644 --- a/code/modules/networks/computer3/mainframe2/logreader.dm +++ b/code/modules/networks/computer3/mainframe2/logreader.dm @@ -35,7 +35,7 @@ New() ..() - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.net_id = generate_net_id(src) if(!src.link) @@ -162,7 +162,7 @@ src.host_id = null src.old_host_id = null src.post_status(rem_host, "command","term_disconnect") - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.post_status(rem_host, "command","term_connect","device",src.device_tag) src.updateUsrDialog() @@ -306,7 +306,7 @@ //We care very deeply about address_1. if(lowertext(signal.data["address_1"]) != lowertext(src.net_id)) if((signal.data["address_1"] == "ping") && ((signal.data["net"] == null) || ("[signal.data["net"]]" == "[src.net_number]"))) - SPAWN_DBG(5) //Send a reply for those curious jerks + SPAWN_DBG(5 DECI SECONDS) //Send a reply for those curious jerks if (signal.transmission_method == TRANSMISSION_WIRE) src.post_status(target, "command", "ping_reply", "device", src.device_tag, "netid", src.net_id, "net", "[net_number]") // else ???? @@ -323,7 +323,7 @@ if(target == src.host_id) src.host_id = null src.updateUsrDialog() - SPAWN_DBG(3) + SPAWN_DBG(3 DECI SECONDS) src.post_status(target, "command","term_disconnect") return @@ -337,7 +337,7 @@ if(signal.data["data"] != "noreply") src.post_status(target, "command","term_connect","data","noreply","device",src.device_tag) src.updateUsrDialog() - SPAWN_DBG(2) //Sign up with the driver (if a mainframe contacted us) + SPAWN_DBG(2 DECI SECONDS) //Sign up with the driver (if a mainframe contacted us) src.post_status(target,"command","term_message","data","command=register") return diff --git a/code/modules/networks/computer3/mainframe2/mainframe2.dm b/code/modules/networks/computer3/mainframe2/mainframe2.dm index ea29aa1..7c7d462 100644 --- a/code/modules/networks/computer3/mainframe2/mainframe2.dm +++ b/code/modules/networks/computer3/mainframe2/mainframe2.dm @@ -61,7 +61,7 @@ New() ..() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src.net_id = generate_net_id(src) @@ -251,7 +251,7 @@ return use_power(500) if(prob(3)) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) playsound(src.loc, pick(ambience_computer), 50, 1) for (var/progIndex = 1, progIndex <= src.processing.len, progIndex++) @@ -303,7 +303,7 @@ //Otherwise, if they aren't addressing us, ignore them if(signal.data["address_1"] != src.net_id) if((signal.data["address_1"] == "ping") && ((signal.data["net"] == null) || ("[signal.data["net"]]" == "[src.net_number]")) && signal.data["sender"]) - SPAWN_DBG(5) //Send a reply for those curious jerks + SPAWN_DBG(5 DECI SECONDS) //Send a reply for those curious jerks src.post_status(target, "command", "ping_reply", "device", src.device_tag, "netid", src.net_id) return @@ -323,7 +323,7 @@ //qdel(conn) if (conn) conn.dispose() - SPAWN_DBG(3) + SPAWN_DBG(3 DECI SECONDS) src.post_status(target, "command","term_disconnect") return @@ -368,7 +368,7 @@ if("term_ping") if(!(target in src.terminals)) - SPAWN_DBG(3) //Go away!! + SPAWN_DBG(3 DECI SECONDS) //Go away!! src.post_status(target, "command","term_disconnect") return if(target in src.timeout_list) @@ -704,7 +704,7 @@ src.stage = 1 src.ping_wait = 4 src.current = null - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) src.master.post_status("ping","data","NETBOOT","net","[src.master.net_number]") return diff --git a/code/modules/networks/computer3/mainframe2/misc_terms.dm b/code/modules/networks/computer3/mainframe2/misc_terms.dm index d9bc912..c9d47a3 100644 --- a/code/modules/networks/computer3/mainframe2/misc_terms.dm +++ b/code/modules/networks/computer3/mainframe2/misc_terms.dm @@ -160,7 +160,7 @@ src.net_id = generate_net_id(src) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) if(!src.link) var/turf/T = get_turf(src) @@ -315,7 +315,7 @@ src.host_id = null src.old_host_id = null src.post_status(rem_host, "command","term_disconnect") - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.post_status(rem_host, "command","term_connect","device",src.device_tag) src.updateUsrDialog() @@ -375,7 +375,7 @@ //Otherwise, if they aren't addressing us, ignore them if(signal.data["address_1"] != src.net_id) if((signal.data["address_1"] == "ping") && ((signal.data["net"] == null) || ("[signal.data["net"]]" == "[src.net_number]")) && signal.data["sender"]) - SPAWN_DBG(5) //Send a reply for those curious jerks + SPAWN_DBG(5 DECI SECONDS) //Send a reply for those curious jerks src.post_status(target, "command", "ping_reply", "device", src.device_tag, "netid", src.net_id, "net", "[src.net_number]") return @@ -390,7 +390,7 @@ // //WHAT IS THIS, HOW COULD THIS HAPPEN?? // src.host_id = null // src.updateUsrDialog() -// SPAWN_DBG(3) +// SPAWN_DBG(3 DECI SECONDS) // src.post_status(target, "command","term_disconnect") // return @@ -404,7 +404,7 @@ if(signal.data["data"] != "noreply") src.post_status(target, "command","term_connect","data","noreply","device",src.device_tag) src.updateUsrDialog() - SPAWN_DBG(2) //Sign up with the driver (if a mainframe contacted us) + SPAWN_DBG(2 DECI SECONDS) //Sign up with the driver (if a mainframe contacted us) src.post_status(target,"command","term_message","data","command=register&data=[src.bank_id]") return @@ -442,7 +442,7 @@ for(var/datum/computer/file/F in tape.root.contents) catrec.fields[F.name] = "[F.extension] - [F.size]" - SPAWN_DBG(2) + SPAWN_DBG(2 DECI SECONDS) src.post_file(target, "data","command=catalog",catrec) //qdel(catrec) //A copy is sent, the original is no longer needed. if (catrec) @@ -865,7 +865,7 @@ src.host_id = null src.old_host_id = null src.post_status(rem_host, "command","term_disconnect") - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.post_status(rem_host, "command","term_connect","device",src.device_tag) src.updateUsrDialog() @@ -1070,7 +1070,7 @@ New() ..() - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.net_id = generate_net_id(src) if(!src.link) @@ -1134,7 +1134,7 @@ src.host_id = null src.old_host_id = null src.post_status(rem_host, "command","term_disconnect") - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.post_status(rem_host, "command","term_connect","device",src.device_tag) src.updateUsrDialog() @@ -1228,7 +1228,7 @@ //Otherwise, if they aren't addressing us, ignore them if(signal.data["address_1"] != src.net_id) if((signal.data["address_1"] == "ping") && ((signal.data["net"] == null) || ("[signal.data["net"]]" == "[src.net_number]")) && signal.data["sender"]) - SPAWN_DBG(5) //Send a reply for those curious jerks + SPAWN_DBG(5 DECI SECONDS) //Send a reply for those curious jerks src.post_status(target, "command", "ping_reply", "device", src.device_tag, "netid", src.net_id, "net", "[src.net_number]") return @@ -1243,7 +1243,7 @@ // //WHAT IS THIS, HOW COULD THIS HAPPEN?? // src.host_id = null // src.updateUsrDialog() -// SPAWN_DBG(3) +// SPAWN_DBG(3 DECI SECONDS) // src.post_status(target, "command","term_disconnect") // return @@ -1257,7 +1257,7 @@ if(signal.data["data"] != "noreply") src.post_status(target, "command","term_connect","data","noreply","device",src.device_tag) src.updateUsrDialog() - SPAWN_DBG(2) //Sign up with the driver (if a mainframe contacted us) + SPAWN_DBG(2 DECI SECONDS) //Sign up with the driver (if a mainframe contacted us) src.post_status(target,"command","term_message","data","command=register&data=nucharge") return @@ -1403,7 +1403,7 @@ src.net_id = generate_net_id(src) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) if (radio_controller) frequencies["1411"] = radio_controller.add_object(src, "1411") @@ -1491,7 +1491,7 @@ src.host_id = null src.old_host_id = null src.post_status(rem_host, "command","term_disconnect") - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.post_status(rem_host, "command","term_connect","device",src.device_tag) src.updateUsrDialog() @@ -1546,7 +1546,7 @@ //We care very deeply about address_1. if(!cmptext(signal.data["address_1"], src.net_id)) if((signal.data["address_1"] == "ping") && ((signal.data["net"] == null) || ("[signal.data["net"]]" == "[src.net_number]"))) - SPAWN_DBG(5) //Send a reply for those curious jerks + SPAWN_DBG(5 DECI SECONDS) //Send a reply for those curious jerks if (signal.transmission_method == TRANSMISSION_RADIO) var/datum/radio_frequency/transmit_connection = radio_controller.return_frequency("[theFreq]") @@ -1600,7 +1600,7 @@ if (theFreq) workparams += "&_freq=[theFreq]" - SPAWN_DBG(2) + SPAWN_DBG(2 DECI SECONDS) if(working_file) src.post_file(src.host_id,"data",workparams,working_file) else @@ -1617,7 +1617,7 @@ // if(target == src.host_id) // src.host_id = null // src.updateUsrDialog() -// SPAWN_DBG(3) +// SPAWN_DBG(3 DECI SECONDS) // src.post_status(target, "command","term_disconnect") // return @@ -1631,7 +1631,7 @@ if(signal.data["data"] != "noreply") src.post_status(target, "command","term_connect","data","noreply","device",src.device_tag) src.updateUsrDialog() - SPAWN_DBG(5) //Sign up with the driver (if a mainframe contacted us) + SPAWN_DBG(5 DECI SECONDS) //Sign up with the driver (if a mainframe contacted us) src.post_status(target,"command","term_message","data","command=register[(frequencies && frequencies.len) ? "&freqs=[jointext(frequencies,",")]" : ""]") return @@ -1739,7 +1739,7 @@ if(!print_id) src.print_id = "GENERIC" - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.net_id = generate_net_id(src) if(!src.link) @@ -1878,7 +1878,7 @@ src.host_id = null src.old_host_id = null src.post_status(rem_host, "command","term_disconnect") - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.post_status(rem_host, "command","term_connect","device",src.device_tag) src.updateUsrDialog() @@ -1930,7 +1930,7 @@ if(signal.data["address_1"] != src.net_id) if((signal.data["address_1"] == "ping") && ((signal.data["net"] == null) || ("[signal.data["net"]]" == "[src.net_number]")) && signal.data["sender"]) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.post_status(target, "command", "ping_reply", "device", src.device_tag, "netid", src.net_id, "net", "[net_number]") return @@ -1946,7 +1946,7 @@ //WHAT IS THIS, HOW COULD THIS HAPPEN?? src.host_id = null src.updateUsrDialog() - SPAWN_DBG(3) + SPAWN_DBG(3 DECI SECONDS) src.post_status(target, "command","term_disconnect") return */ @@ -1960,7 +1960,7 @@ if(signal.data["data"] != "noreply") src.post_status(target, "command","term_connect","data","noreply","device",src.device_tag) src.updateUsrDialog() - SPAWN_DBG(2) //Sign up with the driver (if a mainframe contacted us) + SPAWN_DBG(2 DECI SECONDS) //Sign up with the driver (if a mainframe contacted us) src.post_status(target,"command","term_message","data","command=register&data=[src.print_id]") return @@ -2069,7 +2069,7 @@ flick("printer-printing",src) playsound(src.loc, "sound/machines/printer_dotmatrix.ogg", 50, 1) - SPAWN_DBG(32) + SPAWN_DBG(3.2 SECONDS) if (istype(print_text, /datum/computer/file/image)) // trying to print a photo! :I var/datum/computer/file/image/IMG = print_text @@ -2441,7 +2441,7 @@ light.set_color(0.20, 0.65, 0.20) light.attach(src) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.net_id = generate_net_id(src) if(!src.link) @@ -2530,7 +2530,7 @@ src.host_id = null src.old_host_id = null src.post_status(rem_host, "command","term_disconnect") - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.post_status(rem_host, "command","term_connect","device",src.device_tag) src.updateUsrDialog() @@ -2602,7 +2602,7 @@ if(signal.data["address_1"] != src.net_id) if((signal.data["address_1"] == "ping") && ((signal.data["net"] == null) || ("[signal.data["net"]]" == "[src.net_number]")) && signal.data["sender"]) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.post_status(target, "command", "ping_reply", "device", src.device_tag, "netid", src.net_id, "net", "[src.net_number]") return @@ -2617,7 +2617,7 @@ // src.host_id = null // src.updateUsrDialog() -// SPAWN_DBG(3) +// SPAWN_DBG(3 DECI SECONDS) // src.post_status(target, "command","term_disconnect") // return @@ -2631,7 +2631,7 @@ if(signal.data["data"] != "noreply") src.post_status(target, "command","term_connect","data","noreply","device",src.device_tag) src.updateUsrDialog() - SPAWN_DBG(2) //Sign up with the driver (if a mainframe contacted us) + SPAWN_DBG(2 DECI SECONDS) //Sign up with the driver (if a mainframe contacted us) src.post_status(target,"command","term_message","data","command=register&data=[src.detector_id]") return @@ -2828,7 +2828,7 @@ ..() if (newLimit != null) src.limit = newLimit - SPAWN_DBG(3) + SPAWN_DBG(3 DECI SECONDS) generate_next() return /* @@ -2893,7 +2893,7 @@ New() ..() - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.net_id = generate_net_id(src) if(!src.link) @@ -3061,7 +3061,7 @@ src.host_id = null src.old_host_id = null src.post_status(rem_host, "command","term_disconnect") - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.post_status(rem_host, "command","term_connect","device",src.device_tag) src.updateUsrDialog() @@ -3095,7 +3095,7 @@ if(signal.data["address_1"] != src.net_id) if((signal.data["address_1"] == "ping") && ((signal.data["net"] == null) || ("[signal.data["net"]]" == "[src.net_number]")) && signal.data["sender"]) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.post_status(target, "command", "ping_reply", "device", src.device_tag, "netid", src.net_id, "net", "[src.net_number]") return @@ -3110,7 +3110,7 @@ src.host_id = null src.updateUsrDialog() - SPAWN_DBG(3) + SPAWN_DBG(3 DECI SECONDS) src.post_status(target, "command","term_disconnect") return */ @@ -3124,7 +3124,7 @@ if(signal.data["data"] != "noreply") src.post_status(target, "command","term_connect","data","noreply","device",src.device_tag) src.updateUsrDialog() - SPAWN_DBG(2) //Sign up with the driver (if a mainframe contacted us) + SPAWN_DBG(2 DECI SECONDS) //Sign up with the driver (if a mainframe contacted us) src.post_status(target,"command","term_message","data","command=register&data=[isnull(src.beam) ? "0" : "1"]") return @@ -3260,7 +3260,7 @@ if (newPower != null) src.power = newPower src.icon_state = "h7beam[min(src.power, 5)]" - SPAWN_DBG(2) + SPAWN_DBG(2 DECI SECONDS) generate_next() return @@ -3426,7 +3426,7 @@ New() ..() - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.net_id = generate_net_id(src) if(!src.link) @@ -3530,7 +3530,7 @@ src.host_id = null src.old_host_id = null src.post_status(rem_host, "command","term_disconnect") - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.post_status(rem_host, "command","term_connect","device",src.device_tag) src.updateUsrDialog() @@ -3563,7 +3563,7 @@ if(signal.data["address_1"] != src.net_id) if((signal.data["address_1"] == "ping") && ((signal.data["net"] == null) || ("[signal.data["net"]]" == "[src.net_number]")) && signal.data["sender"]) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.post_status(target, "command", "ping_reply", "device", src.device_tag, "netid", src.net_id, "net", "[src.net_number]") return @@ -3579,7 +3579,7 @@ src.host_id = null src.updateUsrDialog() - SPAWN_DBG(3) + SPAWN_DBG(3 DECI SECONDS) src.post_status(target, "command","term_disconnect") return */ @@ -3593,7 +3593,7 @@ if(signal.data["data"] != "noreply") src.post_status(target, "command","term_connect","data","noreply","device",src.device_tag) src.updateUsrDialog() - SPAWN_DBG(2) //Sign up with the driver (if a mainframe contacted us) + SPAWN_DBG(2 DECI SECONDS) //Sign up with the driver (if a mainframe contacted us) src.message_host("command=register&id=[src.setup_test_id]&data=[isnull(src.active) ? "0" : "1"]&capability=[setup_capability_value]") return @@ -4391,7 +4391,7 @@ src.sensed[4] = "NO" src.sensed[5] = "NONE" - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) src.visible_message("[src.name] finishes working and shuts down.") playsound(src, "sound/machines/chime.ogg", 50, 1) active = 0 diff --git a/code/modules/networks/computer3/mainframe2/os_drivers.dm b/code/modules/networks/computer3/mainframe2/os_drivers.dm index 0feeff2..c96c57a 100644 --- a/code/modules/networks/computer3/mainframe2/os_drivers.dm +++ b/code/modules/networks/computer3/mainframe2/os_drivers.dm @@ -1489,7 +1489,7 @@ message_device("command=upload&overwrite=1&newmodel=[model]", locatedTask) src.contents_mirror -= locatedTask - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) //qdel(locatedTask) if (locatedTask) locatedTask.dispose() diff --git a/code/modules/networks/computer3/mainframe2/telesci.dm b/code/modules/networks/computer3/mainframe2/telesci.dm index 4c7376f..43e2c9e 100644 --- a/code/modules/networks/computer3/mainframe2/telesci.dm +++ b/code/modules/networks/computer3/mainframe2/telesci.dm @@ -45,7 +45,7 @@ var/telesci_modifiers_set = 0 disconnectedImage = image('icons/obj/stationobjs.dmi', "pad-noconnect") - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.net_id = generate_net_id(src) if(!src.link) @@ -110,7 +110,7 @@ var/telesci_modifiers_set = 0 src.host_id = null //src.old_host_id = null src.post_status(rem_host, "command","term_disconnect") - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.post_status(rem_host, "command","term_connect","device",src.device_tag) src.updateUsrDialog() @@ -140,7 +140,7 @@ var/telesci_modifiers_set = 0 if(signal.data["address_1"] != src.net_id) if((signal.data["address_1"] == "ping") && ((signal.data["net"] == null) || ("[signal.data["net"]]" == "[src.net_number]")) && signal.data["sender"]) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.post_status(target, "command", "ping_reply", "device", src.device_tag, "netid", src.net_id, "net", "[net_number]") return @@ -154,7 +154,7 @@ var/telesci_modifiers_set = 0 if(target == src.host_id) src.host_id = null src.updateUsrDialog() - SPAWN_DBG(3) + SPAWN_DBG(3 DECI SECONDS) src.post_status(target, "command","term_disconnect") return @@ -168,7 +168,7 @@ var/telesci_modifiers_set = 0 if(signal.data["data"] != "noreply") src.post_status(target, "command","term_connect","data","noreply","device",src.device_tag) src.updateUsrDialog() - SPAWN_DBG(2) //Sign up with the driver (if a mainframe contacted us) + SPAWN_DBG(2 DECI SECONDS) //Sign up with the driver (if a mainframe contacted us) src.post_status(target,"command","term_message","data","command=register") return @@ -283,7 +283,7 @@ var/telesci_modifiers_set = 0 if (istype(sourceturf) && istype(endturf)) if (coords.can_cheat || (is_allowed(endturf) && is_allowed(sourceturf))) src.receive(sourceturf) - SPAWN_DBG(50) //nurf + SPAWN_DBG(5 SECONDS) //nurf src.send(endturf) message_host("command=ack") @@ -506,7 +506,7 @@ var/telesci_modifiers_set = 0 XSUBTRACT = rand(0,100) YSUBTRACT = rand(0,100) ZSUBTRACT = rand(0,world.maxz) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) processbadeffect(pick("flash","buzz","scatter","ignite","chill")) return 0 @@ -535,7 +535,7 @@ var/telesci_modifiers_set = 0 XSUBTRACT = rand(0,100) YSUBTRACT = rand(0,100) ZSUBTRACT = rand(0,world.maxz) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) processbadeffect(pick("flash","buzz","minorsummon","tinyfire","chill")) return 0 @@ -569,7 +569,7 @@ var/telesci_modifiers_set = 0 XSUBTRACT = rand(0,100) YSUBTRACT = rand(0,100) ZSUBTRACT = rand(0,world.maxz) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) processbadeffect(pick("flash","buzz","scatter","ignite","chill")) if(prob(5) && !locate(/obj/dfissure_to) in get_step(src, EAST)) new/obj/dfissure_to(get_step(src, EAST)) @@ -868,7 +868,7 @@ var/telesci_modifiers_set = 0 New() ..() - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.net_id = generate_net_id(src) if(!src.link) @@ -892,7 +892,7 @@ var/telesci_modifiers_set = 0 if(signal.data["address_1"] != src.net_id) if((signal.data["address_1"] == "ping") && ((signal.data["net"] == null) || ("[signal.data["net"]]" == "[src.net_number]")) && signal.data["sender"]) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.post_status(target, "command", "ping_reply", "device", src.device_tag, "netid", src.net_id, "net", "[net_number]") return @@ -906,7 +906,7 @@ var/telesci_modifiers_set = 0 if(target == src.host_id) src.host_id = null src.updateUsrDialog() - SPAWN_DBG(3) + SPAWN_DBG(3 DECI SECONDS) src.post_status(target, "command","term_disconnect") return @@ -940,7 +940,7 @@ var/telesci_modifiers_set = 0 src.link.post_signal(src, newsignal) src.updateUsrDialog(1) - //SPAWN_DBG(2) //Sign up with the driver (if a mainframe contacted us) + //SPAWN_DBG(2 DECI SECONDS) //Sign up with the driver (if a mainframe contacted us) // src.post_status(target,"command","term_message","data","command=register") return @@ -1091,7 +1091,7 @@ var/telesci_modifiers_set = 0 newsignal.data["sender"] = src.net_id src.link.post_signal(src, newsignal) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) if (!old_host_id) old_host_id = old diff --git a/code/modules/networks/computer3/peripherals.dm b/code/modules/networks/computer3/peripherals.dm index cfe050e..6731f7c 100644 --- a/code/modules/networks/computer3/peripherals.dm +++ b/code/modules/networks/computer3/peripherals.dm @@ -271,7 +271,7 @@ var/broadcast_range = src.range if(src.setup_netmode_norange) broadcast_range = 0 - SPAWN_DBG(5) //Send a reply for those curious jerks + SPAWN_DBG(5 DECI SECONDS) //Send a reply for those curious jerks src.radio_connection.post_signal(src, pingsignal, broadcast_range) return @@ -305,7 +305,7 @@ New() ..() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) if(src.host && !src.link) //Wait for the map to load and hook up if installed() hasn't done it. src.check_connection() //Let's blindy attempt to generate a unique network ID! @@ -419,7 +419,7 @@ pingsignal.data["address_1"] = signal.data["sender"] pingsignal.data["command"] = "ping_reply" pingsignal.transmission_method = TRANSMISSION_WIRE - SPAWN_DBG(5) //Send a reply for those curious jerks + SPAWN_DBG(5 DECI SECONDS) //Send a reply for those curious jerks src.link.post_signal(src, pingsignal) return //Just toss out the rest of the signal then I guess @@ -517,7 +517,7 @@ if(!print_data) src.printing = 0 return 1 - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) var/obj/item/paper/thermal/P = unpool(/obj/item/paper/thermal) P.set_loc(src.host.loc) @@ -584,7 +584,7 @@ if(radio_controller) initialize() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) if(src.host && !src.wired_link) //Wait for the map to load and hook up if installed() hasn't done it. src.check_wired_connection() //Let's blindy attempt to generate a unique network ID! @@ -664,7 +664,7 @@ if(!print_data) src.printing = 0 return 1 - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) var/obj/item/paper/thermal/P = unpool(/obj/item/paper/thermal) P.set_loc(src.host.loc) @@ -756,7 +756,7 @@ pingsignal.data["address_1"] = signal.data["sender"] pingsignal.data["command"] = "ping_reply" pingsignal.transmission_method = src.mode == 2 ? TRANSMISSION_WIRE : TRANSMISSION_RADIO - SPAWN_DBG(5) //Send a reply for those curious jerks + SPAWN_DBG(5 DECI SECONDS) //Send a reply for those curious jerks if (src.mode == 2 && src.wired_link) src.wired_link.post_signal(src, pingsignal) else if (src.wireless_link) @@ -864,7 +864,7 @@ if(!print_data) src.printing = 0 return - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) var/obj/item/paper/thermal/P = unpool(/obj/item/paper/thermal) P.set_loc(src.host.loc) @@ -1057,7 +1057,7 @@ newsignal.data["access"] = jointext(src.authid.access, ";") newsignal.data["balance"] = src.authid.money - SPAWN_DBG(4) + SPAWN_DBG(4 DECI SECONDS) send_command("card_authed", newsignal) return newsignal @@ -1075,7 +1075,7 @@ newsignal.data["assignment"] = src.authid.assignment newsignal.data["balance"] = src.authid.money - SPAWN_DBG(4) + SPAWN_DBG(4 DECI SECONDS) send_command("card_authed", newsignal) return newsignal @@ -1086,13 +1086,13 @@ /* //We need correct PIN numbers you jerks. if(text2num(signal.data["pin"]) != src.authid.pin) - SPAWN_DBG(4) + SPAWN_DBG(4 DECI SECONDS) send_command("card_bad_pin") return */ var/charge_amount = text2num(signal.data["data"]) if(!charge_amount || (charge_amount <= 0) || charge_amount > src.authid.money) - SPAWN_DBG(4) + SPAWN_DBG(4 DECI SECONDS) send_command("card_bad_charge") return 1 @@ -1115,7 +1115,7 @@ var/datum/signal/newsignal = get_free_signal() newsignal.data["access"] = new_access - SPAWN_DBG(4) + SPAWN_DBG(4 DECI SECONDS) send_command("card_add") return 0 @@ -1135,7 +1135,7 @@ var/datum/signal/newsignal = get_free_signal() newsignal.data["access"] = rem_access - SPAWN_DBG(4) + SPAWN_DBG(4 DECI SECONDS) send_command("card_remove") return 0 diff --git a/code/modules/networks/computer3/terminal.dm b/code/modules/networks/computer3/terminal.dm index c94f677..42c5e6a 100644 --- a/code/modules/networks/computer3/terminal.dm +++ b/code/modules/networks/computer3/terminal.dm @@ -390,7 +390,7 @@ file_save - Save file to local disk."} var/obj/target_serv = locate(target_tag) if(istype(target_serv) && hasvar(target_serv,"net_id")) - SPAWN_DBG(100) + SPAWN_DBG(10 SECONDS) if (target_serv) src.input_text("connect [target_serv:net_id]") diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index a26510e..3032873 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -197,7 +197,7 @@ var/zapLimiter = 0 terminal.dir = tdir terminal.master = src - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.update() /obj/machinery/power/apc/disposing() @@ -292,7 +292,7 @@ var/zapLimiter = 0 src.lighting = 0 src.equipment = 0 src.environ = 0 - SPAWN_DBG(600) + SPAWN_DBG(1 MINUTE) src.equipment = 3 src.environ = 3 return @@ -915,20 +915,20 @@ var/zapLimiter = 0 switch(wireIndex) if(APC_WIRE_IDSCAN) //unlocks the APC for 30 seconds, if you have a better way to hack an APC I'm all ears src.locked = 0 - SPAWN_DBG(300) + SPAWN_DBG(30 SECONDS) src.locked = 1 src.updateDialog() if (APC_WIRE_MAIN_POWER1) if(shorted == 0) shorted = 1 - SPAWN_DBG(1200) + SPAWN_DBG(2 MINUTES) if(shorted == 1) shorted = 0 src.updateDialog() if (APC_WIRE_MAIN_POWER2) if(shorted == 0) shorted = 1 - SPAWN_DBG(1200) + SPAWN_DBG(2 MINUTES) if(shorted == 1) shorted = 0 src.updateDialog() @@ -936,7 +936,7 @@ var/zapLimiter = 0 if (src.aidisabled == 0) src.aidisabled = 1 src.updateDialog() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) if (src.aidisabled == 1) src.aidisabled = 0 src.updateDialog() @@ -1316,7 +1316,7 @@ var/zapLimiter = 0 if (istype(cell,/obj/item/cell/erebite)) src.visible_message("[src]'s erebite cell violently detonates!") explosion(src, src.loc, 1, 2, 4, 6, 1) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) qdel(src) else set_broken() return @@ -1325,7 +1325,7 @@ var/zapLimiter = 0 if (istype(cell,/obj/item/cell/erebite)) src.visible_message("[src]'s erebite cell violently detonates!") explosion(src, src.loc, 1, 2, 4, 6, 1) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) qdel(src) else switch(severity) @@ -1346,7 +1346,7 @@ var/zapLimiter = 0 if (istype(cell,/obj/item/cell/erebite)) src.visible_message("[src]'s erebite cell violently detonates!") explosion(src, src.loc, 1, 2, 4, 6, 1) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) qdel (src) /obj/machinery/power/apc/blob_act(var/power) @@ -1409,7 +1409,7 @@ var/zapLimiter = 0 if(signal.data["address_1"] != src.net_id) if((signal.data["address_1"] == "ping") && signal.data["sender"]) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.post_status(target, "command", "ping_reply", "device", "PNET_PWR_CNTRL", "netid", src.net_id) return @@ -1424,7 +1424,7 @@ var/zapLimiter = 0 src.host_id = null src.updateUsrDialog() - SPAWN_DBG(3) + SPAWN_DBG(3 DECI SECONDS) src.post_status(target, "command","term_disconnect") return @@ -1437,7 +1437,7 @@ var/zapLimiter = 0 if(signal.data["data"] != "noreply") src.post_status(target, "command","term_connect","data","noreply","device","PNET_PWR_CNTRL") //src.updateUsrDialog() - SPAWN_DBG(2) + SPAWN_DBG(2 DECI SECONDS) src.post_status(target,"command","term_message","data","command=register&data=[ckey("[src.area]")]") return diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index e416f12..d4922ff 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -107,7 +107,7 @@ // charge = charge * maxcharge/100.0 // map obj has charge as percentage, convert to real value here - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) updateicon() if (genrate && !(src in processing_items)) @@ -225,7 +225,7 @@ explosion(src, T, 0, 1, 2, 2) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) qdel(src) @@ -315,4 +315,4 @@ if (istype(W, /obj/item/plantanalyzer/)) boutput(user, "The potato battery has [src.charge] of [src.max_charge] PUs remaining.") else - ..() \ No newline at end of file + ..() \ No newline at end of file diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index 14e8ca4..6acd194 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -14,7 +14,7 @@ /obj/machinery/power/generator/New() ..() - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) circ1 = locate(/obj/machinery/atmospherics/binary/circulator) in get_step(src,WEST) circ2 = locate(/obj/machinery/atmospherics/binary/circulator) in get_step(src,EAST) if(!circ1 || !circ2) diff --git a/code/modules/power/generator_type2.dm b/code/modules/power/generator_type2.dm index 4193505..e008057 100644 --- a/code/modules/power/generator_type2.dm +++ b/code/modules/power/generator_type2.dm @@ -14,7 +14,7 @@ /obj/machinery/power/generator_type2/New() ..() - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) input1 = locate(/obj/machinery/atmospherics/unary/generator_input) in get_step(src,WEST) input2 = locate(/obj/machinery/atmospherics/unary/generator_input) in get_step(src,EAST) if(!input1 || !input2) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 537602f..d91b212 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -342,7 +342,7 @@ New() //auto position these lights so i don't have to mess with dirs in the map editor that's annoying!!! if (!nostick) // unless nostick is set in which case... dont - SPAWN_DBG(1) //wait for the wingrille spawners to complete when map is loading (ugly i am sorry) + SPAWN_DBG(1 DECI SECOND) //wait for the wingrille spawners to complete when map is loading (ugly i am sorry) var/turf/T = null for (var/dir in cardinal) T = get_step(src,dir) @@ -414,7 +414,7 @@ light.set_color(initial(src.light_type.color_r), initial(src.light_type.color_g), initial(src.light_type.color_b)) light.set_height(2.4) light.attach(src) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) update() // update the icon_state and luminosity of the light depending on its state diff --git a/code/modules/power/nuke/nuke.dm b/code/modules/power/nuke/nuke.dm index d00f742..37f288c 100644 --- a/code/modules/power/nuke/nuke.dm +++ b/code/modules/power/nuke/nuke.dm @@ -86,7 +86,7 @@ nuke_core = src nuke_knobs = src.nuke_knobset - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) debug_messages = 1 /* XXX */ //make_fluid_networks() var/obj/fluid_pipe/sink/temp_i = locate(/obj/fluid_pipe/sink) in get_step(src,NORTH) diff --git a/code/modules/power/nuke/turbine.dm b/code/modules/power/nuke/turbine.dm index 3dd50d7..f59d0d5 100644 --- a/code/modules/power/nuke/turbine.dm +++ b/code/modules/power/nuke/turbine.dm @@ -13,7 +13,7 @@ New() nturbine = src - spawn(5) + spawn(5 DECI SECONDS) var/obj/fluid_pipe/sink/temp_i = locate(/obj/fluid_pipe/sink) in get_step(src,SOUTH) var/obj/fluid_pipe/source/temp_o = locate(/obj/fluid_pipe/source) in get_step(src,NORTH) //n_input = temp_i.network diff --git a/code/modules/power/pt_laser.dm b/code/modules/power/pt_laser.dm index c22c7ba..9f36b6f 100644 --- a/code/modules/power/pt_laser.dm +++ b/code/modules/power/pt_laser.dm @@ -42,7 +42,7 @@ range = max(world.maxx,world.maxy) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) var/turf/origin = get_rear_turf() if(!origin) return //just in case dir_loop: diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index 6a624b2..86538a7 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -55,7 +55,7 @@ src.charge -= 1e6 if (src.charge < 0) src.charge = 0 - SPAWN_DBG(100) + SPAWN_DBG(10 SECONDS) src.output = initial(src.output) src.charging = initial(src.charging) src.online = initial(src.online) @@ -64,7 +64,7 @@ /obj/machinery/power/smes/New() ..() - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) dir_loop: for(var/d in cardinal) var/turf/T = get_step(src, d) @@ -150,7 +150,7 @@ if (online) // if outputting if (prob(5)) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) playsound(src.loc, pick(ambience_power), 60, 1) lastout = min(charge, output) //limit output to that stored diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 1d30c26..c359b88 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -107,7 +107,7 @@ /obj/machinery/power/solar/New() ..() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) updateicon() update_solar_exposure() @@ -257,7 +257,7 @@ /obj/machinery/power/solar_control/New() ..() - SPAWN_DBG(15) + SPAWN_DBG(1.5 SECONDS) if(!powernet) return for(var/obj/machinery/power/solar/S in powernet.nodes) if(S.id != id) continue @@ -373,14 +373,14 @@ if(href_list["dir"]) cdir = text2num(href_list["dir"]) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) set_panels(cdir) updateicon() if(href_list["rate control"]) if(href_list["cdir"]) src.cdir = CLAMP((360+src.cdir+text2num(href_list["cdir"]))%360, 0, 359) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) set_panels(cdir) updateicon() if(href_list["tdir"]) diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index eccbd67..1d20ce8 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -46,7 +46,7 @@ gas_contained = new inturf = get_step(src, dir) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) turbine = locate() in get_step(src, get_dir(inturf, src)) if(!turbine) status |= BROKEN @@ -99,7 +99,7 @@ outturf = get_step(src, dir) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) compressor = locate() in get_step(src, get_dir(outturf, src)) if(!compressor) @@ -222,7 +222,7 @@ /obj/machinery/computer/turbine_computer/New() ..() - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) for(var/obj/machinery/compressor/C in machines) if(id == C.comp_id) compressor = C diff --git a/code/modules/projectiles/40mm.dm b/code/modules/projectiles/40mm.dm index 6837f07..0d74172 100644 --- a/code/modules/projectiles/40mm.dm +++ b/code/modules/projectiles/40mm.dm @@ -55,4 +55,4 @@ toxic - poisons New() src.pixel_x = rand(-8,8) src.pixel_y = rand(-8,8) - SPAWN_DBG(5) qdel(src) + SPAWN_DBG(5 DECI SECONDS) qdel(src) diff --git a/code/modules/projectiles/bfg.dm b/code/modules/projectiles/bfg.dm index 4302953..00f9bef 100644 --- a/code/modules/projectiles/bfg.dm +++ b/code/modules/projectiles/bfg.dm @@ -19,7 +19,7 @@ explosion.pixel_y = -16 explosion.icon = 'icons/effects/64x64.dmi' flick("bfg_explode", explosion) - SPAWN_DBG(16) + SPAWN_DBG(1.6 SECONDS) qdel(explosion) playsound(master, "sound/weapons/DSRXPLOD.ogg", 75) // explosion(master, get_turf(master), 2, 3, 4, 5, lagreducer = 1) diff --git a/code/modules/projectiles/bullet.dm b/code/modules/projectiles/bullet.dm index 945ba66..a0e2cde 100644 --- a/code/modules/projectiles/bullet.dm +++ b/code/modules/projectiles/bullet.dm @@ -1010,14 +1010,14 @@ toxic - poisons if (src.CHEM != null) src.CHEM.loc = T src.has_det = 1 - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) src.CHEM.explode() src.has_grenade = 0 return else if (src.OLD != null) src.OLD.loc = T src.has_det = 1 - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) src.OLD.prime() src.has_grenade = 0 return diff --git a/code/modules/projectiles/energy_bolt.dm b/code/modules/projectiles/energy_bolt.dm index 69ef0b3..32b3eac 100644 --- a/code/modules/projectiles/energy_bolt.dm +++ b/code/modules/projectiles/energy_bolt.dm @@ -109,7 +109,7 @@ toxic - poisons on_hit(atom/hit) if (isliving(hit)) var/mob/living/L = hit - L.changeStatus("slowed", 1 SECONDS) + L.changeStatus("slowed", 1 SECOND) L.change_misstep_chance(1) L.emote("twitch_v") return @@ -316,7 +316,7 @@ toxic - poisons animate(transform=m2,time=5) - spawn(7) del(src) + spawn(7 DECI SECONDS) del(src) /datum/projectile/energy_bolt/pulse name = "pulse" diff --git a/code/modules/projectiles/laser.dm b/code/modules/projectiles/laser.dm index 733826e..b427363 100644 --- a/code/modules/projectiles/laser.dm +++ b/code/modules/projectiles/laser.dm @@ -113,7 +113,7 @@ toxic - poisons fireflash(get_turf(hit), 0) else if (isturf(hit)) fireflash(hit, 0) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) if(prob(40) && istype(hit, /turf/simulated)) hit.meteorhit(src) else diff --git a/code/modules/projectiles/owl.dm b/code/modules/projectiles/owl.dm index a278111..11ff558 100644 --- a/code/modules/projectiles/owl.dm +++ b/code/modules/projectiles/owl.dm @@ -53,5 +53,5 @@ on_hit(atom/hit) if(ishuman(hit)) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) hit:owlgib() \ No newline at end of file diff --git a/code/modules/projectiles/special.dm b/code/modules/projectiles/special.dm index 4868f9a..50fda29 100644 --- a/code/modules/projectiles/special.dm +++ b/code/modules/projectiles/special.dm @@ -337,7 +337,7 @@ if(!src.impacted) world << sound('sound/weapons/energy/howitzer_impact.ogg', volume = 70) src.impacted = 1 - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) for(var/mob/living/M in mobs) shake_camera(M, 2, 1) diff --git a/code/modules/robotics/bot/cambot.dm b/code/modules/robotics/bot/cambot.dm index 013b1f0..99c2811 100644 --- a/code/modules/robotics/bot/cambot.dm +++ b/code/modules/robotics/bot/cambot.dm @@ -309,7 +309,7 @@ src.photographing = 1 src.flash_blink(3, 1) - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) if (src.on) if (get_dist(src,target) <= 1) src.flash_blink(1, 5) diff --git a/code/modules/robotics/bot/chefbot.dm b/code/modules/robotics/bot/chefbot.dm index 8ab5496..285cdae 100644 --- a/code/modules/robotics/bot/chefbot.dm +++ b/code/modules/robotics/bot/chefbot.dm @@ -31,7 +31,7 @@ visible_message("[src] points at [target].") if (istype(target, /atom)) var/D = new /obj/decal/point(get_turf(target)) - SPAWN_DBG(25) + SPAWN_DBG(2.5 SECONDS) qdel(D) /obj/machinery/bot/chefbot/proc/drama() diff --git a/code/modules/robotics/bot/disasters.dm b/code/modules/robotics/bot/disasters.dm index 53dc394..751524b 100644 --- a/code/modules/robotics/bot/disasters.dm +++ b/code/modules/robotics/bot/disasters.dm @@ -11,7 +11,7 @@ New() ..() src.name = pick("Commissar Beepevich","The Beeper","Murderbot","Killtron","Lawmaker") - SPAWN_DBG(600) + SPAWN_DBG(1 MINUTE) if (src && src.blow_up == 1) src.explode() return @@ -28,7 +28,7 @@ New() ..() src.name = pick("Herr Doktor","Heals McGee","Wild-Eye","Jack","Boston Strangler","Insanobot") - SPAWN_DBG(600) + SPAWN_DBG(1 MINUTE) if (src && src.blow_up == 1) src.explode() return @@ -45,7 +45,7 @@ New() ..() src.name = pick("Montag","Fire-Killer","Burns","Murdermaster","Guardbot","Axe Man") - SPAWN_DBG(600) + SPAWN_DBG(1 MINUTE) if (src && src.blow_up == 1) src.explode() return @@ -62,7 +62,7 @@ New() ..() src.name = pick("Mr. Clean","Slip-o-Matic","The Janitor","Port-a-Lube","Galoshes-be-Gone","Slipmeister") - SPAWN_DBG(600) + SPAWN_DBG(1 MINUTE) if (src && src.blow_up == 1) src.explode() return diff --git a/code/modules/robotics/bot/firebot.dm b/code/modules/robotics/bot/firebot.dm index 911cba1..62ada0c 100644 --- a/code/modules/robotics/bot/firebot.dm +++ b/code/modules/robotics/bot/firebot.dm @@ -263,7 +263,7 @@ if(src.path && src.path.len && src.target) step_to(src, src.path[1]) src.path -= src.path[1] - SPAWN_DBG(3) + SPAWN_DBG(3 DECI SECONDS) if(src.path && src.path.len) step_to(src, src.path[1]) src.path -= src.path[1] diff --git a/code/modules/robotics/bot/goosebot.dm b/code/modules/robotics/bot/goosebot.dm index 2d14e5f..9357808 100644 --- a/code/modules/robotics/bot/goosebot.dm +++ b/code/modules/robotics/bot/goosebot.dm @@ -94,7 +94,7 @@ playsound(src.loc, "sound/effects/pump.ogg", 50, 1) SPAWN_DBG(10) E.throwforce = 1 - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) icon_state = "goosebot" return \ No newline at end of file diff --git a/code/modules/robotics/bot/guardbot.dm b/code/modules/robotics/bot/guardbot.dm index bb34bd6..49475c5 100644 --- a/code/modules/robotics/bot/guardbot.dm +++ b/code/modules/robotics/bot/guardbot.dm @@ -370,7 +370,7 @@ else if (E.icon_state == "gold") boutput(user, "You show \the [E] to [src]! They are super impressed!") - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) boutput(user, "Like, really REALLY impressed. They probably think you're some kind of celebrity or something.") sleep(10) boutput(user, "Or the president. The president of space.") @@ -394,7 +394,7 @@ else if (W.icon_state == "gold") boutput(user, "You show \the [W] to [src]! They are super impressed!") - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) boutput(user, "Like, really REALLY impressed. They probably think you're some kind of celebrity or something.") sleep(10) boutput(user, "Or the president. The president of space.") @@ -1241,7 +1241,7 @@ var/list/affected = DrawLine(last, target_r, /obj/line_obj/elec ,'icons/obj/projectiles.dmi',"WholeLghtn",1,1,"HalfStartLghtn","HalfEndLghtn",OBJ_LAYER,1,PreloadedIcon='icons/effects/LghtLine.dmi') for(var/obj/O in affected) - SPAWN_DBG(6) pool(O) + SPAWN_DBG(6 DECI SECONDS) pool(O) if(isliving(target_r)) //Probably unsafe. playsound(target_r:loc, "sound/effects/electric_shock.ogg", 50, 1) @@ -1806,7 +1806,7 @@ master.visible_message("[master] is trying to put handcuffs on [arrest_target]!") var/cuffloc = arrest_target.loc - SPAWN_DBG(60) + SPAWN_DBG(6 SECONDS) if (!master) return @@ -2107,7 +2107,7 @@ new_destination = "__nearest__" master.post_status("!BEACON!", "findbeacon", "patrol") awaiting_beacon = 5 - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) if(!master || !master.on || master.stunned || master.idle) return if(master.task != src) return awaiting_beacon = 0 @@ -2214,7 +2214,7 @@ if(get_dist(master, hug_target) <= 1) if (prob(2)) master.speak("Merry Spacemas!") - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) if (master) master.speak("Warning: Real-time clock battery low or missing.") else @@ -2848,7 +2848,7 @@ src.master.speak("And here comes Officer Beepsky, the proud guard of this station. Proud.") src.master.speak("Not at all terrible. No Sir. Not at all.") if (prob(10)) - SPAWN_DBG(15) + SPAWN_DBG(1.5 SECONDS) src.master.speak("Well okay, maybe a little.") return @@ -2866,7 +2866,7 @@ src.master.speak("Good day, Captain! You look a little different today, did you get a haircut?") var/otherBuddyID = otherBuddy.net_id //Notify other buddy - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) if (src.master) src.master.post_status("[otherBuddyID]", "command", "captain_greet") return @@ -2879,7 +2879,7 @@ src.master.speak("We hope that we aren't disrupting any sort of wiz-biz or wizness deal.") //As before, notify the other buddy var/otherBuddyID = otherBuddy.net_id - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) if (src.master) src.master.post_status("[otherBuddyID]", "command", "wizard_greet") @@ -3093,7 +3093,7 @@ New() ..() - SPAWN_DBG(6) + SPAWN_DBG(6 DECI SECONDS) src.icon_state = "robuddy_frame-[buddy_model]-[stage]" if(src.stage >= 2) src.created_cell = new @@ -3198,7 +3198,7 @@ New() ..() - SPAWN_DBG(8) + SPAWN_DBG(8 DECI SECONDS) if(radio_controller) radio_connection = radio_controller.add_object(src, "[frequency]") if(!src.net_id) @@ -3264,7 +3264,7 @@ var/rem_host = src.host_id src.host_id = null src.post_wire_status(rem_host, "command","term_disconnect") - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.post_wire_status(rem_host, "command","term_connect","device","PNET_PR6_CHARG") src.updateUsrDialog() @@ -3283,7 +3283,7 @@ var/target = signal.data["sender"] if(signal.transmission_method == TRANSMISSION_WIRE) if((signal.data["address_1"] == "ping") && ((signal.data["net"] == null) || ("[signal.data["net"]]" == "[src.net_number]")) && target) - SPAWN_DBG(5) //Send a reply for those curious jerks + SPAWN_DBG(5 DECI SECONDS) //Send a reply for those curious jerks src.post_wire_status(target, "command", "ping_reply", "device", "PNET_PR6_CHARG", "netid", src.net_id, "net", src.net_number) return if(signal.data["address_1"] != src.net_id || !target) @@ -3305,7 +3305,7 @@ src.host_id = target if(signal.data["data"] != "noreply") src.post_wire_status(target, "command","term_connect","data","noreply","device","PNET_PR6_CHARG") - SPAWN_DBG(2) //Sign up with the driver (if a mainframe contacted us) + SPAWN_DBG(2 DECI SECONDS) //Sign up with the driver (if a mainframe contacted us) src.post_wire_status(target,"command","term_message","data","command=register&status=[current ? current.net_id : "nobot"]") src.updateUsrDialog() return @@ -3411,7 +3411,7 @@ newsignal.data_file = task_copy - SPAWN_DBG(2) + SPAWN_DBG(2 DECI SECONDS) src.link.post_signal(src, newsignal) else @@ -3643,7 +3643,7 @@ signal.data["address_1"] = target_id signal.data["sender"] = src.net_id - SPAWN_DBG(2) + SPAWN_DBG(2 DECI SECONDS) if (src.link) //ZeWaka: Fix for null.post_signal src.link.post_signal(src, signal) @@ -3823,7 +3823,7 @@ New() ..() - SPAWN_DBG(6) + SPAWN_DBG(6 DECI SECONDS) src.icon_state = "goldbuddy_frame-[buddy_model]-[stage]" if(src.stage >= 2) src.created_cell = new @@ -3989,7 +3989,7 @@ attack_self(var/mob/user as mob) playsound(src.loc, "sound/items/coindrop.ogg", 100, 1) user.visible_message("[user] flips the token","You flip the token") - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) user.visible_message("It came up Hugs.") #undef GUARDBOT_DOCK_RESET_DELAY diff --git a/code/modules/robotics/bot/medbot.dm b/code/modules/robotics/bot/medbot.dm index ce81400..31ab6a4 100644 --- a/code/modules/robotics/bot/medbot.dm +++ b/code/modules/robotics/bot/medbot.dm @@ -95,7 +95,7 @@ /obj/item/firstaid_arm_assembly/New() ..() - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) if (src.skin) src.overlays += "medskin-[src.skin]" src.overlays += "medibot-arm" @@ -331,7 +331,7 @@ visible_message("[src] points at [target]!") if (iscarbon(target)) var/D = new /obj/decal/point(get_turf(target)) - SPAWN_DBG(25) + SPAWN_DBG(2.5 SECONDS) qdel(D) /obj/machinery/bot/medbot/process() @@ -413,7 +413,7 @@ if(src.path && src.path.len && src.patient) step_to(src, src.path[1]) src.path -= src.path[1] - SPAWN_DBG(3) + SPAWN_DBG(3 DECI SECONDS) if(src.path && src.path.len) step_to(src, src.path[1]) src.path -= src.path[1] @@ -545,7 +545,7 @@ else src.update_icon(stun = 0, heal = 1) src.visible_message("[src] is trying to inject [src.patient]!") - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) if ((get_dist(src, src.patient) <= 1) && (src.on)) if ((reagent_id == "internal_beaker") && (src.reagent_glass) && (src.reagent_glass.reagents.total_volume)) src.reagent_glass.reagents.trans_to(src.patient,src.injection_amount) //Inject from beaker instead. @@ -566,7 +566,7 @@ var/glitchsound = pick('sound/machines/romhack1.ogg', 'sound/machines/romhack2.ogg', 'sound/machines/romhack3.ogg','sound/machines/glitch1.ogg','sound/machines/glitch2.ogg','sound/machines/glitch3.ogg','sound/machines/glitch4.ogg','sound/machines/glitch5.ogg') playsound(src.loc, glitchsound, 50, 1) // let's grustle a bit - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) src.pixel_x += rand(-2,2) src.pixel_y += rand(-2,2) sleep(1) diff --git a/code/modules/robotics/bot/mulebot.dm b/code/modules/robotics/bot/mulebot.dm index fa5d5f5..2270c29 100644 --- a/code/modules/robotics/bot/mulebot.dm +++ b/code/modules/robotics/bot/mulebot.dm @@ -86,7 +86,7 @@ cell.maxcharge = 2000 setup_wires() - SPAWN_DBG(5) // must wait for map loading to finish + SPAWN_DBG(5 DECI SECONDS) // must wait for map loading to finish if(radio_controller) radio_controller.add_object(src, "[control_freq]") radio_controller.add_object(src, "[beacon_freq]") @@ -565,7 +565,7 @@ path -= loc if(mode==4) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) send_status() if(destination == home_destination) @@ -588,7 +588,7 @@ src.visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.") playsound(src.loc, "sound/machines/buzz-sigh.ogg", 50, 0) - SPAWN_DBG(2) + SPAWN_DBG(2 DECI SECONDS) calc_path(next) if(path) src.visible_message("[src] makes a delighted ping!", "You hear a ping.") diff --git a/code/modules/robotics/bot/secbot.dm b/code/modules/robotics/bot/secbot.dm index 83ab5ca..6ac6a40 100644 --- a/code/modules/robotics/bot/secbot.dm +++ b/code/modules/robotics/bot/secbot.dm @@ -397,7 +397,7 @@ Report Arrests: [report_arrests ? "On" if (stuncount > 0) sleep(3) - SPAWN_DBG(2) + SPAWN_DBG(2 DECI SECONDS) src.icon_state = "secbot[src.on][(src.on && src.emagged == 2) ? "-spaz" : null]" if (src.target.getStatusDuration("weakened")) mode = SECBOT_PREP_ARREST @@ -459,7 +459,7 @@ Report Arrests: [report_arrests ? "On" mode = SECBOT_ARREST src.visible_message("[src] is trying to put handcuffs on [src.target]!") - SPAWN_DBG(60) + SPAWN_DBG(6 SECONDS) if (get_dist(src, src.target) <= 1) if (!src.target || src.target.handcuffed) return @@ -557,13 +557,13 @@ Report Arrests: [report_arrests ? "On" if(SECBOT_PATROL) // patrol mode patrol_step() - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) if(mode == SECBOT_PATROL) patrol_step() if(SECBOT_SUMMON) // summoned to PDA patrol_step() - SPAWN_DBG(4) + SPAWN_DBG(4 DECI SECONDS) if(mode == SECBOT_SUMMON) patrol_step() sleep(4) @@ -603,7 +603,7 @@ Report Arrests: [report_arrests ? "On" if(blockcount > 5) // attempt 5 times before recomputing // find new path excluding blocked turf - SPAWN_DBG(2) + SPAWN_DBG(2 DECI SECONDS) calc_path(next) if (!path) find_patrol_target() @@ -648,7 +648,7 @@ Report Arrests: [report_arrests ? "On" new_destination = "__nearest__" post_signal(beacon_freq, "findbeacon", "patrol") awaiting_beacon = 1 - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) awaiting_beacon = 0 if(nearest_beacon) set_destination(nearest_beacon) diff --git a/code/modules/sound/playsound.dm b/code/modules/sound/playsound.dm index fdfa31d..56b9cf8 100644 --- a/code/modules/sound/playsound.dm +++ b/code/modules/sound/playsound.dm @@ -260,7 +260,7 @@ var/global/admin_sound_channel = 1014 //Ranges from 1014 to 1024 stopsound.channel = mute_channel src << stopsound //DEBUG_MESSAGE("Muting sound channel [stopsound.channel] for [src]") - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) src.verbs += /client/verb/stop_the_radio /client/verb/stop_all_sounds() @@ -272,14 +272,14 @@ var/global/admin_sound_channel = 1014 //Ranges from 1014 to 1024 src.verbs -= /client/verb/stop_all_sounds for(var/sound/s in SoundQuery()) - if (!s.channel) return //fixes a list index out of bounds from the channel stop below - possibly SoundQuery bug + if (!s.channel) return //fixes a list index out of bounds from the channel stop below - possibly SoundQuery bug s.status |= SOUND_UPDATE s.volume = 0 sound_playing[ s.channel ][1] = 0 src << s //DEBUG_MESSAGE("Muting sound channel [stopsound.channel] for [src]") - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) src.verbs += /client/verb/stop_all_sounds /proc/move_admin_sound_channel(var/opposite = 0) diff --git a/code/modules/sound/sound.dm b/code/modules/sound/sound.dm index 1cfc521..b0802a5 100644 --- a/code/modules/sound/sound.dm +++ b/code/modules/sound/sound.dm @@ -117,8 +117,7 @@ var/global/list/falloff_cache = list() //volume-related handling var/ourvolume = vol - - + //Custom falloff handling, see: https://www.desmos.com/calculator/ybukxuu9l9 if (dist > falloff_cache.len) falloff_cache.len = dist var/falloffmult = falloff_cache[dist] @@ -321,11 +320,11 @@ var/global/list/falloff_cache = list() switch (type) //After play actions, let the area know if (AMBIENCE_FX_1) A.played_fx_1 = 1 - SPAWN_DBG(400) //40s + SPAWN_DBG(40 SECONDS) //40s A.played_fx_1 = 0 if (AMBIENCE_FX_2) A.played_fx_2 = 1 - SPAWN_DBG(200) //20s + SPAWN_DBG(20 SECONDS) //20s A.played_fx_2 = 0 diff --git a/code/modules/sound/soundCache.dm b/code/modules/sound/soundCache.dm index 2b7697a..8108c16 100644 --- a/code/modules/sound/soundCache.dm +++ b/code/modules/sound/soundCache.dm @@ -41,6 +41,8 @@ var/global/list/soundCache = list( "sound/ambience/loop/Station_Background_Drone.ogg" = 'sound/ambience/loop/Station_Background_Drone.ogg',\ "sound/ambience/loop/Wind_Low.ogg" = 'sound/ambience/loop/Wind_Low.ogg',\ "sound/ambience/music/shoptheme.ogg" = 'sound/ambience/music/shoptheme.ogg',\ + "sound/ambience/music/VRtunes2.ogg" = 'sound/ambience/music/VRtunes2.ogg',\ + "sound/ambience/music/VRtunes_edited.ogg" = 'sound/ambience/music/VRtunes_edited.ogg',\ "sound/ambience/nature/Biodome_Birds1.ogg" = 'sound/ambience/nature/Biodome_Birds1.ogg',\ "sound/ambience/nature/Biodome_Birds2.ogg" = 'sound/ambience/nature/Biodome_Birds2.ogg',\ "sound/ambience/nature/Biodome_Bugs.ogg" = 'sound/ambience/nature/Biodome_Bugs.ogg',\ @@ -69,6 +71,17 @@ var/global/list/soundCache = list( "sound/ambience/nature/Wind_Cold1.ogg" = 'sound/ambience/nature/Wind_Cold1.ogg',\ "sound/ambience/nature/Wind_Cold2.ogg" = 'sound/ambience/nature/Wind_Cold2.ogg',\ "sound/ambience/nature/Wind_Cold3.ogg" = 'sound/ambience/nature/Wind_Cold3.ogg',\ + "sound/ambience/owlzone/owlambi1.ogg" = 'sound/ambience/owlzone/owlambi1.ogg',\ + "sound/ambience/owlzone/owlambi2.ogg" = 'sound/ambience/owlzone/owlambi2.ogg',\ + "sound/ambience/owlzone/owlambi3.ogg" = 'sound/ambience/owlzone/owlambi3.ogg',\ + "sound/ambience/owlzone/owlambi4.ogg" = 'sound/ambience/owlzone/owlambi4.ogg',\ + "sound/ambience/owlzone/owlambi5.ogg" = 'sound/ambience/owlzone/owlambi5.ogg',\ + "sound/ambience/owlzone/owlbanjo.ogg" = 'sound/ambience/owlzone/owlbanjo.ogg',\ + "sound/ambience/owlzone/owlsfx1.ogg" = 'sound/ambience/owlzone/owlsfx1.ogg',\ + "sound/ambience/owlzone/owlsfx2.ogg" = 'sound/ambience/owlzone/owlsfx2.ogg',\ + "sound/ambience/owlzone/owlsfx3.ogg" = 'sound/ambience/owlzone/owlsfx3.ogg',\ + "sound/ambience/owlzone/owlsfx4.ogg" = 'sound/ambience/owlzone/owlsfx4.ogg',\ + "sound/ambience/owlzone/owlsfx5.ogg" = 'sound/ambience/owlzone/owlsfx5.ogg',\ "sound/ambience/spooky/basket_noises1.ogg" = 'sound/ambience/spooky/basket_noises1.ogg',\ "sound/ambience/spooky/basket_noises2.ogg" = 'sound/ambience/spooky/basket_noises2.ogg',\ "sound/ambience/spooky/basket_noises3.ogg" = 'sound/ambience/spooky/basket_noises3.ogg',\ @@ -108,6 +121,7 @@ var/global/list/soundCache = list( "sound/ambience/station/Chapel_ChoirTwoNote2.ogg" = 'sound/ambience/station/Chapel_ChoirTwoNote2.ogg',\ "sound/ambience/station/Chapel_FemaleChoir.ogg" = 'sound/ambience/station/Chapel_FemaleChoir.ogg',\ "sound/ambience/station/Chapel_HighFemaleSolo.ogg" = 'sound/ambience/station/Chapel_HighFemaleSolo.ogg',\ + "sound/ambience/station/Detectivesoffice.ogg" = 'sound/ambience/station/Detectivesoffice.ogg',\ "sound/ambience/station/JazzLounge1.ogg" = 'sound/ambience/station/JazzLounge1.ogg',\ "sound/ambience/station/Machinery_Computers1.ogg" = 'sound/ambience/station/Machinery_Computers1.ogg',\ "sound/ambience/station/Machinery_Computers2.ogg" = 'sound/ambience/station/Machinery_Computers2.ogg',\ @@ -133,6 +147,7 @@ var/global/list/soundCache = list( "sound/ambience/station/Underwater/ocean_ambi1.ogg" = 'sound/ambience/station/Underwater/ocean_ambi1.ogg',\ "sound/ambience/station/Underwater/ocean_ambi2.ogg" = 'sound/ambience/station/Underwater/ocean_ambi2.ogg',\ "sound/ambience/station/Underwater/ocean_ambi3.ogg" = 'sound/ambience/station/Underwater/ocean_ambi3.ogg',\ + "sound/ambience/station/Underwater/sub_ambi.ogg" = 'sound/ambience/station/Underwater/sub_ambi.ogg',\ "sound/ambience/station/Underwater/sub_ambi1.ogg" = 'sound/ambience/station/Underwater/sub_ambi1.ogg',\ "sound/ambience/station/Underwater/sub_ambi2.ogg" = 'sound/ambience/station/Underwater/sub_ambi2.ogg',\ "sound/ambience/station/Underwater/sub_ambi3.ogg" = 'sound/ambience/station/Underwater/sub_ambi3.ogg',\ @@ -140,6 +155,7 @@ var/global/list/soundCache = list( "sound/ambience/station/Underwater/sub_ambi5.ogg" = 'sound/ambience/station/Underwater/sub_ambi5.ogg',\ "sound/ambience/station/Underwater/sub_ambi6.ogg" = 'sound/ambience/station/Underwater/sub_ambi6.ogg',\ "sound/ambience/station/Underwater/sub_ambi7.ogg" = 'sound/ambience/station/Underwater/sub_ambi7.ogg',\ + "sound/ambience/station/Underwater/sub_ambi8.ogg" = 'sound/ambience/station/Underwater/sub_ambi8.ogg',\ "sound/ambience/station/Underwater/sub_bridge_ambi1.ogg" = 'sound/ambience/station/Underwater/sub_bridge_ambi1.ogg',\ "sound/effects/airbridge_dpl.ogg" = 'sound/effects/airbridge_dpl.ogg',\ "sound/effects/bamf.ogg" = 'sound/effects/bamf.ogg',\ @@ -153,12 +169,13 @@ var/global/list/soundCache = list( "sound/effects/bubbles.ogg" = 'sound/effects/bubbles.ogg',\ "sound/effects/bubbles2.ogg" = 'sound/effects/bubbles2.ogg',\ "sound/effects/bubbles3.ogg" = 'sound/effects/bubbles3.ogg',\ - "sound/effects/chair_step.ogg" = 'sound/effects/chair_step.ogg',\ + "sound/effects/cargodoor.ogg" = 'sound/effects/cargodoor.ogg',\ + "sound/effects/chair_step.ogg" = 'sound/effects/chair_step.ogg',\ "sound/effects/chalk1.ogg" = 'sound/effects/chalk1.ogg',\ "sound/effects/chalk2.ogg" = 'sound/effects/chalk2.ogg',\ "sound/effects/chalk3.ogg" = 'sound/effects/chalk3.ogg',\ "sound/effects/cheridan_pop.ogg" = 'sound/effects/cheridan_pop.ogg',\ - "sound/effects/commsdown" = 'sound/effects/commsdown.ogg',\ + "sound/effects/commsdown.ogg" = 'sound/effects/commsdown.ogg',\ "sound/effects/creaking_metal1.ogg" = 'sound/effects/creaking_metal1.ogg',\ "sound/effects/creaking_metal2.ogg" = 'sound/effects/creaking_metal2.ogg',\ "sound/effects/damnation.ogg" = 'sound/effects/damnation.ogg',\ @@ -182,7 +199,7 @@ var/global/list/soundCache = list( "sound/effects/fireworks1.ogg" = 'sound/effects/fireworks1.ogg',\ "sound/effects/flame.ogg" = 'sound/effects/flame.ogg',\ "sound/effects/flameswoosh.ogg" = 'sound/effects/flameswoosh.ogg',\ - "sound/effects/flip.ogg" = 'sound/effects/flip.ogg',\ + "sound/effects/flip.ogg" = 'sound/effects/flip.ogg',\ "sound/effects/ghost.ogg" = 'sound/effects/ghost.ogg',\ "sound/effects/ghost2.ogg" = 'sound/effects/ghost2.ogg',\ "sound/effects/ghostambi1.ogg" = 'sound/effects/ghostambi1.ogg',\ @@ -196,15 +213,12 @@ var/global/list/soundCache = list( "sound/effects/glitchy2.ogg" = 'sound/effects/glitchy2.ogg',\ "sound/effects/glitchy3.ogg" = 'sound/effects/glitchy3.ogg',\ "sound/effects/gust.ogg" = 'sound/effects/gust.ogg',\ - "sound/effects/handscan.ogg" = 'sound/effects/handscan.ogg',\ + "sound/effects/handscan.ogg" = 'sound/effects/handscan.ogg',\ "sound/effects/Heart Beat.ogg" = 'sound/effects/Heart Beat.ogg',\ "sound/effects/heartbeat.ogg" = 'sound/effects/heartbeat.ogg',\ "sound/effects/kaboom.ogg" = 'sound/effects/kaboom.ogg',\ "sound/effects/MagShieldDown.ogg" = 'sound/effects/MagShieldDown.ogg',\ "sound/effects/MagShieldUp.ogg" = 'sound/effects/MagShieldUp.ogg',\ - "sound/effects/manta_alarm.ogg" = 'sound/effects/manta_alarm.ogg',\ - "sound/effects/manta_interface.ogg" = 'sound/effects/manta_interface.ogg',\ - "sound/effects/mantamoving.ogg" = 'sound/effects/mantamoving.ogg',\ "sound/effects/mag_fireballlaunch.ogg" = 'sound/effects/mag_fireballlaunch.ogg',\ "sound/effects/mag_forcewall.ogg" = 'sound/effects/mag_forcewall.ogg',\ "sound/effects/mag_golem.ogg" = 'sound/effects/mag_golem.ogg',\ @@ -217,6 +231,9 @@ var/global/list/soundCache = list( "sound/effects/mag_phase.ogg" = 'sound/effects/mag_phase.ogg',\ "sound/effects/mag_teleport.ogg" = 'sound/effects/mag_teleport.ogg',\ "sound/effects/mag_warp.ogg" = 'sound/effects/mag_warp.ogg',\ + "sound/effects/mantamoving.ogg" = 'sound/effects/mantamoving.ogg',\ + "sound/effects/manta_alarm.ogg" = 'sound/effects/manta_alarm.ogg',\ + "sound/effects/manta_interface.ogg" = 'sound/effects/manta_interface.ogg',\ "sound/effects/pixelexplosion.ogg" = 'sound/effects/pixelexplosion.ogg',\ "sound/effects/plop_dissolve.ogg" = 'sound/effects/plop_dissolve.ogg',\ "sound/effects/poff.ogg" = 'sound/effects/poff.ogg',\ @@ -257,13 +274,14 @@ var/global/list/soundCache = list( "sound/effects/singsuck.ogg" = 'sound/effects/singsuck.ogg',\ "sound/effects/smoke.ogg" = 'sound/effects/smoke.ogg',\ "sound/effects/smoke_tile_spread.ogg" = 'sound/effects/smoke_tile_spread.ogg',\ - "sound/effects/spark_lighter.ogg" = 'sound/effects/spark_lighter.ogg',\ "sound/effects/sparks1.ogg" = 'sound/effects/sparks1.ogg',\ "sound/effects/sparks2.ogg" = 'sound/effects/sparks2.ogg',\ "sound/effects/sparks3.ogg" = 'sound/effects/sparks3.ogg',\ "sound/effects/sparks4.ogg" = 'sound/effects/sparks4.ogg',\ "sound/effects/sparks5.ogg" = 'sound/effects/sparks5.ogg',\ "sound/effects/sparks6.ogg" = 'sound/effects/sparks6.ogg',\ + "sound/effects/spark_lighter.ogg" = 'sound/effects/spark_lighter.ogg',\ + "sound/effects/splort.ogg" = 'sound/effects/splort.ogg',\ "sound/effects/spray.ogg" = 'sound/effects/spray.ogg',\ "sound/effects/spring.ogg" = 'sound/effects/spring.ogg',\ "sound/effects/static_horror.ogg" = 'sound/effects/static_horror.ogg',\ @@ -283,6 +301,7 @@ var/global/list/soundCache = list( "sound/effects/thump.ogg" = 'sound/effects/thump.ogg',\ "sound/effects/thunder.ogg" = 'sound/effects/thunder.ogg',\ "sound/effects/toilet_flush.ogg" = 'sound/effects/toilet_flush.ogg',\ + "sound/effects/torpedolaunch.ogg" = 'sound/effects/torpedolaunch.ogg',\ "sound/effects/valve_creak.ogg" = 'sound/effects/valve_creak.ogg',\ "sound/effects/warp1.ogg" = 'sound/effects/warp1.ogg',\ "sound/effects/warp2.ogg" = 'sound/effects/warp2.ogg',\ @@ -376,6 +395,10 @@ var/global/list/soundCache = list( "sound/items/bball_bounce.ogg" = 'sound/items/bball_bounce.ogg',\ "sound/items/bball_hoop.ogg" = 'sound/items/bball_hoop.ogg',\ "sound/items/blade_pull.ogg" = 'sound/items/blade_pull.ogg',\ + "sound/items/can_crush-1.ogg" = 'sound/items/can_crush-1.ogg',\ + "sound/items/can_crush-2.ogg" = 'sound/items/can_crush-2.ogg',\ + "sound/items/can_crush-3.ogg" = 'sound/items/can_crush-3.ogg',\ + "sound/items/can_open.ogg" = 'sound/items/can_open.ogg',\ "sound/items/coindrop.ogg" = 'sound/items/coindrop.ogg',\ "sound/items/Crowbar.ogg" = 'sound/items/Crowbar.ogg',\ "sound/items/Deconstruct.ogg" = 'sound/items/Deconstruct.ogg',\ @@ -388,6 +411,8 @@ var/global/list/soundCache = list( "sound/items/injectorbelt_active.ogg" = 'sound/items/injectorbelt_active.ogg',\ "sound/items/matchstick_hit.ogg" = 'sound/items/matchstick_hit.ogg',\ "sound/items/matchstick_light.ogg" = 'sound/items/matchstick_light.ogg',\ + "sound/items/mender.ogg" = 'sound/items/mender.ogg',\ + "sound/items/mender2.ogg" = 'sound/items/mender2.ogg',\ "sound/items/mesonactivate.ogg" = 'sound/items/mesonactivate.ogg',\ "sound/items/mic_feedback.ogg" = 'sound/items/mic_feedback.ogg',\ "sound/items/miningtool_off.ogg" = 'sound/items/miningtool_off.ogg',\ @@ -410,15 +435,12 @@ var/global/list/soundCache = list( "sound/items/Screwdriver.ogg" = 'sound/items/Screwdriver.ogg',\ "sound/items/Screwdriver2.ogg" = 'sound/items/Screwdriver2.ogg',\ "sound/items/small_fire_hiss.ogg" = 'sound/items/small_fire_hiss.ogg',\ + "sound/items/sticker.ogg" = 'sound/items/sticker.ogg',\ "sound/items/Welder.ogg" = 'sound/items/Welder.ogg',\ "sound/items/Welder2.ogg" = 'sound/items/Welder2.ogg',\ "sound/items/Wirecutter.ogg" = 'sound/items/Wirecutter.ogg',\ "sound/items/woodbat.ogg" = 'sound/items/woodbat.ogg',\ "sound/items/zipper.ogg" = 'sound/items/zipper.ogg',\ - "sound/items/can_crush-1.ogg" = 'sound/items/can_crush-1.ogg',\ - "sound/items/can_crush-2.ogg" = 'sound/items/can_crush-2.ogg',\ - "sound/items/can_crush-3.ogg" = 'sound/items/can_crush-3.ogg',\ - "sound/items/can_open.ogg" = 'sound/items/can_open.ogg',\ "sound/machines/airlock.ogg" = 'sound/machines/airlock.ogg',\ "sound/machines/airlock_break_very_temp.ogg" = 'sound/machines/airlock_break_very_temp.ogg',\ "sound/machines/airlock_deny.ogg" = 'sound/machines/airlock_deny.ogg',\ @@ -466,8 +488,8 @@ var/global/list/soundCache = list( "sound/machines/cheget_somberbloop.ogg" = 'sound/machines/cheget_somberbloop.ogg',\ "sound/machines/cheget_startledbloop.ogg" = 'sound/machines/cheget_startledbloop.ogg',\ "sound/machines/chime.ogg" = 'sound/machines/chime.ogg',\ - "sound/machines/claw_machine_fail.ogg" = 'sound/machines/claw_machine_fail.ogg',\ - "sound/machines/claw_machine_success.ogg" = 'sound/machines/claw_machine_success.ogg',\ + "sound/machines/claw_machine_fail.ogg" = 'sound/machines/claw_machine_fail.ogg',\ + "sound/machines/claw_machine_success.ogg" = 'sound/machines/claw_machine_success.ogg',\ "sound/machines/click.ogg" = 'sound/machines/click.ogg',\ "sound/machines/computerboot_pc.ogg" = 'sound/machines/computerboot_pc.ogg',\ "sound/machines/computerboot_pc_end.ogg" = 'sound/machines/computerboot_pc_end.ogg',\ @@ -535,13 +557,14 @@ var/global/list/soundCache = list( "sound/machines/printer_dotmatrix.ogg" = 'sound/machines/printer_dotmatrix.ogg',\ "sound/machines/printer_thermal.ogg" = 'sound/machines/printer_thermal.ogg',\ "sound/machines/repairing.ogg" = 'sound/machines/repairing.ogg',\ - "sound/machines/reprog.ogg" = 'sound/machines/reprog.ogg',\ + "sound/machines/reprog.ogg" = 'sound/machines/reprog.ogg',\ "sound/machines/rev_engine.ogg" = 'sound/machines/rev_engine.ogg',\ "sound/machines/romhack1.ogg" = 'sound/machines/romhack1.ogg',\ "sound/machines/romhack2.ogg" = 'sound/machines/romhack2.ogg',\ "sound/machines/romhack3.ogg" = 'sound/machines/romhack3.ogg',\ "sound/machines/satcrash.ogg" = 'sound/machines/satcrash.ogg',\ "sound/machines/scan.ogg" = 'sound/machines/scan.ogg',\ + "sound/machines/shielddown.ogg" = 'sound/machines/shielddown.ogg',\ "sound/machines/shieldgen_mainloop.ogg" = 'sound/machines/shieldgen_mainloop.ogg',\ "sound/machines/shieldgen_shutoff.ogg" = 'sound/machines/shieldgen_shutoff.ogg',\ "sound/machines/shieldgen_startup.ogg" = 'sound/machines/shieldgen_startup.ogg',\ @@ -577,6 +600,13 @@ var/global/list/soundCache = list( "sound/machines/phones/remote_answer.ogg" = 'sound/machines/phones/remote_answer.ogg',\ "sound/machines/phones/ring_incoming.ogg" = 'sound/machines/phones/ring_incoming.ogg',\ "sound/machines/phones/ring_outgoing.ogg" = 'sound/machines/phones/ring_outgoing.ogg',\ + "sound/machines/phones/ringtones/bananaring1.ogg" = 'sound/machines/phones/ringtones/bananaring1.ogg',\ + "sound/machines/phones/ringtones/bananaring2.ogg" = 'sound/machines/phones/ringtones/bananaring2.ogg',\ + "sound/machines/phones/ringtones/ringtone1.ogg" = 'sound/machines/phones/ringtones/ringtone1.ogg',\ + "sound/machines/phones/ringtones/ringtone2.ogg" = 'sound/machines/phones/ringtones/ringtone2.ogg',\ + "sound/machines/phones/ringtones/ringtone3.ogg" = 'sound/machines/phones/ringtones/ringtone3.ogg',\ + "sound/machines/phones/ringtones/ringtone4.ogg" = 'sound/machines/phones/ringtones/ringtone4.ogg',\ + "sound/machines/phones/ringtones/ringtone5.ogg" = 'sound/machines/phones/ringtones/ringtone5.ogg',\ "sound/misc/adminhelp.ogg" = 'sound/misc/adminhelp.ogg',\ "sound/misc/airraid_loop.ogg" = 'sound/misc/airraid_loop.ogg',\ "sound/misc/airraid_loop_short.ogg" = 'sound/misc/airraid_loop_short.ogg',\ @@ -603,6 +633,12 @@ var/global/list/soundCache = list( "sound/misc/Boxingbell.ogg" = 'sound/misc/Boxingbell.ogg',\ "sound/misc/bugchitter.ogg" = 'sound/misc/bugchitter.ogg',\ "sound/misc/cashregister.ogg" = 'sound/misc/cashregister.ogg',\ + "sound/misc/chalkeat_1.ogg" = 'sound/misc/chalkeat_1.ogg',\ + "sound/misc/chalkeat_2.ogg" = 'sound/misc/chalkeat_2.ogg',\ + "sound/misc/chalkwrite_1.ogg" = 'sound/misc/chalkwrite_1.ogg',\ + "sound/misc/chalkwrite_2.ogg" = 'sound/misc/chalkwrite_2.ogg',\ + "sound/misc/chalkwrite_3.ogg" = 'sound/misc/chalkwrite_3.ogg',\ + "sound/misc/chalkwrite_4.ogg" = 'sound/misc/chalkwrite_4.ogg',\ "sound/misc/chefsong.ogg" = 'sound/misc/chefsong.ogg',\ "sound/misc/chefsong_end.ogg" = 'sound/misc/chefsong_end.ogg',\ "sound/misc/chefsong_start.ogg" = 'sound/misc/chefsong_start.ogg',\ @@ -626,7 +662,8 @@ var/global/list/soundCache = list( "sound/misc/ground_rumble_big.ogg" = 'sound/misc/ground_rumble_big.ogg',\ "sound/misc/handle_click.ogg" = 'sound/misc/handle_click.ogg',\ "sound/misc/jaws.ogg" = 'sound/misc/jaws.ogg',\ - "sound/misc/JetPackMK2on.ogg" = 'sound/misc/JetPackMK2on.ogg',\ + "sound/misc/jester_laugh.ogg" = 'sound/misc/jester_laugh.ogg',\ + "sound/misc/JetpackMK2on.ogg" = 'sound/misc/JetpackMK2on.ogg',\ "sound/misc/klaxon.ogg" = 'sound/misc/klaxon.ogg',\ "sound/misc/knockout.ogg" = 'sound/misc/knockout.ogg',\ "sound/misc/lawnotify.ogg" = 'sound/misc/lawnotify.ogg',\ @@ -634,13 +671,13 @@ var/global/list/soundCache = list( "sound/misc/lincolnshire.ogg" = 'sound/misc/lincolnshire.ogg',\ "sound/misc/lose.ogg" = 'sound/misc/lose.ogg',\ "sound/misc/meatmonaut1.ogg" = 'sound/misc/meatmonaut1.ogg',\ - "sound/misc/mechanical_footstep1.ogg" = 'sound/misc/mechanical_footstep1.ogg',\ - "sound/misc/mechanical_footstep2.ogg" = 'sound/misc/mechanical_footstep2.ogg',\ - "sound/misc/mechanical_footstep3.ogg" = 'sound/misc/mechanical_footstep3.ogg',\ "sound/misc/meat_gargle.ogg" = 'sound/misc/meat_gargle.ogg',\ "sound/misc/meat_hork.ogg" = 'sound/misc/meat_hork.ogg',\ "sound/misc/meat_plop.ogg" = 'sound/misc/meat_plop.ogg',\ "sound/misc/meat_splat.ogg" = 'sound/misc/meat_splat.ogg',\ + "sound/misc/mechanical_footstep1.ogg" = 'sound/misc/mechanical_footstep1.ogg',\ + "sound/misc/mechanical_footstep2.ogg" = 'sound/misc/mechanical_footstep2.ogg',\ + "sound/misc/mechanical_footstep3.ogg" = 'sound/misc/mechanical_footstep3.ogg',\ "sound/misc/molly_revived.ogg" = 'sound/misc/molly_revived.ogg',\ "sound/misc/NewRound.ogg" = 'sound/misc/NewRound.ogg',\ "sound/misc/NewRound2.ogg" = 'sound/misc/NewRound2.ogg',\ @@ -701,12 +738,6 @@ var/global/list/soundCache = list( "sound/misc/chair/office/scoot3.ogg" = 'sound/misc/chair/office/scoot3.ogg',\ "sound/misc/chair/office/scoot4.ogg" = 'sound/misc/chair/office/scoot4.ogg',\ "sound/misc/chair/office/scoot5.ogg" = 'sound/misc/chair/office/scoot5.ogg',\ - "sound/misc/chalkeat_1.ogg" = 'sound/misc/chalkeat_1.ogg',\ - "sound/misc/chalkeat_2.ogg" = 'sound/misc/chalkeat_2.ogg',\ - "sound/misc/chalkwrite_1.ogg" = 'sound/misc/chalkwrite_1.ogg',\ - "sound/misc/chalkwrite_2.ogg" = 'sound/misc/chalkwrite_2.ogg',\ - "sound/misc/chalkwrite_3.ogg" = 'sound/misc/chalkwrite_3.ogg',\ - "sound/misc/chalkwrite_4.ogg" = 'sound/misc/chalkwrite_4.ogg',\ "sound/misc/flockmind/flockbit_wisp1.ogg" = 'sound/misc/flockmind/flockbit_wisp1.ogg',\ "sound/misc/flockmind/flockbit_wisp2.ogg" = 'sound/misc/flockmind/flockbit_wisp2.ogg',\ "sound/misc/flockmind/flockbit_wisp3.ogg" = 'sound/misc/flockmind/flockbit_wisp3.ogg',\ @@ -757,6 +788,9 @@ var/global/list/soundCache = list( "sound/misc/step/step_default_3.ogg" = 'sound/misc/step/step_default_3.ogg',\ "sound/misc/step/step_default_4.ogg" = 'sound/misc/step/step_default_4.ogg',\ "sound/misc/step/step_default_5.ogg" = 'sound/misc/step/step_default_5.ogg',\ + "sound/misc/step/step_flipflop_1.ogg" = 'sound/misc/step/step_flipflop_1.ogg',\ + "sound/misc/step/step_flipflop_2.ogg" = 'sound/misc/step/step_flipflop_2.ogg',\ + "sound/misc/step/step_flipflop_3.ogg" = 'sound/misc/step/step_flipflop_3.ogg',\ "sound/misc/step/step_lattice_1.ogg" = 'sound/misc/step/step_lattice_1.ogg',\ "sound/misc/step/step_lattice_2.ogg" = 'sound/misc/step/step_lattice_2.ogg',\ "sound/misc/step/step_lattice_3.ogg" = 'sound/misc/step/step_lattice_3.ogg',\ @@ -769,11 +803,43 @@ var/global/list/soundCache = list( "sound/misc/step/step_plating_3.ogg" = 'sound/misc/step/step_plating_3.ogg',\ "sound/misc/step/step_plating_4.ogg" = 'sound/misc/step/step_plating_4.ogg',\ "sound/misc/step/step_plating_5.ogg" = 'sound/misc/step/step_plating_5.ogg',\ + "sound/misc/step/step_robo_1.ogg" = 'sound/misc/step/step_robo_1.ogg',\ + "sound/misc/step/step_robo_2.ogg" = 'sound/misc/step/step_robo_2.ogg',\ + "sound/misc/step/step_robo_3.ogg" = 'sound/misc/step/step_robo_3.ogg',\ + "sound/misc/step/step_rubberboot_1.ogg" = 'sound/misc/step/step_rubberboot_1.ogg',\ + "sound/misc/step/step_rubberboot_2.ogg" = 'sound/misc/step/step_rubberboot_2.ogg',\ + "sound/misc/step/step_rubberboot_3.ogg" = 'sound/misc/step/step_rubberboot_3.ogg',\ + "sound/misc/step/step_rubberboot_4.ogg" = 'sound/misc/step/step_rubberboot_4.ogg',\ "sound/misc/step/step_wood_1.ogg" = 'sound/misc/step/step_wood_1.ogg',\ "sound/misc/step/step_wood_2.ogg" = 'sound/misc/step/step_wood_2.ogg',\ "sound/misc/step/step_wood_3.ogg" = 'sound/misc/step/step_wood_3.ogg',\ "sound/misc/step/step_wood_4.ogg" = 'sound/misc/step/step_wood_4.ogg',\ "sound/misc/step/step_wood_5.ogg" = 'sound/misc/step/step_wood_5.ogg',\ + "sound/misc/talk/blub.ogg" = 'sound/misc/talk/blub.ogg',\ + "sound/misc/talk/blub_ask.ogg" = 'sound/misc/talk/blub_ask.ogg',\ + "sound/misc/talk/blub_exclaim.ogg" = 'sound/misc/talk/blub_exclaim.ogg',\ + "sound/misc/talk/buwoo.ogg" = 'sound/misc/talk/buwoo.ogg',\ + "sound/misc/talk/buwoo_ask.ogg" = 'sound/misc/talk/buwoo_ask.ogg',\ + "sound/misc/talk/buwoo_exclaim.ogg" = 'sound/misc/talk/buwoo_exclaim.ogg',\ + "sound/misc/talk/lizard.ogg" = 'sound/misc/talk/lizard.ogg',\ + "sound/misc/talk/lizard_ask.ogg" = 'sound/misc/talk/lizard_ask.ogg',\ + "sound/misc/talk/lizard_exclaim.ogg" = 'sound/misc/talk/lizard_exclaim.ogg',\ + "sound/misc/talk/radio.ogg" = 'sound/misc/talk/radio.ogg',\ + "sound/misc/talk/skelly.ogg" = 'sound/misc/talk/skelly.ogg',\ + "sound/misc/talk/skelly_ask.ogg" = 'sound/misc/talk/skelly_ask.ogg',\ + "sound/misc/talk/skelly_exclaim.ogg" = 'sound/misc/talk/skelly_exclaim.ogg',\ + "sound/misc/talk/speak_1.ogg" = 'sound/misc/talk/speak_1.ogg',\ + "sound/misc/talk/speak_1_ask.ogg" = 'sound/misc/talk/speak_1_ask.ogg',\ + "sound/misc/talk/speak_1_exclaim.ogg" = 'sound/misc/talk/speak_1_exclaim.ogg',\ + "sound/misc/talk/speak_2.ogg" = 'sound/misc/talk/speak_2.ogg',\ + "sound/misc/talk/speak_2_ask.ogg" = 'sound/misc/talk/speak_2_ask.ogg',\ + "sound/misc/talk/speak_2_exclaim.ogg" = 'sound/misc/talk/speak_2_exclaim.ogg',\ + "sound/misc/talk/speak_3.ogg" = 'sound/misc/talk/speak_3.ogg',\ + "sound/misc/talk/speak_3_ask.ogg" = 'sound/misc/talk/speak_3_ask.ogg',\ + "sound/misc/talk/speak_3_exclaim.ogg" = 'sound/misc/talk/speak_3_exclaim.ogg',\ + "sound/misc/talk/speak_4.ogg" = 'sound/misc/talk/speak_4.ogg',\ + "sound/misc/talk/speak_4_ask.ogg" = 'sound/misc/talk/speak_4_ask.ogg',\ + "sound/misc/talk/speak_4_exclaim.ogg" = 'sound/misc/talk/speak_4_exclaim.ogg',\ "sound/mksounds/boost.ogg" = 'sound/mksounds/boost.ogg',\ "sound/mksounds/cpuspin.ogg" = 'sound/mksounds/cpuspin.ogg',\ "sound/mksounds/cputhrow.ogg" = 'sound/mksounds/cputhrow.ogg',\ @@ -786,70 +852,7 @@ var/global/list/soundCache = list( "sound/mksounds/skidd.ogg" = 'sound/mksounds/skidd.ogg',\ "sound/mksounds/spinout.ogg" = 'sound/mksounds/spinout.ogg',\ "sound/mksounds/throw.ogg" = 'sound/mksounds/throw.ogg',\ - "sound/piano/a3.ogg" = 'sound/piano/a3.ogg',\ - "sound/piano/a4.ogg" = 'sound/piano/a4.ogg',\ - "sound/piano/a5.ogg" = 'sound/piano/a5.ogg',\ - "sound/piano/ab3.ogg" = 'sound/piano/ab3.ogg',\ - "sound/piano/ab4.ogg" = 'sound/piano/ab4.ogg',\ - "sound/piano/ab5.ogg" = 'sound/piano/ab5.ogg',\ - "sound/piano/as3.ogg" = 'sound/piano/as3.ogg',\ - "sound/piano/as4.ogg" = 'sound/piano/as4.ogg',\ - "sound/piano/as5.ogg" = 'sound/piano/as5.ogg',\ - "sound/piano/b3.ogg" = 'sound/piano/b3.ogg',\ - "sound/piano/b4.ogg" = 'sound/piano/b4.ogg',\ - "sound/piano/b5.ogg" = 'sound/piano/b5.ogg',\ - "sound/piano/bb3.ogg" = 'sound/piano/bb3.ogg',\ - "sound/piano/bb4.ogg" = 'sound/piano/bb4.ogg',\ - "sound/piano/bb5.ogg" = 'sound/piano/bb5.ogg',\ - "sound/piano/bs3.ogg" = 'sound/piano/bs3.ogg',\ - "sound/piano/bs4.ogg" = 'sound/piano/bs4.ogg',\ - "sound/piano/bs5.ogg" = 'sound/piano/bs5.ogg',\ - "sound/piano/c3.ogg" = 'sound/piano/c3.ogg',\ - "sound/piano/c4.ogg" = 'sound/piano/c4.ogg',\ - "sound/piano/c5.ogg" = 'sound/piano/c5.ogg',\ - "sound/piano/cb3.ogg" = 'sound/piano/cb3.ogg',\ - "sound/piano/cb4.ogg" = 'sound/piano/cb4.ogg',\ - "sound/piano/cb5.ogg" = 'sound/piano/cb5.ogg',\ - "sound/piano/cs3.ogg" = 'sound/piano/cs3.ogg',\ - "sound/piano/cs4.ogg" = 'sound/piano/cs4.ogg',\ - "sound/piano/cs5.ogg" = 'sound/piano/cs5.ogg',\ - "sound/piano/d3.ogg" = 'sound/piano/d3.ogg',\ - "sound/piano/d4.ogg" = 'sound/piano/d4.ogg',\ - "sound/piano/d5.ogg" = 'sound/piano/d5.ogg',\ - "sound/piano/db3.ogg" = 'sound/piano/db3.ogg',\ - "sound/piano/db4.ogg" = 'sound/piano/db4.ogg',\ - "sound/piano/db5.ogg" = 'sound/piano/db5.ogg',\ - "sound/piano/ds3.ogg" = 'sound/piano/ds3.ogg',\ - "sound/piano/ds4.ogg" = 'sound/piano/ds4.ogg',\ - "sound/piano/ds5.ogg" = 'sound/piano/ds5.ogg',\ - "sound/piano/e3.ogg" = 'sound/piano/e3.ogg',\ - "sound/piano/e4.ogg" = 'sound/piano/e4.ogg',\ - "sound/piano/e5.ogg" = 'sound/piano/e5.ogg',\ - "sound/piano/eb3.ogg" = 'sound/piano/eb3.ogg',\ - "sound/piano/eb4.ogg" = 'sound/piano/eb4.ogg',\ - "sound/piano/eb5.ogg" = 'sound/piano/eb5.ogg',\ - "sound/piano/es3.ogg" = 'sound/piano/es3.ogg',\ - "sound/piano/es4.ogg" = 'sound/piano/es4.ogg',\ - "sound/piano/es5.ogg" = 'sound/piano/es5.ogg',\ - "sound/piano/f3.ogg" = 'sound/piano/f3.ogg',\ - "sound/piano/f4.ogg" = 'sound/piano/f4.ogg',\ - "sound/piano/f5.ogg" = 'sound/piano/f5.ogg',\ - "sound/piano/fb3.ogg" = 'sound/piano/fb3.ogg',\ - "sound/piano/fb4.ogg" = 'sound/piano/fb4.ogg',\ - "sound/piano/fb5.ogg" = 'sound/piano/fb5.ogg',\ - "sound/piano/fs3.ogg" = 'sound/piano/fs3.ogg',\ - "sound/piano/fs4.ogg" = 'sound/piano/fs4.ogg',\ - "sound/piano/fs5.ogg" = 'sound/piano/fs5.ogg',\ - "sound/piano/g3.ogg" = 'sound/piano/g3.ogg',\ - "sound/piano/g4.ogg" = 'sound/piano/g4.ogg',\ - "sound/piano/g5.ogg" = 'sound/piano/g5.ogg',\ - "sound/piano/gb3.ogg" = 'sound/piano/gb3.ogg',\ - "sound/piano/gb4.ogg" = 'sound/piano/gb4.ogg',\ - "sound/piano/gb5.ogg" = 'sound/piano/gb5.ogg',\ - "sound/piano/gs3.ogg" = 'sound/piano/gb3.ogg',\ - "sound/piano/gs4.ogg" = 'sound/piano/gb4.ogg',\ - "sound/piano/rrr.ogg" = 'sound/piano/rrr.ogg',\ - "sound/musical_instruments/Airhorn_1.ogg" = 'sound/musical_instruments/Airhorn_1.ogg',\ + "sound/musical_instruments/Airhorn_1.ogg" = 'sound/musical_instruments/Airhorn_1.ogg',\ "sound/musical_instruments/Bagpipes_1.ogg" = 'sound/musical_instruments/Bagpipes_1.ogg',\ "sound/musical_instruments/Bagpipes_2.ogg" = 'sound/musical_instruments/Bagpipes_2.ogg',\ "sound/musical_instruments/Bagpipes_3.ogg" = 'sound/musical_instruments/Bagpipes_3.ogg',\ @@ -957,6 +960,69 @@ var/global/list/soundCache = list( "sound/musical_instruments/piano/lune.ogg" = 'sound/musical_instruments/piano/lune.ogg',\ "sound/musical_instruments/piano/nachtmusik1.ogg" = 'sound/musical_instruments/piano/nachtmusik1.ogg',\ "sound/musical_instruments/piano/nachtmusik2.ogg" = 'sound/musical_instruments/piano/nachtmusik2.ogg',\ + "sound/piano/a3.ogg" = 'sound/piano/a3.ogg',\ + "sound/piano/a4.ogg" = 'sound/piano/a4.ogg',\ + "sound/piano/a5.ogg" = 'sound/piano/a5.ogg',\ + "sound/piano/ab3.ogg" = 'sound/piano/ab3.ogg',\ + "sound/piano/ab4.ogg" = 'sound/piano/ab4.ogg',\ + "sound/piano/ab5.ogg" = 'sound/piano/ab5.ogg',\ + "sound/piano/as3.ogg" = 'sound/piano/as3.ogg',\ + "sound/piano/as4.ogg" = 'sound/piano/as4.ogg',\ + "sound/piano/as5.ogg" = 'sound/piano/as5.ogg',\ + "sound/piano/b3.ogg" = 'sound/piano/b3.ogg',\ + "sound/piano/b4.ogg" = 'sound/piano/b4.ogg',\ + "sound/piano/b5.ogg" = 'sound/piano/b5.ogg',\ + "sound/piano/bb3.ogg" = 'sound/piano/bb3.ogg',\ + "sound/piano/bb4.ogg" = 'sound/piano/bb4.ogg',\ + "sound/piano/bb5.ogg" = 'sound/piano/bb5.ogg',\ + "sound/piano/bs3.ogg" = 'sound/piano/bs3.ogg',\ + "sound/piano/bs4.ogg" = 'sound/piano/bs4.ogg',\ + "sound/piano/bs5.ogg" = 'sound/piano/bs5.ogg',\ + "sound/piano/c3.ogg" = 'sound/piano/c3.ogg',\ + "sound/piano/c4.ogg" = 'sound/piano/c4.ogg',\ + "sound/piano/c5.ogg" = 'sound/piano/c5.ogg',\ + "sound/piano/cb3.ogg" = 'sound/piano/cb3.ogg',\ + "sound/piano/cb4.ogg" = 'sound/piano/cb4.ogg',\ + "sound/piano/cb5.ogg" = 'sound/piano/cb5.ogg',\ + "sound/piano/cs3.ogg" = 'sound/piano/cs3.ogg',\ + "sound/piano/cs4.ogg" = 'sound/piano/cs4.ogg',\ + "sound/piano/cs5.ogg" = 'sound/piano/cs5.ogg',\ + "sound/piano/d3.ogg" = 'sound/piano/d3.ogg',\ + "sound/piano/d4.ogg" = 'sound/piano/d4.ogg',\ + "sound/piano/d5.ogg" = 'sound/piano/d5.ogg',\ + "sound/piano/db3.ogg" = 'sound/piano/db3.ogg',\ + "sound/piano/db4.ogg" = 'sound/piano/db4.ogg',\ + "sound/piano/db5.ogg" = 'sound/piano/db5.ogg',\ + "sound/piano/ds3.ogg" = 'sound/piano/ds3.ogg',\ + "sound/piano/ds4.ogg" = 'sound/piano/ds4.ogg',\ + "sound/piano/ds5.ogg" = 'sound/piano/ds5.ogg',\ + "sound/piano/e3.ogg" = 'sound/piano/e3.ogg',\ + "sound/piano/e4.ogg" = 'sound/piano/e4.ogg',\ + "sound/piano/e5.ogg" = 'sound/piano/e5.ogg',\ + "sound/piano/eb3.ogg" = 'sound/piano/eb3.ogg',\ + "sound/piano/eb4.ogg" = 'sound/piano/eb4.ogg',\ + "sound/piano/eb5.ogg" = 'sound/piano/eb5.ogg',\ + "sound/piano/es3.ogg" = 'sound/piano/es3.ogg',\ + "sound/piano/es4.ogg" = 'sound/piano/es4.ogg',\ + "sound/piano/es5.ogg" = 'sound/piano/es5.ogg',\ + "sound/piano/f3.ogg" = 'sound/piano/f3.ogg',\ + "sound/piano/f4.ogg" = 'sound/piano/f4.ogg',\ + "sound/piano/f5.ogg" = 'sound/piano/f5.ogg',\ + "sound/piano/fb3.ogg" = 'sound/piano/fb3.ogg',\ + "sound/piano/fb4.ogg" = 'sound/piano/fb4.ogg',\ + "sound/piano/fb5.ogg" = 'sound/piano/fb5.ogg',\ + "sound/piano/fs3.ogg" = 'sound/piano/fs3.ogg',\ + "sound/piano/fs4.ogg" = 'sound/piano/fs4.ogg',\ + "sound/piano/fs5.ogg" = 'sound/piano/fs5.ogg',\ + "sound/piano/g3.ogg" = 'sound/piano/g3.ogg',\ + "sound/piano/g4.ogg" = 'sound/piano/g4.ogg',\ + "sound/piano/g5.ogg" = 'sound/piano/g5.ogg',\ + "sound/piano/gb3.ogg" = 'sound/piano/gb3.ogg',\ + "sound/piano/gb4.ogg" = 'sound/piano/gb4.ogg',\ + "sound/piano/gb5.ogg" = 'sound/piano/gb5.ogg',\ + "sound/piano/gs3.ogg" = 'sound/piano/gs3.ogg',\ + "sound/piano/gs4.ogg" = 'sound/piano/gs4.ogg',\ + "sound/piano/rrr.ogg" = 'sound/piano/rrr.ogg',\ "sound/radio_station/flockdrone/click.ogg" = 'sound/radio_station/flockdrone/click.ogg',\ "sound/radio_station/flockdrone/deny.ogg" = 'sound/radio_station/flockdrone/deny.ogg',\ "sound/radio_station/flockdrone/hover.ogg" = 'sound/radio_station/flockdrone/hover.ogg',\ @@ -986,6 +1052,7 @@ var/global/list/soundCache = list( "sound/voice/femvox.ogg" = 'sound/voice/femvox.ogg',\ "sound/voice/guard_halt.ogg" = 'sound/voice/guard_halt.ogg',\ "sound/voice/heavenly.ogg" = 'sound/voice/heavenly.ogg',\ + "sound/voice/horse.ogg" = 'sound/voice/horse.ogg',\ "sound/voice/killme.ogg" = 'sound/voice/killme.ogg',\ "sound/voice/mapvote_bill.ogg" = 'sound/voice/mapvote_bill.ogg',\ "sound/voice/mapvote_cirr.ogg" = 'sound/voice/mapvote_cirr.ogg',\ @@ -1027,7 +1094,7 @@ var/global/list/soundCache = list( "sound/voice/animal/cat_hiss.ogg" = 'sound/voice/animal/cat_hiss.ogg',\ "sound/voice/animal/crab_chirp.ogg" = 'sound/voice/animal/crab_chirp.ogg',\ "sound/voice/animal/dogbark.ogg" = 'sound/voice/animal/dogbark.ogg',\ - "sound/voice/animal/fly_buzz.ogg" = 'sound/voice/animal/fly_buzz.ogg',\ + "sound/voice/animal/fly_buzz.ogg" = 'sound/voice/animal/fly_buzz.ogg',\ "sound/voice/animal/gabe1.ogg" = 'sound/voice/animal/gabe1.ogg',\ "sound/voice/animal/gabe10.ogg" = 'sound/voice/animal/gabe10.ogg',\ "sound/voice/animal/gabe11.ogg" = 'sound/voice/animal/gabe11.ogg',\ @@ -1235,6 +1302,7 @@ var/global/list/soundCache = list( "sound/weapons/9x19NATO.ogg" = 'sound/weapons/9x19NATO.ogg',\ "sound/weapons/ACgun1.ogg" = 'sound/weapons/ACgun1.ogg',\ "sound/weapons/ACgun2.ogg" = 'sound/weapons/ACgun2.ogg',\ + "sound/weapons/airzooka.ogg" = 'sound/weapons/airzooka.ogg',\ "sound/weapons/ak47shot.ogg" = 'sound/weapons/ak47shot.ogg',\ "sound/weapons/armbomb.ogg" = 'sound/weapons/armbomb.ogg',\ "sound/weapons/blaster_a.ogg" = 'sound/weapons/blaster_a.ogg',\ @@ -1250,19 +1318,21 @@ var/global/list/soundCache = list( "sound/weapons/flaregun.ogg" = 'sound/weapons/flaregun.ogg',\ "sound/weapons/flash.ogg" = 'sound/weapons/flash.ogg',\ "sound/weapons/flashbang.ogg" = 'sound/weapons/flashbang.ogg',\ + "sound/weapons/flintlock.ogg" = 'sound/weapons/flintlock.ogg',\ "sound/weapons/gauss40mm.ogg" = 'sound/weapons/gauss40mm.ogg',\ "sound/weapons/grenade.ogg" = 'sound/weapons/grenade.ogg',\ - "sound/weapons/gun_cocked_colt45.ogg" = 'sound/weapons/gun_cocked_colt45.ogg',\ "sound/weapons/Gunclick.ogg" = 'sound/weapons/Gunclick.ogg',\ "sound/weapons/gunload_click.ogg" = 'sound/weapons/gunload_click.ogg',\ "sound/weapons/gunload_heavy.ogg" = 'sound/weapons/gunload_heavy.ogg',\ "sound/weapons/gunload_light.ogg" = 'sound/weapons/gunload_light.ogg',\ "sound/weapons/Gunshot.ogg" = 'sound/weapons/Gunshot.ogg',\ "sound/weapons/Gunshotold.ogg" = 'sound/weapons/Gunshotold.ogg',\ + "sound/weapons/gun_cocked_colt45.ogg" = 'sound/weapons/gun_cocked_colt45.ogg',\ "sound/weapons/handcuffs.ogg" = 'sound/weapons/handcuffs.ogg',\ "sound/weapons/heavyion.ogg" = 'sound/weapons/heavyion.ogg',\ "sound/weapons/heavyioncharge.ogg" = 'sound/weapons/heavyioncharge.ogg',\ "sound/weapons/laser-burst.ogg" = 'sound/weapons/laser-burst.ogg',\ + "sound/weapons/Laser-orig.ogg" = 'sound/weapons/Laser-orig.ogg',\ "sound/weapons/Laser.ogg" = 'sound/weapons/Laser.ogg',\ "sound/weapons/laserheavy.ogg" = 'sound/weapons/laserheavy.ogg',\ "sound/weapons/laserlight.ogg" = 'sound/weapons/laserlight.ogg',\ @@ -1277,6 +1347,7 @@ var/global/list/soundCache = list( "sound/weapons/laser_d.ogg" = 'sound/weapons/laser_d.ogg',\ "sound/weapons/laser_e.ogg" = 'sound/weapons/laser_e.ogg',\ "sound/weapons/laser_f.ogg" = 'sound/weapons/laser_f.ogg',\ + "sound/weapons/launcher.ogg" = 'sound/weapons/launcher.ogg',\ "sound/weapons/male_cswordattack1.ogg" = 'sound/weapons/male_cswordattack1.ogg',\ "sound/weapons/male_cswordattack2.ogg" = 'sound/weapons/male_cswordattack2.ogg',\ "sound/weapons/male_cswordstart.ogg" = 'sound/weapons/male_cswordstart.ogg',\ @@ -1297,12 +1368,14 @@ var/global/list/soundCache = list( "sound/weapons/rev_flash_startup.ogg" = 'sound/weapons/rev_flash_startup.ogg',\ "sound/weapons/ribbit.ogg" = 'sound/weapons/ribbit.ogg',\ "sound/weapons/rocket.ogg" = 'sound/weapons/rocket.ogg',\ + "sound/weapons/scope.ogg" = 'sound/weapons/scope.ogg',\ "sound/weapons/shotgunpump.ogg" = 'sound/weapons/shotgunpump.ogg',\ "sound/weapons/shotgunshot.ogg" = 'sound/weapons/shotgunshot.ogg',\ "sound/weapons/smg_shot.ogg" = 'sound/weapons/smg_shot.ogg',\ "sound/weapons/snipershot.ogg" = 'sound/weapons/snipershot.ogg',\ "sound/weapons/Taser.ogg" = 'sound/weapons/Taser.ogg',\ "sound/weapons/TaserOLD.ogg" = 'sound/weapons/TaserOLD.ogg',\ + "sound/weapons/tranq_pistol.ogg" = 'sound/weapons/tranq_pistol.ogg',\ "sound/weapons/trayhit.ogg" = 'sound/weapons/trayhit.ogg',\ "sound/weapons/energy/howitzer_firing.ogg" = 'sound/weapons/energy/howitzer_firing.ogg',\ "sound/weapons/energy/howitzer_impact.ogg" = 'sound/weapons/energy/howitzer_impact.ogg',\ @@ -1311,7 +1384,5 @@ var/global/list/soundCache = list( "sound/weapons/energy/laser_alastor.ogg" = 'sound/weapons/energy/laser_alastor.ogg',\ "sound/weapons/energy/LightningCannon.ogg" = 'sound/weapons/energy/LightningCannon.ogg',\ "sound/weapons/energy/LightningCannonImpact.ogg" = 'sound/weapons/energy/LightningCannonImpact.ogg',\ - "sound/weapons/launcher.ogg" = 'sound/weapons/launcher.ogg',\ - "sound/weapons/scope.ogg" = 'sound/weapons/scope.ogg',\ "NONE" = null) diff --git a/code/modules/status_system/statusSystem.dm b/code/modules/status_system/statusSystem.dm index 3670cc5..c088e29 100644 --- a/code/modules/status_system/statusSystem.dm +++ b/code/modules/status_system/statusSystem.dm @@ -122,9 +122,9 @@ var/list/statusGroupLimits = list("Food"=4) str = "[round(ownerStatus.duration / (1 MINUTES))]M" else if(ownerStatus.duration < 10 SECONDS) - str = "0[round(ownerStatus.duration / (1 SECONDS))]" + str = "0[round(ownerStatus.duration / (1 SECOND))]" else - str = "[round(ownerStatus.duration / (1 SECONDS))]" + str = "[round(ownerStatus.duration / (1 SECOND))]" maptext = "[str]" return @@ -378,7 +378,7 @@ var/list/statusGroupLimits = list("Food"=4) simplehot //Simple heal over time. var/tickCount = 0 - var/tickSpacing = 1 SECONDS //Time between ticks. + var/tickSpacing = 1 SECOND //Time between ticks. var/heal_brute = 0 var/heal_tox = 0 var/heal_burn = 0 @@ -396,7 +396,7 @@ var/list/statusGroupLimits = list("Food"=4) simpledot //Simple damage over time. var/tickCount = 0 - var/tickSpacing = 1 SECONDS //Time between ticks. + var/tickSpacing = 1 SECOND //Time between ticks. var/damage_brute = 0 var/damage_tox = 0 var/damage_burn = 0 @@ -1053,8 +1053,8 @@ var/list/statusGroupLimits = list("Food"=4) name = "janktank" desc = "You're \"high\" on some sorta stimulant" icon_state = "janktank" - duration = 10 MINUTES - maxDuration = 20 MINUTES + duration = 9 MINUTES + maxDuration = 18 MINUTES unique = 1 var/change = 1 //Effective change to maxHealth @@ -1100,8 +1100,8 @@ var/list/statusGroupLimits = list("Food"=4) name = "janktank withdrawl" desc = "You're going through withrawl of Janktank" icon_state = "janktank-w" - duration = 25 MINUTES - maxDuration = 25 MINUTES + duration = 9 MINUTES + maxDuration = 18 MINUTES unique = 1 var/change = 1 //Effective change to maxHealth diff --git a/code/modules/telescience/radiotelescope.dm b/code/modules/telescience/radiotelescope.dm index 6917abe..bb74d78 100644 --- a/code/modules/telescience/radiotelescope.dm +++ b/code/modules/telescience/radiotelescope.dm @@ -34,7 +34,7 @@ onclose(user, "telescope", src) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) callJsFunc(usr, "setRef", list("\ref[src]")) //This is shit but without it, it calls the JS before the window is open and doesn't work. loadContent("Starmap", "#contentInner") diff --git a/code/modules/transport/cruisers/cruiser_console.dm b/code/modules/transport/cruisers/cruiser_console.dm index 5fd9593..3a2dd07 100644 --- a/code/modules/transport/cruisers/cruiser_console.dm +++ b/code/modules/transport/cruisers/cruiser_console.dm @@ -174,7 +174,7 @@ if (usage_count_builder) newsignal.data["usage_breakdown"] = usage_count_builder - SPAWN_DBG(4) + SPAWN_DBG(4 DECI SECONDS) send_command("read_power", newsignal) return newsignal @@ -199,7 +199,7 @@ newsignal.data["damage_num"] = dmg_count newsignal.data["degradation"] = cruiser.degradation - SPAWN_DBG(4) + SPAWN_DBG(4 DECI SECONDS) send_command("get_damage", newsignal) if ("power_ratios") @@ -209,7 +209,7 @@ newsignal.data["ratio_defense"] = cruiser.power_defense newsignal.data["ratio_offense"] = cruiser.power_offense - SPAWN_DBG(4) + SPAWN_DBG(4 DECI SECONDS) send_command("power_ratios", newsignal) return newsignal @@ -262,7 +262,7 @@ cruiser.degradation = min(cruiser.degradation + 5, 100) else newsignal.data["info"] = "INTERNAL ERROR. UNKNOWN SYSTEM" - SPAWN_DBG(4) + SPAWN_DBG(4 DECI SECONDS) send_command("reboot", newsignal) return @@ -283,7 +283,7 @@ cruiser.power_defense = percentage newsignal.data["info"] = "Set [signal.data["system"]] to [percentage]%" - SPAWN_DBG(4) + SPAWN_DBG(4 DECI SECONDS) send_command("set_power", newsignal) else diff --git a/code/modules/transport/cruisers/cruisers.dm b/code/modules/transport/cruisers/cruisers.dm index 4753d47..ecad07f 100644 --- a/code/modules/transport/cruisers/cruisers.dm +++ b/code/modules/transport/cruisers/cruisers.dm @@ -335,7 +335,7 @@ internal_sound(src.loc, 'sound/machines/boost.ogg', 100, 1, -1) src.speed_mod -= 2 src.ramming += 8 - SPAWN_DBG(100) + SPAWN_DBG(10 SECONDS) src.speed_mod += 2 src.removePowerUse("rammingMode") src.ramming = max(src.ramming - 8, 0) @@ -347,7 +347,7 @@ src.addPowerUse("weaponOverload", 90, -1) internal_sound(src.loc, 'sound/machines/weaponoverload.ogg', 80, 1, -1) src.weapon_cooldown_mod -= 3 - SPAWN_DBG(100) + SPAWN_DBG(10 SECONDS) src.weapon_cooldown_mod += 3 src.removePowerUse("weaponOverload") return @@ -360,7 +360,7 @@ I.alpha = 150 shield_obj.overlays += I internal_sound(src.loc, 'sound/machines/shieldoverload.ogg', 80, 0, -1) - SPAWN_DBG(150) + SPAWN_DBG(15 SECONDS) src.removePowerUse("shieldOverload") src.shield_regen_always -= 1 src.shield_regen_boost -= 5 @@ -933,7 +933,7 @@ proc/reboot() //Called when the device is rebooted / in override mode. rebooting = 1 - SPAWN_DBG(10) rebooting = 0 + SPAWN_DBG(1 SECOND) rebooting = 0 return "Reboot complete" proc/adjustHealth(var/amount) @@ -1037,7 +1037,7 @@ boutput(user, "Something is preventing the [src] from opening.") else ready = 0 - SPAWN_DBG(10) ready = 1 + SPAWN_DBG(1 SECOND) ready = 1 playsound(src.loc, 'sound/machines/hydraulic.ogg', 50, 0, -1) open = 1 setIcon() @@ -1051,7 +1051,7 @@ boutput(user, "This device is currently disabled.") return ready = 0 - SPAWN_DBG(10) ready = 1 + SPAWN_DBG(1 SECOND) ready = 1 playsound(src.loc, 'sound/machines/weapons-deploy.ogg', 60, 0, -1) open = 0 setIcon() diff --git a/code/modules/transport/pods/communications.dm b/code/modules/transport/pods/communications.dm index 839f8c1..0f9983a 100644 --- a/code/modules/transport/pods/communications.dm +++ b/code/modules/transport/pods/communications.dm @@ -100,7 +100,7 @@ New() ..() - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) if(radio_controller) radio_controller.add_object(src, "[frequency]") diff --git a/code/modules/transport/pods/sensors.dm b/code/modules/transport/pods/sensors.dm index d800d93..7b9b994 100644 --- a/code/modules/transport/pods/sensors.dm +++ b/code/modules/transport/pods/sensors.dm @@ -127,7 +127,7 @@ //Tracking loop proc/track_target(var/gps_coord) - tracking_gps_coord = gps_coord //Dumb stuff cause I made this on 2016 which didn't have an items processing loop. + tracking_gps_coord = gps_coord //Dumb stuff cause I made this on 2016 which didn't have an items processing loop. cur_dist = 0 same_z_level = 0 trackable_range = 0 @@ -146,7 +146,7 @@ animate_tracking_hud(src.ship.myhud.tracking, src.tracking_target) //If the target is out of seek range, move to top and change to lost state - else + else src.ship.myhud.tracking.icon_state = "lost" //if we're off the z-level or tracking a ship and twice as far out: lose the signal //If it's a static gps target from the coordinate picker, we can track from anywhere. Maybe unneeded @@ -157,7 +157,7 @@ playsound(src.loc, "sound/machines/whistlebeep.ogg", 50, 1) // sleep(SENSOR_REFRESH_RATE) - + //If the engine is off or we're using 10% of power capacity, make it harder for people to track us. //currently only using this for tracking. It doesn't effect the active sensor scan button. @@ -173,21 +173,21 @@ //Turns the sprite around proc/animate_tracking_hud(var/atom/A, var/atom/target) if (!istype(A) || !istype(target)) - return + return var/ang = get_angle(src.ship, target) //Was maybe thinking about having it get further out or something the further the target is, but no. //var/dist = get_dist(src.ship, target) - //var/number = round(ang/(45-(50-dist)))*(45-(50-dist)) + //var/number = round(ang/(45-(50-dist)))*(45-(50-dist)) var/matrix/M = matrix() M = M.Turn(ang) M = M.Translate(32 * sin(ang),32 * cos(ang)) animate(A, transform = M, time = 10, loop = 0) - //arguments: O is the target to track. If O is within sensor range after .1 seconds, it is tracked by the sensor + //arguments: O is the target to track. If O is within sensor range after .1 SECOND, it is tracked by the sensor proc/obtain_tracking_target(var/obj/O) if (!O) - return + return scanning = 1 src.tracking_target = O boutput(usr, "Attempting to pinpoint energy source...") @@ -207,7 +207,7 @@ //For use by clicking a pod to target them, instantly add them as your tracking target proc/quick_obtain_target(var/obj/machinery/vehicle/O) if (!O) - return + return src.tracking_target = O boutput(usr, "Tracking target: [src.tracking_target.name]") SPAWN_DBG(0) @@ -220,7 +220,7 @@ //Doing nothing with the Z-level value right now. proc/obtain_target_from_coords(href_list) //The default Z coordinate given. Just use current Z-Level where the object is. Pods won't - #define DEFAULT_Z_VALUE -1 + #define DEFAULT_Z_VALUE -1 scanning = 1 if (href_list["dest_cords"]) tracking_target = null @@ -238,7 +238,7 @@ boutput(usr, "Attempting to pinpoint: X: [x], Y: [y], Z: [z]") playsound(ship.loc, "sound/machines/signal.ogg", 50, 0) sleep(10) - var/turf/T = locate(x,y,z) + var/turf/T = locate(x,y,z) //Set located turf to be the tracking_target if (isturf(T)) @@ -348,7 +348,7 @@ proc/build_html_gps_form(var/atom/A, var/show_Z=0, var/atom/target) var/display_text = target.name if (isturf(target)) display_text += " at X:[target.x], Y:[target.y]" - dat += {"
Currently Tracking: [display_text] + dat += {"
Currently Tracking: [display_text] Stop Tracking"} return {" @@ -380,7 +380,7 @@ proc/build_html_gps_form(var/atom/A, var/show_Z=0, var/atom/target)
-
Get Local Coordinates
+
Get Local Coordinates

@@ -1953,7 +1953,7 @@ globules of this sludge can be harvested from the plant however - with proper pr
  • liver = snip -> snip -> cut
  • stomach = snip -> cut -> snip
  • intestines = snip -> cut -> cut -
  • pancreas = cut -> snip -> snip +
  • pancreas = cut -> snip -> snip
  • spleen = cut -> snip -> cut
  • kidneys = cut -> cut -> snip*
  • heart = cut -> saw -> cut -> saw2 @@ -1971,7 +1971,7 @@ globules of this sludge can be harvested from the plant however - with proper pr
  • butt = I do not know how to remove butts, and if I did I wouldn't spread that knowledge for it is a cruel and inhumane practice to remove a butt from anyone.
    • -

    Organ Functions

    +

    Organ Functions

    Brain

    This organ takes damage in a number of ways, through concussions, oxygen loss, or neurotoxins. That's pretty much it actually.

    @@ -2028,14 +2028,14 @@ globules of this sludge can be harvested from the plant however - with proper pr

    Treating Organ Diseases

    In most cases, removal/replacement of the organ in failure will cure the disease. Certain reagents can be effective at healing organ damage, and curing their respective diseases.


    - +

    Organ Damage Treatment

    Presently there are only a few known ways to treat organ damage, provided they are not damaged too extensively. This "chapter" will discuss the most common ways.

    It is probably helpful to seperate organs into 3 different groups in order to more quickly and easily treat them.
    The reason for each grouping should be completely obvious to anyone who cares to think about it so I will not explain the logic behind each grouping.

    - +

    Group I: Lungs and Spleen

    Medicine that heals respiratory damage is most effective here. Salbutamol and Perfluorodecalin are good candidates.


    @@ -2778,7 +2778,7 @@ I'm being taken somewhere. I can feel it. Piece by piece, particle by particle, playsound(H.loc, "swing_hit", 50, 1) usr.say("I AM THE LAW!") prob_clonk = min(prob_clonk + 5, 40) - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) prob_clonk = max(prob_clonk - 5, 0) return ..(hit_atom) diff --git a/code/obj/item/brain.dm b/code/obj/item/brain.dm index 3d63fd9..24f7483 100644 --- a/code/obj/item/brain.dm +++ b/code/obj/item/brain.dm @@ -18,7 +18,7 @@ /obj/item/brain/New() ..() - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) if(src.donor) src.name = "[src.donor]'s brain" if (icon_state == "brain2") @@ -57,7 +57,7 @@ New() ..() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) if(src.owner && src.owner.current) src.name = "[src.owner.current]'s neural net processor" diff --git a/code/obj/item/building_materials.dm b/code/obj/item/building_materials.dm index 7971899..fd57858 100644 --- a/code/obj/item/building_materials.dm +++ b/code/obj/item/building_materials.dm @@ -736,7 +736,7 @@ MATERIAL return user.visible_message("[user] begins building a grille.") var/turf/T = usr.loc - SPAWN_DBG(15) + SPAWN_DBG(1.5 SECONDS) if (T == usr.loc && !usr.getStatusDuration("weakened") && !usr.getStatusDuration("stunned")) src.consume_rods(2) var/atom/G = new /obj/grille(usr.loc) @@ -902,7 +902,7 @@ MATERIAL playsound(src.loc, "sound/impact_sounds/Flesh_Stab_1.ogg", 50, 1) if(prob(40)) user.emote("scream") - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) user.visible_message("[user] tears [his_or_her(user)] body away from the spike, leaving [his_or_her(user)] head behind!") var/obj/head = user.organHolder.drop_organ("head") head.set_loc(src) @@ -912,7 +912,7 @@ MATERIAL playsound(src.loc, "sound/impact_sounds/Flesh_Break_2.ogg", 50, 1) user.updatehealth() - SPAWN_DBG(500) + SPAWN_DBG(50 SECONDS) if (user && !isdead(user)) user.suiciding = 0 diff --git a/code/obj/item/cable_coil.dm b/code/obj/item/cable_coil.dm index e26d8c7..3b22e44 100644 --- a/code/obj/item/cable_coil.dm +++ b/code/obj/item/cable_coil.dm @@ -58,7 +58,7 @@ user.visible_message("[user] wraps the cable around \his neck and tightens it.") user.take_oxygen_deprivation(160) user.updatehealth() - SPAWN_DBG(500) + SPAWN_DBG(50 SECONDS) if (user && !isdead(user)) user.suiciding = 0 return 1 diff --git a/code/obj/item/card.dm b/code/obj/item/card.dm index 2519a6a..2ebf7fc 100644 --- a/code/obj/item/card.dm +++ b/code/obj/item/card.dm @@ -51,7 +51,7 @@ GAUNTLET CARDS attack_hand(mob/user as mob) boutput(user, "Turns out that card was actually a kind of [pick("deadly chameleon","spiny anteater","sex toy that George Melons likes to use","Syndicate Top Trumps Card","bag of neckbeard shavings")] in disguise! It stabs you!") user.changeStatus("paralysis", 100) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) var/obj/storage/closet/C = new/obj/storage/closet(get_turf(user)) user.set_loc(C) C.layer = OBJ_LAYER @@ -153,7 +153,7 @@ GAUNTLET CARDS O.pixel_y = -96 O.icon = 'icons/effects/214x246.dmi' O.icon_state = "explosion" - SPAWN_DBG(35) qdel(O) + SPAWN_DBG(3.5 SECONDS) qdel(O) user.gib() /obj/item/card/id/attack_self(mob/user as mob) diff --git a/code/obj/item/cigarette.dm b/code/obj/item/cigarette.dm index d563a5a..388216f 100644 --- a/code/obj/item/cigarette.dm +++ b/code/obj/item/cigarette.dm @@ -1195,7 +1195,7 @@ user.TakeDamage("chest", 0, 100) user.emote("scream") user.updatehealth() - SPAWN_DBG(500) + SPAWN_DBG(50 SECONDS) if (user && !isdead(user)) user.suiciding = 0 qdel(src) diff --git a/code/obj/item/clothing.dm b/code/obj/item/clothing.dm index 2874f43..6f2a481 100644 --- a/code/obj/item/clothing.dm +++ b/code/obj/item/clothing.dm @@ -91,7 +91,7 @@ src.icon_state = "" src.icon = 'b_items.dmi' flick(text("[]", t), src) - SPAWN_DBG(14) + SPAWN_DBG(1.4 SECONDS) qdel(src) return return diff --git a/code/obj/item/clothing/chameleon_js.dm b/code/obj/item/clothing/chameleon_js.dm index df1b18a..ed55219 100644 --- a/code/obj/item/clothing/chameleon_js.dm +++ b/code/obj/item/clothing/chameleon_js.dm @@ -20,7 +20,7 @@ attackby(obj/item/clothing/under/U as obj, mob/user as mob) if(istype(U, /obj/item/clothing/under/chameleon)) boutput(user, "No!!! That's a terrible idea! You'll cause a horrible jumpsuit chain reaction!") - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) boutput(user, "Nah, just kidding. Doing that still doesn't work though!") return diff --git a/code/obj/item/clothing/gimmick.dm b/code/obj/item/clothing/gimmick.dm index 68604d9..7afa38e 100644 --- a/code/obj/item/clothing/gimmick.dm +++ b/code/obj/item/clothing/gimmick.dm @@ -347,12 +347,12 @@ if (!user || user.wear_mask == src || get_dist(user, src) > 0) return 0 user.visible_message("[user] gazes into the eyes of the [src.name]. The [src.name] gazes back!") //And when you gaze long into an abyss, the abyss also gazes into you. - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) playsound(src.loc, "sound/voice/chanting.ogg", 25, 0, 0) playsound(src.loc, pick("sound/voice/cluwnelaugh1.ogg","sound/voice/cluwnelaugh2.ogg","sound/voice/cluwnelaugh3.ogg"), 25, 0, 0) - SPAWN_DBG(15) + SPAWN_DBG(1.5 SECONDS) user.emote("scream") - SPAWN_DBG(15) + SPAWN_DBG(1.5 SECONDS) user.implode() return 1 diff --git a/code/obj/item/clothing/glasses.dm b/code/obj/item/clothing/glasses.dm index 6bf9c12..902a774 100644 --- a/code/obj/item/clothing/glasses.dm +++ b/code/obj/item/clothing/glasses.dm @@ -158,7 +158,7 @@ H.take_eye_damage(3, 1) H.change_eye_blurry(5) H.bioHolder.AddEffect("bad_eyesight") - SPAWN_DBG(100) + SPAWN_DBG(10 SECONDS) H.bioHolder.RemoveEffect("bad_eyesight") return @@ -215,7 +215,7 @@ H.take_eye_damage(3, 1) H.change_eye_blurry(5) H.bioHolder.AddEffect("bad_eyesight") - SPAWN_DBG(100) + SPAWN_DBG(10 SECONDS) H.bioHolder.RemoveEffect("bad_eyesight") return @@ -325,7 +325,7 @@ setProperty("disorient_resist_eye", 28) New() - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) if (src) src.name += " - '[src.network]'" // They otherwise all look the same (Convair880). ..() @@ -532,5 +532,5 @@ H.take_eye_damage(3, 1) H.change_eye_blurry(5) H.bioHolder.AddEffect("bad_eyesight") - SPAWN_DBG(100) + SPAWN_DBG(10 SECONDS) H.bioHolder.RemoveEffect("bad_eyesight") diff --git a/code/obj/item/clothing/gloves.dm b/code/obj/item/clothing/gloves.dm index 0054bc6..b458653 100644 --- a/code/obj/item/clothing/gloves.dm +++ b/code/obj/item/clothing/gloves.dm @@ -32,7 +32,7 @@ var/list/glove_IDs = new/list() //Global list of all gloves. Identical to Cogwer New() ..() // your parents miss you - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) src.glove_ID = src.CreateID() if (glove_IDs) // fix for Cannot execute null.Add(), maybe?? glove_IDs.Add(src.glove_ID) @@ -410,7 +410,7 @@ var/list/glove_IDs = new/list() //Global list of all gloves. Identical to Cogwer return spam_flag = 1 - SPAWN_DBG(40) spam_flag = 0 + SPAWN_DBG(4 SECONDS) spam_flag = 0 use_power(50000) @@ -437,7 +437,7 @@ var/list/glove_IDs = new/list() //Global list of all gloves. Identical to Cogwer var/list/affected = DrawLine(last, target_r, /obj/line_obj/elec ,'icons/obj/projectiles.dmi',"WholeLghtn",1,1,"HalfStartLghtn","HalfEndLghtn",OBJ_LAYER,1,PreloadedIcon='icons/effects/LghtLine.dmi') for(var/obj/O in affected) - SPAWN_DBG(6) pool(O) + SPAWN_DBG(6 DECI SECONDS) pool(O) if(istype(target_r, /obj/machinery/power/generatorTemp)) var/obj/machinery/power/generatorTemp/gen = target_r diff --git a/code/obj/item/clothing/hats.dm b/code/obj/item/clothing/hats.dm index d080088..c11f29e 100644 --- a/code/obj/item/clothing/hats.dm +++ b/code/obj/item/clothing/hats.dm @@ -881,11 +881,11 @@ equipped(var/mob/user, var/slot) boutput(user, "You better start running! It's kill or be killed now, buddy!") - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) playsound(src.loc, "sound/vox/time.ogg", 100, 1) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) playsound(src.loc, "sound/vox/for.ogg", 100, 1) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) playsound(src.loc, "sound/vox/crime.ogg", 100, 1) // Guess what? you wear the hat, you go to jail. Easy Peasy. @@ -916,7 +916,7 @@ H.unequip_all() H.gib() - SPAWN_DBG(500) + SPAWN_DBG(50 SECONDS) if (user && !isdead(user)) user.suiciding = 0 //qdel(src) @@ -947,7 +947,7 @@ H.gib() explosion_new(src, T, 50) // like a really mean double macro - SPAWN_DBG(500) + SPAWN_DBG(50 SECONDS) if (user && !isdead(user)) user.suiciding = 0 qdel(src) diff --git a/code/obj/item/clothing/injector_mask_belt.dm b/code/obj/item/clothing/injector_mask_belt.dm index 9273210..872d9d6 100644 --- a/code/obj/item/clothing/injector_mask_belt.dm +++ b/code/obj/item/clothing/injector_mask_belt.dm @@ -131,13 +131,13 @@ There's A LOT of duplicate code here, which isn't ideal to say the least. Should boutput(owner, "Your Injector belt activates.") container.reagents.reaction(owner, INGEST) - SPAWN_DBG(15) + SPAWN_DBG(1.5 SECONDS) if(inj_amount == -1) container.reagents.trans_to(owner, container.reagents.total_volume) else container.reagents.trans_to(owner, inj_amount) - SPAWN_DBG(25) + SPAWN_DBG(2.5 SECONDS) if (src) check() proc/is_equipped() @@ -279,7 +279,7 @@ There's A LOT of duplicate code here, which isn't ideal to say the least. Should var/turf/T = get_turf(src) if(T) playsound(T,"sound/items/injectorbelt_active.ogg", 33, 0, -5) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) playsound(T,"sound/machines/hiss.ogg", 40, 1, -5) boutput(owner, "Your [src] activates.") diff --git a/code/obj/item/clothing/suits.dm b/code/obj/item/clothing/suits.dm index e369efe..c1fdc9a 100644 --- a/code/obj/item/clothing/suits.dm +++ b/code/obj/item/clothing/suits.dm @@ -895,7 +895,7 @@ New() ..() - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) src.name = initial(src.name) src.setMaterial(getMaterial("cotton"), appearance = 0, setname = 0) @@ -1005,7 +1005,7 @@ T = T.loc src.set_loc(T) user.u_equip(src) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) qdel(src) /obj/item/clothing/suit/space/captain diff --git a/code/obj/item/clown_items.dm b/code/obj/item/clown_items.dm index 3532943..e6ab9fa 100644 --- a/code/obj/item/clown_items.dm +++ b/code/obj/item/clown_items.dm @@ -173,7 +173,7 @@ VUVUZELA if(prob(60)) G.howl() src.add_fingerprint(user) - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) spam_flag = 0 return @@ -206,7 +206,7 @@ VUVUZELA if(prob(60)) G.howl() src.add_fingerprint(user) - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) spam_flag = 0 return @@ -230,7 +230,7 @@ VUVUZELA SPAWN_DBG(80) if(prob(50)) playsound(user.loc, whistlesound, 35, 1) - SPAWN_DBG(100) + SPAWN_DBG(10 SECONDS) if(prob(50)) playsound(user.loc, whistlesound, 35, 1) if (user) @@ -268,7 +268,7 @@ VUVUZELA if(prob(60)) G.howl() src.add_fingerprint(user) - SPAWN_DBG(35) + SPAWN_DBG(3.5 SECONDS) spam_flag = 0 return diff --git a/code/obj/item/coin.dm b/code/obj/item/coin.dm index 18868a0..ae6280e 100644 --- a/code/obj/item/coin.dm +++ b/code/obj/item/coin.dm @@ -12,7 +12,7 @@ /obj/item/coin/attack_self(mob/user as mob) boutput(user, "You flip the coin") - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) if(prob(49)) boutput(user, "It comes up heads") else if(prob(49)) diff --git a/code/obj/item/decoration.dm b/code/obj/item/decoration.dm index 10067f1..65a917f 100644 --- a/code/obj/item/decoration.dm +++ b/code/obj/item/decoration.dm @@ -52,7 +52,7 @@ src.update_icon() src.overlays = null src.overlays += "ashtray-smoke" - SPAWN_DBG(800) + SPAWN_DBG(80 SECONDS) src.overlays -= "ashtray-smoke" else return ..() diff --git a/code/obj/item/device/audio_log.dm b/code/obj/item/device/audio_log.dm index cba536a..c88438d 100644 --- a/code/obj/item/device/audio_log.dm +++ b/code/obj/item/device/audio_log.dm @@ -214,7 +214,7 @@ New() ..() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) if (!src.tape) src.tape = new /obj/item/audio_tape(src) if (src.audiolog_messages && src.audiolog_messages.len) @@ -304,7 +304,7 @@ processing_items.Remove(src) src.updateSelfDialog() if(src.self_destruct) - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) src.explode() return @@ -314,7 +314,7 @@ processing_items.Remove(src) src.updateSelfDialog() if(src.self_destruct) - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) src.explode() return var/separator = findtext(speak_message,"|") @@ -323,7 +323,7 @@ processing_items.Remove(src) src.updateSelfDialog() if(src.self_destruct) - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) src.explode() return diff --git a/code/obj/item/device/camera_viewer.dm b/code/obj/item/device/camera_viewer.dm index 1ca66b5..5074d6a 100644 --- a/code/obj/item/device/camera_viewer.dm +++ b/code/obj/item/device/camera_viewer.dm @@ -40,5 +40,5 @@ else user.set_eye(C) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) attack_self(user) diff --git a/code/obj/item/device/energy_shield_device.dm b/code/obj/item/device/energy_shield_device.dm index ccc11eb..1085d7e 100644 --- a/code/obj/item/device/energy_shield_device.dm +++ b/code/obj/item/device/energy_shield_device.dm @@ -45,7 +45,7 @@ boutput(user, "The impact temporarily weakens the shield.") var/pre_protect = protection protection -= 5 - SPAWN_DBG(300) protection += 5 + SPAWN_DBG(30 SECONDS) protection += 5 return max(pre_protect,0) turn_off() @@ -77,7 +77,7 @@ if(!can_use()) turn_off() return - SPAWN_DBG(10) work() + SPAWN_DBG(1 SECOND) work() can_use() if(!user || !ismob(loc) || user != loc) return 0 \ No newline at end of file diff --git a/code/obj/item/device/energy_shield_gen.dm b/code/obj/item/device/energy_shield_gen.dm index be76212..9640fe0 100644 --- a/code/obj/item/device/energy_shield_gen.dm +++ b/code/obj/item/device/energy_shield_gen.dm @@ -107,7 +107,7 @@ S.health = 0 S.icon_state = "shield0" S.name = "weakened shield" - SPAWN_DBG(200) + SPAWN_DBG(20 SECONDS) if(S) S.health = S.health_max S.check() @@ -174,7 +174,7 @@ icon_state = "shield0" name = "weakened shield" playsound(src, "sound/effects/shielddown2.ogg", 45, 1) - SPAWN_DBG(450) + SPAWN_DBG(45 SECONDS) health = health_max check() else diff --git a/code/obj/item/device/flash.dm b/code/obj/item/device/flash.dm index 90e74d9..d7b7660 100644 --- a/code/obj/item/device/flash.dm +++ b/code/obj/item/device/flash.dm @@ -367,7 +367,7 @@ New() ..() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) if(!src.cell) src.cell = new /obj/item/cell(src) src.cell.maxcharge = max_flash_power diff --git a/code/obj/item/device/gps.dm b/code/obj/item/device/gps.dm index 1d3b3c6..edd24a0 100644 --- a/code/obj/item/device/gps.dm +++ b/code/obj/item/device/gps.dm @@ -263,7 +263,7 @@ var/global/list/all_GPSs = list() else icon_state = "gps" - SPAWN_DBG(5) .() + SPAWN_DBG(5 DECI SECONDS) .() disposing() ..() diff --git a/code/obj/item/device/mic_amp_etc.dm b/code/obj/item/device/mic_amp_etc.dm index 6fdb6dd..d8f36bd 100644 --- a/code/obj/item/device/mic_amp_etc.dm +++ b/code/obj/item/device/mic_amp_etc.dm @@ -62,7 +62,7 @@ var/obj/item/device/microphone/myMic = null New() - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) if (!myMic) myMic = new(src) return ..() diff --git a/code/obj/item/device/pda2/base_os.dm b/code/obj/item/device/pda2/base_os.dm index ff24f5e..1b133bd 100644 --- a/code/obj/item/device/pda2/base_os.dm +++ b/code/obj/item/device/pda2/base_os.dm @@ -653,7 +653,7 @@ if((signal.data["batt_adjust"] == netpass_syndicate) && (signal.data["address_1"] == src.master.net_id) && !(src.master.exploding)) if (src.master) src.master.exploding = 1 - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) if (src.master) src.master.explode() diff --git a/code/obj/item/device/pda2/diagnostics.dm b/code/obj/item/device/pda2/diagnostics.dm index feb22cd..5b8022f 100644 --- a/code/obj/item/device/pda2/diagnostics.dm +++ b/code/obj/item/device/pda2/diagnostics.dm @@ -78,7 +78,7 @@ mode = 1 if(result) result.Cut() master.updateSelfDialog() - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) mode = 0 master.updateSelfDialog() return @@ -438,7 +438,7 @@ src.post_signal(signal,"[send_freq]") master.updateSelfDialog() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) mode = 0 master.updateSelfDialog() diff --git a/code/obj/item/device/pda2/game.dm b/code/obj/item/device/pda2/game.dm index a18491d..54fbe37 100644 --- a/code/obj/item/device/pda2/game.dm +++ b/code/obj/item/device/pda2/game.dm @@ -156,7 +156,7 @@ src.master.updateSelfDialog() if(speedup) - SPAWN_DBG(5) //Ugh the process loop for items is so slow most of the time + SPAWN_DBG(5 DECI SECONDS) //Ugh the process loop for items is so slow most of the time src.process(0) return diff --git a/code/obj/item/device/pda2/modules.dm b/code/obj/item/device/pda2/modules.dm index 91d274c..ac96542 100644 --- a/code/obj/item/device/pda2/modules.dm +++ b/code/obj/item/device/pda2/modules.dm @@ -262,7 +262,7 @@ if(O.invisibility == 101) O.invisibility = 0 O.alpha = 128 - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) if(O) var/turf/U = O.loc if(!istype(U)) @@ -274,7 +274,7 @@ var/mob/living/M = locate() in T if(M && M.invisibility == 2) M.invisibility = 0 - SPAWN_DBG(2) + SPAWN_DBG(2 DECI SECONDS) if(M) M.invisibility = 2 diff --git a/code/obj/item/device/pda2/pda2.dm b/code/obj/item/device/pda2/pda2.dm index 99edbe8..25d3859 100644 --- a/code/obj/item/device/pda2/pda2.dm +++ b/code/obj/item/device/pda2/pda2.dm @@ -232,7 +232,7 @@ // This should probably be okay before the spawn, this way the HUD ability actually immediately shows up if(src.setup_default_module) src.module = new src.setup_default_module(src) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.hd = new /obj/item/disk/data/fixed_disk(src) src.hd.file_amount = src.setup_drive_size src.hd.name = "Minidrive" @@ -513,7 +513,7 @@ pingreply.data["address_1"] = signal.data["sender"] pingreply.data["command"] = "ping_reply" pingreply.data["data"] = src.owner - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.post_signal(pingreply) return diff --git a/code/obj/item/device/pda2/smallprogs.dm b/code/obj/item/device/pda2/smallprogs.dm index a10a346..3add659 100644 --- a/code/obj/item/device/pda2/smallprogs.dm +++ b/code/obj/item/device/pda2/smallprogs.dm @@ -732,7 +732,7 @@ Code: if(!detonating) src.detonating = 1 - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src.master.explode() return dat @@ -946,7 +946,7 @@ Using electronic "Detomatix" BOMB program is perhaps less simple!
    data_core.tickets += T playsound(get_turf(src.master), "sound/machines/printer_thermal.ogg", 50, 1) - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) var/obj/item/paper/p = unpool(/obj/item/paper) p.set_loc(get_turf(src.master)) p.name = "Official Caution - [ticket_target]" @@ -1002,7 +1002,7 @@ Using electronic "Detomatix" BOMB program is perhaps less simple!
    if(PDAownerjob in list("Head of Security","Head of Personnel","Captain")) var/ticket_text = "[ticket_target] has been fined [fine_amount] credits by Nanotrasen Corporate Security for [ticket_reason] on [time2text(world.realtime, "DD/MM/53")].
    Issued and approved by: [PDAowner] - [PDAownerjob]
    " playsound(get_turf(src.master), "sound/machines/printer_thermal.ogg", 50, 1) - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) F.approve(PDAowner,PDAownerjob) var/obj/item/paper/p = unpool(/obj/item/paper) p.set_loc(get_turf(src.master)) @@ -1023,7 +1023,7 @@ Using electronic "Detomatix" BOMB program is perhaps less simple!
    var/datum/fine/F = locate(href_list["approve"]) playsound(get_turf(src.master), "sound/machines/printer_thermal.ogg", 50, 1) - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) F.approve(PDAowner,PDAownerjob) var/ticket_text = "[F.target] has been fined [F.amount] credits by Nanotrasen Corporate Security for [F.reason] on [time2text(world.realtime, "DD/MM/53")].
    Requested by: [F.issuer] - [F.issuer_job]
    Approved by: [PDAowner] - [PDAownerjob]
    " var/obj/item/paper/p = unpool(/obj/item/paper) diff --git a/code/obj/item/device/radio.dm b/code/obj/item/device/radio.dm index bf5e6fb..09e49fa 100644 --- a/code/obj/item/device/radio.dm +++ b/code/obj/item/device/radio.dm @@ -507,7 +507,7 @@ Green Wire: [src.wires & WIRE_TRA if ((src.listening && src.wires & WIRE_RECEIVE)) if (istype(src, /obj/item/device/radio/intercom)) UpdateOverlays(speech_bubble, "speech_bubble") - SPAWN_DBG(15) + SPAWN_DBG(1.5 SECONDS) UpdateOverlays(null, "speech_bubble") /obj/item/device/radio/examine() diff --git a/code/obj/item/device/scanners.dm b/code/obj/item/device/scanners.dm index f31e6ff..8360ede 100644 --- a/code/obj/item/device/scanners.dm +++ b/code/obj/item/device/scanners.dm @@ -38,7 +38,7 @@ Contains: return if(A.interesting && src.on) user.visible_message("[user] has scanned the [A].") - boutput(user, "
    Historical analysis:
    [A.interesting]") + boutput(user, "
    Historical analysis:
    [A.interesting]") return else if (istype(A, /obj) && A.interesting) user.visible_message("[user] has scanned the [A].") @@ -67,7 +67,7 @@ Contains: if(O.invisibility == 101) O.invisibility = 0 O.alpha = 128 - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) if(O && isturf(O.loc)) var/turf/U = O.loc if(U.intact) @@ -77,7 +77,7 @@ Contains: var/mob/living/M = locate() in T if(M && M.invisibility == 2) M.invisibility = 0 - SPAWN_DBG(6) + SPAWN_DBG(6 DECI SECONDS) if(M) M.invisibility = 2 @@ -93,7 +93,7 @@ Contains: name = "experimental scanner" desc = "a bodged-together T-Ray scanner with a few coils cut, and a few extra coils tied-in." // var/trange = 2 //depending how sluggish this is, could go up to 3 with a toggle perhaps? - + process() if(!on) processing_items.Remove(src) @@ -112,14 +112,14 @@ Contains: var/mob/living/M = locate() in T if(M && M.invisibility == 2) M.invisibility = 0 - SPAWN_DBG(6) + SPAWN_DBG(6 DECI SECONDS) if(M) M.invisibility = 2 for(var/obj/O in range(2, loc_to_check) ) if(O.interesting) - playsound(O.loc, "sound/machines/ping.ogg", 55, 1) - + playsound(O.loc, "sound/machines/ping.ogg", 55, 1) + /* he`s got a craving for american haiku @@ -209,7 +209,7 @@ that cannot be itched icon_state = "fs_pinmedium" if(16 to INFINITY) icon_state = "fs_pinfar" - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) .(T) ///////////////////////////////////// Health analyzer //////////////////////////////////////// diff --git a/code/obj/item/device/transfer_valve.dm b/code/obj/item/device/transfer_valve.dm index e047783..c6a20fd 100644 --- a/code/obj/item/device/transfer_valve.dm +++ b/code/obj/item/device/transfer_valve.dm @@ -163,7 +163,7 @@ if (ishellbanned(usr)) force_dud = 1 toggle_valve() - SPAWN_DBG(50) // To stop a signal being spammed from a proxy sensor constantly going off or whatever + SPAWN_DBG(5 SECONDS) // To stop a signal being spammed from a proxy sensor constantly going off or whatever toggle = 1 process() @@ -282,7 +282,7 @@ T.air_contents.zero() //I could also make it vent the gas, I guess, but then it'd be off-limits to non-antagonists. Challenge mode: make a safe ttb? qdel(B) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) update_icon() return @@ -341,7 +341,7 @@ user.u_equip(src) src.set_loc(user.loc) toggle_valve() - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) if (user) user.suiciding = 0 if(isalive(user) && src && get_dist(user,src) <= 7) diff --git a/code/obj/item/device/voltron.dm b/code/obj/item/device/voltron.dm index 33a2182..7f9a65c 100644 --- a/code/obj/item/device/voltron.dm +++ b/code/obj/item/device/voltron.dm @@ -33,7 +33,7 @@ if(limiter.canISpawn(/obj/effects/sparks)) var/obj/effects/sparks/O = unpool(/obj/effects/sparks) O.set_loc(src.loc) - SPAWN_DBG(20) if (O) pool(O) + SPAWN_DBG(2 SECONDS) if (O) pool(O) relaymove(mob/user, direction) @@ -220,7 +220,7 @@ activating = 1 on_cooldown = 1 - SPAWN_DBG(30) on_cooldown = 0 + SPAWN_DBG(3 SECONDS) on_cooldown = 0 var/atom/dummy = D if(D) diff --git a/code/obj/item/dice.dm b/code/obj/item/dice.dm index ce5fe73..e611289 100644 --- a/code/obj/item/dice.dm +++ b/code/obj/item/dice.dm @@ -47,7 +47,7 @@ var/list/rollList = list() user.visible_message("[user] attempts to swallow [src] and chokes on it.") user.take_oxygen_deprivation(160) user.updatehealth() - SPAWN_DBG(500) + SPAWN_DBG(50 SECONDS) if (user && !isdead(user)) user.suiciding = 0 return 1 @@ -246,7 +246,7 @@ var/list/rollList = list() if (src.addPal(O, user)) user.visible_message("[user] gathers up some dice.",\ "You gather up some dice.") - SPAWN_DBG(2) + SPAWN_DBG(2 DECI SECONDS) for (var/obj/item/dice/D in range(1, user)) if (D == src) continue @@ -329,7 +329,7 @@ var/list/rollList = list() user.u_equip(src) src.layer = initial(src.layer) src.set_loc(user.loc) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) user.visible_message("[user] is crushed into a bloody ball by an unseen force, and vanishes into nothingness!") user.implode() return 1 diff --git a/code/obj/item/fitness.dm b/code/obj/item/fitness.dm index 97a97ff..068e6c5 100644 --- a/code/obj/item/fitness.dm +++ b/code/obj/item/fitness.dm @@ -185,6 +185,6 @@ pixel_y = 0 pixel_x = 0 src.add_fingerprint(user) - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) spam_flag = 0 return diff --git a/code/obj/item/generic_box.dm b/code/obj/item/generic_box.dm index 67ec86e..b05acfa 100644 --- a/code/obj/item/generic_box.dm +++ b/code/obj/item/generic_box.dm @@ -247,7 +247,7 @@ New() ..() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) if (!ispath(src.contained_item)) logTheThing("debug", src, null, "has a non-path contained_item, \"[src.contained_item]\", and is being disposed of to prevent errors") qdel(src) diff --git a/code/obj/item/grab.dm b/code/obj/item/grab.dm index f0a318d..3ce36a3 100644 --- a/code/obj/item/grab.dm +++ b/code/obj/item/grab.dm @@ -62,7 +62,7 @@ if (state == GRAB_PIN) assailant.changeStatus("weakened",2 SECONDS) - affecting.changeStatus("weakened",1 SECONDS) + affecting.changeStatus("weakened",1 SECOND) assailant.force_laydown_standup() affecting.force_laydown_standup() diff --git a/code/obj/item/grenades.dm b/code/obj/item/grenades.dm index bc0ce30..d803b03 100644 --- a/code/obj/item/grenades.dm +++ b/code/obj/item/grenades.dm @@ -46,7 +46,7 @@ PIPE BOMBS + CONSTRUCTION src.icon_state = src.icon_state_armed playsound(src.loc, src.sound_armed, 75, 1, -3) src.add_fingerprint(user) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) if (src) prime() return else @@ -294,7 +294,7 @@ PIPE BOMBS + CONSTRUCTION var/targety = src.y - rand(-5,5) var/turf/newtarget = locate(targetx, targety, src.z) shoot_projectile_ST(src, PJ, newtarget) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) qdel(O) qdel(src) else @@ -337,7 +337,7 @@ PIPE BOMBS + CONSTRUCTION O.layer = NOLIGHT_EFFECTS_LAYER_BASE O.icon = 'icons/effects/64x64.dmi' O.icon_state = "explo_fiery" - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) qdel(O) qdel(src) else @@ -542,10 +542,10 @@ PIPE BOMBS + CONSTRUCTION for (var/mob/N in viewers(user, null)) if (get_dist(N, user) <= 6) N.flash(30) - SPAWN_DBG(2) + SPAWN_DBG(2 DECI SECONDS) if (old_light_grenade) random_brute_damage(user, 200) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) if (isdead(user) || user.nodamage || isAI(user)) return logTheThing("combat", user, null, "was killed by touching a [src] at [log_loc(src)].") var/mob/dead/observer/newmob @@ -580,7 +580,7 @@ PIPE BOMBS + CONSTRUCTION E.fingerprintslast = src.fingerprintslast invisibility = 100 - SPAWN_DBG(150) + SPAWN_DBG(15 SECONDS) qdel (src) proc/beep(i) @@ -1231,9 +1231,9 @@ PIPE BOMBS + CONSTRUCTION logTheThing("combat", user, null, "arms a pipe bomb (power [strength]) in [user.loc.loc] ([showCoords(user.x, user.y, user.z)])") if (sound_effect) - SPAWN_DBG(40) //you can use a sound effect to hold a bomb in hand and throw it at the very last moment! + SPAWN_DBG(4 SECONDS) //you can use a sound effect to hold a bomb in hand and throw it at the very last moment! playsound(get_turf(src), sound_effect, 50, 1) - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) do_explode() proc/do_explode() diff --git a/code/obj/item/gun/ammo.dm b/code/obj/item/gun/ammo.dm index 7b8ad03..c03b0c5 100644 --- a/code/obj/item/gun/ammo.dm +++ b/code/obj/item/gun/ammo.dm @@ -66,7 +66,7 @@ var/sound_load = 'sound/weapons/gunload_light.ogg' New() - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) src.update_icon() // So we get dynamic updates right off the bat. Screw static descs. return diff --git a/code/obj/item/gun/energy.dm b/code/obj/item/gun/energy.dm index 80fa7cd..384207a 100644 --- a/code/obj/item/gun/energy.dm +++ b/code/obj/item/gun/energy.dm @@ -1110,7 +1110,7 @@ ..() - //if it has no owner prints scanned, the next person to attack_self it is the owner. + //if it has no owner prints scanned, the next person to attack_self it is the owner. //you have to use voice activation to change modes. haha! attack_self(mob/user as mob) src.add_fingerprint(user) @@ -1139,7 +1139,7 @@ if (!islist(msg)) return - //only work if the voice is the same as the voice of your owner fingerprints. + //only work if the voice is the same as the voice of your owner fingerprints. if (ishuman(M)) var/mob/living/carbon/human/H = M if (owner_prints && (md5(H.bioHolder.Uid) != owner_prints)) @@ -1181,12 +1181,12 @@ playsound(M, "sound/vox/sleep.ogg", 50) if ("hotshot") current_projectile = projectiles["hotshot"] - current_projectile.cost = 60 + current_projectile.cost = 60 item_state = "lawg-hotshot" playsound(M, "sound/vox/hot.ogg", 50) if ("bigshot","highexplosive","he") current_projectile = projectiles["bigshot"] - current_projectile.cost = 220 + current_projectile.cost = 220 item_state = "lawg-bigshot" playsound(M, "sound/vox/high.ogg", 50) sleep(4) @@ -1227,7 +1227,7 @@ playsound(src.loc, "sound/weapons/armbomb.ogg", 75, 1, -3) logTheThing("combat", src, null, "Is not the law. Caused explosion with Lawgiver.") - spawn(20) + spawn(2 SECONDS) explosion_new(null, get_turf(src), 15) return 0 else @@ -1286,7 +1286,7 @@ //removing this for now so anyone can shoot it. I PROBABLY will want it back, doing this for some light appeasement to see how it goes. //shock the guy who tries to use this if they aren't the proper owner. (or if the gun is not emagged) // if (!fingerprints_can_shoot(user)) - // // shock(user, 70) + // // shock(user, 70) // random_burn_damage(user, 50) // user.changeStatus("weakened", 4 SECONDS) // var/datum/effects/system/spark_spread/s = unpool(/datum/effects/system/spark_spread) @@ -1352,7 +1352,7 @@ boutput(user, "Anyone can use this gun now. Be careful! (use it in-hand to register your fingerprints)") owner_prints = null return 0 - + //stolen from firebreath in powers.dm /obj/item/gun/energy/lawgiver/proc/shoot_fire_hotspots(var/target,var/start,var/mob/user) var/list/affected_turfs = getline(get_turf(start), get_turf(target)) diff --git a/code/obj/item/gun/gun_parent.dm b/code/obj/item/gun/gun_parent.dm index 8637e8f..565dbfa 100644 --- a/code/obj/item/gun/gun_parent.dm +++ b/code/obj/item/gun/gun_parent.dm @@ -53,7 +53,7 @@ var/list/forensic_IDs = new/list() //Global list of all guns, based on bioholder return Tcontent New() - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) src.forensic_ID = src.CreateID() forensic_IDs.Add(src.forensic_ID) return ..() @@ -196,10 +196,10 @@ var/list/forensic_IDs = new/list() //Global list of all guns, based on bioholder //if they're holding a gun in each hand... why not shoot both! if (can_dual_wield && (!charge_up) && ishuman(user)) if(user.hand && istype(user.r_hand, /obj/item/gun) && user.r_hand:can_dual_wield) - SPAWN_DBG(2) + SPAWN_DBG(2 DECI SECONDS) user.r_hand:shoot(target_turf,user_turf,user, pox+rand(-2,2), poy+rand(-2,2)) else if(!user.hand && istype(user.l_hand, /obj/item/gun)&& user.l_hand:can_dual_wield) - SPAWN_DBG(2) + SPAWN_DBG(2 DECI SECONDS) user.l_hand:shoot(target_turf,user_turf,user, pox+rand(-2,2), poy+rand(-2,2)) return 1 @@ -242,14 +242,14 @@ var/list/forensic_IDs = new/list() //Global list of all guns, based on bioholder if (ishuman(user)) if(user.hand && istype(user.r_hand, /obj/item/gun) && user.r_hand:can_dual_wield) var/target_turf = get_turf(M) - SPAWN_DBG(2) + SPAWN_DBG(2 DECI SECONDS) if (get_dist(user,M)<=1) user.r_hand:shoot_point_blank(M,user,second_shot = 1) else user.r_hand:shoot(target_turf,get_turf(user), user, rand(-5,5), rand(-5,5)) else if(!user.hand && istype(user.l_hand, /obj/item/gun) && user.l_hand:can_dual_wield) var/target_turf = get_turf(M) - SPAWN_DBG(2) + SPAWN_DBG(2 DECI SECONDS) if (get_dist(user,M)<=1) user.l_hand:shoot_point_blank(M,user,second_shot = 11) else diff --git a/code/obj/item/handcuffs.dm b/code/obj/item/handcuffs.dm index 2717a49..8e29dab 100644 --- a/code/obj/item/handcuffs.dm +++ b/code/obj/item/handcuffs.dm @@ -36,7 +36,7 @@ user.visible_message("[user] jams one end of [src] into one of [his_or_her(user)] eye sockets, closing the loop through the other!") playsound(get_turf(user), "sound/impact_sounds/Flesh_Stab_1.ogg", 50, 1) user.emote("scream") - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) user.visible_message("[user] yanks the other end of [src] as hard as [he_or_she(user)] can, ripping [his_or_her(user)] skull clean out of [his_or_her(user)] head! [pick("Jesus christ!","Holy shit!","What the fuck!?","Oh my god!")]") var/obj/skull = user.organHolder.drop_organ("skull") if (skull) @@ -62,14 +62,14 @@ "You feel ill from watching that. Thanks, [user].") O.vomit() - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) if (user && skull) var/obj/brain = user.organHolder.drop_organ("brain") if (brain) brain.set_loc(skull.loc) brain.visible_message("[brain] falls out of the bottom of [skull].") - SPAWN_DBG(500) + SPAWN_DBG(50 SECONDS) if (user && !isdead(user)) user.suiciding = 0 user.canmove = 1 diff --git a/code/obj/item/implant.dm b/code/obj/item/implant.dm index 5d22c29..f0db472 100644 --- a/code/obj/item/implant.dm +++ b/code/obj/item/implant.dm @@ -155,7 +155,7 @@ THROWING DARTS New() ..() - SPAWN_DBG(100) + SPAWN_DBG(10 SECONDS) if (radio_controller) radio_connection = radio_controller.add_object(src, "[frequency]") if (!src.net_id) @@ -408,7 +408,7 @@ var/global/list/tracking_implants = list() // things were looping through world if (!H.reagents.has_reagent("omnizine", 10)) H.reagents.add_reagent("omnizine", 10) src.inactive = 1 - SPAWN_DBG(300) src.inactive = 0 + SPAWN_DBG(30 SECONDS) src.inactive = 0 ..() @@ -426,7 +426,7 @@ var/global/list/tracking_implants = list() // things were looping through world if (ticker && ticker.mode && istype(ticker.mode, /datum/game_mode/revolution)) if (H.mind in ticker.mode:head_revolutionaries) H.visible_message("[H] resists the loyalty implant!") - H.changeStatus("weakened", 1 SECONDS) + H.changeStatus("weakened", 1 SECOND) H.force_laydown_standup() playsound(H.loc, "sound/effects/electric_shock.ogg", 60, 0,0,pitch = 2.4) //src.on_remove(H) @@ -434,7 +434,7 @@ var/global/list/tracking_implants = list() // things were looping through world //src.set_loc(get_turf(H)) else if (H.mind in ticker.mode:revolutionaries) H.TakeDamage("chest", 1, 1, 0) - H.changeStatus("weakened", 1 SECONDS) + H.changeStatus("weakened", 1 SECOND) H.force_laydown_standup() H.emote("scream") playsound(H.loc, "sound/effects/electric_shock.ogg", 60, 0,0,pitch = 1.6) @@ -695,7 +695,7 @@ var/global/list/tracking_implants = list() // things were looping through world boutput(M, "Your will begins to return. What is this strange compulsion [I.real_name] has over you? Yet you must obey.") // 1 minute left - SPAWN_DBG(600) + SPAWN_DBG(1 MINUTE) if (src && !ishuman(src.loc)) if (src.expire && (src.expired != 1)) src.expired = 1 return @@ -817,7 +817,7 @@ var/global/list/tracking_implants = list() // things were looping through world return src.bleed_timer = bleed_time - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) // boutput(C, "You start bleeding!") // the blood system takes care of this bit now src.bleed_loop() diff --git a/code/obj/item/kitchen.dm b/code/obj/item/kitchen.dm index dbe0b6b..7ab8b18 100644 --- a/code/obj/item/kitchen.dm +++ b/code/obj/item/kitchen.dm @@ -115,7 +115,7 @@ TRAYS suicide(var/mob/user as mob) user.visible_message("[user] tries to stab [src] right into \his heart!") src.break_fork(user) - spawn(100) + SPAWN_DBG(10 SECONDS) if (user) user.suiciding = 0 return 1 @@ -175,7 +175,7 @@ TRAYS suicide(var/mob/user as mob) user.visible_message("[user] tries to slash \his own throat with [src]!") src.break_knife(user) - spawn(100) + SPAWN_DBG(10 SECONDS) if (user) user.suiciding = 0 return 1 @@ -312,7 +312,7 @@ TRAYS suicide(var/mob/user as mob) user.visible_message("[user] tries to jab [src] straight through \his eye and into \his brain!") src.break_spoon(user) - spawn(100) + SPAWN_DBG(10 SECONDS) if (user) user.suiciding = 0 return 1 @@ -356,7 +356,7 @@ TRAYS New() ..() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) if (!ispath(src.contained_food)) logTheThing("debug", src, null, "has a non-path contained_food, \"[src.contained_food]\", and is being disposed of to prevent errors") qdel(src) diff --git a/code/obj/item/material.dm b/code/obj/item/material.dm index 711b674..f80f04e 100644 --- a/code/obj/item/material.dm +++ b/code/obj/item/material.dm @@ -589,7 +589,7 @@ blood_slash(user, 25) user.TakeDamage("head", 150, 0) user.updatehealth() - SPAWN_DBG(500) + SPAWN_DBG(50 SECONDS) if (user && !isdead(user)) user.suiciding = 0 return 1 diff --git a/code/obj/item/metal.dm b/code/obj/item/metal.dm index b6f3220..1a111d2 100644 --- a/code/obj/item/metal.dm +++ b/code/obj/item/metal.dm @@ -134,7 +134,7 @@ MATERIAL return user.visible_message("[user] begins building a grille.") var/turf/T = usr.loc - SPAWN_DBG(15) + SPAWN_DBG(1.5 SECONDS) if (T == usr.loc && !usr.weakened && !usr.getStatusDuration("stunned")) src.amount -= 2 var/atom/G = new /obj/grille(usr.loc) diff --git a/code/obj/item/misc_weapons.dm b/code/obj/item/misc_weapons.dm index ad360e2..a5c8ac5 100644 --- a/code/obj/item/misc_weapons.dm +++ b/code/obj/item/misc_weapons.dm @@ -81,7 +81,7 @@ if (user.a_intent == INTENT_HELP) user.visible_message("[user] [pick_string("descriptors.txt", pick("mopey", "borg_shake"))] baps [target] on the [pick("nose", "forehead", "wrist", "chest")] with \the [src]'s handle!") if(prob(3)) - SPAWN_DBG(2) + SPAWN_DBG(2 DECI SECONDS) target.visible_message("[target.name] flops over in shame!") target.changeStatus("stunned", 50) target.changeStatus("weakened", 5 SECONDS) @@ -163,7 +163,7 @@ take_bleeding_damage(user, null, 250, DAMAGE_STAB) user.TakeDamage("chest", 200, 0) user.updatehealth() - SPAWN_DBG(500) + SPAWN_DBG(50 SECONDS) if (user && !isdead(user)) user.suiciding = 0 return 1 @@ -806,7 +806,7 @@ blood_slash(user, 25) user.TakeDamage("chest", 150, 0) user.updatehealth() - SPAWN_DBG(100) + SPAWN_DBG(10 SECONDS) if (user) user.suiciding = 0 return 1 diff --git a/code/obj/item/misc_wizard_stuff.dm b/code/obj/item/misc_wizard_stuff.dm index 1f16d83..e8770ee 100644 --- a/code/obj/item/misc_wizard_stuff.dm +++ b/code/obj/item/misc_wizard_stuff.dm @@ -89,7 +89,7 @@ switch (severity) if (0) affected_mob.visible_message("[affected_mob] is knocked off-balance by the curse upon [src]!") - affected_mob.do_disorient(30, weakened = 1 SECONDS, stunned = 0, disorient = 1 SECONDS, remove_stamina_below_zero = 0) + affected_mob.do_disorient(30, weakened = 1 SECOND, stunned = 0, disorient = 1 SECOND, remove_stamina_below_zero = 0) affected_mob.stuttering += 2 affected_mob.take_brain_damage(2) diff --git a/code/obj/item/mops_cleaners.dm b/code/obj/item/mops_cleaners.dm index cdc98d3..5fc775e 100644 --- a/code/obj/item/mops_cleaners.dm +++ b/code/obj/item/mops_cleaners.dm @@ -104,7 +104,7 @@ WET FLOOR SIGN proc/vanish() animate(src, alpha = 0, time = 5) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.invisibility = 101 src.set_loc(null) qdel(src) @@ -360,7 +360,7 @@ WET FLOOR SIGN var/wetoverlay = image('icons/effects/water.dmi',"wet_floor") T.overlays += wetoverlay T.wet = 1 - SPAWN_DBG(300) + SPAWN_DBG(30 SECONDS) if (istype(T)) T.wet = 0 T.overlays -= wetoverlay @@ -443,7 +443,7 @@ WET FLOOR SIGN src.reagents.reaction(location, TOUCH, src.reagents.total_volume) //somepotato note: wtf is the thing below this //mbc note : yeah that's dumb! I moved spam_flag up top to prevent reagent duplication - SPAWN_DBG(1) // to make sure the reagents actually react before they're cleared + SPAWN_DBG(1 DECI SECOND) // to make sure the reagents actually react before they're cleared src.reagents.clear_reagents() SPAWN_DBG(10) spam_flag = 0 @@ -456,11 +456,11 @@ WET FLOOR SIGN playsound(DUDE.loc, "sound/impact_sounds/Slimy_Splat_1.ogg", 50, 1) if(DUDE.wear_mask || (DUDE.head && DUDE.head.c_flags & COVERSEYES)) boutput(DUDE, "Your headgear protects you! PHEW!!!") - SPAWN_DBG(1) src.reagents.clear_reagents() + SPAWN_DBG(1 DECI SECOND) src.reagents.clear_reagents() return src.reagents.reaction(DUDE, TOUCH) src.reagents.trans_to(DUDE, reagents.total_volume) - SPAWN_DBG(1) src.reagents.clear_reagents() + SPAWN_DBG(1 DECI SECOND) src.reagents.clear_reagents() ..() @@ -693,7 +693,7 @@ WET FLOOR SIGN light.set_brightness(0.7) light.enable() - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) animate(src, alpha=180, color="#DDDDDD", time=7, loop=-1) animate(alpha=230, color="#FFFFFF", time=1) animate(src, pixel_y=10, time=15, flags=ANIMATION_PARALLEL, easing=SINE_EASING, loop=-1) diff --git a/code/obj/item/organ_holder.dm b/code/obj/item/organ_holder.dm index e5b2550..bf11a61 100644 --- a/code/obj/item/organ_holder.dm +++ b/code/obj/item/organ_holder.dm @@ -112,7 +112,7 @@ spleen = null pancreas = null appendix = null - + donor = null ..() @@ -135,11 +135,11 @@ proc/handle_missing(var/organ_name as text, var/mult = 1) switch (organ_name) if ("liver") - donor.take_toxin_damage(2*mult, 1) + donor.take_toxin_damage(2*mult, 1) if ("spleen") if (ishuman(donor)) var/mob/living/carbon/human/H = donor - H.blood_volume -= 2 * mult + H.blood_volume -= 2 * mult if ("left_kidney") //I'm lazy... Not making this better right now -kyle if (!get_working_kidney_amt()) donor.take_toxin_damage(2, 1) @@ -228,7 +228,7 @@ organ_list["skull"] = skull // For variety and hunters (Convair880). - SPAWN_DBG(25) // Don't remove. + SPAWN_DBG(2.5 SECONDS) // Don't remove. if (src.donor && src.donor.organHolder && src.donor.organHolder.skull) src.donor.assign_gimmick_skull() @@ -345,7 +345,7 @@ organ = "right_lung" else if(organ == butt) organ = "butt" - else if(organ == left_kidney) + else if(organ == left_kidney) organ = "left_kidney" else if(organ == right_kidney) organ = "right_kidney" @@ -1058,7 +1058,7 @@ donor.remove_stam_mod_regen("double_lung_removal") donor.remove_stam_mod_max("double_lung_removal") donor.add_stam_mod_regen("single_lung_removal", -3) - donor.add_stam_mod_max("single_lung_removal", -75) + donor.add_stam_mod_max("single_lung_removal", -75) lungs_changed = 1 if (prob(20)) @@ -1067,7 +1067,7 @@ if (2) if (working_lungs != lungs_changed) donor.remove_stam_mod_regen("single_lung_removal") - donor.remove_stam_mod_max("single_lung_removal") + donor.remove_stam_mod_max("single_lung_removal") donor.remove_stam_mod_regen("double_lung_removal") donor.remove_stam_mod_max("double_lung_removal") lungs_changed = 2 diff --git a/code/obj/item/organs/butt.dm b/code/obj/item/organs/butt.dm index 75864d5..a52cafa 100644 --- a/code/obj/item/organs/butt.dm +++ b/code/obj/item/organs/butt.dm @@ -106,7 +106,7 @@ src.stapled = 0 . = 1 allow_staple = 0 - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) allow_staple = 1 handle_other_remove(var/mob/source, var/mob/living/carbon/human/target) diff --git a/code/obj/item/organs/torso.dm b/code/obj/item/organs/torso.dm index 575f1fa..ddf2bbf 100644 --- a/code/obj/item/organs/torso.dm +++ b/code/obj/item/organs/torso.dm @@ -17,7 +17,7 @@ New() ..() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) if (src.donor) src.bones = new /datum/bone(src) src.bones.donor = src.donor @@ -54,7 +54,7 @@ src.holder.damage_organs(brute/5, 0, 0, list("liver", "left_kidney", "right_kidney", "stomach", "intestines","appendix", "pancreas"), 30) else if (prob(30)) src.holder.damage_organs(brute/10, 0, 0, list("spleen", "left_lung", "right_lung"), 50) - + heal_damage(brute, burn, tox) if (brute_dam <= 0 && burn_dam <= 0 && tox_dam <= 0) return 0 diff --git a/code/obj/item/paint.dm b/code/obj/item/paint.dm index 11690fb..866a791 100644 --- a/code/obj/item/paint.dm +++ b/code/obj/item/paint.dm @@ -223,7 +223,7 @@ src.desc = "Damaged beyond all repair, this will never dispense paint ever again." flick("vendbreak", src) - SPAWN_DBG(8) + SPAWN_DBG(8 DECI SECONDS) src.icon_state = "fallen" sleep(70) playsound(src.loc, "sound/effects/Explosion2.ogg", 100, 1) @@ -311,7 +311,7 @@ var/list/cached_colors = new/list() uses = 5 New() ..() - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) var/colorname = "Weird" switch(rand(1,6)) if(1) diff --git a/code/obj/item/pens_writing_etc.dm b/code/obj/item/pens_writing_etc.dm index 995019a..055ef4a 100644 --- a/code/obj/item/pens_writing_etc.dm +++ b/code/obj/item/pens_writing_etc.dm @@ -106,7 +106,7 @@ user.visible_message("[user] gently pushes the end of [src] into [his_or_her(user)] nose, then leans forward until [he_or_she(user)] falls to the floor face first!") user.TakeDamage("head", 175, 0) user.updatehealth() - SPAWN_DBG(500) + SPAWN_DBG(50 SECONDS) if (user && !isdead(user)) user.suiciding = 0 qdel(src) @@ -283,7 +283,7 @@ New() ..() if (!ticker) // trying to avoid pre-game-start runtime bullshit - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) src.font_color = random_saturated_hex_color(1) src.color_name = hex2color_name(src.font_color) else @@ -302,12 +302,12 @@ if (!src.user_can_suicide(user)) return 0 user.visible_message("[user] jams [src] up [his_or_her(user)] nose!") - SPAWN_DBG(5) // so we get a moment to think before we die + SPAWN_DBG(5 DECI SECONDS) // so we get a moment to think before we die user.take_brain_damage(120) user.u_equip(src) src.set_loc(user) // SHOULD be redundant but you never know. user.updatehealth() - SPAWN_DBG(500) + SPAWN_DBG(50 SECONDS) if (user && !isdead(user)) user.suiciding = 0 return 1 @@ -421,12 +421,12 @@ suicide(var/mob/user as mob) user.visible_message("[user] crushes \the [src] into a powder and then [he_or_she(user)] snorts it all! That can't be good for [his_or_her(user)] lungs!") - spawn(5) // so we get a moment to think before we die + spawn(5 DECI SECONDS) // so we get a moment to think before we die user.take_oxygen_deprivation(175) user.u_equip(src) user.updatehealth() src.set_loc(user) //yes i did this dont ask why i cant literally think of anything better to do - spawn(100) + SPAWN_DBG(10 SECONDS) if (user) user.suiciding = 0 qdel(src) @@ -587,7 +587,7 @@ user.TakeDamage("chest", 300, 0) //they have to die fast or it'd make even less sense user.updatehealth() - SPAWN_DBG(500) + SPAWN_DBG(50 SECONDS) if (user && !isdead(user)) user.suiciding = 0 return 1 diff --git a/code/obj/item/pinpointer.dm b/code/obj/item/pinpointer.dm index 0fb3c9b..2e47763 100644 --- a/code/obj/item/pinpointer.dm +++ b/code/obj/item/pinpointer.dm @@ -49,7 +49,7 @@ icon_state = "[src.icon_type]_pinonmedium" if(16 to INFINITY) icon_state = "[src.icon_type]_pinonfar" - SPAWN_DBG(5) .() + SPAWN_DBG(5 DECI SECONDS) .() /obj/item/pinpointer/nuke name = "pinpointer (nuclear bomb)" @@ -125,7 +125,7 @@ icon_state = "id_pinonmedium" if(16 to INFINITY) icon_state = "id_pinonfar" - SPAWN_DBG(5) .() + SPAWN_DBG(5 DECI SECONDS) .() /obj/item/idtracker/spy attack_hand(mob/user as mob) @@ -223,5 +223,5 @@ icon_state = "blood_pinonmedium" if(16 to INFINITY) icon_state = "blood_pinonfar" - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) .(T) \ No newline at end of file diff --git a/code/obj/item/rcd.dm b/code/obj/item/rcd.dm index 9b15581..4491860 100644 --- a/code/obj/item/rcd.dm +++ b/code/obj/item/rcd.dm @@ -692,7 +692,7 @@ Broken RCD + Effects ..() lifespan = rand(2,4) rangeout = lifespan - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) void_shatter() void_loop() @@ -728,10 +728,10 @@ Broken RCD + Effects if (prob(5 + lifespan) && limiter.canISpawn(/obj/effects/sparks)) var/obj/sparks = unpool(/obj/effects/sparks) sparks.set_loc(T) - SPAWN_DBG(20) if (sparks) pool(sparks) + SPAWN_DBG(2 SECONDS) if (sparks) pool(sparks) T.ex_act((rangeout-lifespan) < 2 ? 1 : 2) - SPAWN_DBG(15) + SPAWN_DBG(1.5 SECONDS) void_loop() return diff --git a/code/obj/item/sponge_capsule.dm b/code/obj/item/sponge_capsule.dm index 66b13b4..00cef4b 100644 --- a/code/obj/item/sponge_capsule.dm +++ b/code/obj/item/sponge_capsule.dm @@ -53,7 +53,7 @@ /obj/item/toy/sponge_capsule/proc/add_water() playsound(src.loc, 'sound/effects/cheridan_pop.ogg', 100, 1) - spawn(8) + spawn(8 DECI SECONDS) if(!src || (src.qdeled)) //The capsule was deleted as it was expanding. return var/obj/critter/C = new animal_to_spawn(get_turf(src)) @@ -63,7 +63,7 @@ /obj/item/toy/sponge_capsule/suicide(var/mob/user) user.visible_message("[user] is eating [src]!") - spawn(20) + spawn(2 SECONDS) if(!src || (src.qdeled)) return var/obj/critter/C = new animal_to_spawn(user.loc) diff --git a/code/obj/item/stickers.dm b/code/obj/item/stickers.dm index cccbfeb..f8ddd98 100644 --- a/code/obj/item/stickers.dm +++ b/code/obj/item/stickers.dm @@ -275,7 +275,7 @@ src.radio = new src.radio_path (src) else src.radio = new /obj/item/device/radio/spy (src) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) src.radio.broadcasting = 0 //src.radio.listening = 0 else diff --git a/code/obj/item/storage/bible.dm b/code/obj/item/storage/bible.dm index 6a90c43..de9afee 100644 --- a/code/obj/item/storage/bible.dm +++ b/code/obj/item/storage/bible.dm @@ -196,7 +196,7 @@ var/global/list/the_very_holy_global_bible_list_amen = list() // this is becomin src.layer = initial(src.layer) src.set_loc(user.loc) var/list/gibz = user.gib(0, 1) - SPAWN_DBG(30)//this code is awful lol. + SPAWN_DBG(3 SECONDS)//this code is awful lol. for( var/i = 1, i <= 500, i++ ) for( var/obj/gib in gibz ) if(!gib.loc) continue @@ -216,7 +216,7 @@ var/global/list/the_very_holy_global_bible_list_amen = list() // this is becomin src.layer = initial(src.layer) src.set_loc(user.loc) var/list/gibz = user.gib(0, 1) - SPAWN_DBG(30)//this code is awful lol. + SPAWN_DBG(3 SECONDS)//this code is awful lol. for( var/i = 1, i <= 50, i++ ) for( var/obj/gib in gibz ) step_to( gib, src ) diff --git a/code/obj/item/storage/med_chem.dm b/code/obj/item/storage/med_chem.dm index b50c171..768fb65 100644 --- a/code/obj/item/storage/med_chem.dm +++ b/code/obj/item/storage/med_chem.dm @@ -12,7 +12,7 @@ New() ..() - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) if (kit_styles && kit_styles.len) icon_state = pick(kit_styles) item_state = icon_state @@ -37,7 +37,7 @@ /obj/item/reagent_containers/pill/salicylic_acid,\ /obj/item/device/analyzer/healthanalyzer/borg,\ /obj/item/reagent_containers/emergency_injector/epinephrine) - + /obj/item/storage/firstaid/brute name = "brute first aid" diff --git a/code/obj/item/storage/secure_safe.dm b/code/obj/item/storage/secure_safe.dm index 8c1ec7b..d0179cb 100644 --- a/code/obj/item/storage/secure_safe.dm +++ b/code/obj/item/storage/secure_safe.dm @@ -64,7 +64,7 @@ if (ispulsingtool(W) && (src.open == 1) && (!src.locked) && (!src.l_hacking)) user.show_message(text("Now attempting to reset internal memory, please hold."), 1) src.l_hacking = 1 - SPAWN_DBG(100) + SPAWN_DBG(10 SECONDS) if (prob(40)) src.l_setshort = 1 configure_mode = 1 diff --git a/code/obj/item/storage/small_storage_parent.dm b/code/obj/item/storage/small_storage_parent.dm index 4c883d7..d8a5ed7 100644 --- a/code/obj/item/storage/small_storage_parent.dm +++ b/code/obj/item/storage/small_storage_parent.dm @@ -36,7 +36,7 @@ New() hud = new(src) ..() - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) src.make_my_stuff() disposing() @@ -92,7 +92,7 @@ afterattack(obj/O as obj, mob/user as mob) if (O in src.contents) user.drop_item() - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) O.attack_hand(user) attackby(obj/item/W as obj, mob/user as mob, params, obj/item/storage/T as obj) // T for transfer - transferring items from one storage obj to another @@ -377,7 +377,7 @@ return I.throwforce += 8 //Ugly. Who cares. - SPAWN_DBG(15) + SPAWN_DBG(1.5 SECONDS) if (I) I.throwforce -= 8 diff --git a/code/obj/item/storage/toolbox.dm b/code/obj/item/storage/toolbox.dm index da8791c..0473ae8 100644 --- a/code/obj/item/storage/toolbox.dm +++ b/code/obj/item/storage/toolbox.dm @@ -36,7 +36,7 @@ user.visible_message("[user] slams the toolbox closed on [his_or_her(user)] head repeatedly!") user.TakeDamage("head", 150, 0) user.updatehealth() - SPAWN_DBG(500) + SPAWN_DBG(50 SECONDS) if (user && !isdead(user)) user.suiciding = 0 return 1 @@ -201,7 +201,7 @@ M.remove() var/we_need_to_die = (M == original_owner) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) if (G) qdel(G) if (we_need_to_die) diff --git a/code/obj/item/toilets.dm b/code/obj/item/toilets.dm index 3fd4119..a59256d 100644 --- a/code/obj/item/toilets.dm +++ b/code/obj/item/toilets.dm @@ -153,7 +153,7 @@ var/list/all_toilets = null playsound(src.loc, "sound/impact_sounds/Liquid_Slosh_1.ogg", 50, 1) user.updatehealth() - SPAWN_DBG(100) + SPAWN_DBG(10 SECONDS) if (user) user.suiciding = 0 return 1 diff --git a/code/obj/item/toys.dm b/code/obj/item/toys.dm index 6bc7637..49a5abc 100644 --- a/code/obj/item/toys.dm +++ b/code/obj/item/toys.dm @@ -277,7 +277,7 @@ user.visible_message("[user] shoves [src] down [his_or_her(user)] throat and chokes on it!") user.take_oxygen_deprivation(175) user.updatehealth() - SPAWN_DBG(500) + SPAWN_DBG(50 SECONDS) if (user && !isdead(user)) user.suiciding = 0 qdel(src) @@ -814,7 +814,7 @@ var/list/figure_patreon_rarity = list(\ prevend_effect() playsound(src.loc, sound_vend, 80, 1) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) var/datum/data/vending_product/R = src.product_list[1] src.capsule_image.icon_state = "m_caps[R.product_amount]" src.UpdateOverlays(src.capsule_image, "capsules") @@ -848,7 +848,7 @@ var/list/figure_patreon_rarity = list(\ user.visible_message(" Sweet Jesus! [user] is bashing their head in with [name]!") user.TakeDamage("head", 150, 0) user.updatehealth() - SPAWN_DBG(500) + SPAWN_DBG(50 SECONDS) if (user && !isdead(user)) user.suiciding = 0 return 1 diff --git a/code/obj/item/uplinks.dm b/code/obj/item/uplinks.dm index 8639e9c..2083203 100644 --- a/code/obj/item/uplinks.dm +++ b/code/obj/item/uplinks.dm @@ -636,7 +636,7 @@ Note: Add new traitor items to syndicate_buylist.dm, not here. else //The gamemode is NOT spy, but we've got one on our hands! Set this badboy up. if (!ticker.mode.spy_market) ticker.mode.spy_market = new /datum/game_mode/spy_theft - SPAWN_DBG(50) //Some possible bounty items (like organs) need some time to get set up properly and be assigned names + SPAWN_DBG(5 SECONDS) //Some possible bounty items (like organs) need some time to get set up properly and be assigned names ticker.mode.spy_market.build_bounty_list() ticker.mode.spy_market.update_bounty_readouts() game = ticker.mode.spy_market diff --git a/code/obj/landmark.dm b/code/obj/landmark.dm index dde7cfe..bb9367e 100644 --- a/code/obj/landmark.dm +++ b/code/obj/landmark.dm @@ -80,19 +80,19 @@ var/global/list/landmarks = list() qdel(src) if ("shitty_bill") - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) new /mob/living/carbon/human/biker(src.loc) deleted_on_start = 1 qdel(src) if ("john_bill") - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) new /mob/living/carbon/human/john(src.loc) deleted_on_start = 1 qdel(src) if ("big_yank") - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) new /mob/living/carbon/human/big_yank(src.loc) deleted_on_start = 1 qdel(src) @@ -106,116 +106,116 @@ var/global/list/landmarks = list() if ("father_jack") - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) new /mob/living/carbon/human/fatherjack(src.loc) deleted_on_start = 1 qdel(src) if ("don_glab") - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) new /mob/living/carbon/human/don_glab(src.loc) deleted_on_start = 1 qdel(src) if ("monkeyspawn_normal") - SPAWN_DBG(60) + SPAWN_DBG(6 SECONDS) new /mob/living/carbon/human/npc/monkey(src.loc) deleted_on_start = 1 qdel(src) if ("monkeyspawn_inside") - SPAWN_DBG(60) + SPAWN_DBG(6 SECONDS) var/obj/storage/S = locate() in src.loc new /mob/living/carbon/human/npc/monkey(S) deleted_on_start = 1 qdel(src) if ("monkeyspawn_albert") - SPAWN_DBG(60) + SPAWN_DBG(6 SECONDS) new /mob/living/carbon/human/npc/monkey/albert(src.loc) deleted_on_start = 1 qdel(src) if ("monkeyspawn_rathen") - SPAWN_DBG(60) + SPAWN_DBG(6 SECONDS) new /mob/living/carbon/human/npc/monkey/mr_rathen(src.loc) deleted_on_start = 1 qdel(src) if ("monkeyspawn_mrmuggles") - SPAWN_DBG(60) + SPAWN_DBG(6 SECONDS) new /mob/living/carbon/human/npc/monkey/mr_muggles(src.loc) deleted_on_start = 1 qdel(src) if ("monkeyspawn_mrsmuggles") - SPAWN_DBG(60) + SPAWN_DBG(6 SECONDS) new /mob/living/carbon/human/npc/monkey/mrs_muggles(src.loc) deleted_on_start = 1 qdel(src) if ("monkeyspawn_syndicate") - SPAWN_DBG(60) + SPAWN_DBG(6 SECONDS) new /mob/living/carbon/human/npc/monkey/von_braun(src.loc) deleted_on_start = 1 qdel(src) if ("monkeyspawn_horse") - SPAWN_DBG(60) + SPAWN_DBG(6 SECONDS) new /mob/living/carbon/human/npc/monkey/horse(src.loc) deleted_on_start = 1 qdel(src) if ("monkeyspawn_krimpus") - SPAWN_DBG(60) + SPAWN_DBG(6 SECONDS) new /mob/living/carbon/human/npc/monkey/krimpus(src.loc) deleted_on_start = 1 qdel(src) if ("monkeyspawn_tanhony") - SPAWN_DBG(60) + SPAWN_DBG(6 SECONDS) new /mob/living/carbon/human/npc/monkey/tanhony(src.loc) deleted_on_start = 1 qdel(src) if ("monkeyspawn_stirstir") - SPAWN_DBG(60) + SPAWN_DBG(6 SECONDS) new /mob/living/carbon/human/npc/monkey/stirstir(src.loc) deleted_on_start = 1 qdel(src) if ("seamonkeyspawn") - SPAWN_DBG(60) + SPAWN_DBG(6 SECONDS) new /mob/living/carbon/human/npc/monkey/sea(src.loc) deleted_on_start = 1 qdel(src) if ("seamonkeyspawn_gang") - SPAWN_DBG(60) + SPAWN_DBG(6 SECONDS) new /mob/living/carbon/human/npc/monkey/sea/gang(src.loc) deleted_on_start = 1 qdel(src) if ("seamonkeyspawn_gang_gun") - SPAWN_DBG(60) + SPAWN_DBG(6 SECONDS) new /mob/living/carbon/human/npc/monkey/sea/gang_gun(src.loc) deleted_on_start = 1 qdel(src) if ("seamonkeyspawn_rich") - SPAWN_DBG(60) + SPAWN_DBG(6 SECONDS) new /mob/living/carbon/human/npc/monkey/sea/rich(src.loc) deleted_on_start = 1 qdel(src) if ("seamonkeyspawn_lab") - SPAWN_DBG(60) + SPAWN_DBG(6 SECONDS) new /mob/living/carbon/human/npc/monkey/sea/lab(src.loc) deleted_on_start = 1 qdel(src) if ("waiter") - SPAWN_DBG(60) + SPAWN_DBG(6 SECONDS) new /mob/living/carbon/human/waiter(src.loc) deleted_on_start = 1 qdel(src) @@ -426,7 +426,7 @@ obj/landmark/interesting New() //use initialize() later and test ok ..() - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) src.setup() SPAWN_DBG(10) qdel(src) diff --git a/code/obj/machinery.dm b/code/obj/machinery.dm index b3fd708..3398252 100644 --- a/code/obj/machinery.dm +++ b/code/obj/machinery.dm @@ -28,7 +28,7 @@ ..() SubscribeToProcess() if (current_state > GAME_STATE_WORLD_INIT) - spawn(5) + spawn(5 DECI SECONDS) src.power_change() /obj/machinery/initialize() @@ -247,7 +247,7 @@ pulse2.anchored = 1 pulse2.dir = pick(cardinal) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) qdel(pulse2) return diff --git a/code/obj/machinery/autolathe.dm b/code/obj/machinery/autolathe.dm index badb832..1daf8be 100644 --- a/code/obj/machinery/autolathe.dm +++ b/code/obj/machinery/autolathe.dm @@ -43,7 +43,7 @@ */ if (istype(O, /obj/item/sheet/metal)) if (src.m_amount < 150000.0) - SPAWN_DBG(16) { + SPAWN_DBG(1.6 SECONDS) { flick("autolathe_c",src) src.m_amount += O:height * O:width * O:length * 100000.0 O:amount-- @@ -54,7 +54,7 @@ boutput(user, "The autolathe is full. Please remove metal from the autolathe in order to insert more.") else if (istype(O, /obj/item/sheet/glass) || istype(O, /obj/item/sheet/glass/reinforced)) if (src.g_amount < 75000.0) - SPAWN_DBG(16) { + SPAWN_DBG(1.6 SECONDS) { flick("autolathe_c",src) src.g_amount += O:height * O:width * O:length * 100000.0 O:amount-- @@ -65,7 +65,7 @@ boutput(user, "The autolathe is full. Please remove glass from the autolathe in order to insert more.") else if (O.g_amt || O.m_amt) - SPAWN_DBG(16) { + SPAWN_DBG(1.6 SECONDS) { flick("autolathe_c",src) src.g_amount += O.g_amt src.m_amount += O.m_amt @@ -127,11 +127,11 @@ src.m_amount = 0 if(src.g_amount < 0) src.g_amount = 0 - SPAWN_DBG(16) + SPAWN_DBG(1.6 SECONDS) flick("autolathe_c",src) - SPAWN_DBG(16) + SPAWN_DBG(1.6 SECONDS) flick("autolathe_o",src) - SPAWN_DBG(16) + SPAWN_DBG(1.6 SECONDS) new template.type(usr.loc) src.operating = 0 @@ -145,15 +145,15 @@ else if(src.hack_wire == href_list["wire"]) src.hacked = !src.hacked - SPAWN_DBG(100) src.hacked = !src.hacked + SPAWN_DBG(10 SECONDS) src.hacked = !src.hacked if(src.disable_wire == href_list["wire"]) src.disabled = !src.disabled src.shock(usr) - SPAWN_DBG(100) src.disabled = !src.disabled + SPAWN_DBG(10 SECONDS) src.disabled = !src.disabled if(src.shock_wire == href_list["wire"]) src.shocked = !src.shocked src.shock(usr) - SPAWN_DBG(100) src.shocked = !src.shocked + SPAWN_DBG(10 SECONDS) src.shocked = !src.shocked if(href_list["act"] == "wire") if (!usr.find_tool_in_hand(TOOL_SNIPPING)) boutput(usr, "You need wirecutters!") diff --git a/code/obj/machinery/camera.dm b/code/obj/machinery/camera.dm index 9c600fe..e2a9ebf 100644 --- a/code/obj/machinery/camera.dm +++ b/code/obj/machinery/camera.dm @@ -120,7 +120,7 @@ ..() cameras.Add(src) - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) // making life easy for mappers since 2013 if (dd_hasprefix(name, "autoname")) var/area/where = get_area(src) @@ -238,7 +238,7 @@ src.remove_from_turfs() - SPAWN_DBG(900) + SPAWN_DBG(90 SECONDS) camera_status++ src.network = initial(src.network) if(!istype(src, /obj/machinery/camera/television)) diff --git a/code/obj/machinery/clonepod.dm b/code/obj/machinery/clonepod.dm index a3fdd68..38a67ee 100644 --- a/code/obj/machinery/clonepod.dm +++ b/code/obj/machinery/clonepod.dm @@ -71,7 +71,7 @@ light.set_height(0.75) light.attach(src) - SPAWN_DBG(100) + SPAWN_DBG(10 SECONDS) if (radio_controller) pda_connection = radio_controller.add_object(src, "[pdafrequency]") if (!src.net_id) @@ -167,7 +167,7 @@ src.failed_tick_counter = 0 // make sure we start here src.eject_wait = 1 - SPAWN_DBG(30) + SPAWN_DBG(3 SECONDS) src.eject_wait = 0 src.occupant = new /mob/living/carbon/human(src) @@ -194,7 +194,7 @@ src.update_icon() //Get the clone body ready - SPAWN_DBG(5) //Organs may not exist yet if we call this right away. + SPAWN_DBG(5 DECI SECONDS) //Organs may not exist yet if we call this right away. random_brute_damage(src.occupant, 90, 1) src.occupant.take_toxin_damage(50) src.occupant.take_oxygen_deprivation(40) @@ -582,7 +582,7 @@ var/list/clonepod_accepted_reagents = list("blood"=0.5,"synthflesh"=1,"beff"=0.7 src.failed_tick_counter = 0 src.update_icon() src.occupant.ghostize() - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) qdel(src.occupant) return @@ -902,7 +902,7 @@ var/list/clonepod_accepted_reagents = list("blood"=0.5,"synthflesh"=1,"beff"=0.7 src.start_cycle() - SPAWN_DBG(500) + SPAWN_DBG(50 SECONDS) if (user && !isdead(user)) // how????????? ? user.suiciding = 0 // just in case I guess return 1 diff --git a/code/obj/machinery/computer/cloning.dm b/code/obj/machinery/computer/cloning.dm index a9ba361..e80900f 100644 --- a/code/obj/machinery/computer/cloning.dm +++ b/code/obj/machinery/computer/cloning.dm @@ -62,7 +62,7 @@ /obj/machinery/computer/cloning/New() ..() - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) if(portable) return src.scanner = locate(/obj/machinery/clone_scanner, orange(2,src)) src.pod1 = locate(/obj/machinery/clonepod, orange(4,src)) @@ -853,7 +853,7 @@ if(prob(50)) playsound(get_turf(src), 'sound/machines/mixer.ogg', 50, 1) if(prob(30)) - SPAWN_DBG(3) + SPAWN_DBG(3 DECI SECONDS) playsound(src.loc, pick('sound/impact_sounds/Flesh_Stab_1.ogg', \ 'sound/impact_sounds/Slimy_Hit_3.ogg', \ 'sound/impact_sounds/Slimy_Hit_4.ogg', \ diff --git a/code/obj/machinery/computer/general_air_control.dm b/code/obj/machinery/computer/general_air_control.dm index 81fcd84..d6dd454 100644 --- a/code/obj/machinery/computer/general_air_control.dm +++ b/code/obj/machinery/computer/general_air_control.dm @@ -267,7 +267,7 @@ Max Output Pressure: [output_pressure] kPa
    "} var/change = text2num(href_list["adj_pressure"]) pressure_setting = min(max(0, pressure_setting + change), 50*ONE_ATMOSPHERE) - SPAWN_DBG(7) + SPAWN_DBG(7 DECI SECONDS) attack_hand(usr) fuel_injection diff --git a/code/obj/machinery/computer/operating.dm b/code/obj/machinery/computer/operating.dm index d60a1ec..0831150 100644 --- a/code/obj/machinery/computer/operating.dm +++ b/code/obj/machinery/computer/operating.dm @@ -14,7 +14,7 @@ /obj/machinery/computer/operating/New() ..() - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.table = locate(/obj/machinery/optable, orange(2,src)) /obj/machinery/computer/operating/attack_ai(mob/user) diff --git a/code/obj/machinery/computer/pod.dm b/code/obj/machinery/computer/pod.dm index 57e87fc..5db90ed 100644 --- a/code/obj/machinery/computer/pod.dm +++ b/code/obj/machinery/computer/pod.dm @@ -188,7 +188,7 @@ usr.machine = src if (href_list["spell_teleport"]) //src.TPR = 1 - //SPAWN_DBG(600) + //SPAWN_DBG(1 MINUTE) // if(src) // src.TPR = 0 // src.updateDialog() diff --git a/code/obj/machinery/computer/shuttle.dm b/code/obj/machinery/computer/shuttle.dm index cf9b7cc..0f3f7c8 100644 --- a/code/obj/machinery/computer/shuttle.dm +++ b/code/obj/machinery/computer/shuttle.dm @@ -242,7 +242,7 @@ for(var/obj/machinery/computer/mining_shuttle/C in machines) active = 1 C.visible_message("The Mining Shuttle has been Called and will leave shortly!") - SPAWN_DBG(100) + SPAWN_DBG(10 SECONDS) call_shuttle() /obj/machinery/computer/mining_shuttle/proc/call_shuttle() @@ -301,7 +301,7 @@ active = 1 C.visible_message("The Prison Shuttle has been Called and will leave shortly!") - SPAWN_DBG(100) + SPAWN_DBG(10 SECONDS) call_shuttle() else if (href_list["close"]) @@ -352,7 +352,7 @@ /obj/machinery/computer/research_shuttle/New() ..() - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.net_id = generate_net_id(src) if(!src.link) @@ -403,7 +403,7 @@ active = 1 C.visible_message("The Research Shuttle has been Called and will leave shortly!") - SPAWN_DBG(100) + SPAWN_DBG(10 SECONDS) call_shuttle() else if (href_list["close"]) @@ -469,7 +469,7 @@ for(var/obj/machinery/computer/icebase_elevator/C in machines) active = 1 C.visible_message("The elevator begins to move!") - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) call_shuttle() if (href_list["close"]) @@ -492,7 +492,7 @@ var/area/start_location = locate(/area/shuttle/icebase_elevator/upper) var/area/end_location = locate(/area/shuttle/icebase_elevator/lower) for(var/mob/M in end_location) // oh dear, stay behind the yellow line kids - SPAWN_DBG(1) M.gib() + SPAWN_DBG(1 DECI SECOND) M.gib() start_location.move_contents_to(end_location, /turf/simulated/floor/arctic_elevator_shaft) location = 0 @@ -533,7 +533,7 @@ for(var/obj/machinery/computer/icebase_elevator/C in machines) active = 1 C.visible_message("The elevator begins to move!") - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) call_shuttle() if (href_list["close"]) diff --git a/code/obj/machinery/door/airlock.dm b/code/obj/machinery/door/airlock.dm index 7eb6f90..0259cf9 100644 --- a/code/obj/machinery/door/airlock.dm +++ b/code/obj/machinery/door/airlock.dm @@ -586,7 +586,7 @@ About the new airlock wires panel: if (AIRLOCK_WIRE_MAIN_POWER1 || AIRLOCK_WIRE_MAIN_POWER2) //Sending a pulse through either one causes a breaker to trip, disabling the door for 10 seconds if backup power is connected, or 1 minute if not (or until backup power comes back on, whichever is shorter). src.loseMainPower() - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) src.shock(usr, 25) if (AIRLOCK_WIRE_DOOR_BOLTS) //one wire for door bolts. Sending a pulse through this drops door bolts if they're not down (whether power's on or not), @@ -602,13 +602,13 @@ About the new airlock wires panel: src.updateUsrDialog() boutput(usr, "You hear a click from inside the door.") update_icon() - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) src.shock(usr, 25) if (AIRLOCK_WIRE_BACKUP_POWER1 || AIRLOCK_WIRE_BACKUP_POWER2) //two wires for backup power. Sending a pulse through either one causes a breaker to trip, but this does not disable it unless main power is down too (in which case it is disabled for 1 minute or however long it takes main power to come back, whichever is shorter). src.loseBackupPower() - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) src.shock(usr, 25) if (AIRLOCK_WIRE_AI_CONTROL) if (src.aiControlDisabled == 0) @@ -616,20 +616,20 @@ About the new airlock wires panel: else if (src.aiControlDisabled == -1) src.aiControlDisabled = 2 src.updateDialog() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) if (src.aiControlDisabled == 1) src.aiControlDisabled = 0 else if (src.aiControlDisabled == 2) src.aiControlDisabled = -1 src.updateDialog() - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) src.shock(usr, 25) if (AIRLOCK_WIRE_ELECTRIFY) //one wire for electrifying the door. Sending a pulse through this electrifies the door for 30 seconds. if (src.secondsElectrified==0) src.secondsElectrified = 30 logTheThing("station", usr, null, "temporarily electrified an airlock at [log_loc(src)] with a pulse.") - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) //TODO: Move this into process() and make pulsing reset secondsElectrified to 30 while (src.secondsElectrified>0) src.secondsElectrified-=1 @@ -651,7 +651,7 @@ About the new airlock wires panel: src.safety = 0 src.close(1) src.safety = 1 - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) src.shock(usr, 25) /obj/machinery/door/airlock/proc/cut(var/wireColor) @@ -662,7 +662,7 @@ About the new airlock wires panel: if(AIRLOCK_WIRE_MAIN_POWER1 || AIRLOCK_WIRE_MAIN_POWER2) //Cutting either one disables the main door power, but unless backup power is also cut, the backup power re-powers the door in 10 seconds. While unpowered, the door may be crowbarred open, but bolts-raising will not work. Cutting these wires may electocute the user. src.loseMainPower() - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) src.shock(usr, 50) src.updateUsrDialog() if (AIRLOCK_WIRE_DOOR_BOLTS) @@ -675,7 +675,7 @@ About the new airlock wires panel: if (AIRLOCK_WIRE_BACKUP_POWER1 || AIRLOCK_WIRE_BACKUP_POWER2) //Cutting either one disables the backup door power (allowing it to be crowbarred open, but disabling bolts-raising), but may electocute the user. src.loseBackupPower() - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) src.shock(usr, 50) src.updateUsrDialog() if (AIRLOCK_WIRE_AI_CONTROL) @@ -685,7 +685,7 @@ About the new airlock wires panel: src.aiControlDisabled = 1 else if (src.aiControlDisabled == -1) src.aiControlDisabled = 2 - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) src.shock(usr, 25) src.updateUsrDialog() if (AIRLOCK_WIRE_ELECTRIFY) @@ -707,13 +707,13 @@ About the new airlock wires panel: if(AIRLOCK_WIRE_MAIN_POWER1 || AIRLOCK_WIRE_MAIN_POWER2) if ((!src.isWireCut(AIRLOCK_WIRE_MAIN_POWER1)) && (!src.isWireCut(AIRLOCK_WIRE_MAIN_POWER2))) src.regainMainPower() - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) src.shock(usr, 50) src.updateUsrDialog() if (AIRLOCK_WIRE_BACKUP_POWER1 || AIRLOCK_WIRE_BACKUP_POWER2) if ((!src.isWireCut(AIRLOCK_WIRE_BACKUP_POWER1)) && (!src.isWireCut(AIRLOCK_WIRE_BACKUP_POWER2))) src.regainBackupPower() - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) src.shock(usr, 50) src.updateUsrDialog() if (AIRLOCK_WIRE_AI_CONTROL) @@ -1061,7 +1061,7 @@ About the new airlock wires panel: /obj/machinery/door/airlock/proc/hack(mob/user as mob) if (src.aiHacking==0) src.aiHacking=1 - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) //TODO: Make this take a minute boutput(user, "Airlock AI control has been blocked. Beginning fault-detection.") sleep(50) @@ -1382,7 +1382,7 @@ About the new airlock wires panel: src.secondsElectrified = 30 logTheThing("combat", usr, null, "electrified airlock ([src]) at [log_loc(src)] for 30 seconds.") message_admins("[key_name(usr)] electrified airlock ([src]) at [log_loc(src)] for 30 seconds.") - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) while (src.secondsElectrified>0) src.secondsElectrified-=1 if (src.secondsElectrified<0) @@ -1815,7 +1815,7 @@ obj/machinery/door/airlock if(prob(40)) if(src.secondsElectrified == 0) src.secondsElectrified = -1 - SPAWN_DBG(300) + SPAWN_DBG(30 SECONDS) src.secondsElectrified = 0 return @@ -1895,7 +1895,7 @@ obj/machinery/door/airlock src.secondsElectrified = 30 logTheThing("combat", usr, null, "electrified airlock ([src]) at [log_loc(src)] for 30 seconds.") message_admins("[key_name(usr)] electrified airlock ([src]) at [log_loc(src)] for 30 seconds.") - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) while (src.secondsElectrified>0) src.secondsElectrified-=1 if (src.secondsElectrified<0) diff --git a/code/obj/machinery/door/door_control.dm b/code/obj/machinery/door/door_control.dm index cce0e11..687ff26 100644 --- a/code/obj/machinery/door/door_control.dm +++ b/code/obj/machinery/door/door_control.dm @@ -317,7 +317,7 @@ M.operating = 0 M.setdir() - SPAWN_DBG(15) + SPAWN_DBG(1.5 SECONDS) if(!(status & NOPOWER)) icon_state = "doorctrl0" src.add_fingerprint(usr) @@ -661,7 +661,7 @@ New() ..() UnsubscribeProcess() - SPAWN_DBG(5) // must wait for map loading to finish + SPAWN_DBG(5 DECI SECONDS) // must wait for map loading to finish if(radio_controller) radio_controller.add_object(src, "[frequency]") diff --git a/code/obj/machinery/door/door_parent.dm b/code/obj/machinery/door/door_parent.dm index 5a2d020..6e25b92 100644 --- a/code/obj/machinery/door/door_parent.dm +++ b/code/obj/machinery/door/door_parent.dm @@ -103,7 +103,7 @@ affecting.take_damage(9, 0) C.UpdateDamage() C.UpdateDamageIcon() - C.changeStatus("weakened", 1 SECONDS) + C.changeStatus("weakened", 1 SECOND) else boutput(C, "Your helmet protected you from injury!") diff --git a/code/obj/machinery/door/door_timer.dm b/code/obj/machinery/door/door_timer.dm index 8951a42..9682b6b 100644 --- a/code/obj/machinery/door/door_timer.dm +++ b/code/obj/machinery/door/door_timer.dm @@ -322,6 +322,6 @@ else if (src.time > 0) icon_state = "doortimer0" else - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) icon_state = "doortimer0" icon_state = "doortimer2" \ No newline at end of file diff --git a/code/obj/machinery/door/firedoor.dm b/code/obj/machinery/door/firedoor.dm index 361837b..b4c2465 100644 --- a/code/obj/machinery/door/firedoor.dm +++ b/code/obj/machinery/door/firedoor.dm @@ -9,7 +9,7 @@ New() ..() - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) src.setup() SPAWN_DBG(10) qdel(src) @@ -56,7 +56,7 @@ var/area/A = get_area(loc) if (A && A.name) zone = A.name - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) if (radio_controller) radio_controller.add_object(src, "[control_frequency]") diff --git a/code/obj/machinery/door/forcefield_gen.dm b/code/obj/machinery/door/forcefield_gen.dm index 0ae5f72..c93c599 100644 --- a/code/obj/machinery/door/forcefield_gen.dm +++ b/code/obj/machinery/door/forcefield_gen.dm @@ -113,14 +113,14 @@ boutput(M, "[A] was shocked by [src]!") boutput(A, "[src] shocks you.") A.TakeDamage("All", 0, 75) - if(hasvar(A,"weakened")) A:changeStatus("weakened", 1 SECONDS) + if(hasvar(A,"weakened")) A:changeStatus("weakened", 1 SECOND) var/dirmob = turn(A.dir,180) var/location = get_turf(A) var/datum/effects/system/spark_spread/s = unpool(/datum/effects/system/spark_spread) s.set_up(3, 1, location) s.start() step(A,dirmob) - SPAWN_DBG(5) step(A,dirmob) + SPAWN_DBG(5 DECI SECONDS) step(A,dirmob) playsound(src, "sound/impact_sounds/Energy_Hit_1.ogg", 40, 1) return 0 diff --git a/code/obj/machinery/door/poddoor.dm b/code/obj/machinery/door/poddoor.dm index f2ced9b..1a7e548 100644 --- a/code/obj/machinery/door/poddoor.dm +++ b/code/obj/machinery/door/poddoor.dm @@ -23,7 +23,7 @@ New() ..() - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) open() Bump() @@ -562,7 +562,7 @@ if(operating == 1) //emag again src.operating = 0 if(autoclose) - SPAWN_DBG(150) + SPAWN_DBG(15 SECONDS) autoclose() return 1 @@ -670,7 +670,7 @@ if(operating == 1) //emag again src.operating = 0 if(autoclose) - SPAWN_DBG(150) + SPAWN_DBG(15 SECONDS) autoclose() return 1 diff --git a/code/obj/machinery/door/supernorn.dm b/code/obj/machinery/door/supernorn.dm index bcb343b..23df04f 100644 --- a/code/obj/machinery/door/supernorn.dm +++ b/code/obj/machinery/door/supernorn.dm @@ -54,7 +54,7 @@ playsound(src, "sound/machines/airlock_swoosh_temp.ogg", 100, 0) SPAWN_DBG(2.5) set_density(0) // let them through halfway through the anim - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) operating = 0 if (autoclose_delay) SPAWN_DBG(autoclose_delay) @@ -72,7 +72,7 @@ playsound(src, "sound/machines/airlock_swoosh_temp.ogg", 100, 0) SPAWN_DBG(2.5) set_density(1) - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) operating = 0 if (ignore_light_or_cam_opacity) src.opacity = 1 @@ -109,7 +109,7 @@ if (check_safeties()) close() else - SPAWN_DBG(10) // something was in the way + SPAWN_DBG(1 SECOND) // something was in the way try_autoclose() /obj/machinery/door/tempfiredoor diff --git a/code/obj/machinery/drone_factory.dm b/code/obj/machinery/drone_factory.dm index 14fbc2d..afe1a9c 100644 --- a/code/obj/machinery/drone_factory.dm +++ b/code/obj/machinery/drone_factory.dm @@ -119,7 +119,7 @@ var/global/list/ghostdrone_candidates = list() New() ..() src.icon_state = "factory[src.factory_section][src.working]" - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src.update_conveyors() src.update_rechargers() @@ -313,7 +313,7 @@ var/global/list/ghostdrone_candidates = list() New() ..() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src.update_conveyors() src.update_rechargers() diff --git a/code/obj/machinery/drone_recharger.dm b/code/obj/machinery/drone_recharger.dm index 9b2ffb2..55a56a4 100644 --- a/code/obj/machinery/drone_recharger.dm +++ b/code/obj/machinery/drone_recharger.dm @@ -70,7 +70,7 @@ //Do opening thing src.icon_state = "drone-charger-open" - SPAWN_DBG(7) //Animation is 6 ticks, 1 extra for byond + SPAWN_DBG(7 DECI SECONDS) //Animation is 6 ticks, 1 extra for byond src.occupant = G src.updateSprite() G.charging = 1 @@ -101,7 +101,7 @@ //Do closing thing src.icon_state = "drone-charger-close" src.transition = 1 - SPAWN_DBG(7) + SPAWN_DBG(7 DECI SECONDS) src.set_density(0) src.transition = 0 src.updateSprite() diff --git a/code/obj/machinery/firealarm.dm b/code/obj/machinery/firealarm.dm index 205cc77..227181f 100644 --- a/code/obj/machinery/firealarm.dm +++ b/code/obj/machinery/firealarm.dm @@ -171,7 +171,7 @@ src.dont_spam = 1 - SPAWN_DBG(50) + SPAWN_DBG(5 SECONDS) if(src) src.dont_spam = 0 @@ -231,7 +231,7 @@ reply.data["alert"] = src.icon_state == "fire0" ? "reset" : "fire" reply.data["zone"] = alarm_zone reply.data["type"] = "Fire" - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.frequency.post_signal(src, reply) return diff --git a/code/obj/machinery/floorflusher.dm b/code/obj/machinery/floorflusher.dm index cd277fb..8b326f5 100644 --- a/code/obj/machinery/floorflusher.dm +++ b/code/obj/machinery/floorflusher.dm @@ -68,7 +68,7 @@ // find the attached trunk (if present) and init gas resvr. New() ..() - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) trunk = locate() in src.loc if(!trunk) mode = 0 @@ -112,7 +112,7 @@ I.set_loc(src) user.visible_message("[user] drops \the [I] into the [src].", "You drop \the [I] into the inky blackness of the [src].") - update() + update() // mouse drop another mob or self @@ -302,7 +302,7 @@ AM.set_loc(src.loc) AM.pipe_eject(0) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) if(AM) AM.throw_at(target, 5, 1) diff --git a/code/obj/machinery/launcherloader.dm b/code/obj/machinery/launcherloader.dm index 3870262..117db2e 100644 --- a/code/obj/machinery/launcherloader.dm +++ b/code/obj/machinery/launcherloader.dm @@ -18,7 +18,7 @@ New() ..() - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) var/list/drivers = new/list() for(var/obj/machinery/mass_driver/D in range(1,src)) drivers += D @@ -60,7 +60,7 @@ SPAWN_DBG(0) if (door) door.open() - SPAWN_DBG(100) + SPAWN_DBG(10 SECONDS) if (door) door.close() //this may need some adjusting still @@ -156,11 +156,11 @@ driver_operating = 1 SPAWN_DBG(0) - SPAWN_DBG(20) + SPAWN_DBG(2 SECONDS) driver_operating = 0 driver = null - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) if (driver) driver.drive() diff --git a/code/obj/machinery/lightswitch.dm b/code/obj/machinery/lightswitch.dm index df63f5c..162d069 100644 --- a/code/obj/machinery/lightswitch.dm +++ b/code/obj/machinery/lightswitch.dm @@ -20,7 +20,7 @@ ..() UnsubscribeProcess() light = new /datum/light/point - SPAWN_DBG(5) + SPAWN_DBG(5 DECI SECONDS) src.area = src.loc.loc if(otherarea) @@ -119,7 +119,7 @@ New() var/turf/T = null - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) for (var/dir in cardinal) T = get_step(src,dir) if (istype(T,/turf/simulated/wall) || (locate(/obj/wingrille_spawn) in T) || (locate(/obj/window) in T)) diff --git a/code/obj/machinery/meter.dm b/code/obj/machinery/meter.dm index 05fb8d7..e79b736 100644 --- a/code/obj/machinery/meter.dm +++ b/code/obj/machinery/meter.dm @@ -10,7 +10,7 @@ /obj/machinery/meter/New() ..() - SPAWN_DBG(10) + SPAWN_DBG(1 SECOND) src.target = locate(/obj/machinery/atmospherics/pipe) in loc return 1 @@ -53,7 +53,7 @@ if(prob(50)) playsound(src.loc, "sound/machines/hiss.ogg", 50, 1) noiselimiter = 1 - SPAWN_DBG(60) + SPAWN_DBG(6 SECONDS) noiselimiter = 0 diff --git a/code/obj/machinery/navbeacon.dm b/code/obj/machinery/navbeacon.dm index c58a201..bdc3f7b 100644 --- a/code/obj/machinery/navbeacon.dm +++ b/code/obj/machinery/navbeacon.dm @@ -32,7 +32,7 @@ var/turf/T = loc hide(T.intact) - SPAWN_DBG(5) // must wait for map loading to finish + SPAWN_DBG(5 DECI SECONDS) // must wait for map loading to finish if(radio_controller) radio_controller.add_object(src, "[freq]") @@ -85,7 +85,7 @@ var/request = signal.data["findbeacon"] if(request && ((request in codes) || request == "any" || request == location)) - SPAWN_DBG(1) + SPAWN_DBG(1 DECI SECOND) post_signal() @@ -279,7 +279,7 @@ Transponder Codes: