From d3d50e29609a5665f6ca15827de6957a56ba3beb Mon Sep 17 00:00:00 2001 From: Molti <108117184+Moltijoe@users.noreply.github.com> Date: Mon, 22 Jan 2024 23:17:10 -0600 Subject: [PATCH 1/4] Update blood.dm (#21234) --- code/modules/mob/living/blood.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm index ad04d2d20b2b..caa73cd6a21a 100644 --- a/code/modules/mob/living/blood.dm +++ b/code/modules/mob/living/blood.dm @@ -331,6 +331,10 @@ var/datum/blood_type/blood_type = blood_dna[blood_print] if(!blood_type) return null + if(!istype(blood_type))//maybe a letter somehow got passed here, check anyways + blood_type = get_blood_type(blood_type) + if(!blood_type || !istype(blood_type)) + return null return blood_type.color //to add a splatter of blood or other mob liquid. From 252c38bacc497c9c112a693871ab53b2d84a98ce Mon Sep 17 00:00:00 2001 From: Yogbot-13 Date: Tue, 23 Jan 2024 00:17:13 -0500 Subject: [PATCH 2/4] Automatic changelog generation #21234 [ci skip] --- html/changelogs/AutoChangelog-pr-21234.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangelog-pr-21234.yml diff --git a/html/changelogs/AutoChangelog-pr-21234.yml b/html/changelogs/AutoChangelog-pr-21234.yml new file mode 100644 index 000000000000..c5286edb3573 --- /dev/null +++ b/html/changelogs/AutoChangelog-pr-21234.yml @@ -0,0 +1,4 @@ +author: "Moltijoe" +delete-after: true +changes: + - bugfix: "Fixes an issue with blood decals" From de9764f478905c7a4344ff98f4a2b95dba8775d6 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Tue, 23 Jan 2024 06:11:43 +0000 Subject: [PATCH 3/4] Automatic changelog compile [ci skip] --- html/changelog.html | 27 +++++----------------- html/changelogs/.all_changelog.yml | 3 +++ html/changelogs/AutoChangelog-pr-21234.yml | 4 ---- 3 files changed, 9 insertions(+), 25 deletions(-) delete mode 100644 html/changelogs/AutoChangelog-pr-21234.yml diff --git a/html/changelog.html b/html/changelog.html index f3cadcf3947c..8bbab4331f80 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -57,6 +57,12 @@ -->
+

23 January 2024

+

Moltijoe updated:

+
    +
  • Fixes an issue with blood decals
    • +
+

22 January 2024

Moltijoe updated:

    @@ -1424,27 +1430,6 @@

    ToasterBiome updated:

    • box lawyer office actually has spawns now
    - -

    24 October 2023

    -

    Addust updated:

    -
      -
    • oopsies
      • -
    • charlie station AGCNR no longer blows out invariably
      • -
    -

    Aquizit updated:

    -
      -
    • Lawyers now have access to their shutter buttons
      • -
    -

    LoliconSlayer updated:

    -
      -
    • Asimov++ law 3 no longer contradicts itself
      • -
    -

    cowbot92 updated:

    -
      -
    • Adds new Heretic paths
      • -
    • Adds new heretic sounds
      • -
    • added new sprites, icons, and actions
      • -
GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index f22da5fef77a..3bac1be04892 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -42876,3 +42876,6 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - tweak: '''Solo'' special syndi-kit is now slightly more balanced. David. David you aren''t going to let this stop you are you David. Get to work David ignore the EMPs. Take your pills get to work.' +2024-01-23: + Moltijoe: + - bugfix: Fixes an issue with blood decals diff --git a/html/changelogs/AutoChangelog-pr-21234.yml b/html/changelogs/AutoChangelog-pr-21234.yml deleted file mode 100644 index c5286edb3573..000000000000 --- a/html/changelogs/AutoChangelog-pr-21234.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Moltijoe" -delete-after: true -changes: - - bugfix: "Fixes an issue with blood decals" From 4d9507eb04cee160b287b6cd719560cad30b2041 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Wed, 24 Jan 2024 06:11:54 +0000 Subject: [PATCH 4/4] Automatic changelog compile [ci skip] --- html/changelog.html | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/html/changelog.html b/html/changelog.html index 8bbab4331f80..c13c3fb55e54 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -1415,21 +1415,6 @@

warface1234455 updated:

  • Ethereal heart now gives a crystallization cooldown timer on status panel
- -

25 October 2023

-

JohnFulpWillard updated:

-
    -
  • Wands now work as intended again.
    • -
  • Wizard hardsuits no longer block spell usage.
    • -
-

SapphicOverload updated:

-
    -
  • fixed nuclear reactor not outputting power correctly
    • -
-

ToasterBiome updated:

-
    -
  • box lawyer office actually has spawns now
    • -
GoonStation 13 Development Team