MERGE SHIT REEEEE IMMAH PUNCH A WALL

code/modules/admin/verbs/spawnfloorcluwne.dm

@@ -2,25 +2,29 @@
 	set category = "Event"
 	set name = "Unleash Floor Cluwne"
 	set desc = "Pick a specific target or just let it select randomly and spawn the floor cluwne mob on the station. Be warned: spawning more than one may cause issues!"
-	var/target
+	var/mob/living/carbon/human/target
 
 	if(!check_rights(R_EVENT))
 		return
 
-	var/confirm = alert("Are you sure you want to release a floor cluwne and kill alot of people?", "Confirm Massacre", "Yes", "No")
+	var/confirm = alert("Are you sure you want to release a floor cluwne and kill a lot of people?", "Confirm Massacre", "Yes", "No")
 	if(confirm == "Yes")
 
 		var/turf/T = get_turf(usr)
-		target = input("Any specific target in mind? Please note only live, non cluwned, human targets are valid.", "Target", target) as null|anything in GLOB.player_list
-		if(isnull(target))
+		var/list/potential_targets = list()
+		for(var/mob/M in GLOB.player_list)
+			var/mob/living/carbon/human/H = M
+			if(!istype(H))
+				continue
+			if(H.mind.assigned_role == "Cluwne")
+				continue
+			potential_targets += H
+		if(!potential_targets.len) //You're probably the only player on this damn station, spawn it yourself
+			to_chat(src, "<span class='notice'>No valid targets!</span>")
 			return
-		if(target && ishuman(target))
-			var/mob/living/carbon/human/H = target
-			var/mob/living/simple_animal/hostile/floor_cluwne/FC = new /mob/living/simple_animal/hostile/floor_cluwne(T)
-			FC.Acquire_Victim(H)
-		else
-			new /mob/living/simple_animal/hostile/floor_cluwne(T)
-		log_admin("[key_name(usr)] spawned floor cluwne.")
-		message_admins("[key_name(usr)] spawned floor cluwne.")
-	else
-		return
+		target = input("Any specific target in mind? Please note only live, non cluwned, human targets are valid.", "Target", target) as null|anything in potential_targets
+		var/mob/living/simple_animal/hostile/floor_cluwne/FC = new /mob/living/simple_animal/hostile/floor_cluwne(T)
+		if(target)
+			FC.Acquire_Victim(target)
+		log_admin("[key_name(usr)] spawned floor cluwne[target ? ", initially targetting [target]": null].")
+		message_admins("[key_name(usr)] spawned floor cluwne[target ? ", initially targetting [target]": null].")

code/modules/clothing/glasses/hud.dm

@@ -83,6 +83,7 @@
 	origin_tech = "magnets=3;combat=2"
 	var/global/list/jobs[0]
 	HUDType = DATA_HUD_SECURITY_ADVANCED
+	var/read_only = FALSE
 	species_fit = list("Vox")
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/eyes.dmi',
@@ -114,6 +115,9 @@
 	invis_view = SEE_INVISIBLE_MINIMUM //don't render darkness while wearing these
 	prescription_upgradable = 0
 
+/obj/item/clothing/glasses/hud/security/sunglasses/read_only
+	read_only = TRUE
+
 /obj/item/clothing/glasses/hud/security/sunglasses
 	name = "HUDSunglasses"
 	desc = "Sunglasses with a HUD."

code/modules/clothing/head/hardhat.dm

@@ -11,12 +11,15 @@
 	flags_inv = 0
 	actions_types = list(/datum/action/item_action/toggle_helmet_light)
 	burn_state = FIRE_PROOF
+	species_fit = list("Grey")
+	sprite_sheets = list(
+		"Grey" = 'icons/mob/species/grey/head.dmi'
+	)
 
 /obj/item/clothing/head/hardhat/attack_self(mob/user)
 	on = !on
 	icon_state = "hardhat[on]_[item_color]"
 	item_state = "hardhat[on]_[item_color]"
-
 	if(on)
 		set_light(brightness_on)
 	else

code/modules/clothing/head/misc.dm

@@ -70,6 +70,11 @@
 	desc = "A plastic replica of a syndicate agent's space helmet, you'll look just like a real murderous syndicate agent in this! This is a toy, it is not made for use in space!"
 	flags = BLOCKHAIR
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
+	species_fit = list("Grey")
+	sprite_sheets = list(
+	"Grey" = 'icons/mob/species/grey/helmet.dmi'
+	)
+
 
 /obj/item/clothing/head/cueball
 	name = "cueball helmet"
@@ -79,6 +84,10 @@
 	flags = BLOCKHAIR
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
 	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
+	species_fit = list("Grey")
+	sprite_sheets = list(
+	"Grey" = 'icons/mob/species/grey/head.dmi'
+	)
 
 /obj/item/clothing/head/snowman
 	name = "snowman head"
@@ -88,6 +97,10 @@
 	flags = BLOCKHAIR
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
 	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
+	species_fit = list("Grey")
+	sprite_sheets = list(
+	"Grey" = 'icons/mob/species/grey/head.dmi'
+	)
 
 /obj/item/clothing/head/that
 	name = "sturdy top-hat"
@@ -246,6 +259,10 @@
 	icon_state = "chickenhead"
 	item_state = "chickensuit"
 	flags = BLOCKHAIR
+	species_fit = list("Grey")
+	sprite_sheets = list(
+	"Grey" = 'icons/mob/species/grey/head.dmi'
+	)
 
 /obj/item/clothing/head/corgi
 	name = "corgi suit head"
@@ -396,6 +413,10 @@
 	item_state = "griffinhat"
 	flags = BLOCKHAIR
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
+	species_fit = list("Grey")
+	sprite_sheets = list(
+	"Grey" = 'icons/mob/species/grey/head.dmi'
+	)
 	actions_types = list(/datum/action/item_action/caw)
 
 /obj/item/clothing/head/griffin/attack_self()
@@ -425,6 +446,10 @@
 	icon_state = "papersack"
 	flags = BLOCKHAIR
 	flags_inv = HIDEFACE|HIDEEARS
+	species_fit = list("Grey")
+	sprite_sheets = list(
+	"Grey" = 'icons/mob/species/grey/head.dmi'
+	)
 
 /obj/item/clothing/head/papersack/smiley
 	name = "paper sack hat"
@@ -432,6 +457,10 @@
 	icon_state = "papersack_smile"
 	flags = BLOCKHAIR
 	flags_inv = HIDEFACE|HIDEEARS
+	species_fit = list("Grey")
+	sprite_sheets = list(
+	"Grey" = 'icons/mob/species/grey/head.dmi'
+	)
 
 /obj/item/clothing/head/crown
 	name = "crown"

code/modules/clothing/head/misc_special.dm

@@ -131,6 +131,10 @@
 	flags_inv = HIDEEARS
 	cold_protection = HEAD
 	min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
+	species_fit = list("Grey")
+	sprite_sheets = list(
+	"Grey" = 'icons/mob/species/grey/head.dmi'
+	)
 
 /obj/item/clothing/head/ushanka/attack_self(mob/user as mob)
 	if(src.icon_state == "ushankadown")
@@ -154,6 +158,10 @@
 	flags = BLOCKHAIR
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
 	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
+	species_fit = list("Grey")
+	sprite_sheets = list(
+		"Grey" = 'icons/mob/species/grey/head.dmi'
+	)
 
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
 	brightness_on = 2 //luminosity when on
@@ -221,6 +229,11 @@
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
 	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
 	species_disguise = "High-tech robot"
+	species_fit = list("Grey")
+	sprite_sheets = list(
+	"Grey" = 'icons/mob/species/grey/head.dmi'
+	)
+
 
 /obj/item/clothing/head/cardborg/equipped(mob/living/user, slot)
 	..()

code/modules/clothing/masks/miscellaneous.dm

@@ -98,14 +98,13 @@
 		"Grey" = 'icons/mob/species/grey/mask.dmi'
 		)
 
-/obj/item/clothing/mask/muzzle/tapegag/dropped(mob/living/carbon/human/user)
-	var/atom/movable/R = new /obj/item/trash/tapetrash
-	var/turf/T = get_turf(src)
-	R.loc = T
-	transfer_fingerprints_to(R)
-	playsound(src,'sound/items/poster_ripped.ogg',40,1)
+/obj/item/clothing/mask/muzzle/tapegag/dropped(mob/user)
+	var/obj/item/trash/tapetrash/TT = new(drop_location(src))
+	transfer_fingerprints_to(TT)
+	user.transfer_fingerprints_to(TT)
+	playsound(src, 'sound/items/poster_ripped.ogg', 40, 1)
+	..()
 	user.emote("scream")
-	. = ..()
 
 /obj/item/clothing/mask/muzzle/safety
 	name = "safety muzzle"
@@ -295,8 +294,10 @@
 	var/voicechange = 0
 	var/temporaryname = " the Horse"
 	var/originalname = ""
-
-
+	species_fit = list("Grey")
+	sprite_sheets = list(
+		"Grey" = 'icons/mob/species/grey/mask.dmi'
+	)
 
 /obj/item/clothing/mask/horsehead/equipped(mob/user, slot)
 	if(flags & NODROP)	//cursed masks only

code/modules/clothing/shoes/miscellaneous.dm

@@ -79,7 +79,6 @@
 	slowdown = SHOES_SLOWDOWN+1
 	item_color = "clown"
 	var/footstep = 1	//used for squeeks whilst walking
-	silence_steps = 1
 	shoe_sound = "clownstep"
 
 /obj/item/clothing/shoes/jackboots
@@ -93,7 +92,6 @@
 	put_on_delay = 50
 	burn_state = FIRE_PROOF
 	var/footstep = 1
-	silence_steps = 1
 	shoe_sound = "jackboot"
 
 /obj/item/clothing/shoes/jackboots/jacksandals
@@ -182,10 +180,10 @@
 	item_state = "noble_boot"
 
 /obj/item/clothing/shoes/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/stack/tape_roll))
+	if(istype(I, /obj/item/stack/tape_roll) && !silence_steps)
 		var/obj/item/stack/tape_roll/TR = I
 		if((!silence_steps || shoe_sound) && TR.use(4))
-			silence_steps = 1
+			silence_steps = TRUE
 			shoe_sound = null
 			to_chat(user, "You tape the soles of [src] to silence your footsteps.")
 	else

code/modules/clothing/spacesuits/miscellaneous.dm

@@ -99,8 +99,22 @@
 	name = "Santa's hat"
 	desc = "Ho ho ho. Merrry X-mas!"
 	icon_state = "santahat"
+	species_fit = list("Grey, Drask")
+	sprite_sheets = list(
+		"Grey" = 'icons/mob/species/Grey/head.dmi',
+		"Drask" = 'icons/mob/species/Drask/helmet.dmi'
+		)
 	flags = BLOCKHAIR | STOPSPRESSUREDMAGE
 	flags_cover = HEADCOVERSEYES
+/obj/item/clothing/head/helmet/space/santahat/attack_self(mob/user as mob)
+	if(src.icon_state == "santahat")
+		src.icon_state = "santahat_beard"
+		src.item_state = "santahat_beard"
+		to_chat(user, "Santa's beard expands out from the hat!")
+	else
+		src.icon_state = "santahat"
+		src.item_state = "santahat"
+		to_chat(user, "The beard slinks back into the hat...")
 
 /obj/item/clothing/suit/space/santa
 	name = "Santa's suit"
@@ -165,10 +179,9 @@
 	desc = "A brand new paramedic EVA suit. The nitrile seems a bit too thin to be space proof. Used for retrieving bodies in space."
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20)
 	species_restricted = list("exclude", "Diona", "Wryn")
-	species_fit = list("Vox", "Grey" , "Skrell" , "Tajaran" , "Drask" , "Unathi" , "Vulpkanin")
+	species_fit = list("Vox", "Skrell" , "Tajaran" , "Drask" , "Unathi" , "Vulpkanin")
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/suit.dmi',
-		"Grey" = 'icons/mob/species/grey/suit.dmi',
 		"Skrell" = 'icons/mob/species/skrell/suit.dmi',
 		"Tajaran" = 'icons/mob/species/tajaran/suit.dmi',
 		"Drask" = 'icons/mob/species/drask/suit.dmi',

code/modules/clothing/suits/bio.dm

@@ -9,10 +9,11 @@
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20)
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
 	burn_state = FIRE_PROOF
-	species_fit = list("Vox")
+	species_fit = list("Vox", "Grey")
 	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/helmet.dmi'
-		)
+		"Vox" = 'icons/mob/species/vox/helmet.dmi',
+		"Grey" = 'icons/mob/species/grey/head.dmi'
+	)
 
 /obj/item/clothing/suit/bio_suit
 	name = "bio suit"

code/modules/clothing/suits/utility.dm

@@ -77,7 +77,8 @@
 	burn_state = FIRE_PROOF
 	species_fit = list("Vox")
 	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/helmet.dmi'
+		"Vox" = 'icons/mob/species/vox/helmet.dmi',
+		"Grey" = 'icons/mob/species/grey/head.dmi'
 		)
 
 /obj/item/clothing/suit/bomb_suit
@@ -130,7 +131,8 @@
 	burn_state = FIRE_PROOF
 	species_fit = list("Vox")
 	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/head.dmi'
+		"Vox" = 'icons/mob/species/vox/head.dmi',
+		"Grey" = 'icons/mob/species/grey/head.dmi'
 		)
 
 /obj/item/clothing/suit/radiation

code/modules/crafting/recipes.dm

@@ -247,6 +247,14 @@
 	reqs = list(/obj/item/paper = 5)
 	category = CAT_MISC
 
+/datum/crafting_recipe/sushimat
+	name = "Sushi Mat"
+	result = /obj/item/kitchen/sushimat
+	time = 10
+	reqs = list(/obj/item/stack/sheet/wood = 1,
+				/obj/item/stack/cable_coil = 2)
+	category = CAT_MISC
+
 /datum/crafting_recipe/notreallysoap
 	name = "Homemade Soap"
 	result = /obj/item/soap/ducttape

code/modules/food_and_drinks/drinks/drinks.dm

@@ -114,6 +114,8 @@
 			reagents.chem_temp += 15
 			to_chat(user, "<span class='notice'>You heat [src] with [I].</span>")
 			reagents.handle_reactions()
+	else
+		return ..()
 
 /obj/item/reagent_containers/food/drinks/examine(mob/user)
 	if(!..(user, 1))

code/modules/food_and_drinks/food/condiment.dm

@@ -26,9 +26,6 @@
 	 "sugar" = list("emptycondiment", "sugar bottle", "Tasty spacey sugar!"))
 	var/originalname = "condiment" //Can't use initial(name) for this. This stores the name set by condimasters.
 
-/obj/item/reagent_containers/food/condiment/attackby(obj/item/W, mob/user, params)
-	return
-
 /obj/item/reagent_containers/food/condiment/attack_self(mob/user)
 	return
 
@@ -55,9 +52,6 @@
 	playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
 	return 1
 
-/obj/item/reagent_containers/food/condiment/attackby(obj/item/I, mob/user, params)
-	return
-
 /obj/item/reagent_containers/food/condiment/afterattack(obj/target, mob/user , proximity)
 	if(!proximity)
 		return

code/modules/food_and_drinks/food/foods/seafood.dm

@@ -97,6 +97,16 @@
 	bitesize = 3
 	list_reagents = list("nutriment" = 2)
 
+/obj/item/reagent_containers/food/snacks/sliceable/Ebi_maki
+	name = "Ebi Makiroll"
+	desc = "A large unsliced roll of Ebi Sushi."
+	icon = 'icons/obj/food/seafood.dmi'
+	icon_state = "Ebi_maki"
+	slice_path = /obj/item/reagent_containers/food/snacks/sushi_Ebi
+	slices_num = 4
+	bitesize = 3
+	list_reagents = list("nutriment" = 8)
+
 /obj/item/reagent_containers/food/snacks/sushi_Ebi
 	name = "Ebi Sushi"
 	desc = "A simple sushi consisting of cooked shrimp and rice."
@@ -105,6 +115,16 @@
 	bitesize = 3
 	list_reagents = list("nutriment" = 2)
 
+/obj/item/reagent_containers/food/snacks/sliceable/Ikura_maki
+	name = "Ikura Makiroll"
+	desc = "A large unsliced roll of Ikura Sushi."
+	icon = 'icons/obj/food/seafood.dmi'
+	icon_state = "Ikura_maki"
+	slice_path = /obj/item/reagent_containers/food/snacks/sushi_Ikura
+	slices_num = 4
+	bitesize = 3
+	list_reagents = list("nutriment" = 8, "protein" = 4)
+
 /obj/item/reagent_containers/food/snacks/sushi_Ikura
 	name = "Ikura Sushi"
 	desc = "A simple sushi consisting of salmon roe."
@@ -113,6 +133,16 @@
 	bitesize = 3
 	list_reagents = list("nutriment" = 2, "protein" = 1)
 
+/obj/item/reagent_containers/food/snacks/sliceable/Sake_maki
+	name = "Sake Makiroll"
+	desc = "A large unsliced roll of Ebi Sushi."
+	icon = 'icons/obj/food/seafood.dmi'
+	icon_state = "Sake_maki"
+	slice_path = /obj/item/reagent_containers/food/snacks/sushi_Sake
+	slices_num = 4
+	bitesize = 3
+	list_reagents = list("nutriment" = 8)
+
 /obj/item/reagent_containers/food/snacks/sushi_Sake
 	name = "Sake Sushi"
 	desc = "A simple sushi consisting of raw salmon and rice."
@@ -121,6 +151,16 @@
 	bitesize = 3
 	list_reagents = list("nutriment" = 2)
 
+/obj/item/reagent_containers/food/snacks/sliceable/SmokedSalmon_maki
+	name = "Smoked Salmon Makiroll"
+	desc = "A large unsliced roll of Smoked Salmon Sushi."
+	icon = 'icons/obj/food/seafood.dmi'
+	icon_state = "SmokedSalmon_maki"
+	slice_path = /obj/item/reagent_containers/food/snacks/sushi_SmokedSalmon
+	slices_num = 4
+	bitesize = 3
+	list_reagents = list("nutriment" = 8)
+
 /obj/item/reagent_containers/food/snacks/sushi_SmokedSalmon
 	name = "Smoked Salmon Sushi"
 	desc = "A simple sushi consisting of cooked salmon and rice."
@@ -129,6 +169,16 @@
 	bitesize = 3
 	list_reagents = list("nutriment" = 2)
 
+/obj/item/reagent_containers/food/snacks/sliceable/Tamago_maki
+	name = "Tamago Makiroll"
+	desc = "A large unsliced roll of Tamago Sushi."
+	icon = 'icons/obj/food/seafood.dmi'
+	icon_state = "Tamago_maki"
+	slice_path = /obj/item/reagent_containers/food/snacks/sushi_Tamago
+	slices_num = 4
+	bitesize = 3
+	list_reagents = list("nutriment" = 8)
+
 /obj/item/reagent_containers/food/snacks/sushi_Tamago
 	name = "Tamago Sushi"
 	desc = "A simple sushi consisting of egg and rice."
@@ -137,6 +187,16 @@
 	bitesize = 3
 	list_reagents = list("nutriment" = 2)
 
+/obj/item/reagent_containers/food/snacks/sliceable/Inari_maki
+	name = "Inari Makiroll"
+	desc = "A large unsliced roll of Inari Sushi."
+	icon = 'icons/obj/food/seafood.dmi'
+	icon_state = "Inari_maki"
+	slice_path = /obj/item/reagent_containers/food/snacks/sushi_Inari
+	slices_num = 4
+	bitesize = 3
+	list_reagents = list("nutriment" = 8)
+
 /obj/item/reagent_containers/food/snacks/sushi_Inari
 	name = "Inari Sushi"
 	desc = "A piece of fried tofu stuffed with rice."
@@ -145,6 +205,16 @@
 	bitesize = 3
 	list_reagents = list("nutriment" = 2)
 
+/obj/item/reagent_containers/food/snacks/sliceable/Masago_maki
+	name = "Masago Makiroll"
+	desc = "A large unsliced roll of Masago Sushi."
+	icon = 'icons/obj/food/seafood.dmi'
+	icon_state = "Masago_maki"
+	slice_path = /obj/item/reagent_containers/food/snacks/sushi_Masago
+	slices_num = 4
+	bitesize = 3
+	list_reagents = list("nutriment" = 8, "protein" = 4)
+
 /obj/item/reagent_containers/food/snacks/sushi_Masago
 	name = "Masago Sushi"
 	desc = "A simple sushi consisting of goldfish roe."
@@ -153,6 +223,16 @@
 	bitesize = 3
 	list_reagents = list("nutriment" = 2, "protein" = 1)
 
+/obj/item/reagent_containers/food/snacks/sliceable/Tobiko_maki
+	name = "Tobiko Makiroll"
+	desc = "A large unsliced roll of Tobkio Sushi."
+	icon = 'icons/obj/food/seafood.dmi'
+	icon_state = "Tobiko_maki"
+	slice_path = /obj/item/reagent_containers/food/snacks/sushi_Tobiko
+	slices_num = 4
+	bitesize = 3
+	list_reagents = list("nutriment" = 8, "protein" = 4)
+
 /obj/item/reagent_containers/food/snacks/sushi_Tobiko
 	name = "Tobiko Sushi"
 	desc = "A simple sushi consisting of shark roe."
@@ -161,6 +241,16 @@
 	bitesize = 3
 	list_reagents = list("nutriment" = 2, "protein" = 1)
 
+/obj/item/reagent_containers/food/snacks/sliceable/TobikoEgg_maki
+	name = "Tobiko and Egg Makiroll"
+	desc = "A large unsliced roll of Tobkio and Egg Sushi."
+	icon = 'icons/obj/food/seafood.dmi'
+	icon_state = "TobikoEgg_maki"
+	slice_path = /obj/item/reagent_containers/food/snacks/sushi_TobikoEgg
+	slices_num = 4
+	bitesize = 3
+	list_reagents = list("nutriment" = 8, "protein" = 4)
+
 /obj/item/reagent_containers/food/snacks/sushi_TobikoEgg
 	name = "Tobiko and Egg Sushi"
 	desc = "A sushi consisting of shark roe and an egg."
@@ -169,6 +259,16 @@
 	bitesize = 3
 	list_reagents = list("nutriment" = 2, "protein" = 1)
 
+/obj/item/reagent_containers/food/snacks/sliceable/Tai_maki
+	name = "Tai Makiroll"
+	desc = "A large unsliced roll of Tai Sushi."
+	icon = 'icons/obj/food/seafood.dmi'
+	icon_state = "Tai_maki"
+	slice_path = /obj/item/reagent_containers/food/snacks/sushi_Tai
+	slices_num = 4
+	bitesize = 3
+	list_reagents = list("nutriment" = 8)
+
 /obj/item/reagent_containers/food/snacks/sushi_Tai
 	name = "Tai Sushi"
 	desc = "A simple sushi consisting of catfish and rice."

code/modules/food_and_drinks/food/snacks.dm

@@ -79,7 +79,7 @@
 	if(istype(W,/obj/item/storage))
 		..() // -> item/attackby(, params)
 
-	if(istype(W,/obj/item/kitchen/utensil))
+	else if(istype(W,/obj/item/kitchen/utensil))
 
 		var/obj/item/kitchen/utensil/U = W
 
@@ -116,6 +116,8 @@
 				TrashItem.forceMove(loc)
 			qdel(src)
 		return TRUE
+	else
+		return ..()
 
 /obj/item/reagent_containers/food/snacks/proc/generate_trash(atom/location)
 	if(trash)

code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm

@@ -82,6 +82,16 @@
 	result = /obj/item/reagent_containers/food/snacks/sushi_Ebi
 	category = CAT_FOOD
 
+/datum/crafting_recipe/Ebi_maki
+	name = "Ebi Makiroll"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/boiledrice = 1,
+		/obj/item/reagent_containers/food/snacks/boiled_shrimp = 4,
+	)
+	tools = list(/obj/item/kitchen/sushimat)
+	result = /obj/item/reagent_containers/food/snacks/sliceable/Ebi_maki
+	category = CAT_FOOD
+
 /datum/crafting_recipe/sushi_Ikura
 	name = "Ikura Sushi"
 	reqs = list(
@@ -91,6 +101,16 @@
 	result = /obj/item/reagent_containers/food/snacks/sushi_Ikura
 	category = CAT_FOOD
 
+/datum/crafting_recipe/Ikura_maki
+	name = "Ikura Makiroll"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/boiledrice = 1,
+		/obj/item/fish_eggs/salmon = 4,
+	)
+	tools = list(/obj/item/kitchen/sushimat)
+	result = /obj/item/reagent_containers/food/snacks/sliceable/Ikura_maki
+	category = CAT_FOOD
+
 /datum/crafting_recipe/sushi_Inari
 	name = "Inari Sushi"
 	reqs = list(
@@ -100,6 +120,16 @@
 	result = /obj/item/reagent_containers/food/snacks/sushi_Inari
 	category = CAT_FOOD
 
+/datum/crafting_recipe/Inari_maki
+	name = "Inari Makiroll"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/boiledrice = 1,
+		/obj/item/reagent_containers/food/snacks/fried_tofu = 4,
+	)
+	tools = list(/obj/item/kitchen/sushimat)
+	result = /obj/item/reagent_containers/food/snacks/sliceable/Inari_maki
+	category = CAT_FOOD
+
 /datum/crafting_recipe/sushi_Sake
 	name = "Sake Sushi"
 	reqs = list(
@@ -109,6 +139,16 @@
 	result = /obj/item/reagent_containers/food/snacks/sushi_Sake
 	category = CAT_FOOD
 
+/datum/crafting_recipe/Sake_maki
+	name = "Sake Makiroll"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/boiledrice = 1,
+		/obj/item/reagent_containers/food/snacks/salmonmeat = 4,
+	)
+	tools = list(/obj/item/kitchen/sushimat)
+	result = /obj/item/reagent_containers/food/snacks/sliceable/Sake_maki
+	category = CAT_FOOD
+
 /datum/crafting_recipe/sushi_SmokedSalmon
 	name = "Smoked Salmon Sushi"
 	reqs = list(
@@ -118,6 +158,16 @@
 	result = /obj/item/reagent_containers/food/snacks/sushi_SmokedSalmon
 	category = CAT_FOOD
 
+/datum/crafting_recipe/SmokedSalmon_maki
+	name = "Smoked Salmon Makiroll"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/boiledrice = 1,
+		/obj/item/reagent_containers/food/snacks/salmonsteak = 4,
+	)
+	tools = list(/obj/item/kitchen/sushimat)
+	result = /obj/item/reagent_containers/food/snacks/sliceable/SmokedSalmon_maki
+	category = CAT_FOOD
+
 /datum/crafting_recipe/sushi_Masago
 	name = "Masago Sushi"
 	reqs = list(
@@ -127,6 +177,16 @@
 	result = /obj/item/reagent_containers/food/snacks/sushi_Masago
 	category = CAT_FOOD
 
+/datum/crafting_recipe/Masago_maki
+	name = "Masago Makiroll"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/boiledrice = 1,
+		/obj/item/fish_eggs/goldfish = 4,
+	)
+	tools = list(/obj/item/kitchen/sushimat)
+	result = /obj/item/reagent_containers/food/snacks/sliceable/Masago_maki
+	category = CAT_FOOD
+
 /datum/crafting_recipe/sushi_Tobiko
 	name = "Tobiko Sushi"
 	reqs = list(
@@ -136,6 +196,16 @@
 	result = /obj/item/reagent_containers/food/snacks/sushi_Tobiko
 	category = CAT_FOOD
 
+/datum/crafting_recipe/Tobiko_maki
+	name = "Tobiko Makiroll"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/boiledrice = 1,
+		/obj/item/fish_eggs/shark = 4,
+	)
+	tools = list(/obj/item/kitchen/sushimat)
+	result = /obj/item/reagent_containers/food/snacks/sliceable/Tobiko_maki
+	category = CAT_FOOD
+
 /datum/crafting_recipe/sushi_TobikoEgg
 	name = "Tobiko and Egg Sushi"
 	reqs = list(
@@ -145,6 +215,26 @@
 	result = /obj/item/reagent_containers/food/snacks/sushi_TobikoEgg
 	category = CAT_FOOD
 
+/datum/crafting_recipe/TobikoEgg_maki
+	name = "Tobiko Makiroll"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/sushi_Tobiko = 4,
+		/obj/item/reagent_containers/food/snacks/egg = 4,
+	)
+	tools = list(/obj/item/kitchen/sushimat)
+	result = /obj/item/reagent_containers/food/snacks/sliceable/TobikoEgg_maki
+	category = CAT_FOOD
+
+/datum/crafting_recipe/Sake_maki
+	name = "Sake Makiroll"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/sushi_Tobiko = 4,
+		/obj/item/reagent_containers/food/snacks/egg = 4,
+	)
+	tools = list(/obj/item/kitchen/sushimat)
+	result = /obj/item/reagent_containers/food/snacks/sliceable/TobikoEgg_maki
+	category = CAT_FOOD
+
 /datum/crafting_recipe/sushi_Tai
 	name = "Tai Sushi"
 	reqs = list(
@@ -153,3 +243,13 @@
 	)
 	result = /obj/item/reagent_containers/food/snacks/sushi_Tai
 	category = CAT_FOOD
+
+/datum/crafting_recipe/Tai_maki
+	name = "Tai Makiroll"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/boiledrice = 1,
+		/obj/item/reagent_containers/food/snacks/catfishmeat = 4,
+	)
+	tools = list(/obj/item/kitchen/sushimat)
+	result = /obj/item/reagent_containers/food/snacks/sliceable/Tai_maki
+	category = CAT_FOOD

code/modules/holiday/christmas.dm

@@ -6,6 +6,8 @@
 				new /obj/item/a_gift(T)
 	for(var/mob/living/simple_animal/pet/corgi/Ian/Ian in GLOB.mob_list)
 		Ian.place_on_head(new /obj/item/clothing/head/helmet/space/santahat(Ian))
+	var/datum/supply_packs/xmas = SSshuttle.supply_packs["[/datum/supply_packs/misc/snow_machine]"] //Snow!
+	xmas.special_enabled = TRUE
 
 /datum/holiday/xmas/handle_event()
 	spawnTree()

code/modules/mob/living/autohiss.dm

@@ -58,6 +58,16 @@
 		)
 	autohiss_exempt = list("Chittin")
 
+/datum/species/drask
+	autohiss_basic_map = list(
+			"o" = list ("oo", "ooo"),
+			"u" = list ("uu", "uuu")			
+		)
+	autohiss_extra_map = list(
+			"m" = list ("mm", "mmm")
+		)
+	autohiss_exempt = list("Orluum")
+
 
 /datum/species/proc/handle_autohiss(message, datum/language/lang, mode)
 	if(!autohiss_basic_map)

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

@@ -363,8 +363,8 @@
 					for(var/datum/data/record/R in data_core.security)
 						if(R.fields["id"] == E.fields["id"])
 							criminal = R.fields["criminal"]
-
-			msg += "<span class = 'deptradio'>Criminal status:</span> <a href='?src=[UID()];criminal=1'>\[[criminal]\]</a>\n"
+			var/criminal_status = hasHUD(user, "read_only_security") ? "\[[criminal]\]" : "<a href='?src=[UID()];criminal=[glasses]'>\[[criminal]\]</a>"
+			msg += "<span class = 'deptradio'>Criminal status:</span> [criminal_status]\n"
 			msg += "<span class = 'deptradio'>Security records:</span> <a href='?src=[UID()];secrecord=`'>\[View\]</a>  <a href='?src=[UID()];secrecordadd=`'>\[Add comment\]</a>\n"
 
 	if(hasHUD(user,"medical"))
@@ -408,7 +408,12 @@
 		var/obj/item/organ/internal/cyberimp/eyes/hud/CIH = H.get_int_organ(/obj/item/organ/internal/cyberimp/eyes/hud)
 		switch(hudtype)
 			if("security")
-				return istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(H.glasses, /obj/item/clothing/glasses/hud/security/sunglasses) || istype(CIH,/obj/item/organ/internal/cyberimp/eyes/hud/security)
+				return istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(CIH,/obj/item/organ/internal/cyberimp/eyes/hud/security)
+			if("read_only_security")
+				var/obj/item/clothing/glasses/hud/security/S
+				if(istype(H.glasses, /obj/item/clothing/glasses/hud/security))
+					S = H.glasses
+				return !istype(CIH,/obj/item/organ/internal/cyberimp/eyes/hud/security) && S && S.read_only
 			if("medical")
 				return istype(H.glasses, /obj/item/clothing/glasses/hud/health) || istype(H.glasses, /obj/item/clothing/glasses/hud/health/health_advanced) ||  istype(CIH,/obj/item/organ/internal/cyberimp/eyes/hud/medical)
 			else

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

@@ -85,6 +85,13 @@
 					if(!(step_count % 2)) //every other turf makes a sound
 						return 0
 
+				if(istype(shoes, /obj/item/clothing/shoes))
+					var/obj/item/clothing/shoes/shooess = shoes
+					if(shooess.silence_steps)
+						return 0 //silent
+					if(shooess.shoe_sound)
+						return //Handle it on the shoe
+
 				var/range = -(world.view - 2)
 				if(m_intent == MOVE_INTENT_WALK)
 					range -= 0.333
@@ -104,11 +111,6 @@
 				if(!shoes)
 					volume -= 4
 
-				if(istype(shoes, /obj/item/clothing/shoes))
-					var/obj/item/clothing/shoes/shooess = shoes
-					if(shooess.silence_steps)
-						return 0 //silent
-
 				if(!has_organ("l_foot") && !has_organ("r_foot"))
 					return 0 //no feet no footsteps
 

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

@@ -156,6 +156,9 @@
 	// Mutant pieces
 	var/obj/item/organ/internal/ears/mutantears = /obj/item/organ/internal/ears
 
+	// Species specific boxes
+	var/speciesbox
+
 /datum/species/New()
 	//If the species has eyes, they are the default vision organ
 	if(!vision_organ && has_organ["eyes"])

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

@@ -17,4 +17,5 @@
 	worlds tumultous at best."
 
 	reagent_tag = PROCESS_ORG
-	//Has standard darksight of 2.
+	//Has standard darksight of 2.
+	

code/modules/mob/living/carbon/human/species/plasmaman.dm

@@ -39,6 +39,8 @@
 		"eyes" =     /obj/item/organ/internal/eyes
 		)
 
+	speciesbox = /obj/item/storage/box/survival_plasmaman
+
 /datum/species/plasmaman/say_filter(mob/M, message, datum/language/speaking)
 	if(copytext(message, 1, 2) != "*")
 		message = replacetext(message, "s", stutter("ss"))

code/modules/mob/living/carbon/human/species/vox.dm

@@ -78,6 +78,8 @@
 		"is holding their breath!",
 		"is deeply inhaling oxygen!")
 
+	speciesbox = /obj/item/storage/box/survival_vox
+
 /datum/species/vox/handle_death(mob/living/carbon/human/H)
 	H.stop_tail_wagging(1)
 

code/modules/mob/living/carbon/superheroes.dm

@@ -9,13 +9,15 @@
 	var/class
 	var/list/default_genes = list(REGEN, BREATHLESS, COLDRES)
 	var/list/default_spells = list()
-
+	var/activated = FALSE //for wishgranters to not give an option if someone already has it.
+	
 /datum/superheroes/proc/create(var/mob/living/carbon/human/H)
 	assign_genes(H)
 	assign_spells(H)
 	equip(H)
 	fixflags(H)
 	assign_id(H)
+	H.mind.special_role = SPECIAL_ROLE_SUPER
 
 /datum/superheroes/proc/equip(var/mob/living/carbon/human/H)
 	H.rename_character(H.real_name, name)

code/modules/mob/living/silicon/ai/ai.dm

@@ -656,7 +656,21 @@ var/list/ai_verbs_default = list(
 		return
 
 	if(href_list["ai_take_control"]) //Mech domination
+
 		var/obj/mecha/M = locate(href_list["ai_take_control"])
+
+		if(!M)
+			return
+
+		var/mech_has_controlbeacon = FALSE
+		for(var/obj/item/mecha_parts/mecha_tracking/ai_control/A in M.trackers)
+			mech_has_controlbeacon = TRUE
+			break
+		if(!can_dominate_mechs && !mech_has_controlbeacon)
+			message_admins("Warning: possible href exploit by [key_name(usr)] - attempted control of a mecha without can_dominate_mechs or a control beacon in the mech.")
+			log_debug("Warning: possible href exploit by [key_name(usr)] - attempted control of a mecha without can_dominate_mechs or a control beacon in the mech.")
+			return
+
 		if(controlled_mech)
 			to_chat(src, "<span class='warning'>You are already loaded into an onboard computer!</span>")
 			return
@@ -670,7 +684,7 @@ var/list/ai_verbs_default = list(
 			to_chat(src, "<span class='warning'>You aren't in your core!</span>")
 			return
 		if(M)
-			M.transfer_ai(AI_MECH_HACK,src, usr) //Called om the mech itself.
+			M.transfer_ai(AI_MECH_HACK, src, usr) //Called om the mech itself.
 
 	else if(href_list["faketrack"])
 		var/mob/target = locate(href_list["track"]) in GLOB.mob_list

code/modules/mob/living/silicon/pai/recruit.dm

@@ -23,24 +23,22 @@ var/datum/paiController/paiController			// Global handler for pAI candidates
 	var/askDelay = 10 * 60 * 1	// One minute [ms * sec * min]
 
 /datum/paiController/Topic(href, href_list[])
-	if("signup" in href_list)
-		var/mob/dead/observer/O = locate(href_list["signup"])
-		if(!O) return
-		if(!(O in GLOB.respawnable_list))
-			to_chat(O, "You've given up your ability to respawn!")
+
+	var/datum/paiCandidate/candidate = locateUID(href_list["candidate"])
+
+	if(candidate)
+		if(!istype(candidate))
+			message_admins("Warning: possible href exploit by [key_name(usr)] (paiController/Topic, candidate is not a pAI)")
+			log_debug("Warning: possible href exploit by [key_name(usr)] (paiController/Topic, candidate is not a pAI)")
 			return
-		if(!check_recruit(O)) return
-		recruitWindow(O)
-		return
 
 	if(href_list["download"])
-		var/datum/paiCandidate/candidate = locate(href_list["candidate"])
 		var/obj/item/paicard/card = locate(href_list["device"])
 		if(card.pai)
 			return
 		if(usr.incapacitated() || isobserver(usr) || !card.Adjacent(usr))
 			return
-		if(istype(card,/obj/item/paicard) && istype(candidate,/datum/paiCandidate))
+		if(istype(card, /obj/item/paicard) && istype(candidate, /datum/paiCandidate))
 			var/mob/living/silicon/pai/pai = new(card)
 			if(!candidate.name)
 				pai.name = pick(GLOB.ninja_names)
@@ -58,8 +56,27 @@ var/datum/paiController/paiController			// Global handler for pAI candidates
 			pai_candidates -= candidate
 			usr << browse(null, "window=findPai")
 
+
+	if(candidate)
+		if(candidate.key && usr.key && candidate.key != usr.key)
+			message_admins("Warning: possible href exploit by [key_name(usr)] (paiController/Topic, candidate and usr are different mobs)")
+			log_debug("Warning: possible href exploit by [key_name(usr)] (paiController/Topic, candidate and usr are different mobs)")
+			return
+
+	if("signup" in href_list)
+		var/mob/dead/observer/O = locate(href_list["signup"])
+		if(!O)
+			return
+		if(!(O in GLOB.respawnable_list))
+			to_chat(O, "You've given up your ability to respawn!")
+			return
+		if(!check_recruit(O))
+			return
+		recruitWindow(O)
+		return
+
+
 	if(href_list["new"])
-		var/datum/paiCandidate/candidate = locate(href_list["candidate"])
 		var/option = href_list["option"]
 		var/t = ""
 
@@ -183,28 +200,28 @@ var/datum/paiController/paiController			// Global handler for pAI candidates
 
 		<table>
 			<tr class="d0">
-				<th rowspan="2"><a href='byond://?src=[UID()];option=name;new=1;candidate=\ref[candidate]'>Name</a>:</th>
+				<th rowspan="2"><a href='byond://?src=[UID()];option=name;new=1;candidate=[candidate.UID()]'>Name</a>:</th>
 				<td class="desc">[candidate.name]&nbsp;</td>
 			</tr>
 			<tr class="d1">
 				<td>What you plan to call yourself. Suggestions: Any character name you would choose for a station character OR an AI.</td>
 			</tr>
 			<tr class="d0">
-				<th rowspan="2"><a href='byond://?src=[UID()];option=desc;new=1;candidate=\ref[candidate]'>Description</a>:</th>
+				<th rowspan="2"><a href='byond://?src=[UID()];option=desc;new=1;candidate=[candidate.UID()]'>Description</a>:</th>
 				<td class="desc">[candidate.description]&nbsp;</td>
 			</tr>
 			<tr class="d1">
 				<td>What sort of pAI you typically play; your mannerisms, your quirks, etc. This can be as sparse or as detailed as you like.</td>
 			</tr>
 			<tr class="d0">
-				<th rowspan="2"><a href='byond://?src=[UID()];option=role;new=1;candidate=\ref[candidate]'>Preferred Role</a>:</th>
+				<th rowspan="2"><a href='byond://?src=[UID()];option=role;new=1;candidate=[candidate.UID()]'>Preferred Role</a>:</th>
 				<td class="desc">[candidate.role]&nbsp;</td>
 			</tr>
 			<tr class="d1">
 				<td>Do you like to partner with sneaky social ninjas? Like to help security hunt down thugs? Enjoy watching an engineer's back while he saves the station yet again? This doesn't have to be limited to just station jobs. Pretty much any general descriptor for what you'd like to be doing works here.</td>
 			</tr>
 			<tr class="d0">
-				<th rowspan="2"><a href='byond://?src=[UID()];option=ooc;new=1;candidate=\ref[candidate]'>OOC Comments</a>:</th>
+				<th rowspan="2"><a href='byond://?src=[UID()];option=ooc;new=1;candidate=[candidate.UID()]'>OOC Comments</a>:</th>
 				<td class="desc">[candidate.comments]&nbsp;</td>
 			</tr>
 			<tr class="d1">
@@ -215,17 +232,17 @@ var/datum/paiController/paiController			// Global handler for pAI candidates
 		<table>
 			<tr>
 				<td class="button">
-					<a href='byond://?src=[UID()];option=save;new=1;candidate=\ref[candidate]' class="button">Save Personality</a>
+					<a href='byond://?src=[UID()];option=save;new=1;candidate=[candidate.UID()]' class="button">Save Personality</a>
 				</td>
 			</tr>
 			<tr>
 				<td class="button">
-					<a href='byond://?src=[UID()];option=load;new=1;candidate=\ref[candidate]' class="button">Load Personality</a>
+					<a href='byond://?src=[UID()];option=load;new=1;candidate=[candidate.UID()]' class="button">Load Personality</a>
 				</td>
 			</tr>
 		</table><br>
 		<table>
-			<td class="button"><a href='byond://?src=[UID()];option=submit;new=1;candidate=\ref[candidate]' class="button"><b><font size="4px">Submit Personality</font></b></a></td>
+			<td class="button"><a href='byond://?src=[UID()];option=submit;new=1;candidate=[candidate.UID()]' class="button"><b><font size="4px">Submit Personality</font></b></a></td>
 		</table><br>
 
 	</body>
@@ -336,7 +353,7 @@ var/datum/paiController/paiController			// Global handler for pAI candidates
 					</tr>
 				</table>
 				<table class="download">
-					<td class="download"><a href='byond://?src=[UID()];download=1;candidate=\ref[c];device=\ref[p]' class="button"><b>Download [c.name]</b></a>
+					<td class="download"><a href='byond://?src=[UID()];download=1;candidate=[c.UID()];device=\ref[p]' class="button"><b>Download [c.name]</b></a>
 					</td>
 				</table>
 				<br>

code/modules/mob/living/simple_animal/bot/ed209bot.dm

@@ -23,12 +23,13 @@
 	path_image_color = "#FF0000"
 	data_hud_type = DATA_HUD_SECURITY_ADVANCED
 
+	allow_pai = 0
+
 	var/lastfired = 0
 	var/shot_delay = 3 //.3 seconds between shots
 	var/lasercolor = ""
 	var/disabled = 0//A holder for if it needs to be disabled, if true it will not seach for targets, shoot at targets, or move, currently only used for lasertag
 
-
 	var/mob/living/carbon/target
 	var/oldtarget_name
 	var/threatlevel = 0
@@ -41,10 +42,9 @@
 	var/arrest_type = 0 //If true, don't handcuff
 	var/projectile = /obj/item/projectile/energy/electrode //Holder for projectile type
 	var/shoot_sound = 'sound/weapons/Taser.ogg'
-	allow_pai = 0
 
 
-/mob/living/simple_animal/bot/ed209/New(loc,created_name,created_lasercolor)
+/mob/living/simple_animal/bot/ed209/New(loc, created_name, created_lasercolor)
 	..()
 	if(created_name)
 		name = created_name
@@ -52,29 +52,33 @@
 		lasercolor = created_lasercolor
 	icon_state = "[lasercolor]ed209[on]"
 	set_weapon() //giving it the right projectile and firing sound.
-	spawn(3)
-		var/datum/job/detective/J = new/datum/job/detective
-		access_card.access += J.get_access()
-		prev_access = access_card.access
+	setup_access()
 
-		if(lasercolor)
-			shot_delay = 6//Longer shot delay because JESUS CHRIST
-			check_records = 0//Don't actively target people set to arrest
-			arrest_type = 1//Don't even try to cuff
-			declare_arrests = 0 // Don't spam sec
-			bot_core.req_access = list(access_maint_tunnels, access_theatre, access_robotics)
+	if(lasercolor)
+		shot_delay = 6//Longer shot delay because JESUS CHRIST
+		check_records = 0//Don't actively target people set to arrest
+		arrest_type = 1//Don't even try to cuff
+		declare_arrests = 0 // Don't spam sec
+		bot_core.req_access = list(access_maint_tunnels, access_theatre, access_robotics)
 
-			if(created_name == initial(name) || !created_name)
-				if(lasercolor == "b")
-					name = pick("BLUE BALLER","SANIC","BLUE KILLDEATH MURDERBOT")
-				else if (lasercolor == "r")
-					name = pick("RED RAMPAGE","RED ROVER","RED KILLDEATH MURDERBOT")
+		if(created_name == initial(name) || !created_name)
+			if(lasercolor == "b")
+				name = pick("BLUE BALLER","SANIC","BLUE KILLDEATH MURDERBOT")
+			else if (lasercolor == "r")
+				name = pick("RED RAMPAGE","RED ROVER","RED KILLDEATH MURDERBOT")
 
 	//SECHUD
 	var/datum/atom_hud/secsensor = huds[DATA_HUD_SECURITY_ADVANCED]
 	secsensor.add_hud_to(src)
 	permanent_huds |= secsensor
 
+
+/mob/living/simple_animal/bot/ed209/proc/setup_access()
+	if(access_card)
+		var/datum/job/detective/J = new/datum/job/detective
+		access_card.access += J.get_access()
+		prev_access = access_card.access
+
 /mob/living/simple_animal/bot/ed209/turn_on()
 	. = ..()
 	icon_state = "[lasercolor]ed209[on]"
@@ -412,7 +416,7 @@
 	..()
 
 /mob/living/simple_animal/bot/ed209/proc/set_weapon()  //used to update the projectile type and firing sound
-	shoot_sound = 'sound/weapons/laser.ogg'
+	shoot_sound = 'sound/weapons/Laser.ogg'
 	if(emagged == 2)
 		if(lasercolor)
 			projectile = /obj/item/projectile/beam/disabler

code/modules/mob/living/simple_animal/bot/syndicate.dm

@@ -29,12 +29,14 @@
 
 /mob/living/simple_animal/bot/ed209/syndicate/New()
 	..()
-	if(access_card)
-		access_card.access = list(access_syndicate, access_syndicate_leader)
 	set_weapon()
 	update_icon()
 	spawn_turf = get_turf(src)
 
+/mob/living/simple_animal/bot/ed209/syndicate/setup_access()
+	if(access_card)
+		access_card.access = list(access_syndicate, access_syndicate_leader)
+		prev_access = access_card.access
 
 /mob/living/simple_animal/bot/ed209/syndicate/update_icon()
 	icon_state = initial(icon_state)
@@ -160,7 +162,7 @@
 	P.fire()
 
 /mob/living/simple_animal/bot/ed209/syndicate/explode()
-	if (!QDELETED(src))
+	if(!QDELETED(src))
 		if(depotarea)
 			depotarea.list_remove(src, depotarea.guard_list)
 		walk_to(src,0)

code/modules/mob/living/simple_animal/hostile/floorcluwne.dm

@@ -71,15 +71,18 @@
 
 
 /mob/living/simple_animal/hostile/floor_cluwne/Life(seconds, times_fired)
+	if(current_victim && !ishuman(current_victim)) //Just in case a nonhuman is accidentally chosen. A human will then be chosen later on in Acquire_Victim()
+		current_victim = null
+
 	do_jitter_animation(1000)
 	pixel_y = 8
 
-	if(is_type_in_typecache(get_area(src.loc), invalid_area_typecache))
+	if(is_type_in_typecache(get_area(loc), invalid_area_typecache))
 		var/area = pick(teleportlocs)
 		var/area/tp = teleportlocs[area]
 		forceMove(pick(get_area_turfs(tp.type)))
 
-	if(!current_victim && !admincluwne)
+	if((!current_victim && !admincluwne) || QDELETED(current_victim))
 		Acquire_Victim()
 
 	if(stage && !manifested)
@@ -147,24 +150,25 @@
 	var/list/players_copy = GLOB.player_list.Copy()
 	while(players_copy.len)
 		var/mob/living/carbon/human/H = pick_n_take(players_copy)
+		if(!ishuman(H))
+			continue
 
 		if(specific)
 			H = specific
 			if((!H || H.stat == DEAD) && smiting)//safety check, target somehow DIED after we sent a smite
-				message_admins("Smiting Floor Cluwne was deleted due to a lack of valid target. Someone killed them first, or they ceased to exist.")
+				message_admins("Smiting floor cluwne was deleted due to a lack of valid target. Someone killed them first, or they ceased to exist.")
 				qdel(src)
 				return
 			if(H.stat != DEAD && !isLivingSSD(H) &&  H.client && !H.get_int_organ(/obj/item/organ/internal/honktumor/cursed) && !is_type_in_typecache(get_area(H.loc), invalid_area_typecache))
 				current_victim = H
 				return target = current_victim
 
-		if(H && ishuman(H) && H.stat != DEAD && H != current_victim && !isLivingSSD(H) &&  H.client && !H.get_int_organ(/obj/item/organ/internal/honktumor/cursed) && !is_type_in_typecache(get_area(H.loc), invalid_area_typecache))
+		if(H && H.stat != DEAD && H != current_victim && !isLivingSSD(H) &&  H.client && !H.get_int_organ(/obj/item/organ/internal/honktumor/cursed) && !is_type_in_typecache(get_area(H.loc), invalid_area_typecache))
 			current_victim = H
 			interest = 0
 			return target = current_victim
 
-
-	message_admins("Floor Cluwne was deleted due to a lack of valid targets, if this was a manually targeted instance please re-evaluate your choice.")
+	message_admins("Floor cluwne was deleted due to a lack of valid targets[specific ? ", if you spawned this with a specific target please choose another person" : null].")
 	qdel(src)
 
 /mob/living/simple_animal/hostile/floor_cluwne/proc/Manifest()//handles disappearing and appearance anim
@@ -195,6 +199,8 @@
 
 /mob/living/simple_animal/hostile/floor_cluwne/proc/On_Stage()
 	var/mob/living/carbon/human/H = current_victim
+	if(!H)
+		Acquire_Victim()
 	switch(stage)
 
 		if(STAGE_HAUNT)

code/modules/mob/living/simple_animal/hostile/giant_spider.dm

@@ -10,7 +10,7 @@
 
 /mob/living/simple_animal/hostile/poison/AttackingTarget()
 	..()
-	if(isliving(target))
+	if(isliving(target) && (!client || a_intent == INTENT_HARM))
 		var/mob/living/L = target
 		if(L.reagents)
 			L.reagents.add_reagent("spidertoxin", poison_per_bite)

code/modules/mob/living/simple_animal/hostile/hostile.dm

@@ -18,7 +18,7 @@
 	var/check_friendly_fire = 0 // Should the ranged mob check for friendlies when shooting
 	var/retreat_distance = null //If our mob runs from players when they're too close, set in tile distance. By default, mobs do not retreat.
 	var/minimum_distance = 1 //Minimum approach distance, so ranged mobs chase targets down, but still keep their distance set in tiles to the target, set higher to make mobs keep distance
-	
+
 //These vars are related to how mobs locate and target
 	var/robust_searching = 0 //By default, mobs have a simple searching method, set this to 1 for the more scrutinous searching (stat_attack, stat_exclusive, etc), should be disabled on most mobs
 	var/vision_range = 9 //How big of an area to search for targets in, a vision of 9 attempts to find targets as soon as they walk into screen view
@@ -41,6 +41,8 @@
 	/obj/structure/grille,
 	/obj/structure/girder,
 	/obj/structure/rack,
+	/obj/structure/computerframe,
+	/obj/machinery/constructable_frame,
 	/obj/structure/barricade) //turned into a typecache in New()
 	var/atom/targets_from = null //all range/attack/etc. calculations should be done from this atom, defaults to the mob itself, useful for Vehicles and such
 	var/list/emote_taunt = list()

code/modules/mob/living/simple_animal/hostile/pirate.dm

@@ -34,7 +34,7 @@
 	icon_state = "pirateranged"
 	icon_living = "pirateranged"
 	icon_dead = "piratemelee_dead"
-	projectilesound = 'sound/weapons/laser.ogg'
+	projectilesound = 'sound/weapons/Laser.ogg'
 	ranged = 1
 	rapid = 1
 	retreat_distance = 5

code/modules/mob/living/simple_animal/hostile/syndicate.dm

@@ -85,7 +85,7 @@
 	var/area/syndicate_depot/core/depotarea
 	var/raised_alert = FALSE
 	var/alert_on_death = FALSE
-	var/alert_on_timeout = FALSE
+	var/alert_on_timeout = TRUE
 	var/alert_on_spacing = TRUE
 	var/alert_on_shield_breach = FALSE
 	var/seen_enemy = FALSE
@@ -99,6 +99,7 @@
 /mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/New()
 	..()
 	name = "[name] [pick(GLOB.last_names)]"
+	// Do not attempt to move this code to Initialize() or LateInitialize(). Doing so with other objects has caused bugs in the past, because assigning "depotarea" may not work there.
 	depotarea = areaMaster
 	spawn_turf = get_turf(src)
 
@@ -197,7 +198,6 @@
 /mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/officer
 	name = "Syndicate Officer"
 	alert_on_death = TRUE
-	alert_on_timeout = TRUE
 	melee_block_chance = 60
 
 /mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/armory
@@ -209,7 +209,6 @@
 	maxHealth = 250
 	health = 250
 	melee_block_chance = 80
-	alert_on_timeout = TRUE
 	alert_on_shield_breach = TRUE
 
 /mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/armory/Initialize()

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -561,17 +561,16 @@
 /mob/living/simple_animal/proc/sentience_act() //Called when a simple animal gains sentience via gold slime potion
 	return
 
-/mob/living/simple_animal/update_sight(reset_sight = FALSE)
+/mob/living/simple_animal/update_sight()
 	if(!client)
 		return
 	if(stat == DEAD)
 		grant_death_vision()
 		return
 
-	if(reset_sight)
-		see_invisible = initial(see_invisible)
-		see_in_dark = initial(see_in_dark)
-		sight = initial(sight)
+	see_invisible = initial(see_invisible)
+	see_in_dark = initial(see_in_dark)
+	sight = initial(sight)
 
 	if(client.eye != src)
 		var/atom/A = client.eye

code/modules/mob/new_player/sprite_accessories/ipc/ipc_face.dm

@@ -122,13 +122,13 @@
 /datum/sprite_accessory/hair/ipc/fluff
 	fluff = 1
 
-/datum/sprite_accessory/hair/ipc/fluff/lumi_face //Lumi Fluff hair
-	name = "Lumi Face"
-	icon_state = "lumi_face"
+/datum/sprite_accessory/hair/ipc/fluff/lumi_eyes //Lumi Fluff hair
+	name = "Lumi Eyes"
+	icon_state = "lumi_eyes"
 
-/datum/sprite_accessory/hair/ipc/fluff/lumi_blush //Lumi Fluff hair
-	name = "Lumi Blush"
-	icon_state = "lumi_blush"
+/datum/sprite_accessory/hair/ipc/fluff/lumi_music //Lumi Fluff hair
+	name = "Lumi Music"
+	icon_state = "lumi_music"
 
 /datum/sprite_accessory/hair/ipc/fluff/lumi_waiting //Lumi Fluff hair
 	name = "Lumi Waiting"

code/modules/nano/modules/law_manager.dm

@@ -31,6 +31,11 @@
 	if(..())
 		return 1
 
+	if(usr != owner && !check_rights(R_ADMIN))
+		message_admins("Warning: possible href exploit by [key_name(usr)] - failed permissions check in nano_module/law_manager/Topic")
+		log_debug("Warning: possible href exploit by [key_name(usr)] - failed permissions check in nano_module/law_manager/Topic")
+		return 1
+
 	if(href_list["set_view"])
 		current_view = text2num(href_list["set_view"])
 		return 1

code/modules/paperwork/clipboard.dm

@@ -83,7 +83,7 @@ obj/item/clipboard/proc/penPlacement(mob/user, obj/item/pen/P, placing)
 	if(containedpen)
 		overlays += "clipboard_pen"
 	overlays += "clipboard_over"
-	return
+	..()
 
 /obj/item/clipboard/attackby(obj/item/W, mob/user)
 	if(isPaperwork(W)) //If it's a photo, paper bundle, or piece of paper, place it on the clipboard.
@@ -114,6 +114,8 @@ obj/item/clipboard/proc/penPlacement(mob/user, obj/item/pen/P, placing)
 	else if(istype(W, /obj/item/stamp) && toppaper) //We can stamp the topmost piece of paper
 		toppaper.attackby(W, user)
 		update_icon()
+	else
+		return ..()
 
 /obj/item/clipboard/attack_self(mob/user)
 	showClipboard(user)

code/modules/paperwork/faxmachine.dm

@@ -61,6 +61,7 @@ var/global/list/fax_blacklist = list()
 /obj/machinery/photocopier/faxmachine/emag_act(mob/user)
 	if(!emagged)
 		emagged = 1
+		req_one_access = list()
 		to_chat(user, "<span class='notice'>The transmitters realign to an unknown source!</span>")
 	else
 		to_chat(user, "<span class='warning'>You swipe the card through [src], but nothing happens.</span>")

code/modules/paperwork/folders.dm

@@ -27,7 +27,7 @@
 	overlays.Cut()
 	if(contents.len)
 		overlays += "folder_paper"
-	return
+	..()
 
 /obj/item/folder/attackby(obj/item/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/paper) || istype(W, /obj/item/photo) || istype(W, /obj/item/paper_bundle) || istype(W, /obj/item/documents))
@@ -43,7 +43,8 @@
 
 		if((loc == usr || Adjacent(usr)) && usr.stat == 0)
 			name = "folder[(n_name ? text("- '[n_name]'") : null)]"
-	return
+	else
+		return ..()
 
 /obj/item/folder/attack_self(mob/user as mob)
 	var/dat = "<title>[name]</title>"

code/modules/paperwork/paper.dm

@@ -53,6 +53,7 @@
 		updateinfolinks()
 
 /obj/item/paper/update_icon()
+	..()
 	if(icon_state == "paper_talisman")
 		return
 	if(info)
@@ -303,12 +304,6 @@
 	if(user.mind && (user.mind.assigned_role == "Clown"))
 		clown = 1
 
-	if(istype(P, /obj/item/stack/tape_roll))
-		var/obj/item/stack/tape_roll/tape = P
-		tape.stick(src, user)
-		tape.use(1)
-		return
-
 	if(istype(P, /obj/item/paper) || istype(P, /obj/item/photo))
 		if(istype(P, /obj/item/paper/carbon))
 			var/obj/item/paper/carbon/C = P

code/modules/paperwork/paper_bundle.dm

@@ -62,8 +62,6 @@
 		to_chat(user, "<span class='notice'>You add \the [W.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].</span>")
 		qdel(W)
 	else
-		if(istype(W, /obj/item/stack/tape_roll))
-			return 0
 		if(istype(W, /obj/item/pen) || istype(W, /obj/item/toy/crayon))
 			usr << browse("", "window=[name]") //Closes the dialog
 		P = src[page]
@@ -217,6 +215,7 @@
 
 
 /obj/item/paper_bundle/update_icon()
+	..()
 	if(contents.len)
 		var/obj/item/paper/P = src[1]
 		icon_state = P.icon_state

code/modules/paperwork/paperbin.dm

@@ -87,14 +87,14 @@
 
 
 /obj/item/paper_bin/attackby(obj/item/paper/i as obj, mob/user as mob, params)
-	if(!istype(i))
-		return
-
-	user.drop_item()
-	i.loc = src
-	to_chat(user, "<span class='notice'>You put [i] in [src].</span>")
-	papers.Add(i)
-	amount++
+	if(istype(i))
+		user.drop_item()
+		i.loc = src
+		to_chat(user, "<span class='notice'>You put [i] in [src].</span>")
+		papers.Add(i)
+		amount++
+	else
+		return ..()
 
 
 /obj/item/paper_bin/examine(mob/user)
@@ -110,7 +110,7 @@
 		icon_state = "paper_bin0"
 	else
 		icon_state = "paper_bin1"
-
+	..()
 
 /obj/item/paper_bin/carbon
 	name = "carbonless paper bin"

code/modules/paperwork/photocopier.dm

@@ -62,6 +62,16 @@
 			if(toner <= 0)
 				break
 
+			if(copier_items_printed >= copier_max_items) //global vars defined in misc.dm
+				if(prob(10))
+					visible_message("<span class='warning'>The printer screen reads \"PC LOAD LETTER\".</span>")
+				else
+					visible_message("<span class='warning'>The printer screen reads \"PHOTOCOPIER NETWORK OFFLINE, PLEASE CONTACT SYSTEM ADMINISTRATOR\".</span>")
+				if(!copier_items_printed_logged)
+					message_admins("Photocopier cap of [copier_max_items] papers reached, all photocopiers are now disabled. This may be the cause of any lag.")
+					copier_items_printed_logged = TRUE
+				break
+
 			if(emag_cooldown > world.time)
 				return
 
@@ -86,7 +96,7 @@
 			else
 				to_chat(usr, "<span class='warning'>\The [copyitem] can't be copied by \the [src].</span>")
 				break
-
+			copier_items_printed++
 			use_power(active_power_usage)
 		updateUsrDialog()
 	else if(href_list["remove"])

code/modules/power/cable.dm

@@ -589,6 +589,7 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list(
 	else
 		icon_state = "coil"
 		name = "cable coil"
+	..()
 
 /obj/item/stack/cable_coil/proc/update_wclass()
 	if(amount == 1)

code/modules/projectiles/guns/energy/nuclear.dm

@@ -34,6 +34,7 @@
 	ammo_x_offset = 2
 	charge_sections = 3
 	can_flashlight = 0 // Can't attach or detach the flashlight, and override it's icon update
+	actions_types = list(/datum/action/item_action/toggle_gunlight)
 
 /obj/item/gun/energy/gun/mini/New()
 	gun_light = new /obj/item/flashlight/seclite(src)

code/modules/projectiles/guns/energy/special.dm

@@ -140,7 +140,7 @@
 	modifystate = -1
 	origin_tech = "combat=1;materials=3;magnets=2;plasmatech=3;engineering=1"
 	ammo_type = list(/obj/item/ammo_casing/energy/plasma)
-	fire_sound = 'sound/weapons/laser.ogg'
+	fire_sound = 'sound/weapons/Laser.ogg'
 	usesound = 'sound/items/Welder.ogg'
 	toolspeed = 1
 	container_type = OPENCONTAINER

code/modules/projectiles/guns/magic/staff.dm

@@ -60,7 +60,7 @@
 	item_state = "honker"
 	max_charges = 4
 	recharge_rate = 8
-	fire_sound = 'sound/items/airhorn.ogg'
+	fire_sound = 'sound/items/Airhorn.ogg'
 
 /obj/item/gun/magic/staff/focus
 	name = "mental focus"

code/modules/projectiles/guns/projectile/automatic.dm

@@ -22,6 +22,8 @@
 /obj/item/gun/projectile/automatic/attackby(var/obj/item/A as obj, mob/user as mob, params)
 	. = ..()
 	if(.)
+		if(alarmed) // Did the empty clip alarm go off already?
+			alarmed = 0 // Reset the alarm once a magazine is loaded
 		return
 	if(istype(A, /obj/item/ammo_box/magazine))
 		var/obj/item/ammo_box/magazine/AM = A
@@ -33,6 +35,8 @@
 				magazine = null
 			else
 				to_chat(user, "<span class='notice'>You insert the magazine into \the [src].</span>")
+			if(alarmed)
+				alarmed = 0
 			user.remove_from_mob(AM)
 			magazine = AM
 			magazine.loc = src

code/modules/reagents/chemistry/machinery/chem_master.dm

@@ -48,6 +48,7 @@
 	else
 		spawn(rand(0, 15))
 			stat |= NOPOWER
+	update_icon()
 
 /obj/machinery/chem_master/attackby(obj/item/B, mob/user, params)
 	if(default_unfasten_wrench(user, B))

code/modules/reagents/reagent_containers/glass_containers.dm

@@ -148,8 +148,8 @@
 			to_chat(user, "<span class='notice'>You set the label to \"[tmp_label]\".</span>")
 			label_text = tmp_label
 			update_name_label()
-	if(istype(I,/obj/item/storage/bag))
-		..()
+	else
+		return ..()
 
 /obj/item/reagent_containers/glass/proc/update_name_label()
 	if(label_text == "")
@@ -201,6 +201,7 @@
 		overlays += lid
 	if(assembly)
 		overlays += "assembly"
+	..()
 
 /obj/item/reagent_containers/glass/beaker/verb/remove_assembly()
 	set name = "Remove Assembly"

code/modules/surgery/organs/augments_arms.dm

@@ -133,14 +133,28 @@
 		holder = null
 		if(contents.len == 1)
 			Extend(contents[1])
-		else // TODO: make it similar to borg's storage-like module selection
-			var/obj/item/choise = input("Activate which item?", "Arm Implant", null, null) as null|anything in items_list
-			if(owner && owner == usr && owner.stat != DEAD && (src in owner.internal_organs) && !holder && istype(choise) && (choise in contents))
-				// This monster sanity check is a nice example of how bad input() is.
-				Extend(choise)
+		else
+			radial_menu(owner)
 	else
 		Retract()
 
+/obj/item/organ/internal/cyberimp/arm/proc/check_menu(var/mob/user)
+	return (owner && owner == user && owner.stat != DEAD && (src in owner.internal_organs) && !holder)
+
+/obj/item/organ/internal/cyberimp/arm/proc/radial_menu(mob/user)
+	var/list/choices = list()
+	for(var/obj/I in items_list)
+		choices["[I.name]"] = image(icon = I.icon, icon_state = I.icon_state)
+	var/choice = show_radial_menu(user, src, choices, custom_check = CALLBACK(src, .proc/check_menu, user))
+	if(!check_menu(user))
+		return
+	var/obj/item/selected
+	for(var/obj/item in items_list)
+		if(item.name == choice)
+			selected = item
+			break
+	if(istype(selected) && (selected in contents))
+		Extend(selected)
 
 /obj/item/organ/internal/cyberimp/arm/gun/emp_act(severity)
 	if(emp_proof)
@@ -185,6 +199,8 @@
 	origin_tech = "materials=3;engineering=4;biotech=3;powerstorage=4"
 	contents = newlist(/obj/item/screwdriver/cyborg, /obj/item/wrench/cyborg, /obj/item/weldingtool/largetank/cyborg,
 		/obj/item/crowbar/cyborg, /obj/item/wirecutters/cyborg, /obj/item/multitool/cyborg)
+	action_icon = list(/datum/action/item_action/organ_action/toggle = 'icons/obj/clothing/belts.dmi')
+	action_icon_state = list(/datum/action/item_action/organ_action/toggle = "utilitybelt")
 
 /obj/item/organ/internal/cyberimp/arm/toolset/l
 	parent_organ = "l_arm"
@@ -207,12 +223,16 @@
 	desc = "A cybernetic implant that allows the user to project a healing beam from their hand."
 	contents = newlist(/obj/item/gun/medbeam)
 	origin_tech = "materials=5;combat=2;biotech=5;powerstorage=4;syndicate=1"
+	action_icon = list(/datum/action/item_action/organ_action/toggle = 'icons/obj/chronos.dmi')
+	action_icon_state = list(/datum/action/item_action/organ_action/toggle = "chronogun")
 
 /obj/item/organ/internal/cyberimp/arm/flash
 	name = "integrated high-intensity photon projector" //Why not
 	desc = "An integrated projector mounted onto a user's arm, that is able to be used as a powerful flash."
 	contents = newlist(/obj/item/flash/armimplant)
 	origin_tech = "materials=4;combat=3;biotech=4;magnets=4;powerstorage=3"
+	action_icon = list(/datum/action/item_action/organ_action/toggle = 'icons/obj/device.dmi')
+	action_icon_state = list(/datum/action/item_action/organ_action/toggle = "flash")
 
 /obj/item/organ/internal/cyberimp/arm/flash/New()
 	..()
@@ -251,6 +271,8 @@
 	desc = "A set of surgical tools hidden behind a concealed panel on the user's arm"
 	contents = newlist(/obj/item/retractor/augment, /obj/item/hemostat/augment, /obj/item/cautery/augment, /obj/item/surgicaldrill/augment, /obj/item/scalpel/augment, /obj/item/circular_saw/augment, /obj/item/bonegel/augment, /obj/item/FixOVein/augment, /obj/item/bonesetter/augment)
 	origin_tech = "materials=3;engineering=3;biotech=3;programming=2;magnets=3"
+	action_icon = list(/datum/action/item_action/organ_action/toggle = 'icons/obj/storage.dmi')
+	action_icon_state = list(/datum/action/item_action/organ_action/toggle = "duffel-med")
 
 /obj/item/organ/internal/cyberimp/arm/surgery/l
 	parent_organ = "l_arm"
@@ -334,9 +356,13 @@
 	desc = "Telescopic baton implant. Does what it says on the tin" // A better description
 
 	contents = newlist(/obj/item/melee/classic_baton)
+	action_icon = list(/datum/action/item_action/organ_action/toggle = 'icons/obj/items.dmi')
+	action_icon_state = list(/datum/action/item_action/organ_action/toggle = "baton")
 
 /obj/item/organ/internal/cyberimp/arm/advmop
 	name = "advanced mop implant"
 	desc = "Advanced mop implant. Does what it says on the tin" // A better description
 
-	contents = newlist(/obj/item/mop/advanced)
+	contents = newlist(/obj/item/mop/advanced)
+	action_icon = list(/datum/action/item_action/organ_action/toggle = 'icons/obj/janitor.dmi')
+	action_icon_state = list(/datum/action/item_action/organ_action/toggle = "advmop")