[MIRROR] Various fixes & tweaks (#10582)

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>

archive/maps/submaps/depreciated_vr/talon.dm

@@ -6,8 +6,8 @@ var/global/list/latejoin_talon = list()
 	delete_me = 1
 
 /obj/effect/landmark/talon/Initialize(mapload)
-	. = ..()
 	latejoin_talon += loc // Register this turf as tram latejoin.
+	. = ..()
 
 /datum/spawnpoint/talon
 	display_name = "ITV Talon Cryo"

code/game/machinery/adv_med.dm

@@ -215,7 +215,7 @@
 			var/blood_volume = round(H.vessel.get_reagent_amount(REAGENT_ID_BLOOD))
 			var/blood_max = H.species.blood_volume
 			bloodData["volume"] = blood_volume
-			bloodData["percent"] = round(((blood_volume / blood_max)*100))
+			bloodData["percent"] = blood_max ? round(((blood_volume / blood_max)*100)) : 0
 
 		occupantData["blood"] = bloodData
 

code/game/machinery/atmoalter/portable_atmospherics.dm

@@ -2,7 +2,7 @@
 	name = "atmoalter"
 	use_power = USE_POWER_OFF
 	layer = OBJ_LAYER // These are mobile, best not be under everything.
-	var/datum/gas_mixture/air_contents = new
+	var/datum/gas_mixture/air_contents
 
 	var/obj/machinery/atmospherics/portables_connector/connected_port
 	var/obj/item/tank/holding
@@ -15,9 +15,9 @@
 
 /obj/machinery/portable_atmospherics/Initialize(mapload)
 	..()
-	if(air_contents)
-		air_contents.volume = volume
-		air_contents.temperature = T20C
+	air_contents = new
+	air_contents.volume = volume
+	air_contents.temperature = T20C
 	return INITIALIZE_HINT_LATELOAD
 
 /obj/machinery/portable_atmospherics/LateInitialize()

code/game/objects/structures/transit_tubes.dm

@@ -43,7 +43,7 @@
 	anchored = TRUE
 	density = TRUE
 	var/moving = 0
-	var/datum/gas_mixture/air_contents = new()
+	var/datum/gas_mixture/air_contents
 
 
 
@@ -80,7 +80,7 @@
 
 /obj/structure/transit_tube_pod/Initialize(mapload)
 	. = ..()
-
+	air_contents = new()
 	air_contents.adjust_multi(GAS_O2, MOLES_O2STANDARD * 2, GAS_N2, MOLES_N2STANDARD)
 	air_contents.temperature = T20C
 

code/modules/artifice/deadringer.dm

@@ -52,9 +52,11 @@
 
 /obj/item/deadringer/process()
 	if(activated)
-		if (ismob(src.loc))
+		if(ishuman(src.loc))
 			var/mob/living/carbon/human/H = src.loc
 			watchowner = H
+			if(isbelly(watchowner.loc)) //No spawning people in bellies.
+				return
 			if(H.getBruteLoss() > bruteloss_prev || H.getFireLoss() > fireloss_prev)
 				deathprevent()
 				activated = 0
@@ -81,7 +83,7 @@
 		if(!D.has_AI())
 			continue
 		D.ai_holder.lose_target()
-	watchowner.alpha = 15
+	watchowner.alpha = 7 //10 is too visible, 5 is too in-visible... 7 is difficult to see but manageable.
 	makeacorpse(watchowner)
 	return
 
@@ -96,8 +98,6 @@
 		return
 	corpse = new /mob/living/carbon/human(H.loc)
 	qdel_swap(corpse.dna,H.dna.Clone())
-	corpse.emote("deathgasp")
-	corpse.death(1) //Kills the new mob
 	var/obj/item/clothing/temp = null
 	if(H.get_equipped_item(slot_w_uniform))
 		corpse.equip_to_slot_or_del(new /obj/item/clothing/under/chameleon/changeling(corpse), slot_w_uniform)
@@ -162,6 +162,8 @@
 	corpse.flavor_texts = H.flavor_texts.Copy()
 	corpse.real_name = H.real_name
 	corpse.name = H.name
+	corpse.emote("deathgasp") //Done after the name is set.
+	corpse.death(1) //Kills the new mob
 	corpse.set_species(corpse.dna.species)
 	corpse.change_hair(H.h_style)
 	corpse.change_facial_hair(H.f_style)

code/modules/client/preferences.dm

@@ -315,8 +315,7 @@ var/list/preferences_datums = list()
 	else if(href_list["close"])
 		// User closed preferences window, cleanup anything we need to.
 		clear_character_previews()
-		if(GLOB.mannequins[client_ckey])
-			qdel_null(GLOB.mannequins[client_ckey])
+		//Mannequin removal code needed here...For the far future once harddels are solved.
 		return 1
 	else
 		return 0

code/modules/research/designs/xenobio_toys_vr.dm

@@ -2,8 +2,8 @@
 	name = "bluespace monkey deployment system"
 	desc = "An Advanced monkey teleportation and rehydration system. For serious monkey business."
 	id = "monkey_gun"
-	req_tech = list(TECH_MATERIAL = 3, TECH_BIO = 3, TECH_POWER = 4, TECH_COMBAT = 4, TECH_BLUESPACE = 6)
-	materials = list(MAT_PLASTEEL = 5000, MAT_GLASS = 5000, MAT_DIAMOND = 500, MAT_MORPHIUM = 350)
+	req_tech = list(TECH_BIO = 6, TECH_BLUESPACE = 5)
+	materials = list(MAT_STEEL = 3500, MAT_GLASS = 3500, MAT_PHORON = 1500, MAT_DIAMOND = 1500)
 	build_path = /obj/item/xenobio/monkey_gun
 	sort_string = "HBBA"
 

tgui/packages/tgui-panel/chat/renderer.tsx

@@ -231,17 +231,18 @@ class ChatRenderer {
     this.lastScrollHeight = 0;
     this.handleScroll = (type) => {
       const node = this.scrollNode;
-      if (node) {
-        const height = node.scrollHeight;
-        const bottom = node.scrollTop + node.offsetHeight;
-        const scrollTracking =
-          Math.abs(height - bottom) < SCROLL_TRACKING_TOLERANCE ||
-          this.lastScrollHeight === 0;
-        if (scrollTracking !== this.scrollTracking) {
-          this.scrollTracking = scrollTracking;
-          this.events.emit('scrollTrackingChanged', scrollTracking);
-          logger.debug('tracking', this.scrollTracking);
-        }
+      if (!node) {
+        return;
+      }
+      const height = node.scrollHeight;
+      const bottom = node.scrollTop + node.offsetHeight;
+      const scrollTracking =
+        Math.abs(height - bottom) < SCROLL_TRACKING_TOLERANCE ||
+        this.lastScrollHeight === 0;
+      if (scrollTracking !== this.scrollTracking) {
+        this.scrollTracking = scrollTracking;
+        this.events.emit('scrollTrackingChanged', scrollTracking);
+        logger.debug('tracking', this.scrollTracking);
       }
     };
     this.ensureScrollTracking = () => {

tgui/packages/tgui/interfaces/PublicLibraryWiki/WikiPages/WikiSearchPage.tsx

@@ -11,7 +11,7 @@ import { WikiChemistryPage } from './WikiSubPages/WikiChemistryPage';
 import { WikiFoodPage } from './WikiSubPages/WikiFoodPage';
 import { WikiMaterialPage } from './WikiSubPages/WikiMaterialPage';
 import { WikiNoDataPage } from './WikiSubPages/WikiNoDataPage';
-import { WikiOrePage } from './WikiSubPages/WikiOrePare';
+import { WikiOrePage } from './WikiSubPages/WikiOrePage';
 import { WikiParticlePage } from './WikiSubPages/WikiParticlePage';
 
 export const WikiSearchPage = (

tgui/packages/tgui/styles/functions.scss

@@ -26,17 +26,6 @@
 //  Color
 // --------------------------------------------------------
 
-// Increases perceptual color lightness.
-@function lighten($color, $percent) {
-  $scaled: hsl(
-    color.channel($color, 'hue', $space: hsl),
-    color.channel($color, 'saturation', $space: hsl),
-    color.channel($color, 'lightness', $space: hsl) * (1 + num($percent))
-  );
-  $mixed: color.mix(hsl(0, 0%, 100%), $color, 100% * num($percent));
-  @return color.mix($scaled, $mixed, 75%);
-}
-
 // Returns the NTSC luminance of `$color` as a float (between 0 and 1).
 // 1 is pure white, 0 is pure black.
 @function luminance($color) {

tgui/packages/tgui/styles/interfaces/NuclearBomb.scss

@@ -1,3 +1,5 @@
+@use 'sass:color';
+
 @use '../base.scss';
 @use '../colors.scss';
 @use '../functions.scss' as *;
@@ -27,8 +29,11 @@ $background-beige: hsl(52, 40%, 85%);
   background-color: $background-beige;
   border-color: $background-beige;
   &:hover {
-    background-color: lighten($background-beige, 15%) !important;
-    border-color: lighten($background-beige, 15%) !important;
+    background-color: color.adjust(
+      $background-beige,
+      $lightness: 15%
+    ) !important;
+    border-color: color.adjust($background-beige, $lightness: 15%) !important;
   }
 }
 
@@ -42,8 +47,8 @@ $background-beige: hsl(52, 40%, 85%);
   background-color: $color-caution !important;
   border-color: $color-caution !important;
   &:hover {
-    background-color: lighten($color-caution, 15%) !important;
-    border-color: lighten($color-caution, 15%) !important;
+    background-color: color.adjust($color-caution, $lightness: 15%) !important;
+    border-color: color.adjust($color-caution, $lightness: 15%) !important;
   }
 }
 
@@ -51,8 +56,8 @@ $background-beige: hsl(52, 40%, 85%);
   background-color: $color-danger !important;
   border-color: $color-danger !important;
   &:hover {
-    background-color: lighten($color-danger, 15%) !important;
-    border-color: lighten($color-danger, 15%) !important;
+    background-color: color.adjust($color-danger, $lightness: 15%) !important;
+    border-color: color.adjust($color-danger, $lightness: 15%) !important;
   }
 }
 

tgui/packages/tgui/styles/layouts/Window.scss

@@ -67,7 +67,7 @@
   bottom: 0;
   left: 0;
   right: 0;
-  background-color: rgba(lighten(base.$color-bg, 30%), 0.25);
+  background-color: rgba(color.adjust(base.$color-bg, $lightness: 30%), 0.25);
   pointer-events: none;
 }