Merge branch 'master' into rig

code/modules/clothing/head/helmet.dm

@@ -677,7 +677,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
 				if(length(total_visors) > iterator)
 					var/obj/item/device/helmet_visor/next_visor = total_visors[iterator + 1]
 
-					if(!isnull(GLOB.huds[next_visor.hud_type].hudusers[user]))
+					if(!isnull(GLOB.huds[next_visor.hud_type]?.hudusers[user]))
 						iterator++
 						skipped_hud = TRUE
 						continue
@@ -694,7 +694,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
 
 	for(var/obj/item/device/helmet_visor/new_visor in total_visors)
 
-		if(!isnull(GLOB.huds[new_visor.hud_type].hudusers[user]))
+		if(!isnull(GLOB.huds[new_visor.hud_type]?.hudusers[user]))
 			continue
 
 		active_visor = new_visor

code/modules/mob/living/living_healthscan.dm

@@ -178,7 +178,7 @@ GLOBAL_LIST_INIT(known_implants, subtypesof(/obj/item/implant))
 				bleeding_check = TRUE
 				break
 
-			if((!limb.brute_dam && !limb.burn_dam && !(limb.status & LIMB_DESTROYED)) && !bleeding_check && !internal_bleeding_check && !(implant && detail_level >= DETAIL_LEVEL_BODYSCAN ) && !(limb.status & LIMB_UNCALIBRATED_PROSTHETIC) && !(limb.status & LIMB_BROKEN) && !(limb.status & LIMB_SPLINTED) && !(limb.status & LIMB_SPLINTED_INDESTRUCTIBLE))
+			if((!limb.brute_dam && !limb.burn_dam && !(limb.status & LIMB_DESTROYED)) && !bleeding_check && !internal_bleeding_check && !(implant && detail_level >= DETAIL_LEVEL_BODYSCAN ) && !(limb.status & LIMB_UNCALIBRATED_PROSTHETIC) && !(limb.status & LIMB_BROKEN) && !(limb.status & LIMB_SPLINTED) && !(limb.status & LIMB_SPLINTED_INDESTRUCTIBLE) && !(limb.get_incision_depth()))
 				continue
 			var/list/core_body_parts = list("head", "chest", "groin")
 			var/list/current_list = list(
@@ -190,7 +190,6 @@ GLOBAL_LIST_INIT(known_implants, subtypesof(/obj/item/implant))
 				"missing" = (limb.status & LIMB_DESTROYED),
 				"limb_status" = null,
 				"bleeding" = bleeding_check,
-				"open_incision" = limb.get_incision_depth(),
 				"implant" = implant,
 				"internal_bleeding" = internal_bleeding_check
 			)
@@ -248,6 +247,24 @@ GLOBAL_LIST_INIT(known_implants, subtypesof(/obj/item/implant))
 			if(limb_type)
 				current_list["limb_type"] = limb_type
 
+			//checking for open incisions, but since eyes and mouths incisions are "head incisions" but not "head surgeries" gotta do some snowflake
+			if(limb.name == "head")
+				if(human_target_mob.active_surgeries["head"])
+					current_list["open_incision"] = TRUE
+
+				var/zone
+				if(human_target_mob.active_surgeries["eyes"])
+					zone = "eyes"
+				if(human_target_mob.active_surgeries["mouth"])
+					if(zone)
+						zone = "eyes and mouth"
+					else
+						zone = "mouth"
+				current_list["open_zone_incision"] = capitalize(zone)
+
+			else
+				current_list["open_incision"] = limb.get_incision_depth()
+
 			limb_data_lists["[limb.name]"] = current_list
 
 		data["limb_data_lists"] = limb_data_lists

code/modules/tgui/tgui_number_input.dm

@@ -158,11 +158,13 @@
 		return
 	switch(action)
 		if("submit")
-			if(!isnum(params["entry"]))
-				CRASH("A non number was input into tgui input number by [usr]")
 			var/choice = params["entry"]
+			if(!isnum(choice))
+				CRASH("A non number was input into tgui input number by [usr]")
+			if(choice != choice) //isnan
+				CRASH("A NaN was input into tgui input number by [usr]")
 			if(integer_only)
-				choice = round(params["entry"])
+				choice = round(choice)
 			if(choice > max_value)
 				CRASH("A number greater than the max value was input into tgui input number by [usr]")
 			if(choice < min_value)

html/changelogs/archive/2024-02.yml

@@ -85,3 +85,18 @@
       that are already active on your character.
   cuberound:
   - balance: increases flare pouch storage slots from 8 to 16
+2024-02-05:
+  Drathek:
+  - bugfix: Added more null testing to helmet visors.
+  Poltava:
+  - imageadd: updated intel expedition chestrig sprite
+  SpartanBobby:
+  - maptweak: Fixes the two gauss sentry guns that were boxxed in by a mapper over
+      a year ago on ice 3
+  Warfan1815:
+  - bugfix: Open surgical incisions now show up on a health scanner even if there
+      is nothing else wrong.
+  - bugfix: Open surgical incisions in the head "zones" (mouth and eyes) now show
+      up independently on health scanner
+  cuberound:
+  - balance: increases healing node heal from 10hp every 5 sec to 20 hp every 5 sec

maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm

@@ -9203,10 +9203,6 @@
 "dYp" = (
 /turf/closed/wall/shiva/ice,
 /area/shiva/interior/bar)
-"dYw" = (
-/obj/structure/machinery/defenses/sentry/premade,
-/turf/open/auto_turf/snow/layer0,
-/area/shiva/exterior/junkyard)
 "dZb" = (
 /obj/structure/closet/secure_closet/guncabinet,
 /obj/structure/machinery/firealarm{
@@ -45631,7 +45627,7 @@ kyD
 tHd
 pDr
 tHd
-dYw
+kyD
 kyD
 kyD
 kyD
@@ -45793,7 +45789,7 @@ tHd
 kyD
 pDr
 kyD
-dYw
+kyD
 kyD
 kyD
 kyD

tgui/packages/tgui/interfaces/HealthScan.jsx

@@ -389,6 +389,11 @@ const ScannerLimbs = (props) => {
                       [Embedded Object]
                     </Box>
                   ) : null}
+                  {limb.open_zone_incision ? (
+                    <Box inline color={'red'} bold={1}>
+                      [Open Surgical Incision In {limb.open_zone_incision}]
+                    </Box>
+                  ) : null}
                 </Flex.Item>
               </>
             )}