Merge branch 'yogstation13:master' into master

wonderinghost · Jan 24, 2024 · 4c301ea · 4c301ea
2 parents 1022339 + 4d9507e
commit 4c301ea
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 36 deletions.
diff --git 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.

diff --git a/html/changelog.html b/html/changelog.html
@@ -57,6 +57,12 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">23 January 2024</h2>
+			<h3 class="author">Moltijoe updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixes an issue with blood decals</li>
+			</ul>
+
 			<h2 class="date">22 January 2024</h2>
 			<h3 class="author">Moltijoe updated:</h3>
 			<ul class="changes bgimages16">
@@ -1409,42 +1415,6 @@ <h3 class="author">warface1234455 updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Ethereal heart now gives a crystallization cooldown timer on status panel</li>
 			</ul>
-
-			<h2 class="date">25 October 2023</h2>
-			<h3 class="author">JohnFulpWillard updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Wands now work as intended again.</li>
-				<li class="bugfix">Wizard hardsuits no longer block spell usage.</li>
-			</ul>
-			<h3 class="author">SapphicOverload updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">fixed nuclear reactor not outputting power correctly</li>
-			</ul>
-			<h3 class="author">ToasterBiome updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="mapping">box lawyer office actually has spawns now</li>
-			</ul>
-
-			<h2 class="date">24 October 2023</h2>
-			<h3 class="author">Addust updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">oopsies</li>
-				<li class="bugfix">charlie station AGCNR no longer blows out invariably</li>
-			</ul>
-			<h3 class="author">Aquizit updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Lawyers now have access to their shutter buttons</li>
-			</ul>
-			<h3 class="author">LoliconSlayer updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Asimov++ law 3 no longer contradicts itself</li>
-			</ul>
-			<h3 class="author">cowbot92 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Adds new Heretic paths</li>
-				<li class="soundadd">Adds new heretic sounds</li>
-				<li class="imageadd">added new sprites, icons, and actions</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>

diff --git 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