Merge upstream [31.07.2024]

code/datums/pod_style.dm

@@ -56,7 +56,7 @@
 	glow_color = "blue"
 	id = "deathsquad"
 
-/datum/pod_style/advanced
+/datum/pod_style/cultist
 	name = "bloody supply pod"
 	ui_name = "Cultist"
 	desc = "A Nanotrasen supply pod covered in scratch-marks, blood, and strange runes."

code/game/objects/items/crayons.dm

@@ -860,7 +860,7 @@
 		if(carbon_target.client)
 			carbon_target.set_eye_blur_if_lower(6 SECONDS)
 			carbon_target.adjust_temp_blindness(2 SECONDS)
-		if(carbon_target.get_eye_protection() <= 0) // no eye protection? ARGH IT BURNS. Warning: don't add a stun here. It's a roundstart item with some quirks.
+		if(carbon_target.get_eye_protection() <= 0 || carbon_target.is_eyes_covered()) // no eye protection? ARGH IT BURNS. Warning: don't add a stun here. It's a roundstart item with some quirks. added redundancy because gas masks don't give you eye protection
 			carbon_target.adjust_jitter(1 SECONDS)
 			carbon_target.adjust_eye_blur(0.5 SECONDS)
 			flash_color(carbon_target, flash_color=paint_color, flash_time=40)

code/modules/hydroponics/seeds.dm

@@ -638,5 +638,5 @@
 	if(length(valid_reagents))
 		// pick a valid reagent that our receptor seed don't have and add the gene to it
 		var/datum/plant_gene/reagent/selected_reagent = pick(valid_reagents)
-		genes += selected_reagent
+		genes += selected_reagent.Copy()
 		reagents_from_genes()

code/modules/mob/living/carbon/human/_species.dm

@@ -1195,9 +1195,10 @@ GLOBAL_LIST_EMPTY(features_by_species)
 
 	// Get the insulation value based on the area's temp
 	var/thermal_protection = humi.get_insulation_protection(area_temp)
+	var/original_bodytemp = humi.bodytemperature
 
 	// Changes to the skin temperature based on the area
-	var/area_skin_diff = area_temp - humi.bodytemperature
+	var/area_skin_diff = area_temp - original_bodytemp
 	if(!humi.on_fire || area_skin_diff > 0)
 		// change rate of 0.05 as area temp has large impact on the surface
 		var/area_skin_change = get_temp_change_amount(area_skin_diff, 0.05 * seconds_per_tick)
@@ -1217,7 +1218,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
 	// Core to skin temp transfer, when not on fire
 	if(!humi.on_fire)
 		// Get the changes to the skin from the core temp
-		var/core_skin_diff = humi.coretemperature - humi.bodytemperature
+		var/core_skin_diff = humi.coretemperature - original_bodytemp
 		// change rate of 0.045 to reflect temp back to the skin at the slight higher rate then core to skin
 		var/core_skin_change = (1 + thermal_protection) * get_temp_change_amount(core_skin_diff, 0.045 * seconds_per_tick)
 

code/modules/vending/subtype.dm

@@ -10,6 +10,7 @@
 	circuit = null
 	product_slogans = "Spawn \" too annoying? Too lazy to open game panel? This one's for you!;Subtype vendor, for all your debugging woes!"
 	default_price = 0
+	onstation = FALSE
 	/// Spawns coders by default
 	var/type_to_vend = /obj/item/food/grown/citrus
 

html/changelogs/AutoChangeLog-pr-85375.yml

@@ -0,0 +1,4 @@
+author: "Sadboysuss"
+delete-after: True
+changes:
+  - bugfix: "spray can face spraying will no longer work on light-sensitives with eyewear and people wearing eye covering masks"

html/changelogs/AutoChangeLog-pr-85383.yml

@@ -0,0 +1,4 @@
+author: "SmArtKar"
+delete-after: True
+changes:
+  - admin: "Subtype vendor no longer requries an ID"

html/changelogs/AutoChangeLog-pr-85393.yml

@@ -0,0 +1,4 @@
+author: "SmArtKar"
+delete-after: True
+changes:
+  - bugfix: "Fixed advanced pods showing up as cultist pods"

html/changelogs/archive/2024-07.yml

@@ -1493,3 +1493,15 @@
   - code_imp: 'improves reagent cross pollination code
 
       :cl:'
+2024-07-31:
+  Jacquerel:
+  - image: Big balls are now much rounder, to more easily slide down into a cannon.
+  SmArtKar:
+  - image: All implants have received a fresh coat of paint
+  rroqc:
+  - bugfix: 'fix a bug where botany reagents would dissapear from existing plants
+
+      :cl:'
+  thegrb93:
+  - bugfix: Fixes getting permanently hot or cold if wearing thermal insulation as
+      a lizard