Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real

code/modules/cargo/bounties/assistant.dm

@@ -31,7 +31,7 @@
 	description = "CentCom's security forces are going through budget cuts. You will be paid if you ship a set of spears."
 	reward = 1000
 	required_count = 5
-	wanted_types = list(/obj/item/twohanded/spear)
+	wanted_types = list(/obj/item/spear)
 
 /datum/bounty/item/assistant/toolbox
 	name = "Toolboxes"
@@ -134,7 +134,7 @@
 	description = "Central Command is looking to commission a new BirdBoat-class station. You've been ordered to supply the potted plants."
 	reward = 2000
 	required_count = 8
-	wanted_types = list(/obj/item/twohanded/required/kirbyplants)
+	wanted_types = list(/obj/item/kirbyplants)
 
 // /datum/bounty/item/assistant/earmuffs
 // 	name = "Earmuffs"
@@ -160,7 +160,7 @@
 	name = "Chainsaw"
 	description = "The chef at CentCom is having trouble butchering her animals. She requests one chainsaw, please."
 	reward = 2500
-	wanted_types = list(/obj/item/twohanded/required/chainsaw)
+	wanted_types = list(/obj/item/chainsaw)
 
 /datum/bounty/item/assistant/ied
 	name = "IED"

code/modules/cargo/bounties/medical.dm

@@ -121,7 +121,7 @@
 
 /datum/bounty/item/medical/defibrillator
 	name = "New defibillators"
-	description = "After years of storge our defib units have become liabilities. Please send us some new ones."
+	description = "After years of storage our defibrillation units have worn out. Please send us some new ones."
 	reward = 2250
 	required_count = 5
 	wanted_types = list(/obj/item/defibrillator)

code/modules/cargo/bounties/mining.dm

@@ -22,7 +22,7 @@
 	name = "Bone Axe"
 	description = "Station 12 has had their fire axes stolen by marauding clowns. Ship them a bone axe as a replacement."
 	reward = 3500
-	wanted_types = list(/obj/item/twohanded/fireaxe/boneaxe)
+	wanted_types = list(/obj/item/fireaxe/boneaxe)
 
 /datum/bounty/item/mining/bone_armor
 	name = "Bone Armor"

code/modules/cargo/bounties/science.dm

@@ -119,7 +119,7 @@
 
 /datum/bounty/item/science/noneactive_reactivearmor
 	name = "Reactive Armor Shells"
-	description = "Do to the breakthroughs in anomalies, we can not keep up in making reactive armor shells, can you send us a few?"
+	description = "Due to the breakthroughs in anomalies, we can not keep up in making reactive armor shells, can you send us a few?"
 	reward = 2000
 	required_count = 5
 	wanted_types = list(/obj/item/reactive_armour_shell, /obj/item/clothing/suit/armor/reactive)
@@ -138,14 +138,14 @@
 
 /datum/bounty/item/science/anomaly_neutralizer
 	name = "Anomaly Neutralizers"
-	description = "An idea for a long time was to use an unstable Supermatter Shard to help create  the breeding grounds for an unstable part of space to harvest any anomalies we want. It worked a little too well and now were out of anomaly neutralizers please send us a baker's dozen."
+	description = "An idea for a long time was to use an unstable Supermatter Shard to help create the breeding grounds for an unstable part of space to harvest any anomalies we want. It worked a little too well and now we're out of anomaly neutralizers, please send us a baker's dozen."
 	reward = 2500
 	required_count = 13
 	wanted_types = list(/obj/item/anomaly_neutralizer)
 
 /datum/bounty/item/science/integrated_circuit_printer
 	name = "Integrated Circuit Printer"
-	description = "due to a paperwork error, a newly made integrated circuit manufacturer line is missing three of its printers needed to operate. Until the paper work is corrected we are outsourcing this problem, so please send us three integrated circuit printers."
+	description = "Due to a paperwork error, a newly made integrated circuit manufacturer line is missing three of its printers needed to operate. Until the paper work is corrected we are outsourcing this problem, so please send us three integrated circuit printers."
 	reward = 2000
 	required_count = 3
 	wanted_types = list(/obj/item/integrated_circuit_printer)
@@ -159,7 +159,7 @@
 
 /datum/bounty/item/science/nanite_trash
 	name = "Nanite Based Gear"
-	description = "CC wants to make nanite based gear available to a new wing of devolvement but lacks the hand held tools to get it full up and running. Please send us any you have."
+	description = "CC wants to make nanite based gear available to a new wing of development but lacks the hand held tools to get it fully up and running. Please send us any you have."
 	reward = 2500
 	required_count = 20 //Its just metal
 	wanted_types = list( /obj/item/nanite_remote, /obj/item/nanite_remote/comm, /obj/item/nanite_scanner)