Merge pull request #971 from crix870/blacksmithing/merchant-adjustmen…

…ts,-fur/hide-adjustments,-typos

Steel, blacksmithing/merchant adjustments, hide/fur price changes

code/game/objects/items/rogueitems/natural/animals.dm

@@ -3,26 +3,26 @@
 /obj/item/natural/hide
 	name = "hide"
 	icon_state = "hide"
-	desc = "Hide from one of Gott's creachers."
+	desc = "Hide from one of Dendor's creachers."
 	dropshrink = 0.50
 	force = 0
 	throwforce = 0
 	w_class = WEIGHT_CLASS_SMALL
 	resistance_flags = FLAMMABLE
 	drop_sound = 'sound/foley/dropsound/cloth_drop.ogg'
-	sellprice = 20
+	sellprice = 8
 
 /obj/item/natural/fur
 	name = "fur"
 	icon_state = "wool1"
-	desc = "Fur from one of Gott's creachers."
+	desc = "Fur from one of Dendor's creachers."
 	force = 0
 	throwforce = 0
 	w_class = WEIGHT_CLASS_SMALL
 	resistance_flags = FLAMMABLE
 	drop_sound = 'sound/foley/dropsound/cloth_drop.ogg'
 	color = "#5c5243"
-	sellprice = 40
+	sellprice = 18
 
 //RTD make this a storage item and make clickign on animals with things put it in storage
 /obj/item/natural/saddle

code/game/objects/items/rogueitems/natural/clothfibersthorn.dm

@@ -112,7 +112,7 @@
 	spitoutmouth = FALSE
 	bundletype = /obj/item/natural/bundle/cloth
 	var/wet = 0
-	/// Effectiveness when used as a bandage, how much bloodloss we can tampon
+	/// Effectiveness when used as a bandage, how much bloodloss we can staunch
 	var/bandage_effectiveness = 0.9
 
 /obj/item/natural/cloth/attack_right(mob/user)

code/game/objects/items/rogueweapons/melee/polearms.dm

@@ -245,7 +245,7 @@
 	possible_item_intents = list(SPEAR_THRUST, SPEAR_BASH) //bash is for nonlethal takedowns, only targets limbs
 	gripped_intents = list(SPEAR_THRUST, /datum/intent/spear/cut/halberd, /datum/intent/sword/chop, SPEAR_BASH)
 	name = "halberd"
-	desc = "An iron halberd, mostly used by town guards."
+	desc = "A steel halberd, mostly used by town guards."
 	icon_state = "halberd"
 	icon = 'icons/roguetown/weapons/64.dmi'
 	pixel_y = -16
@@ -293,7 +293,7 @@
 	possible_item_intents = list(/datum/intent/spear/thrust/eaglebeak, SPEAR_BASH) //bash is for nonlethal takedowns, only targets limbs
 	gripped_intents = list(/datum/intent/spear/thrust/eaglebeak, /datum/intent/mace/smash/eaglebeak, SPEAR_BASH)
 	name = "eagle's beak"
-	desc = "A reinforced pole affixed with an ornate steel eagle's head, of which it's beak is intended to pierce with great harm."
+	desc = "A reinforced pole affixed with an ornate steel eagle's head, of which its beak is intended to pierce with great harm."
 	icon_state = "eaglebeak"
 	icon = 'icons/roguetown/weapons/64.dmi'
 	pixel_y = -16

code/game/objects/structures/bearpelt.dm

@@ -1,6 +1,6 @@
 /obj/structure/bearpelt
 	name = "Bearpelt"
-	desc = "A hide of a slayin bear. It looks poorly made."
+	desc = "A hide of a slain bear. It looks poorly made."
 	icon = 'icons/turf/floors/bear.dmi'
 	icon_state = "bear"
 	density = FALSE

code/game/objects/structures/signs/signs_plaques.dm

@@ -49,8 +49,8 @@
 
 /obj/structure/rogue/trophy/deer
 	name = "deer trophy"
-	desc = "A deer head, a skilled hunter must have slayin this creature."
+	desc = "A deer head, a skilled hunter must have slain this creature."
 	icon = 'icons/roguetown/misc/structure.dmi'
 	icon_state = "deer_trophy"
 	dir = SOUTH
-	pixel_y = 32
+	pixel_y = 32

code/modules/cargo/packsrogue/armor.dm

@@ -36,30 +36,6 @@
 					/obj/item/clothing/mask/rogue/facemask/steel,
 				)
 
-/datum/supply_pack/rogue/armor/bracers
-	name = "Steel Bracers"
-	cost = 50
-	contains = list(
-					/obj/item/clothing/wrists/roguetown/bracers,
-					/obj/item/clothing/wrists/roguetown/bracers,
-				)
-
-/datum/supply_pack/rogue/armor/chaingauntlets
-	name = "Steel Chain Gauntlets"
-	cost = 50
-	contains = list(
-					/obj/item/clothing/gloves/roguetown/chain,
-					/obj/item/clothing/gloves/roguetown/chain,
-				)
-
-/datum/supply_pack/rogue/armor/boots
-	name = "Steel Boots"
-	cost = 50
-	contains = list(
-					/obj/item/clothing/shoes/roguetown/boots,
-					/obj/item/clothing/shoes/roguetown/boots,
-				)
-
 /datum/supply_pack/rogue/armor/gambeson
 	name = "Gambeson"
 	cost = 50
@@ -123,3 +99,46 @@
 					/obj/item/clothing/suit/roguetown/armor/plate/full,
 					/obj/item/clothing/suit/roguetown/armor/plate/full,
 				)
+
+/datum/supply_pack/rogue/armor/bracers
+	name = "Steel Bracers"
+	cost = 50
+	contains = list(
+					/obj/item/clothing/wrists/roguetown/bracers,
+					/obj/item/clothing/wrists/roguetown/bracers,
+				)
+
+/datum/supply_pack/rogue/armor/chaingauntlets
+	name = "Steel Chain Gauntlets"
+	cost = 50
+	contains = list(
+					/obj/item/clothing/gloves/roguetown/chain,
+					/obj/item/clothing/gloves/roguetown/chain,
+				)
+
+
+/datum/supply_pack/rogue/armor/pants/plate
+	name = "Iron Chain Chausses"
+	cost = 50
+	contains = list(
+					/obj/item/clothing/under/roguetown/chainlegs/iron,
+					/obj/item/clothing/under/roguetown/chainlegs/iron,
+				)
+
+/datum/supply_pack/rogue/armor/pants/chain
+	name = "Steel Plated Chausses"
+	cost = 120
+	contains = list(
+					/obj/item/clothing/under/roguetown/platelegs,
+					/obj/item/clothing/under/roguetown/platelegs,
+				)
+
+
+/datum/supply_pack/rogue/armor/boots
+	name = "Steel Boots"
+	cost = 50
+	contains = list(
+					/obj/item/clothing/shoes/roguetown/boots/armor,
+					/obj/item/clothing/shoes/roguetown/boots/armor,
+				)
+

code/modules/cargo/packsrogue/food.dm

@@ -71,7 +71,7 @@
 
 /datum/supply_pack/rogue/food/butter
 	name = "Butter"
-	cost = 40
+	cost = 35
 	contains = list(
 					/obj/item/reagent_containers/food/snacks/butter,
 					/obj/item/reagent_containers/food/snacks/butter,

code/modules/cargo/packsrogue/wardrobe.dm

@@ -4,45 +4,6 @@
 	crate_name = "merchant guild's crate"
 	crate_type = /obj/structure/closet/crate/chest/merchant
 
-/datum/supply_pack/rogue/wardrobe/cloaks/bhalfcloaks
-	name = "Half-Cloaks"
-	cost = 20
-	contains = list(
-					/obj/item/clothing/cloak/half,
-					/obj/item/clothing/cloak/half,
-				)
-
-/datum/supply_pack/rogue/wardrobe/cloaks/bcloaks
-	name = "Blue Cloaks"
-	cost = 20
-	contains = list(
-					/obj/item/clothing/cloak/raincloak/blue,
-					/obj/item/clothing/cloak/raincloak/blue,
-				)
-
-/datum/supply_pack/rogue/wardrobe/cloaks/rcloaks
-	name = "Red Cloaks"
-	cost = 20
-	contains = list(
-					/obj/item/clothing/cloak/raincloak/red,
-					/obj/item/clothing/cloak/raincloak/red,
-				)
-
-/datum/supply_pack/rogue/wardrobe/cloaks/gcloaks
-	name = "Green Cloaks"
-	cost = 20
-	contains = list(
-					/obj/item/clothing/cloak/raincloak/green,
-					/obj/item/clothing/cloak/raincloak/green,
-				)
-
-/datum/supply_pack/rogue/wardrobe/gloves/fgloves
-	name = "Fingerless Gloves"
-	cost = 5
-	contains = list(
-					/obj/item/clothing/gloves/roguetown/fingerless,
-					/obj/item/clothing/gloves/roguetown/fingerless,
-				)
 
 /datum/supply_pack/rogue/wardrobe/hat/witchhat
 	name = "Witch-Hunter's Hats"
@@ -76,20 +37,50 @@
 					/obj/item/clothing/head/roguetown/bardhat,
 				)
 
-/datum/supply_pack/rogue/wardrobe/shoes/shalal
-	name = "Shalal Shoes"
-	cost = 10
+/datum/supply_pack/rogue/wardrobe/masks/specs
+	name = "Spectacles"
+	cost = 25
 	contains = list(
-					/obj/item/clothing/shoes/roguetown/shalal,
-					/obj/item/clothing/shoes/roguetown/shalal,
+					/obj/item/clothing/mask/rogue/spectacles,
 				)
 
-/datum/supply_pack/rogue/wardrobe/shoes/sandals
-	name = "Sandals"
-	cost = 5
+/datum/supply_pack/rogue/wardrobe/masks/goldspecs
+	name = "Golden Spectacles"
+	cost = 60
 	contains = list(
-					/obj/item/clothing/shoes/roguetown/gladiator,
-					/obj/item/clothing/shoes/roguetown/gladiator,
+					/obj/item/clothing/mask/rogue/spectacles/golden,
+				)
+
+/datum/supply_pack/rogue/wardrobe/cloaks/bhalfcloaks
+	name = "Half-Cloaks"
+	cost = 20
+	contains = list(
+					/obj/item/clothing/cloak/half,
+					/obj/item/clothing/cloak/half,
+				)
+
+/datum/supply_pack/rogue/wardrobe/cloaks/bcloaks
+	name = "Blue Cloaks"
+	cost = 20
+	contains = list(
+					/obj/item/clothing/cloak/raincloak/blue,
+					/obj/item/clothing/cloak/raincloak/blue,
+				)
+
+/datum/supply_pack/rogue/wardrobe/cloaks/rcloaks
+	name = "Red Cloaks"
+	cost = 20
+	contains = list(
+					/obj/item/clothing/cloak/raincloak/red,
+					/obj/item/clothing/cloak/raincloak/red,
+				)
+
+/datum/supply_pack/rogue/wardrobe/cloaks/gcloaks
+	name = "Green Cloaks"
+	cost = 20
+	contains = list(
+					/obj/item/clothing/cloak/raincloak/green,
+					/obj/item/clothing/cloak/raincloak/green,
 				)
 
 /datum/supply_pack/rogue/wardrobe/suits/blackdress
@@ -134,6 +125,14 @@
 					/obj/item/clothing/suit/roguetown/shirt/undershirt/puritan,
 				)
 
+/datum/supply_pack/rogue/wardrobe/gloves/fgloves
+	name = "Fingerless Gloves"
+	cost = 5
+	contains = list(
+					/obj/item/clothing/gloves/roguetown/fingerless,
+					/obj/item/clothing/gloves/roguetown/fingerless,
+				)
+
 /datum/supply_pack/rogue/wardrobe/pants/formal
 	name = "Formal Pants"
 	cost = 20
@@ -150,16 +149,18 @@
 					/obj/item/clothing/shoes/roguetown/nobleboot,
 				)
 
-/datum/supply_pack/rogue/wardrobe/masks/specs
-	name = "Spectacles"
-	cost = 25
+/datum/supply_pack/rogue/wardrobe/shoes/shalal
+	name = "Shalal Shoes"
+	cost = 10
 	contains = list(
-					/obj/item/clothing/mask/rogue/spectacles,
+					/obj/item/clothing/shoes/roguetown/shalal,
+					/obj/item/clothing/shoes/roguetown/shalal,
 				)
 
-/datum/supply_pack/rogue/wardrobe/masks/goldspecs
-	name = "Golden Spectacles"
-	cost = 60
+/datum/supply_pack/rogue/wardrobe/shoes/sandals
+	name = "Sandals"
+	cost = 5
 	contains = list(
-					/obj/item/clothing/mask/rogue/spectacles/golden,
+					/obj/item/clothing/shoes/roguetown/gladiator,
+					/obj/item/clothing/shoes/roguetown/gladiator,
 				)

code/modules/farming/soil.dm

@@ -431,7 +431,7 @@
 	if(blessed_time > 0)
 		. += span_good("The soil seems blessed.")
 	if(fertilized_time > 0)
-		. += span_good("The soil has special fertilzier mixed in.")
+		. += span_good("The soil has special fertilizer mixed in.")
 
 #define BLESSING_WEED_DECAY_RATE 10 / (1 MINUTES)
 #define WEED_GROWTH_RATE 3 / (1 MINUTES)

code/modules/roguetown/roguejobs/blacksmith/anvil_recipes/armor.dm

@@ -121,28 +121,28 @@
 	craftdiff = 3
 
 /datum/anvil_recipe/armor/steel/halfplate
-	name = "Half-Plate Armour (+2 Steel)"
+	name = "Half-Plate Armour (+2 Steel, +1 Hide)"
 	req_bar = /obj/item/ingot/steel
-	additional_items = list(/obj/item/ingot/steel,/obj/item/ingot/steel)
+	additional_items = list(/obj/item/ingot/steel,/obj/item/ingot/steel,/obj/item/natural/hide)
 	created_item = /obj/item/clothing/suit/roguetown/armor/plate
 	craftdiff = 3
 
 /datum/anvil_recipe/armor/steel/fullplate
-	name = "Full-Plate Armour (+3 Steel)"
+	name = "Full-Plate Armour (+3 Steel, +1 Hide)"
 	req_bar = /obj/item/ingot/steel
-	additional_items = list(/obj/item/ingot/steel, /obj/item/ingot/steel, /obj/item/ingot/steel)
+	additional_items = list(/obj/item/ingot/steel, /obj/item/ingot/steel, /obj/item/ingot/steel, /obj/item/natural/hide)
 	created_item = /obj/item/clothing/suit/roguetown/armor/plate/full
 	craftdiff = 4
 
 /datum/anvil_recipe/armor/steel/platebikini
-	name = "Half-Plate Bikini (+1 Steel +1 Hide)"
+	name = "Half-Plate Bikini (+1 Steel, +1 Hide)"
 	req_bar = /obj/item/ingot/steel
 	additional_items = list(/obj/item/ingot/steel, /obj/item/natural/hide)
 	created_item = /obj/item/clothing/suit/roguetown/armor/plate/bikini
 	craftdiff = 3
 
 /datum/anvil_recipe/armor/steel/fullplatebikini
-	name = "Full-Plate Bikini (+2 Steel +1 Hide)"
+	name = "Full-Plate Bikini (+2 Steel, +1 Hide)"
 	req_bar = /obj/item/ingot/steel
 	additional_items = list(/obj/item/ingot/steel, /obj/item/ingot/steel, /obj/item/natural/hide)
 	created_item = /obj/item/clothing/suit/roguetown/armor/plate/full/bikini
@@ -156,7 +156,7 @@
 	craftdiff = 2
 
 /datum/anvil_recipe/armor/steel/steel/brigandine
-	name = "Brigandine (+1 Steel +2 Cloth)"
+	name = "Brigandine (+1 Steel, +2 Cloth)"
 	req_bar = /obj/item/ingot/steel
 	additional_items = list(/obj/item/ingot/steel, /obj/item/natural/cloth, /obj/item/natural/cloth)
 	created_item = /obj/item/clothing/suit/roguetown/armor/brigandine

code/modules/roguetown/roguejobs/blacksmith/anvil_recipes/tools.dm

@@ -4,7 +4,7 @@
 
 // --------- IRON -----------
 /datum/anvil_recipe/tools/surgery/surgerytools
-	name = "Surgeon's Bag (+1 iron +1 hide)"
+	name = "Surgeon's Bag (+1 Iron, +1 Hide)"
 	req_bar = /obj/item/ingot/iron
 	additional_items = list(/obj/item/ingot/iron, /obj/item/natural/hide)
 	created_item = /obj/item/storage/belt/rogue/surgery_bag/full