diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm
index 67391a1854..ee4e577f9f 100644
--- a/code/datums/helper_datums/getrev.dm
+++ b/code/datums/helper_datums/getrev.dm
@@ -54,6 +54,8 @@ var/global/datum/getrev/revdata = new("config/svndir.txt")
if(svndirpath && fexists(svndirpath) && fexists("[svndirpath]/entries") && isfile(file("[svndirpath]/entries")))
var/list/filelist = dd_file2list("[svndirpath]/entries",null)
+ if(filelist.len < 4)
+ return abort()
revision = filelist[4]
commiter = filelist[12]
diary << "Revision info loaded succesfully"
diff --git a/code/defines/obj/decal.dm b/code/defines/obj/decal.dm
index d12a8497f8..68c6245f98 100644
--- a/code/defines/obj/decal.dm
+++ b/code/defines/obj/decal.dm
@@ -41,7 +41,7 @@
/obj/effect/decal/cleanable/blood
name = "Blood"
- desc = "It's red. Its Gooye. It is the chefs cooking perhaps."
+ desc = "It's red. It's Gooye. It's the chef's cooking, perhaps?"
density = 0
anchored = 1
layer = 2
@@ -94,7 +94,7 @@
/obj/effect/decal/cleanable/xenoblood
name = "xeno blood"
- desc = "It's green. Must be more of the chefs cooking."
+ desc = "It's green. Must be more of the chef's cooking."
density = 0
anchored = 1
layer = 2
diff --git a/code/defines/obj/machinery.dm b/code/defines/obj/machinery.dm
index 97f93bab18..42c3f0ca91 100644
--- a/code/defines/obj/machinery.dm
+++ b/code/defines/obj/machinery.dm
@@ -19,7 +19,7 @@
gl_uid = 1
/obj/machinery/autolathe
- name = "Autolathe"
+ name = "\improper Autolathe"
desc = "Produces items with metal and glass."
icon_state = "autolathe"
density = 1
@@ -42,7 +42,7 @@
active_power_usage = 100
/obj/machinery/camera
- name = "Security Camera"
+ name = "security camera"
desc = "This is used to monitor rooms. Can see through walls."
icon = 'monitors.dmi'
icon_state = "camera"
@@ -60,8 +60,8 @@
active_power_usage = 10
/obj/machinery/dispenser
+ name = "\improper Tank Storage Unit"
desc = "A simple yet bulky one-way storage device for gas tanks. Holds 10 plasma and 10 oxygen tanks."
- name = "Tank Storage Unit"
icon = 'objects.dmi'
icon_state = "dispenser"
density = 1
@@ -73,7 +73,7 @@
active_power_usage = 10
/obj/machinery/dna_scanner
- name = "DNA Scanner/Implanter"
+ name = "\improper DNA Scanner/Implanter"
desc = "Scans DNA."
icon = 'Cryogenic2.dmi'
icon_state = "scanner_0"
@@ -86,7 +86,7 @@
active_power_usage = 300
/obj/machinery/dna_scannernew
- name = "DNA Modifier"
+ name = "\improper DNA Modifier"
desc = "Scans DNA better."
icon = 'Cryogenic2.dmi'
icon_state = "scanner_0"
@@ -99,7 +99,7 @@
active_power_usage = 300
/obj/machinery/firealarm
- name = "Fire Alarm"
+ name = "fire alarm"
desc = "Pull this in case of emergency. Thus keep pulling this forever."
icon = 'monitors.dmi'
icon_state = "fire0"
@@ -115,7 +115,7 @@
power_channel = ENVIRON
/obj/machinery/partyalarm
- name = "Party Button"
+ name = "\improper Party Button"
desc = "Cuban Pete is in the house!"
icon = 'monitors.dmi'
icon_state = "fire0"
@@ -169,7 +169,7 @@
active_power_usage = 4
/obj/machinery/restruct
- name = "DNA Physical Restructurization Accelerator"
+ name = "\improper DNA Physical Restructurization Accelerator"
desc = "This looks complex."
icon = 'Cryogenic2.dmi'
icon_state = "restruct_0"
@@ -182,7 +182,7 @@
active_power_usage = 600
/obj/machinery/scan_console
- name = "DNA Scanner Access Console"
+ name = "\improper DNA Scanner Access Console"
desc = "Scand DNA."
icon = 'computer.dmi'
icon_state = "scanner"
@@ -204,7 +204,7 @@
active_power_usage = 400
/obj/machinery/door_control
- name = "Remote Door Control"
+ name = "remote door control"
desc = "This controls doors."
icon = 'stationobjs.dmi'
icon_state = "doorctrl0"
@@ -228,7 +228,7 @@
active_power_usage = 4
/obj/machinery/driver_button
- name = "Mass Driver Button"
+ name = "mass driver button"
desc = "FIRE AWAY!"
icon = 'objects.dmi'
icon_state = "launcherbtt"
@@ -241,7 +241,7 @@
active_power_usage = 4
/obj/machinery/ignition_switch
- name = "Ignition Switch"
+ name = "ignition switch"
desc = "Activates that igniter."
icon = 'objects.dmi'
icon_state = "launcherbtt"
@@ -336,7 +336,7 @@
var/lastgenlev = -1
/obj/machinery/power/monitor
- name = "Power Monitoring Computer"
+ name = "\improper Power Monitoring Computer"
desc = "Used to monitor the power. Pretty useless."
icon = 'computer.dmi'
icon_state = "power"
@@ -359,7 +359,7 @@
active_power_usage = 60
/obj/machinery/light_switch
- desc = "A light switch"
+ desc = "light switch"
name = null
icon = 'power.dmi'
icon_state = "light1"
@@ -390,20 +390,20 @@
obj/effect/overlay/hologram//The projection itself. If there is one, the instrument is on, off otherwise.
/obj/machinery/hologram/holopad
- name = "AI holopad"
+ name = "\improper AI holopad"
desc = "A floor-mounted device for projecting a holographic image. It is activated remotely."
icon_state = "holopad0"
var
mob/living/silicon/ai/master//Which AI, if any, is controlling the object? Only one AI may control a hologram at any time.
/obj/machinery/hologram/projector
- name = "Hologram Projector"
+ name = "\improper Hologram Projector"
desc = "Makes a hologram appear...somehow..."
icon = 'stationobjs.dmi'
icon_state = "hologram0"
/obj/machinery/hologram/proj_ai
- name = "Hologram Projector Platform"
+ name = "\improper Hologram Projector Platform"
desc = "Used for the fun of the diabolical AI."
icon = 'stationobjs.dmi'
icon_state = "hologram0"
diff --git a/code/defines/procs/gamehelpers.dm b/code/defines/procs/gamehelpers.dm
index 6f7918290b..39b0511950 100644
--- a/code/defines/procs/gamehelpers.dm
+++ b/code/defines/procs/gamehelpers.dm
@@ -19,7 +19,7 @@
return null
return 0
-/proc/get_area_name(N) //get area by it's name
+/proc/get_area_name(N) //get area by its name
for(var/area/A in world)
if(A.name == N)
return A
diff --git a/code/defines/turf.dm b/code/defines/turf.dm
index 140f1a3f5a..61fdc42b7b 100644
--- a/code/defines/turf.dm
+++ b/code/defines/turf.dm
@@ -37,7 +37,7 @@
/turf/space
icon = 'space.dmi'
- name = "space"
+ name = "\proper space"
icon_state = "placeholder"
temperature = TCMB
diff --git a/code/game/gamemodes/events/ninja_equipment.dm b/code/game/gamemodes/events/ninja_equipment.dm
index 6c489d87a2..d4f390db4f 100644
--- a/code/game/gamemodes/events/ninja_equipment.dm
+++ b/code/game/gamemodes/events/ninja_equipment.dm
@@ -1121,7 +1121,7 @@ ________________________________________________________________________________
else break
U << "\blue Gained [totaldrain] energy from [src]."
else
- U << "\red The exosuit's battery has run dry of power. You must find another source."
+ U << "\red The exosuit's battery has run dry. You must find another source of power."
if("CYBORG")
var/mob/living/silicon/robot/A = target
diff --git a/code/game/gamemodes/intercept_report.dm b/code/game/gamemodes/intercept_report.dm
index 8c49bd3e3a..48de925403 100644
--- a/code/game/gamemodes/intercept_report.dm
+++ b/code/game/gamemodes/intercept_report.dm
@@ -207,14 +207,14 @@
src.text += "
The evil Space Wizards Federation have recently broke their most feared wizard, known only as \"[SWF_desc]\" out of space jail. "
src.text += "He is on the run, last spotted in a system near your present location. If anybody suspicious is located aboard, please "
- src.text += "approach with EXTREME caution. Cent. Com also recommends that it would be wise to not inform the crew of this, due to it's fearful nature."
+ src.text += "approach with EXTREME caution. Cent. Com also recommends that it would be wise to not inform the crew of this, due to their fearful nature."
src.text += "Known attributes include: Brown sandals, a large blue hat, a voluptous white beard, and an inclination to cast spells."
/datum/intercept_text/proc/build_nuke(datum/mind/correct_person)
src.text += "
Cent. Com recently recieved a report of a plot to destory one of our stations in your area. We believe the Nuclear Authentication Disc "
- src.text += "that is standard issue aboard your vessel may be a target, and reccommend removal of this object, and it's storage in a safe "
+ src.text += "that is standard issue aboard your vessel may be a target. We recommend removal of this object, and it's storage in a safe "
src.text += "environment. As this may cause panic among the crew, all efforts should be made to keep this information a secret from all but "
- src.text += "the most trusted members."
+ src.text += "the most trusted crew-members."
/datum/intercept_text/proc/build_malf(datum/mind/correct_person)
var/a_name = pick(src.anomalies)
diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm
index d8f46a3f77..4630aa688b 100644
--- a/code/game/gamemodes/wizard/soulstone.dm
+++ b/code/game/gamemodes/wizard/soulstone.dm
@@ -138,8 +138,8 @@
T.loc = C //put shade in stone
T.nodamage = 1
T.canmove = 0
- T.health = T.max_health
+ T.health = T.maxHealth
C.icon_state = "soulstone2"
- T << "Your soul has been recaptured by the soul stone, it's arcane energies reknitting your ethereal form"
+ T << "Your soul has been recaptured by the soul stone, its arcane energies are reknitting your ethereal form"
U << "\blue Capture successful!: \black [T.name]'s has been recaptured and stored within the soul stone."
- return
\ No newline at end of file
+ return
diff --git a/code/game/machinery/kitchen/microwave.dm b/code/game/machinery/kitchen/microwave.dm
index 0a57dec0de..ac5f74d7cc 100644
--- a/code/game/machinery/kitchen/microwave.dm
+++ b/code/game/machinery/kitchen/microwave.dm
@@ -88,7 +88,7 @@
"\blue [user] has cleaned the microwave.", \
"\blue You have cleaned the microwave." \
)
- src.dirty = 0 // It's cleaned!
+ src.dirty = 0 // It's clean!
src.broken = 0 // just to be sure
src.icon_state = "mw"
src.flags = OPENCONTAINER
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index 371a9894d6..5c1a0f70cc 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -478,7 +478,7 @@
if(istype(I, /obj/item/weapon/screwdriver))
src.panelopen = !src.panelopen
playsound(src.loc, 'Screwdriver.ogg', 100, 1)
- user << text("You [] the Unit's maintenance panel.",(src.panelopen ? "open up" : "close") )
+ user << text("You [] the unit's maintenance panel.",(src.panelopen ? "open up" : "close") )
src.updateUsrDialog()
return
if ( istype(I, /obj/item/weapon/grab) )
@@ -492,7 +492,7 @@
usr << "The unit is not operational."
return
if ( (src.OCCUPANT) || (src.HELMET) || (src.SUIT) ) //Unit needs to be absolutely empty
- user << "The Unit's storage area is too cluttered."
+ user << "The unit's storage area is too cluttered."
return
for (var/mob/V in viewers(user))
V.show_message("[user] starts putting [G.affecting.name] into the Suit Storage Unit.", 3)
diff --git a/code/game/magic/cultist/ritual.dm b/code/game/magic/cultist/ritual.dm
index f32f7eadea..0a8de64184 100644
--- a/code/game/magic/cultist/ritual.dm
+++ b/code/game/magic/cultist/ritual.dm
@@ -396,7 +396,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",