merge from master

modular_citadel/code/modules/client/loadout/backpack.dm

@@ -1,27 +1,7 @@
-/datum/gear/plushcarp
-	name = "Space carp plushie"
+/datum/gear/plushbox
+	name = "Plushie Choice Box"
 	category = SLOT_IN_BACKPACK
-	path = /obj/item/toy/plush/carpplushie
-
-/datum/gear/plushliz
-	name = "Lizard plushie"
-	category = SLOT_IN_BACKPACK
-	path = /obj/item/toy/plush/lizardplushie
-
-/datum/gear/plushsnek
-	name = "Snake plushie"
-	category = SLOT_IN_BACKPACK
-	path = /obj/item/toy/plush/snakeplushie
-
-/datum/gear/plushslime
-	name = "Slime plushie"
-	category = SLOT_IN_BACKPACK
-	path = /obj/item/toy/plush/slimeplushie
-
-/datum/gear/plushlamp
-	name = "Lamp plushie"
-	category = SLOT_IN_BACKPACK
-	path = /obj/item/toy/plush/lampplushie
+	path = /obj/item/choice_beacon/box/plushie
 
 /datum/gear/tennis
 	name = "Classic Tennis Ball"

modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm

@@ -210,7 +210,7 @@
 	var/datum/component/radioactive/contamination = M.GetComponent(/datum/component/radioactive)
 	if(M.radiation > 0)
 		M.radiation -= min(M.radiation, 60)
-	if(contamination.strength > 0)
+	if(contamination && contamination.strength > 0)
 		contamination.strength -= min(contamination.strength, 100)
 	..()
 

modular_citadel/code/modules/reagents/objects/clothes.dm

@@ -9,7 +9,7 @@
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
 	//item_flags = NODROP //Tips their hat!
 
-/obj/item/clothing/head/hattip/attack_hand(mob/user)
+/obj/item/clothing/head/hattip/attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
 	if(iscarbon(user))
 		var/mob/living/carbon/C = user
 		if(is_ninja(C))

modular_citadel/code/modules/reagents/objects/items.dm

@@ -9,7 +9,7 @@
 	w_class = WEIGHT_CLASS_TINY
 
 //A little janky with pockets
-/obj/item/fermichem/pHbooklet/attack_hand(mob/user)
+/obj/item/fermichem/pHbooklet/attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
 	if(user.get_held_index_of_item(src))//Does this check pockets too..?
 		if(numberOfPages == 50)
 			icon_state = "pHbookletOpen"