Merge remote-tracking branch 'upstream/master'

code/game/machinery/porta_turret/portable_turret.dm

@@ -393,6 +393,27 @@
 		spark_system.start()	//creates some sparks because they look cool
 		qdel(cover)	//deletes the cover - no need on keeping it there!
 
+//turret healing
+/obj/machinery/porta_turret/examine(mob/user)
+	. = ..()
+	if(obj_integrity < max_integrity)
+		. += "<span class='notice'>[src] is damaged, use a lit welder to fix it.</span>"
+
+/obj/machinery/porta_turret/welder_act(mob/living/user, obj/item/I)
+	. = TRUE
+	if(cover && obj_integrity < max_integrity)
+		if(!I.tool_start_check(user, amount=0))
+			return
+		user.visible_message("[user] is welding the turret.", \
+						"<span class='notice'>You begin repairing the turret...</span>", \
+						"<span class='italics'>You hear welding.</span>")
+		if(I.use_tool(src, user, 40, volume=50))
+			obj_integrity = max_integrity
+			user.visible_message("[user.name] has repaired [src].", \
+								"<span class='notice'>You finish repairing the turret.</span>")
+	else
+		to_chat(user, "<span class='notice'>The turret doesn't need repairing.</span>")
+
 /obj/machinery/porta_turret/process()
 	//the main machinery process
 	if(cover == null && anchored)	//if it has no cover and is anchored

code/modules/surgery/organs/eyes.dm

@@ -404,6 +404,7 @@
 		on_mob.set_light(1, 1, current_color_string)
 
 /obj/effect/abstract/eye_lighting
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 	var/obj/item/organ/eyes/robotic/glow/parent
 
 /obj/effect/abstract/eye_lighting/Initialize()

html/changelog.html

@@ -50,6 +50,12 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">31 January 2021</h2>
+			<h3 class="author">Putnam3145 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="balance">fermichem explosion EMPs don't cover the entire station</li>
+			</ul>
+
 			<h2 class="date">30 January 2021</h2>
 			<h3 class="author">timothyteakettle updated:</h3>
 			<ul class="changes bgimages16">

html/changelogs/.all_changelog.yml

@@ -28358,3 +28358,6 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   zeroisthebiggay:
   - rscadd: some more FUCKING hairs
   - imageadd: uncodersprites the advanced extinguisher
+2021-01-31:
+  Putnam3145:
+  - balance: fermichem explosion EMPs don't cover the entire station

modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm

@@ -93,9 +93,8 @@
 		e.set_up(round((volume/28)*(pH-9)), T, 0, 0)
 		e.start()
 
-	if(!ImpureTot == 0) //If impure, v.small emp (0.6 or less)
-		ImpureTot *= volume
-		empulse(T, volume, 1)
+	if(ImpureTot) //If impure, v.small emp (0.6 or less)
+		empulse(T, ImpureTot, 1)
 
 	my_atom.reagents.clear_reagents() //just in case
 	return