From 04797a961b1ed797a9a23458eb6ef623428e6e63 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Wed, 8 Dec 2021 05:07:22 +0100 Subject: [PATCH 1/4] linters b gone --- code/game/objects/items/stunbaton.dm | 10 +++++++--- code/modules/holiday/halloween/jacqueen.dm | 5 ++++- .../research/xenobiology/crossbreeding/_misc.dm | 11 +++++++++-- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm index 6cc2385e62..6db1e4baae 100644 --- a/code/game/objects/items/stunbaton.dm +++ b/code/game/objects/items/stunbaton.dm @@ -368,12 +368,16 @@ if(ishuman(hit_atom) && !caught && prob(throw_hit_chance) && thrownby)//if they are a carbon and they didn't catch it baton_stun(hit_atom, thrownby, shoving = TRUE) if(thrownby && !caught) - sleep(1) - if(!QDELETED(src)) - throw_at(thrownby, throw_range+2, throw_speed, null, TRUE) + throw_back() else return ..() +/obj/item/melee/baton/boomerang/proc/throw_back() + set waitfor = FALSE + sleep(1) + if(!QDELETED(src)) + throw_at(thrownby, throw_range+2, throw_speed, null, TRUE) + /obj/item/melee/baton/boomerang/update_icon() if(turned_on) icon_state = "[initial(icon_state)]_active" diff --git a/code/modules/holiday/halloween/jacqueen.dm b/code/modules/holiday/halloween/jacqueen.dm index fb16a9c9a7..9f41fb0f79 100644 --- a/code/modules/holiday/halloween/jacqueen.dm +++ b/code/modules/holiday/halloween/jacqueen.dm @@ -731,9 +731,12 @@ /obj/item/reagent_containers/potion_container/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) ..() + delayed_release_smoke() + +/obj/item/reagent_containers/potion_container/proc/delayed_release_smoke() sleep(20) var/datum/effect_system/smoke_spread/chem/s = new() - s.set_up(src.reagents, 3, src.loc) + s.set_up(src.reagents, 3, get_turf(src)) s.start() qdel(src) diff --git a/code/modules/research/xenobiology/crossbreeding/_misc.dm b/code/modules/research/xenobiology/crossbreeding/_misc.dm index 4684352ef5..97a87a5e01 100644 --- a/code/modules/research/xenobiology/crossbreeding/_misc.dm +++ b/code/modules/research/xenobiology/crossbreeding/_misc.dm @@ -92,6 +92,10 @@ icon_state = "capturedevice" /obj/item/capturedevice/attack(mob/living/M, mob/user) + try_catching(M, user) + +/obj/item/capturedevice/proc/try_catching(mob/living/M, mob/user) + set waitfor = FALSE if(length(contents)) to_chat(user, "The device already has something inside.") return @@ -116,7 +120,7 @@ to_chat(user, "This creature is too aggressive to capture.") return to_chat(user, "You store [M] in the capture device.") - store(M) + store(M, user) /obj/item/capturedevice/attack_self(mob/user) if(contents.len) @@ -125,7 +129,10 @@ else to_chat(user, "The device is empty...") -/obj/item/capturedevice/proc/store(var/mob/living/M) +/obj/item/capturedevice/proc/store(var/mob/living/M, mob/user) + if(length(contents)) + to_chat(user, "The device already has something inside.") + return M.forceMove(src) /obj/item/capturedevice/proc/release() From f0ff064dc1b1f087928195dca4e39ffc74c6c8f9 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Wed, 8 Dec 2021 05:12:32 +0100 Subject: [PATCH 2/4] missed a line --- code/modules/holiday/halloween/jacqueen.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/holiday/halloween/jacqueen.dm b/code/modules/holiday/halloween/jacqueen.dm index 9f41fb0f79..01272a9b86 100644 --- a/code/modules/holiday/halloween/jacqueen.dm +++ b/code/modules/holiday/halloween/jacqueen.dm @@ -734,6 +734,7 @@ delayed_release_smoke() /obj/item/reagent_containers/potion_container/proc/delayed_release_smoke() + set waitfor = FALSE sleep(20) var/datum/effect_system/smoke_spread/chem/s = new() s.set_up(src.reagents, 3, get_turf(src)) From 4dd6a547b8734806c6dc5c38b2698848532b1dd4 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Wed, 8 Dec 2021 05:28:13 +0100 Subject: [PATCH 3/4] mayhaps? --- strings/flavor_objectives/traitor/assistant.txt | 1 + strings/flavor_objectives/traitor/engineering.txt | 1 + strings/flavor_objectives/traitor/medical.txt | 1 + 3 files changed, 3 insertions(+) diff --git a/strings/flavor_objectives/traitor/assistant.txt b/strings/flavor_objectives/traitor/assistant.txt index e69de29bb2..0ce4c3b131 100644 --- a/strings/flavor_objectives/traitor/assistant.txt +++ b/strings/flavor_objectives/traitor/assistant.txt @@ -0,0 +1 @@ +There are no flavor objectives for this job so you got this one because it's needed for Github to stop screaming. If you get this because someone enabled flavor objectives without rechecking them, yell at coders. \ No newline at end of file diff --git a/strings/flavor_objectives/traitor/engineering.txt b/strings/flavor_objectives/traitor/engineering.txt index e69de29bb2..0ce4c3b131 100644 --- a/strings/flavor_objectives/traitor/engineering.txt +++ b/strings/flavor_objectives/traitor/engineering.txt @@ -0,0 +1 @@ +There are no flavor objectives for this job so you got this one because it's needed for Github to stop screaming. If you get this because someone enabled flavor objectives without rechecking them, yell at coders. \ No newline at end of file diff --git a/strings/flavor_objectives/traitor/medical.txt b/strings/flavor_objectives/traitor/medical.txt index e69de29bb2..0ce4c3b131 100644 --- a/strings/flavor_objectives/traitor/medical.txt +++ b/strings/flavor_objectives/traitor/medical.txt @@ -0,0 +1 @@ +There are no flavor objectives for this job so you got this one because it's needed for Github to stop screaming. If you get this because someone enabled flavor objectives without rechecking them, yell at coders. \ No newline at end of file From 745138068c7d8211be5d6f891f9c4ac127eccd68 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 7 Dec 2021 23:14:49 -0600 Subject: [PATCH 4/4] Automatic changelog generation for PR #15417 [ci skip] --- html/changelogs/AutoChangeLog-pr-15417.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15417.yml diff --git a/html/changelogs/AutoChangeLog-pr-15417.yml b/html/changelogs/AutoChangeLog-pr-15417.yml new file mode 100644 index 0000000000..2008aeafa8 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15417.yml @@ -0,0 +1,4 @@ +author: "DeltaFire15" +delete-after: True +changes: + - bugfix: "Linters should no longer scream."