From 620025ec07d3662cfe95a324981554cbe836d35e Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Sun, 9 Jan 2022 07:26:37 -0800 Subject: [PATCH 1/7] Makes drunkenness work properly again (#15463) --- code/modules/mob/living/carbon/life.dm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index 196c5ff654..28c5ca5334 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -573,9 +573,6 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put if(druggy) adjust_drugginess(-1) - if(drunkenness) - drunkenness = max(drunkenness-1,0) - if(silent) silent = max(silent-1, 0) @@ -583,7 +580,7 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put handle_hallucinations() if(drunkenness) - drunkenness = max(drunkenness - (drunkenness * 0.04), 0) + drunkenness *= 0.96 if(drunkenness >= 6) SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "drunk", /datum/mood_event/drunk) if(prob(25)) @@ -598,6 +595,7 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put SEND_SIGNAL(src, COMSIG_CLEAR_MOOD_EVENT, "drunk") clear_alert("drunk") sound_environment_override = SOUND_ENVIRONMENT_NONE + drunkenness = max(drunkenness - 0.2, 0) if(mind && (mind.assigned_role == "Scientist" || mind.assigned_role == "Research Director")) if(SSresearch.science_tech) From e591ad6fdfc56bdb4f27fdbfad990f988693980d Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 9 Jan 2022 09:26:40 -0600 Subject: [PATCH 2/7] Automatic changelog generation for PR #15463 [ci skip] --- html/changelogs/AutoChangeLog-pr-15463.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15463.yml diff --git a/html/changelogs/AutoChangeLog-pr-15463.yml b/html/changelogs/AutoChangeLog-pr-15463.yml new file mode 100644 index 0000000000..66485ff0e8 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15463.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - bugfix: "Alcohol works again" From 4de727ce6ebbb48fd31f9e3d5ee278ecf5b6059e Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sun, 9 Jan 2022 07:59:29 -0800 Subject: [PATCH 3/7] Update SDQL_2.dm (#15462) --- code/modules/admin/verbs/SDQL2/SDQL_2.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm index 498355f7c3..51299a17bd 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm @@ -242,7 +242,7 @@ var/selectors_used = FALSE var/list/combined_refs = list() do - CHECK_TICK + stoplag(2) finished = TRUE for(var/i in running) var/datum/SDQL2_query/query = i From d7cbb017f61cd5d60598e434b402b1bd4162ceda Mon Sep 17 00:00:00 2001 From: Lin Date: Sun, 9 Jan 2022 16:23:48 +0000 Subject: [PATCH 4/7] Fix few instances of bleeding white blood (#15398) * no longer bleed white blood * parentheses man * fix that one bdm map spawn too --- .../lavaland_surface_mining_site.dmm | 54 ++++++++++++++----- code/datums/wounds/bones.dm | 12 ++++- code/datums/wounds/pierce.dm | 12 ++++- .../mecha/equipment/tools/mining_tools.dm | 6 ++- .../temporary_visuals/miscellaneous.dm | 1 + 5 files changed, 66 insertions(+), 19 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_mining_site.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_mining_site.dmm index c5074528f1..6161bd8b86 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_mining_site.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_mining_site.dmm @@ -54,7 +54,10 @@ /area/ruin/lavaland/unpowered) "m" = ( /obj/structure/mineral_door/wood, -/obj/effect/decal/cleanable/trail_holder, +/obj/effect/decal/cleanable/trail_holder{ + color = "#dc0000"; + dir = 8 + }, /turf/open/floor/wood, /area/ruin/lavaland/unpowered) "n" = ( @@ -68,7 +71,10 @@ /obj/machinery/light/broken{ dir = 4 }, -/obj/effect/decal/cleanable/trail_holder, +/obj/effect/decal/cleanable/trail_holder{ + color = "#dc0000"; + dir = 6 + }, /turf/open/floor/wood, /area/ruin/lavaland/unpowered) "q" = ( @@ -93,13 +99,33 @@ /turf/open/floor/wood, /area/ruin/lavaland/unpowered) "s" = ( -/obj/effect/decal/cleanable/trail_holder, +/obj/effect/decal/cleanable/trail_holder{ + color = "#dc0000"; + dir = 9 + }, +/turf/open/floor/wood, +/area/ruin/lavaland/unpowered) +"x" = ( +/obj/effect/decal/cleanable/trail_holder{ + color = "#dc0000"; + dir = 8 + }, /turf/open/floor/wood, /area/ruin/lavaland/unpowered) "N" = ( -/obj/effect/decal/cleanable/trail_holder, +/obj/effect/decal/cleanable/trail_holder{ + color = "#dc0000"; + dir = 8 + }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) +"Q" = ( +/obj/effect/decal/cleanable/trail_holder{ + color = "#dc0000"; + dir = 6 + }, +/turf/open/floor/wood, +/area/ruin/lavaland/unpowered) (1,1,1) = {" i @@ -440,7 +466,7 @@ f f f f -s +x b b i @@ -467,7 +493,7 @@ g f f f -s +x b b i @@ -494,7 +520,7 @@ f f f f -s +x b b i @@ -521,7 +547,7 @@ j f f f -s +x b b i @@ -548,7 +574,7 @@ k f f f -s +x b b i @@ -575,7 +601,7 @@ l f f s -s +Q b b i @@ -627,7 +653,7 @@ i b b b -s +x b b b @@ -654,7 +680,7 @@ i i i b -s +x b i i @@ -681,7 +707,7 @@ i i i b -s +x b i i @@ -708,7 +734,7 @@ i i i b -s +x b i i diff --git a/code/datums/wounds/bones.dm b/code/datums/wounds/bones.dm index 128c860a6d..bf5c0f55d2 100644 --- a/code/datums/wounds/bones.dm +++ b/code/datums/wounds/bones.dm @@ -119,12 +119,20 @@ victim.bleed(blood_bled, TRUE) if(14 to 19) victim.visible_message("[victim] spits out a string of blood from the blow to [victim.p_their()] chest!", "You spit out a string of blood from the blow to your chest!", vision_distance=COMBAT_MESSAGE_RANGE) - new /obj/effect/temp_visual/dir_setting/bloodsplatter(victim.loc, victim.dir) + if(ishuman(victim)) + var/mob/living/carbon/human/H = victim + new /obj/effect/temp_visual/dir_setting/bloodsplatter(victim.loc, victim.dir, H.dna.species.exotic_blood_color) + else + new /obj/effect/temp_visual/dir_setting/bloodsplatter(victim.loc, victim.dir) victim.bleed(blood_bled) if(20 to INFINITY) victim.visible_message("[victim] chokes up a spray of blood from the blow to [victim.p_their()] chest!", "You choke up on a spray of blood from the blow to your chest!", vision_distance=COMBAT_MESSAGE_RANGE) victim.bleed(blood_bled) - new /obj/effect/temp_visual/dir_setting/bloodsplatter(victim.loc, victim.dir) + if(ishuman(victim)) + var/mob/living/carbon/human/H = victim + new /obj/effect/temp_visual/dir_setting/bloodsplatter(victim.loc, victim.dir, H.dna.species.exotic_blood_color) + else + new /obj/effect/temp_visual/dir_setting/bloodsplatter(victim.loc, victim.dir) victim.add_splatter_floor(get_step(victim.loc, victim.dir)) diff --git a/code/datums/wounds/pierce.dm b/code/datums/wounds/pierce.dm index b26728c377..434a711109 100644 --- a/code/datums/wounds/pierce.dm +++ b/code/datums/wounds/pierce.dm @@ -39,12 +39,20 @@ victim.bleed(blood_bled, TRUE) if(14 to 19) victim.visible_message("A small stream of blood spurts from the hole in [victim]'s [limb.name]!", "You spit out a string of blood from the blow to your [limb.name]!", vision_distance=COMBAT_MESSAGE_RANGE) - new /obj/effect/temp_visual/dir_setting/bloodsplatter(victim.loc, victim.dir) + if(ishuman(victim)) + var/mob/living/carbon/human/H = victim + new /obj/effect/temp_visual/dir_setting/bloodsplatter(victim.loc, victim.dir, H.dna.species.exotic_blood_color) + else + new /obj/effect/temp_visual/dir_setting/bloodsplatter(victim.loc, victim.dir) victim.bleed(blood_bled) if(20 to INFINITY) victim.visible_message("A spray of blood streams from the gash in [victim]'s [limb.name]!", "You choke up on a spray of blood from the blow to your [limb.name]!", vision_distance=COMBAT_MESSAGE_RANGE) victim.bleed(blood_bled) - new /obj/effect/temp_visual/dir_setting/bloodsplatter(victim.loc, victim.dir) + if(ishuman(victim)) + var/mob/living/carbon/human/H = victim + new /obj/effect/temp_visual/dir_setting/bloodsplatter(victim.loc, victim.dir, H.dna.species.exotic_blood_color) + else + new /obj/effect/temp_visual/dir_setting/bloodsplatter(victim.loc, victim.dir) victim.add_splatter_floor(get_step(victim.loc, victim.dir)) /datum/wound/pierce/handle_process() diff --git a/code/game/mecha/equipment/tools/mining_tools.dm b/code/game/mecha/equipment/tools/mining_tools.dm index 06e4208d71..47820d1e27 100644 --- a/code/game/mecha/equipment/tools/mining_tools.dm +++ b/code/game/mecha/equipment/tools/mining_tools.dm @@ -130,7 +130,11 @@ if(isalien(target)) new /obj/effect/temp_visual/dir_setting/bloodsplatter/xenosplatter(target.drop_location(), splatter_dir) else - new /obj/effect/temp_visual/dir_setting/bloodsplatter(target.drop_location(), splatter_dir) + if(ishuman(target)) + var/mob/living/carbon/human/H = target + new /obj/effect/temp_visual/dir_setting/bloodsplatter(target.drop_location(), splatter_dir, H.dna.species.exotic_blood_color) + else + new /obj/effect/temp_visual/dir_setting/bloodsplatter(target.drop_location(), splatter_dir) //organs go everywhere if(target_part && prob(10 * drill_level)) diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm index d7eeb2789b..543bad1fb8 100644 --- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm +++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm @@ -4,6 +4,7 @@ duration = 5 randomdir = FALSE layer = BELOW_MOB_LAYER + color = BLOOD_COLOR_HUMAN // set it to red by default because the actual icons are white var/splatter_type = "splatter" /obj/effect/temp_visual/dir_setting/bloodsplatter/Initialize(mapload, set_dir, new_color) From 91667debc71345ac8c1448387f395e844410b65e Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 9 Jan 2022 10:23:51 -0600 Subject: [PATCH 5/7] Automatic changelog generation for PR #15398 [ci skip] --- html/changelogs/AutoChangeLog-pr-15398.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15398.yml diff --git a/html/changelogs/AutoChangeLog-pr-15398.yml b/html/changelogs/AutoChangeLog-pr-15398.yml new file mode 100644 index 0000000000..00cd4522cc --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15398.yml @@ -0,0 +1,5 @@ +author: "Linzolle" +delete-after: True +changes: + - bugfix: "bloodsplatter effects no longer white in certain cases" + - bugfix: "the blood in the BDM ruin is no longer white" From 0077f682fde4ae8e6d1831f448a4ef8ccad00813 Mon Sep 17 00:00:00 2001 From: Hatterhat <31829017+Hatterhat@users.noreply.github.com> Date: Sun, 9 Jan 2022 11:46:48 -0600 Subject: [PATCH 6/7] crusher gauntlets - resonator hitsound, sharpness to SHARP_NONE (#15458) * boo womp * wrongsonator Co-authored-by: Hatterhat --- code/modules/mining/equipment/kinetic_crusher.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index 91078bb135..409cdb825b 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -245,6 +245,8 @@ those who wish to spit in the eyes of God. Sacrifices outright damage for \ a reliance on backstabs and the ability to give fauna concussions on a parry." attack_verb = list("pummeled", "punched", "jabbed", "hammer-fisted", "uppercut", "slammed") + hitsound = 'sound/weapons/resonator_blast.ogg' + sharpness = SHARP_NONE // use your survival dagger or smth icon_state = "crusher-hands" item_state = "crusher0-fist" unique_reskin = list("Gauntlets" = "crusher-hands", From 7bae2cdab36be4d79b1dd71479c6095d4768752f Mon Sep 17 00:00:00 2001 From: Changelogs Date: Mon, 10 Jan 2022 00:31:36 +0000 Subject: [PATCH 7/7] Automatic changelog compile [ci skip] --- html/changelog.html | 18 +++++++++++------- html/changelogs/.all_changelog.yml | 6 ++++++ html/changelogs/AutoChangeLog-pr-15398.yml | 5 ----- html/changelogs/AutoChangeLog-pr-15463.yml | 4 ---- 4 files changed, 17 insertions(+), 16 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-15398.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-15463.yml diff --git a/html/changelog.html b/html/changelog.html index 01b03a7766..da0ba48e8b 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,17 @@ -->
+

10 January 2022

+

Linzolle updated:

+
    +
  • bloodsplatter effects no longer white in certain cases
    • +
  • the blood in the BDM ruin is no longer white
    • +
+

Putnam3145 updated:

+
    +
  • Alcohol works again
    • +
+

07 January 2022

MrJWhit updated:

    @@ -395,13 +406,6 @@
    • Crayon precision mode.
    - -

    08 November 2021

    -

    timothyteakettle updated:

    -
      -
    • fixes party pod sprite
      • -
    • fixes red panda head marking
      • -
GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 27da9da63f..b58c419ceb 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -30466,3 +30466,9 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. 2022-01-07: MrJWhit: - rscadd: Adds an airlock between atmos and engineering on omega. +2022-01-10: + Linzolle: + - bugfix: bloodsplatter effects no longer white in certain cases + - bugfix: the blood in the BDM ruin is no longer white + Putnam3145: + - bugfix: Alcohol works again diff --git a/html/changelogs/AutoChangeLog-pr-15398.yml b/html/changelogs/AutoChangeLog-pr-15398.yml deleted file mode 100644 index 00cd4522cc..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15398.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Linzolle" -delete-after: True -changes: - - bugfix: "bloodsplatter effects no longer white in certain cases" - - bugfix: "the blood in the BDM ruin is no longer white" diff --git a/html/changelogs/AutoChangeLog-pr-15463.yml b/html/changelogs/AutoChangeLog-pr-15463.yml deleted file mode 100644 index 66485ff0e8..0000000000 --- a/html/changelogs/AutoChangeLog-pr-15463.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - bugfix: "Alcohol works again"