*sigh

ChaoticOnyx · May 30, 2024 · 77c5498 · 77c5498
1 parent 4f1b61d
commit 77c5498
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 7 deletions.
diff --git a/code/datums/trading/goods.dm b/code/datums/trading/goods.dm
@@ -26,7 +26,8 @@
 	)
 
 	possible_wanted_items = list(/obj/item/toy/figure/ert 			= TRADER_THIS_TYPE,
-								/obj/item/toy/prize/honk 			= TRADER_THIS_TYPE
+								/obj/item/toy/prize/honk 			= TRADER_THIS_TYPE,
+								/obj/item/material/coin 			= TRADER_SUBTYPES_ONLY
 								)
 
 	possible_trading_items = list(/obj/item/toy/prize 				= TRADER_SUBTYPES_ONLY,

diff --git a/code/datums/trading/misc.dm b/code/datums/trading/misc.dm
@@ -53,7 +53,8 @@
 								/obj/item/device/dociler 									= TRADER_THIS_TYPE,
 								/obj/structure/dogbed 										= TRADER_THIS_TYPE,
 								/obj/item/device/metroid_scanner 							= TRADER_THIS_TYPE,
-								/obj/item/lazarus_injector 									= TRADER_THIS_TYPE
+								/obj/item/lazarus_injector 									= TRADER_THIS_TYPE,
+								/obj/item/metroid_cookie 									= TRADER_SUBTYPES_ONLY
 								)
 
 /datum/trader/ship/pet_shop/New()
@@ -110,6 +111,7 @@
 								/obj/item/grenade/spawnergrenade/fake_carp 					= TRADER_THIS_TYPE,
 								/obj/item/clothingbag 										= TRADER_SUBTYPES_ONLY,
 								/obj/item/toy/pig 											= TRADER_THIS_TYPE,
+								/obj/item/balloon_box 										= TRADER_THIS_TYPE,
 								/obj/item/reagent_containers/vessel/paint/random 			= TRADER_THIS_TYPE,
 								/obj/item/reagent_containers/vessel/paint/white 			= TRADER_THIS_TYPE,
 								/obj/item/reagent_containers/vessel/bottle/bottleofnothing 	= TRADER_THIS_TYPE,

diff --git a/code/game/objects/items/storage/pill_bottle.dm b/code/game/objects/items/storage/pill_bottle.dm
@@ -184,7 +184,7 @@
 
 /obj/item/storage/pill_bottle/oxycodone
 	name = "pill bottle (oxycodone)"
-	desc = "Contains pills of complex painkiller."
+	desc = "Contains pills of complex painkillers."
 	label_color = "#800080"
 	starting_label = "oxycodone"
 

diff --git a/code/modules/Z_item_worth/materials.dm b/code/modules/Z_item_worth/materials.dm
@@ -20,7 +20,7 @@
 	value = 4
 
 /material/steel
-	value = 4
+	value = 2
 
 /material/diona
 	value = 5
@@ -35,7 +35,7 @@
 	value = 10
 
 /material/glass/reinforced
-	value = 2
+	value = 4
 
 /material/glass/plasma
 	value = 30
@@ -56,7 +56,7 @@
 	value = 80
 
 /material/iron
-	value = 5
+	value = 1
 
 /material/voxalloy
 	value = 100

diff --git a/code/modules/Z_item_worth/reagents.dm b/code/modules/Z_item_worth/reagents.dm
@@ -403,7 +403,7 @@
 	value = 3.1
 
 /datum/reagent/painkiller/tramadol/oxycodone
-	value = 3.3
+	value = 3.6
 
 /datum/reagent/synaptizine
 	value = 1.1

diff --git a/code/modules/Z_item_worth/worths_list.dm b/code/modules/Z_item_worth/worths_list.dm
@@ -621,6 +621,7 @@ var/list/worths = list(
 					/obj/item/bee_pack = 200,
 					/obj/item/weedkiller = 30,
 					/obj/item/sign/medipolma = 1500,
+					/obj/item/metroid_cookie = 150,
 					/obj/item = 5,
 //STRUCTURES,
 					/obj/structure/dogbed = 15,