Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate

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

@@ -80,7 +80,8 @@
 		/obj/item/device/lightreplacer,
 		/obj/item/weapon/storage/bag/trash,
 		/obj/item/weapon/storage/belt/janitor,
-		/obj/item/clothing/shoes/galoshes
+		/obj/item/clothing/shoes/galoshes,
+		/obj/item/clothing/glasses/hud/janitor
 		)
 
 /*

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

@@ -210,7 +210,9 @@
 		/obj/item/weapon/cell/device,
 		/obj/item/device/radio,
 		/obj/item/device/gps/explorer,
-		/obj/item/weapon/gun/energy/gun/protector/pilotgun/locked)
+		/obj/item/weapon/gun/energy/gun/protector/pilotgun/locked,
+		/obj/item/clothing/gloves/watch/survival
+		)
 
 /obj/structure/closet/secure_closet/pilot/Initialize()
 	if(prob(50))

code/game/objects/structures/props/fantasy.dm

@@ -50,3 +50,10 @@
 	desc = "A red banner hanging from a stand."
 	icon_state = "pinkbanner_stand"
 	density = FALSE
+
+/obj/structure/prop/fantasy/shinto
+	name = "shinto arch"
+	desc = "A tall red wooden shinto style archway."
+	icon = 'icons/obj/props/decor96x96.dmi'
+	icon_state = "shinto"
+	density = FALSE

code/game/objects/structures/watercloset.dm

@@ -295,6 +295,11 @@
 	desc = "Rubber ducky you're so fine, you make bathtime lots of fuuun. Rubber ducky I'm awfully fooooond of yooooouuuu~"	//thanks doohl
 	icon = 'icons/obj/watercloset.dmi'
 	icon_state = "rubberducky"
+	item_state = "rubberducky"
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand.dmi',
+	)
 	honk_sound = 'sound/voice/quack.ogg' //VOREStation edit
 	var/honk_text = 0
 
@@ -316,6 +321,7 @@
 	desc = "From the depths of hell it arose, feathers glistening with crimson, a honk that struck fear into all men."	//thanks doohl
 	icon = 'icons/obj/watercloset.dmi'
 	icon_state = "rubberducky_red"
+	item_state = "rubberducky_red"
 	honk_sound = 'sound/effects/adminhelp.ogg'
 	var/honk_count = 0
 
@@ -341,6 +347,7 @@
 	desc = "The see me rollin', they hatin'."	//thanks doohl
 	icon = 'icons/obj/watercloset.dmi'
 	icon_state = "rubberducky_blue"
+	item_state = "rubberducky_blue"
 	honk_sound = 'sound/effects/bubbles.ogg'
 	var/honk_count = 0
 
@@ -362,6 +369,7 @@
 	desc = "It's extra squishy!"
 	icon = 'icons/obj/watercloset.dmi'
 	icon_state = "rubberducky_pink"
+	item_state = "rubberducky_pink"
 	honk_sound = 'sound/vore/sunesound/pred/insertion_01.ogg'
 	var/honk_count = 0
 
@@ -391,6 +399,7 @@
 	desc = "There's something otherworldly about this particular duck..."
 	icon = 'icons/obj/watercloset.dmi'
 	icon_state = "rubberducky_grey"
+	item_state = "rubberducky_grey"
 	honk_sound = 'sound/effects/ghost.ogg'
 	var/honk_count = 0
 
@@ -416,6 +425,7 @@
 	desc = "Like a true Nature’s child, we were born, born to be wild."
 	icon = 'icons/obj/watercloset.dmi'
 	icon_state = "rubberducky_green"
+	item_state = "rubberducky_green"
 	honk_sound = 'sound/arcade/mana.ogg'
 	var/honk_count = 0
 	var/list/flora = list(/obj/structure/flora/ausbushes,
@@ -454,6 +464,7 @@
 	desc = "It's so full of energy, such a happy little guy, I just wanna give him a squeeze."	//thanks doohl
 	icon = 'icons/obj/watercloset.dmi'
 	icon_state = "rubberducky_white"
+	item_state = "rubberducky_white"
 	honk_sound = 'sound/effects/lightningshock.ogg'
 	var/honk_count = 0
 
@@ -475,6 +486,7 @@
 	name = "rubber ducky"
 	icon = 'icons/obj/watercloset.dmi'
 	icon_state = "rubberducky_black"
+	item_state = "rubberducky_black"
 	det_time = 20
 	var/honk_text = 0