Merge remote-tracking branch 'skrat/master' into upstream-2024-02-03

# Conflicts:
#	_maps/map_files/IceBoxStation/IceBoxStation.dmm
#	_maps/map_files/KiloStation/KiloStation.dmm
#	_maps/map_files/tramstation/tramstation.dmm
#	_maps/skyrat/automapper/automapper_config.toml
#	code/controllers/subsystem/statpanel.dm
#	code/datums/chatmessage.dm
#	code/datums/quirks/negative_quirks/claustrophobia.dm
#	code/game/objects/items/tools/weldingtool.dm
#	code/modules/client/preferences/middleware/quirks.dm
#	code/modules/mob/living/carbon/carbon_defense.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/inventory.dm
#	code/modules/mob/living/living_say.dm
#	code/modules/modular_computers/file_system/programs/jobmanagement.dm
#	code/modules/projectiles/guns/energy/kinetic_accelerator.dm
#	code/modules/research/designs/mechfabricator_designs.dm
#	code/modules/research/machinery/_production.dm
#	code/modules/surgery/organs/internal/_internal_organ.dm
#	html/changelogs/archive/2024-01.yml
#	modular_skyrat/modules/automapper/code/area_spawn_entries.dm
#	modular_skyrat/modules/jukebox/code/jukebox_subsystem.dm
#	modular_skyrat/modules/loadouts/loadout_items/loadout_datum_heads.dm
#	modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm
#	modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm
#	modular_skyrat/modules/synths/code/bodyparts/power_cord.dm
#	tgstation.dme
#	tgui/packages/tgui/components/Dropdown.tsx
#	tgui/packages/tgui/components/Input.tsx
#	tgui/packages/tgui/interfaces/Fabrication/DesignBrowser.tsx
#	tgui/packages/tgui/interfaces/Jukebox.jsx
#	tgui/packages/tgui/interfaces/PreferencesMenu/QuirksPage.tsx
#	tgui/packages/tgui/interfaces/PreferencesMenu/data.ts
#	tgui/packages/tgui/interfaces/common/SearchBar.tsx

code/game/objects/structures/flora.dm

@@ -455,7 +455,7 @@
 	icon_state = "pinepresents"
 	desc = "A wondrous decorated Christmas tree. It has presents!"
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF //protected by the christmas spirit
-	obj_flags = /obj::obj_flags | NO_DECONSTRUCTION
+	obj_flags = parent_type::obj_flags | NO_DECONSTRUCTION
 	var/gift_type = /obj/item/gift/anything
 	var/unlimited = FALSE
 	var/static/list/took_presents //shared between all xmas trees
@@ -1118,4 +1118,3 @@
 	. = ..()
 	icon_state = "lavarocks[rand(1, 3)]"
 	update_appearance()
-