more merge conflicts

code/game/objects/items/devices/lighting/flare.dm

@@ -156,11 +156,7 @@
 	icon_state = "torch-empty"
 	item_state = "torch-empty"
 	icon = 'icons/obj/lighting.dmi'
-	item_icons = list(
-		slot_l_hand_str = 'icons/mob/items/lefthand_lighting.dmi',
-		slot_r_hand_str = 'icons/mob/items/righthand_lighting.dmi',
-		)
-
+	contained_sprite = TRUE
 	drop_sound = 'sound/items/drop/woodweapon.ogg'
 	pickup_sound = 'sound/items/pickup/woodweapon.ogg'
 

code/game/objects/items/devices/lighting/flashlight.dm

@@ -3,10 +3,6 @@
 	desc = "A hand-held emergency light."
 	desc_info = "Use this item in your hand, to turn on the light. Click this light with the opposite hand, to remove the cell contained inside."
 	icon = 'icons/obj/lighting.dmi'
-	item_icons = list(
-		slot_l_hand_str = 'icons/mob/items/lefthand_lighting.dmi',
-		slot_r_hand_str = 'icons/mob/items/righthand_lighting.dmi',
-		)
 	icon_state = "flashlight"
 	item_state = "flashlight"
 	w_class = WEIGHT_CLASS_SMALL
@@ -399,10 +395,6 @@
 	desc = "A mining lantern. Accepts larger cells than normal flashlights."
 	icon_state = "lantern"
 	item_state = "lantern"
-	item_icons = list(
-		slot_l_hand_str = 'icons/mob/items/lefthand_mining.dmi',
-		slot_r_hand_str = 'icons/mob/items/righthand_mining.dmi',
-		)
 	attack_verb = list("bludgeoned, bashed, whacked")
 	matter = list(MATERIAL_STEEL = 200,MATERIAL_GLASS = 100)
 	flashlight_power = 1

code/game/objects/items/devices/lighting/lamp.dm

@@ -86,7 +86,6 @@
 	desc = "A portable, beautiful and flashy stage light!"
 	light_color = COLOR_ORANGE
 	icon_state = "stage"
-	item_state = "stage"
 
 /obj/item/device/flashlight/lamp/holodeck
 	name = "holographic lighting orb"
@@ -97,7 +96,6 @@
 	light_color = "#ffcb9b"
 	icon = 'icons/effects/props/holodeck/holodeck_tools.dmi'
 	icon_state = "orb"
-	item_state = "orb"
 
 /obj/item/device/flashlight/lamp/holodeck/attack_hand(mob/user)
 	toggle()
@@ -109,4 +107,3 @@
 	light_color = "#ffcb9b"
 	icon = 'icons/effects/props/holodeck/konyang/32x32.dmi'
 	icon_state = "boxlamp"
-	item_state = "boxlamp"

code/game/objects/items/devices/radio/headset.dm

@@ -291,6 +291,7 @@
 
 /obj/item/device/radio/headset/headset_service/alt
 	name = "service radio bowman headset"
+	icon = 'icons/obj/item/device/radio/headset_alt.dmi'
 	icon_state = "srv_headset_alt"
 	item_state = "srv_headset_alt"
 
@@ -320,6 +321,7 @@
 
 /obj/item/device/radio/headset/heads/xo/alt
 	name = "executive officer's bowman headset"
+	icon = 'icons/obj/item/device/radio/headset_alt.dmi'
 	icon_state = "hop_headset_alt"
 	item_state = "headset_alt"
 
@@ -353,6 +355,7 @@
 
 /obj/item/device/radio/headset/headset_eng/alt
 	name = "engineering bowman headset"
+	icon = 'icons/obj/item/device/radio/headset_alt.dmi'
 	icon_state = "eng_headset_alt"
 	item_state = "headset_alt"
 
@@ -382,6 +385,7 @@
 
 /obj/item/device/radio/headset/heads/ce/alt
 	name = "chief engineer's bowman headset"
+	icon = 'icons/obj/item/device/radio/headset_alt.dmi'
 	icon_state = "ce_headset_alt"
 	item_state = "headset_alt"
 
@@ -415,6 +419,7 @@
 
 /obj/item/device/radio/headset/headset_cargo/alt
 	name = "cargo bowman headset"
+	icon = 'icons/obj/item/device/radio/headset_alt.dmi'
 	icon_state = "cargo_headset_alt"
 	item_state = "headset_alt"
 
@@ -471,6 +476,7 @@
 
 /obj/item/device/radio/headset/operations_manager/alt
 	name = "operations manager bowman headset"
+	icon = 'icons/obj/item/device/radio/headset_alt.dmi'
 	icon_state = "qm_headset_alt"
 	item_state = "headset_alt"
 
@@ -504,6 +510,7 @@
 
 /obj/item/device/radio/headset/headset_med/alt
 	name = "medical bowman headset"
+	icon = 'icons/obj/item/device/radio/headset_alt.dmi'
 	icon_state = "med_headset_alt"
 	item_state = "headset_alt"
 
@@ -533,6 +540,7 @@
 
 /obj/item/device/radio/headset/heads/cmo/alt
 	name = "chief medical officer's bowman headset"
+	icon = 'icons/obj/item/device/radio/headset_alt.dmi'
 	icon_state = "cmo_headset_alt"
 	item_state = "headset_alt"
 
@@ -566,6 +574,7 @@
 
 /obj/item/device/radio/headset/headset_sci/alt
 	name = "science bowman headset"
+	icon = 'icons/obj/item/device/radio/headset_alt.dmi'
 	icon_state = "sci_headset_alt"
 
 /obj/item/device/radio/headset/alt/double/sci
@@ -594,6 +603,7 @@
 
 /obj/item/device/radio/headset/headset_xenoarch/alt
 	name = "xenoarchaeology bowman headset"
+	icon = 'icons/obj/item/device/radio/headset_alt.dmi'
 	icon_state = "sci_headset_alt"
 
 /obj/item/device/radio/headset/alt/double/xenoarch
@@ -622,6 +632,7 @@
 
 /obj/item/device/radio/headset/headset_anom/alt
 	name = "anomalist bowman headset"
+	icon = 'icons/obj/item/device/radio/headset_alt.dmi'
 	icon_state = "sci_headset_alt"
 
 /obj/item/device/radio/headset/alt/double/anom
@@ -656,6 +667,7 @@
 
 /obj/item/device/radio/headset/heads/rd/alt
 	name = "research director's bowman headset"
+	icon = 'icons/obj/item/device/radio/headset_alt.dmi'
 	icon_state = "rd_headset_alt"
 	item_state = "headset_alt"
 
@@ -689,6 +701,7 @@
 
 /obj/item/device/radio/headset/headset_sec/alt
 	name = "security bowman headset"
+	icon = 'icons/obj/item/device/radio/headset_alt.dmi'
 	icon_state = "sec_headset_alt"
 	item_state = "headset_alt"
 
@@ -718,6 +731,7 @@
 
 /obj/item/device/radio/headset/headset_warden/alt
 	name = "warden bowman headset"
+	icon = 'icons/obj/item/device/radio/headset_alt.dmi'
 	icon_state = "sec_headset_alt"
 	item_state = "headset_alt"
 
@@ -747,6 +761,7 @@
 
 /obj/item/device/radio/headset/heads/hos/alt
 	name = "head of security's bowman headset"
+	icon = 'icons/obj/item/device/radio/headset_alt.dmi'
 	icon_state = "hos_headset_alt"
 	item_state = "headset_alt"
 
@@ -780,6 +795,7 @@
 
 /obj/item/device/radio/headset/headset_com/alt
 	name = "command bowman headset"
+	icon = 'icons/obj/item/device/radio/headset_alt.dmi'
 	icon_state = "com_headset_alt"
 	item_state = "headset_alt"
 
@@ -809,6 +825,7 @@
 
 /obj/item/device/radio/headset/heads/captain/alt
 	name = "captain's bowman headset"
+	icon = 'icons/obj/item/device/radio/headset_alt.dmi'
 	icon_state = "cap_headset_alt"
 	item_state = "headset_alt"
 
@@ -886,6 +903,7 @@
 
 /obj/item/device/radio/headset/syndicate/alt
 	name = "military bowman headset"
+	icon = 'icons/obj/item/device/radio/headset_alt.dmi'
 	icon_state = "syn_headset_alt"
 	item_state = "headset_alt"
 
@@ -981,6 +999,7 @@
 
 /obj/item/device/radio/headset/ert/alt
 	name = "emergency response team bowman headset"
+	icon = 'icons/obj/item/device/radio/headset_alt.dmi'
 	icon_state = "com_headset_alt"
 	item_state = "headset_alt"
 
@@ -1003,6 +1022,7 @@
 
 /obj/item/device/radio/headset/representative/alt
 	name = "representative bowman headset"
+	icon = 'icons/obj/item/device/radio/headset_alt.dmi'
 	icon_state = "com_headset_alt"
 	item_state = "headset_alt"
 

code/game/objects/items/devices/versebook.dm

@@ -2,10 +2,6 @@
 	name = "\improper versebook"
 	desc = "If you see this, someone fucked up. Make a issue request."
 	desc_extended = "No, seriously. Make a issue request"
-	item_icons = list(
-		slot_l_hand_str = 'icons/mob/items/lefthand_books.dmi',
-		slot_r_hand_str = 'icons/mob/items/righthand_books.dmi',
-		)
 	icon = 'icons/obj/library.dmi'
 	icon_state = "dominiabook"
 	item_state = "dominia"

code/game/objects/items/toys.dm

@@ -299,6 +299,8 @@
 	name = "comic book"
 	desc = "A magazine presenting a fictional story through a sequence of images. Perfect for those long, boring shifts."
 	w_class = WEIGHT_CLASS_SMALL
+	icon = 'icons/obj/library.dmi'
+	contained_sprite = TRUE
 	icon_state = "comic"
 	item_state = "comic"
 	drop_sound = 'sound/items/drop/paper.ogg'
@@ -308,16 +310,16 @@
 	name = "inspector 404 manga"
 	desc = "Inspector 404 follows the adventures of the titular I404, a shell inspector from Konyang. This issue, #67, follows the \
 	404, also known as Kyung-Sun's quest to bring down the corrupt Superintendent Hayashi."
-	icon_state = "comicinspector"
-	item_state = "comicinspector"
+	icon_state = "comic_inspector"
+	item_state = "comic_inspector"
 
 /obj/item/toy/comic/stormman
 	name = "stormman manga"
 	desc = "Stormman, often stylized as STORMMAN! is one of Konyang's most beloved anime series, following a masked superhero named Stormman \
 	who has the power to harness the weather to defend his homeworld while keeping his secret identity. Since its release, all kinds of merchandise \
 	have been made, including a conversion of the show to a paperback manga."
-	icon_state = "comicstormman"
-	item_state = "comicstormman"
+	icon_state = "comic_stormman"
+	item_state = "comic_stormman"
 
 /obj/item/toy/comic/outlandish_tales
 	name = "outlandish tales magazine"
@@ -328,13 +330,13 @@
 	aspects of fantasy, horror, and speculative fiction alongside Adhomian paranormal elements, frequently reimagining mythological creatures and events. Tajaran Otherworldly texts are usually \
 	published in magazines or on extranet sites."
 	icon_state = "comicoutlandish"
-	item_state = "comicoutlandish"
+	item_state = "comic"
 
 /obj/item/toy/comic/azmarian
 	name = "az'marian comic"
 	desc = "A comic book series revolving around a superhero from Az'Mar, popular in the New Kingdom."
 	icon_state = "comicazmarian"
-	item_state = "comicazmarian"
+	item_state = "comic"
 
 /obj/item/toy/comic/azmarian/issue_1
 	desc_extended = "Issue 1 - The Az'Marian Landing! - In this issue, the would-be hero departs from Az'Mar and lands in a war-torn \
@@ -389,7 +391,6 @@
 	newly regained powers to their fullest."
 
 /obj/item/toy/comic/witchfinder
-	icon = 'icons/obj/library.dmi'
 	name = "Witchfinder novel"
 	desc = "A popular genre of Dominian mystery literature, glorifying the Tribunal Investigations Constabulary and the work they do in \
 	defending the souls of the people of the Empire."
@@ -399,7 +400,7 @@
 	authors of witchfinder novels, such as Novi Jadran's Andrija Jurina, even travel abroad as honored servants of His Imperial Majesty Boleslaw Keeser, both to \
 	promote Dominian arts among their foreign partners and to proselytize their state religion to eager masses."
 	icon_state = "witchfindernovel"
-	item_state = "witchfindernovel"
+	item_state = "book"
 
 //
 // Toy Crossbows

code/game/objects/items/weapons/storage/bible.dm

@@ -3,10 +3,6 @@
 	desc = "A holy item, containing the written words of a religion."
 	icon_state = "bible"
 	item_state = "bible"
-	item_icons = list(
-		slot_l_hand_str = 'icons/mob/items/lefthand_books.dmi',
-		slot_r_hand_str = 'icons/mob/items/righthand_books.dmi'
-		)
 	icon = 'icons/obj/library.dmi'
 	throw_speed = 1
 	throw_range = 5

code/modules/cciaa/cciaa_items.dm

@@ -343,6 +343,7 @@
 
 /obj/item/device/radio/headset/ert/ccia/alt
 	name = "central command internal affairs bowman headset"
+	icon = 'icons/obj/item/device/radio/headset_alt.dmi'
 	icon_state = "com_headset_alt"
 	item_state = "headset_alt"
 

code/modules/library/lib_items.dm

@@ -190,10 +190,7 @@
 /obj/item/book
 	name = "book"
 	icon = 'icons/obj/library.dmi'
-	item_icons = list(
-		slot_l_hand_str = 'icons/mob/items/lefthand_books.dmi',
-		slot_r_hand_str = 'icons/mob/items/righthand_books.dmi'
-		)
+	contained_sprite = TRUE
 	icon_state = "book"
 	desc_antag = "As a Cultist, this item can be reforged to become a cult tome."
 	throw_speed = 1

code/modules/martial_arts/martial.dm

@@ -205,10 +205,7 @@
 	name = "SolCom manual"
 	desc = "A manual designated to teach the user about the martial art of solarian combat, a style based on traditional human martial arts."
 	icon = 'icons/obj/library.dmi'
-	item_icons = list(
-		slot_l_hand_str = 'icons/mob/items/lefthand_books.dmi',
-		slot_r_hand_str = 'icons/mob/items/righthand_books.dmi'
-		)
+	contained_sprite = TRUE
 	icon_state ="cqcmanual"
 	item_state ="book1"
 	var/martial_art = /datum/martial_art/sol_combat

code/modules/mob/living/carbon/brain/brain_item.dm

@@ -13,8 +13,5 @@
 	icon = 'icons/obj/library.dmi'
 	icon_state = "scroll"
 	item_state = "scroll"
-	item_icons = list(
-		slot_l_hand_str = 'icons/mob/items/lefthand_books.dmi',
-		slot_r_hand_str = 'icons/mob/items/righthand_books.dmi'
-		)
+	contained_sprite = TRUE
 	can_prepare = 0

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm

@@ -5677,17 +5677,6 @@
 	glass_desc = "And Our Lady did come down from the mountain, and She was flanked in radiant and ever-burning cosmic fires. And She spoke with the Lady Caladius for what seemed an eternity, \
 	and the Lady Caladius did finally emerge. And we happy few were so blessed as to hear her- the Prophetess Giovanna- say, 'Drink today not as warriors, but as immortals.'."
 
-/singleton/reagent/alcohol/mimosa
-	name = "Mimosa"
-	color = "#d87606"
-	description = "Champagne and orange juice. A festive cocktail usually served at high-end events, such as weddings, business brunch, or even as a first-class drink on passenger transports."
-	strength = 35
-	taste_description = "sparkling orange juice"
-
-	glass_icon_state = "mimosa_glass"
-	glass_name = "glass of Mimosa"
-	glass_desc = "Champagne and orange juice. A festive cocktail usually served at high-end events, such as weddings, business brunch, or even as a first-class drink on passenger transports."
-
 /singleton/reagent/alcohol/lights_edge
 	name = "Light's Edge"
 	color = "#592ada"

code/modules/reagents/Chemistry-Recipes.dm

@@ -3175,13 +3175,6 @@
 	required_reagents = list(/singleton/reagent/drink/milk = 1, /singleton/reagent/nutriment/choconutspread = 1, /singleton/reagent/drink/milk/cream = 1)
 	result_amount = 3
 
-/datum/chemical_reaction/drink/drink/mimosa
-	name = "Mimosa"
-	id = "mimosa"
-	result = /singleton/reagent/alcohol/mimosa
-	required_reagents = list(/singleton/reagent/alcohol/champagne = 1, /singleton/reagent/drink/orangejuice = 1)
-	result_amount = 2
-
 /datum/chemical_reaction/drink/lights_edge
 	name = "Light's Edge"
 	id = "lights_edge"

code/modules/telesci/gps.dm

@@ -73,6 +73,13 @@ GLOBAL_LIST_EMPTY(gps_list)
 	STOP_PROCESSING(SSprocessing, src)
 	return ..()
 
+/obj/item/device/gps/attack_self(mob/user, modifiers)
+	if(!emped)
+		ui_interact(user)
+
+	var/turf/T = get_turf(src)
+	to_chat(user, SPAN_NOTICE("[icon2html(src, user)] [src] flashes <i>[T.x].[rand(0,9)]:[T.y].[rand(0,9)]:[T.z].[rand(0,9)]</i>."))
+
 /obj/item/device/gps/update_icon()
 	ClearOverlays()
 	if(emped)