Skip to content

Commit

Permalink
Merge pull request tgstation#16696 from SamuelRowe/master
Browse files Browse the repository at this point in the history
Minor grammar fixes
  • Loading branch information
KorPhaeron committed Apr 13, 2016
2 parents 62939a0 + 4809875 commit 9988ee1
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions code/modules/hydroponics/beekeeping/beekeeper_suit.dm
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@

/obj/item/clothing/head/beekeeper_head
name = "beekeeper hat"
desc = "keeps the lil buzzing buggers out of your eyes"
desc = "Keeps the lil buzzing buggers out of your eyes."
icon_state = "beekeeper"
item_state = "beekeeper"
flags = THICKMATERIAL


/obj/item/clothing/suit/beekeeper_suit
name = "beekeeper suit"
desc = "keeps the lil buzzing buggers away from your squishy bits"
desc = "Keeps the lil buzzing buggers away from your squishy bits."
icon_state = "beekeeper"
item_state = "beekeeper"
flags = THICKMATERIAL
Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/beekeeping/honey_frame.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

/obj/item/honey_frame
name = "honey frame"
desc = "a scaffold for bees to build honeycomb on"
desc = "A scaffold for bees to build honeycomb on."
icon = 'icons/obj/hydroponics/equipment.dmi'
icon_state = "honey_frame"
var/honeycomb_capacity = 10 //10 Honeycomb per frame by default, researchable frames perhaps?
Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/beekeeping/honeycomb.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

/obj/item/weapon/reagent_containers/honeycomb
name = "honeycomb"
desc = "a hexagonal mesh of honeycomb"
desc = "A hexagonal mesh of honeycomb."
icon = 'icons/obj/hydroponics/harvest.dmi'
icon_state = "honeycomb"
possible_transfer_amounts = list()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/power/cable.dm
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ By design, d1 is the smallest direction and d2 is the highest
on_blueprints = TRUE
var/datum/powernet/powernet
name = "power cable"
desc = "A flexible superconducting cable for heavy-duty power transfer"
desc = "A flexible, superconducting cable for heavy-duty power transfer."
icon = 'icons/obj/power_cond/power_cond_red.dmi'
icon_state = "0-1"
var/d1 = 0 // cable direction 1 (see above)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/power/port_gen.dm
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ display round(lastgen) and plasmatank amount
//Baseline portable generator. Has all the default handling. Not intended to be used on it's own (since it generates unlimited power).
/obj/machinery/power/port_gen
name = "portable generator"
desc = "A portable generator for emergency backup power"
desc = "A portable generator for emergency backup power."
icon = 'icons/obj/power.dmi'
icon_state = "portgen0"
density = 1
Expand Down
2 changes: 1 addition & 1 deletion code/modules/power/smes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
return

if(terminal) //is there already a terminal ?
user << "<span class='warning'>This SMES already have a power terminal!</span>"
user << "<span class='warning'>This SMES already has a power terminal!</span>"
return

if(!panel_open) //is the panel open ?
Expand Down
2 changes: 1 addition & 1 deletion code/modules/power/turbine.dm
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@

/obj/machinery/computer/turbine_computer
name = "gas turbine control computer"
desc = "A computer to remotely control a gas turbine"
desc = "A computer to remotely control a gas turbine."
icon_screen = "turbinecomp"
icon_keyboard = "tech_key"
circuit = /obj/item/weapon/circuitboard/turbine_computer
Expand Down
14 changes: 7 additions & 7 deletions code/modules/reagents/reagent_dispenser.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@

//Dispensers
/obj/structure/reagent_dispensers/watertank
name = "watertank"
desc = "A watertank"
name = "water tank"
desc = "A water tank."
icon = 'icons/obj/objects.dmi'
icon_state = "watertank"

Expand Down Expand Up @@ -73,8 +73,8 @@
qdel(src)

/obj/structure/reagent_dispensers/fueltank
name = "fueltank"
desc = "A fueltank"
name = "fuel tank"
desc = "A fuel tank."
icon = 'icons/obj/objects.dmi'
icon_state = "weldtank"

Expand Down Expand Up @@ -123,8 +123,8 @@


/obj/structure/reagent_dispensers/water_cooler
name = "Water-Cooler"
desc = "A machine that dispenses water to drink"
name = "water cooler"
desc = "A machine that dispenses water to drink."
icon = 'icons/obj/vending.dmi'
icon_state = "water_cooler"
anchored = 1
Expand Down Expand Up @@ -158,7 +158,7 @@
..()
/obj/structure/reagent_dispensers/beerkeg
name = "beer keg"
desc = "A beer keg"
desc = "A beer keg."
icon = 'icons/obj/objects.dmi'
icon_state = "beertankTEMP"

Expand Down

0 comments on commit 9988ee1

Please sign in to comment.