Merchant changes. (#5177)

-adds the changes suggested in this thread: https://forums.aurorastation.org/viewtopic.php?f=18&t=11795 -renames the department jackets to look better in the examine -reduces the price of toy guns and sets a price for vehicles in the worth list
Aurorastation · Aug 30, 2018 · 277843f · 277843f
1 parent e950f6b
commit 277843f
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 48 deletions.
diff --git a/code/datums/trading/ai.dm b/code/datums/trading/ai.dm
@@ -112,7 +112,9 @@ They sell generic supplies and ask for generic supplies.
 		/obj/item/target                    = TRADER_ALL,
 		/obj/structure/dispenser            = TRADER_SUBTYPES_ONLY,
 		/obj/structure/filingcabinet        = TRADER_THIS_TYPE,
-		/obj/structure/plushie              = TRADER_SUBTYPES_ONLY
+		/obj/structure/plushie              = TRADER_SUBTYPES_ONLY,
+		/obj/mecha/working/hoverpod         = TRADER_THIS_TYPE,
+		/obj/vehicle/bike                   = TRADER_THIS_TYPE
 	)
 
 /datum/trader/trading_beacon/medical
@@ -149,5 +151,6 @@ They sell generic supplies and ask for generic supplies.
 		/obj/item/weapon/reagent_containers/glass/bottle/chloralhydrate = TRADER_THIS_TYPE,
 		/obj/item/weapon/reagent_containers/glass/bottle/antitoxin      = TRADER_THIS_TYPE,
 		/obj/item/device/handheld_medical                               = TRADER_THIS_TYPE,
-		/obj/item/stack/medical/advanced/bruise_pack/spaceklot          = TRADER_THIS_TYPE
+		/obj/item/stack/medical/advanced/bruise_pack/spaceklot          = TRADER_THIS_TYPE,
+		/obj/mecha/medical/odysseus                                     = TRADER_THIS_TYPE
 	)
diff --git a/code/datums/trading/goods.dm b/code/datums/trading/goods.dm
@@ -121,27 +121,37 @@
 	)
 
 	possible_trading_items = list(
-		/obj/item/clothing/under                              = TRADER_SUBTYPES_ONLY,
-		/obj/item/clothing/under/acj                          = TRADER_BLACKLIST,
-		/obj/item/clothing/under/chameleon                    = TRADER_BLACKLIST,
-		/obj/item/clothing/under/color                        = TRADER_BLACKLIST,
-		/obj/item/clothing/under/dress                        = TRADER_BLACKLIST,
-		/obj/item/clothing/under/ert                          = TRADER_BLACKLIST_ALL,
-		/obj/item/clothing/under/gimmick                      = TRADER_BLACKLIST_ALL,
-		/obj/item/clothing/under/lawyer                       = TRADER_BLACKLIST,
-		/obj/item/clothing/under/pj                           = TRADER_BLACKLIST,
-		/obj/item/clothing/under/rank                         = TRADER_BLACKLIST,
-		/obj/item/clothing/under/shorts                       = TRADER_BLACKLIST,
-		/obj/item/clothing/under/stripper                     = TRADER_BLACKLIST_ALL,
-		/obj/item/clothing/under/swimsuit                     = TRADER_BLACKLIST,
-		/obj/item/clothing/under/syndicate                    = TRADER_BLACKLIST_ALL,
-		/obj/item/clothing/under/tactical                     = TRADER_BLACKLIST,
-		/obj/item/clothing/under/vox                          = TRADER_BLACKLIST_ALL,
-		/obj/item/clothing/under/wedding                      = TRADER_BLACKLIST,
-		/obj/item/clothing/under/punpun                       = TRADER_BLACKLIST,
-		/obj/item/clothing/under/fluff                        = TRADER_BLACKLIST_ALL,
-		/obj/item/clothing/under/dress/fluff                  = TRADER_BLACKLIST_ALL,
-		/obj/item/clothing/under/rank/centcom_officer/bst     = TRADER_BLACKLIST
+		/obj/item/clothing/under                                 = TRADER_SUBTYPES_ONLY,
+		/obj/item/clothing/under/acj                             = TRADER_BLACKLIST,
+		/obj/item/clothing/under/chameleon                       = TRADER_BLACKLIST,
+		/obj/item/clothing/under/color                           = TRADER_BLACKLIST,
+		/obj/item/clothing/under/dress                           = TRADER_BLACKLIST,
+		/obj/item/clothing/under/ert                             = TRADER_BLACKLIST_ALL,
+		/obj/item/clothing/under/gimmick                         = TRADER_BLACKLIST_ALL,
+		/obj/item/clothing/under/lawyer                          = TRADER_BLACKLIST,
+		/obj/item/clothing/under/pj                              = TRADER_BLACKLIST,
+		/obj/item/clothing/under/rank                            = TRADER_BLACKLIST,
+		/obj/item/clothing/under/shorts                          = TRADER_BLACKLIST,
+		/obj/item/clothing/under/stripper                        = TRADER_BLACKLIST_ALL,
+		/obj/item/clothing/under/swimsuit                        = TRADER_BLACKLIST,
+		/obj/item/clothing/under/syndicate                       = TRADER_BLACKLIST_ALL,
+		/obj/item/clothing/under/tactical                        = TRADER_BLACKLIST,
+		/obj/item/clothing/under/vox                             = TRADER_BLACKLIST_ALL,
+		/obj/item/clothing/under/wedding                         = TRADER_BLACKLIST,
+		/obj/item/clothing/under/punpun                          = TRADER_BLACKLIST,
+		/obj/item/clothing/under/fluff                           = TRADER_BLACKLIST_ALL,
+		/obj/item/clothing/under/dress/fluff                     = TRADER_BLACKLIST_ALL,
+		/obj/item/clothing/under/rank/centcom_officer/bst        = TRADER_BLACKLIST,
+		/obj/item/clothing/suit/storage/hooded                   = TRADER_SUBTYPES_ONLY,
+		/obj/item/clothing/suit/storage/hooded/fluff             = TRADER_BLACKLIST_ALL,
+		/obj/item/clothing/suit/storage/hooded/wintercoat/fluff  = TRADER_BLACKLIST_ALL,
+		/obj/item/clothing/suit/storage/toggle/labcoat           = TRADER_ALL,
+		/obj/item/clothing/suit/storage/toggle/labcoat/fluff     = TRADER_BLACKLIST_ALL,
+		/obj/item/clothing/suit/varsity                          = TRADER_ALL,
+		/obj/item/clothing/suit/storage/toggle/track             = TRADER_ALL,
+		/obj/item/clothing/suit/storage/miljacket                = TRADER_ALL,
+		/obj/item/clothing/suit/jacket/puffer                    = TRADER_ALL,
+		/obj/item/clothing/suit/storage/toggle/flannel           = TRADER_ALL
 	)
 
 /datum/trader/ship/clothingshop/shoes
@@ -181,6 +191,7 @@
 		/obj/item/clothing/gloves/yellow/typec          = TRADER_BLACKLIST,
 		/obj/item/clothing/gloves/swat/bst              = TRADER_BLACKLIST,
 		/obj/item/clothing/gloves/watch/fluff           = TRADER_BLACKLIST_ALL,
+		/obj/item/clothing/gloves/fluff                 = TRADER_BLACKLIST_ALL,
 		/obj/item/clothing/head                         = TRADER_SUBTYPES_ONLY,
 		/obj/item/clothing/head/beret/centcom           = TRADER_BLACKLIST_ALL,
 		/obj/item/clothing/head/bio_hood                = TRADER_BLACKLIST_ALL,
@@ -310,24 +321,25 @@ Sells devices, odds and ends, and medical stuff
 	possible_origins = list("Astrodia", "Slag. Co.", "Explosive Drills S.A.", "The Shaft Shop")
 
 	possible_wanted_items  = list(
-		/obj/item/weapon/ore                      = TRADER_SUBTYPES_ONLY,
-		/obj/item/stack/material/glass            = TRADER_ALL,
-		/obj/item/stack/material/iron             = TRADER_THIS_TYPE,
-		/obj/item/stack/material/sandstone        = TRADER_THIS_TYPE,
-		/obj/item/stack/material/marble           = TRADER_THIS_TYPE,
-		/obj/item/stack/material/diamond          = TRADER_THIS_TYPE,
-		/obj/item/stack/material/uranium          = TRADER_THIS_TYPE,
-		/obj/item/stack/material/phoron           = TRADER_THIS_TYPE,
-		/obj/item/stack/material/plastic          = TRADER_THIS_TYPE,
-		/obj/item/stack/material/gold             = TRADER_THIS_TYPE,
-		/obj/item/stack/material/silver           = TRADER_THIS_TYPE,
-		/obj/item/stack/material/platinum         = TRADER_THIS_TYPE,
-		/obj/item/stack/material/mhydrogen        = TRADER_THIS_TYPE,
-		/obj/item/stack/material/tritium          = TRADER_THIS_TYPE,
-		/obj/item/stack/material/osmium           = TRADER_THIS_TYPE,
-		/obj/item/stack/material/steel            = TRADER_THIS_TYPE,
-		/obj/item/stack/material/plasteel         = TRADER_SUBTYPES_ONLY,
-		/obj/item/weapon/coin                     = TRADER_SUBTYPES_ONLY
+		/obj/item/weapon/ore                                    = TRADER_SUBTYPES_ONLY,
+		/obj/item/stack/material/glass                          = TRADER_ALL,
+		/obj/item/stack/material/iron                           = TRADER_THIS_TYPE,
+		/obj/item/stack/material/sandstone                      = TRADER_THIS_TYPE,
+		/obj/item/stack/material/marble                         = TRADER_THIS_TYPE,
+		/obj/item/stack/material/diamond                        = TRADER_THIS_TYPE,
+		/obj/item/stack/material/uranium                        = TRADER_THIS_TYPE,
+		/obj/item/stack/material/phoron                         = TRADER_THIS_TYPE,
+		/obj/item/stack/material/plastic                        = TRADER_THIS_TYPE,
+		/obj/item/stack/material/gold                           = TRADER_THIS_TYPE,
+		/obj/item/stack/material/silver                         = TRADER_THIS_TYPE,
+		/obj/item/stack/material/platinum                       = TRADER_THIS_TYPE,
+		/obj/item/stack/material/mhydrogen                      = TRADER_THIS_TYPE,
+		/obj/item/stack/material/tritium                        = TRADER_THIS_TYPE,
+		/obj/item/stack/material/osmium                         = TRADER_THIS_TYPE,
+		/obj/item/stack/material/steel                          = TRADER_THIS_TYPE,
+		/obj/item/stack/material/plasteel                       = TRADER_THIS_TYPE,
+		/obj/item/weapon/coin                                   = TRADER_SUBTYPES_ONLY,
+		/mob/living/simple_animal/hostile/retaliate/minedrone   = TRADER_THIS_TYPE
 	)
 
 	possible_trading_items = list(
@@ -354,7 +366,10 @@ Sells devices, odds and ends, and medical stuff
 		/obj/item/clothing/suit/space/void/mining        = TRADER_THIS_TYPE,
 		/obj/machinery/mining/drill                      = TRADER_THIS_TYPE,
 		/obj/machinery/mining/brace                      = TRADER_THIS_TYPE,
-		/obj/mecha/working/ripley                        = TRADER_THIS_TYPE
+		/obj/mecha/working/ripley                        = TRADER_THIS_TYPE,
+		/obj/item/custom_ka_upgrade/upgrade_chips        = TRADER_SUBTYPES_ONLY,
+		/obj/item/custom_ka_upgrade/barrels              = TRADER_SUBTYPES_ONLY,
+		/obj/item/custom_ka_upgrade/cells                = TRADER_SUBTYPES_ONLY
 	)
 
 	speech = list(

diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes.dm b/code/modules/client/preference_setup/loadout/loadout_eyes.dm
@@ -131,5 +131,5 @@
 	cost = 2
 
 /datum/gear/eyes/spiffygogs
-	display_name = "Orange Goggles"
+	display_name = "orange goggles"
 	path = /obj/item/clothing/glasses/spiffygogs
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
@@ -522,25 +522,25 @@
  * Department Jackets
  */
 /obj/item/clothing/suit/storage/toggle/engi_dep_jacket
-	name = "department jacket, engineering"
+	name = "engineering department jacket"
 	desc = "A cozy jacket in engineering's colors. Show your department pride!"
 	icon_state = "engi_dep_jacket"
 	item_state = "engi_dep_jacket"
 
 /obj/item/clothing/suit/storage/toggle/supply_dep_jacket
-	name = "department jacket, supply"
+	name = "supply department jacket"
 	desc = "A cozy jacket in supply's colors. Show your department pride!"
 	icon_state = "supply_dep_jacket"
 	item_state = "supply_dep_jacket"
 
 /obj/item/clothing/suit/storage/toggle/sci_dep_jacket
-	name = "department jacket, science"
+	name = "science department jacket"
 	desc = "A cozy jacket in science's colors. Show your department pride!"
 	icon_state = "sci_dep_jacket"
 	item_state = "sci_dep_jacket"
 
 /obj/item/clothing/suit/storage/toggle/med_dep_jacket
-	name = "department jacket, medical"
+	name = "medical department jacket"
 	desc = "A cozy jacket in medical's colors. Show your department pride!"
 	icon_state = "med_dep_jacket"
 	item_state = "med_dep_jacket"

diff --git a/code/modules/item_worth/worths_list.dm b/code/modules/item_worth/worths_list.dm
@@ -117,6 +117,7 @@ var/list/worths = list(
 					/obj/item/weapon/gun/projectile/contender = 1300,
 					/obj/item/weapon/gun/projectile = 1500,
 //GUN,
+					/obj/item/weapon/gun/bang = 200,
 					/obj/item/weapon/gun = 500,
 //MATERIAL STACKS,
 					/obj/item/stack/material/marble = -20,
@@ -922,6 +923,8 @@ var/list/worths = list(
 					/obj/machinery/libraryscanner = -1000,
 					/obj/machinery/bookbinder = -1200,
 					/obj/machinery/wish_granter = - 1000000,
-					/obj/machinery = -1000
+					/obj/machinery = -1000,
+					/obj/vehicle/bike = 1500,
+					/obj/vehicle = 1000
 					) //Must be in descending order. Child before parents, otherwise it doesn't work.,