Merge upstream 16.06.2024 (ss220club#304)

## About The Pull Request

Merge upstream 16.06.2024

_maps/map_files/IceBoxStation/IceBoxStation.dmm

@@ -27555,9 +27555,9 @@
 	},
 /area/station/hallway/secondary/entry)
 "ioi" = (
-/obj/structure/bed/dogbed/lia,
 /obj/structure/cable,
-/mob/living/basic/carp/pet/lia,
+/mob/living/basic/bear/snow/misha,
+/obj/structure/bed/dogbed/misha,
 /turf/open/floor/carpet/royalblue,
 /area/station/command/heads_quarters/hos)
 "iol" = (

code/game/objects/structures/beds_chairs/bed.dm

@@ -272,6 +272,11 @@
 	name = "Cayenne's bed"
 	anchored = TRUE
 
+/obj/structure/bed/dogbed/misha
+	desc = "There is fur all over it, and some blood..."
+	name = "Misha's bed"
+	anchored = TRUE
+
 /obj/structure/bed/dogbed/lia
 	desc = "Seems kind of... fishy."
 	name = "Lia's bed"

code/modules/antagonists/traitor/objectives/kill_pet.dm

@@ -55,6 +55,7 @@
 		JOB_HEAD_OF_SECURITY = list(
 			/mob/living/basic/carp/pet/lia,
 			/mob/living/basic/spider/giant/sgt_araneus,
+			/mob/living/basic/bear/snow/misha,
 		),
 		JOB_WARDEN = list(
 			/mob/living/basic/pet/dog/pug/mcgriff

code/modules/atmospherics/machinery/portable/portable_atmospherics.dm

@@ -32,6 +32,9 @@
 	var/suppress_reactions = FALSE
 	/// Is there a hypernoblium crystal inserted into this
 	var/nob_crystal_inserted = FALSE
+	var/insert_sound = 'sound/effects/tank_insert_clunky.ogg'
+	var/remove_sound = 'sound/effects/tank_remove_thunk.ogg'
+	var/sound_vol = 50
 
 /datum/armor/machinery_portable_atmospherics
 	energy = 100
@@ -211,15 +214,23 @@
 /obj/machinery/portable_atmospherics/proc/replace_tank(mob/living/user, close_valve, obj/item/tank/new_tank)
 	if(!user)
 		return FALSE
-	if(holding)
+	if(holding && new_tank)//for when we are actually switching tanks
+		user.put_in_hands(holding)
+		UnregisterSignal(holding, COMSIG_QDELETING)
+		holding = new_tank
+		RegisterSignal(holding, COMSIG_QDELETING, PROC_REF(unregister_holding))
+		playsound(src, list(insert_sound,remove_sound), sound_vol)
+	else if(holding)//we remove a tank
 		if(Adjacent(user))
 			user.put_in_hands(holding)
 		else
 			holding.forceMove(get_turf(src))
+		playsound(src, remove_sound, sound_vol)
 		UnregisterSignal(holding, COMSIG_QDELETING)
 		holding = null
-	if(new_tank)
+	else if(new_tank)//we insert the tank
 		holding = new_tank
+		playsound(src, insert_sound, sound_vol)
 		RegisterSignal(holding, COMSIG_QDELETING, PROC_REF(unregister_holding))
 
 	SSair.start_processing_machine(src)

code/modules/events/ghost_role/sentience.dm

@@ -17,6 +17,7 @@ GLOBAL_LIST_INIT(high_priority_sentience, typecacheof(list(
 	/mob/living/basic/spider/giant/sgt_araneus,
 	/mob/living/simple_animal/bot/secbot/beepsky,
 	/mob/living/simple_animal/hostile/retaliate/goose/vomit,
+	/mob/living/basic/bear/snow/misha,
 )))
 
 /datum/round_event_control/sentience

code/modules/mob/living/basic/space_fauna/bear/_bear.dm

@@ -82,6 +82,15 @@
 	icon_dead = "snowbear_dead"
 	desc = "It's a polar bear, in space, but not actually in space."
 
+/mob/living/basic/bear/snow/misha
+	name = "Misha"
+	real_name = "Misha"
+	desc = "Tamed and trained by the Head of Security. Only beasts are above deceit."
+	gold_core_spawnable = NO_SPAWN
+	maxHealth = 250
+	health = 250
+	faction = list(FACTION_NEUTRAL)
+
 /mob/living/basic/bear/snow/ancient
 	name = "ancient polar bear"
 	desc = "A grizzled old polar bear, its hide thick enough to make it impervious to almost all weapons."

code/modules/projectiles/projectile/bullets/rifle.dm

@@ -124,7 +124,7 @@
 
 /obj/projectile/bullet/rebar/healium/on_hit(atom/target, blocked = 0, pierce_hit)
 	. = ..()
-	if(!isliving(target))
+	if(!iscarbon(target))
 		return BULLET_ACT_HIT
 	var/mob/living/breather = target
 	breather.SetSleeping(3 SECONDS)

html/changelogs/AutoChangeLog-pr-83840.yml

@@ -0,0 +1,4 @@
+author: "TheBoondock"
+delete-after: True
+changes:
+  - sound: "added compressed air sound for when air tanks are inserted into machinery"

html/changelogs/AutoChangeLog-pr-83949.yml

@@ -0,0 +1,4 @@
+author: "grungussuss"
+delete-after: True
+changes:
+  - rscadd: "Added Misha the bear to the HoS office on icebox."

html/changelogs/archive/2024-06.yml

@@ -708,3 +708,37 @@
   - bugfix: RCD material reclamation
   mc-oofert:
   - rscadd: the flatpacker, a machine unlocked at industrial engineering
+2024-06-16:
+  Archie700:
+  - qol: Changes description of steal objective to match the name
+  EnterTheJake:
+  - qol: You can now repair portable scrubbers and pumps.
+  GPeckman:
+  - bugfix: The reset button in the bluespace launchpad UI should work again.
+  Goat:
+  - bugfix: A wrecked shuttle on lavaland no longer has asteroid tiles containing
+      the danger of space.
+  - code_imp: Added volcanic versions of all mineral turfs for those that did not
+      have it.
+  GoblinBackwards:
+  - bugfix: Fixed the patient information for the mech sleeper module not displaying
+      when the mech didn't also have a syringe gun.
+  Jacquerel:
+  - rscadd: Cats and Dogs can lick slashing wounds clean.
+  - rscadd: Basic Mobs with hands can relocate dislocated bones, and pluck eyeballs
+      out of pulped skulls.
+  - balance: Gorillas can strangle people.
+  Melbert:
+  - bugfix: Fix inability to make r-glass by hand inside your backpack
+  ShizCalev:
+  - bugfix: Fixed some surgery failure states not properly setting the correct mood
+      event.
+  - refactor: Minor refactor to how surgery events work, there is now better support
+      for per-surgery mood events!
+  Wayland-Smithy:
+  - bugfix: Fixed revenant spawning next to brains and other unharvestable dead mobs.
+  WebcomicArtist:
+  - bugfix: Healium bolt now no longer affects silicons.
+  carlarctg:
+  - bugfix: Cosmos spells will no longer star mark your steed
+  - qol: Baby plushies are now smaller than their parents

sound/attributions.txt

@@ -178,3 +178,13 @@ https://freesound.org/people/shw489/sounds/234389/
 
 soup_boil1.ogg through soup_boil5.ogg and soup_boil_end.ogg are taken from Boiling Soup from Freesoung.org (CC4) and converted to OGG / split apart (but is otherwise unchanged):
 https://freesound.org/people/jorickhoofd/sounds/632783/
+
+compressed_air1.ogg is taken from Freesound and converted to ogg:
+https://freesound.org/people/Geoff-Bremner-Audio/sounds/682952/
+compressed_air2.ogg is taken from Freesound and converted to ogg:
+https://freesound.org/people/Geoff-Bremner-Audio/sounds/682816/
+tank_insert_clunky.ogg was created by mixing compressed_air1 and clunk sound from Freesound:
+https://freesound.org/people/BinaryMonkFlint/sounds/333296/
+tank_remove_thunk.ogg was made by mixing two sound tracks from Freesound:
+https://freesound.org/people/lowdjinn/sounds/533885/ and;
+https://freesound.org/people/BMacZero/sounds/96137/