Merge pull request #3796 from ghost/hephaestus

Standardizes spellings to wiki and adds more major corps and places to setup.

code/modules/busy_space/organizations.dm

@@ -117,8 +117,8 @@
 		)
 
 /datum/lore/organization/tsc/vey_med
-	name = "Vey Medical"
-	short_name = "Vey Med"
+	name = "Vey-Medical" //The Wiki displays them as Vey-Medical.
+	short_name = "Vey-Med"
 	acronym = "VM"
 	desc = "Vey-Med is one of the newer TSCs on the block and is notable for being largely owned and opperated by Skrell. \
 	Despite the suspicion and prejudice leveled at them for their alien origin, Vey-Med has obtained market dominance in \

code/modules/client/preferences_factions.dm

@@ -16,9 +16,11 @@ var/global/list/seen_religions = list()
 var/global/list/citizenship_choices = list(
 	"Earth",
 	"Mars",
+	"Sif",
+	"Binma",
 	"Moghes",
 	"Meralar",
-	"Qerrbalak"
+	"Qerr'balak"
 	)
 
 var/global/list/home_system_choices = list(
@@ -26,7 +28,7 @@ var/global/list/home_system_choices = list(
 	"Vir",
 	"Nyx",
 	"Tau Ceti",
-	"Qerr'Vallis",
+	"Qerr'valis",
 	"Epsilon Ursae Minoris",
 	"Rarkajar"
 	)
@@ -42,7 +44,9 @@ var/global/list/faction_choices = list(
 	"Grayson Manufactories Ltd.",
 	"Aether Atmospherics",
 	"Zeng-Hu Pharmaceuticals",
-	"Hesphaistos Industries"
+	"Hephaestus Industries",
+	"Morpheus Cyberkinetics",
+	"Xion Manufacturing Group"
 	)
 
 var/global/list/antag_faction_choices = list()	//Should be populated after brainstorming. Leaving as blank in case brainstorming does not occur.
@@ -57,8 +61,8 @@ var/global/list/religion_choices = list(
 	"Unitarianism",
 	"Hinduism",
 	"Buddhist",
-	"Islamic",
-	"Christian",
-	"Agnostic",
-	"Deist"
+	"Islam",
+	"Christianity",
+	"Agnosticism",
+	"Deism"
 	)

code/modules/projectiles/guns/energy/laser.dm

@@ -1,6 +1,6 @@
 /obj/item/weapon/gun/energy/laser
 	name = "laser carbine"
-	desc = "An Hesphaistos Industries G40E carbine, designed to kill with concentrated energy blasts.  This varient has the ability to \
+	desc = "A Hephaestus Industries G40E carbine, designed to kill with concentrated energy blasts.  This varient has the ability to \
 	switch between standard fire and a more efficent but weaker 'suppressive' fire."
 	icon_state = "laser"
 	item_state = "laser"
@@ -108,7 +108,7 @@ obj/item/weapon/gun/energy/retro
 
 /obj/item/weapon/gun/energy/sniperrifle
 	name = "marksman energy rifle"
-	desc = "The HI DMR 9E is an older design of Hesphaistos Industries. A designated marksman rifle capable of shooting powerful \
+	desc = "The HI DMR 9E is an older design of Hephaestus Industries. A designated marksman rifle capable of shooting powerful \
 	ionized beams, this is a weapon to kill from a distance."
 	icon_state = "sniper"
 	item_state = "sniper"

code/modules/projectiles/guns/energy/stun.dm

@@ -19,7 +19,7 @@
 
 /obj/item/weapon/gun/energy/stunrevolver
 	name = "stun revolver"
-	desc = "A LAEP20 Zeus. Designed by Lawson Arms and produced under the wing of the FTU, several TSCs have been trying to get a hold of the blueprints for half a decade."
+	desc = "A LAEP20 Zeus. Designed by Lawson Arms and produced under the wing of Hephaestus, several TSCs have been trying to get a hold of the blueprints for half a decade."
 	icon_state = "stunrevolver"
 	item_state = "stunrevolver"
 	fire_sound = 'sound/weapons/Gunshot.ogg'

code/modules/projectiles/guns/projectile/shotgun.dm

@@ -43,7 +43,7 @@
 
 /obj/item/weapon/gun/projectile/shotgun/pump/combat
 	name = "combat shotgun"
-	desc = "Built for close quarters combat, the Hesphaistos Industries KS-40 is widely regarded as a weapon of choice for repelling boarders. Uses 12g rounds."
+	desc = "Built for close quarters combat, the Hephaestus Industries KS-40 is widely regarded as a weapon of choice for repelling boarders. Uses 12g rounds."
 	icon_state = "cshotgun"
 	item_state = "cshotgun"
 	origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2)