diff --git a/code/defines/mob/dead/observer.dm b/code/defines/mob/dead/observer.dm
index 9e63345a3d2..2cecfcf1841 100644
--- a/code/defines/mob/dead/observer.dm
+++ b/code/defines/mob/dead/observer.dm
@@ -1,4 +1,6 @@
/mob/dead/observer
+ name = "ghost"
+ desc = "It's a g-g-g-g-ghooooost!" //jinkies!
icon = 'mob.dmi'
icon_state = "ghost"
layer = 4
diff --git a/code/defines/mob/living/silicon/robot.dm b/code/defines/mob/living/silicon/robot.dm
index ebcf1457b69..604e589f97d 100644
--- a/code/defines/mob/living/silicon/robot.dm
+++ b/code/defines/mob/living/silicon/robot.dm
@@ -1,5 +1,5 @@
/mob/living/silicon/robot
- name = "Robot"
+ name = "Cyborg"
icon = 'robots.dmi'//
icon_state = "robot"
health = 300
diff --git a/code/defines/obj/closet.dm b/code/defines/obj/closet.dm
index d1781e0555b..815a7be2535 100644
--- a/code/defines/obj/closet.dm
+++ b/code/defines/obj/closet.dm
@@ -1,6 +1,6 @@
/obj/structure/closet
- name = "Closet"
- desc = "It's a closet!"
+ name = "closet"
+ desc = "It's a basic storage unit."
icon = 'closet.dmi'
icon_state = "closed"
density = 1
@@ -14,14 +14,14 @@
var/lastbang
/obj/structure/closet/acloset
- name = "Strange closet"
+ name = "strange closet"
desc = "It looks alien!"
icon_state = "acloset"
icon_closed = "acloset"
icon_opened = "aclosetopen"
/obj/structure/closet/cabinet
- name = "Cabinet"
+ name = "cabinet"
desc = "Old will forever be in fashion."
icon_state = "cabinet_closed"
icon_closed = "cabinet_closed"
@@ -36,12 +36,12 @@
anchored = 0
/obj/structure/closet/gmcloset
- name = "Formal closet"
- desc = "A bulky (yet mobile) closet. Comes with formal clothes"
+ name = "formal closet"
+ desc = "It's a storage unit for formal clothing."
/obj/structure/closet/emcloset
- name = "Emergency Closet"
- desc = "A bulky (yet mobile) closet. Comes prestocked with a gasmask and o2 tank for emergencies."
+ name = "emergency closet"
+ desc = "It's a storage unit for emergency breathmasks and o2 tanks."
icon_state = "emergency"
icon_closed = "emergency"
icon_opened = "emergencyopen"
@@ -49,15 +49,15 @@
/obj/structure/closet/emcloset/legacy
/obj/structure/closet/firecloset
- name = "Fire Closet"
- desc = "A bulky (yet mobile) closet. Comes with supplies to fight fire."
+ name = "fire-safety closet"
+ desc = "It's a storage unit for fire-fighting supplies."
icon_state = "firecloset"
icon_closed = "firecloset"
icon_opened = "fireclosetopen"
/obj/structure/closet/hydrant //wall mounted fire closet
- name = "Fire Closet"
- desc = "A wall mounted closet which comes with supplies to fight fire."
+ name = "fire-safety closet"
+ desc = "It's a storage unit for fire-fighting supplies."
icon_state = "hydrant"
icon_closed = "hydrant"
icon_opened = "hydrant_open"
@@ -66,8 +66,8 @@
wall_mounted = 1
/obj/structure/closet/medical_wall //wall mounted medical closet
- name = "First Aid Closet"
- desc = "A wall mounted closet which should have some first aid."
+ name = "first-aid closet"
+ desc = "It's wall-mounted storage unit for first aid supplies."
icon_state = "medical_wall"
icon_closed = "medical_wall"
icon_opened = "medical_wall_open"
@@ -75,55 +75,52 @@
density = 0
wall_mounted = 1
-
-
-
/obj/structure/closet/toolcloset
- name = "Tool Closet"
- desc = "A bulky (yet mobile) closet. Contains tools."
+ name = "tool closet"
+ desc = "It's a storage unit for tools."
icon_state = "toolcloset"
icon_closed = "toolcloset"
icon_opened = "toolclosetopen"
/obj/structure/closet/radiation
- desc = "A closet with a radiation sign on it."
- name = "Level 2 Radiation Suit"
+ name = "radiation suit closet"
+ desc = "It's a storage unit for rad-protective suits."
icon_state = "radsuitcloset"
icon_opened = "toolclosetopen"
icon_closed = "radsuitcloset"
/obj/structure/closet/jcloset
- name = "Custodial Closet"
- desc = "A bulky (yet mobile) closet. Comes with janitor's clothes and gear."
+ name = "custodial closet"
+ desc = "It's a storage unit for janitorial clothes and gear."
/obj/structure/closet/lawcloset
- name = "Legal Closet"
- desc = "A bulky (yet mobile) closet. Comes with lawyer apparel and items."
+ name = "legal closet"
+ desc = "It's a storage unit for courtroom apparel and items."
/obj/structure/closet/coffin
name = "coffin"
- desc = "A burial receptacle for the dearly departed."
+ desc = "It's a burial receptacle for the dearly departed."
icon_state = "coffin"
icon_closed = "coffin"
icon_opened = "coffin_open"
/obj/structure/closet/bombcloset
- name = "EOD closet"
- desc = "A bulky (yet mobile) closet. Comes prestocked with a level 4 bombsuit."
+ name = "\improper EOD closet"
+ desc = "It's a storage unit for explosion-protective suits."
icon_state = "bombsuit"
icon_closed = "bombsuit"
icon_opened = "bombsuitopen"
/obj/structure/closet/bombclosetsecurity
- name = "EOD closet"
- desc = "A bulky (yet mobile) closet. Comes prestocked with a level 4 bombsuit."
+ name = "\improper EOD closet"
+ desc = "It's a storage unit for explosion-protective suits."
icon_state = "bombsuitsec"
icon_closed = "bombsuitsec"
icon_opened = "bombsuitsecopen"
/obj/structure/closet/l3closet
- name = "Level 3 Biohazard Suit"
- desc = "A bulky (yet mobile) closet. Comes prestocked with level 3 biohazard gear for emergencies."
+ name = "level-3 biohazard suit closet"
+ desc = "It's a storage unit for level-3 biohazard gear."
icon_state = "bio"
icon_closed = "bio"
icon_opened = "bioopen"
@@ -154,164 +151,148 @@
icon_opened = "bio_scientistopen"
/obj/structure/closet/syndicate
- name = "Weapons Closet"
+ name = "armoury closet"
desc = "Why is this here?"
icon_state = "syndicate"
icon_closed = "syndicate"
icon_opened = "syndicateopen"
/obj/structure/closet/syndicate/personal
- desc = "Gear preperations closet."
+ desc = "It's a storage unit for operative gear."
/obj/structure/closet/syndicate/nuclear
- desc = "Nuclear preperations closet."
+ desc = "It's a storage unit for nuclear-operative gear."
// Inserting the gimmick clothing stuff here for generic items, IE Tacticool stuff
/obj/structure/closet/gimmick
- name = "Administrative Supply Closet"
+ name = "administrative supply closet"
+ desc = "It's a storage unit for things that have no right being here."
icon_state = "syndicate1"
icon_closed = "syndicate1"
icon_opened = "syndicate1open"
- desc = "Closet of things that have no right being here."
anchored = 0
/obj/structure/closet/gimmick/russian
- name = "Russian Surplus"
+ name = "russian surplus closet"
+ desc = "It's a storage unit for Russian standard-issue surplus."
icon_state = "syndicate1"
icon_closed = "syndicate1"
icon_opened = "syndicate1open"
- desc = "Russian Surplus Closet"
/obj/structure/closet/gimmick/tacticool
- name = "Tacticool Gear"
+ name = "tacticool gear closet"
+ desc = "It's a storage unit for Tacticool gear."
icon_state = "syndicate1"
icon_closed = "syndicate1"
icon_opened = "syndicate1open"
- desc = "Tacticool Gear Closet"
/obj/structure/closet/thunderdome
+ name = "\improper Thunderdome closet"
desc = "Everything you need!"
icon_state = "syndicate"
icon_closed = "syndicate"
icon_opened = "syndicateopen"
- name = "Thunderdome closet."
anchored = 1
/obj/structure/closet/thunderdome/tdred
- desc = "Everything you need!"
- icon_state = "syndicate"
- icon_closed = "syndicate"
- icon_opened = "syndicateopen"
- name = "Thunderdome closet."
+ name = "red-team Thunderdome closet"
/obj/structure/closet/thunderdome/tdgreen
- desc = "Everything you need!"
+ name = "green-team Thunderdome closet"
icon_state = "syndicate1"
icon_closed = "syndicate1"
icon_opened = "syndicate1open"
- name = "Thunderdome closet."
+
/obj/structure/closet/malf/suits
- desc = "Gear preparations closet."
+ desc = "It's a storage unit for operational gear."
icon_state = "syndicate"
icon_closed = "syndicate"
icon_opened = "syndicateopen"
/obj/structure/closet/wardrobe
- desc = "A bulky (yet mobile) wardrobe closet. Comes prestocked with 6 changes of clothes."
- name = "Wardrobe"
+ name = "wardrobe"
+ desc = "It's a storage unit for standard-issue Nanotrasen attire."
icon_state = "blue"
icon_closed = "blue"
/obj/structure/closet/wardrobe/black
- name = "Black Wardrobe"
- desc = "Contains black jumpsuits."
+ name = "black wardrobe"
icon_state = "black"
icon_closed = "black"
/obj/structure/closet/wardrobe/chaplain_black
- name = "Chaplain Wardrobe"
- desc = "Closet of basic chaplain clothes."
+ name = "chapel wardrobe"
+ desc = "It's a storage unit for Nanotrasen-approved religious attire."
icon_state = "black"
icon_closed = "black"
/obj/structure/closet/wardrobe/green
- name = "Green Wardrobe"
- desc = "Contains green jumpsuits."
+ name = "green wardrobe"
icon_state = "green"
icon_closed = "green"
/obj/structure/closet/wardrobe/mixed
- name = "Mixed Wardrobe"
- desc = "This appears to contain several different sets of clothing."
+ name = "mixed wardrobe"
icon_state = "mixed"
icon_closed = "mixed"
/obj/structure/closet/wardrobe/orange
- name = "Prisoners Wardrobe"
- desc = "Contains orange jumpsuits."
+ name = "prison wardrobe"
+ desc = "It's a storage unit for Nanotrasen-regulation prisoner attire."
icon_state = "orange"
icon_closed = "orange"
/obj/structure/closet/wardrobe/pink
- name = "Pink Wardrobe"
- desc = "Contains pink jumpsuits."
+ name = "pink wardrobe"
icon_state = "pink"
icon_closed = "pink"
/obj/structure/closet/wardrobe/red
- name = "Security Wardrobe"
- desc = "Contains security officer jumpsuits."
+ name = "security wardrobe"
icon_state = "red"
icon_closed = "red"
/obj/structure/closet/wardrobe/white
- name = "White Wardrobe"
- desc = "Contains white jumpsuits."
+ name = "white wardrobe"
icon_state = "white"
icon_closed = "white"
/obj/structure/closet/wardrobe/toxins_white
- name = "Toxins Wardrobe"
- desc = "Contains toxins jumpsuits."
+ name = "toxins wardrobe"
icon_state = "white"
icon_closed = "white"
/obj/structure/closet/wardrobe/genetics_white
- name = "Genetics Wardrobe"
- desc = "Contains genetics jumpsuits."
+ name = "genetics wardrobe"
icon_state = "white"
icon_closed = "white"
/obj/structure/closet/wardrobe/yellow
- name = "Yellow Wardrobe"
- desc = "Contains yellow jumpsuits."
+ name = "yellow wardrobe"
icon_state = "wardrobe-y"
icon_closed = "wardrobe-y"
/obj/structure/closet/wardrobe/engineering_yellow
- name = "Engineering Wardrobe"
- desc = "Contains engineering jumpsuits."
+ name = "engineering wardrobe"
icon_state = "yellow"
icon_closed = "yellow"
/obj/structure/closet/wardrobe/atmospherics_yellow
- name = "Atmospherics Wardrobe"
- desc = "Contains atmospheric jumpsuits."
+ name = "atmospherics wardrobe"
icon_state = "yellow"
icon_closed = "yellow"
/obj/structure/closet/wardrobe/grey
- name = "Grey Wardrobe"
- desc = "Contains grey jumpsuits."
+ name = "grey wardrobe"
icon_state = "grey"
icon_closed = "grey"
/obj/structure/closet/secure_closet
- desc = "An immobile card-locked storage closet."
- name = "Security Locker"
+ name = "secure locker"
+ desc = "It's an immobile card-locked storage unit."
icon = 'closet.dmi'
icon_state = "secure1"
density = 1
@@ -329,7 +310,7 @@
/obj/structure/closet/secure_closet/medical_wall
name = "First Aid Closet"
- desc = "A wall mounted closet which --should-- contain medical supplies."
+ desc = "It's a secure wall-mounted storage unit for first aid supplies."
icon_state = "medical_wall_locked"
icon_closed = "medical_wall_unlocked"
icon_locked = "medical_wall_locked"
@@ -342,8 +323,8 @@
req_access = list(access_medical)
/obj/structure/closet/secure_closet/personal
- desc = "The first card swiped gains control."
- name = "Personal Closet"
+ desc = "It's a secure locker for personell. The first card swiped gains control."
+ name = "personal closet"
/obj/structure/closet/secure_closet/personal/cabinet
icon_state = "cabinetdetective_locked"
@@ -354,7 +335,7 @@
icon_off = "cabinetdetective_broken"
/obj/structure/closet/secure_closet/personal/patient
- name = "Patient's closet"
+ name = "patient's closet"
/obj/structure/closet/secure_closet/wall
name = "wall locker"
diff --git a/code/defines/obj/clothing/gloves.dm b/code/defines/obj/clothing/gloves.dm
index 05554b14600..20e03464ed7 100644
--- a/code/defines/obj/clothing/gloves.dm
+++ b/code/defines/obj/clothing/gloves.dm
@@ -2,6 +2,7 @@
/obj/item/clothing/gloves
name = "gloves"
+ gender = PLURAL //Carn: for grammarically correct text-parsing
w_class = 2.0
icon = 'gloves.dmi'
protective_temperature = 400
@@ -14,7 +15,7 @@
/obj/item/clothing/gloves/boxing
- name = "Boxing Gloves"
+ name = "boxing gloves"
desc = "Because you really needed another excuse to punch your crewmates."
icon_state = "boxing"
item_state = "boxing"
@@ -32,7 +33,7 @@
item_state = "boxingyellow"
/obj/item/clothing/gloves/white
- name = "White Gloves"
+ name = "white gloves"
desc = "These look pretty fancy."
icon_state = "latex"
item_state = "lgloves"
@@ -43,7 +44,7 @@
/obj/item/clothing/gloves/black
desc = "These gloves are fire-resistant."
- name = "Black Gloves"
+ name = "black gloves"
icon_state = "black"
item_state = "bgloves"
color="brown"
@@ -65,7 +66,7 @@
siemens_coefficient = 1.0
/obj/item/clothing/gloves/latex
- name = "Latex Gloves"
+ name = "latex gloves"
desc = "Sterile latex gloves."
icon_state = "latex"
item_state = "lgloves"
@@ -80,7 +81,7 @@
/obj/item/clothing/gloves/swat
desc = "These tactical gloves are somewhat fire and impact-resistant."
- name = "SWAT Gloves"
+ name = "\improper SWAT Gloves"
icon_state = "black"
item_state = "swat_gl"
siemens_coefficient = 0
@@ -136,14 +137,14 @@
/obj/item/clothing/gloves/captain
desc = "Regal blue gloves, with a nice gold trim. Swanky."
- name = "Captain Gloves"
+ name = "captain's gloves"
icon_state = "captain"
item_state = "egloves"
color = "captain"
/obj/item/clothing/gloves/botanic_leather
desc = "These leather gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin."
- name = "botanic leather gloves"
+ name = "botanist's leather gloves"
icon_state = "leather"
item_state = "ggloves"
siemens_coefficient = 0.50
@@ -152,21 +153,21 @@
heat_transfer_coefficient = 0.70
/obj/item/clothing/gloves/orange
- name = "Orange Gloves"
+ name = "orange gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "orange"
item_state = "orangegloves"
color="orange"
/obj/item/clothing/gloves/red
- name = "Red Gloves"
+ name = "red gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "red"
item_state = "redgloves"
color = "red"
/obj/item/clothing/gloves/rainbow
- name = "Rainbow Gloves"
+ name = "rainbow gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "rainbow"
item_state = "rainbowgloves"
@@ -176,28 +177,28 @@
color = "clown"
/obj/item/clothing/gloves/blue
- name = "Blue Gloves"
+ name = "blue gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "blue"
item_state = "bluegloves"
color="blue"
/obj/item/clothing/gloves/purple
- name = "Purple Gloves"
+ name = "purple gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "purple"
item_state = "purplegloves"
color="purple"
/obj/item/clothing/gloves/green
- name = "Green Gloves"
+ name = "green gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "green"
item_state = "greengloves"
color="green"
/obj/item/clothing/gloves/grey
- name = "Grey Gloves"
+ name = "grey gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "gray"
item_state = "graygloves"
@@ -210,14 +211,14 @@
color = "hop" //Exists for washing machines. Is not different from gray gloves in any way.
/obj/item/clothing/gloves/light_brown
- name = "Light Brown Gloves"
+ name = "light brown gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "lightbrown"
item_state = "lightbrowngloves"
color="light brown"
/obj/item/clothing/gloves/brown
- name = "Brown Gloves"
+ name = "brown gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "brown"
item_state = "browngloves"
diff --git a/code/defines/obj/clothing/head.dm b/code/defines/obj/clothing/head.dm
index 1b068cfa4f3..a5c71bb091a 100644
--- a/code/defines/obj/clothing/head.dm
+++ b/code/defines/obj/clothing/head.dm
@@ -6,8 +6,8 @@
var/list/allowed = list()
/obj/item/clothing/head/cakehat
- name = "cakehat"
- desc = "It is a cakehat!"
+ name = "cake-hat"
+ desc = "It's tasty looking!"
icon_state = "cake0"
var/onfire = 0.0
var/status = 0
@@ -15,16 +15,16 @@
var/fire_resist = T0C+1300 //this is the max temp it can stand before you start to cook. although it might not burn away, you take damage
/obj/item/clothing/head/caphat
- name = "Captain's hat"
+ name = "captain's hat"
icon_state = "captain"
desc = "It's good being the king."
flags = FPRINT|TABLEPASS|SUITSPACE
item_state = "caphat"
/obj/item/clothing/head/centhat
- name = "Cent. Comm. hat"
+ name = "\improper CentComm. hat"
icon_state = "centcom"
- desc = "It's even better to be the emperor."
+ desc = "It's good to be emperor."
flags = FPRINT|TABLEPASS|SUITSPACE
item_state = "centhat"
@@ -36,35 +36,36 @@
item_state = "pwig"
/obj/item/clothing/head/that
- name = "Top hat"
- desc = "An amish looking hat."
+ name = "top-hat"
+ desc = "It's an amish looking hat."
icon_state = "tophat"
item_state = "that"
flags = FPRINT|TABLEPASS
/obj/item/clothing/head/chefhat
- name = "Chef's Hat"
+ name = "chef's hat"
+ desc = "It's a hat used by chefs to keep hair out of your food. Judging by the food in the mess, they don't work."
icon_state = "chef"
item_state = "chef"
desc = "The commander in chef's head wear."
flags = FPRINT | TABLEPASS
/obj/item/clothing/head/redcoat
- name = "Redcoat hat"
+ name = "redcoat's hat"
icon_state = "redcoat"
- desc = "I guess it's a redhead."
+ desc = "'I guess it's a redhead.'"
flags = FPRINT | TABLEPASS
/obj/item/clothing/head/mailman
- name = "Mailman Hat"
+ name = "mailman's hat"
icon_state = "mailman"
- desc = "Right-on-time mail service head wear."
+ desc = "'Right-on-time' mail service head wear."
flags = FPRINT | TABLEPASS
/obj/item/clothing/head/plaguedoctorhat
- name = "Plague doctor's hat"
- desc = "Once used by Plague doctors. Now useless."
+ name = "plague doctor's hat"
+ desc = "These were once used by Plague doctors. They're pretty much useless."
icon_state = "plaguedoctor"
flags = FPRINT | TABLEPASS
permeability_coefficient = 0.01
@@ -90,8 +91,8 @@
flags_inv = HIDEEARS|HIDEEYES
/obj/item/clothing/head/helmet/warden
- name = "Warden Hat"
- desc = "A special helmet issued to the Warden of a securiy force. Protects the head from impacts."
+ name = "warden's hat"
+ desc = "It's a special helmet issued to the Warden of a securiy force. Protects the head from impacts."
icon_state = "policehelm"
flags_inv = 0
@@ -104,22 +105,23 @@
flags_inv = 0
/obj/item/clothing/head/secsoft
- name = "Soft Cap"
- desc = "A baseball hat in tasteful red."
+ name = "soft cap"
+ desc = "It's baseball hat in tasteful red colour."
icon_state = "secsoft"
flags = FPRINT|TABLEPASS|HEADCOVERSEYES
item_state = "helmet"
/obj/item/clothing/head/cargosoft
- name = "Cargo cap"
- desc = "A baseball hat in tasteless yellow."
+ name = "cargo cap"
+ desc = "It's a baseball hat in a tasteless yellow colour."
icon_state = "cargosoft"
flags = FPRINT|TABLEPASS|HEADCOVERSEYES
item_state = "helmet"
var/flipped = 0
/obj/item/clothing/head/syndicatefake
- name = "red space helmet replica"
+ name = "red space-helmet replica"
+ desc = "It's a very convincing replica."
icon_state = "syndicate"
item_state = "syndicate"
desc = "A plastic replica of a syndicate agent's space helmet, you'll look just like a real murderous syndicate agent in this! This is a toy, it is not made for use in space!"
@@ -128,8 +130,8 @@
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
/obj/item/clothing/head/helmet/swat
- name = "swat helmet"
- desc = "Used by highly trained Swat Members."
+ name = "\improper SWAT helmet"
+ desc = "They're often used by highly trained Swat Members."
icon_state = "swat"
flags = FPRINT | TABLEPASS | SUITSPACE | HEADSPACE | HEADCOVERSEYES | BLOCKHAIR
item_state = "swat"
@@ -137,8 +139,8 @@
flags_inv = HIDEEARS|HIDEEYES
/obj/item/clothing/head/helmet/thunderdome
- name = "Thunderdome helmet"
- desc = "Let the battle commence!"
+ name = "\improper Thunderdome helmet"
+ desc = "'Let the battle commence!'"
icon_state = "thunderdome"
flags = FPRINT | TABLEPASS | SUITSPACE | HEADSPACE | HEADCOVERSEYES | BLOCKHAIR
item_state = "thunderdome"
@@ -161,8 +163,8 @@
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
/obj/item/clothing/head/helmet/that
- name = "Sturdy Top hat"
- desc = "An amish looking armored top hat."
+ name = "sturdy top-hat"
+ desc = "It's an amish looking armored top hat."
icon_state = "tophat"
item_state = "that"
flags = FPRINT|TABLEPASS
@@ -170,8 +172,8 @@
flags_inv = 0
/obj/item/clothing/head/helmet/greenbandana
- name = "Green Bandana"
- desc = "A green bandana with some fine nanotech lining."
+ name = "green bandana"
+ desc = "It's a green bandana with some fine nanotech lining."
icon_state = "greenbandana"
item_state = "greenbandana"
flags = FPRINT|TABLEPASS
@@ -179,8 +181,8 @@
flags_inv = 0
/obj/item/clothing/head/helmet/riot
- name = "Riot Helmet"
- desc = "A helmet specifically designed to protect against close range attacks."
+ name = "riot helmet"
+ desc = "It's a helmet specifically designed to protect against close range attacks."
icon_state = "riot"
item_state = "helmet"
flags = FPRINT|TABLEPASS|SUITSPACE|HEADCOVERSEYES
@@ -188,28 +190,28 @@
flags_inv = HIDEEARS
/obj/item/clothing/head/helmet/cap
- name = "Captain's cap"
- desc = "For irresponsible Captains."
+ name = "captain's cap"
+ desc = "You fear to wear it for the negligence it brings."
icon_state = "capcap"
flags = FPRINT|TABLEPASS|SUITSPACE
armor = list(melee = 0, bullet = 0, laser = 2,energy = 2, bomb = 0, bio = 0, rad = 0)
flags_inv = 0
/obj/item/clothing/head/chaplain_hood
- name = "Chaplain's hood"
- desc = "A hood that covers the head. Keeps you warm during the space winters."
+ name = "chaplain's hood"
+ desc = "It's hood that covers the head. It keeps you warm during the space winters."
icon_state = "chaplain_hood"
flags = FPRINT|TABLEPASS|HEADSPACE|HEADCOVERSEYES|BLOCKHAIR
/obj/item/clothing/head/hasturhood
- name = "Hastur's Hood"
- desc = "This hood is unspeakably stylish"
+ name = "hastur's hood"
+ desc = "It's unspeakably stylish"
icon_state = "hasturhood"
flags = FPRINT|TABLEPASS|HEADSPACE|HEADCOVERSEYES|BLOCKHAIR
/obj/item/clothing/head/nursehat
- name = "Nurse Hat"
- desc = "For quick identification of trained medical personnel."
+ name = "nurse's hat"
+ desc = "It allows quick identification of trained medical personnel."
icon_state = "nursehat"
flags = FPRINT|TABLEPASS
diff --git a/code/defines/obj/clothing/jumpsuit.dm b/code/defines/obj/clothing/jumpsuit.dm
index c4e10760604..524a5fce845 100644
--- a/code/defines/obj/clothing/jumpsuit.dm
+++ b/code/defines/obj/clothing/jumpsuit.dm
@@ -22,50 +22,50 @@
/obj/item/clothing/under/chameleon
//starts off as black
- name = "Black Jumpsuit"
+ name = "black jumpsuit"
icon_state = "black"
item_state = "bl_suit"
color = "black"
- desc = "A plain jumpsuit. It seems to have a small dial on the wrist."
+ desc = "It's a plain jumpsuit. It seems to have a small dial on the wrist."
origin_tech = "syndicate=3"
var/list/clothing_choices = list()
/obj/item/clothing/under/chameleon/all
/obj/item/clothing/under/color/black
- name = "Black Jumpsuit"
+ name = "black jumpsuit"
icon_state = "black"
item_state = "bl_suit"
color = "black"
/obj/item/clothing/under/color/blackf
- name = "Female Black Jumpsuit"
- desc = "This one is a lady-size!"
+ name = "feminine black jumpsuit"
+ desc = "It's very smart and in a ladies-size!"
icon_state = "black"
item_state = "bl_suit"
color = "blackf"
/obj/item/clothing/under/color/blue
- name = "Blue Jumpsuit"
+ name = "blue jumpsuit"
icon_state = "blue"
item_state = "b_suit"
color = "blue"
/obj/item/clothing/under/color/green
- name = "Green Jumpsuit"
+ name = "green jumpsuit"
icon_state = "green"
item_state = "g_suit"
color = "green"
/obj/item/clothing/under/color/grey
- name = "Grey Jumpsuit"
+ name = "grey jumpsuit"
icon_state = "grey"
item_state = "gy_suit"
color = "grey"
/obj/item/clothing/under/color/orange
- name = "Orange Jumpsuit"
- desc = "Standard Nanotrasen prisoner wear. Its suit sensors are stuck in the \"Fully On\" position."
+ name = "orange jumpsuit"
+ desc = "It's standardised Nanotrasen prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
icon_state = "orange"
item_state = "o_suit"
color = "orange"
@@ -73,20 +73,20 @@
sensor_mode = 3
/obj/item/clothing/under/color/pink
- name = "Pink Jumpsuit"
+ name = "pink jumpsuit"
icon_state = "pink"
item_state = "p_suit"
color = "pink"
/obj/item/clothing/under/color/red
- name = "Red Jumpsuit"
+ name = "red jumpsuit"
icon_state = "red"
item_state = "r_suit"
color = "red"
/obj/item/clothing/under/color/white
- desc = "Made of a special fiber that gives special protection against biohazards."
- name = "White Jumpsuit"
+ desc = "It's made of a special fiber which gives special protection against biohazards."
+ name = "white jumpsuit"
icon_state = "white"
item_state = "w_suit"
color = "white"
@@ -94,7 +94,7 @@
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
/obj/item/clothing/under/color/yellow
- name = "Yellow Jumpsuit"
+ name = "yellow jumpsuit"
icon_state = "yellow"
item_state = "y_suit"
color = "yellow"
@@ -103,29 +103,29 @@
/obj/item/clothing/under/rank
/obj/item/clothing/under/rank/atmospheric_technician
- desc = "A jumpsuit used by atmospheric technicians."
- name = "Atmospherics Jumpsuit"
+ desc = "It's a jumpsuit worn by atmospheric technicians."
+ name = "atmospheric technician's jumpsuit"
icon_state = "atmos"
item_state = "atmos_suit"
color = "atmos"
/obj/item/clothing/under/rank/captain
- desc = "A blue jumpsuit with gold marking denoting the rank of \"Captain\"."
- name = "Captain Jumpsuit"
+ desc = "It's a blue jumpsuit with some gold markings denoting the rank of \"Captain\"."
+ name = "captain's jumpsuit"
icon_state = "captain"
item_state = "caparmor"
color = "captain"
/obj/item/clothing/under/rank/chaplain
- desc = "A black jumpsuit, worn by religious folk."
- name = "Chaplain Jumpsuit"
+ desc = "It's a black jumpsuit, often worn by religious folk."
+ name = "chaplain's jumpsuit"
icon_state = "chaplain"
item_state = "bl_suit"
color = "chapblack"
/obj/item/clothing/under/rank/engineer
- desc = "An orange high visibility jumpsuit. Used by Nanotrasen Engineers, has minor radiation shielding."
- name = "Engineering Jumpsuit"
+ desc = "It's an orange high visibility jumpsuit worn by engineers. It has minor radiation shielding."
+ name = "engineer's jumpsuit"
icon_state = "engine"
item_state = "engi_suit"
color = "engine"
@@ -133,38 +133,38 @@
/obj/item/clothing/under/rank/forensic_technician
desc = "It has a Forensics rank stripe on it."
- name = "Forensics Jumpsuit"
+ name = "forensic technician's jumpsuit"
icon_state = "darkred"
item_state = "r_suit"
color = "forensicsred"
/obj/item/clothing/under/rank/warden
- desc = "Made of a slightly sturdier material than standard jumpsuits, to allow for more robust protection. This one has the word \"Warden\" written on the shoulders."
- name = "Warden Jumpsuit"
+ desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for more robust protection. It has the word \"Warden\" written on the shoulders."
+ name = "warden's jumpsuit"
icon_state = "warden"
item_state = "r_suit"
color = "warden"
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/under/rank/security
- name = "Security Jumpsuit"
- desc = "Made of a slightly sturdier material than standard jumpsuits, to allow for more robust protection."
+ name = "security officer's jumpsuit"
+ desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection."
icon_state = "security"
item_state = "r_suit"
color = "secred"
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/under/rank/vice
- name = "Vice officer Jumpsuit"
- desc = "Your standard issue pretty-boy outfit, as seen on TV."
+ name = "vice officer's jumpsuit"
+ desc = "It's the standard issue pretty-boy outfit, as seen on Holo-Vision."
icon_state = "vice"
item_state = "gy_suit"
color = "vice"
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/under/rank/geneticist
- desc = "Made of a special fiber that gives special protection against biohazards. Has a genetics rank stripe on it."
- name = "Genetics Jumpsuit"
+ desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it."
+ name = "geneticist's jumpsuit"
icon_state = "genetics"
item_state = "w_suit"
color = "geneticswhite"
@@ -172,8 +172,8 @@
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
/obj/item/clothing/under/rank/chemist
- desc = "Made of a special fiber that gives special protection against biohazards. Has a chemist rank stripe on it."
- name = "Chemist Jumpsuit"
+ desc = "It's made of a special fiber that gives special protection against biohazards. It has a chemist rank stripe on it."
+ name = "chemist's jumpsuit"
icon_state = "chemistry"
item_state = "w_suit"
color = "chemistrywhite"
@@ -181,8 +181,8 @@
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
/obj/item/clothing/under/rank/virologist
- desc = "Made of a special fiber that gives special protection against biohazards. Has a virologist rank stripe on it."
- name = "Virologist Jumpsuit"
+ desc = "It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it."
+ name = "virologist's jumpsuit"
icon_state = "virology"
item_state = "w_suit"
color = "virologywhite"
@@ -190,74 +190,74 @@
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
/obj/item/clothing/under/rank/head_of_personnel
- desc = "A jumpsuit worn by someone who works in the position of \"Head of Personnel\"."
- name = "Head of Personnel Jumpsuit"
+ desc = "It's a jumpsuit worn by someone who works in the position of \"Head of Personnel\"."
+ name = "head of personnel's jumpsuit"
icon_state = "hop"
item_state = "b_suit"
color = "hop"
/obj/item/clothing/under/rank/centcom_officer
- desc = "A jumpsuit worn by Centcom Officers."
- name = "CentCom Officer Jumpsuit"
+ desc = "It's a jumpsuit worn by CentCom Officers."
+ name = "\improper CentCom officer's jumpsuit"
icon_state = "officer"
item_state = "g_suit"
color = "officer"
/obj/item/clothing/under/rank/centcom_commander
- desc = "A jumpsuit worn by Centcom's highest level Commanders."
- name = "CentCom Officer Jumpsuit"
+ desc = "It's a jumpsuit worn by CentCom's highest-tier Commanders."
+ name = "\improper CentCom officer's jumpsuit"
icon_state = "centcom"
item_state = "dg_suit"
color = "centcom"
/obj/item/clothing/under/rank/miner
- desc = "A snappy jumpsuit with a sturdy set of overalls. It is very dirty."
- name = "Shaft Miner Jumpsuit"
+ desc = "It's a snappy jumpsuit with a sturdy set of overalls. It is very dirty."
+ name = "shaft miner's jumpsuit"
icon_state = "miner"
item_state = "miner"
color = "miner"
/obj/item/clothing/under/rank/roboticist
- desc = "A slimming black with reinforced seams. Great for industrial work."
- name = "Roboticist Jumpsuit"
+ desc = "It's a slimming black with reinforced seams; great for industrial work."
+ name = "roboticist's jumpsuit"
icon_state = "robotics"
item_state = "robotics"
color = "robotics"
/obj/item/clothing/under/rank/head_of_security
- desc = "A jumpsuit worn by those few with the dedication to achieve the position of \"Head of Security\". Has slight armor to protect the wearer."
- name = "Head of Security Jumpsuit"
+ desc = "It's a jumpsuit worn by those few with the dedication to achieve the position of \"Head of Security\". It has additional armor to protect the wearer."
+ name = "head of security's jumpsuit"
icon_state = "hos"
item_state = "r_suit"
color = "hosred"
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/under/rank/chief_engineer
- desc = "A high visibility jumpsuit given to those engineers committed enough to their jobs to achieve the rank of \"Chief engineer\". Has minor radiation shielding."
- name = "Chief Engineer Jumpsuit"
+ desc = "It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of \"Chief engineer\". It has minor radiation shielding."
+ name = "chief engineer's jumpsuit"
icon_state = "chiefengineer"
item_state = "g_suit"
color = "chief"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
/obj/item/clothing/under/rank/research_director
- desc = "A jumpsuit worn by those dedicated to all that is science and have achieved the position of \"Research Director\". Has minor biological anomaly protection."
- name = "Research Director Jumpsuit"
+ desc = "It's a jumpsuit worn by those with the know-how to achieve the position of \"Research Director\". Its fabric provides minor protection from biological contaminants."
+ name = "research director's jumpsuit"
icon_state = "director"
item_state = "g_suit"
color = "director"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
/obj/item/clothing/under/rank/janitor
- desc = "Official clothing of the station's janitor. Has minor protection from biohazards."
- name = "Janitor's Jumpsuit"
+ desc = "It's the official uniform of the station's janitor. It has minor protection from biohazards."
+ name = "janitor's jumpsuit"
icon_state = "janitor"
color = "janitor"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
/obj/item/clothing/under/rank/scientist
- desc = "Made of a special fiber that gives special protection against biohazards. Has markings denoting the wearer as a scientist."
- name = "Scientist's Jumpsuit"
+ desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer as a scientist."
+ name = "scientist's jumpsuit"
icon_state = "toxins"
item_state = "w_suit"
color = "toxinswhite"
@@ -265,8 +265,8 @@
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
/obj/item/clothing/under/rank/medical
- desc = "Made of a special fiber that gives special protection against biohazards. Has a cross on the chest denoting that the wearer is trained medical personnel."
- name = "Medical Doctor's Jumpsuit"
+ desc = "It's made of a special fiber that provides minor protection against biohazards. it has a cross on the chest denoting that the wearer is trained medical personnel."
+ name = "medical doctor's jumpsuit"
icon_state = "medical"
item_state = "w_suit"
color = "medical"
@@ -274,8 +274,8 @@
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
/obj/item/clothing/under/rank/chief_medical_officer
- desc = "A jumpsuit worn by those with the dedication to the medical profession who have achieved the position of \"Chief Medical Officer\". Has minor biological protection."
- name = "Chief Medical Officer's Jumpsuit"
+ desc = "It's a jumpsuit worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection."
+ name = "chief medical officer's jumpsuit"
icon_state = "medical"
item_state = "w_suit"
color = "medical"
@@ -283,8 +283,8 @@
armor = list(melee = 0, bullet = 0, laser = 2,energy = 2, bomb = 0, bio = 10, rad = 0)
/obj/item/clothing/under/rank/hydroponics
- desc = "A jumpsuit designed to protect against minor plant-related hazards."
- name = "Hydroponics Jumpsuit"
+ desc = "It's a jumpsuit designed to protect against minor plant-related hazards."
+ name = "botanist's jumpsuit"
icon_state = "hydroponics"
item_state = "g_suit"
color = "hydroponics"
@@ -292,56 +292,56 @@
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
/obj/item/clothing/under/rank/cargo
- name = "Quartermaster's Jumpsuit"
- desc = "What can brown do for you?"
+ name = "quartermaster's jumpsuit"
+ desc = "It's a jumpsuit worn by the quartermaster. It's specially designed to prevent back injuries caused by heavy lifting."
icon_state = "lightbrown"
item_state = "lb_suit"
color = "cargo"
/obj/item/clothing/under/rank/cargotech
- name = "Cargotech's Jumpsuit"
- desc = "Shooooorts! They're comfy and easy to wear!"
+ name = "cargotech's jumpsuit"
+ desc = "'Shooooorts! They're comfy and easy to wear!'"
icon_state = "cargotech"
item_state = "cargotech"
color = "cargotech"
/obj/item/clothing/under/rank/mailman
- name = "Mailman Jumpsuit"
- desc = "Special delivery!"
+ name = "mailman's jumpsuit"
+ desc = "'Special delivery!'"
icon_state = "mailman"
item_state = "b_suit"
color = "mailman"
/obj/item/clothing/under/sexyclown
- name = "Sexyclown suit"
- desc = "What can I do for you?"
+ name = "sexy-clown suit"
+ desc = "It makes you look HONKable!"
icon_state = "sexyclown"
item_state = "sexyclown"
color = "sexyclown"
/obj/item/clothing/under/rank/bartender
- desc = "It looks like it could use more flair."
- name = "Bartender's Uniform"
+ desc = "It looks like it could use some more flair."
+ name = "bartender's uniform"
icon_state = "ba_suit"
item_state = "ba_suit"
color = "ba_suit"
/obj/item/clothing/under/rank/clown
name = "clown suit"
- desc = "Wearing this, all the children love you, for all the wrong reasons."
+ desc = "'HONK!'"
icon_state = "clown"
item_state = "clown"
color = "clown"
/obj/item/clothing/under/rank/chef
- desc = "Issued only to the most hardcore chefs in space."
- name = "Chef's Uniform"
+ desc = "It's an apron which is given only to the most hardcore chefs in space."
+ name = "chef's uniform"
icon_state = "chef"
color = "chef"
/obj/item/clothing/under/rank/geneticist_new
- desc = "Made of a special fiber that gives special protection against biohazards."
- name = "Genetics Jumpsuit"
+ desc = "It's made of a special fiber which provides minor protection against biohazards."
+ name = "geneticist's jumpsuit"
icon_state = "genetics_new"
item_state = "w_suit"
color = "genetics_new"
@@ -349,8 +349,8 @@
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
/obj/item/clothing/under/rank/chemist_new
- desc = "Made of a special fiber that gives special protection against biohazards."
- name = "Chemist Jumpsuit"
+ desc = "It's made of a special fiber which provides minor protection against biohazards."
+ name = "chemist's jumpsuit"
icon_state = "chemist_new"
item_state = "w_suit"
color = "chemist_new"
@@ -359,7 +359,7 @@
/obj/item/clothing/under/rank/scientist_new
desc = "Made of a special fiber that gives special protection against biohazards and small explosions."
- name = "Scientist Jumpsuit"
+ name = "scientist's jumpsuit"
icon_state = "scientist_new"
item_state = "w_suit"
color = "scientist_new"
@@ -368,7 +368,7 @@
/obj/item/clothing/under/rank/virologist_new
desc = "Made of a special fiber that gives increased protection against biohazards."
- name = "Virologist Jumpsuit"
+ name = "virologist's jumpsuit"
icon_state = "virologist_new"
item_state = "w_suit"
color = "virologist_new"
@@ -378,7 +378,7 @@
// OTHER NONRANKED STATION JOBS
/obj/item/clothing/under/det
- name = "Hard worn suit"
+ name = "hard-worn suit"
desc = "Someone who wears this means business."
icon_state = "detective"
item_state = "det"
@@ -386,7 +386,7 @@
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/under/scratch
- name = "White Suit"
+ name = "white suit"
desc = "A white suit, suitable for an excellent host"
flags = FPRINT | TABLEPASS
icon_state = "scratch"
@@ -395,22 +395,22 @@
/obj/item/clothing/under/jensen
- desc = "You never asked for anything this stylish."
- name = "Head of Security Jumpsuit"
+ desc = "You never asked for anything that stylish."
+ name = "head of security's jumpsuit"
icon_state = "jensen"
item_state = "jensen"
color = "jensen"
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/under/sl_suit
- desc = "A very amish looking suit."
- name = "Amish Suit"
+ desc = "It's a very amish looking suit."
+ name = "amish suit"
icon_state = "sl_suit"
color = "sl_suit"
/obj/item/clothing/under/syndicate
- name = "Tactical Turtleneck"
- desc = "Non-descript, slightly suspicious civilian clothing."
+ name = "tactical turtleneck"
+ desc = "It's some non-descript, slightly suspicious looking, civilian clothing."
icon_state = "syndicate"
item_state = "bl_suit"
color = "syndicate"
@@ -418,33 +418,33 @@
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/under/syndicate/tacticool
- name = "Tacticool Turtleneck"
- desc = "Wearing this makes you feel like buying an SKS, going into the woods, and operating."
+ name = "\improper Tacticool turtleneck"
+ desc = "Just looking at it makes you want to buy an SKS, go into the woods, and -operate-."
icon_state = "tactifool"
item_state = "bl_suit"
color = "tactifool"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/under/syndicate/combat
- name = "Combat Turtleneck"
+ name = "combat turtleneck"
/obj/item/clothing/under/librarian
- name = "Sensible Suit"
+ name = "sensible suit"
desc = "It's very... sensible."
icon_state = "red_suit"
item_state = "red_suit"
color = "red_suit"
/obj/item/clothing/under/mime
- name = "Mime Outfit"
+ name = "mime's outfit"
desc = "It's not very colourful."
icon_state = "mime"
item_state = "mime"
color = "mime"
/obj/item/clothing/under/waiter
- name = "Waiter Outfit"
- desc = "There is a special pocket for tip."
+ name = "waiter's outfit"
+ desc = "It's a very smart uniform with a special pocket for tip."
icon_state = "waiter"
item_state = "waiter"
color = "waiter"
@@ -454,6 +454,7 @@
/obj/item/clothing/under/shorts
name = "athletic shorts"
desc = "95% Polyester, 5% Spandex!"
+ gender = PLURAL
flags = FPRINT | TABLEPASS
body_parts_covered = LOWER_TORSO
@@ -478,11 +479,11 @@
color = "greyshorts"
/obj/item/clothing/under/space
- name = "NASA Jumpsuit"
+ name = "\improper NASA jumpsuit"
+ desc = "It has a NASA logo on it and is made of space-proofed materials."
icon_state = "black"
item_state = "bl_suit"
color = "black"
- desc = "Has a NASA logo on it, made of space proofed materials."
w_class = 4//bulky item
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.02
@@ -492,15 +493,15 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
/obj/item/clothing/under/spiderman
- name = "Deadpool Suit"
- desc = "A suit of Deadpool!"
+ name = "\improper Deadpool suit"
+ desc = "It's the suit of Deadpool!"
icon_state = "spiderman"
item_state = "spiderman"
color = "spiderman"
/obj/item/clothing/under/rank/nursesuit
- desc = "A jumpsuit commonly worn by nursing staff in the medical department."
- name = "Nurse Suit"
+ desc = "It's a jumpsuit commonly worn by nursing staff in the medical department."
+ name = "nurse's suit"
icon_state = "nursesuit"
item_state = "nursesuit"
color = "nursesuit"
@@ -508,11 +509,11 @@
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
/obj/item/clothing/under/acj
- name = "Administrative Cybernetic Jumpsuit"
+ name = "administrative cybernetic jumpsuit"
icon_state = "syndicate"
item_state = "bl_suit"
color = "syndicate"
- desc = "A cybernetically enhanced jumpsuit used in administrative duties."
+ desc = "it's a cybernetically enhanced jumpsuit used for administrative duties."
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
heat_transfer_coefficient = 0.01
diff --git a/code/defines/obj/clothing/mask.dm b/code/defines/obj/clothing/mask.dm
index 5dba832c354..b17a44ea2c7 100644
--- a/code/defines/obj/clothing/mask.dm
+++ b/code/defines/obj/clothing/mask.dm
@@ -9,7 +9,7 @@
/obj/item/clothing/mask/breath
desc = "A close-fitting mask that can be connected to an air supply."
- name = "Breath Mask"
+ name = "breath mask"
icon_state = "breath"
item_state = "breath"
flags = FPRINT | TABLEPASS | SUITSPACE | HEADSPACE | MASKCOVERSMOUTH | HALFMASK
@@ -21,7 +21,7 @@
/obj/item/clothing/mask/medical
desc = "A close-fitting sterile mask that can be connected to an air supply."
- name = "Medical Mask"
+ name = "medical mask"
icon_state = "medical"
item_state = "medical"
flags = FPRINT|TABLEPASS|SUITSPACE|HEADSPACE|MASKCOVERSMOUTH
@@ -32,7 +32,7 @@
/obj/item/clothing/mask/spiderman
desc = "A mask of Deadpool!"
- name = "Deadpool mask"
+ name = "\improper Deadpool mask"
icon_state = "spiderman"
item_state = "spiderman"
flags = FPRINT|TABLEPASS|SUITSPACE|HEADSPACE|MASKCOVERSMOUTH|BLOCKHAIR
@@ -51,7 +51,7 @@
gas_transfer_coefficient = 0.90
/obj/item/clothing/mask/surgical
- name = "Sterile Mask"
+ name = "sterile mask"
desc = "A sterile mask designed to help prevent the spread of diseases."
icon_state = "sterile"
item_state = "sterile"
@@ -75,7 +75,7 @@
permeability_coefficient = 0.01
/obj/item/clothing/mask/gas/plaguedoctor
- name = "Plague doctor mask"
+ name = "plague doctor mask"
desc = "A modernised version of the classic design, this mask will not only filter out toxins but it can also be connected to an air supply."
icon_state = "plaguedoctor"
item_state = "gas_mask"
@@ -88,7 +88,7 @@
item_state = "gas_alt"
/obj/item/clothing/mask/gas/swat
- name = "SWAT Mask"
+ name = "\improper SWAT mask"
desc = "A close-fitting tactical mask that can be connected to an air supply."
icon_state = "swat"
@@ -120,7 +120,7 @@
item_state = "clown_hat"
/obj/item/clothing/mask/gas/sexyclown
- name = "sexy clown mask"
+ name = "sexy-clown wig and mask"
desc = "A feminine clown mask for the dabbling crossdressers or female entertainers."
icon_state = "sexyclown"
item_state = "sexyclown"
diff --git a/code/defines/obj/clothing/shoes.dm b/code/defines/obj/clothing/shoes.dm
index eb873472f7a..1529eabaaf0 100644
--- a/code/defines/obj/clothing/shoes.dm
+++ b/code/defines/obj/clothing/shoes.dm
@@ -1,9 +1,8 @@
-// OMG SHOES
-
/obj/item/clothing/shoes
name = "shoes"
icon = 'shoes.dmi'
desc = "Comfortable-looking shoes."
+ gender = PLURAL //Carn: for grammarically correct text-parsing
body_parts_covered = FEET
@@ -16,7 +15,7 @@
/obj/item/clothing/shoes/syndigaloshes
desc = "A pair of brown shoes. They seem to have extra grip."
- name = "Brown Shoes"
+ name = "brown shoes"
icon_state = "brown"
item_state = "brown"
permeability_coefficient = 0.05
@@ -27,7 +26,7 @@
/obj/item/clothing/shoes/syndigaloshes/all
/obj/item/clothing/shoes/black
- name = "Black Shoes"
+ name = "black shoes"
icon_state = "black"
color = "black"
desc = "A pair of black shoes."
@@ -36,7 +35,7 @@
color = "redcoat" //Exists for washing machines. Is not different from black shoes in any way.
/obj/item/clothing/shoes/brown
- name = "Brown Shoes"
+ name = "brown shoes"
desc = "A pair of brown shoes."
icon_state = "brown"
color = "brown"
@@ -55,43 +54,43 @@
color = "cargo" //Exists for washing machines. Is not different from brown shoes in any way.
/obj/item/clothing/shoes/blue
- name = "Blue Shoes"
+ name = "blue shoes"
icon_state = "blue"
color = "blue"
/obj/item/clothing/shoes/green
- name = "Green Shoes"
+ name = "green shoes"
icon_state = "green"
color = "green"
/obj/item/clothing/shoes/yellow
- name = "Yellow Shoes"
+ name = "yellow shoes"
icon_state = "yellow"
color = "yellow"
/obj/item/clothing/shoes/mime
- name = "Mime Shoes"
+ name = "mime shoes"
icon_state = "mime"
color = "mime"
/obj/item/clothing/shoes/purple
- name = "Purple Shoes"
+ name = "purple shoes"
icon_state = "purple"
color = "purple"
/obj/item/clothing/shoes/brown
- name = "Brown Shoes"
+ name = "brown shoes"
icon_state = "brown"
color = "brown"
/obj/item/clothing/shoes/orange
- name = "Orange Shoes"
+ name = "orange shoes"
icon_state = "orange"
var/chained = 0
color = "orange"
/obj/item/clothing/shoes/swat
- name = "SWAT shoes"
+ name = "\improper SWAT shoes"
desc = "When you want to turn up the heat."
icon_state = "swat"
armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 10, rad = 0)
@@ -114,7 +113,7 @@
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
/obj/item/clothing/shoes/white
- name = "White Shoes"
+ name = "white shoes"
icon_state = "white"
permeability_coefficient = 0.25
color = "white"
@@ -126,7 +125,7 @@
/obj/item/clothing/shoes/sandal/marisa
desc = "A pair of magic, black shoes."
- name = "Magic Shoes"
+ name = "magic shoes"
icon_state = "black"
/obj/item/clothing/shoes/galoshes
@@ -155,7 +154,7 @@
color = "clown"
/obj/item/clothing/shoes/jackboots
- name = "Jackboots"
+ name = "jackboots"
desc = "Nanotrasen-issue Security combat boots for combat scenarios or combat situations. All combat, all the time."
icon_state = "jackboots"
item_state = "jackboots"
diff --git a/code/defines/obj/clothing/z_gimmick.dm b/code/defines/obj/clothing/z_gimmick.dm
index 0e5acd4d42d..64cbf86cdf1 100644
--- a/code/defines/obj/clothing/z_gimmick.dm
+++ b/code/defines/obj/clothing/z_gimmick.dm
@@ -1,11 +1,11 @@
/obj/item/clothing/head/rabbitears
- name = "Rabbit Ears"
+ name = "rabbit ears"
desc = "Wearing these makes you looks useless, and only good for your sex appeal."
icon_state = "bunny"
flags = FPRINT | TABLEPASS
/obj/item/clothing/head/kitty
- name = "Kitty Ears"
+ name = "kitty ears"
desc = "A pair of kitty ears. Meow!"
icon_state = "kitty"
flags = FPRINT | TABLEPASS
@@ -37,12 +37,12 @@
color = "rainbow"
/obj/item/clothing/mask/owl_mask
- name = "Owl mask"
+ name = "owl mask"
desc = "Twoooo!"
icon_state = "owl"
/obj/item/clothing/under/owl
- name = "Owl uniform"
+ name = "owl uniform"
desc = "A jumpsuit with owl wings. Photorealistic owl feathers! Twooooo!"
icon_state = "owl"
color = "owl"
@@ -87,13 +87,13 @@
flags = FPRINT | TABLEPASS
/obj/item/clothing/under/johnny
- name = "Johnny~~"
+ name = "johnny~~ jumpsuit"
desc = "Johnny~~"
icon_state = "johnny"
color = "johnny"
/obj/item/clothing/suit/johnny_coat
- name = "Johnny~~"
+ name = "johnny~~ coat"
desc = "Johnny~~"
icon_state = "johnny"
item_state = "johnny"
@@ -221,42 +221,42 @@
item_state = "headset" // lol
/obj/item/clothing/under/gimmick/rank/captain/suit
- name = "Captain's Suit"
+ name = "captain's suit"
desc = "A green suit and yellow necktie. Exemplifies authority."
icon_state = "green_suit"
item_state = "dg_suit"
color = "green_suit"
/obj/item/clothing/under/gimmick/rank/head_of_personnel/suit
- name = "Head of Personnel's Suit"
+ name = "head of personnel's suit"
desc = "A teal suit and yellow necktie. An authoritative yet tacky ensemble."
icon_state = "teal_suit"
item_state = "g_suit"
color = "teal_suit"
/obj/item/clothing/under/suit_jacket
- name = "Black Suit"
+ name = "black suit"
desc = "A black suit and red tie. Very formal."
icon_state = "black_suit"
item_state = "bl_suit"
color = "black_suit"
/obj/item/clothing/under/suit_jacket/really_black
- name = "Executive Suit"
+ name = "executive suit"
desc = "A formal black suit and red tie, intended for the station's finest."
icon_state = "really_black_suit"
item_state = "bl_suit"
color = "black_suit"
/obj/item/clothing/under/suit_jacket/red
- name = "Red Suit"
+ name = "red suit"
desc = "A red suit and blue tie. Somewhat formal."
icon_state = "red_suit"
item_state = "r_suit"
color = "red_suit"
/obj/item/clothing/under/blackskirt
- name = "Black skirt"
+ name = "black skirt"
desc = "A black skirt, very fancy!"
icon_state = "blackskirt"
color = "blackskirt"
@@ -271,7 +271,7 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
/obj/item/clothing/under/gimmick/rank/police
- name = "Police Uniform"
+ name = "police uniform"
desc = "Move along, nothing to see here."
icon_state = "police"
item_state = "b_suit"
@@ -284,7 +284,7 @@
item_state = "detective"
/obj/item/clothing/under/overalls
- name = "Laborer's Overalls"
+ name = "laborer's overalls"
desc = "A set of durable overalls for getting the job done."
icon_state = "overalls"
item_state = "lb_suit"
@@ -300,7 +300,7 @@
force = 10
/obj/item/clothing/under/pirate
- name = "Pirate Outfit"
+ name = "pirate outfit"
desc = "Yarr."
icon_state = "pirate"
item_state = "pirate"
@@ -368,117 +368,117 @@
flags_inv = HIDEEARS
/obj/item/clothing/head/collectable //Hat Station 13
- name = "Collectable Hat"
+ name = "collectable hat"
desc = "A rare collectable hat."
/obj/item/clothing/head/collectable/petehat
- name = "Ultra Rare! Pete's Hat!"
+ name = "ultra rare Pete's hat!"
desc = "It smells faintly of plasma"
icon_state = "petehat"
/obj/item/clothing/head/collectable/metroid
- name = "Collectable Metroid Cap!"
+ name = "collectable metroid cap!"
desc = "It just latches right in place!"
icon_state = "metroid"
/obj/item/clothing/head/collectable/xenom
- name = "Collectable Xenomorph Helmet!"
+ name = "collectable xenomorph helmet!"
desc = "Hiss hiss hiss!"
icon_state = "xenom"
/obj/item/clothing/head/collectable/chef
- name = "Collectable Chef's Hat"
+ name = "collectable chef's hat"
desc = "A rare Chef's Hat meant for hat collectors!"
icon_state = "chef"
item_state = "chef"
/obj/item/clothing/head/collectable/paper
- name = "Collectable Paper Hat"
+ name = "collectable paper hat"
desc = "What looks like an ordinary paper hat, is actually a rare and valuable collector's edition paper hat. Keep away from water, fire and Librarians."
icon_state = "paper"
/obj/item/clothing/head/collectable/tophat
- name = "Collectable Top Hat"
+ name = "collectable top hat"
desc = "A top hat worn by only the most prestigious hat collectors."
icon_state = "tophat"
item_state = "that"
/obj/item/clothing/head/collectable/captain
- name = "Collectable Captain's Hat"
+ name = "collectable captain's hat"
desc = "A Collectable Hat that'll make you look just like a real comdom!"
icon_state = "captain"
item_state = "caphat"
/obj/item/clothing/head/collectable/police
- name = "Collectable Police Officer's Hat"
+ name = "collectable police officer's hat"
desc = "A Collectable Police Officer's Hat. This hat emphasizes that you are THE LAW."
icon_state = "policehelm"
/obj/item/clothing/head/collectable/beret
- name = "Collectable Beret"
+ name = "collectable beret"
desc = "A Collectable red Beret. It smells faintly of Garlic."
icon_state = "beret"
/obj/item/clothing/head/collectable/welding
- name = "Collectable Welding Helmet"
+ name = "collectable welding helmet"
desc = "A Collectable Welding Helmet. Now with 80% less lead! Not for actual welding. Any welding done while wearing this Helmet is done so at the owner's own risk!"
icon_state = "welding"
item_state = "welding"
/obj/item/clothing/head/collectable/slime
- name = "Collectable Slime Hat"
+ name = "collectable slime hat"
desc = "Just like a real Brain Slug!"
icon_state = "headslime"
item_state = "headslime"
/obj/item/clothing/head/collectable/flatcap
- name = "Collectable Flat Cap"
+ name = "collectable flat cap"
desc = "A Collectible farmer's Flat Cap!"
icon_state = "flat_cap"
item_state = "detective"
/obj/item/clothing/head/collectable/pirate
- name = "Collectable Pirate Hat"
+ name = "collectable pirate hat"
desc = "You'd make a great Dread Syndie Roberts!"
icon_state = "pirate"
item_state = "pirate"
/obj/item/clothing/head/collectable/kitty
- name = "Collectable Kitty Ears"
+ name = "collectable kitty ears"
desc = "The fur feels.....a bit too realistic."
icon_state = "kitty"
item_state = "kitty"
/obj/item/clothing/head/collectable/rabbitears
- name = "Collectable Rabbit Ears"
+ name = "collectable rabbit ears"
desc = "Not as lucky as the feet!"
icon_state = "bunny"
item_state = "bunny"
/obj/item/clothing/head/collectable/wizard
- name = "Collectable Wizard's Hat"
+ name = "collectable wizard's hat"
desc = "NOTE:Any magical powers gained from wearing this hat are purely coincidental."
icon_state = "wizard"
/obj/item/clothing/head/collectable/hardhat
- name = "Collectable Hard Hat"
+ name = "collectable hard hat"
desc = "WARNING! Offers no real protection, or luminosity, but it is damn fancy!"
icon_state = "hardhat0_yellow"
item_state = "hardhat0_yellow"
/obj/item/clothing/head/collectable/HoS
- name = "Collectable HoS Hat"
+ name = "collectable HoS hat"
desc = "Now you can beat prisoners, set silly sentences and arrest for no reason too!"
icon_state = "hoscap"
/obj/item/clothing/head/collectable/thunderdome
- name = "Collectable Thunderdome helmet"
+ name = "collectable Thunderdome helmet"
desc = "Go Red! I mean Green! I mean Red! No Green!"
icon_state = "thunderdome"
item_state = "thunderdome"
/obj/item/clothing/head/collectable/swat
- name = "Collectable SWAT Helmet"
+ name = "collectable SWAT helmet"
desc = "Now you can be in the Deathsquad too!"
icon_state = "swat"
item_state = "swat"
@@ -512,7 +512,7 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|FEET
/obj/item/clothing/under/sexymime
- name = "Sexy mime outfit"
+ name = "sexy mime outfit"
desc = "The only time when you DON'T enjoy looking at someone's rack."
icon_state = "sexymime"
item_state = "sexymime"
diff --git a/code/defines/obj/decal.dm b/code/defines/obj/decal.dm
index 63d094d1720..fb1b34d3c23 100644
--- a/code/defines/obj/decal.dm
+++ b/code/defines/obj/decal.dm
@@ -1,34 +1,38 @@
/obj/effect/decal/ash
- name = "Ashes"
+ name = "ashes"
desc = "Ashes to ashes, dust to dust, and into space."
+ gender = PLURAL
icon = 'objects.dmi'
icon_state = "ash"
anchored = 1
/obj/effect/decal/remains/human
name = "remains"
- desc = "These remains have a strange sense about them..."
+ desc = "They look like human remains. They have a strange aura about them."
+ gender = PLURAL
icon = 'blood.dmi'
icon_state = "remains"
anchored = 1
/obj/effect/decal/remains/xeno
name = "remains"
- desc = "These remains have a strange sense about them..."
+ desc = "They look like the remains of something... alien. They have a strange aura about them."
+ gender = PLURAL
icon = 'blood.dmi'
icon_state = "remainsxeno"
anchored = 1
/obj/effect/decal/remains/robot
name = "remains"
- desc = "These remains have a strange sense about them..."
+ desc = "They look like the remains of something mechanical. They have a strange aura about them."
+ gender = PLURAL
icon = 'robots.dmi'
icon_state = "remainsrobot"
anchored = 1
/obj/effect/decal/point
- name = "point"
- desc = "It is an arrow hanging in mid-air. There may be a wizard about."
+ name = "arrow"
+ desc = "It's an arrow hanging in mid-air. There may be a wizard about."
icon = 'screen1.dmi'
icon_state = "arrow"
layer = 16.0
@@ -40,8 +44,9 @@
//HUMANS
/obj/effect/decal/cleanable/blood
- name = "Blood"
- desc = "It's red. It's Gooye. It's the chef's cooking, perhaps?"
+ name = "blood"
+ desc = "It's red and gooey. Perhaps it's the chef's cooking?"
+ gender = PLURAL
density = 0
anchored = 1
layer = 2
@@ -61,12 +66,15 @@
random_icon_states = list("gibbl1", "gibbl2", "gibbl3", "gibbl4", "gibbl5")
/obj/effect/decal/cleanable/blood/tracks
- icon_state = "tracks"
+ icon_state = "blood"
+ desc = "They look like tracks left by wheels."
+ gender = PLURAL
random_icon_states = null
/obj/effect/decal/cleanable/blood/gibs
name = "gibs"
- desc = "Grisly...and not the good kind neither."
+ desc = "They look bloody and gruesome."
+ gender = PLURAL
density = 0
anchored = 0
layer = 2
@@ -93,7 +101,8 @@
/obj/effect/decal/cleanable/xenoblood
name = "xeno blood"
- desc = "It's green. Must be more of the chef's cooking."
+ desc = "It's green and acidic. It looks like... blood?"
+ gender = PLURAL
density = 0
anchored = 1
layer = 2
@@ -113,6 +122,7 @@
/obj/effect/decal/cleanable/xenoblood/xgibs
name = "xeno gibs"
desc = "Gnarly..."
+ gender = PLURAL
icon = 'blood.dmi'
icon_state = "xgib1"
random_icon_states = list("xgib1", "xgib2", "xgib3", "xgib4", "xgib5", "xgib6")
@@ -140,7 +150,8 @@
/obj/effect/decal/cleanable/robot_debris
name = "robot debris"
- desc = "Useless heap of junk...or is it..."
+ desc = "It's a useless heap of junk... or is it?"
+ gender = PLURAL
density = 0
anchored = 0
layer = 2
@@ -159,7 +170,8 @@
/obj/effect/decal/cleanable/oil
name = "motor oil"
- desc = "It's black. Beepsky made another mess."
+ desc = "It's black and greasy. Looks like Beepsky made another mess."
+ gender = PLURAL
density = 0
anchored = 1
layer = 2
@@ -181,6 +193,7 @@
/obj/effect/decal/cleanable/generic
name = "clutter"
desc = "Someone should clean that up."
+ gender = PLURAL
density = 0
anchored = 1
layer = 2
@@ -190,6 +203,7 @@
/obj/effect/decal/cleanable/dirt
name = "dirt"
desc = "Someone should clean that up."
+ gender = PLURAL
density = 0
anchored = 1
layer = 2
@@ -197,8 +211,9 @@
icon_state = "dirt"
/obj/effect/decal/cleanable/greenglow
- name = "green glow"
- desc = "Eerie. This makes you feel creepy."
+ name = "glowing goo"
+ desc = "Jeez. I hope that's not for lunch."
+ gender = PLURAL
density = 0
anchored = 1
layer = 2
@@ -207,7 +222,7 @@
/obj/effect/decal/cleanable/cobweb
name = "cobweb"
- desc = "Someone should remove that."
+ desc = "Somebody should remove that."
density = 0
anchored = 1
layer = 3
@@ -216,7 +231,7 @@
/obj/effect/decal/cleanable/molten_item
name = "gooey grey mass"
- desc = "Huh. Creepy..."
+ desc = "It looks like a melted... something."
density = 0
anchored = 1
layer = 3
@@ -225,7 +240,7 @@
/obj/effect/decal/cleanable/cobweb2
name = "cobweb"
- desc = "Someone should remove that."
+ desc = "Somebody should remove that."
density = 0
anchored = 1
layer = 3
@@ -240,8 +255,9 @@
//Vomit (sorry)
/obj/effect/decal/cleanable/vomit
- name = "Vomit"
+ name = "vomit"
desc = "Gosh, how unpleasant."
+ gender = PLURAL
density = 0
anchored = 1
layer = 2
@@ -256,8 +272,8 @@
..()
/obj/effect/decal/cleanable/tomato_smudge
- name = "Tomato smooth"
- desc = "It's red"
+ name = "tomato smudge"
+ desc = "It's red."
density = 0
anchored = 1
layer = 2
@@ -265,8 +281,8 @@
random_icon_states = list("tomato_floor1", "tomato_floor2", "tomato_floor3")
/obj/effect/decal/cleanable/egg_smudge
- name = "Smashed egg"
- desc = "Seems like this one won't hatch"
+ name = "smashed egg"
+ desc = "Seems like this one won't hatch."
density = 0
anchored = 1
layer = 2
@@ -274,8 +290,8 @@
random_icon_states = list("smashed_egg1", "smashed_egg2", "smashed_egg3")
/obj/effect/decal/cleanable/pie_smudge //honk
- name = "Smashed pie"
- desc = "Pie cream from a cream pie"
+ name = "smashed pie"
+ desc = "It's pie cream from a cream pie."
density = 0
anchored = 1
layer = 2
diff --git a/code/defines/obj/hydro.dm b/code/defines/obj/hydro.dm
index 9a85cb59cb9..b7174050456 100644
--- a/code/defines/obj/hydro.dm
+++ b/code/defines/obj/hydro.dm
@@ -1,7 +1,7 @@
// Plant analyzer
/obj/item/device/analyzer/plant_analyzer
- name = "Plant Analyzer"
+ name = "plant analyzer"
icon = 'device.dmi'
icon_state = "hydro"
item_state = "analyzer"
@@ -10,17 +10,17 @@
return 0
// ********************************************************
-// Here's all the seeds (=plants) that can be used in hydro
+// Here's all the seeds (plants) that can be used in hydro
// ********************************************************
/obj/item/seeds
- name = "seed"
+ name = "pack of seeds"
icon = 'seeds.dmi'
icon_state = "seed" // unknown plant seed - these shouldn't exist in-game
flags = FPRINT | TABLEPASS
w_class = 1.0 // Makes them pocketable
var/mypath = "/obj/item/seeds"
- var/plantname = ""
+ var/plantname = "Plants"
var/productname = ""
var/species = ""
var/lifespan = 0
@@ -35,12 +35,12 @@
/obj/item/seeds/chiliseed
- name = "Chili plant seeds"
- desc = "HOT! HOT! HOT!"
+ name = "pack of chili seeds"
+ desc = "These seeds grow into chili plants. HOT! HOT! HOT!"
icon_state = "seed-chili"
mypath = "/obj/item/seeds/chiliseed"
species = "chili"
- plantname = "Chili plant"
+ plantname = "Chili Plants"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/chili"
lifespan = 20
endurance = 15
@@ -52,12 +52,12 @@
growthstages = 6
/obj/item/seeds/replicapod
- name = "Replica pod seeds"
- desc = "They say these are used to harvest humans."
+ name = "pack of replica pod seeds"
+ desc = "These seeds grow into replica pods. They say these are used to harvest humans."
icon_state = "seed-replicapod"
mypath = "/obj/item/seeds/replicapod"
species = "replicapod"
- plantname = "Replica pod"
+ plantname = "Replica Pod"
productname = "/mob/living/carbon/human" //verrry special -- Urist
lifespan = 50 //no idea what those do
endurance = 8
@@ -76,8 +76,8 @@
gender = "male"
/obj/item/seeds/grapeseed
- name = "Grape seeds"
- desc = "Seeds that grows into grapes"
+ name = "pack of grape seeds"
+ desc = "These seeds grow into grape vines."
icon_state = "seed-grapes"
mypath = "/obj/item/seeds/grapeseed"
species = "grape"
@@ -93,12 +93,12 @@
growthstages = 2
/obj/item/seeds/greengrapeseed
- name = "Green Grape seeds"
- desc = "Seeds that grows into green grapes"
+ name = "pack of green grape seeds"
+ desc = "These seeds grow into green-grape vines."
icon_state = "seed-greengrapes"
mypath = "/obj/item/seeds/greengrapeseed"
species = "greengrape"
- plantname = "Gren Grape Vine"
+ plantname = "Green-Grape Vine"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/greengrapes"
lifespan = 50
endurance = 25
@@ -110,12 +110,12 @@
growthstages = 2
/obj/item/seeds/cabbageseed
- name = "Cabbage seeds"
- desc = "Seeds that grows into cabbages"
+ name = "pack of cabbage seeds"
+ desc = "These seeds grow into cabbages."
icon_state = "seed-cabbage"
mypath = "/obj/item/seeds/cabbageseed"
species = "cabbage"
- plantname = "Cabbage Plant"
+ plantname = "Cabbages"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/cabbage"
lifespan = 50
endurance = 25
@@ -127,12 +127,12 @@
growthstages = 1
/obj/item/seeds/berryseed
- name = "Berry seeds"
- desc = "Seeds that grows into berries."
+ name = "pack of berry seeds"
+ desc = "These seeds grow into berry bushes."
icon_state = "seed-berry"
mypath = "/obj/item/seeds/berryseed"
species = "berry"
- plantname = "Berry bush"
+ plantname = "Berry Bush"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/berries"
lifespan = 20
endurance = 15
@@ -144,12 +144,12 @@
growthstages = 6
/obj/item/seeds/glowberryseed
- name = "Glow Berry seeds"
- desc = "Seeds that grows into glow berries."
+ name = "pack of glow-berry seeds"
+ desc = "These seeds grow into glow-berry bushes."
icon_state = "seed-glowberry"
mypath = "/obj/item/seeds/glowberryseed"
species = "glowberry"
- plantname = "Glow Berry bush"
+ plantname = "Glow-Berry Bush"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/glowberries"
lifespan = 30
endurance = 25
@@ -161,12 +161,12 @@
growthstages = 6
/obj/item/seeds/bananaseed
- name = "Banana seeds"
- desc = "When grown, keep away from clown."
+ name = "pack of banana seeds"
+ desc = "They're seeds that grow into bannana trees. When grown, keep away from clown."
icon_state = "seed-banana"
mypath = "/obj/item/seeds/bananaseed"
species = "banana"
- plantname = "Banana tree"
+ plantname = "Banana Tree"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/banana"
lifespan = 50
endurance = 30
@@ -177,12 +177,12 @@
growthstages = 6
/obj/item/seeds/eggplantseed
- name = "Eggplant seeds"
- desc = "These seeds grows into plants in the form of eggs."
+ name = "pack of eggplant seeds"
+ desc = "These seeds grow to produce berries that look nothing like eggs."
icon_state = "seed-eggplant"
mypath = "/obj/item/seeds/eggplantseed"
species = "eggplant"
- plantname = "Eggplant plant"
+ plantname = "Eggplants"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/eggplant"
lifespan = 25
endurance = 15
@@ -193,12 +193,12 @@
growthstages = 6
/obj/item/seeds/eggyseed
- name = "Egg Plant seeds"
- desc = "These seeds grows into plants in the form of eggs."
+ name = "pack of eggplant seeds"
+ desc = "These seeds grow to produce berries that look nothing like eggs."
icon_state = "seed-eggy"
mypath = "/obj/item/seeds/eggy"
species = "eggy"
- plantname = "Egg Plant plant"
+ plantname = "Eggplants"
productname = "/obj/item/weapon/reagent_containers/food/snacks/egg"
lifespan = 75
endurance = 15
@@ -209,12 +209,12 @@
growthstages = 6
/obj/item/seeds/bloodtomatoseed
- name = "Blood Tomato seeds"
- desc = "Used to grow blood tomotoes."
+ name = "pack of blood-tomato seeds"
+ desc = "These seeds grow into blood-tomato plants."
icon_state = "seed-bloodtomato"
mypath = "/obj/item/seeds/bloodtomatoseed"
species = "bloodtomato"
- plantname = "Blood Tomato plant"
+ plantname = "Blood-Tomato Plants"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/bloodtomato"
lifespan = 25
endurance = 20
@@ -226,12 +226,12 @@
growthstages = 6
/obj/item/seeds/tomatoseed
- name = "Tomato seeds"
- desc = "Used to grow tomotoes."
+ name = "pack of tomato seeds"
+ desc = "These seeds grow into tomato plants."
icon_state = "seed-tomato"
mypath = "/obj/item/seeds/tomatoseed"
species = "tomato"
- plantname = "Tomato plant"
+ plantname = "Tomato Plants"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/tomato"
lifespan = 25
endurance = 15
@@ -243,12 +243,12 @@
growthstages = 6
/obj/item/seeds/killertomatoseed
- name = "Killer Tomato seeds"
- desc = "Used to grow killer tomotoes."
+ name = "pack of killer-tomato seeds"
+ desc = "These seeds grow into killer-tomato plants."
icon_state = "seed-killertomato"
mypath = "/obj/item/seeds/killertomatoseed"
species = "killertomato"
- plantname = "Killer Tomato plant"
+ plantname = "Killer-Tomato Plants"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/killertomato"
lifespan = 25
endurance = 15
@@ -261,12 +261,12 @@
growthstages = 2
/obj/item/seeds/bluetomatoseed
- name = "Blue Tomato seeds"
- desc = "Used to grow blue tomotoes."
+ name = "pack of blue-tomato seeds"
+ desc = "These seeds grow into blue-tomato plants."
icon_state = "seed-bluetomato"
mypath = "/obj/item/seeds/bluetomatoseed"
species = "bluetomato"
- plantname = "Blue Tomato plant"
+ plantname = "Blue-Tomato Plants"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/bluetomato"
lifespan = 25
endurance = 15
@@ -278,12 +278,12 @@
growthstages = 6
/obj/item/seeds/cornseed
- name = "Corn seeds"
+ name = "pack of corn seeds"
desc = "I don't mean to sound corny..."
icon_state = "seed-corn"
mypath = "/obj/item/seeds/cornseed"
species = "corn"
- plantname = "Corn plant"
+ plantname = "Corn Stalks"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/corn"
lifespan = 25
endurance = 15
@@ -295,11 +295,12 @@
growthstages = 3
/obj/item/seeds/poppyseed
- name = "Poppy seeds"
+ name = "pack of poppy seeds"
+ desc = "These seeds grow into poppies."
icon_state = "seed-poppy"
mypath = "/obj/item/seeds/poppyseed"
species = "poppy"
- plantname = "Poppy plant"
+ plantname = "Poppy Plants"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/poppy"
lifespan = 25
endurance = 10
@@ -312,12 +313,12 @@
growthstages = 3
/obj/item/seeds/potatoseed
- name = "Potato Seeds"
- desc = "This will one day grow into potatoes."
+ name = "pack of potato seeds"
+ desc = "Boil 'em! Mash 'em! Stick 'em in a stew!"
icon_state = "seed-potato"
mypath = "/obj/item/seeds/potatoseed"
species = "potato"
- plantname = "Potato Plant"
+ plantname = "Potato-Plants"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/potato"
lifespan = 30
endurance = 15
@@ -330,12 +331,12 @@
growthstages = 4
/obj/item/seeds/icepepperseed
- name = "Ice pepper seeds"
- desc = "This will soon become chilly..."
+ name = "pack of ice-pepper seeds"
+ desc = "These seeds grow into ice-pepper plants."
icon_state = "seed-icepepper"
mypath = "/obj/item/seeds/icepepperseed"
species = "chiliice"
- plantname = "Ice pepper plant"
+ plantname = "Ice-Pepper Plants"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/icepepper"
lifespan = 25
endurance = 15
@@ -347,12 +348,12 @@
growthstages = 6
/obj/item/seeds/soyaseed
- name = "Soybean seeds"
- desc = "This grows into Soy."
+ name = "pack of soybean seeds"
+ desc = "These seeds grow into soybean plants."
icon_state = "seed-soybean"
mypath = "/obj/item/seeds/soyaseed"
species = "soybean"
- plantname = "Soybean plant"
+ plantname = "Soybean Plants"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans"
lifespan = 25
endurance = 15
@@ -364,12 +365,12 @@
growthstages = 6
/obj/item/seeds/wheatseed
- name = "Wheat seeds"
- desc = "This may or may not grow into weed."
+ name = "pack of wheat seeds"
+ desc = "These may, or may not, grow into weed."
icon_state = "seed-wheat"
mypath = "/obj/item/seeds/wheatseed"
species = "wheat"
- plantname = "Wheat stalks"
+ plantname = "Wheat Stalks"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/wheat"
lifespan = 25
endurance = 15
@@ -382,12 +383,12 @@
growthstages = 6
/obj/item/seeds/carrotseed
- name = "Carrot seeds"
- desc = "It will grow into a carrot."
+ name = "pack of carrot seeds"
+ desc = "These seeds grow into carrots."
icon_state = "seed-carrot"
mypath = "/obj/item/seeds/carrotseed"
species = "carrot"
- plantname = "CURROTS MAN CURROTS"
+ plantname = "Carrots"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/carrot"
lifespan = 25
endurance = 15
@@ -400,12 +401,12 @@
growthstages = 5
/obj/item/seeds/amanitamycelium
- name = "Fly Amanita mycelium"
- desc = "Grows into something horrible."
+ name = "pack of fly amanita mycelium"
+ desc = "This mycelium grows into something horrible."
icon_state = "mycelium-amanita"
mypath = "/obj/item/seeds/amanitamycelium"
species = "amanita"
- plantname = "Fly Amanita"
+ plantname = "Fly Amanitas"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita"
lifespan = 50
endurance = 35
@@ -418,11 +419,12 @@
plant_type = 2
/obj/item/seeds/angelmycelium
- name = "Destroying Angel mycelium"
+ name = "pack of destroying angel mycelium"
+ desc = "This mycelium grows into something devestating."
icon_state = "mycelium-angel"
mypath = "/obj/item/seeds/angelmycelium"
species = "angel"
- plantname = "Destroying Angel"
+ plantname = "Destroying Angels"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/angel"
lifespan = 50
endurance = 35
@@ -435,12 +437,12 @@
plant_type = 2
/obj/item/seeds/libertymycelium
- name = "Liberty Cap mycelium"
- desc = "It is said to grow druggy."
+ name = "pack of liberty-cap mycelium"
+ desc = "This mycelium grows into liberty-cap mushrooms."
icon_state = "mycelium-liberty"
mypath = "/obj/item/seeds/libertymycelium"
species = "liberty"
- plantname = "Liberty Cap"
+ plantname = "Liberty-Caps"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap"
lifespan = 25
endurance = 15
@@ -453,12 +455,12 @@
plant_type = 2
/obj/item/seeds/chantermycelium
- name = "Chanterelle mycelium"
- desc = "Grows, grows, grows."
+ name = "pack of chanterelle mycelium"
+ desc = "This mycelium grows into chanterelle mushrooms."
icon_state = "mycelium-chanter"
mypath = "/obj/item/seeds/chantermycelium"
species = "chanter"
- plantname = "Chanterelle"
+ plantname = "Chanterelle Mushrooms"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/chanterelle"
lifespan = 35
endurance = 20
@@ -471,12 +473,12 @@
plant_type = 2
/obj/item/seeds/towermycelium
- name = "Tower Cap mycelium"
- desc = "Why does this sound so familiar..."
+ name = "pack of tower-cap mycelium"
+ desc = "This mycelium grows into tower-cap mushrooms."
icon_state = "mycelium-tower"
mypath = "/obj/item/seeds/towermycelium"
species = "towercap"
- plantname = "Tower Cap"
+ plantname = "Tower Caps"
productname = "/obj/item/weapon/grown/log"
lifespan = 80
endurance = 50
@@ -489,12 +491,12 @@
plant_type = 2
/obj/item/seeds/glowshroom
- name = "Glowshroom mycelium"
- desc = "This will glow into mushrooms."
+ name = "pack of glowshroom mycelium"
+ desc = "This mycelium -glows- into mushrooms!"
icon_state = "mycelium-glowshroom"
mypath = "/obj/item/seeds/glowshroom"
species = "glowshroom"
- plantname = "Glowshroom"
+ plantname = "Glowshrooms"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom"
lifespan = 120 //ten times that is the delay
endurance = 30
@@ -507,12 +509,12 @@
plant_type = 2
/obj/item/seeds/plumpmycelium
- name = "Plump Helmet mycelium"
- desc = "These seeds will grow into helmets."
+ name = "pack of plump-helmet mycelium"
+ desc = "This mycelium grows into helmets... maybe."
icon_state = "mycelium-plump"
mypath = "/obj/item/seeds/plumpmycelium"
species = "plump"
- plantname = "Plump Helmet"
+ plantname = "Plump-Helmet Mushrooms"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/plumphelmet"
lifespan = 25
endurance = 15
@@ -525,12 +527,12 @@
plant_type = 2
/obj/item/seeds/walkingmushroommycelium
- name = "Walking Mushroom mycelium"
- desc = "These seeds will grow into huge stuff."
+ name = "pack of walking mushroom mycelium"
+ desc = "This mycelium will grow into huge stuff!"
icon_state = "mycelium-walkingmushroom"
mypath = "/obj/item/seeds/walkingmushroommycelium"
species = "walkingmushroom"
- plantname = "Walking Mushroom"
+ plantname = "Walking Mushrooms"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/walkingmushroom"
lifespan = 30
endurance = 30
@@ -543,12 +545,12 @@
plant_type = 2
/obj/item/seeds/nettleseed
- name = "Nettle seeds"
- desc = "Grows into nettle."
+ name = "pack of nettle seeds"
+ desc = "These seeds grow into nettles."
icon_state = "seed-nettle"
mypath = "/obj/item/seeds/nettleseed"
species = "nettle"
- plantname = "Nettle"
+ plantname = "Nettles"
productname = "/obj/item/weapon/grown/nettle"
lifespan = 30
endurance = 40 // tuff like a toiger
@@ -561,12 +563,12 @@
plant_type = 1
/obj/item/seeds/deathnettleseed
- name = "Deathnettle seeds"
- desc = "Grows into Nettle."
+ name = "pack of death-nettle seeds"
+ desc = "These seeds grow into death-nettles."
icon_state = "seed-deathnettle"
mypath = "/obj/item/seeds/deathnettleseed"
species = "deathnettle"
- plantname = "Death Nettle"
+ plantname = "Death Nettles"
productname = "/obj/item/weapon/grown/deathnettle"
lifespan = 30
endurance = 25
@@ -579,12 +581,12 @@
plant_type = 1
/obj/item/seeds/weeds
- name = "Weeds"
- desc = "These seems weedy."
+ name = "pack of weed seeds"
+ desc = "Yo mang, want some weeds?"
icon_state = "seed"
mypath = "/obj/item/seeds/weeds"
species = "weeds"
- plantname = "Generic weeds"
+ plantname = "Generic Weeds"
productname = ""
lifespan = 100
endurance = 50 // damm pesky weeds
@@ -597,11 +599,12 @@
plant_type = 1
/obj/item/seeds/harebell
- name = "Harebell"
+ name = "pack of harebell seeds"
+ desc = "These seeds grow into pretty little flowers."
icon_state = "seed"
mypath = "/obj/item/seeds/harebell"
species = "harebell"
- plantname = "Harebell"
+ plantname = "Harebells"
productname = ""
lifespan = 100
endurance = 20
@@ -614,12 +617,12 @@
plant_type = 1
/obj/item/seeds/sunflowerseed
- name = "Sunflower seeds"
- desc = "This will grow shining."
+ name = "pack of sunflower seeds"
+ desc = "These seeds grow into sunflowers."
icon_state = "seed-sunflower"
mypath = "/obj/item/seeds/sunflowerseed"
species = "sunflower"
- plantname = "Sunflower"
+ plantname = "Sunflowers"
productname = "/obj/item/weapon/grown/sunflower"
lifespan = 25
endurance = 20
@@ -632,8 +635,8 @@
plant_type = 1
/obj/item/seeds/brownmold
- name = "Brown Mold"
- desc = "Moldy."
+ name = "pack of brown mold"
+ desc = "Eww.. moldy."
icon_state = "seed"
mypath = "/obj/item/seeds/brownmold"
species = "mold"
@@ -650,12 +653,12 @@
plant_type = 2
/obj/item/seeds/appleseed
- name = "Apple seeds"
- desc = "A tasty fruit."
+ name = "pack of apple seeds"
+ desc = "These seeds grow into apple trees."
icon_state = "seed-apple"
mypath = "/obj/item/seeds/appleseed"
species = "apple"
- plantname = "Apple tree"
+ plantname = "Apple Tree"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/apple"
lifespan = 55
endurance = 35
@@ -666,8 +669,8 @@
growthstages = 6
/obj/item/seeds/ambrosiavulgarisseed
- name = "Ambrosia Vulgaris seeds"
- desc = "A plant grown by and from medicine."
+ name = "pack of ambrosia vulgaris seeds"
+ desc = "These seeds grow into common ambrosia, a plant grown by and from medicine."
icon_state = "seed-ambrosiavulgaris"
mypath = "/obj/item/seeds/ambrosiavulgarisseed"
species = "ambrosiavulgaris"
@@ -682,12 +685,12 @@
growthstages = 6
/obj/item/seeds/whitebeetseed
- name = "White Beet seed"
- desc = "A sugary beet."
+ name = "pack of white-beet seeds"
+ desc = "These seeds grow into sugary beet producing plants."
icon_state = "seed-whitebeet"
mypath = "/obj/item/seeds/whitebeetseed"
species = "whitebeet"
- plantname = "White Beet Plant"
+ plantname = "White-Beet Plants"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/whitebeet"
lifespan = 60
endurance = 50
@@ -698,8 +701,8 @@
growthstages = 6
/obj/item/seeds/sugarcaneseed
- name = "Sugarcane seed"
- desc = "A cane of sugar"
+ name = "pack of sugarcane seeds"
+ desc = "These seeds grow into sugarcane."
icon_state = "seed-sugarcane"
mypath = "/obj/item/seeds/sugarcaneseed"
species = "sugarcane"
@@ -714,12 +717,12 @@
growthstages = 3
/obj/item/seeds/watermelonseed
- name = "Watermelon Seed"
- desc = "Some promising seeds."
+ name = "pack of watermelon seeds"
+ desc = "These seeds grow into watermelon plants."
icon_state = "seed-watermelon"
mypath = "/obj/item/seeds/watermelonseed"
species = "watermelon"
- plantname = "Watermelon Plant"
+ plantname = "Watermelon Vines"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon"
lifespan = 50
endurance = 40
@@ -730,12 +733,12 @@
growthstages = 6
/obj/item/seeds/pumpkinseed
- name = "Pumpkin Seed"
- desc = "Some promising seeds."
+ name = "pack of pumpkin seeds"
+ desc = "These seeds grow into pumpkin vines."
icon_state = "seed-pumpkin"
mypath = "/obj/item/seeds/pumpkinseed"
species = "pumpkin"
- plantname = "pumpkin Plant"
+ plantname = "Pumpkin Vines"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin"
lifespan = 50
endurance = 40
@@ -747,8 +750,8 @@
/obj/item/seeds/limeseed
- name = "Lime Seed"
- desc = "Very sour seeds."
+ name = "pack of lime seeds"
+ desc = "These are very sour seeds."
icon_state = "seed-lime"
mypath = "/obj/item/seeds/limeseed"
species = "lime"
@@ -763,8 +766,8 @@
growthstages = 6
/obj/item/seeds/lemonseed
- name = "Lemon Seed"
- desc = "Sour seeds."
+ name = "pack of lemon seeds"
+ desc = "These are sour seeds."
icon_state = "seed-lemon"
mypath = "/obj/item/seeds/lemonseed"
species = "lemon"
@@ -779,7 +782,7 @@
growthstages = 6
/obj/item/seeds/orangeseed
- name = "Orange Seed"
+ name = "pack of orange seed"
desc = "Sour seeds."
icon_state = "seed-orange"
mypath = "/obj/item/seeds/orangeseed"
@@ -795,12 +798,12 @@
growthstages = 6
/obj/item/seeds/poisonberryseed
- name = "Poison Berry seeds"
- desc = "Seeds that grows into poison berries."
+ name = "pack of poison-berry seeds"
+ desc = "These seeds grow into poison-berry bushes."
icon_state = "seed-poisonberry"
mypath = "/obj/item/seeds/poisonberryseed"
species = "poisonberry"
- plantname = "Poison Berry bush"
+ plantname = "Poison-Berry Bush"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/poisonberries"
lifespan = 20
endurance = 15
@@ -812,12 +815,12 @@
growthstages = 6
/obj/item/seeds/deathberryseed
- name = "Death Berry seeds"
- desc = "Seeds that grows into death berries."
+ name = "pack of death-berry seeds"
+ desc = "These seeds grow into death berries."
icon_state = "seed-deathberry"
mypath = "/obj/item/seeds/deathberryseed"
species = "deathberry"
- plantname = "Death Berry bush"
+ plantname = "Death Berry Bush"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/deathberries"
lifespan = 30
endurance = 20
@@ -829,8 +832,8 @@
growthstages = 6
/obj/item/seeds/grassseed
- name = "Grass seeds"
- desc = "Seeds that will one day become sheep food."
+ name = "pack of grass seeds"
+ desc = "These seeds grow ito grass. Yummy!"
icon_state = "seed-grass"
mypath = "/obj/item/seeds/grassseed"
species = "grass"
@@ -846,12 +849,12 @@
growthstages = 2
/obj/item/seeds/cocoapodseed
- name = "Cocoa Pod seeds"
- desc = "Looks fattening these seeds."
+ name = "pack of cocoa pod seeds"
+ desc = "These seeds grow into cacao trees. They look fattening." //SIC: cocoa is the seeds. The tress ARE spelled cacao.
icon_state = "seed-cocoapod"
mypath = "/obj/item/seeds/cocoapodseed"
species = "cocoapod"
- plantname = "Cocoa Pod Tree"
+ plantname = "Cocao Tree" //SIC: see above
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/cocoapod"
lifespan = 20
endurance = 15
@@ -932,45 +935,50 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/attackby(var/obj/item/O as obj, var/mob/user as mob)
..()
if (istype(O, /obj/item/device/analyzer/plant_analyzer))
- user << "This is a \blue [name]"
+ var/msg
+ msg = "*---------*\n This is \a [src]\n"
switch(plant_type)
if(0)
- user << "- Plant type: \blue Normal plant"
+ msg += "- Plant type: Normal plant\n"
if(1)
- user << "- Plant type: \blue Weed"
+ msg += "- Plant type: Weed\n"
if(2)
- user << "- Plant type: \blue Mushroom"
- user << "- Potency: \blue [potency]"
- user << "- Yield: \blue [yield]"
- user << "- Maturation speed: \blue [maturation]"
- user << "- Production speed: \blue [production]"
- user << "- Endurance: \blue [endurance]"
- user << "- Healing properties: \blue [reagents.get_reagent_amount("nutriment")]"
+ msg += "- Plant type: Mushroom\n"
+ msg += "- Potency: [potency]\n"
+ msg += "- Yield: [yield]\n"
+ msg += "- Maturation speed: [maturation]\n"
+ msg += "- Production speed: [production]\n"
+ msg += "- Endurance: [endurance]\n"
+ msg += "- Healing properties: [reagents.get_reagent_amount("nutriment")]\n"
+ msg += "*---------*"
+ usr << msg
return
/obj/item/weapon/grown/attackby(var/obj/item/O as obj, var/mob/user as mob)
..()
if (istype(O, /obj/item/device/analyzer/plant_analyzer))
- user << "This is a \blue [name]"
+ var/msg
+ msg = "*---------*\n This is \a [src]\n"
switch(plant_type)
if(0)
- user << "- Plant type: \blue Normal plant"
+ msg += "- Plant type: Normal plant\n"
if(1)
- user << "- Plant type: \blue Weed"
+ msg += "- Plant type: Weed\n"
if(2)
- user << "- Plant type: \blue Mushroom"
- user << "- Acid strength: \blue [potency]"
- user << "- Yield: \blue [yield]"
- user << "- Maturation speed: \blue [maturation]"
- user << "- Production speed: \blue [production]"
- user << "- Endurance: \blue [endurance]"
- user << ""
-
+ msg += "- Plant type: Mushroom\n"
+ msg += "- Acid strength: [potency]\n"
+ msg += "- Yield: [yield]\n"
+ msg += "- Maturation speed: [maturation]\n"
+ msg += "- Production speed: [production]\n"
+ msg += "- Endurance: [endurance]\n"
+ msg += "*---------*"
+ usr << msg
return
+
/obj/item/weapon/reagent_containers/food/snacks/grown/corn
seed = "/obj/item/seeds/cornseed"
- name = "Corn"
- desc = "I like corm!"
+ name = "cob of corn"
+ desc = "Needs some butter!"
icon_state = "corn"
potency = 40
New()
@@ -980,7 +988,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/poppy
seed = "/obj/item/seeds/poppyseed"
- name = "Poppy"
+ name = "poppy"
icon_state = "poppy"
potency = 30
New()
@@ -992,8 +1000,8 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/potato
seed = "/obj/item/seeds/potatoseed"
- name = "Potato"
- desc = "Starchy!"
+ name = "potato"
+ desc = "Boil 'em! Mash 'em! Stick 'em in a stew!"
icon_state = "potato"
potency = 25
New()
@@ -1006,14 +1014,14 @@
if(W:amount >= 5)
W:amount -= 5
if(!W:amount) del(W)
- user << "\blue You add cable to the potato."
+ user << "You add some cable to the potato."
new /obj/item/weapon/cell/potato(src.loc)
del(src)*/
/obj/item/weapon/reagent_containers/food/snacks/grown/grapes
seed = "/obj/item/seeds/grapeseed"
- name = "Grapes"
+ name = "bunch of grapes"
desc = "Nutritious!"
icon_state = "grapes"
New()
@@ -1024,7 +1032,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/greengrapes
seed = "/obj/item/seeds/greengrapeseed"
- name = "Green Grapes"
+ name = "bunch of green grapes"
desc = "Nutritious!"
icon_state = "greengrapes"
potency = 25
@@ -1036,8 +1044,8 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/cabbage
seed = "/obj/item/seeds/cabbageseed"
- name = "Cabbage"
- desc = "Ewwwwwwwwww"
+ name = "cabbage"
+ desc = "Ewwwwwwwwww. Cabbage."
icon_state = "cabbage"
potency = 25
New()
@@ -1047,7 +1055,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/berries
seed = "/obj/item/seeds/berryseed"
- name = "Berries"
+ name = "bunch of berries"
desc = "Nutritious!"
icon_state = "berrypile"
New()
@@ -1057,7 +1065,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/glowberries
seed = "/obj/item/seeds/glowberryseed"
- name = "Glow Berries"
+ name = "bunch of glow-berries"
desc = "Nutritious!"
var/on = 1
var/brightness_on = 2 //luminosity when on
@@ -1083,8 +1091,8 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/cocoapod
seed = "/obj/item/seeds/cocoapodseed"
- name = "Cocoa Pod"
- desc = "Fattening"
+ name = "cocoa pod"
+ desc = "Fattening... Mmmmm... chucklate."
icon_state = "cocoapod"
potency = 50
New()
@@ -1096,8 +1104,8 @@
//This object is just a transition object. All it does is make a grass tile and delete itself.
/obj/item/weapon/reagent_containers/food/snacks/grown/grass
seed = "/obj/item/seeds/grassseed"
- name = "Grass"
- desc = "Greeny"
+ name = "grass"
+ desc = "Green and lush."
icon_state = "grass"
potency = 20
New()
@@ -1106,8 +1114,8 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/sugarcane
seed = "/obj/item/seeds/sugarcaneseed"
- name = "Sugarcane"
- desc = "Sugary"
+ name = "sugarcane"
+ desc = "Sickly sweet."
icon_state = "sugarcane"
potency = 50
New()
@@ -1116,8 +1124,8 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/poisonberries
seed = "/obj/item/seeds/poisonberryseed"
- name = "Poison Berries"
- desc = "Nutritious in a deadly way."
+ name = "bunch of poison-berries"
+ desc = "Taste so good, you could die!"
icon_state = "poisonberrypile"
potency = 15
New()
@@ -1128,8 +1136,8 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/deathberries
seed = "/obj/item/seeds/deathberryseed"
- name = "Death Berries"
- desc = "Nutritious in a deadly way."
+ name = "bunch of death-berries"
+ desc = "Taste so good, you could die!"
icon_state = "deathberrypile"
potency = 50
New()
@@ -1140,8 +1148,8 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris
seed = "/obj/item/seeds/ambrosiavulgaris"
- name = "Ambrosia Vulgaris"
- desc = "A plant containing various healing chemicals."
+ name = "ambrosia vulgaris branch"
+ desc = "This is a plant containing various healing chemicals."
icon_state = "ambrosiavulgaris"
potency = 10
New()
@@ -1155,8 +1163,8 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/apple
seed = "/obj/item/seeds/appleseed"
- name = "Apple"
- desc = "A piece of Eden."
+ name = "apple"
+ desc = "It's a little piece of Eden."
icon_state = "apple"
potency = 15
New()
@@ -1165,8 +1173,8 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon
seed = "/obj/item/seeds/watermelonseed"
- name = "Watermelon"
- desc = "A melon full of watery goodness"
+ name = "watermelon"
+ desc = "It's full of watery goodness."
icon_state = "watermelon"
potency = 10
New()
@@ -1175,8 +1183,8 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin
seed = "/obj/item/seeds/pumpkinseed"
- name = "Pumpkin"
- desc = "A large and scary pumpkin"
+ name = "pumpkin"
+ desc = "It's large and scary."
icon_state = "pumpkin"
potency = 10
New()
@@ -1185,8 +1193,8 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/lime
seed = "/obj/item/seeds/limeseed"
- name = "Lime"
- desc = "A fruit so sour it twists your face."
+ name = "lime"
+ desc = "It's so sour, your face will twist."
icon_state = "lime"
potency = 20
New()
@@ -1196,8 +1204,8 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/lemon
seed = "/obj/item/seeds/lemonseed"
- name = "Lemon"
- desc = "A sour fruit that makes your mouth bleed."
+ name = "lemon"
+ desc = "When life gives you lemons, be grateful they aren't limes."
icon_state = "lemon"
potency = 20
New()
@@ -1207,8 +1215,8 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/orange
seed = "/obj/item/seeds/orangeseed"
- name = "Orange"
- desc = "A sweet and sour fruit."
+ name = "orange"
+ desc = "It's an tangy fruit."
icon_state = "orange"
potency = 20
New()
@@ -1217,8 +1225,8 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/whitebeet
seed = "/obj/item/seeds/whitebeetseed"
- name = "White Beet"
- desc = "A beeting of white."
+ name = "white-beet"
+ desc = "You can't beat white-beet."
icon_state = "whitebeet"
potency = 15
New()
@@ -1229,8 +1237,8 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/banana
seed = "/obj/item/seeds/bananaseed"
- name = "Banana"
- desc = "A banana. Excellent clown weapon."
+ name = "banana"
+ desc = "It's an excellent prop for a clown."
icon = 'items.dmi'
icon_state = "banana"
item_state = "banana"
@@ -1238,7 +1246,7 @@
if(!reagents.total_volume)
var/mob/M = usr
var/obj/item/weapon/bananapeel/W = new /obj/item/weapon/bananapeel( M )
- M << "\blue You peel the banana."
+ M << "You peel the banana."
M.put_in_hand(W)
W.add_fingerprint(M)
New()
@@ -1250,8 +1258,8 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/chili
seed = "/obj/item/seeds/chiliseed"
- name = "Chili"
- desc = "Spicy! Wait...ITS BURNING ME!"
+ name = "chili"
+ desc = "It's spicy! Wait... IT'S BURNING ME!!"
icon_state = "chilipepper"
New()
..()
@@ -1262,12 +1270,12 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/chili/attackby(var/obj/item/O as obj, var/mob/user as mob)
. = ..()
if (istype(O, /obj/item/device/analyzer/plant_analyzer))
- user << "- Capsaicin: \blue [reagents.get_reagent_amount("capsaicin")]%"
+ user << "- Capsaicin: [reagents.get_reagent_amount("capsaicin")]%"
/obj/item/weapon/reagent_containers/food/snacks/grown/eggplant
seed = "/obj/item/seeds/eggplantseed"
- name = "Eggplant"
- desc = "Yum!"
+ name = "eggplant"
+ desc = "Maybe there's a chicken inside?"
icon_state = "eggplant"
New()
..()
@@ -1276,8 +1284,9 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans
seed = "/obj/item/seeds/soyaseed"
- name = "Soybeans"
- desc = "Pretty bland, but the possibilities..."
+ name = "soybeans"
+ desc = "It's pretty bland, but oh the possibilities..."
+ gender = PLURAL
icon_state = "soybeans"
New()
..()
@@ -1286,8 +1295,8 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato
seed = "/obj/item/seeds/tomatoseed"
- name = "Tomato"
- desc = "Tom-mae-to or to-mah-to? You decide."
+ name = "tomato"
+ desc = "I say to-mah-to, you say tom-mae-to."
icon_state = "tomato"
potency = 10
New()
@@ -1298,14 +1307,14 @@
throw_impact(atom/hit_atom)
..()
new/obj/effect/decal/cleanable/tomato_smudge(src.loc)
- src.visible_message("\red [src.name] has been squashed.","\red You hear a smack.")
+ src.visible_message("[src.name] has been squashed.","You hear a smack.")
del(src)
return
/obj/item/weapon/reagent_containers/food/snacks/grown/killertomato
seed = "/obj/item/seeds/killertomatoseed"
- name = "Killer Tomato"
- desc = "Tom-mae-to or to-mah-to? You decide."
+ name = "killer-tomato"
+ desc = "I say to-mah-to, you say tom-mae-to... OH GOD IT'S EATING MY LEGS!!"
icon_state = "killertomato"
potency = 10
New()
@@ -1329,11 +1338,11 @@
del(src)
- user << "You plant the killertomato."
+ user << "You plant the killer-tomato."
/obj/item/weapon/reagent_containers/food/snacks/grown/bloodtomato
seed = "/obj/item/seeds/bloodtomatoseed"
- name = "Blood Tomato"
+ name = "blood-tomato"
desc = "So bloody...so...very...bloody....AHHHH!!!!"
icon_state = "bloodtomato"
potency = 10
@@ -1345,8 +1354,8 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/bluetomato
seed = "/obj/item/seeds/bluetomatoseed"
- name = "Blue Tomato"
- desc = "Tom-mae-to or to-mah-to? You decide."
+ name = "blue-tomato"
+ desc = "I say blue-mah-to, you say blue-mae-to."
icon_state = "bluetomato"
potency = 10
New()
@@ -1358,8 +1367,9 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/wheat
seed = "/obj/item/seeds/wheatseed"
- name = "Wheat"
- desc = "I wouldn't eat this, unless you're one of those health freaks.."
+ name = "wheat"
+ desc = "Sigh... wheat... a-grain?"
+ gender = PLURAL
icon_state = "wheat"
New()
..()
@@ -1368,8 +1378,8 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/icepepper
seed = "/obj/item/seeds/icepepperseed"
- name = "Icepepper"
- desc = "A mutant strain of chile"
+ name = "ice-pepper"
+ desc = "It's a mutant strain of chili"
icon_state = "icepepper"
potency = 20
New()
@@ -1381,12 +1391,12 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/icepepper/attackby(var/obj/item/O as obj, var/mob/user as mob)
. = ..()
if (istype(O, /obj/item/device/analyzer/plant_analyzer))
- user << "- Frostoil: \blue [reagents.get_reagent_amount("frostoil")]%"
+ user << "- Frostoil: [reagents.get_reagent_amount("frostoil")]%"
/obj/item/weapon/reagent_containers/food/snacks/grown/carrot
seed = "/obj/item/seeds/carrotseed"
- name = "Carrot"
- desc = "Good for the eyes!"
+ name = "carrot"
+ desc = "It's good for the eyes!"
icon_state = "carrot"
potency = 10
New()
@@ -1397,7 +1407,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita
seed = "/obj/item/seeds/amanitamycelium"
- name = "Fly amanita"
+ name = "fly amanita"
desc = "Amanita Muscaria: Learn poisonous mushrooms by heart. Only pick mushrooms you know."
icon_state = "amanita"
potency = 10
@@ -1411,12 +1421,12 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita/attackby(var/obj/item/O as obj, var/mob/user as mob)
. = ..()
if (istype(O, /obj/item/device/analyzer/plant_analyzer))
- user << "- Amatoxins: \blue [reagents.get_reagent_amount("amatoxin")]%"
- user << "- Psilocybin: \blue [reagents.get_reagent_amount("psilocybin")]%"
+ user << "- Amatoxins: [reagents.get_reagent_amount("amatoxin")]%"
+ user << "- Psilocybin: [reagents.get_reagent_amount("psilocybin")]%"
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/angel
seed = "/obj/item/seeds/angelmycelium"
- name = "Destroying angel"
+ name = "destroying angel"
desc = "Amanita Virosa: Deadly poisonous basidiomycete fungus filled with alpha amatoxins."
icon_state = "angel"
potency = 35
@@ -1430,12 +1440,12 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/angel/attackby(var/obj/item/O as obj, var/mob/user as mob)
. = ..()
if (istype(O, /obj/item/device/analyzer/plant_analyzer))
- user << "- Amatoxins: \blue [reagents.get_reagent_amount("amatoxin")]%"
- user << "- Psilocybin: \blue [reagents.get_reagent_amount("psilocybin")]%"
+ user << "- Amatoxins: [reagents.get_reagent_amount("amatoxin")]%"
+ user << "- Psilocybin: [reagents.get_reagent_amount("psilocybin")]%"
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap
seed = "/obj/item/seeds/libertymycelium"
- name = "Liberty cap"
+ name = "liberty-cap"
desc = "Psilocybe Semilanceata: Liberate yourself!"
icon_state = "libertycap"
potency = 15
@@ -1448,11 +1458,11 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap/attackby(var/obj/item/O as obj, var/mob/user as mob)
. = ..()
if (istype(O, /obj/item/device/analyzer/plant_analyzer))
- user << "- Psilocybin: \blue [reagents.get_reagent_amount("psilocybin")]%"
+ user << "- Psilocybin: [reagents.get_reagent_amount("psilocybin")]%"
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/plumphelmet
seed = "/obj/item/seeds/plumpmycelium"
- name = "Plump Helmet"
+ name = "plump-helmet"
desc = "Plumus Hellmus: Plump, soft and s-so inviting~"
icon_state = "plumphelmet"
New()
@@ -1462,7 +1472,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/walkingmushroom
seed = "/obj/item/seeds/walkingmushroom"
- name = "Walking Mushroom"
+ name = "walking mushroom"
desc = "The beginging of the great walk."
icon_state = "walkingmushroom"
New()
@@ -1486,12 +1496,12 @@
del(src)
- user << "You plant the walking mushroom."
+ user << "You plant the walking mushroom."
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/chanterelle
seed = "/obj/item/seeds/chantermycelium"
- name = "Chanterelle"
- desc = "Cantharellus Cibarius: These jolly yellow little shrooms sure look tasty! There's a lot!"
+ name = "chanterelle cluster"
+ desc = "Cantharellus Cibarius: These jolly yellow little shrooms sure look tasty!"
icon_state = "chanterelle"
New()
..()
@@ -1500,8 +1510,8 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom
seed = "/obj/item/seeds/glowshroom"
- name = "Glowshroom"
- desc = "Glowshroom: These species of mushrooms glown in the dark. OR DO THEY?"
+ name = "glowshroom cluster"
+ desc = "Glowshroom: This species of mushroom glows in the dark. Or does it?"
icon_state = "glowshroom"
New()
..()
@@ -1530,7 +1540,7 @@
del(src)
- user << "You plant the glowshroom."
+ user << "You plant the glowshroom."
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/Del()
if(istype(loc,/mob))
@@ -1569,9 +1579,9 @@
R.my_atom = src
/obj/item/weapon/grown/log
+ name = "tower-cap log"
desc = "It's better than bad, it's good!"
icon = 'harvest.dmi'
- name = "Tower Cap Log"
icon_state = "logs"
force = 5
flags = TABLEPASS
@@ -1585,16 +1595,16 @@
attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W, /obj/item/weapon/circular_saw))
- W.visible_message(" \red You make planks out of the [src]! ", 1)
+ user.show_message("You make planks out of the [src]!", 1)
for(var/i=0,i<2,i++)
new /obj/item/stack/sheet/wood (src.loc)
del(src)
return
/obj/item/weapon/grown/sunflower // FLOWER POWER!
- desc = "This is a beautiful sunflower! A certain person might beat you to death if you trample these."
+ name = "sunflower"
+ desc = "It's beautiful! A certain person might beat you to death if you trample these."
icon = 'harvest.dmi'
- name = "Sunflower"
icon_state = "sunflower"
damtype = "fire"
force = 0
@@ -1631,9 +1641,9 @@
src.smoke.set_up(10, 0, usr.loc)
*/
/obj/item/weapon/grown/nettle // -- Skie
- desc = "This is a nettle. It's probably not wise to touch it with bare hands..."
+ desc = "It's probably not wise to touch it with bare hands..."
icon = 'weapons.dmi'
- name = "Nettle"
+ name = "nettle"
icon_state = "nettle"
damtype = "fire"
force = 15
@@ -1654,7 +1664,7 @@
/obj/item/weapon/grown/deathnettle // -- Skie
desc = "The \red glowing \black nettle incites \redrage\black in you just from looking at it!"
icon = 'weapons.dmi'
- name = "Deathnettle"
+ name = "deathnettle"
icon_state = "deathnettle"
damtype = "fire"
force = 30
@@ -1677,7 +1687,7 @@
// *************************************
/obj/item/pestkiller
- name = ""
+ name = "bottle of pestkiller"
icon = 'chemical.dmi'
icon_state = "bottle16"
flags = FPRINT | TABLEPASS
@@ -1688,7 +1698,7 @@
src.pixel_y = rand(-5.0, 5)
/obj/item/pestkiller/carbaryl
- name = "Carbaryl"
+ name = "bottle of carbaryl"
icon = 'chemical.dmi'
icon_state = "bottle16"
flags = FPRINT | TABLEPASS
@@ -1699,7 +1709,7 @@
src.pixel_y = rand(-5.0, 5)
/obj/item/pestkiller/lindane
- name = "Lindane"
+ name = "bottle of lindane"
icon = 'chemical.dmi'
icon_state = "bottle18"
flags = FPRINT | TABLEPASS
@@ -1710,7 +1720,7 @@
src.pixel_y = rand(-5.0, 5)
/obj/item/pestkiller/phosmet
- name = "Phosmet"
+ name = "bottle of phosmet"
icon = 'chemical.dmi'
icon_state = "bottle15"
flags = FPRINT | TABLEPASS
@@ -1725,9 +1735,9 @@
// *************************************
/obj/item/weapon/plantbgone // -- Skie
- desc = "Plant-B-Gone! Kill those pesky weeds!"
+ desc = "Kill those pesky weeds!"
icon = 'hydroponics.dmi'
- name = "Plant-B-Gone"
+ name = "bottle of Plant-B-Gone"
icon_state = "plantbgone"
item_state = "plantbgone"
flags = ONBELT|TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY
@@ -1739,9 +1749,9 @@
/obj/item/weapon/weedspray // -- Skie
- desc = "Toxic mixture in spray form to kill small weeds."
+ desc = "It's a toxic mixture, in spray form, to kill small weeds."
icon = 'hydroponics.dmi'
- name = "Weed Spray"
+ name = "weed-spray"
icon_state = "weedspray"
item_state = "spray"
flags = ONBELT|TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY
@@ -1753,9 +1763,9 @@
var/WeedKillStr = 2
/obj/item/weapon/pestspray // -- Skie
- desc = "Pest eliminator spray! Do not inhale!"
+ desc = "It's some pest eliminator spray! Do not inhale!"
icon = 'hydroponics.dmi'
- name = "Pest Spray"
+ name = "pest-spray"
icon_state = "pestspray"
item_state = "spray"
flags = ONBELT|TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY
@@ -1767,8 +1777,8 @@
var/PestKillStr = 2
/obj/item/weapon/minihoe // -- Numbers
- name = "Mini hoe"
- desc = "Use for removing weeds or scratching your back. Might be convinced for other uses."
+ name = "mini hoe"
+ desc = "It's used for removing weeds or scratching your back."
icon = 'weapons.dmi'
icon_state = "hoe"
item_state = "hoe"
@@ -1783,7 +1793,7 @@
// *************************************
/obj/item/weedkiller
- name = ""
+ name = "bottle of weedkiller"
icon = 'chemical.dmi'
icon_state = "bottle16"
flags = FPRINT | TABLEPASS
@@ -1791,7 +1801,7 @@
var/WeedKillStr = 0
/obj/item/weedkiller/triclopyr
- name = "Glyphosate"
+ name = "bottle of glyphosate"
icon = 'chemical.dmi'
icon_state = "bottle16"
flags = FPRINT | TABLEPASS
@@ -1799,7 +1809,7 @@
WeedKillStr = 2
/obj/item/weedkiller/lindane
- name = "Triclopyr"
+ name = "bottle of triclopyr"
icon = 'chemical.dmi'
icon_state = "bottle18"
flags = FPRINT | TABLEPASS
@@ -1807,7 +1817,7 @@
WeedKillStr = 4
/obj/item/weedkiller/D24
- name = "2,4-D"
+ name = "bottle of 2,4-D"
icon = 'chemical.dmi'
icon_state = "bottle15"
flags = FPRINT | TABLEPASS
@@ -1819,7 +1829,7 @@
// *************************************
/obj/item/nutrient
- name = ""
+ name = "bottle of nutrient"
icon = 'chemical.dmi'
icon_state = "bottle16"
flags = FPRINT | TABLEPASS
@@ -1831,7 +1841,7 @@
src.pixel_y = rand(-5.0, 5)
/obj/item/nutrient/ez
- name = "E-Z-Nutrient"
+ name = "bottle of E-Z-Nutrient"
icon = 'chemical.dmi'
icon_state = "bottle16"
flags = FPRINT | TABLEPASS
@@ -1842,7 +1852,7 @@
src.pixel_y = rand(-5.0, 5)
/obj/item/nutrient/l4z
- name = "Left 4 Zed"
+ name = "bottle of Left 4 Zed"
icon = 'chemical.dmi'
icon_state = "bottle18"
flags = FPRINT | TABLEPASS
@@ -1853,7 +1863,7 @@
src.pixel_y = rand(-5.0, 5)
/obj/item/nutrient/rh
- name = "Robust Harvest"
+ name = "bottle of Robust Harvest"
icon = 'chemical.dmi'
icon_state = "bottle15"
flags = FPRINT | TABLEPASS
diff --git a/code/defines/obj/machinery.dm b/code/defines/obj/machinery.dm
index fb8124b49c6..55461e17b09 100644
--- a/code/defines/obj/machinery.dm
+++ b/code/defines/obj/machinery.dm
@@ -20,7 +20,7 @@
/obj/machinery/autolathe
name = "\improper Autolathe"
- desc = "Produces items with metal and glass."
+ desc = "It produces items using metal and glass."
icon_state = "autolathe"
density = 1
var/m_amount = 0.0
@@ -43,7 +43,7 @@
/obj/machinery/camera
name = "security camera"
- desc = "This is used to monitor rooms. Can see through walls."
+ desc = "It's used to monitor rooms. It can see through walls."
icon = 'monitors.dmi'
icon_state = "camera"
var/network = "SS13"
@@ -60,7 +60,7 @@
active_power_usage = 10
/obj/machinery/dispenser
- name = "\improper Tank Storage Unit"
+ name = "tank storage unit"
desc = "A simple yet bulky one-way storage device for gas tanks. Holds 10 plasma and 10 oxygen tanks."
icon = 'objects.dmi'
icon_state = "dispenser"
@@ -73,8 +73,8 @@
active_power_usage = 10
/obj/machinery/dna_scanner
- name = "\improper DNA Scanner/Implanter"
- desc = "Scans DNA."
+ name = "\improper DNA scanner/implanter"
+ desc = "It scans DNA structures."
icon = 'Cryogenic2.dmi'
icon_state = "scanner_0"
density = 1
@@ -86,8 +86,8 @@
active_power_usage = 300
/obj/machinery/dna_scannernew
- name = "\improper DNA Modifier"
- desc = "Scans DNA better."
+ name = "\improper DNA modifier"
+ desc = "It scans DNA structures."
icon = 'Cryogenic2.dmi'
icon_state = "scanner_0"
density = 1
@@ -100,7 +100,7 @@
/obj/machinery/firealarm
name = "fire alarm"
- desc = "Pull this in case of emergency. Thus keep pulling this forever."
+ desc = "\"Pull this in case of emergency\". Thus, keep pulling it forever."
icon = 'monitors.dmi'
icon_state = "fire0"
var/detecting = 1.0
@@ -122,7 +122,7 @@
src.overlays += image('monitors.dmi', "overlay_green")
/obj/machinery/partyalarm
- name = "\improper Party Button"
+ name = "\improper PARTY BUTTON"
desc = "Cuban Pete is in the house!"
icon = 'monitors.dmi'
icon_state = "fire0"
@@ -139,7 +139,7 @@
/obj/machinery/igniter
name = "igniter"
- desc = "Fun for igniting plasma."
+ desc = "It's useful for igniting plasma."
icon = 'stationobjs.dmi'
icon_state = "igniter1"
var/id = null
@@ -151,7 +151,7 @@
/obj/machinery/injector
name = "injector"
- desc = "Injects gas into a chamber."
+ desc = "It injects gas into a chamber."
icon = 'stationobjs.dmi'
icon_state = "injector"
density = 1
@@ -176,8 +176,8 @@
active_power_usage = 4
/obj/machinery/restruct
- name = "\improper DNA Physical Restructurization Accelerator"
- desc = "This looks complex."
+ name = "\improper DNA physical restructurization accelerator"
+ desc = "It looks ridiculously complex."
icon = 'Cryogenic2.dmi'
icon_state = "restruct_0"
density = 1
@@ -190,7 +190,7 @@
/obj/machinery/scan_console
name = "\improper DNA Scanner Access Console"
- desc = "Scand DNA."
+ desc = "It scans DNA structures."
icon = 'computer.dmi'
icon_state = "scanner"
density = 1
@@ -211,11 +211,11 @@
active_power_usage = 400
/obj/machinery/door_control
- name = "remote door control"
- desc = "This controls doors."
+ name = "remote door-control"
+ desc = "It controls doors, remotely."
icon = 'stationobjs.dmi'
icon_state = "doorctrl0"
- desc = "A remote control switch for a door."
+ desc = "A remote control-switch for a door."
var/id = null
var/range = 10
var/normaldoorcontrol = 0
@@ -257,7 +257,7 @@
/obj/machinery/ignition_switch
name = "ignition switch"
- desc = "Activates that igniter."
+ desc = "It activates an igniter."
icon = 'objects.dmi'
icon_state = "launcherbtt"
desc = "A remote control switch for a mounted igniter."
@@ -276,8 +276,8 @@
var/lockeddown = 0
/obj/machinery/teleport/hub
- name = "hub"
- desc = "A hub of a teleporting machine."
+ name = "teleporter hub"
+ desc = "It's the hub of a teleporting machine."
icon_state = "tele0"
var/accurate = 0
use_power = 1
@@ -286,7 +286,7 @@
/obj/machinery/teleport/station
name = "station"
- desc = "The station thingy of a teleport thingy."
+ desc = "It's the station thingy of a teleport thingy." //seriously, wtf.
icon_state = "controller"
var/active = 0
var/engaged = 0
@@ -316,7 +316,7 @@
/obj/machinery/power/terminal
name = "terminal"
icon_state = "term"
- desc = "An underfloor wiring terminal for power equipment"
+ desc = "It's an underfloor wiring terminal for power equipment."
level = 1
layer = TURF_LAYER
var/obj/machinery/power/master = null
@@ -325,8 +325,8 @@
layer = 2.6 // a bit above wires
/obj/machinery/power/generator
- name = "generator"
- desc = "A high efficiency thermoelectric generator."
+ name = "thermoelectric generator"
+ desc = "It's a high efficiency thermoelectric generator."
icon_state = "teg"
anchored = 1
density = 1
@@ -338,8 +338,8 @@
var/lastgenlev = -1
/obj/machinery/power/generator_type2
- name = "generator"
- desc = "A high efficiency thermoelectric generator."
+ name = "thermoelectric generator"
+ desc = "It's a high efficiency thermoelectric generator."
icon_state = "teg"
anchored = 1
density = 1
@@ -351,8 +351,8 @@
var/lastgenlev = -1
/obj/machinery/power/monitor
- name = "\improper Power Monitoring Computer"
- desc = "Used to monitor the power. Pretty useless."
+ name = "power monitoring computer"
+ desc = "It monitors power levels across the station."
icon = 'computer.dmi'
icon_state = "power"
density = 1
@@ -363,7 +363,7 @@
/obj/machinery/cell_charger
name = "cell charger"
- desc = "A charging unit for power cells."
+ desc = "It charges power cells."
icon = 'power.dmi'
icon_state = "ccharger0"
var/obj/item/weapon/cell/charging = null
@@ -374,8 +374,8 @@
active_power_usage = 60
/obj/machinery/light_switch
- desc = "light switch"
- name = null
+ name = "light switch"
+ desc = "It turns lights on and off. What are you, simple?"
icon = 'power.dmi'
icon_state = "light1"
anchored = 1.0
@@ -406,20 +406,21 @@
/obj/machinery/hologram/holopad
name = "\improper AI holopad"
- desc = "A floor-mounted device for projecting a holographic image. It is activated remotely."
+ desc = "It's a floor-mounted device for projecting holographic images. 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.
+ last_request = 0 //to prevent request spam. ~Carn
/obj/machinery/hologram/projector
- name = "\improper Hologram Projector"
- desc = "Makes a hologram appear...somehow..."
+ name = "hologram projector"
+ desc = "It makes a hologram appear...with magnets or something..."
icon = 'stationobjs.dmi'
icon_state = "hologram0"
/obj/machinery/hologram/proj_ai
- name = "\improper Hologram Projector Platform"
- desc = "Used for the fun of the diabolical AI."
+ name = "hologram projector platform"
+ desc = "It's used by the AI for fooling around."
icon = 'stationobjs.dmi'
icon_state = "hologram0"
var
diff --git a/code/defines/obj/storage.dm b/code/defines/obj/storage.dm
index 5994590c6c0..ba2fd2991fd 100644
--- a/code/defines/obj/storage.dm
+++ b/code/defines/obj/storage.dm
@@ -8,13 +8,13 @@
max_combined_w_class = 21
/obj/item/weapon/storage/backpack/cultpack
- name = "Trophy Rack"
- desc = "A backpack and trophy rack, useful for both carrying extra gear and proudly declaring your insanity "
+ name = "trophy rack"
+ desc = "It's useful for both carrying extra gear and proudly declaring your insanity."
icon_state = "cultpack"
/obj/item/weapon/storage/trashbag
name = "trash bag"
- desc = "for picking up all those pens"
+ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"
icon_state = "trashbag"
item_state = "trashbag"
w_class = 4.0
@@ -31,7 +31,7 @@
*/
/obj/item/weapon/storage/pill_bottle
name = "pill bottle"
- desc = "This is told to hold untold horrors of pulls."
+ desc = "It's an airtight container for storing medication."
icon_state = "pill_canister"
icon = 'chemical.dmi'
item_state = "contsolid"
@@ -39,8 +39,8 @@
can_hold = list("/obj/item/weapon/reagent_containers/pill")
/obj/item/weapon/storage/dice
- name = "dice pack"
- desc = "Apparently this has dice in them."
+ name = "pack of dice"
+ desc = "It's a small container with dice inside."
icon_state = "pill_canister"
icon = 'chemical.dmi'
item_state = "contsolid"
@@ -48,7 +48,8 @@
can_hold = list("/obj/item/weapon/dice")
/obj/item/weapon/storage/box
- name = "Box"
+ name = "box"
+ desc = "It's just an ordinary box."
icon_state = "box"
item_state = "syringe_kit"
@@ -57,7 +58,8 @@
/obj/item/weapon/storage/box/syndicate
/obj/item/weapon/storage/cupbox
- name = "Paper-cup Box"
+ name = "box of paper cups"
+ desc = "It has pictures of paper cups on the front."
icon_state = "box"
item_state = "syringe_kit"
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
@@ -72,37 +74,37 @@
new /obj/item/weapon/reagent_containers/food/drinks/sillycup( src )
/obj/item/weapon/storage/pillbottlebox
- name = "pill bottles"
- desc = "A box of pill bottles."
+ name = "box of pill bottles"
+ desc = "It has pictures of pill bottles on its front."
icon_state = "box"
item_state = "syringe_kit"
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
/obj/item/weapon/storage/blankbox
- name = "blank shells"
- desc = "A box containing...stuff..."
+ name = "box of blank shells"
+ desc = "It has a picture of a gun and several warning symbols on the front."
icon_state = "box"
item_state = "syringe_kit"
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
/obj/item/weapon/storage/backpack/clown
name = "Giggles Von Honkerton"
- desc = "The backpack made by Honk. Co."
+ desc = "It's a backpack made by Honk! Co."
icon_state = "clownpack"
/obj/item/weapon/storage/backpack/medic
- name = "medic's backpack"
- desc = "The backpack used to keep with the sterile environment."
+ name = "medical backpack"
+ desc = "It's a backpack especially designed for use in a sterile environment."
icon_state = "medicalpack"
/obj/item/weapon/storage/backpack/security
name = "security backpack"
- desc = "A very robust backpack."
+ desc = "It's a very robust backpack."
icon_state = "securitypack"
/obj/item/weapon/storage/backpack/satchel
- name = "Satchel"
- desc = "A very robust satchel to wear on your back."
+ name = "satchel"
+ desc = "It's a very robust satchel to wear on your back."
icon_state = "satchel"
New()
@@ -110,18 +112,18 @@
new /obj/item/weapon/storage/wallet/random(src)
/obj/item/weapon/storage/backpack/bandolier
- name = "Bandolier"
- desc = "A very old bandolier to wear on your back."
+ name = "bandolier"
+ desc = "It's a very old bandolier to wear on your back."
icon_state = "bandolier"
/obj/item/weapon/storage/backpack/industrial
name = "industrial backpack"
- desc = "A tough backpack for the daily grind"
+ desc = "It's a tough backpack for the daily grind of station life."
icon_state = "engiepack"
/obj/item/weapon/storage/briefcase
name = "briefcase"
- desc = "Used by the lawyer to robust security in the court room."
+ desc = "It's made of AUTHENTIC faux-leather and has a price-tag still attached. Its owner must be a real professional."
icon_state = "briefcase"
flags = FPRINT | TABLEPASS| CONDUCT
force = 8.0
@@ -133,7 +135,7 @@
/obj/item/weapon/storage/wallet
name = "wallet"
- desc = "A small wallet which can hold a few small personal things."
+ desc = "It can hold a few small and personal things."
storage_slots = 4
icon_state = "wallet"
can_hold = list(
@@ -197,8 +199,8 @@
/obj/item/weapon/storage/disk_kit
- name = "data disks"
- desc = "For disks."
+ name = "box of data disks"
+ desc = "It has a picture of a data disk on it."
icon_state = "id"
item_state = "syringe_kit"
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
@@ -208,22 +210,22 @@
/obj/item/weapon/storage/disk_kit/disks2
/obj/item/weapon/storage/fcard_kit
- name = "Fingerprint Cards"
- desc = "This contains cards which are used to take fingerprints."
+ name = "box of fingerprint cards"
+ desc = "It has a picture of a fingerprint on each of its faces."
icon_state = "id"
item_state = "syringe_kit"
/obj/item/weapon/storage/firstaid
- name = "First-Aid"
- desc = "In case of a boo-boo."
+ name = "first-aid kit"
+ desc = "It's an emergency medical kit for those serious boo-boos."
icon_state = "firstaid"
throw_speed = 2
throw_range = 8
var/empty = 0
/obj/item/weapon/storage/firstaid/fire
- name = "Fire First Aid"
- desc = "A kit for when you 'accidently' set toxins on fire and burn yourself."
+ name = "fire first-aid kit"
+ desc = "It's an emergency medical kit for when the toxins lab -spontaneously- burns down."
icon_state = "ointment"
item_state = "firstaid-ointment"
@@ -357,7 +359,7 @@
item_state = "toolbox_yellow"
/obj/item/weapon/storage/toolbox/syndicate
- name = "Suspicious looking toolbox"
+ name = "suspicious looking toolbox"
icon_state = "syndicate"
item_state = "toolbox_syndi"
origin_tech = "combat=1;syndicate=1"
@@ -376,32 +378,32 @@
/obj/item/weapon/storage/bible/booze
name = "bible"
- desc = "Apply to head repeatedly."
+ desc = "To be applied to the head repeatedly."
icon_state ="bible"
/obj/item/weapon/storage/mousetraps
- name = "Pest-B-Gon Mousetraps"
- desc = "WARNING: Keep out of reach of children."
+ name = "box of Pest-B-Gon Mousetraps"
+ desc = "WARNING: Keep out of reach of children."
icon_state = "mousetraps"
item_state = "syringe_kit"
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
/obj/item/weapon/storage/donkpocket_kit
- name = "Donk-Pockets"
- desc = "Remember to fully heat prior to serving. Product will cool if not eaten within seven minutes."
+ name = "box of donk-pockets"
+ desc = "Instructions: Heat in microwave. Product will cool if not eaten within seven minutes."
icon_state = "donk_kit"
item_state = "syringe_kit"
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
/obj/item/weapon/storage/condimentbottles
- name = "Condiment Bottles"
- desc = "A box of empty condiment bottles."
+ name = "box of condiment bottles"
+ desc = "It has a large ketchup smear on it."
icon_state = "box"
item_state = "syringe_kit"
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
/obj/item/weapon/storage/drinkingglasses
- name = "Drinking Glasses"
- desc = "A box of clean drinking glasses"
+ name = "box of drinking glasses"
+ desc = "It has a picture of drinking glasses on it."
icon_state = "box"
- item_state = "syringe_kit"
\ No newline at end of file
+ item_state = "syringe_kit"
diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index 3dd79221fd2..6fcd3ba0377 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -3,7 +3,7 @@
icon = 'weapons.dmi'
/obj/item/weapon/offhand
- name = "Offhand"
+ name = "offhand"
var/linked_weapon_name = ""
w_class = 5.0
icon_state = "offhand"
@@ -43,7 +43,7 @@
w_class = 1
/obj/item/weapon/sord
- name = "SORD"
+ name = "\improper SORD"
desc = "This thing is so unspeakably shitty you are having a hard time even holding it."
icon_state = "sord"
item_state = "sord"
@@ -54,7 +54,7 @@
/obj/item/weapon/claymore
name = "claymore"
- desc = "what are you standing around staring at this for? get to killing!"
+ desc = "What are you standing around staring at this for? Get to killing!"
icon_state = "claymore"
item_state = "claymore"
flags = FPRINT | ONBELT | TABLEPASS
@@ -81,7 +81,7 @@
origin_tech = "materials=2"
/obj/item/weapon/rsf
- name = "Rapid-Service-Fabricator (RSF)"
+ name = "\improper Rapid-Service-Fabricator"
desc = "A device used to rapidly deploy service items."
icon = 'items.dmi'
icon_state = "rcd"
@@ -94,7 +94,7 @@
w_class = 3.0
/obj/item/weapon/rsp
- name = "Rapid-Seed-Producer (RSP)"
+ name = "\improper Rapid-Seed-Producer (RSP)"
desc = "A device used to rapidly deploy seeds."
icon = 'items.dmi'
icon_state = "rcd"
@@ -107,7 +107,7 @@
w_class = 3.0
/obj/item/weapon/rcd_ammo
- name = "Compressed matter cartridge"
+ name = "compressed matter cartridge"
desc = "Highly compressed matter for the RCD."
icon = 'ammo.dmi'
icon_state = "rcd"
@@ -120,8 +120,9 @@
g_amt = 15000
/obj/item/weapon/spacecash
- name = "Space Cash"
- desc = "You're rich, bitch!"
+ name = "space cash"
+ desc = "It's worth 1 credit."
+ gender = PLURAL
icon = 'items.dmi'
icon_state = "spacecash"
opacity = 0
@@ -138,25 +139,31 @@
/obj/item/weapon/spacecash/c10
icon_state = "spacecash10"
access = access_crate_cash
+ desc = "It's worth 10 credits."
/obj/item/weapon/spacecash/c20
icon_state = "spacecash20"
access = access_crate_cash
+ desc = "It's worth 20 credits."
/obj/item/weapon/spacecash/c50
icon_state = "spacecash50"
access = access_crate_cash
+ desc = "It's worth 50 credits."
/obj/item/weapon/spacecash/c100
icon_state = "spacecash100"
access = access_crate_cash
+ desc = "It's worth 100 credits."
/obj/item/weapon/spacecash/c200
icon_state = "spacecash200"
access = access_crate_cash
+ desc = "It's worth 200 credits."
/obj/item/weapon/spacecash/c500
icon_state = "spacecash500"
access = access_crate_cash
+ desc = "It's worth 500 credits."
/obj/item/weapon/spacecash/c1000
icon_state = "spacecash1000"
access = access_crate_cash
-
+ desc = "It's worth 1000 credits."
/obj/item/device/mass_spectrometer
desc = "A hand-held mass spectrometer which identifies trace chemicals in a blood sample."
@@ -182,7 +189,7 @@
origin_tech = "magnets=4;biotech=2"
/obj/item/weapon/melee/baton
- name = "Stun Baton"
+ name = "stun baton"
desc = "A stun baton for hitting people with."
icon_state = "stunbaton"
item_state = "baton"
@@ -196,7 +203,7 @@
origin_tech = "combat=2"
/obj/item/weapon/melee/chainofcommand
- name = "Chain of Command"
+ name = "chain of command"
desc = "The Captain is first and all other heads are last."
icon_state = "chainofcommand"
item_state = "chainofcommand"
@@ -213,7 +220,7 @@
var/active = 0
/obj/item/weapon/melee/energy/axe
- name = "Axe"
+ name = "energy axe"
desc = "An energised battle axe."
icon_state = "axe0"
force = 40.0
@@ -260,7 +267,7 @@
var/datum/effect/effect/system/spark_spread/spark_system
/obj/item/weapon/bananapeel
- name = "Banana Peel"
+ name = "banana peel"
desc = "A peel from a banana."
icon = 'items.dmi'
icon_state = "banana_peel"
@@ -271,8 +278,9 @@
throw_range = 20
/obj/item/weapon/soap
- name = "Soap"
+ name = "soap"
desc = "A cheap bar of soap. Doesn't smell."
+ gender = PLURAL
icon = 'items.dmi'
icon_state = "soap"
w_class = 1.0
@@ -285,7 +293,7 @@
icon_state = "soapnt"
/obj/item/weapon/soap/deluxe
- desc = "A deluxe Waffle Co. brand bar of soap. Smells of comdoms."
+ desc = "A deluxe Waffle Co. brand bar of soap. Smells of condoms."
icon_state = "soapdeluxe"
/obj/item/weapon/soap/syndie
@@ -370,7 +378,7 @@
color = "brown"
/obj/item/weapon/bikehorn
- name = "Bike Horn"
+ name = "bike horn"
desc = "A horn off of a bicycle."
icon = 'items.dmi'
icon_state = "bike_horn"
@@ -404,6 +412,7 @@
/obj/item/stack/medical/ointment
name = "ointment"
desc = "Used to treat those nasty burns."
+ gender = PLURAL
singular_name = "ointment"
icon_state = "ointment"
heal_burn = 40
@@ -446,7 +455,7 @@
item_state = "card-id"
/obj/item/weapon/card/data/clown
- name = "Coordinates to Clown Planet"
+ name = "coordinates to clown planet"
icon_state = "data"
item_state = "card-id"
layer = 3
@@ -485,14 +494,14 @@
origin_tech = "syndicate=3"
/obj/item/weapon/card/id/syndicate_command
- name = "Syndicate ID card"
+ name = "syndicate ID card"
desc = "An ID straight from the Syndicate."
registered = "Syndicate"
assignment = "Syndicate Overlord"
access = list(access_syndicate)
/obj/item/weapon/card/id/captains_spare
- name = "Captain's spare ID"
+ name = "captain's spare ID"
desc = "The spare ID of the High Lord himself."
icon_state = "gold"
item_state = "gold_id"
@@ -503,7 +512,7 @@
..()
/obj/item/weapon/card/id/centcom
- name = "CentCom ID"
+ name = "\improper CentCom. ID"
desc = "An ID straight from Cent. Com."
icon_state = "centcom"
registered = "Central Command"
@@ -575,7 +584,7 @@
/obj/item/weapon/fireaxe // DEM AXES MAN, marker -Agouri
icon_state = "fireaxe0"
- name = "Fire axe"
+ name = "fire axe"
desc = "Truly, the tool of a madman. Who would possibly think to fight fire with an axe?"
force = 5
w_class = 4.0
@@ -605,7 +614,7 @@
icon = 'items.dmi'
/obj/item/weapon/disk/nuclear
- name = "Nuclear Authentication Disk"
+ name = "nuclear authentication disk"
desc = "Better keep this safe."
icon_state = "nucleardisk"
item_state = "card-id"
@@ -635,7 +644,7 @@
m_amt = 90
/obj/item/weapon/f_card
- name = "Finger Print Card"
+ name = "finger print card"
desc = "Used to take fingerprints."
icon = 'card.dmi'
icon_state = "fingerprint0"
@@ -648,7 +657,7 @@
/obj/item/weapon/fcardholder
- name = "Finger Print Case"
+ name = "fingerprint card case"
desc = "Apply finger print card."
icon = 'items.dmi'
icon_state = "fcardholder0"
@@ -715,6 +724,7 @@
/obj/item/weapon/handcuffs
name = "handcuffs"
desc = "Use this to keep prisoners in line."
+ gender = PLURAL
icon = 'items.dmi'
icon_state = "handcuff"
flags = FPRINT | TABLEPASS | CONDUCT | ONBELT
@@ -767,7 +777,8 @@
/obj/item/weapon/paper
- name = "Paper"
+ name = "paper"
+ gender = PLURAL
icon = 'paper.dmi'
icon_state = "paper"
var/info = null
@@ -786,8 +797,9 @@
var/siemens_coefficient = 0.80
/obj/item/weapon/directions
- name = "Crumpled Paper"
- desc = "This is a crumpled piece fo paper."
+ name = "crumpled paper"
+ gender = PLURAL
+ desc = "This is a crumpled piece of paper."
icon = 'weapons.dmi'
icon_state = "crumpled"
throwforce = 0
@@ -832,7 +844,7 @@
info = "Alert Levels:
\nBlue- Emergency
\n\t1. Caused by fire
\n\t2. Caused by manual interaction
\n\tAction:
\n\t\tClose all fire doors. These can only be opened by reseting the alarm
\nRed- Ejection/Self Destruct
\n\t1. Caused by module operating computer.
\n\tAction:
\n\t\tAfter the specified time the module will eject completely.
\n
\nEngine Maintenance Instructions:
\n\tShut off ignition systems:
\n\tActivate internal power
\n\tActivate orbital balance matrix
\n\tRemove volatile liquids from area
\n\tWear a fire suit
\n
\n\tAfter
\n\t\tDecontaminate
\n\t\tVisit medical examiner
\n
\nToxin Laboratory Procedure:
\n\tWear a gas mask regardless
\n\tGet an oxygen tank.
\n\tActivate internal atmosphere
\n
\n\tAfter
\n\t\tDecontaminate
\n\t\tVisit medical examiner
\n
\nDisaster Procedure:
\n\tFire:
\n\t\tActivate sector fire alarm.
\n\t\tMove to a safe area.
\n\t\tGet a fire suit
\n\t\tAfter:
\n\t\t\tAssess Damage
\n\t\t\tRepair damages
\n\t\t\tIf needed, Evacuate
\n\tMeteor Shower:
\n\t\tActivate fire alarm
\n\t\tMove to the back of ship
\n\t\tAfter
\n\t\t\tRepair damage
\n\t\t\tIf needed, Evacuate
\n\tAccidental Reentry:
\n\t\tActivate fire alrms in front of ship.
\n\t\tMove volatile matter to a fire proof area!
\n\t\tGet a fire suit.
\n\t\tStay secure until an emergency ship arrives.
\n
\n\t\tIf ship does not arrive-
\n\t\t\tEvacuate to a nearby safe area!"
/obj/item/weapon/paper_bin
- name = "Paper Bin"
+ name = "paper bin"
desc = "This contains many papers."
icon = 'paper.dmi'
icon_state = "paper_bin1"
@@ -868,7 +880,7 @@
/obj/item/weapon/banhammer
desc = "A banhammer"
- name = "Banhammer"
+ name = "banhammer"
icon = 'items.dmi'
icon_state = "toyhammer"
flags = FPRINT | ONBELT | TABLEPASS
@@ -896,7 +908,7 @@
m_amt = 3750
/obj/item/weapon/rubber_chicken
- name = "Rubber Chicken"
+ name = "rubber chicken"
desc = "A rubber chicken, isn't that hilarious?"
icon = 'items.dmi'
icon_state = "rubber_chicken"
@@ -948,7 +960,7 @@
origin_tech = "magnets=2;syndicate=3"*/
/obj/item/weapon/SWF_uplink
- name = "station bounced radio"
+ name = "station-bounced radio"
desc = "used to comunicate it appears."
icon = 'radio.dmi'
icon_state = "radio"
@@ -967,7 +979,7 @@
origin_tech = "magnets=1"
/obj/item/weapon/spellbook
- name = "Spell Book"
+ name = "spell book"
desc = "The legendary book of spells of the wizard."
icon = 'library.dmi'
icon_state ="book"
@@ -1012,6 +1024,7 @@
/obj/item/weapon/table_parts
name = "table parts"
desc = "Parts of a table. Poor table."
+ gender = PLURAL
icon = 'items.dmi'
icon_state = "table_parts"
m_amt = 3750
@@ -1032,7 +1045,7 @@
flags = null
/obj/item/weapon/teleportation_scroll
- name = "Teleportation Scroll"
+ name = "scroll of teleportation"
desc = "A scroll for moving around."
icon = 'wizard.dmi'
icon_state = "scroll"
@@ -1083,7 +1096,7 @@
var/minor_fault = 0 //If not 100% reliable, it will build up faults.
/obj/item/weapon/cell/crap
- name = "Nanotrassen Brand Rechargable AA Battery"
+ name = "\improper Nanotrassen brand rechargable AA battery"
desc = "You can't top the plasma top." //TOTALLY TRADEMARK INFRINGEMENT
origin_tech = "powerstorage=0"
maxcharge = 500
@@ -1169,7 +1182,7 @@
desc = "Heavy-duty switching circuits for power control."
/obj/item/weapon/module/id_auth
- name = "ID authentication module"
+ name = "\improper ID authentication module"
icon_state = "id_mod"
desc = "A module allowing secure authorization of ID cards."
@@ -1217,7 +1230,7 @@
w_class = 3.0
/obj/item/weapon/kitchenknife
- name = "Kitchen knife"
+ name = "kitchen knife"
icon = 'kitchen.dmi'
icon_state = "knife"
desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come."
@@ -1231,7 +1244,7 @@
origin_tech = "materials=1"
/obj/item/weapon/butch
- name = "Butcher's Cleaver"
+ name = "butcher's Cleaver"
icon = 'kitchen.dmi'
icon_state = "butch"
desc = "A huge thing used for chopping and chopping up meat. This includes clowns and clown-by-products."
@@ -1245,10 +1258,10 @@
origin_tech = "materials=1"
/obj/item/weapon/tray
- name = "Tray"
+ name = "tray"
icon = 'food.dmi'
icon_state = "tray"
- desc = "A plastic tray to lay food on."
+ desc = "A metal tray to lay food on."
throwforce = 12.0
throwforce = 10.0
throw_speed = 1
@@ -1371,7 +1384,7 @@
origin_tech = "materials=1;biotech=1"
/obj/item/weapon/syntiflesh
- name = "Syntiflesh"
+ name = "syntiflesh"
desc = "Meat that appears...strange..."
icon = 'food.dmi'
icon_state = "meat"
@@ -1424,7 +1437,7 @@
color = "medical"
/obj/item/weapon/stamp/denied
- name = "DENIED rubber stamp"
+ name = "\improper DENIED rubber stamp"
icon_state = "stamp-qm"
color = "redcoat"
@@ -1480,15 +1493,15 @@
/obj/item/weapon/pai_cable
desc = "A flexible coated cable with a universal jack on one end."
- desc = "Some spacey cable."
name = "data cable"
icon = 'power.dmi'
icon_state = "wire1"
var/obj/machinery/machine
/obj/item/weapon/plastique
- name = "Plastic Explosives"
+ name = "plastic explosives"
desc = "Used to put holes in specific areas without too much extra hole."
+ gender = PLURAL
icon = 'assemblies.dmi'
icon_state = "plastic-explosive0"
item_state = "plasticx"
@@ -1503,6 +1516,7 @@
/obj/item/weapon/stock_parts
name = "stock part"
desc = "What?"
+ gender = PLURAL
icon = 'stock_parts.dmi'
w_class = 2.0
var/rating = 1
@@ -1513,14 +1527,14 @@
//Rank 1
/obj/item/weapon/stock_parts/console_screen
- name = "Console Screen"
+ name = "console screen"
desc = "Used in the construction of computers and other devices with a interactive console."
icon_state = "screen"
origin_tech = "materials=1"
g_amt = 200
/obj/item/weapon/stock_parts/capacitor
- name = "Capacitor"
+ name = "capacitor"
desc = "A basic capacitor used in the construction of a variety of devices."
icon_state = "capacitor"
origin_tech = "powerstorage=1"
@@ -1528,7 +1542,7 @@
g_amt = 50
/obj/item/weapon/stock_parts/scanning_module
- name = "Scanning Module"
+ name = "scanning module"
desc = "A compact, high resolution scanning module used in the construction of certain devices."
icon_state = "scan_module"
origin_tech = "magnets=1"
@@ -1536,14 +1550,14 @@
g_amt = 20
/obj/item/weapon/stock_parts/manipulator
- name = "Micro-Manipulator"
+ name = "micro-manipulator"
desc = "A tiny little manipulator used in the construction of certain devices."
icon_state = "micro_mani"
origin_tech = "materials=1;programming=1"
m_amt = 30
/obj/item/weapon/stock_parts/micro_laser
- name = "Micro-laser"
+ name = "micro-laser"
desc = "A tiny laser used in certain devices."
icon_state = "micro_laser"
origin_tech = "magnets=1"
@@ -1551,7 +1565,7 @@
g_amt = 20
/obj/item/weapon/stock_parts/matter_bin
- name = "Matter Bin"
+ name = "matter bin"
desc = "A container for hold compressed matter awaiting re-construction."
icon_state = "matter_bin"
origin_tech = "materials=1"
@@ -1560,7 +1574,7 @@
//Rank 2
/obj/item/weapon/stock_parts/capacitor/adv
- name = "Advanced Capacitor"
+ name = "advanced capacitor"
desc = "An advanced capacitor used in the construction of a variety of devices."
origin_tech = "powerstorage=3"
rating = 2
@@ -1568,7 +1582,7 @@
g_amt = 50
/obj/item/weapon/stock_parts/scanning_module/adv
- name = "Advanced Scanning Module"
+ name = "advanced scanning module"
desc = "A compact, high resolution scanning module used in the construction of certain devices."
icon_state = "scan_module"
origin_tech = "magnets=3"
@@ -1577,7 +1591,7 @@
g_amt = 20
/obj/item/weapon/stock_parts/manipulator/nano
- name = "Nano-Manipulator"
+ name = "nano-manipulator"
desc = "A tiny little manipulator used in the construction of certain devices."
icon_state = "micro_mani"
origin_tech = "materials=3,programming=2"
@@ -1585,7 +1599,7 @@
m_amt = 30
/obj/item/weapon/stock_parts/micro_laser/high
- name = "High-Power Micro-laser"
+ name = "high-power micro-laser"
desc = "A tiny laser used in certain devices."
icon_state = "micro_laser"
origin_tech = "magnets=3"
@@ -1594,7 +1608,7 @@
g_amt = 20
/obj/item/weapon/stock_parts/matter_bin/adv
- name = "Advanced Matter Bin"
+ name = "advanced matter bin"
desc = "A container for hold compressed matter awaiting re-construction."
icon_state = "matter_bin"
origin_tech = "materials=3"
@@ -1604,7 +1618,7 @@
//Rating 3
/obj/item/weapon/stock_parts/capacitor/super
- name = "Super Capacitor"
+ name = "super capacitor"
desc = "A super-high capacity capacitor used in the construction of a variety of devices."
origin_tech = "powerstorage=5;materials=4"
rating = 3
@@ -1612,7 +1626,7 @@
g_amt = 50
/obj/item/weapon/stock_parts/scanning_module/phasic
- name = "Phasic Scanning Module"
+ name = "phasic scanning module"
desc = "A compact, high resolution phasic scanning module used in the construction of certain devices."
origin_tech = "magnets=5"
rating = 3
@@ -1620,14 +1634,14 @@
g_amt = 20
/obj/item/weapon/stock_parts/manipulator/pico
- name = "Pico-Manipulator"
+ name = "pico-manipulator"
desc = "A tiny little manipulator used in the construction of certain devices."
origin_tech = "materials=5,programming=2"
rating = 3
m_amt = 30
/obj/item/weapon/stock_parts/micro_laser/ultra
- name = "Ultra-High-Power Micro-laser"
+ name = "ultra-high-power micro-laser"
desc = "A tiny laser used in certain devices."
origin_tech = "magnets=5"
rating = 3
@@ -1635,7 +1649,7 @@
g_amt = 20
/obj/item/weapon/stock_parts/matter_bin/super
- name = "Super Matter Bin"
+ name = "super matter bin"
desc = "A container for hold compressed matter awaiting re-construction."
origin_tech = "materials=5"
rating = 3
@@ -1644,7 +1658,7 @@
// Subspace stock parts
/obj/item/weapon/stock_parts/subspace/ansible
- name = "Subspace Ansible"
+ name = "subspace ansible"
icon_state = "subspace_ansible"
desc = "A compact module capable of sensing extradimensional activity."
origin_tech = "programming=3;magnets=5;materials=4;bluespace=2"
@@ -1652,7 +1666,7 @@
g_amt = 10
/obj/item/weapon/stock_parts/subspace/filter
- name = "Hyperwave Filter"
+ name = "hyperwave filter"
icon_state = "hyperwave_filter"
desc = "A tiny device capable of filtering and converting super-intense radiowaves."
origin_tech = "programming=4;magnets=2"
@@ -1660,7 +1674,7 @@
g_amt = 10
/obj/item/weapon/stock_parts/subspace/amplifier
- name = "Subspace Amplifier"
+ name = "subspace amplifier"
icon_state = "subspace_amplifier"
desc = "A compact micro-machine capable of amplifying weak subspace transmissions."
origin_tech = "programming=3;magnets=4;materials=4;bluespace=2"
@@ -1668,7 +1682,7 @@
g_amt = 10
/obj/item/weapon/stock_parts/subspace/treatment
- name = "Subspace Treatment Disk"
+ name = "subspace treatment disk"
icon_state = "treatment_disk"
desc = "A compact micro-machine capable of stretching out hyper-compressed radio waves."
origin_tech = "programming=3;magnets=2;materials=5;bluespace=2"
@@ -1676,7 +1690,7 @@
g_amt = 10
/obj/item/weapon/stock_parts/subspace/analyzer
- name = "Subspace Wavelength Analyzer"
+ name = "subspace wavelength analyzer"
icon_state = "wavelength_analyzer"
desc = "A sophisticated analyzer capable of analyzing cryptic subspace wavelengths."
origin_tech = "programming=3;magnets=4;materials=4;bluespace=2"
@@ -1684,22 +1698,22 @@
g_amt = 10
/obj/item/weapon/stock_parts/subspace/crystal
- name = "Ansible Crystal"
+ name = "ansible crystal"
icon_state = "ansible_crystal"
desc = "A crystal made from pure glass used to transmit laser databursts to subspace."
origin_tech = "magnets=4;materials=4;bluespace=2"
g_amt = 50
/obj/item/weapon/stock_parts/subspace/transmitter
- name = "Subspace Transmitter"
+ name = "subspace transmitter"
icon_state = "subspace_transmitter"
desc = "A large piece of equipment used to open a window into the subspace dimension."
origin_tech = "magnets=5;materials=5;bluespace=3"
m_amt = 50
-
/obj/item/weapon/ectoplasm
name = "ectoplasm"
desc = "spooky"
+ gender = PLURAL
icon = 'wizard.dmi'
- icon_state = "ectoplasm"
\ No newline at end of file
+ icon_state = "ectoplasm"
diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index 8721249bb52..758df9b4fd3 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -9,6 +9,7 @@
/area/New()
+ master = src //moved outside the spawn(1) to avoid runtimes in lighting.dm when it references src.loc.loc.master ~Carn
src.icon = 'alert.dmi'
uid = ++global_uid
spawn(1)
@@ -18,7 +19,6 @@
if(sd_created)
related += src
return
- master = src
related = list(src)
src.icon = 'alert.dmi'
diff --git a/code/game/machinery/hydroponics.dm b/code/game/machinery/hydroponics.dm
index 72aa484c04a..c499177bffd 100644
--- a/code/game/machinery/hydroponics.dm
+++ b/code/game/machinery/hydroponics.dm
@@ -623,11 +623,11 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
src.updateicon()
else
- user << "\red The tray already has a seed in it!"
+ user << "\red The tray already has seeds in it!"
else if (istype(O, /obj/item/device/analyzer/plant_analyzer))
if(src.planted && src.myseed)
- user << "*** [src.myseed.name] ***"
+ user << "*** [src.myseed.plantname] ***" //Carn: now reports the plants growing, not the seeds.
user << "-Plant Age: \blue [src.age]"
user << "-Plant Endurance: \blue [src.myseed.endurance]"
user << "-Plant Lifespan: \blue [src.myseed.lifespan]"
diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm
index ea083d7db30..52543d70bc1 100644
--- a/code/game/machinery/newscaster.dm
+++ b/code/game/machinery/newscaster.dm
@@ -624,7 +624,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //list that will contain r
if (src.isbroken)
playsound(src.loc, 'hit_on_shattered_glass.ogg', 100, 1)
for (var/mob/O in hearers(5, src.loc))
- O.show_message("[user.name] furtherly abuses the shattered [src.name]." )
+ O.show_message("[user.name] further abuses the shattered [src.name].")
else
if(istype(I, /obj/item/weapon) )
var/obj/item/weapon/W = I
@@ -831,7 +831,7 @@ obj/item/weapon/newspaper/attackby(obj/item/weapon/W as obj, mob/user as mob)
var/turf/T = get_turf(src)
if(channel)
for(var/mob/O in hearers(world.view-1, T))
- O.show_message("[src.name] beeps, \"Breaking news from [channel]!\"",2)
+ O.show_message("[src.name] beeps, \"Breaking news from [channel]!\"",2)
src.alert = 1
src.update_icon()
spawn(600)
@@ -839,5 +839,5 @@ obj/item/weapon/newspaper/attackby(obj/item/weapon/W as obj, mob/user as mob)
src.update_icon()
else
for(var/mob/O in hearers(world.view-1, T))
- O.show_message("[src.name] beeps, \"Wanted notice posted!\"",2)
- playsound(src.loc, 'twobeep.ogg', 75, 1)
\ No newline at end of file
+ O.show_message("[src.name] beeps, \"Wanted notice posted!\"",2)
+ playsound(src.loc, 'twobeep.ogg', 75, 1)
diff --git a/code/game/objects/closets/extinguisher.dm b/code/game/objects/closets/extinguisher.dm
index dd54bc41157..797b54583a6 100644
--- a/code/game/objects/closets/extinguisher.dm
+++ b/code/game/objects/closets/extinguisher.dm
@@ -1,6 +1,6 @@
/obj/structure/closet/extinguisher
- name = "Extinguisher closet"
+ name = "extinguisher closet"
desc = "A small wall mounted cabinet designed to hold a fire extinguisher."
icon_state = "extinguisher10"
icon_opened = "extinguisher11"
diff --git a/code/game/objects/devices/paicard.dm b/code/game/objects/devices/paicard.dm
index 0acb5bc2b52..6d74d416465 100644
--- a/code/game/objects/devices/paicard.dm
+++ b/code/game/objects/devices/paicard.dm
@@ -10,7 +10,6 @@
var/looking_for_personality = 0
var/mob/living/silicon/pai/pai
-
attack_self(mob/user)
if (!in_range(src, user))
return
diff --git a/code/game/objects/radio/headset.dm b/code/game/objects/radio/headset.dm
index 34fb8cb1e67..74e93a6bbaa 100644
--- a/code/game/objects/radio/headset.dm
+++ b/code/game/objects/radio/headset.dm
@@ -1,5 +1,5 @@
/obj/item/device/radio/headset
- name = "Radio Headset"
+ name = "radio headset"
desc = "An updated, modular intercom that fits over the head. Takes encryption keys"
icon_state = "headset"
item_state = "headset"
@@ -36,112 +36,112 @@
recalculateChannels()
/obj/item/device/radio/headset/headset_sec
- name = "Security Radio Headset"
+ name = "security radio headset"
desc = "This is used by your elite security force. To access the security channel, use :s."
icon_state = "sec_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/encryptionkey/headset_sec
/obj/item/device/radio/headset/headset_eng
- name = "Engineering Radio Headset"
+ name = "engineering radio headset"
desc = "When the engineers wish to chat like girls. To access the engineering channel, use :e. "
icon_state = "eng_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/encryptionkey/headset_eng
/obj/item/device/radio/headset/headset_rob
- name = "Robotics Radio Headset"
+ name = "robotics radio headset"
desc = "Made specifically for the roboticists who cannot decide between departments. To access the engineering channel, use :e. For research, use :n."
icon_state = "rob_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/encryptionkey/headset_rob
/obj/item/device/radio/headset/headset_med
- name = "Medical Radio Headset"
+ name = "medical radio headset"
desc = "A headset for the trained staff of the medbay. To access the medical channel, use :m."
icon_state = "med_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/encryptionkey/headset_med
/obj/item/device/radio/headset/headset_sci
- name = "Science Radio Headset"
+ name = "science radio headset"
desc = "A sciency headset. Like usual. To access the science channel, use :n."
icon_state = "com_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/encryptionkey/headset_sci
/obj/item/device/radio/headset/headset_medsci
- name = "Medical Research Radio Headset"
+ name = "medical research radio headset"
desc = "A headset that is a result of the mating between medical and science. To access the medical channel, use :m. For science, use :n."
icon_state = "med_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/encryptionkey/headset_medsci
/obj/item/device/radio/headset/headset_com
- name = "Command Radio Headset"
+ name = "command radio headset"
desc = "A headset with a commanding channel. To access the command channel, use :c."
icon_state = "com_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/encryptionkey/headset_com
/obj/item/device/radio/headset/heads/captain
- name = "Captain's Headset"
+ name = "captain's headset"
desc = "The headset of the boss. Channels are as follows: :c - command, :s - security, :e - engineering, :d - mining, :q - cargo, :m - medical, :n - science."
icon_state = "com_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/encryptionkey/heads/captain
/obj/item/device/radio/headset/heads/rd
- name = "Research Director's Headset"
+ name = "Research Director's headset"
desc = "Headset of the researching God. To access the science channel, use :n. For command, use :c."
icon_state = "com_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/encryptionkey/heads/rd
/obj/item/device/radio/headset/heads/hos
- name = "Head of Security's Headset"
+ name = "head of security's headset"
desc = "The headset of the man who protects your worthless lifes. To access the security channel, use :s. For command, use :c."
icon_state = "com_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/encryptionkey/heads/hos
/obj/item/device/radio/headset/heads/ce
- name = "Chief Engineer's Headset"
+ name = "chief engineer's headset"
desc = "The headset of the guy who is in charge of morons. To access the engineering channel, use :e. For command, use :c."
icon_state = "com_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/encryptionkey/heads/ce
/obj/item/device/radio/headset/heads/cmo
- name = "Chief Medical Officer's Headset"
+ name = "chief medical officer's headset"
desc = "The headset of the highly trained medical chief. To access the medical channel, use :m. For command, use :c."
icon_state = "com_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/encryptionkey/heads/cmo
/obj/item/device/radio/headset/heads/hop
- name = "Head of Personnel's Headset"
+ name = "head of personnel's headset"
desc = "The headset of the guy who will one day be captain. Channels are as follows: :c - command, :s - security, :q - cargo, :d - mining."
icon_state = "com_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/encryptionkey/heads/hop
/obj/item/device/radio/headset/headset_mine
- name = "Mining Radio Headset"
+ name = "mining radio headset"
desc = "Headset used by miners. How useless. To access the mining channel, use :d."
icon_state = "mine_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/encryptionkey/headset_mine
/obj/item/device/radio/headset/heads/qm
- name = "Quartermaster's Headset"
+ name = "quartermaster's headset"
desc = "The headset of the man who control your toiletpaper supply. To access the cargo channel, use :q. For mining, use :d."
icon_state = "cargo_headset"
item_state = "headset"
keyslot2 = new /obj/item/device/encryptionkey/heads/qm
/obj/item/device/radio/headset/headset_cargo
- name = "Cargo Radio Headset"
+ name = "cargo radio headset"
desc = "Headset used by the QM's slaves. To access the cargo channel, use :q."
icon_state = "cargo_headset"
item_state = "headset"
@@ -240,7 +240,7 @@
if(!radio_controller)
sleep(30) // Waiting for the radio_controller to be created.
if(!radio_controller)
- src.name = "Broken Radio Headset"
+ src.name = "broken radio headset"
return
secure_radio_connections[ch_name] = radio_controller.add_object(src, radiochannels[ch_name], RADIO_CHAT)
diff --git a/code/game/objects/radio/intercom.dm b/code/game/objects/radio/intercom.dm
index 1c53965ae71..704b16bfe48 100644
--- a/code/game/objects/radio/intercom.dm
+++ b/code/game/objects/radio/intercom.dm
@@ -1,5 +1,5 @@
/obj/item/device/radio/intercom
- name = "Station Intercom (Radio)"
+ name = "station intercom"
desc = "Talk through this."
icon_state = "intercom"
anchored = 1
diff --git a/code/game/objects/stacks/stack.dm b/code/game/objects/stacks/stack.dm
index d8f618232a0..7eb1063c89d 100644
--- a/code/game/objects/stacks/stack.dm
+++ b/code/game/objects/stacks/stack.dm
@@ -20,7 +20,7 @@
/obj/item/stack/examine()
set src in view(1)
..()
- usr << text("There are [] []\s left on the stack.", src.amount, src.singular_name)
+ usr << "There are [src.amount] [src.singular_name]\s in the stack."
return
/obj/item/stack/proc/use(var/amount)
diff --git a/code/game/objects/storage/belt.dm b/code/game/objects/storage/belt.dm
index 38279438c17..92912c3b2a6 100644
--- a/code/game/objects/storage/belt.dm
+++ b/code/game/objects/storage/belt.dm
@@ -49,7 +49,7 @@
/obj/item/weapon/storage/belt/utility
- name = "utility belt"
+ name = "tool-belt" //Carn: utility belt is nicer, but it bamboozles the text parsing.
desc = "Can hold various tools."
icon_state = "utilitybelt"
item_state = "utility"
diff --git a/code/game/objects/storage/lockbox.dm b/code/game/objects/storage/lockbox.dm
index a5f64ab0e6c..d8de98e2913 100644
--- a/code/game/objects/storage/lockbox.dm
+++ b/code/game/objects/storage/lockbox.dm
@@ -1,5 +1,5 @@
/obj/item/weapon/storage/lockbox
- name = "Lockbox"
+ name = "lockbox"
desc = "A locked box."
icon_state = "lockbox+l"
item_state = "syringe_kit"
@@ -78,7 +78,7 @@
/obj/item/weapon/storage/lockbox/clusterbang
- name = "Lockbox (Clusterbang)"
+ name = "lockbox (clusterbang)"
desc = "You have a bad feeling about opening this."
req_access = list(access_security)
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 0967ba74d82..b1d890edd4c 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -1,19 +1,5 @@
/mob/living/carbon/human/examine()
- set src in view()
-
- usr << "\blue *---------*"
-
- usr << "\blue This is \icon[src.icon] [src.name]!"
-
- // crappy hack because you can't do \his[src] etc
- var/t_his = "its"
- var/t_him = "it"
- if (src.gender == MALE)
- t_his = "his"
- t_him = "him"
- else if (src.gender == FEMALE)
- t_his = "her"
- t_him = "her"
+ set src in oview()
var/skipgloves = 0
var/skipsuitstorage = 0
@@ -23,6 +9,7 @@
var/skipears = 0
var/skipeyes = 0
+ //exosuits and helmets obscure our view and stuff.
if (src.wear_suit)
skipgloves = src.wear_suit.flags_inv & HIDEGLOVES
skipsuitstorage = src.wear_suit.flags_inv & HIDESUITSTORAGE
@@ -34,79 +21,128 @@
skipeyes = src.head.flags_inv & HIDEEYES
skipears = src.head.flags_inv & HIDEEARS
+ // crappy hacks because you can't do \his[src] etc. I'm sorry this proc is so unreadable, blame the text macros :<
+ var/t_He = "It" //capitalised for use at the start of each line.
+ var/t_his = "its"
+ var/t_him = "it"
+ var/t_has = "has"
+ var/t_is = "is"
+
+ var/msg = "*---------*\nThis is "
+
+ if( skipjumpsuit && (wear_mask || skipmask) ) //big suits/masks make it hard to tell their gender
+ t_He = "They"
+ t_his = "their"
+ t_him = "them"
+ t_has = "have"
+ t_is = "are"
+ else
+ msg += "\icon[src.icon] "
+ switch(src.gender)
+ if(MALE)
+ t_He = "He"
+ t_his = "his"
+ t_him = "him"
+ if(FEMALE)
+ t_He = "She"
+ t_his = "her"
+ t_him = "her"
+
+ msg += "\a [src]!\n"
+
+ //uniform
if (src.w_uniform && !skipjumpsuit)
if (src.w_uniform.blood_DNA.len)
- usr << "\red [src.name] is wearing a[src.w_uniform.blood_DNA.len ? " bloody " : " "] \icon[src.w_uniform] [src.w_uniform.name]!"
+ msg += "[t_He] [t_is] wearing \icon[src.w_uniform.icon] [src.w_uniform.gender==PLURAL?"some":"a"] blood-stained [src.w_uniform.name]!\n"
else
- usr << "\blue [src.name] is wearing a \icon[src.w_uniform] [src.w_uniform.name]."
-
- if (src.wear_suit)
- if (src.wear_suit.blood_DNA.len)
- usr << "\red [src.name] has a[src.wear_suit.blood_DNA.len ? " bloody " : " "] \icon[src.wear_suit] [src.wear_suit.name] on!"
- else
- usr << "\blue [src.name] has a \icon[src.wear_suit] [src.wear_suit.name] on."
+ msg += "[t_He] [t_is] wearing \icon[src.w_uniform] \a [src.w_uniform].\n"
+ //head
if (src.head)
if (src.head.blood_DNA.len)
- usr << "\red [src.name] has a[src.head.blood_DNA.len ? " bloody " : " "] \icon[src.head] [src.head.name] on his head!"
+ msg += "[t_He] [t_is] wearing \icon[src.head.icon] [src.head.gender==PLURAL?"some":"a"] blood-stained [src.head.name] on [t_his] head!\n"
else
- usr << "\blue [src.name] has a \icon[src.head] [src.head.name] on."
+ msg += "[t_He] [t_is] wearing \icon[src.head] \a [src.head] on [t_his] head.\n"
- if (src.handcuffed)
- usr << "\blue [src.name] is \icon[src.handcuffed] handcuffed!"
-
- if (src.ears && !skipears)
- usr << "\blue [src.name] has a \icon[src.ears] [src.ears.name] by [t_his] mouth."
-
- if (src.wear_mask && !skipmask)
- if (src.wear_mask.blood_DNA.len)
- usr << "\red [src.name] has a[src.wear_mask.blood_DNA.len ? " bloody " : " "] \icon[src.wear_mask] [src.wear_mask.name] on [t_his] face!"
+ //suit/armour
+ if (src.wear_suit)
+ if (src.wear_suit.blood_DNA.len)
+ msg += "[t_He] [t_is] wearing \icon[src.wear_suit.icon] [src.wear_suit.gender==PLURAL?"some":"a"] blood-stained [src.wear_suit.name]!\n"
else
- usr << "\blue [src.name] has a \icon[src.wear_mask] [src.wear_mask.name] on [t_his] face."
+ msg += "[t_He] [t_is] wearing \icon[src.wear_suit] \a [src.wear_suit].\n"
- if (src.l_hand)
- if (src.l_hand.blood_DNA.len)
- usr << "\red [src.name] has a[src.l_hand.blood_DNA.len ? " bloody " : " "] \icon[src.l_hand] [src.l_hand.name] in [t_his] left hand!"
- else
- usr << "\blue [src.name] has a \icon[src.l_hand] [src.l_hand.name] in [t_his] left hand."
-
- if (src.r_hand)
- if (src.r_hand.blood_DNA.len)
- usr << "\red [src.name] has a[src.r_hand.blood_DNA.len ? " bloody " : " "] \icon[src.r_hand] [src.r_hand.name] in [t_his] right hand!"
- else
- usr << "\blue [src.name] has a \icon[src.r_hand] [src.r_hand.name] in [t_his] right hand."
-
- if (src.belt)
- if (src.belt.blood_DNA.len)
- usr << "\red [src.name] has a[src.belt.blood_DNA.len ? " bloody " : " "] \icon[src.belt] [src.belt.name] on [t_his] belt!"
- else
- usr << "\blue [src.name] has a \icon[src.belt] [src.belt.name] on [t_his] belt."
+ //suit/armour storage
if(src.s_store && !skipsuitstorage)
if(src.s_store.blood_DNA.len)
- usr << "\red [src.name] has a[src.s_store.blood_DNA.len ? " bloody " : " "] \icon[src.s_store] [src.s_store.name] on [t_his][src.wear_suit.blood_DNA.len ? " bloody " : " "] \icon[src.wear_suit] [src.wear_suit.name]!"
+ msg += "[t_He] [t_is] carrying \icon[src.s_store.icon] [src.s_store.gender==PLURAL?"some":"a"] blood-stained [src.s_store.name] on [t_his] [src.wear_suit.name]!\n"
else
- usr << "\blue [src.name] has a \icon[src.s_store] [src.s_store.name] on [t_his][src.wear_suit.blood_DNA.len ? " bloody " : " "] \icon[src.wear_suit] [src.wear_suit.name]."
+ msg += "[t_He] [t_is] carrying \icon[src.s_store] \a [src.s_store] on [t_his] [src.wear_suit.name].\n"
- if (src.shoes && !skipshoes)
- usr << "[src.shoes.blood_DNA.len ? "\red" : "\blue"] [src.name] is wearing[src.shoes.blood_DNA.len ? " bloody " : " "] \icon[src.shoes] [src.shoes.name] on [t_his] feet."
+ //back
+ if (src.back)
+ msg += "[t_He] [t_has] \icon[src.back] \a [src.back] on [t_his] back.\n"
+ //left hand
+ if (src.l_hand)
+ if (src.l_hand.blood_DNA.len)
+ msg += "[t_He] [t_is] holding \icon[src.l_hand.icon] [src.l_hand.gender==PLURAL?"some":"a"] blood-stained [src.l_hand.name] in [t_his] left hand!\n"
+ else
+ msg += "[t_He] [t_is] holding \icon[src.l_hand] \a [src.l_hand] in [t_his] left hand.\n"
+
+ //right hand
+ if (src.r_hand)
+ if (src.r_hand.blood_DNA.len)
+ msg += "[t_He] [t_is] holding \icon[src.r_hand] [src.r_hand.gender==PLURAL?"some":"a"] blood-stained [src.r_hand.name] in [t_his] right hand!\n"
+ else
+ msg += "[t_He] [t_is] holding \icon[src.r_hand] \a [src.r_hand] in [t_his] right hand.\n"
+
+ //gloves
if (src.gloves && !skipgloves)
if (src.gloves.blood_DNA.len)
- usr << "\red [src.name] has bloody \icon[src.gloves] [src.gloves.name] on [t_his] hands!"
+ msg += "[t_He] [t_has] \icon[src.gloves.icon] [src.gloves.gender==PLURAL?"some":"a"] blood-stained [src.gloves.name] on [t_his] hands!\n"
else
- usr << "\blue [src.name] has \icon[src.gloves] [src.gloves.name] on [t_his] hands."
+ msg += "[t_He] [t_has] \icon[src.gloves] \a [src.gloves] on [t_his] hands.\n"
else if (src.blood_DNA.len)
- usr << "\red [src.name] has[src.blood_DNA.len ? " bloody " : " "] hands!"
+ msg += "[t_He] [t_has] blood-stained hands!\n"
- if (src.glasses && !skipeyes)
- if (src.glasses.blood_DNA.len)
- usr << "\red [src.name] has bloody \icon[src.glasses] [src.glasses.name] on [t_his] eyes!"
+ //handcuffed?
+ if (src.handcuffed)
+ msg += "[t_He] [t_is] \icon[src.handcuffed] handcuffed!\n"
+
+ //belt
+ if (src.belt)
+ if (src.belt.blood_DNA.len)
+ msg += "[t_He] [t_has] \icon[src.belt.icon] [src.belt.gender==PLURAL?"some":"a"] blood-stained [src.belt.name] about [t_his] waist!\n"
else
- usr << "\blue [src.name] has \icon[src.glasses] [src.glasses.name] on [t_his] eyes."
+ msg += "[t_He] [t_has] \icon[src.belt] \a [src.belt] about [t_his] waist.\n"
- if (src.back)
- usr << "\blue [src.name] has a \icon[src.back] [src.back.name] on [t_his] back."
+ //shoes
+ if (src.shoes && !skipshoes)
+ if(src.shoes.blood_DNA.len)
+ msg += "[t_He] [t_is] wearing \icon[src.shoes.icon] [src.shoes.gender==PLURAL?"some":"a"] blood-stained [src.shoes.name] on [t_his] feet!\n"
+ else
+ msg += "[t_He] [t_is] wearing \icon[src.shoes] \a [src.shoes] on [t_his] feet.\n"
+ //mask
+ if (src.wear_mask && !skipmask)
+ if (src.wear_mask.blood_DNA.len)
+ msg += "[t_He] [t_has] \icon[src.wear_mask.icon] [src.wear_mask.gender==PLURAL?"some":"a"] blood-stained [src.wear_mask.name] on [t_his] face!\n"
+ else
+ msg += "[t_He] [t_has] \icon[src.wear_mask] \a [src.wear_mask] on [t_his] face.\n"
+
+ //eyes
+ if (!skipeyes)
+ if(src.glasses)
+ if (src.glasses.blood_DNA.len)
+ msg += "[t_He] [t_has] \icon[src.glasses] [src.gloves.gender==PLURAL?"some":"a"] blood-stained [src.glasses] covering [t_his] eyes!\n"
+ else
+ msg += "[t_He] [t_has] \icon[src.glasses] \a [src.glasses] covering [t_his] eyes.\n"
+
+ //ears
+ if (src.ears && !skipears)
+ msg += "[t_He] [t_has] \icon[src.ears] \a [src.ears] on [t_his] ears.\n"
+
+ //ID
if (src.wear_id)
var/id
if(istype(src:wear_id, /obj/item/device/pda))
@@ -115,61 +151,67 @@
else
id = src.wear_id.registered
if (id != src.real_name && in_range(src, usr) && prob(10))
- usr << "\red [src.name] is wearing \icon[src.wear_id] [src.wear_id.name] yet doesn't seem to be that person!!!"
+ msg += "[t_He] [t_is] wearing \icon[src.wear_id] \a [src.wear_id] yet something doesn't seem right...\n"
else
- usr << "\blue [src.name] is wearing \icon[src.wear_id] [src.wear_id.name]."
-
+ msg += "[t_He] [t_is] wearing \icon[src.wear_id] \a [src.wear_id].\n"
+ //Jitters
if (src.is_jittery)
switch(src.jitteriness)
if(300 to INFINITY)
- usr << "\red [src] is violently convulsing."
+ msg += "[t_He] [t_is] convulsing violently!\n"
if(200 to 300)
- usr << "\red [src] looks extremely jittery."
+ msg += "[t_He] [t_is] extremely jittery.\n"
if(100 to 200)
- usr << "\red [src] is twitching ever so slightly."
+ msg += "[t_He] [t_is] twitching ever so slightly.\n"
- if (src.suiciding)
- switch(src.suiciding)
- if(1)
- usr << "\red [src.name] appears to have bitten [t_his] tongue off!"
+ if (src.suiciding == 1)
+ msg += "[t_He] [t_has] bitten off [t_his] own tongue and suffered major bloodloss!\n"
- if (src.stat == 2 || (changeling && changeling.changeling_fakedeath == 1))
- usr << "\red [src] is limp and unresponsive, a dull lifeless look in [t_his] eyes."
+ if (src.stat == DEAD || (changeling && changeling.changeling_fakedeath == 1))
+ msg += "[t_He] [t_is] limp and unresponsive"
+ //Carn: yes I'm a pedant, you aren't seeing their lifeless eyes unless you can see their eyes in the first place.
+ if(!skipeyes)
+ msg += ", with a dull lifeless look in [t_his] eyes...\n"
+ else
+ msg += "...\n"
else
+ msg += ""
if (src.getBruteLoss())
if (src.getBruteLoss() < 30)
- usr << "\red [src.name] looks slightly injured!"
+ msg += "[t_He] [t_has] minor bruising.\n"
else
- usr << "\red [src.name] looks severely injured!"
-
- if (src.getCloneLoss())
- if (src.getCloneLoss() < 30)
- usr << "\red [src.name] looks slightly... unfinished?"
- else
- usr << "\red [src.name] looks very... unfinished?"
+ msg += "[t_He] [t_has] severe bruising!\n"
if (src.getFireLoss())
if (src.getFireLoss() < 30)
- usr << "\red [src.name] looks slightly burned!"
+ msg += "[t_He] [t_has] minor burns.\n"
else
- usr << "\red [src.name] looks severely burned!"
+ msg += "[t_He] [t_has] severe burns!\n"
+
+ if (src.getCloneLoss())
+ if (src.getCloneLoss() < 30)
+ msg += "[t_He] [t_has] minor genetic deformities.\n"
+ else
+ msg += "[t_He] [t_has] severe genetic deformities.\n"
if (src.nutrition < 100)
- usr << "\red [src.name] looks like flesh and bones."
+ msg += "[t_He] [t_is] severely malnourished.\n"
else if (src.nutrition >= 500)
if (usr.nutrition < 100)
- usr << "\red [src.name] looks very round and delicious. Like a little piggy. A tasty piggy."
+ msg += "[t_He] [t_is] plump and delicious looking - Like a fat little piggy. A tasty piggy.\n"
else
- usr << "\blue [src.name] looks quite chubby."
+ msg += "[t_He] [t_is] quite chubby.\n"
- if (src.stat == 1)
- usr << "\red [src.name] doesn't seem to be responding to anything around [t_him], [t_his] eyes closed as though asleep."
+ if (src.stat == UNCONSCIOUS)
+ msg += "[t_He] [t_is]n't responding to anything around [t_him]; [t_his] eyes are closed as though asleep.\n"
else if (src.getBrainLoss() >= 60)
- usr << "\red [src.name] has a stupid expression on [t_his] face."
+ msg += "[t_He] [t_has] a stupid expression on [t_his] face.\n"
+ msg += ""
+
if (!src.client)
- usr << "\red [src.name] doesn't seem as though they want to talk."
+ msg += "[t_He] [t_has] a vacant, braindead stare...\n"
+ msg += "*---------*"
- usr << "\blue *---------*"
-
+ usr << msg
diff --git a/code/modules/mob/living/carbon/metroid/examine.dm b/code/modules/mob/living/carbon/metroid/examine.dm
index 063caa27dd7..22122001de8 100644
--- a/code/modules/mob/living/carbon/metroid/examine.dm
+++ b/code/modules/mob/living/carbon/metroid/examine.dm
@@ -1,29 +1,32 @@
/mob/living/carbon/metroid/examine()
set src in oview()
- usr << "\blue *---------*"
- usr << text("\blue This is \icon[] []!", src, src.name)
- if (src.stat == 2)
- usr << text("\red [] is limp and unresponsive.", src.name)
+ var/msg = "*---------*\nThis is \icon[src] \a [src]!\n"
+ if (src.stat == DEAD)
+ msg += "It is limp and unresponsive.\n"
else
if (src.getBruteLoss())
+ msg += ""
if (src.getBruteLoss() < 40)
- usr << text("\red [] has some punctures in its flesh!", src.name)
+ msg += "It has some punctures in its flesh!"
else
- usr << text("\red [] has a lot of punctures and tears in its flesh!", src.name)
+ msg += "It has severe punctures and tears in its flesh!"
+ msg += "\n"
switch(powerlevel)
if(2 to 3)
- usr << text("\blue [] seems to have little bit of electrical activity inside it.", src.name)
+ msg += "It is flickering gently with a little electrical activity.\n"
if(4 to 5)
- usr << text("\blue [] seems to some electricity inside of it.", src.name)
+ msg += "It is glowing gently with moderate levels of electrical activity.\n"
if(6 to 9)
- usr << text("\blue [] seems to have a lot of electricity inside of it.", src.name)
+ msg += "It is glowing brightly with high levels of electrical activity.\n"
if(10)
- usr << text("\blue [] seems to have extreme electrical activity inside it!", src.name)
+ msg += "It is radiating with massive levels of electrical activity!\n"
+ msg += "*---------*"
+ usr << msg
return
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/monkey/examine.dm b/code/modules/mob/living/carbon/monkey/examine.dm
index 012680351a3..544a400e34b 100644
--- a/code/modules/mob/living/carbon/monkey/examine.dm
+++ b/code/modules/mob/living/carbon/monkey/examine.dm
@@ -1,31 +1,37 @@
/mob/living/carbon/monkey/examine()
set src in oview()
- usr << "\blue *---------*"
- usr << text("\blue This is \icon[] []!", src, src.name)
+ var/msg = "*---------*\nThis is \icon[src] \a [src]!\n"
+
if (src.handcuffed)
- usr << text("\blue [] is handcuffed! \icon[]", src.name, src.handcuffed)
+ msg += "It is \icon[src.handcuffed] handcuffed!\n"
if (src.wear_mask)
- usr << text("\blue [] has a \icon[] [] on \his[] head!", src.name, src.wear_mask, src.wear_mask.name, src)
+ msg += "It has \icon[src.wear_mask] \a [src.wear_mask] on its head.\n"
if (src.l_hand)
- usr << text("\blue [] has a \icon[] [] in \his[] left hand!", src.name, src.l_hand, src.l_hand.name, src)
+ msg += "It has \icon[src.l_hand] \a [src.l_hand] in its left hand.\n"
if (src.r_hand)
- usr << text("\blue [] has a \icon[] [] in \his[] right hand!", src.name, src.r_hand, src.r_hand.name, src)
+ msg += "It has \icon[src.r_hand] \a [src.r_hand] in its right hand.\n"
if (src.back)
- usr << text("\blue [] has a \icon[] [] on \his[] back!", src.name, src.back, src.back.name, src)
- if (src.stat == 2)
- usr << text("\red [] is limp and unresponsive, a dull lifeless look in their eyes.", src.name)
+ msg += "It has \icon[src.back] \a [src.back] on its back.\n"
+ if (src.stat == DEAD)
+ msg += "It is limp and unresponsive, with no signs of life.\n"
else
+ msg += ""
if (src.getBruteLoss())
if (src.getBruteLoss() < 30)
- usr << text("\red [] looks slightly bruised!", src.name)
+ msg += "It has minor bruising.\n"
else
- usr << text("\red [] looks severely bruised!", src.name)
+ msg += "It has severe bruising!\n"
if (src.getFireLoss())
if (src.getFireLoss() < 30)
- usr << text("\red [] looks slightly burnt!", src.name)
+ msg += "It has minor burns.\n"
else
- usr << text("\red [] looks severely burnt!", src.name)
- if (src.stat == 1)
- usr << text("\red [] doesn't seem to be responding to anything around them, their eyes closed as though asleep.", src.name)
+ msg += "It has severe burns!\n"
+ if (src.stat == UNCONSCIOUS)
+ msg += "It isn't responding to anything around it; it seems to be asleep.\n"
+ msg += ""
+
+ msg += "*---------*"
+
+ usr << msg
return
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/ai/examine.dm b/code/modules/mob/living/silicon/ai/examine.dm
index fdcf15dec61..ac856907658 100644
--- a/code/modules/mob/living/silicon/ai/examine.dm
+++ b/code/modules/mob/living/silicon/ai/examine.dm
@@ -1,21 +1,26 @@
/mob/living/silicon/ai/examine()
set src in oview()
- usr << "\blue *---------*"
- usr << text("\blue This is \icon[] []!", src, src.name)
- if (src.stat == 2)
- usr << text("\red [] is powered-down.", src.name)
+ var/msg = "*---------*\nThis is \icon[src] [src]!\n"
+ if (src.stat == DEAD)
+ msg += "It appears to be powered-down.\n"
else
+ msg += ""
if (src.getBruteLoss())
if (src.getBruteLoss() < 30)
- usr << text("\red [] looks slightly dented", src.name)
+ msg += "It looks slightly dented.\n"
else
- usr << text("\red [] looks severely dented!", src.name)
- if (src.getFireLoss())
- if (src.getFireLoss() < 30)
- usr << text("\red [] looks slightly burnt!", src.name)
- else
- usr << text("\red [] looks severely burnt!", src.name)
- if (src.stat == 1)
- usr << text("\red [] doesn't seem to be responding.", src.name)
+ msg += "It looks severely dented!\n"
+ if (src.getFireLoss())
+ if (src.getFireLoss() < 30)
+ msg += "It looks slightly charred.\n"
+ else
+ msg += "Its casing is melted and heat-warped!\n"
+
+ if (src.stat == UNCONSCIOUS)
+ msg += "It is non-responsive and displaying the text: \"RUNTIME: Sensory Overload, stack 26/3\".\n"
+ msg += ""
+ msg += "*---------*"
+
+ usr << msg
return
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/pai/examine.dm b/code/modules/mob/living/silicon/pai/examine.dm
index 621448c3579..26010d63535 100644
--- a/code/modules/mob/living/silicon/pai/examine.dm
+++ b/code/modules/mob/living/silicon/pai/examine.dm
@@ -1,21 +1,27 @@
-/mob/living/silicon/pai/examine()
+/mob/living/silicon/pai/examine() //removed as it was pointless...moved to the pai-card instead.
+ /* This is totaly pointless because this mob is contained inside a card!
set src in oview()
- usr << "\blue *---------*"
- usr << text("\blue This is \icon[] []!", src, src.name)
- if (src.stat == 2)
- usr << text("\red [] appears disabled.", src.name)
+ var/msg = "*---------*\nThis is \icon[src] \a [src]!\n"
+ if (src.stat == DEAD)
+ msg += "It appears to be offline.\n"
else
+ msg += ""
if (src.getBruteLoss())
if (src.getBruteLoss() < 30)
- usr << text("\red [] looks slightly dented", src.name)
+ msg += "It looks slightly dented.\n"
else
- usr << text("\red []'s casing appears cracked and broken!", src.name)
- if (src.getFireLoss())
- if (src.getFireLoss() < 30)
- usr << text("\red [] looks slightly charred!", src.name)
- else
- usr << text("\red []'s casing is melted and heat-warped!", src.name)
- if (src.stat == 1)
- usr << text("\red [] doesn't seem to be responding.", src.name)
+ msg += "Its casing appears cracked and broken!\n"
+ if (src.getFireLoss())
+ if (src.getFireLoss() < 30)
+ msg += "It looks slightly charred!\n"
+ else
+ msg += "Its casing is melted and heat-warped!\n"
+ if (src.stat == UNCONSCIOUS)
+ msg += "It doesn't seem to be responding and its text-output is lagging.\n"
+ msg += ""
+ msg += "*---------*"
+
+ usr << msg
+ */
return
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/robot/examine.dm b/code/modules/mob/living/silicon/robot/examine.dm
index c6d04d7f1d8..4123cdf3512 100644
--- a/code/modules/mob/living/silicon/robot/examine.dm
+++ b/code/modules/mob/living/silicon/robot/examine.dm
@@ -1,24 +1,30 @@
/mob/living/silicon/robot/examine()
set src in oview()
-
- usr << "\blue *---------*"
- usr << text("\blue This is \icon[src] [src.name]!")
- if (src.stat == 2)
- usr << text("\red [src.name] is powered-down.")
+ var/msg = "*---------*\nThis is \icon[src] \a [src]!\n"
+ msg += ""
if (src.getBruteLoss())
if (src.getBruteLoss() < 75)
- usr << text("\red [src.name] looks slightly dented")
+ msg += "It looks slightly dented.\n"
else
- usr << text("\red [src.name] looks severely dented!")
+ msg += "It looks severely dented!\n"
if (src.getFireLoss())
if (src.getFireLoss() < 75)
- usr << text("\red [src.name] looks slightly burnt!")
+ msg += "It looks slightly charred.\n"
else
- usr << text("\red [src.name] looks severely burnt!")
- if (src.stat == 1)
- usr << text("\red [src.name] doesn't seem to be responding.")
+ msg += "It looks severely burnt and heat-warped!\n"
+ msg += ""
+
if(opened)
- usr << "The cover is open and the power cell is [ cell ? "installed" : "missing"]."
+ msg += "Its cover is open and the power cell is [cell ? "installed" : "missing"].\n"
else
- usr << "The cover is closed."
- return
\ No newline at end of file
+ msg += "Its cover is closed.\n"
+
+ switch(src.stat)
+ if(CONSCIOUS)
+ if(!src.client) msg += "It appears to be in stand-by mode.\n" //afk
+ if(UNCONSCIOUS) msg += "It doesn't seem to be responding.\n"
+ if(DEAD) msg += "It appears to be powered-down.\n"
+ msg += "*---------*"
+
+ usr << msg
+ return
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index a0209ededd8..9190fc145dc 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -67,6 +67,7 @@
return
switch(mod)
if("Standard")
+ updatename()
module = new /obj/item/weapon/robot_module/standard(src)
hands.icon_state = "standard"
icon_state = "robot"
@@ -74,6 +75,7 @@
feedback_inc("cyborg_standard",1)
if("Service")
+ updatename(mod)
module = new /obj/item/weapon/robot_module/butler(src)
hands.icon_state = "service"
var/icontype = input("Select an icon!", "Robot", null, null) in list("Waitress", "Bro", "Butler", "Kent", "Rich")
@@ -91,6 +93,7 @@
feedback_inc("cyborg_service",1)
if("Miner")
+ updatename(mod)
module = new /obj/item/weapon/robot_module/miner(src)
hands.icon_state = "miner"
icon_state = "Miner"
@@ -98,6 +101,7 @@
feedback_inc("cyborg_miner",1)
if("Medical")
+ updatename(mod)
module = new /obj/item/weapon/robot_module/medical(src)
hands.icon_state = "medical"
icon_state = "surgeon"
@@ -106,6 +110,7 @@
feedback_inc("cyborg_medical",1)
if("Security")
+ updatename(mod)
module = new /obj/item/weapon/robot_module/security(src)
hands.icon_state = "security"
icon_state = "bloodhound"
@@ -113,6 +118,7 @@
feedback_inc("cyborg_security",1)
if("Engineering")
+ updatename(mod)
module = new /obj/item/weapon/robot_module/engineering(src)
hands.icon_state = "engineer"
icon_state = "landmate"
@@ -120,6 +126,7 @@
feedback_inc("cyborg_engineering",1)
if("Janitor")
+ updatename(mod)
module = new /obj/item/weapon/robot_module/janitor(src)
hands.icon_state = "janitor"
icon_state = "mopgearrex"
@@ -129,6 +136,15 @@
overlays -= "eyes" //Takes off the eyes that it started with
updateicon()
+/mob/living/silicon/robot/proc/updatename(var/prefix as text)
+ if( length(real_name) < 7 || !prefix ) return
+ //not really necessary but just to avoid annoying people with
+ //unique names seeming as nobody could give me a straight answer as
+ //to whether to remove custom borg names completely.
+ if(copytext(real_name, 1, 7) == "Cyborg")
+ real_name = "[prefix] [real_name]"
+ name = real_name
+
/mob/living/silicon/robot/verb/cmd_robot_alerts()
set category = "Robot Commands"
set name = "Show Alerts"
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index c98e9121d60..9de286d2254 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -705,7 +705,7 @@
if (!( usr ))
return
- usr << "This is \an [name]."
+ usr << "That's \a [src]." //changed to "That's" from "This is" because "This is some metal sheets" sounds dumb compared to "That's some metal sheets" ~Carn
usr << desc
// *****RM
//usr << "[name]: Dn:[density] dir:[dir] cont:[contents] icon:[icon] is:[icon_state] loc:[loc]"
diff --git a/code/modules/mob/new_player/preferences.dm b/code/modules/mob/new_player/preferences.dm
index 598e2088670..71382028f64 100644
--- a/code/modules/mob/new_player/preferences.dm
+++ b/code/modules/mob/new_player/preferences.dm
@@ -361,12 +361,23 @@ datum/preferences
switch(link_tags["real_name"])
if("input")
new_name = input(user, "Please select a name:", "Character Generation") as text
- var/list/bad_characters = list("_", "'", "\"", "<", ">", ";", "[", "]", "{", "}", "|", "\\")
+ var/list/bad_characters = list("_", "\"", "<", ">", ";", "\[", "\]", "{", "}", "|", "\\","0","1","2","3","4","5","6","7","8","9")
for(var/c in bad_characters)
new_name = dd_replacetext(new_name, c, "")
if(!new_name || (new_name == "Unknown") || (new_name == "floor") || (new_name == "wall") || (new_name == "r-wall"))
- alert("Don't do this")
+ alert("Invalid name. Don't do that!")
return
+ if(length(new_name) >= 26)
+ alert("That name is too long.")
+ return
+
+ //Carn: To fix BYOND text-parsing errors caused by people using dumb capitalisation in their names.
+ var/tempname
+ for(var/N in dd_text2list(new_name, " "))
+ if(N && tempname) //if both aren't null strings
+ tempname += " "
+ tempname += capitalize(lowertext(N))
+ new_name = tempname
if("random")
randomize_name()
diff --git a/code/modules/mob/simple_animal/constructs.dm b/code/modules/mob/simple_animal/constructs.dm
index 4b430edbc27..c47ef5a311c 100644
--- a/code/modules/mob/simple_animal/constructs.dm
+++ b/code/modules/mob/simple_animal/constructs.dm
@@ -101,13 +101,13 @@
/mob/living/simple_animal/constructarmoured/attack_animal(mob/living/simple_animal/M as mob)
if(istype(M, /mob/living/simple_animal/constructbuilder))
health += 10
- M.emote("mends some of [src]'s wounds")
+ M.emote("mends some of \the [src]'s wounds")
else
- if(M.melee_damage_upper == 0)
- M.emote("[M.friendly] [src]")
+ if(M.melee_damage_upper <= 0)
+ M.emote("[M.friendly] \the [src]")
else
for(var/mob/O in viewers(src, null))
- O.show_message("\red [M] [M.attacktext] [src]!", 1)
+ O.show_message("\The [M] [M.attacktext] \the [src]!", 1)
var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
health -= damage
@@ -117,17 +117,19 @@
/mob/living/simple_animal/constructarmoured/examine()
set src in oview()
- usr << "\blue *---------*"
- usr << text("\blue This is \icon[src] [src.name]!")
- if (src.health != src.maxHealth)
- if (src.health >= 150)
- usr << text("\red [src.name] looks slightly dented")
+ var/msg = "*---------*\nThis is \icon[src] \a [src]!\n"
+ if (src.health < src.maxHealth)
+ msg += ""
+ if (src.health >= src.maxHealth/2)
+ msg += "It looks slightly dented.\n"
else
- usr << text("\red [src.name] looks severely dented!")
+ msg += "It looks severely dented!\n"
+ msg += ""
+ msg += "*---------*"
+
+ usr << msg
return
-
-
////////////////////////Wraith/////////////////////////////////////////////
@@ -223,13 +225,13 @@
/mob/living/simple_animal/constructwraith/attack_animal(mob/living/simple_animal/M as mob)
if(istype(M, /mob/living/simple_animal/constructbuilder))
health += 10
- M.emote("mends some of [src]'s wounds")
+ M.emote("mends some of \the [src]'s wounds")
else
- if(M.melee_damage_upper == 0)
- M.emote("[M.friendly] [src]")
+ if(M.melee_damage_upper <= 0)
+ M.emote("[M.friendly] \the [src]")
else
for(var/mob/O in viewers(src, null))
- O.show_message("\red [M] [M.attacktext] [src]!", 1)
+ O.show_message("\The [M] [M.attacktext] \the [src]!", 1)
var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
health -= damage
@@ -238,13 +240,17 @@
/mob/living/simple_animal/constructwraith/examine()
set src in oview()
- usr << "\blue *---------*"
- usr << text("\blue This is \icon[src] [src.name]!")
- if (src.health != src.maxHealth)
- if (src.health >= 35)
- usr << text("\red [src.name] looks slightly dented")
+ var/msg = "*---------*\nThis is \icon[src] \a [src]!\n"
+ if (src.health < src.maxHealth)
+ msg += ""
+ if (src.health >= src.maxHealth/2)
+ msg += "It looks slightly dented.\n"
else
- usr << text("\red [src.name] looks severely dented!")
+ msg += "It looks severely dented!\n"
+ msg += ""
+ msg += "*---------*"
+
+ usr << msg
return
@@ -296,24 +302,28 @@
/mob/living/simple_animal/constructbuilder/attack_animal(mob/living/simple_animal/M as mob)
if(istype(M, /mob/living/simple_animal/constructbuilder))
health += 5
- M.emote("mends some of [src]'s wounds")
+ M.emote("mends some of \the [src]'s wounds")
else
- if(M.melee_damage_upper == 0)
- M.emote("[M.friendly] [src]")
+ if(M.melee_damage_upper <= 0)
+ M.emote("[M.friendly] \the [src]")
else
for(var/mob/O in viewers(src, null))
- O.show_message("\red [M] [M.attacktext] [src]!", 1)
+ O.show_message("\The [M] [M.attacktext] \the [src]!", 1)
var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
health -= damage
/mob/living/simple_animal/constructbuilder/examine()
set src in oview()
- usr << "\blue *---------*"
- usr << text("\blue This is \icon[src] [src.name]!")
- if (src.health != src.maxHealth)
- if (src.health >= 75)
- usr << text("\red [src.name] looks slightly dented")
+ var/msg = "*---------*\nThis is \icon[src] \a [src]!\n"
+ if (src.health < src.maxHealth)
+ msg += ""
+ if (src.health >= src.maxHealth/2)
+ msg += "It looks slightly dented.\n"
else
- usr << text("\red [src.name] looks severely dented!")
+ msg += "It looks severely dented!\n"
+ msg += ""
+ msg += "*---------*"
+
+ usr << msg
return
\ No newline at end of file
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index b5521f61816..5d4ceaa7d2a 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -153,7 +153,6 @@
/obj/machinery/light/attackby(obj/item/W, mob/user)
-
// attempt to insert light
if(istype(W, /obj/item/weapon/light))
if(status != LIGHT_EMPTY)
@@ -347,14 +346,12 @@
// use_power(luminosity * LIGHTING_POWER_FACTOR, LIGHT)
// called when area power state changes
-
/obj/machinery/light/power_change()
- spawn(0) //rand(0,15)
+ spawn(10)
var/area/A = src.loc.loc
A = A.master
seton(A.lightswitch && A.power_light)
-
// called when on fire
/obj/machinery/light/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index 8c18f86fb17..032a375fd93 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -88,6 +88,7 @@
// attack with item, place item on conveyor
/obj/machinery/conveyor/attackby(var/obj/item/I, mob/user)
+ if(isrobot(user)) return //Carn: fix for borgs dropping their modules on conveyor belts
user.drop_item()
if(I && I.loc) I.loc = src.loc
return
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index 94d6b476dc6..83f012be838 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -44,6 +44,9 @@
if(stat & BROKEN || !I || !user)
return
+ if(isrobot(user))
+ return
+
if(istype(I, /obj/item/weapon/melee/energy/blade))
user << "You can't place that item inside the disposal unit."
return
@@ -73,9 +76,6 @@
del(G)
return
- if(isrobot(user))
- return
-
if(!I) return
user.drop_item()
diff --git a/code/stylesheet.dm b/code/stylesheet.dm
index f973a4d2dee..5b0502cc924 100644
--- a/code/stylesheet.dm
+++ b/code/stylesheet.dm
@@ -1,120 +1,69 @@
client/script = {""}
diff --git a/html/changelog.html b/html/changelog.html
index b3918318f58..92ca47aa2e2 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -92,16 +92,27 @@ should be listed in the changelog upon commit tho. Thanks. -->
-
01/03/2012
+
02 March 2012
+
Carn updated:
+
+ - Fixed a number of issues with mob examining. Including: not being able to see burns unless they were bruised; vast amounts of grammar; and icons. Updated them to use stylesheet classes.
+ - Borgs can no-longer drop their module items on conveyor belts.
+ - Names input into the setup screen are now lower-cased and then have their first letters capitalised. This is to fix problems with BYOND's text-parsing system.
+ - Runtime fix for lighting.
+ - Over the next few commits I will be updating a tonne of item names to fix text-parsing. Please inform me if I've typoed anything.
+
+
+
01 March 2012
SkyMarshal updated:
- Tweak/Bugfix for Hallucinations. Much more robust.
-
01/03/2012
+
01 March 2012
SkyMarshal updated:
- Ported BS12 Detective Work System