Merge branch 'master' into placeholder

code/game/objects/items.dm

@@ -103,7 +103,7 @@
 	if(islist(armor))
 		for(var/type in armor)
 			if(armor[type])
-				AddComponent(/datum/component/armor, armor, armor_degradation_speed)
+				AddComponent(/datum/component/armor, armor)
 				break
 
 /obj/item/Destroy()

code/game/objects/items/toys.dm

@@ -925,6 +925,13 @@
 	icon_state = "kittenplushie"
 	slot_flags = SLOT_HEAD
 
+/obj/item/toy/plushie/pennyplush
+	name = "Penny plush"
+	desc = "It's a plush of the beloved company mascot cat, Penny! For the price Nanotrasen sells these things at, you probably could have bought an actual cat."
+	icon_state = "pennyplushie"
+	slot_flags = SLOT_HEAD
+
+
 /obj/item/toy/plushie/lizard
 	name = "lizard plush"
 	desc = "A plushie of a scaly lizard! Very controversial, after being accused as \"racist\" by some Unathi."

code/game/objects/items/trash.dm

@@ -205,10 +205,6 @@
 	drop_sound = 'sound/items/drop/bottle.ogg'
 	pickup_sound = 'sound/items/pickup/bottle.ogg'
 
-/obj/item/trash/diona_bites
-	name = "dionae bites"
-	icon_state = "dionaebitesempty"
-
 /obj/item/trash/ricetub
 	name = "empty rice tub"
 	icon_state = "ricetub"

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

@@ -30,7 +30,7 @@
 		if("NanoTrasen Sponsored")
 			new /obj/item/reagent_containers/food/snacks/liquidfood(src)
 			new /obj/item/reagent_containers/food/snacks/liquidfood(src)
-			new /obj/item/reagent_containers/food/drinks/cans/sodawater(src)
+			new /obj/item/reagent_containers/food/drinks/cans/hrozamal_soda(src)
 			desc += " This one has the NanoTrasen logo."
 
 /obj/item/storage/field_ration/army

code/game/objects/structures/crates_lockers/closets/fitness.dm

@@ -43,33 +43,3 @@
 	new /obj/item/clothing/mask/luchador(src)
 	new /obj/item/clothing/mask/luchador/rudos(src)
 	new /obj/item/clothing/mask/luchador/tecnicos(src)
-
-
-/obj/structure/closet/lasertag/red
-	name = "red laser tag equipment"
-	desc = "It's a storage unit for laser tag equipment."
-	icon_state = "red"
-	icon_closed = "red"
-
-/obj/structure/closet/lasertag/red/fill()
-	new /obj/item/clothing/ears/earmuffs(src)
-	new /obj/item/clothing/ears/earmuffs(src)
-	new /obj/item/gun/energy/lasertag/red(src)
-	new /obj/item/gun/energy/lasertag/red(src)
-	new /obj/item/clothing/suit/redtag(src)
-	new /obj/item/clothing/suit/redtag(src)
-
-
-/obj/structure/closet/lasertag/blue
-	name = "blue laser tag equipment"
-	desc = "It's a storage unit for laser tag equipment."
-	icon_state = "blue"
-	icon_closed = "blue"
-
-/obj/structure/closet/lasertag/blue/fill()
-	new /obj/item/clothing/ears/earmuffs(src)
-	new /obj/item/clothing/ears/earmuffs(src)
-	new /obj/item/gun/energy/lasertag/blue(src)
-	new /obj/item/gun/energy/lasertag/blue(src)
-	new /obj/item/clothing/suit/bluetag(src)
-	new /obj/item/clothing/suit/bluetag(src)

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

@@ -261,7 +261,7 @@
 /obj/structure/bed/roller/attackby(obj/item/I, mob/user)
 	if(iswrench(I) || istype(I, /obj/item/stack) || iswirecutter(I))
 		return 1
-	if(iv_stand && !beaker && istype(I, /obj/item/reagent_containers))
+	if(iv_stand && !beaker && (istype(I, /obj/item/reagent_containers/glass/beaker) || istype(I, /obj/item/reagent_containers/blood)))
 		if(!user.unEquip(I, target = src))
 			return
 		to_chat(user, SPAN_NOTICE("You attach \the [I] to \the [src]."))
@@ -318,7 +318,7 @@
 	..()
 	if(use_check(usr) || !Adjacent(usr))
 		return
-	if(!(ishuman(usr) || isrobot(usr)))
+	if(!ishuman(usr))
 		return
 	if(over_object == buckled && beaker)
 		if(iv_attached)

code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm

@@ -210,11 +210,12 @@
 
 /obj/structure/bed/chair/wheelchair/MouseDrop(over_object, src_location, over_location)
 	..()
-	if((over_object == usr && (in_range(src, usr) || usr.contents.Find(src))))
-		if(!ishuman(usr))
-			return FALSE
-		if(buckled)
-			return FALSE
+	if(!ishuman(usr))
+		return FALSE
+	if(buckled)
+		return FALSE
+	if(!usr.Adjacent(src))
+		return FALSE
 	visible_message(SPAN_NOTICE("[usr] collapses [src]."))
 	var/obj/item/wheelchair/R = new(get_turf(src))
 	R.name = src.name