From 2007004f3ced317e74db8e69fbdc3ce2e69dd2b5 Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Wed, 9 Sep 2015 12:19:00 +0200 Subject: [PATCH 1/3] Qdel cleanup. Replaces a few instances of del() with qdel(). --- code/game/atoms.dm | 2 +- code/game/machinery/portable_turret.dm | 5 ++--- code/modules/mining/abandonedcrates.dm | 2 +- code/modules/mob/living/silicon/ai/ai.dm | 2 +- code/modules/power/apc.dm | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 4df4ad0e71e..83a5657f1cf 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -413,7 +413,7 @@ its easier to just keep the beam vertical. return src.germ_level = 0 if(istype(blood_DNA, /list)) - del(blood_DNA) + blood_DNA.Cut() return 1 diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index fc32db7852d..307b504b074 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -406,7 +406,6 @@ var/list/turret_icons /obj/machinery/porta_turret/ex_act(severity) switch (severity) if (1) - del(src) qdel(src) if (2) if (prob(25)) @@ -503,7 +502,7 @@ var/list/turret_icons if(isanimal(L) || issmall(L)) // Animals are not so dangerous return check_anomalies ? TURRET_SECONDARY_TARGET : TURRET_NOT_TARGET - + if(isxenomorph(L) || isalien(L)) // Xenos are dangerous return check_anomalies ? TURRET_PRIORITY_TARGET : TURRET_NOT_TARGET @@ -701,7 +700,7 @@ var/list/turret_icons playsound(loc, 'sound/items/Crowbar.ogg', 75, 1) user << "You dismantle the turret construction." new /obj/item/stack/material/steel( loc, 5) - qdel(src) // qdel + qdel(src) return if(1) diff --git a/code/modules/mining/abandonedcrates.dm b/code/modules/mining/abandonedcrates.dm index 11b90e28ea1..1039b616da6 100644 --- a/code/modules/mining/abandonedcrates.dm +++ b/code/modules/mining/abandonedcrates.dm @@ -166,7 +166,7 @@ user << "The crate's anti-tamper system activates!" var/turf/T = get_turf(src.loc) explosion(T, 0, 0, 1, 2) - del(src) + qdel(src) /obj/structure/closet/crate/secure/loot/proc/check_input(var/input) if(length(input) != codelen) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 6448c4dc843..ba42e42c75f 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -842,7 +842,7 @@ var/list/ai_verbs_default = list( // Cleaner proc for creating powersupply for an AI. /mob/living/silicon/ai/proc/create_powersupply() if(psupply) - del(psupply) + qdel(psupply) psupply = new/obj/machinery/ai_powersupply(src) #undef AI_CHECK_WIRELESS diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 319de5f4a35..6a3fd1da71c 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -1170,7 +1170,7 @@ obj/machinery/power/apc/proc/autoset(var/val, var/on) switch(severity) if(1.0) - //set_broken() //now Del() do what we need + //set_broken() //now qdel() do what we need if (cell) cell.ex_act(1.0) // more lags woohoo qdel(src) From f69c723d4000251dba376252d912969ef19ee43d Mon Sep 17 00:00:00 2001 From: mwerezak Date: Wed, 9 Sep 2015 20:34:54 -0400 Subject: [PATCH 2/3] Made flares a bit brighter --- code/game/objects/items/devices/flashlight.dm | 3 ++- html/changelogs/HarpyEagle-flare-tweak.yml | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/HarpyEagle-flare-tweak.yml diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 609bacc6c1d..88964ab6d42 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -132,7 +132,8 @@ name = "flare" desc = "A red Nanotrasen issued flare. There are instructions on the side, it reads 'pull cord, make light'." w_class = 2.0 - brightness_on = 7 // Pretty bright. + brightness_on = 8 // Pretty bright. + light_power = 3 light_color = "#e58775" icon_state = "flare" item_state = "flare" diff --git a/html/changelogs/HarpyEagle-flare-tweak.yml b/html/changelogs/HarpyEagle-flare-tweak.yml new file mode 100644 index 00000000000..49a2f323eca --- /dev/null +++ b/html/changelogs/HarpyEagle-flare-tweak.yml @@ -0,0 +1,18 @@ +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment + +author: HarpyEagle +delete-after: True + +changes: + - tweak: "Made flares brighter." From ae5810d6edc65d237b33e6e5eedb167b1bb9f6ce Mon Sep 17 00:00:00 2001 From: Vivalas Date: Thu, 10 Sep 2015 13:50:24 -0500 Subject: [PATCH 3/3] Fixes #10729 --- code/game/objects/items/devices/PDA/PDA.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 364392222ab..25f2b407cea 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -1041,7 +1041,7 @@ var/global/list/obj/item/device/pda/PDAs = list() /obj/item/device/pda/proc/new_message(var/sending_unit, var/sender, var/sender_job, var/message) var/reception_message = "\icon[src] Message from [sender] ([sender_job]), \"[message]\" (Reply)" - new_info(message_silent, newstone, reception_message) + new_info(message_silent, ttone, reception_message) log_pda("[usr] (PDA: [sending_unit]) sent \"[message]\" to [name]") new_message = 1