Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into freegolems

code/modules/reagents/reagent_dispenser.dm

@@ -85,12 +85,13 @@
 			boom()
 
 /obj/structure/reagent_dispensers/fueltank/boom(var/rigtrigger = FALSE) // Prevent case where someone who rigged the tank is blamed for the explosion when the rig isn't what triggered the explosion
-	if(rigtrigger == TRUE) // If the explosion is triggered by an assembly holder
-		message_admins("A fueltank, last rigged by [lastrigger], exploded at [COORD(loc)]") // Then admin is informed of the last person who rigged the fuel tank
-		log_game("A fueltank, last rigged by [lastrigger], exploded at [COORD(loc)]")
-		investigate_log("A fueltank, last rigged by [lastrigger], exploded at [COORD(loc)]", INVESTIGATE_BOMB)
-	explosion(loc, 0, 1, 5, 7, 10, flame_range = 5)
-	qdel(src)
+	if(reagents.has_reagent("fuel"))
+		if(rigtrigger == TRUE) // If the explosion is triggered by an assembly holder
+			message_admins("A fueltank, last rigged by [lastrigger], exploded at [COORD(loc)]") // Then admin is informed of the last person who rigged the fuel tank
+			log_game("A fueltank, last rigged by [lastrigger], exploded at [COORD(loc)]")
+			investigate_log("A fueltank, last rigged by [lastrigger], exploded at [COORD(loc)]", INVESTIGATE_BOMB)
+		explosion(loc, 0, 1, 5, 7, 10, flame_range = 5)
+		qdel(src)
 
 /obj/structure/reagent_dispensers/fueltank/blob_act()
 	boom()

html/changelog.html

@@ -61,6 +61,15 @@
 			<ul class="changes bgimages16">
 				<li class="bugfix">Fixes a few edge cases of being able to create immunity to a few diseases</li>
 				<li class="rscadd">Adds suspiciously Voxy outfit to the game</li>
+				<li class="tweak">Lack of breathing will render you unable to speak</li>
+			</ul>
+			<h3 class="author">MINIMAN10000 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Boom function now properly checks for fuel</li>
+			</ul>
+			<h3 class="author">Tayyyyyyy, TaukaUsanake updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">pAI units now have access to a flashlight module, which can be obtained with 5 RAM points.</li>
 			</ul>
 
 			<h2 class="date">02 February 2019</h2>

html/changelogs/.all_changelog.yml

@@ -9003,3 +9003,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Fox McCloud:
   - bugfix: Fixes a few edge cases of being able to create immunity to a few diseases
   - rscadd: Adds suspiciously Voxy outfit to the game
+  - tweak: Lack of breathing will render you unable to speak
+  MINIMAN10000:
+  - bugfix: Boom function now properly checks for fuel
+  Tayyyyyyy, TaukaUsanake:
+  - rscadd: pAI units now have access to a flashlight module, which can be obtained
+      with 5 RAM points.

html/changelogs/AutoChangeLog-pr-10800.yml

@@ -1,4 +0,0 @@
-author: "Fox McCloud"
-delete-after: True
-changes: 
-  - tweak: "Lack of breathing will render you unable to speak"

html/changelogs/AutoChangeLog-pr-10817.yml

@@ -1,4 +0,0 @@
-author: "Tayyyyyyy, TaukaUsanake"
-delete-after: True
-changes: 
-  - rscadd: "pAI units now have access to a flashlight module, which can be obtained with 5 RAM points."