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

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

@@ -58,7 +58,7 @@
 	desc = "A deluxe belt with many pouches. It can hold a very wide variety of items, but less items overall than a dedicated belt. Still, it's useful for any explorer who wants to be prepared for anything they might find."
 	icon = 'icons/inventory/belt/item_vr.dmi'
 	icon_state = "pathfinder_belt"
-	item_state = "explorer_belt"
+	item_state = "pathfinder_belt"
 	storage_slots = 7	//two more, bringing it on par with normal belts
 	max_storage_space = ITEMSIZE_COST_NORMAL * 7
 
@@ -157,6 +157,7 @@
 	name = "hydroponics belt"
 	desc = "A belt used to hold most hydroponics supplies. Suprisingly, not green."
 	icon = 'icons/inventory/belt/item_vr.dmi'
+	icon_override = 'icons/inventory/belt/mob_vr.dmi'
 	icon_state = "plantbelt"
 	item_state = "plantbelt"
 	storage_slots = 5

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

@@ -50,7 +50,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list(
 			var/image/bible_image = image(icon = 'icons/obj/storage.dmi', icon_state = GLOB.biblestates[i])
 			skins += list("[GLOB.biblenames[i]]" = bible_image)
 
-		var/choice = show_radial_menu(user, src, skins, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 40, require_near = TRUE)
+		var/choice = show_radial_menu(user, src, skins, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 40, require_near = TRUE)
 		if(!choice)
 			return FALSE
 		var/bible_index = GLOB.biblenames.Find(choice)
@@ -112,4 +112,4 @@ GLOBAL_LIST_INIT(bibleitemstates, list(
 /obj/item/weapon/storage/bible/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if (src.use_sound)
 		playsound(src, src.use_sound, 50, 1, -5)
-	..()
+	..()

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

@@ -385,16 +385,18 @@
 /obj/item/weapon/storage/fancy/cigar
 	name = "cigar case"
 	desc = "A case for holding your cigars when you are not smoking them."
-	description_fluff = "The tastefully engraved palm tree tells you that these 'Palma Grande' premium cigars are only sold on the luxury cruises and resorts of Oasis, though ten separate companies produce them for that purpose galaxy-wide. The standard is however very high."
+	description_fluff = "The tasteful stained palm case tells you that these 'Palma Grande' premium \
+	cigars are only sold on the luxury cruises and resorts of Oasis, though ten separate companies \
+	produce them for that purpose galaxy-wide. The standard is however very high."
 	icon_state = "cigarcase"
 	icon = 'icons/obj/cigarettes.dmi'
 	w_class = ITEMSIZE_TINY
 	throwforce = 2
 	slot_flags = SLOT_BELT
-	storage_slots = 7
+	storage_slots = 5
 	can_hold = list(/obj/item/clothing/mask/smokable/cigarette/cigar, /obj/item/trash/cigbutt/cigarbutt)
 	icon_type = "cigar"
-	starts_with = list(/obj/item/clothing/mask/smokable/cigarette/cigar = 8)
+	starts_with = list(/obj/item/clothing/mask/smokable/cigarette/cigar = 5)
 
 /obj/item/weapon/storage/fancy/cigar/Initialize()
 	. = ..()
@@ -419,7 +421,7 @@
 	if(open)
 		icon_state = open_state
 		if(contents.len >= 1)
-			add_overlay("cigarcase[contents.len]")
+			add_overlay("[initial(icon_state)][contents.len]")
 	else
 		icon_state = closed_state
 
@@ -435,6 +437,27 @@
 	update_icon()
 	..()
 
+/obj/item/weapon/storage/fancy/cigar/choiba
+	name = "/improper Choiba cigar case"
+	desc = "A fancy case for holding your cigars when you are not smoking them."
+	description_fluff = "The exquisite wooden case bears the markings of the \
+	Choiba cigar company based out of Cuba. The perfectly humidized case keeps \
+	the companies signature Cigars in premium condidtion even when traveling \
+	long distances within a vacuume. The custom case itself can sell for quite \
+	a lot in some places."
+	icon_state = "cohibacase"
+	icon = 'icons/obj/cigarettes.dmi'
+	icon_type = "cigar"
+	starts_with = list(/obj/item/clothing/mask/smokable/cigarette/cigar/cohiba = 5)
+
+/obj/item/weapon/storage/fancy/cigar/havana
+	name = "\improper Havana cigar case"
+	desc = "A fancy case for holding your cigars when you are not smoking them."
+	icon_state = "havanacase"
+	icon = 'icons/obj/cigarettes.dmi'
+	icon_type = "cigar"
+	starts_with = list(/obj/item/clothing/mask/smokable/cigarette/cigar/havana = 5)
+
 /*
  * Tobacco Bits
  */

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

@@ -850,12 +850,12 @@
 	plane = PLANE_PLAYER_HUD_ITEMS
 	layer = 0.1
 	alpha = 200
-	var/weakref/held_item
+	var/datum/weakref/held_item
 
 /atom/movable/storage_slot/New(newloc, obj/item/held_item)
 	ASSERT(held_item)
 	name += held_item.name
-	src.held_item = weakref(held_item)
+	src.held_item = WEAKREF(held_item)
 
 /atom/movable/storage_slot/Destroy()
 	held_item = null