From 022eb8cf4c1f1ed2a1c0360414dafe20d5c860d9 Mon Sep 17 00:00:00 2001 From: Belsima Date: Sat, 9 Sep 2017 12:20:08 -0400 Subject: [PATCH 1/2] Standardizes spellings to wiki and adds more major corps and places to setup. --- code/game/machinery/newscaster.dm | 2 +- code/modules/client/preferences_factions.dm | 20 ++++++---- code/modules/projectiles/guns/energy/laser.dm | 4 +- code/modules/projectiles/guns/energy/stun.dm | 2 +- .../projectiles/guns/projectile/shotgun.dm | 2 +- html/changelogs/Belsima-Factions.yml | 38 +++++++++++++++++++ 6 files changed, 55 insertions(+), 13 deletions(-) create mode 100644 html/changelogs/Belsima-Factions.yml diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index f2a0132b5a4..f1fb58ccaa9 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -268,7 +268,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co switch(screen) if(0) dat += "Welcome to Newscasting Unit #[unit_no].
Interface & News networks Operational." - dat += "
Property of Nanotransen Inc" + dat += "
Property of NanoSrasen Inc" if(news_network.wanted_issue) dat+= "
Read Wanted Issue" dat+= "

Create Feed Channel" diff --git a/code/modules/client/preferences_factions.dm b/code/modules/client/preferences_factions.dm index 00ff50a656d..a2438777529 100644 --- a/code/modules/client/preferences_factions.dm +++ b/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,14 +28,14 @@ var/global/list/home_system_choices = list( "Vir", "Nyx", "Tau Ceti", - "Qerr'Vallis", + "Qerr'valis", "Epsilon Ursae Minoris", "Rarkajar" ) var/global/list/faction_choices = list( "Sol Central", - "Vey Med", + "Vey-Medical", "Einstein Engines", "Free Trade Union", "NanoTrasen", @@ -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" ) \ No newline at end of file diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index de28d0d7c5b..811e9d28f9e 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/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" diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index 41e8c9a53db..07b78fc2ea5 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/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' diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index d2012b4c661..2fb6f04abbe 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/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) diff --git a/html/changelogs/Belsima-Factions.yml b/html/changelogs/Belsima-Factions.yml new file mode 100644 index 00000000000..4ccef636ae3 --- /dev/null +++ b/html/changelogs/Belsima-Factions.yml @@ -0,0 +1,38 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Belsima + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - spellcheck: "Made spelling of corporations and planets more consistent." + - rscadd: "Added more planets to character setup." + From 7359c6f7a6959da7feed73ee4202f98e82fb0259 Mon Sep 17 00:00:00 2001 From: Belsima Date: Sat, 9 Sep 2017 23:17:41 -0400 Subject: [PATCH 2/2] Fixes up the PR. --- code/game/machinery/newscaster.dm | 2 +- code/modules/busy_space/organizations.dm | 4 ++-- code/modules/client/preferences_factions.dm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index f1fb58ccaa9..5ce605afccd 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -268,7 +268,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co switch(screen) if(0) dat += "Welcome to Newscasting Unit #[unit_no].
Interface & News networks Operational." - dat += "
Property of NanoSrasen Inc" + dat += "
Property of NanoTrasen Inc" if(news_network.wanted_issue) dat+= "
Read Wanted Issue" dat+= "

Create Feed Channel" diff --git a/code/modules/busy_space/organizations.dm b/code/modules/busy_space/organizations.dm index 68226189c83..fd2e3ed4ca8 100644 --- a/code/modules/busy_space/organizations.dm +++ b/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 \ diff --git a/code/modules/client/preferences_factions.dm b/code/modules/client/preferences_factions.dm index a2438777529..98ba4584d0a 100644 --- a/code/modules/client/preferences_factions.dm +++ b/code/modules/client/preferences_factions.dm @@ -35,7 +35,7 @@ var/global/list/home_system_choices = list( var/global/list/faction_choices = list( "Sol Central", - "Vey-Medical", + "Vey Med", "Einstein Engines", "Free Trade Union", "NanoTrasen",