From e61efc752a5ebfa64cebc3fab4d69cb012f33418 Mon Sep 17 00:00:00 2001 From: Belsima <31827220+Belsima@users.noreply.github.com> Date: Sat, 14 Oct 2017 00:32:22 -0400 Subject: [PATCH] more gammers (#4052) * Update medsci.dm * Update miscellaneous.dm * Update arcade.dm * Update transform.dm * Update implanter.dm * Update shuttle_console.dm --- .../gamemodes/changeling/powers/transform.dm | 2 +- code/game/machinery/computer/arcade.dm | 32 +++++++++---------- .../items/weapons/implants/implanter.dm | 2 +- code/modules/clothing/under/jobs/medsci.dm | 4 +-- code/modules/clothing/under/miscellaneous.dm | 6 ++-- code/modules/shuttles/shuttle_console.dm | 2 +- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/code/game/gamemodes/changeling/powers/transform.dm b/code/game/gamemodes/changeling/powers/transform.dm index 37a9945210..9225792575 100644 --- a/code/game/gamemodes/changeling/powers/transform.dm +++ b/code/game/gamemodes/changeling/powers/transform.dm @@ -1,6 +1,6 @@ /datum/power/changeling/transform name = "Transform" - desc = "We take on the apperance and voice of one we have absorbed." + desc = "We take on the appearance and voice of one we have absorbed." ability_icon_state = "ling_transform" genomecost = 0 verbpath = /mob/proc/changeling_transform diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 408e3184d4..d546ef4676 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -387,9 +387,9 @@ var/dat = "" if(gameStatus == ORION_STATUS_GAMEOVER) dat = "

Game Over

" - dat += "Like many before you, your crew never made it to Orion, lost to space...
Forever." + dat += "Like many before you, your crew never made it to Orion, lost to space...
forever." if(settlers.len == 0) - dat += "
Your entire crew died, your ship joins the fleet of ghost-ships littering the galaxy." + dat += "
Your entire crew died, and your ship joins the fleet of ghost-ships littering the galaxy." else if(food <= 0) dat += "
You ran out of food and starved." @@ -650,17 +650,17 @@ if(prob(success)) FU = rand(5,15) FO = rand(5,15) - last_spaceport_action = "You successfully raided the spaceport! you gained [FU] Fuel and [FO] Food! (+[FU]FU,+[FO]FO)" + last_spaceport_action = "You successfully raided the spaceport! You gained [FU] Fuel and [FO] Food! (+[FU]FU,+[FO]FO)" else FU = rand(-5,-15) FO = rand(-5,-15) - last_spaceport_action = "You failed to raid the spaceport! you lost [FU*-1] Fuel and [FO*-1] Food in your scramble to escape! ([FU]FU,[FO]FO)" + last_spaceport_action = "You failed to raid the spaceport! You lost [FU*-1] Fuel and [FO*-1] Food in your scramble to escape! ([FU]FU,[FO]FO)" //your chance of lose a crewmember is 1/2 your chance of success //this makes higher % failures hurt more, don't get cocky space cowboy! if(prob(success*5)) var/lost_crew = remove_crewmember() - last_spaceport_action = "You failed to raid the spaceport! you lost [FU*-1] Fuel and [FO*-1] Food, AND [lost_crew] in your scramble to escape! ([FU]FI,[FO]FO,-Crew)" + last_spaceport_action = "You failed to raid the spaceport! You lost [FU*-1] Fuel and [FO*-1] Food, AND [lost_crew] in your scramble to escape! ([FU]FI,[FO]FO,-Crew)" if(emagged) src.visible_message("The machine states, 'YOU ARE UNDER ARREST, RAIDER!' and shoots handcuffs onto [usr]!", "You hear something say 'YOU ARE UNDER ARREST, RAIDER!' and a clinking sound") var/obj/item/weapon/handcuffs/C = new(src.loc) @@ -730,9 +730,9 @@ eventdat += "
They have stolen [sfood] Food and [sfuel] Fuel." else if(prob(10)) var/deadname = remove_crewmember() - eventdat += "
[deadname] tried to fight back but was killed." + eventdat += "
[deadname] tried to fight back, but was killed." else - eventdat += "
Fortunately you fended them off without any trouble." + eventdat += "
Fortunately, you fended them off without any trouble." eventdat += "

Continue

" eventdat += "

Close

" canContinueEvent = 1 @@ -890,7 +890,7 @@ add_crewmember() freecrew++ - eventdat += "
The traders of the spaceport take pitty on you, and give you some food and fuel (+[FU]FU,+[FO]FO)" + eventdat += "
The traders of the spaceport take pity on you, and give you some supplies. (+[FU]FU,+[FO]FO)" if(freecrew) eventdat += "
You also gain a new crewmember!" @@ -904,13 +904,13 @@ if(food >= 10 && fuel >= 10) eventdat += "

Hire a new Crewmember (-10FU,-10FO)

" else - eventdat += "

Cant afford a new Crewmember

" + eventdat += "

You cannot afford a new Crewmember

" //Sell crew if(settlers.len > 1) eventdat += "

Sell crew for Fuel and Food (+7FU,+7FO)

" else - eventdat += "

Cant afford to sell a Crewmember

" + eventdat += "

You cannot afford to sell a Crewmember

" //BUY/SELL STUFF eventdat += "

Spare Parts:

" @@ -919,30 +919,30 @@ if(fuel > 5) eventdat += "

Buy Engine Parts (-5FU)

" else - eventdat += "

Cant afford to buy Engine Parts" + eventdat += "

You cannot afford to buy Engine Parts" //Hull plates if(fuel > 5) eventdat += "

Buy Hull Plates (-5FU)

" else - eventdat += "

Cant afford to buy Hull Plates" + eventdat += "

You cannot afford to buy Hull Plates" //Electronics if(fuel > 5) eventdat += "

Buy Spare Electronics (-5FU)

" else - eventdat += "

Cant afford to buy Spare Electronics" + eventdat += "

You cannot afford to buy Spare Electronics" //Trade if(fuel > 5) eventdat += "

Trade Fuel for Food (-5FU,+5FO)

" else - eventdat += "

Cant afford to Trade Fuel for Food 5) eventdat += "

Trade Food for Fuel (+5FU,-5FO)

" else - eventdat += "

Cant afford to Trade Food for Fuel[user] is attemping to implant [M].") + M.visible_message("[user] is attempting to implant [M].") user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) user.do_attack_animation(M) diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index 7398efa44d..b958d18840 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -16,7 +16,7 @@ /obj/item/clothing/under/rank/research_director/dress_rd name = "research director dress uniform" - desc = "Feminine fashion for the style concious RD. Its fabric provides minor protection from biological contaminants." + desc = "Feminine fashion for the style conscious RD. Its fabric provides minor protection from biological contaminants." icon_state = "dress_rd" armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS @@ -194,4 +194,4 @@ item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "white") permeability_coefficient = 0.50 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) - rolled_sleeves = 0 \ No newline at end of file + rolled_sleeves = 0 diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 9c8eb14582..7f9586b6a0 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -363,13 +363,13 @@ /obj/item/clothing/under/dress/dress_cap name = "colony director's dress uniform" - desc = "Feminine fashion for the style concious Colony Director." + desc = "Feminine fashion for the style conscious Colony Director." icon_state = "dress_cap" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS /obj/item/clothing/under/dress/dress_hop name = "head of personnel dress uniform" - desc = "Feminine fashion for the style concious HoP." + desc = "Feminine fashion for the style conscious HoP." icon_state = "dress_hop" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS @@ -808,4 +808,4 @@ name = "bathrobe" desc = "A fluffy robe to keep you from showing off to the world." icon_state = "bathrobe" - worn_state = "bathrobe" \ No newline at end of file + worn_state = "bathrobe" diff --git a/code/modules/shuttles/shuttle_console.dm b/code/modules/shuttles/shuttle_console.dm index 0da9634b39..5e096fcd8f 100644 --- a/code/modules/shuttles/shuttle_console.dm +++ b/code/modules/shuttles/shuttle_console.dm @@ -40,7 +40,7 @@ else shuttle_status = "Standing-by at offsite location." if(WAIT_LAUNCH, FORCE_LAUNCH) - shuttle_status = "Shuttle has recieved command and will depart shortly." + shuttle_status = "Shuttle has received command and will depart shortly." if(WAIT_ARRIVE) shuttle_status = "Proceeding to destination." if(WAIT_FINISH)