bwuh bwuh bwuh

code/modules/cargo/blackmarket/blackmarket_items/consumables.dm

@@ -53,7 +53,7 @@
 	stock_max = 7
 	availability_prob = 40
 
-/datum/blackmarket_item/consumable/suspicious_pills/spawn_item(loc)
+/datum/blackmarket_item/consumable/trickwine/spawn_item(loc)
 	var/trickwine = pick(list(/datum/reagent/consumable/ethanol/trickwine/ash_wine,
 						/datum/reagent/consumable/ethanol/trickwine/ice_wine,
 						/datum/reagent/consumable/ethanol/trickwine/shock_wine,

code/modules/cargo/blackmarket/blackmarket_items/misc.dm

@@ -21,26 +21,6 @@
 	stock_max = 8
 	availability_prob = 60
 
-/datum/blackmarket_item/misc/trickwine
-	name = "Trickwine"
-	desc = "The SRM keeps the recipes for their trickwines a closely guarded secret. The Hunters carrying those bottles? Less so."
-	item = /datum/reagent/consumable/ethanol/trickwine/ash_wine
-
-	price_min = 200
-	price_max = 600
-	stock_min = 3
-	stock_max = 7
-	availability_prob = 40
-
-/datum/blackmarket_item/consumable/suspicious_pills/spawn_item(loc)
-	var/trickwine = pick(list(/datum/reagent/consumable/ethanol/trickwine/ash_wine,
-						/datum/reagent/consumable/ethanol/trickwine/ice_wine,
-						/datum/reagent/consumable/ethanol/trickwine/shock_wine,
-						/datum/reagent/consumable/ethanol/trickwine/hearth_wine,
-						/datum/reagent/consumable/ethanol/trickwine/force_wine,
-						/datum/reagent/consumable/ethanol/trickwine/prism_wine))
-	return new trickwine(loc)
-
 /datum/blackmarket_item/misc/strange_seed
 	name = "Strange Seeds"
 	desc = "An Exotic Variety of seed that can contain anything from glow to acid."

code/modules/projectiles/guns/ballistic/rifle.dm

@@ -118,7 +118,7 @@
 	desc = "An Illestren rifle sawn down to a ridiculously small size. There was probably a reason it wasn't made this short to begin with, but it still packs a punch."
 	item_state = "illestren_sawn"
 	sawn_off = TRUE
-	weight = WEAPON_MEDIUM
+	weapon_weight = WEAPON_MEDIUM
 
 
 /obj/item/gun/ballistic/rifle/solgov