Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs

# Conflicts:
#	icons/obj/toy.dmi

code/game/objects/items.dm

@@ -599,7 +599,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
 
 /obj/item/MouseEntered(location, control, params)
 	if(in_inventory)
-		var/timedelay = 5
+		var/timedelay = 8
 		var/user = usr
 		tip_timer = addtimer(CALLBACK(src, .proc/openTip, location, control, params, user), timedelay, TIMER_STOPPABLE)
 

code/game/objects/items/dehy_carp.dm

@@ -37,7 +37,7 @@
 	visible_message("<span class='notice'>[src] swells up!</span>")
 
 	// Animation
-	icon = 'icons/mob/animal.dmi'
+	icon = 'icons/mob/carp.dmi'
 	flick("carp_swell", src)
 	// Wait for animation to end
 	sleep(6)

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -240,6 +240,7 @@ var/global/list/datum/stack_recipe/cloth_recipes = list ( \
 var/global/list/datum/stack_recipe/cardboard_recipes = list (
 	new /datum/stack_recipe("box", /obj/item/storage/box),
 	new /datum/stack_recipe("large box", /obj/item/storage/box/large, 4),
+	new /datum/stack_recipe("patch pack", /obj/item/storage/pill_bottle/patch_pack, 2),
 	new /datum/stack_recipe("light tubes", /obj/item/storage/box/lights/tubes),
 	new /datum/stack_recipe("light bulbs", /obj/item/storage/box/lights/bulbs),
 	new /datum/stack_recipe("mouse traps", /obj/item/storage/box/mousetraps),

code/game/objects/items/toys.dm

@@ -1066,6 +1066,32 @@ obj/item/toy/cards/deck/syndicate/black
 	name = "tuxedo cat plushie"
 	icon_state = "tuxedocat"
 
+//New generation TG plushies
+
+/obj/item/toy/plushie/lizardplushie
+	name = "lizard plushie"
+	desc = "An adorable stuffed toy that resembles a lizardperson."
+	icon_state = "plushie_lizard"
+	item_state = "plushie_lizard"
+
+/obj/item/toy/plushie/snakeplushie
+	name = "snake plushie"
+	desc = "An adorable stuffed toy that resembles a snake. Not to be mistaken for the real thing."
+	icon_state = "plushie_snake"
+	item_state = "plushie_snake"
+
+/obj/item/toy/plushie/nukeplushie
+	name = "operative plushie"
+	desc = "An stuffed toy that resembles a syndicate nuclear operative. The tag claims operatives to be purely fictitious."
+	icon_state = "plushie_nuke"
+	item_state = "plushie_nuke"
+
+/obj/item/toy/plushie/slimeplushie
+	name = "slime plushie"
+	desc = "An adorable stuffed toy that resembles a slime. It is practically just a hacky sack."
+	icon_state = "plushie_slime"
+	item_state = "plushie_slime"
+
 /*
  * Foam Armblade
  */

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

@@ -4,23 +4,22 @@
 	icon = 'icons/obj/clothing/belts.dmi'
 	icon_state = "utilitybelt"
 	item_state = "utility"
+	lefthand_file = 'icons/mob/inhands/equipment/belt_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/belt_righthand.dmi'
 	slot_flags = SLOT_BELT
 	attack_verb = list("whipped", "lashed", "disciplined")
 	var/use_item_overlays = 0 // Do we have overlays for items held inside the belt?
 
-
 /obj/item/storage/belt/update_icon()
 	if(use_item_overlays)
 		overlays.Cut()
 		for(var/obj/item/I in contents)
 			overlays += "[I.name]"
-
 	..()
 
 /obj/item/storage/belt/proc/can_use()
 	return is_equipped()
 
-
 /obj/item/storage/belt/MouseDrop(obj/over_object as obj, src_location, over_location)
 	var/mob/M = usr
 	if(!istype(over_object, /obj/screen))
@@ -68,7 +67,7 @@
 	new /obj/item/weldingtool(src)
 	new /obj/item/crowbar(src)
 	new /obj/item/wirecutters(src)
-	new /obj/item/stack/cable_coil(src, 30, pick(COLOR_RED, COLOR_YELLOW, COLOR_ORANGE))
+	new /obj/item/stack/cable_coil/random(src, 30)
 	update_icon()
 
 /obj/item/storage/belt/utility/full/multitool/New()
@@ -99,7 +98,7 @@
 	new /obj/item/crowbar/power(src)
 	new /obj/item/weldingtool/experimental(src)//This can be changed if this is too much
 	new /obj/item/multitool(src)
-	new /obj/item/stack/cable_coil(src, 30, pick(COLOR_RED, COLOR_YELLOW, COLOR_ORANGE))
+	new /obj/item/stack/cable_coil/random(src, 30)
 	new /obj/item/extinguisher/mini(src)
 	new /obj/item/analyzer(src)
 	update_icon()
@@ -184,7 +183,6 @@
 	new /obj/item/reagent_containers/food/pill/salicylic(src)
 	update_icon()
 
-
 /obj/item/storage/belt/botany
 	name = "botanist belt"
 	desc = "Can hold various botanical supplies."
@@ -207,7 +205,6 @@
         /obj/item/wrench,
 	)
 
-
 /obj/item/storage/belt/security
 	name = "security belt"
 	desc = "Can hold security gear like handcuffs and flashes."
@@ -474,7 +471,6 @@
 	..()
 	update_icon()
 
-
 /obj/item/storage/belt/holster
 	name = "shoulder holster"
 	desc = "A holster to conceal a carried handgun. WARNING: Badasses only."
@@ -512,7 +508,6 @@
 		W.charges = W.max_charges
 	update_icon()
 
-
 /obj/item/storage/belt/fannypack
 	name = "fannypack"
 	desc = "A dorky fannypack for keeping small items in."
@@ -601,7 +596,6 @@
 //     Bluespace Belt
 // -------------------------------------
 
-
 /obj/item/storage/belt/bluespace
 	name = "Belt of Holding"
 	desc = "The greatest in pants-supporting technology."
@@ -634,8 +628,6 @@
 	var/bolacount = 0
 	var/cooldown = 0
 
-
-
 /obj/item/storage/belt/bluespace/owlman/New()
 	..()
 	new /obj/item/grenade/smokebomb(src)

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

@@ -312,6 +312,7 @@
 		if(usr.s_active)
 			usr.s_active.show_to(usr)
 	W.mouse_opacity = MOUSE_OPACITY_OPAQUE //So you can click on the area around the item to equip it, instead of having to pixel hunt
+	W.in_inventory = TRUE
 	update_icon()
 	return 1
 

code/game/objects/structures/crates_lockers/crittercrate.dm

@@ -44,6 +44,10 @@
 	name = "cow crate"
 	content_mob = /mob/living/simple_animal/cow
 
+/obj/structure/closet/critter/pig
+	name = "pig crate"
+	content_mob = /mob/living/simple_animal/pig
+
 /obj/structure/closet/critter/goat
 	name = "goat crate"
 	content_mob = /mob/living/simple_animal/hostile/retaliate/goat