From 599f8174da6e46e98ebda4ddb726a8a70ee75723 Mon Sep 17 00:00:00 2001 From: crazyclonetheninja Date: Mon, 4 Jul 2011 01:51:53 +0000 Subject: [PATCH] A couple additions from Firecode: *Tons more items now have descriptions. *Jackboots now 20% less stupid. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1758 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/obj.dm | 56 +++++++++++++++----- code/defines/obj/assemblies.dm | 1 + code/defines/obj/closet.dm | 20 +++++++- code/defines/obj/clothing/ears.dm | 1 + code/defines/obj/clothing/gimmick.dm | 4 ++ code/defines/obj/clothing/glasses.dm | 7 +++ code/defines/obj/clothing/gloves.dm | 1 + code/defines/obj/clothing/head.dm | 10 ++++ code/defines/obj/clothing/jumpsuit.dm | 2 +- code/defines/obj/clothing/mask.dm | 4 ++ code/defines/obj/clothing/suit.dm | 5 ++ code/defines/obj/computer.dm | 23 +++++++++ code/defines/obj/decal.dm | 17 +++--- code/defines/obj/door.dm | 6 +++ code/defines/obj/hydro.dm | 30 +++++++++-- code/defines/obj/injector.dm | 27 ++++++++++ code/defines/obj/machinery.dm | 27 +++++++++- code/defines/obj/radio.dm | 22 ++++++++ code/defines/obj/storage.dm | 28 ++++++++++ code/defines/obj/weapon.dm | 71 ++++++++++++++++++++++++++ code/defines/turf.dm | 2 + icons/mob/feet.dmi | Bin 3652 -> 3632 bytes 22 files changed, 336 insertions(+), 28 deletions(-) diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 10d037a869f..6af2c8159e0 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -88,7 +88,7 @@ /obj/bedsheetbin name = "linen bin" - desc = "A bin for containing bedsheets." + desc = "A bin for containing bedsheets. It looks rather cosy." icon = 'items.dmi' icon_state = "bedbin" var/amount = 23.0 @@ -126,7 +126,7 @@ var/mob/living/carbon/monkey/target = null /obj/grille - desc = "A piece of metal with evenly spaced gridlike holes in it. Blocks large object but lets small items, gas, or energy beams through." + desc = "A piece of metal with evenly spaced gridlike holes in it. Blocks large object but lets small items, gas, or energy beams through. Strangely enough these grilles also lets meteors pass through them, whether they be small or huge station breaking death stones." name = "grille" icon = 'structures.dmi' icon_state = "grille" @@ -139,7 +139,7 @@ layer = 2.9 /obj/securearea - desc = "A warning sign which reads 'SECURE AREA'" + desc = "A warning sign which reads 'SECURE AREA'. This obviously applies to a nun-Clown." name = "SECURE AREA" icon = 'decals.dmi' icon_state = "securearea" @@ -248,7 +248,7 @@ del(src)*/ /obj/sign/maltesefalcon1 //The sign is 64x32, so it needs two tiles. ;3 - desc = "The Maltese Falcon, Space Bar and Grill" + desc = "The Maltese Falcon, Space Bar and Grill. Now with added monkey." name = "The Maltese Falcon" icon = 'decals.dmi' icon_state = "maltesefalcon1" @@ -257,7 +257,7 @@ density = 0 /obj/sign/maltesefalcon2 - desc = "The Maltese Falcon, Space Bar and Grill" + desc = "The Maltese Falcon, Space Bar and Grill. Now with added monkey." name = "The Maltese Falcon" icon = 'decals.dmi' icon_state = "maltesefalcon2" @@ -314,7 +314,7 @@ /obj/item/device/detective_scanner name = "Scanner" - desc = "Used to scan objects for DNA and fingerprints" + desc = "Used to scan objects for DNA and fingerprints." icon_state = "forensic0" var/amount = 20.0 var/printing = 0.0 @@ -325,6 +325,7 @@ /obj/item/device/flash name = "flash" + desc = "Used for blinding and being an asshole." icon_state = "flash" var/l_time = 1.0 var/shots = 5.0 @@ -353,7 +354,7 @@ /obj/item/device/flashlight/pen name = "penlight" - desc = "A pen-sized light." + desc = "A pen-sized light. It shines as well as a flashlight." icon_state = "plight0" flags = FPRINT | TABLEPASS | CONDUCT item_state = "" @@ -390,7 +391,7 @@ /obj/item/device/igniter name = "igniter" - desc = "A small electronic device able to ignite combustable substances." + desc = "A small electronic device able to ignite combustable substances. Does not function well as a lighter." icon_state = "igniter" var/status = 1.0 flags = FPRINT | TABLEPASS| CONDUCT @@ -438,6 +439,7 @@ /obj/item/device/multitool name = "multitool" + desc = "Used for pulsing wires to test which to cut. Not recommended by doctors." icon_state = "multitool" flags = FPRINT | TABLEPASS| CONDUCT force = 5.0 @@ -453,6 +455,7 @@ /obj/item/device/prox_sensor name = "Proximity Sensor" + desc = "Used for scanning and alerting when someone enters a certain proximity." icon_state = "motion0" var/state = 0.0 var/timing = 0.0 @@ -466,6 +469,7 @@ /obj/item/device/shield name = "shield" + desc = "This is an item which is specially crafted to shield you. It is much like a visible version of the outdated cloaking device." icon_state = "shield0" var/active = 0.0 flags = FPRINT | TABLEPASS| CONDUCT @@ -477,6 +481,7 @@ /obj/item/device/timer name = "timer" + desc = "Used to time things. Works well with contraptions which has to count down. Tick tock." icon_state = "timer0" item_state = "electronic" var/timing = 0.0 @@ -510,6 +515,7 @@ /obj/laser name = "laser" + desc = "IT BURNS!!!" icon = 'projectiles.dmi' var/damage = 0.0 var/range = 10.0 @@ -600,6 +606,7 @@ /obj/m_tray name = "morgue tray" + desc = "Apply corpse before closing." icon = 'stationobjs.dmi' icon_state = "morguet" density = 1 @@ -609,6 +616,7 @@ /obj/c_tray name = "crematorium tray" + desc = "Apply body before burning." icon = 'stationobjs.dmi' icon_state = "cremat" density = 1 @@ -625,7 +633,7 @@ anchored =1 var/netnum = 0 name = "power cable" - desc = "A flexible superconducting cable for heavy-duty power transfer." + desc = "A flexible superconducting cable for heavy-duty power transfer. Comes in clown colors now." icon = 'power_cond_red.dmi' icon_state = "0-1" var/d1 = 0 @@ -653,6 +661,7 @@ /obj/morgue name = "morgue" + desc = "Used to keep bodies in untill someone fetches them." icon = 'stationobjs.dmi' icon_state = "morgue1" density = 1 @@ -661,7 +670,7 @@ /obj/crematorium name = "crematorium" - desc = "A human incinerator." + desc = "A human incinerator. Works well on barbeque nights." icon = 'stationobjs.dmi' icon_state = "crema1" density = 1 @@ -723,6 +732,7 @@ /obj/portal name = "portal" + desc = "Looks unstable. Best to test it with the clown." icon = 'stationobjs.dmi' icon_state = "portal" density = 1 @@ -734,10 +744,12 @@ /obj/projection name = "Projection" + desc = "This looks like a projection of something." anchored = 1.0 /obj/rack name = "rack" + desc = "Different from the Middle Ages version." icon = 'objects.dmi' icon_state = "rack" density = 1 @@ -784,6 +796,7 @@ /obj/stool name = "stool" + desc = "Apply butt." icon = 'objects.dmi' icon_state = "stool" flags = FPRINT @@ -791,12 +804,14 @@ /obj/stool/bed name = "bed" + desc = "This is used to lie in, sleep in or strap on." icon_state = "bed" anchored = 1.0 var/list/buckled_mobs = list( ) /obj/stool/chair name = "chair" + desc = "You sit in this. Either by will or force." icon_state = "chair" var/status = 0.0 anchored = 1.0 @@ -804,6 +819,7 @@ /obj/stool/chair/e_chair name = "electrified chair" + desc = "Looks absolutely SHOCKING!" icon_state = "e_chair0" var/atom/movable/overlay/overl = null var/on = 0.0 @@ -812,6 +828,7 @@ /obj/table name = "table" + desc = "A square piece of metal standing on four metal legs. It can not move." icon = 'structures.dmi' icon_state = "table" density = 1 @@ -948,11 +965,13 @@ /obj/table/reinforced name = "reinforced table" + desc = "A version of the four legged table. It is stronger." icon_state = "reinf_table" var/status = 2 /obj/table/woodentable name = "wooden table" + desc = "Do not apply fire to this. Rumour says it burns easily." icon_state = "wood_table" /obj/mopbucket @@ -981,7 +1000,7 @@ name = "Display Case" icon = 'stationobjs.dmi' icon_state = "glassbox1" - desc = "A display case for prized possessions." + desc = "A display case for prized possessions. It taunts you to kick it." density = 1 anchored = 1 unacidable = 1//Dissolving the case would also delete the gun. @@ -1001,6 +1020,7 @@ //BEGIN BRAINS===================================================== /obj/item/brain name = "brain" + desc = "A piece of juicy meat found in a persons head." icon = 'surgery.dmi' icon_state = "brain2" flags = TABLEPASS @@ -1058,6 +1078,7 @@ // TODO: robust mixology system! (and merge with beakers, maybe) /obj/item/weapon/glass name = "empty glass" + desc = "Emptysville." icon = 'kitchen.dmi' icon_state = "glass_empty" item_state = "beaker" @@ -1115,6 +1136,7 @@ /obj/falsewall name = "wall" + desc = "A huge chunk of metal used to seperate rooms." icon = 'walls.dmi' icon_state = "" density = 1 @@ -1123,6 +1145,7 @@ /obj/falserwall name = "r wall" + desc = "A huge chunk of reinforced metal used to seperate rooms." icon = 'walls.dmi' icon_state = "r_wall" density = 1 @@ -1136,6 +1159,7 @@ /obj/item/stack/rods name = "metal rods" + desc = "Some rods. Can be used for building, or something." singular_name = "metal rod" icon_state = "rods" flags = FPRINT | TABLEPASS| CONDUCT @@ -1159,6 +1183,7 @@ /obj/item/stack/sheet/wood name = "Wood Planks" + desc = "One can only guess that this is a bunch of wood." singular_name = "wood plank" icon_state = "sheet-wood" force = 5.0 @@ -1169,6 +1194,7 @@ /obj/item/stack/sheet/sandstone name = "Sandstone Bricks" + desc = "This appears to be a combination of both sand and stone." singular_name = "sandstone brick" icon_state = "sheet-sandstone" force = 5.0 @@ -1179,6 +1205,7 @@ /obj/item/stack/sheet/glass name = "glass" + desc = "HOLY HELL! That is a lot of glass." singular_name = "glass sheet" icon_state = "sheet-glass" force = 5.0 @@ -1190,6 +1217,7 @@ /obj/item/stack/sheet/rglass name = "reinforced glass" + desc = "Glass which seems to have rods or something stuck in them." singular_name = "reinforced glass sheet" icon_state = "sheet-rglass" force = 6.0 @@ -1202,8 +1230,8 @@ /obj/item/stack/sheet/metal name = "metal" + desc = "Sheets made out off metal. It has been dubbed Metal Sheets." singular_name = "metal sheet" - desc = "A heavy sheet of metal." icon_state = "sheet-metal" force = 5.0 m_amt = 3750 @@ -1258,7 +1286,7 @@ /obj/item/stack/light_w name = "Wired glass tile" singular_name = "Wired glass tile" - desc = "" + desc = "A glass tile, which is wired, somehow." icon_state = "glass_wire" w_class = 3.0 force = 3.0 @@ -1294,7 +1322,7 @@ /obj/item/stack/tile/light name = "Light floor tile" singular_name = "Light floor tile" - desc = "" + desc = "A floor tile, made out off glass. It produces light." icon_state = "tile_e" w_class = 3.0 force = 3.0 diff --git a/code/defines/obj/assemblies.dm b/code/defines/obj/assemblies.dm index 52fcee23789..9e1f3ab0e16 100644 --- a/code/defines/obj/assemblies.dm +++ b/code/defines/obj/assemblies.dm @@ -114,6 +114,7 @@ /obj/item/assembly/shock_kit name = "Shock Kit" + desc = "This appears to be made from both an Electric Pack and a Helmet." icon_state = "shock_kit" var/obj/item/clothing/head/helmet/part1 = null var/obj/item/device/radio/electropack/part2 = null diff --git a/code/defines/obj/closet.dm b/code/defines/obj/closet.dm index aeacd945797..52b5c7d1379 100644 --- a/code/defines/obj/closet.dm +++ b/code/defines/obj/closet.dm @@ -329,7 +329,7 @@ icon_closed = "extinguisher10" opened = 1 var/localopened = 1 - desc = "Sure was nice of CentCom to install these everywhere." + desc = "Sure was nice of CentCom to install these everywhere. Foam in them would have been nicer." anchored = 1 open() @@ -470,79 +470,94 @@ /obj/closet/wardrobe/black name = "Black Wardrobe" + desc = "This contains clothes which appears to be black." icon_state = "black" icon_closed = "black" /obj/closet/wardrobe/chaplain_black name = "Chaplain Wardrobe" + desc = "Closet of chaplain clothes. Looks meh." icon_state = "black" icon_closed = "black" /obj/closet/wardrobe/green name = "Green Wardrobe" + desc = "Green is the new green." icon_state = "green" icon_closed = "green" /obj/closet/wardrobe/mixed name = "Mixed Wardrobe" + desc = "This appears to contain two different sets of clothing." icon_state = "mixed" icon_closed = "mixed" /obj/closet/wardrobe/orange name = "Prisoners Wardrobe" + desc = "Prisoners now wear orange. The Security Officers kept thinking the Mime was an escapee." icon_state = "orange" icon_closed = "orange" /obj/closet/wardrobe/pink name = "Pink Wardrobe" + desc = "Closet of of soft clothing." icon_state = "pink" icon_closed = "pink" /obj/closet/wardrobe/red name = "Red Wardrobe" + desc = "This closer appears to contain clothing which are red." icon_state = "red" icon_closed = "red" /obj/closet/wardrobe/forensics_red name = "Forensics Wardrobe" + desc = "Used by your local Forensics." icon_state = "red" icon_closed = "red" /obj/closet/wardrobe/white name = "White Wardrobe" + desc = "Basic plain white clothing. Boring..." icon_state = "white" icon_closed = "white" /obj/closet/wardrobe/toxins_white name = "Toxins Wardrobe" + desc = "Clothes for toxins." icon_state = "white" icon_closed = "white" /obj/closet/wardrobe/genetics_white name = "Genetics Wardrobe" + desc = "Clothes for genetics. They will need this when they are human." icon_state = "white" icon_closed = "white" /obj/closet/wardrobe/yellow name = "Yellow Wardrobe" + desc = "Basic yellow clothing." icon_state = "wardrobe-y" icon_closed = "wardrobe-y" /obj/closet/wardrobe/engineering_yellow name = "Engineering Wardrobe" + desc = "The yellow Engineers loves." icon_state = "yellow" icon_closed = "yellow" /obj/closet/wardrobe/atmospherics_yellow name = "Atmospherics Wardrobe" + desc = "Clothing for the most dangerous job." icon_state = "yellow" icon_closed = "yellow" /obj/closet/wardrobe/grey name = "Grey Wardrobe" + desc = "This contains the clothing of the Grey Shirts." icon_state = "grey" icon_closed = "grey" @@ -594,6 +609,7 @@ /obj/secure_closet/medical1 name = "Medicine Closet" + desc = "Filled with medical junk." icon_state = "medical1" icon_closed = "medical" icon_locked = "medical1" @@ -604,6 +620,7 @@ /obj/secure_closet/chemical name = "Chemical Closet" + desc = "Store dangerous chemicals in here. This closet is full of cobwebs." icon_state = "medical1" icon_closed = "medical" icon_locked = "medical1" @@ -614,6 +631,7 @@ /obj/secure_closet/medical2 name = "Anesthetic" + desc = "Used to knock people out, but who uses this trash?" icon_state = "medical1" icon_closed = "medical" icon_locked = "medical1" diff --git a/code/defines/obj/clothing/ears.dm b/code/defines/obj/clothing/ears.dm index 1c2b00ec466..4044bc82e1f 100644 --- a/code/defines/obj/clothing/ears.dm +++ b/code/defines/obj/clothing/ears.dm @@ -7,6 +7,7 @@ /obj/item/clothing/ears/earmuffs name = "earmuffs" + desc = "Blocks out sound and is very cosy." icon_state = "earmuffs" protective_temperature = 500 item_state = "earmuffs" \ No newline at end of file diff --git a/code/defines/obj/clothing/gimmick.dm b/code/defines/obj/clothing/gimmick.dm index f72e7e8fec5..d571018dbdb 100644 --- a/code/defines/obj/clothing/gimmick.dm +++ b/code/defines/obj/clothing/gimmick.dm @@ -26,6 +26,7 @@ /obj/item/clothing/head/helmet/space/santahat name = "Santa's hat" + desc = "Ho ho ho. Merrry X-mas!" icon_state = "santahat" /obj/item/clothing/suit/space/santa @@ -38,6 +39,7 @@ /obj/item/clothing/shoes/red name = "red shoes" + desc = "Stylish red shoes." icon_state = "red" /obj/item/clothing/mask/owl_mask @@ -65,10 +67,12 @@ /obj/item/clothing/shoes/cyborg name = "cyborg boots" + desc = "Shoes for a cyborg costume" icon_state = "boots" /obj/item/clothing/suit/cyborg_suit name = "cyborg suit" + desc = "Suit for a cyborg costume." icon_state = "death" item_state = "death" flags = FPRINT | TABLEPASS | CONDUCT diff --git a/code/defines/obj/clothing/glasses.dm b/code/defines/obj/clothing/glasses.dm index b9765538c49..ef8745b30af 100644 --- a/code/defines/obj/clothing/glasses.dm +++ b/code/defines/obj/clothing/glasses.dm @@ -8,29 +8,34 @@ /obj/item/clothing/glasses/blindfold name = "blindfold" + desc = "Makes you like...blind." icon_state = "blindfold" item_state = "blindfold" /obj/item/clothing/glasses/meson name = "Optical Meson Scanner" + desc = "Used for seeing walls, floors, and stuff through anything." icon_state = "meson" item_state = "glasses" origin_tech = "magnets=2;engineering=2" /obj/item/clothing/glasses/night name = "Night Vision Goggles" + desc = "You can totally see in the dark now!." icon_state = "night" item_state = "glasses" origin_tech = "magnets=2" /obj/item/clothing/glasses/material name = "Optical Material Scanner" + desc = "Veru confusing glasses." icon_state = "material" item_state = "glasses" origin_tech = "magnets=3;engineering=3" /obj/item/clothing/glasses/regular name = "Prescription Glasses" + desc = "Made by Nerd. Co." icon_state = "glasses" item_state = "glasses" @@ -50,12 +55,14 @@ /obj/item/clothing/glasses/thermal name = "Optical Thermal Scanner" + desc = "Thermals in the shape of glasses." icon_state = "thermal" item_state = "glasses" origin_tech = "magnets=3" /obj/item/clothing/glasses/thermal/monocle name = "Thermoncle" + desc = "A monocle thermal." icon_state = "thermoncle" flags = null //doesn't protect eyes because it's a monocle, duh diff --git a/code/defines/obj/clothing/gloves.dm b/code/defines/obj/clothing/gloves.dm index 92a21b20de8..08a7058fa5d 100644 --- a/code/defines/obj/clothing/gloves.dm +++ b/code/defines/obj/clothing/gloves.dm @@ -37,6 +37,7 @@ /obj/item/clothing/gloves/latex name = "Latex Gloves" + desc = "Gloves of the Latex nature." icon_state = "latex" item_state = "lgloves" siemens_coefficient = 0.30 diff --git a/code/defines/obj/clothing/head.dm b/code/defines/obj/clothing/head.dm index b1d9283326c..c19e1711c14 100644 --- a/code/defines/obj/clothing/head.dm +++ b/code/defines/obj/clothing/head.dm @@ -17,6 +17,7 @@ /obj/item/clothing/head/bomb_hood name = "bomb hood" + desc = "Use in case of bomb." icon_state = "bombsuit" flags = FPRINT|TABLEPASS|HEADSPACE|HEADCOVERSEYES|HEADCOVERSMOUTH armor = list(melee = 20, bullet = 10, laser = 10, taser = 5, bomb = 100, bio = 0, rad = 0) @@ -123,6 +124,7 @@ /obj/item/clothing/head/plaguedoctorhat name = "Plague doctor's hat" + desc = "Once used by Plague doctors. Now useless." icon_state = "plaguedoctor" flags = FPRINT | TABLEPASS | HEADSPACE permeability_coefficient = 0.01 @@ -138,6 +140,7 @@ /obj/item/clothing/head/helmet name = "helmet" + desc = "Standard Security gear." icon_state = "helmet" flags = FPRINT|TABLEPASS|SUITSPACE|HEADCOVERSEYES item_state = "helmet" @@ -176,6 +179,7 @@ /obj/item/clothing/head/helmet/space/syndicate name = "red space helmet" + desc = "Top secret Spess Helmet." icon_state = "syndicate" item_state = "syndicate" desc = "Has a tag: Totally not property of an enemy corporation, honest." @@ -269,6 +273,7 @@ /obj/item/clothing/head/helmet/swat name = "swat helmet" + desc = "Used by highly trained Swat Members." icon_state = "swat" flags = FPRINT | TABLEPASS | SUITSPACE | HEADSPACE | HEADCOVERSEYES item_state = "swat" @@ -276,6 +281,7 @@ /obj/item/clothing/head/helmet/thunderdome name = "Thunderdome helmet" + desc = "Let the battle commence!" icon_state = "thunderdome" flags = FPRINT | TABLEPASS | SUITSPACE | HEADSPACE | HEADCOVERSEYES item_state = "thunderdome" @@ -283,6 +289,7 @@ /obj/item/clothing/head/helmet/hardhat name = "hard hat" + desc = "A hat which appears to be very hard." icon_state = "hardhat0" flags = FPRINT | TABLEPASS | SUITSPACE item_state = "hardhat0" @@ -306,6 +313,7 @@ /obj/item/clothing/head/helmet/HoS name = "HoS Hat" + desc = "The hat of the HoS. Very secure, for he always gets assassinated." icon_state = "hoscap" desc = "A hat that shows the security grunts who's in charge!" flags = FPRINT | TABLEPASS | SUITSPACE | HEADCOVERSEYES @@ -352,11 +360,13 @@ /obj/item/clothing/head/helmet/cap name = "Captain's cap" + desc = "For irresponsible Captains." icon_state = "capcap" flags = FPRINT|TABLEPASS|SUITSPACE armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 0, rad = 0) /obj/item/clothing/head/chaplain_hood name = "Chaplain's hood" + desc = "A hoodie for the chaplain!!!" icon_state = "chaplain_hood" flags = FPRINT|TABLEPASS|HEADSPACE|HEADCOVERSEYES diff --git a/code/defines/obj/clothing/jumpsuit.dm b/code/defines/obj/clothing/jumpsuit.dm index aeaa6f4b030..bdd1ebc13dc 100644 --- a/code/defines/obj/clothing/jumpsuit.dm +++ b/code/defines/obj/clothing/jumpsuit.dm @@ -26,7 +26,7 @@ icon_state = "black" item_state = "bl_suit" color = "black" - desc = null + desc = "Changes colors." origin_tech = "syndicate=3" var/list/clothing_choices = list() diff --git a/code/defines/obj/clothing/mask.dm b/code/defines/obj/clothing/mask.dm index 7dfe98aef05..4d6852fc279 100644 --- a/code/defines/obj/clothing/mask.dm +++ b/code/defines/obj/clothing/mask.dm @@ -32,6 +32,7 @@ /obj/item/clothing/mask/muzzle name = "muzzle" + desc = "To stop that awful noise." icon_state = "muzzle" item_state = "muzzle" flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH @@ -40,6 +41,7 @@ /obj/item/clothing/mask/surgical name = "Sterile Mask" + desc = "These masks are unable to mate." icon_state = "sterile" item_state = "sterile" w_class = 1 @@ -70,6 +72,7 @@ /obj/item/clothing/mask/gas/emergency name = "emergency gas mask" + desc = "Gas mask mooks for emergencies." icon_state = "gas_alt" item_state = "gas_alt" @@ -107,6 +110,7 @@ /obj/item/clothing/mask/cigarette name = "Cigarette" + desc = "Tasty" icon_state = "cigoff" var/lit = 0 var/icon_on = "cigon" //Note - these are in masks.dmi not in cigarette.dmi diff --git a/code/defines/obj/clothing/suit.dm b/code/defines/obj/clothing/suit.dm index ba20c2e694a..66363fe6774 100644 --- a/code/defines/obj/clothing/suit.dm +++ b/code/defines/obj/clothing/suit.dm @@ -145,6 +145,7 @@ /obj/item/clothing/suit/apron name = "apron" + desc = "A basic blue apron." icon_state = "apron" item_state = "apron" flags = FPRINT | TABLEPASS | ONESIZEFITSALL @@ -153,6 +154,7 @@ /obj/item/clothing/suit/chef name = "Chef's apron" + desc = "An Apron used by a high class chef. The chef unfortunately retired." icon_state = "chef" item_state = "chef" gas_transfer_coefficient = 0.90 @@ -291,11 +293,13 @@ /obj/item/clothing/suit/armor/tdome/red name = "Thunderdome suit (red)" + desc = "Reddish armor." icon_state = "tdred" item_state = "tdred" /obj/item/clothing/suit/armor/tdome/green name = "Thunderdome suit (green)" + desc = "Pukish armor." icon_state = "tdgreen" item_state = "tdgreen" @@ -555,6 +559,7 @@ /obj/item/clothing/suit/captunic name = "captain's parade tunic" + desc = "Used by irresponsible captains." icon_state = "captunic" item_state = "bio_suit" flags = FPRINT | TABLEPASS | ONESIZEFITSALL diff --git a/code/defines/obj/computer.dm b/code/defines/obj/computer.dm index ae35f28e6c6..fe73135cc22 100644 --- a/code/defines/obj/computer.dm +++ b/code/defines/obj/computer.dm @@ -28,6 +28,7 @@ /obj/machinery/computer/arcade name = "arcade machine" + desc = "Does not support Pin ball." icon = 'computer.dmi' icon_state = "arcade" var/enemy_name = "Space Villian" @@ -41,25 +42,30 @@ /obj/machinery/computer/aiupload name = "AI Upload" + desc = "It is said that you can upload silly laws to AI's with this." icon_state = "command" var/mob/living/silicon/ai/current = null var/opened = 0 /obj/machinery/computer/borgupload name = "Cyborg Upload" + desc = "Used for uploading responsible laws to Cyborg. Right..." icon_state = "command" var/mob/living/silicon/robot/current = null /obj/machinery/computer/atmosphere name = "atmos" + desc = "A computer for Atmospherics." /obj/machinery/computer/station_alert name = "Station Alert Computer" + desc = "Alert. Alert. ALERT!!!" icon_state = "alert:0" var/alarms = list("Fire"=list(), "Atmosphere"=list(), "Power"=list()) /obj/machinery/computer/atmos_alert name = "Atmospheric Alert Computer" + desc = "Used to detect where they messed up this time." icon_state = "alert:0" var/list/priority_alarms = list() var/list/minor_alarms = list() @@ -68,6 +74,7 @@ /obj/machinery/computer/atmosphere/siphonswitch name = "Area Air Control" + desc = "Nanotrasen provided this, barely." icon_state = "atmos" var/otherarea var/area/area @@ -77,6 +84,7 @@ /obj/machinery/computer/card name = "Identification Computer" + desc = "You can use this to change ID's. YOU ARE GOD!" icon_state = "id" var/obj/item/weapon/card/id/scan = null var/obj/item/weapon/card/id/modify = null @@ -88,10 +96,12 @@ //ID changing computer for CentCom. /obj/machinery/computer/card/centcom name = "CentCom Identification Computer" + desc = "You are the Gods's God." req_access = list(access_cent_captain) /obj/machinery/computer/communications name = "Communications Console" + desc = "This can be used for various important functions. Still under developement." icon_state = "comm" req_access = list(access_heads) var/prints_intercept = 1 @@ -132,6 +142,7 @@ /obj/machinery/computer/dna name = "DNA operations computer" + desc = "A Computer used to advanced DNA stuff." icon_state = "dna" var/obj/item/weapon/card/data/scan = null var/obj/item/weapon/card/data/modify = null @@ -141,6 +152,7 @@ /obj/machinery/computer/hologram_comp name = "Hologram Computer" + desc = "Rumoured to control holograms." icon = 'stationobjs.dmi' icon_state = "holo_console0" var/obj/machinery/hologram_proj/projector = null @@ -152,6 +164,7 @@ /obj/machinery/computer/med_data name = "Medical Records" + desc = "This can be used to check medical records." icon_state = "dna" req_access = list(access_medical) var/obj/item/weapon/card/id/scan = null @@ -166,10 +179,12 @@ /obj/machinery/computer/med_data/laptop name = "Medical Laptop" + desc = "Cheap Nanotrasen Laptop." icon_state = "medlaptop" /obj/machinery/computer/pod name = "Pod Launch Control" + desc = "A controll for launching pods. Some people prefer firing Mechas." icon_state = "computer_generic" var/id = 1.0 var/obj/machinery/mass_driver/connected = null @@ -190,6 +205,7 @@ /obj/machinery/computer/secure_data name = "Security Records" + desc = "Beepsky. ARREST!!!" icon_state = "security" req_access = list(access_security) var/obj/item/weapon/card/id/scan = null @@ -209,6 +225,7 @@ /obj/machinery/computer/security name = "Security Cameras" + desc = "Better than Television." icon_state = "cameras" var/obj/machinery/camera/current = null var/last_pic = 1.0 @@ -217,6 +234,7 @@ /obj/machinery/computer/security/telescreen name = "Telescreen" + desc = "Used for watching an empty arena." icon = 'stationobjs.dmi' icon_state = "telescreen" network = "thunder" @@ -224,27 +242,32 @@ /obj/machinery/computer/security/wooden_tv name = "Security Cameras" + desc = "Nanotrasen gave the detective this for Noir feeling." icon_state = "security_det" /obj/machinery/computer/security/mining name = "Outpost Status Display" + desc = "To view limited cameras on a tiny station." icon_state = "miningcameras" network = "mining" /obj/machinery/computer/shuttle name = "Shuttle" + desc = "For shuttle controll." icon_state = "shuttle" var/auth_need = 3.0 var/list/authorized = list( ) /obj/machinery/computer/teleporter name = "Teleporter" + desc = "Use this to set your destination...hopefully..." icon_state = "teleport" var/obj/item/locked = null var/id = null /obj/machinery/computer/teleporter/security name = "Teleporter" + desc = "Use this to set your destination...hopefully..." icon_state = "teleport" locked = null id = null \ No newline at end of file diff --git a/code/defines/obj/decal.dm b/code/defines/obj/decal.dm index df610beb740..90e9e3a3fb0 100644 --- a/code/defines/obj/decal.dm +++ b/code/defines/obj/decal.dm @@ -1,6 +1,6 @@ /obj/decal/ash name = "Ashes" - desc = "Ashes to ashes, dust to dust." + desc = "Ashes to ashes, dust to dust, and into space." icon = 'objects.dmi' icon_state = "ash" anchored = 1 @@ -28,6 +28,7 @@ /obj/decal/point name = "point" + desc = "It is an arrow hanging in mid-air. There may be a wizard about." icon = 'screen1.dmi' icon_state = "arrow" layer = 16.0 @@ -40,7 +41,7 @@ /obj/decal/cleanable/blood name = "Blood" - desc = "It's red." + desc = "It's red. Its Gooye. It is the chefs cooking perhaps." density = 0 anchored = 1 layer = 2 @@ -65,7 +66,7 @@ /obj/decal/cleanable/blood/gibs name = "gibs" - desc = "Grisly..." + desc = "Grisly...and not the good kind neither." density = 0 anchored = 0 layer = 2 @@ -92,7 +93,7 @@ /obj/decal/cleanable/xenoblood name = "xeno blood" - desc = "It's green." + desc = "It's green. Must be more of the chefs cooking." density = 0 anchored = 1 layer = 2 @@ -139,7 +140,7 @@ /obj/decal/cleanable/robot_debris name = "robot debris" - desc = "Useless heap of junk." + desc = "Useless heap of junk...or is it..." density = 0 anchored = 0 layer = 2 @@ -158,7 +159,7 @@ /obj/decal/cleanable/oil name = "motor oil" - desc = "It's black." + desc = "It's black. Beepsky made another mess." density = 0 anchored = 1 layer = 2 @@ -197,7 +198,7 @@ /obj/decal/cleanable/greenglow name = "green glow" - desc = "Eerie." + desc = "Eerie. This makes you feel creepy." density = 0 anchored = 1 layer = 2 @@ -215,7 +216,7 @@ /obj/decal/cleanable/molten_item name = "gooey grey mass" - desc = "huh." + desc = "Huh. Creepy..." density = 0 anchored = 1 layer = 3 diff --git a/code/defines/obj/door.dm b/code/defines/obj/door.dm index e85c6a14196..4e51e86be0b 100644 --- a/code/defines/obj/door.dm +++ b/code/defines/obj/door.dm @@ -1,5 +1,6 @@ /obj/machinery/door name = "Door" + desc = "It opens and closes." icon = 'doorint.dmi' icon_state = "door1" opacity = 1 @@ -16,6 +17,7 @@ /obj/machinery/door/firedoor name = "Firelock" + desc = "Apply crowbar" icon = 'Doorfire.dmi' icon_state = "door0" var/blocked = null @@ -25,11 +27,13 @@ /obj/machinery/door/firedoor/border_only name = "Firelock" + desc = "Apply crowbar." icon = 'door_fire2.dmi' icon_state = "door0" /obj/machinery/door/poddoor name = "Podlock" + desc = "Why it no open!!!" icon = 'rapid_pdoor.dmi' icon_state = "pdoor1" var/id = 1.0 @@ -136,6 +140,7 @@ /obj/machinery/door/window name = "interior door" + desc = "A door made from a window, yet it can not break nor be depowered." icon = 'windoor.dmi' icon_state = "left" var/base_state = "left" @@ -145,6 +150,7 @@ /obj/machinery/door/window/brigdoor name = "Brig Door" + desc = "A stronger door made from window, even though it can not break." icon = 'windoor.dmi' icon_state = "leftsecure" base_state = "leftsecure" diff --git a/code/defines/obj/hydro.dm b/code/defines/obj/hydro.dm index 571b2bff374..c75d419c361 100644 --- a/code/defines/obj/hydro.dm +++ b/code/defines/obj/hydro.dm @@ -36,6 +36,7 @@ /obj/item/seeds/chiliseed name = "Chili plant seeds" + desc = "HOT! HOT! HOT!" icon_state = "seed-chili" mypath = "/obj/item/seeds/chiliseed" species = "chili" @@ -52,6 +53,7 @@ /obj/item/seeds/replicapod name = "Replica pod seeds" + desc = "They say these are used to harvest humans." icon_state = "seed-replicapod" mypath = "/obj/item/seeds/replicapod" species = "replicapod" @@ -75,6 +77,7 @@ /obj/item/seeds/berryseed name = "Berry seeds" + desc = "Seeds that grows into berries." icon_state = "seed-berry" mypath = "/obj/item/seeds/berryseed" species = "berry" @@ -91,6 +94,7 @@ /obj/item/seeds/bananaseed name = "Banana seeds" + desc = "When grown, keep away from clown." icon_state = "seed-banana" mypath = "/obj/item/seeds/bananaseed" species = "banana" @@ -106,6 +110,7 @@ /obj/item/seeds/eggplantseed name = "Eggplant seeds" + desc = "These seeds grows into plants in the form of eggs." icon_state = "seed-eggplant" mypath = "/obj/item/seeds/eggplantseed" species = "eggplant" @@ -121,6 +126,7 @@ /obj/item/seeds/eggyseed name = "Egg Plant seeds" + desc = "These seeds grows into plants in the form of eggs." icon_state = "seed-eggy" mypath = "/obj/item/seeds/eggy" species = "eggy" @@ -136,6 +142,7 @@ /obj/item/seeds/tomatoseed name = "Tomato seeds" + desc = "Used to grow tomotoes." icon_state = "seed-tomato" mypath = "/obj/item/seeds/tomatoseed" species = "tomato" @@ -152,6 +159,7 @@ /obj/item/seeds/cornseed name = "Corn seeds" + desc = "I don't mean to sound corny..." icon_state = "seed-corn" mypath = "/obj/item/seeds/cornseed" species = "corn" @@ -185,6 +193,7 @@ */ /obj/item/seeds/potatoseed name = "Potato Seeds" + desc = "This will one day grow into potatoes." icon_state = "seed-potato" mypath = "/obj/item/seeds/potatoseed" species = "potato" @@ -202,6 +211,7 @@ /obj/item/seeds/icepepperseed name = "Ice pepper seeds" + desc = "This will soon become chilly..." icon_state = "seed-icepepper" mypath = "/obj/item/seeds/icepepperseed" species = "chiliice" @@ -218,6 +228,7 @@ /obj/item/seeds/soyaseed name = "Soybean seeds" + desc = "This grows into Soy." icon_state = "seed-soybean" mypath = "/obj/item/seeds/soyaseed" species = "soybean" @@ -234,6 +245,7 @@ /obj/item/seeds/wheatseed name = "Wheat seeds" + desc = "This may or may not grow into weed." icon_state = "seed-wheat" mypath = "/obj/item/seeds/wheatseed" species = "wheat" @@ -251,6 +263,7 @@ /obj/item/seeds/carrotseed name = "Carrot seeds" + desc = "It will grow into a carrot." icon_state = "seed-carrot" mypath = "/obj/item/seeds/carrotseed" species = "carrot" @@ -268,6 +281,7 @@ /obj/item/seeds/amanitamycelium name = "Fly Amanita mycelium" + desc = "Grows into something horrible." icon_state = "mycelium-amanita" mypath = "/obj/item/seeds/amanitamycelium" species = "amanita" @@ -302,6 +316,7 @@ /obj/item/seeds/libertymycelium name = "Liberty Cap mycelium" + desc = "It is said to grow druggy." icon_state = "mycelium-liberty" mypath = "/obj/item/seeds/libertymycelium" species = "liberty" @@ -319,6 +334,7 @@ /obj/item/seeds/chantermycelium name = "Chanterelle mycelium" + desc = "Grows, grows, grows." icon_state = "mycelium-chanter" mypath = "/obj/item/seeds/chantermycelium" species = "chanter" @@ -336,6 +352,7 @@ /obj/item/seeds/towermycelium name = "Tower Cap mycelium" + desc = "Why does this sound so familiar..." icon_state = "mycelium-tower" mypath = "/obj/item/seeds/towermycelium" species = "towercap" @@ -353,6 +370,7 @@ /obj/item/seeds/glowshroom name = "Glowshroom mycelium" + desc = "This will glow into mushrooms." icon_state = "mycelium-glowshroom" mypath = "/obj/item/seeds/glowshroom" species = "glowshroom" @@ -370,6 +388,7 @@ /obj/item/seeds/plumpmycelium name = "Plump Helmet mycelium" + desc = "These seeds will grow into helmets." icon_state = "mycelium-plump" mypath = "/obj/item/seeds/plumpmycelium" species = "plump" @@ -387,6 +406,7 @@ /obj/item/seeds/nettleseed name = "Nettle seeds" + desc = "Grows into nettle." icon_state = "seed-nettle" mypath = "/obj/item/seeds/nettleseed" species = "nettle" @@ -404,6 +424,7 @@ /obj/item/seeds/deathnettleseed name = "Deathnettle seeds" + desc = "Grows into Nettle." icon_state = "seed-deathnettle" mypath = "/obj/item/seeds/deathnettleseed" species = "deathnettle" @@ -421,6 +442,7 @@ /obj/item/seeds/weeds name = "Weeds" + desc = "These seems weedy." icon_state = "seed" mypath = "/obj/item/seeds/weeds" species = "weeds" @@ -455,6 +477,7 @@ /obj/item/seeds/sunflowerseed name = "Sunflower seeds" + desc = "This will grow shining." icon_state = "seed-sunflower" mypath = "/obj/item/seeds/sunflowerseed" species = "sunflower" @@ -472,6 +495,7 @@ /obj/item/seeds/brownmold name = "Brown Mold" + desc = "Moldy." icon_state = "seed" mypath = "/obj/item/seeds/brownmold" species = "mold" @@ -631,7 +655,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/banana seed = "/obj/item/seeds/bananaseed" name = "Banana" - desc = "A banana." + desc = "A banana. Excellent clown weapon." icon = 'items.dmi' icon_state = "banana" item_state = "banana" @@ -652,7 +676,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/chili seed = "/obj/item/seeds/chiliseed" name = "Chili" - desc = "Spicy!" + desc = "Spicy! Wait...ITS BURNING ME!" icon_state = "chilipepper" New() ..() @@ -1048,7 +1072,7 @@ /obj/item/weapon/minihoe // -- Numbers name = "Mini hoe" - desc = "Use for removing weeds or scratching your back." + desc = "Use for removing weeds or scratching your back. Might be convinced for other uses." icon = 'weapons.dmi' icon_state = "hoe" item_state = "hoe" diff --git a/code/defines/obj/injector.dm b/code/defines/obj/injector.dm index 91a2215c703..54007e68099 100644 --- a/code/defines/obj/injector.dm +++ b/code/defines/obj/injector.dm @@ -1,5 +1,6 @@ /obj/item/weapon/dnainjector name = "DNA-Injector" + desc = "This injects the person with DNA." icon = 'items.dmi' icon_state = "dnainjector" var/dnatype = null @@ -17,6 +18,7 @@ /obj/item/weapon/dnainjector/antihulk name = "DNA-Injector (Anti-Hulk)" + desc = "Cures green skin." dnatype = "se" dna = "708" //block = 2 @@ -26,6 +28,7 @@ /obj/item/weapon/dnainjector/hulkmut name = "DNA-Injector (Hulk)" + desc = "This will make you big and strong, but give you a bad skin condition." dnatype = "se" dna = "FED" //block = 2 @@ -35,6 +38,7 @@ /obj/item/weapon/dnainjector/xraymut name = "DNA-Injector (Xray)" + desc = "Finally you can see what the Captain does." dnatype = "se" dna = "FED" //block = 8 @@ -44,6 +48,7 @@ /obj/item/weapon/dnainjector/antixray name = "DNA-Injector (Anti-Xray)" + desc = "It will make you see harder." dnatype = "se" dna = "708" //block = 8 @@ -54,42 +59,49 @@ ///////////////////////////////////// /obj/item/weapon/dnainjector/antiglasses name = "DNA-Injector (Anti-Glasses)" + desc = "Toss away those glasses!" dnatype = "se" dna = "708" block = 1 /obj/item/weapon/dnainjector/glassesmut name = "DNA-Injector (Glasses)" + desc = "Will make you need dorkish glasses." dnatype = "se" dna = "BD6" block = 1 /obj/item/weapon/dnainjector/epimut name = "DNA-Injector (Epi.)" + desc = "Shake shake shake the room!" dnatype = "se" dna = "FA0" block = 3 /obj/item/weapon/dnainjector/antiepi name = "DNA-Injector (Anti-Epi.)" + desc = "Will fix you up from shaking the room." dnatype = "se" dna = "708" block = 3 //////////////////////////////////// /obj/item/weapon/dnainjector/anticough name = "DNA-Injector (Anti-Cough)" + desc = "Will stop that aweful noise." dnatype = "se" dna = "708" block = 5 /obj/item/weapon/dnainjector/coughmut name = "DNA-Injector (Cough)" + desc = "Will bring forth a sound of horror from your throat." dnatype = "se" dna = "BD6" block = 5 /obj/item/weapon/dnainjector/clumsymut name = "DNA-Injector (Clumsy)" + desc = "Makes clown minions." dnatype = "se" dna = "FA0" //block = 6 @@ -99,6 +111,7 @@ /obj/item/weapon/dnainjector/anticlumsy name = "DNA-Injector (Anti-Clumy)" + desc = "Apply this for Security Clown." dnatype = "se" dna = "708" //block = 6 @@ -108,30 +121,35 @@ /obj/item/weapon/dnainjector/antitour name = "DNA-Injector (Anti-Tour.)" + desc = "Will cure tourrets." dnatype = "se" dna = "708" block = 7 /obj/item/weapon/dnainjector/tourmut name = "DNA-Injector (Tour.)" + desc = "Gives you a nasty case off tourrets." dnatype = "se" dna = "BD6" block = 7 /obj/item/weapon/dnainjector/stuttmut name = "DNA-Injector (Stutt.)" + desc = "Makes you s-s-stuttterrr" dnatype = "se" dna = "FA0" block = 9 /obj/item/weapon/dnainjector/antistutt name = "DNA-Injector (Anti-Stutt.)" + desc = "Fixes that speaking impairment." dnatype = "se" dna = "708" block = 9 /obj/item/weapon/dnainjector/antifire name = "DNA-Injector (Anti-Fire)" + desc = "Cures fire." dnatype = "se" dna = "708" //block = 10 @@ -141,6 +159,7 @@ /obj/item/weapon/dnainjector/firemut name = "DNA-Injector (Fire)" + desc = "Gives you fire." dnatype = "se" dna = "FED" //block = 10 @@ -150,6 +169,7 @@ /obj/item/weapon/dnainjector/blindmut name = "DNA-Injector (Blind)" + desc = "Makes you not see anything." dnatype = "se" dna = "FA0" //block = 11 @@ -159,6 +179,7 @@ /obj/item/weapon/dnainjector/antiblind name = "DNA-Injector (Anti-Blind)" + desc = "ITS A MIRACLE!!!" dnatype = "se" dna = "708" //block = 11 @@ -168,6 +189,7 @@ /obj/item/weapon/dnainjector/antitele name = "DNA-Injector (Anti-Tele.)" + desc = "Will make you not able to control your mind." dnatype = "se" dna = "708" //block = 12 @@ -177,6 +199,7 @@ /obj/item/weapon/dnainjector/telemut name = "DNA-Injector (Tele.)" + desc = "Super brain man!" dnatype = "se" dna = "FED" //block = 12 @@ -186,6 +209,7 @@ /obj/item/weapon/dnainjector/deafmut name = "DNA-Injector (Deaf)" + desc = "Sorry, what did you say?" dnatype = "se" dna = "FA0" //block = 13 @@ -195,6 +219,7 @@ /obj/item/weapon/dnainjector/antideaf name = "DNA-Injector (Anti-Deaf)" + desc = "Will make you hear once more." dnatype = "se" dna = "708" //block = 13 @@ -204,12 +229,14 @@ /obj/item/weapon/dnainjector/h2m name = "DNA-Injector (Human > Monkey)" + desc = "Will make you a flea bag." dnatype = "se" dna = "FA0" block = 14 /obj/item/weapon/dnainjector/m2h name = "DNA-Injector (Monkey > Human)" + desc = "Will make you...less hairy." dnatype = "se" dna = "708" block = 14 \ No newline at end of file diff --git a/code/defines/obj/machinery.dm b/code/defines/obj/machinery.dm index 9f79572b5e7..cb67320ee16 100644 --- a/code/defines/obj/machinery.dm +++ b/code/defines/obj/machinery.dm @@ -20,6 +20,7 @@ /obj/machinery/autolathe name = "Autolathe" + desc = "Produces items with metal and glass." icon_state = "autolathe" density = 1 var/m_amount = 0.0 @@ -43,6 +44,7 @@ /obj/machinery/camera name = "Security Camera" + desc = "This is used to monitor rooms. Can see through walls." icon = 'monitors.dmi' icon_state = "camera" var/network = "SS13" @@ -73,6 +75,7 @@ /obj/machinery/dna_scanner name = "DNA Scanner/Implanter" + desc = "Scans DNA." icon = 'Cryogenic2.dmi' icon_state = "scanner_0" density = 1 @@ -85,6 +88,7 @@ /obj/machinery/dna_scannernew name = "DNA Modifier" + desc = "Scans DNA better." icon = 'Cryogenic2.dmi' icon_state = "scanner_0" density = 1 @@ -97,6 +101,7 @@ /obj/machinery/firealarm name = "Fire Alarm" + desc = "Pull this in case of emergency. Thus keep pulling this forever." icon = 'monitors.dmi' icon_state = "fire0" var/detecting = 1.0 @@ -112,6 +117,7 @@ /obj/machinery/partyalarm name = "Party Button" + desc = "Cuban Pete is in the house!" icon = 'monitors.dmi' icon_state = "fire0" var/detecting = 1.0 @@ -127,6 +133,7 @@ /obj/machinery/hologram_proj name = "Hologram Projector" + desc = "Makes a hologram appear...somehow..." icon = 'stationobjs.dmi' icon_state = "hologram0" var/atom/projection = null @@ -138,6 +145,7 @@ /obj/machinery/hologram_ai name = "Hologram Projector Platform" + desc = "Used for the fun of the diabolical AI." icon = 'stationobjs.dmi' icon_state = "hologram0" var/atom/projection = null @@ -154,6 +162,7 @@ /obj/machinery/igniter name = "igniter" + desc = "Fun for igniting plasma." icon = 'stationobjs.dmi' icon_state = "igniter1" var/id = null @@ -165,6 +174,7 @@ /obj/machinery/injector name = "injector" + desc = "Injects gas into a chamber." icon = 'stationobjs.dmi' icon_state = "injector" density = 1 @@ -177,6 +187,7 @@ /obj/machinery/mass_driver name = "mass driver" + desc = "Shoots things into space." icon = 'stationobjs.dmi' icon_state = "mass_driver" var/power = 1.0 @@ -190,6 +201,7 @@ /obj/machinery/meter name = "meter" + desc = "It measures something." icon = 'meter.dmi' icon_state = "meterX" var/obj/machinery/atmospherics/pipe/target = null @@ -201,7 +213,7 @@ active_power_usage = 4 /obj/machinery/nuclearbomb - desc = "Uh oh." + desc = "Uh oh. RUN!!!!" name = "Nuclear Fission Explosive" icon = 'stationobjs.dmi' icon_state = "nuclearbomb0" @@ -220,6 +232,7 @@ /obj/machinery/optable name = "Operating Table" + desc = "Used for advanced medical procedures. Apparently this includes the clown." icon = 'surgery.dmi' icon_state = "table2-idle" density = 1 @@ -249,6 +262,7 @@ /obj/machinery/vehicle/pod name = "Escape Pod" + desc = "A pod, for, moving in space" icon = 'escapepod.dmi' icon_state = "pod" can_rotate = 0 @@ -256,6 +270,7 @@ /obj/machinery/vehicle/recon name = "Reconaissance Pod" + desc = "A fast moving pod." icon = 'escapepod.dmi' icon_state = "recon" speed = 1.0 @@ -265,6 +280,7 @@ /obj/machinery/restruct name = "DNA Physical Restructurization Accelerator" + desc = "This looks complex." icon = 'Cryogenic2.dmi' icon_state = "restruct_0" density = 1 @@ -277,6 +293,7 @@ /obj/machinery/scan_console name = "DNA Scanner Access Console" + desc = "Scand DNA." icon = 'computer.dmi' icon_state = "scanner" density = 1 @@ -298,6 +315,7 @@ /obj/machinery/scan_consolenew name = "DNA Modifier Access Console" + desc = "Scand DNA." icon = 'computer.dmi' icon_state = "scanner" density = 1 @@ -335,6 +353,7 @@ /obj/machinery/sec_lock name = "Security Pad" + desc = "A lock, for doors. Used by security." icon = 'stationobjs.dmi' icon_state = "sec_lock" var/obj/item/weapon/card/id/scan = null @@ -349,6 +368,7 @@ /obj/machinery/door_control name = "Remote Door Control" + desc = "This controls doors." icon = 'stationobjs.dmi' icon_state = "doorctrl0" desc = "A remote control switch for a door." @@ -360,6 +380,7 @@ /obj/machinery/driver_button name = "Mass Driver Button" + desc = "FIRE AWAY!" icon = 'objects.dmi' icon_state = "launcherbtt" desc = "A remote control switch for a Mass Driver." @@ -372,6 +393,7 @@ /obj/machinery/ignition_switch name = "Ignition Switch" + desc = "Activates that igniter." icon = 'objects.dmi' icon_state = "launcherbtt" desc = "A remote control switch for a mounted igniter." @@ -429,6 +451,7 @@ /obj/machinery/teleport/hub name = "hub" + desc = "A hub of a teleporting machine." icon_state = "tele0" var/accurate = 0 use_power = 1 @@ -437,6 +460,7 @@ /obj/machinery/teleport/station name = "station" + desc = "The station thingy of a teleport thingy." icon_state = "controller" var/active = 0 var/engaged = 0 @@ -502,6 +526,7 @@ /obj/machinery/power/monitor name = "Power Monitoring Computer" + desc = "Used to monitor the power. Pretty useless." icon = 'computer.dmi' icon_state = "power" density = 1 diff --git a/code/defines/obj/radio.dm b/code/defines/obj/radio.dm index ea8048a73e0..b1c335638bb 100644 --- a/code/defines/obj/radio.dm +++ b/code/defines/obj/radio.dm @@ -31,6 +31,7 @@ /obj/item/device/radio/beacon name = "Tracking Beacon" + desc = "A beacon used by a teleporter." icon_state = "beacon" item_state = "signaler" var/code = "electronic" @@ -38,12 +39,14 @@ /obj/item/device/radio/courtroom_beacon name = "Tracking Beacon" + desc = "A more useless beacon in the courtroom." icon_state = "beacon" item_state = "signaler" var/code = "electronic" /obj/item/device/radio/electropack name = "Electropack" + desc = "Dance my monkeys! DANCE!!!" icon_state = "electropack0" var/code = 2 var/on = 0 @@ -55,6 +58,7 @@ /obj/item/device/radio/signaler name = "Remote Signaling Device" + desc = "Used to remotely activate devices." icon_state = "signaller" item_state = "signaler" var/code = 30 @@ -65,6 +69,7 @@ /obj/item/device/radio/intercom name = "Station Intercom (Radio)" + desc = "Talk through this." icon_state = "intercom" anchored = 1 var/number = 0 @@ -73,6 +78,7 @@ /obj/item/device/radio/headset name = "Radio Headset" + desc = "An intercom that fits over the head." icon_state = "headset" item_state = "headset" var @@ -87,96 +93,112 @@ /obj/item/device/radio/headset/headset_sec // -- TLE name = "Security Radio Headset" + desc = "This is used by your elite security force." icon_state = "sec_headset" item_state = "headset" channels = list("Security" = 1) /obj/item/device/radio/headset/headset_eng // -- TLE name = "Engineering Radio Headset" + desc = "When the engineers wishes to chat like girls." icon_state = "eng_headset" item_state = "headset" channels = list("Engineering" = 1) /obj/item/device/radio/headset/headset_rob // -- DH name = "Robotics Radio Headset" + desc = "Made specifically for the roboticists who cannot decide between departments." icon_state = "rob_headset" item_state = "headset" channels = list("Engineering" = 1, "Science" = 1) /obj/item/device/radio/headset/headset_med // -- TLE name = "Medical Radio Headset" + desc = "A headset for the trained staff of the medbay." icon_state = "med_headset" item_state = "headset" channels = list("Medical" = 1) /obj/item/device/radio/headset/headset_sci // -- Bar name = "Science Radio Headset" + desc = "A sciency headset. Like usual." icon_state = "com_headset" item_state = "headset" channels = list("Science" = 1) /obj/item/device/radio/headset/headset_medsci // -- Micro name = "Medical Research Radio Headset" + desc = "A headset that is a result of the mating between medical and science." icon_state = "med_headset" item_state = "headset" channels = list("Medical" = 1, "Science" = 1) /obj/item/device/radio/headset/headset_com // -- TLE name = "Command Radio Headset" + desc = "A headset with a commanding channel" icon_state = "com_headset" item_state = "headset" channels = list("Command" = 1) /obj/item/device/radio/headset/heads/captain // -- Bar name = "Captain's Headset" + desc = "The headset of the boss." icon_state = "com_headset" item_state = "headset" channels = list("Command" = 1, "Science" = 0, "Medical" = 0, "Security" = 1, "Engineering" = 0, "Mining" = 0, "Cargo" = 0) /obj/item/device/radio/headset/heads/rd // -- Bar name = "Research Director's Headset" + desc = "Headset of the researching God." icon_state = "com_headset" item_state = "headset" channels = list("Science" = 1, "Command" = 1) /obj/item/device/radio/headset/heads/hos // -- Bar name = "Head of Security's Headset" + desc = "The headset of the man who protects your worthless lifes." icon_state = "com_headset" item_state = "headset" channels = list("Security" = 1, "Command" = 1) /obj/item/device/radio/headset/heads/ce // -- Bar name = "Chief Engineer's Headset" + desc = "The headset of the guy who is in charge of morons." icon_state = "com_headset" item_state = "headset" channels = list("Engineering" = 1, "Command" = 1) /obj/item/device/radio/headset/heads/cmo // -- Bar name = "Chief Medical Officer's Headset" + desc = "The headset of the highly trained medical chief." icon_state = "com_headset" item_state = "headset" channels = list("Medical" = 1, "Command" = 1) /obj/item/device/radio/headset/heads/hop // -- rastaf0 name = "Head of Personnel's Headset" + desc = "The headset of the guy who will one day be captain." icon_state = "com_headset" item_state = "headset" channels = list("Command" = 1, "Security" = 0, "Cargo" = 1, "Mining" = 0) /obj/item/device/radio/headset/headset_mine // -- rastaf0 name = "Mining Radio Headset" + desc = "Headset used by miners. How useless." icon_state = "mine_headset" item_state = "headset" channels = list("Mining" = 1) /obj/item/device/radio/headset/headset_cargo // -- rastaf0 name = "Cargo Radio Headset" + desc = "Headset used by the QM's slaves." icon_state = "cargo_headset" item_state = "headset" channels = list("Cargo" = 1) /obj/item/device/radio/headset/heads/qm // -- rastaf0 name = "Quartermaster's Headset" + desc = "The headset of the man who control your toiletpaper supply." icon_state = "cargo_headset" item_state = "headset" channels = list("Cargo" = 1, "Mining" = 1) diff --git a/code/defines/obj/storage.dm b/code/defines/obj/storage.dm index bc46c4ee3f9..eb9698c9602 100644 --- a/code/defines/obj/storage.dm +++ b/code/defines/obj/storage.dm @@ -51,6 +51,7 @@ /obj/item/weapon/storage/backpack name = "backpack" + desc = "You wear this on your back and put items into it." icon_state = "backpack" w_class = 4.0 flags = 259.0 @@ -59,6 +60,7 @@ /obj/item/weapon/storage/pill_bottle name = "pill bottle" + desc = "This is told to hold untold horrors of pulls." icon_state = "pill_canister" icon = 'chemical.dmi' item_state = "contsolid" @@ -67,6 +69,7 @@ /obj/item/weapon/storage/dice name = "dice pack" + desc = "Apparently this has dice in them." icon_state = "pill_canister" icon = 'chemical.dmi' item_state = "contsolid" @@ -75,33 +78,40 @@ /obj/item/weapon/storage/box name = "box" + desc = "A nice looking box." icon_state = "box" item_state = "syringe_kit" /obj/item/weapon/storage/pillbottlebox name = "pill bottles" + desc = "A box of pill bottles." icon_state = "box" item_state = "syringe_kit" /obj/item/weapon/storage/blankbox name = "blank shells" + desc = "A box containing...stuff..." icon_state = "box" item_state = "syringe_kit" /obj/item/weapon/storage/backpack/clown name = "Giggles Von Honkerton" + desc = "The 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." icon_state = "medicalpack" /obj/item/weapon/storage/backpack/security name = "security backpack" + desc = "A very robust backpack." icon_state = "securitypack" /obj/item/weapon/storage/briefcase name = "briefcase" + desc = "Used by the lawyer to robust security in the court room." icon_state = "briefcase" flags = FPRINT | TABLEPASS| CONDUCT force = 8.0 @@ -113,6 +123,7 @@ /obj/item/weapon/storage/disk_kit name = "data disks" + desc = "For disks." icon_state = "id" item_state = "syringe_kit" @@ -122,11 +133,13 @@ /obj/item/weapon/storage/fcard_kit name = "Fingerprint Cards" + desc = "This contains cards which are used to take fingerprints." icon_state = "id" item_state = "syringe_kit" /obj/item/weapon/storage/firstaid name = "First-Aid" + desc = "In case of a boo-boo." icon_state = "firstaid" throw_speed = 2 throw_range = 8 @@ -134,6 +147,7 @@ /obj/item/weapon/storage/firstaid/fire name = "Fire First Aid" + desc = "A kit for when you 'accidently' set toxins on fire and burn yourself." icon_state = "ointment" item_state = "firstaid-ointment" @@ -142,16 +156,19 @@ /obj/item/weapon/storage/syringes name = "Syringes" + desc = "A box full of syringes." desc = "A biohazard alert warning is printed on the box" icon_state = "syringe" /obj/item/weapon/storage/firstaid/toxin name = "Toxin First Aid" + desc = "Used to treat when you have a high amoutn of toxins in your body. Or atleast the box containing those things." icon_state = "antitoxin" item_state = "firstaid-toxin" /obj/item/weapon/storage/firstaid/o2 name = "Oxygen Deprivation First Aid" + desc = "A box full of oxygen goodies." icon_state = "o2" item_state = "firstaid-o2" @@ -169,46 +186,55 @@ /obj/item/weapon/storage/gl_kit name = "Prescription Glasses" + desc = "This box contains nerd glasses." icon_state = "id" item_state = "syringe_kit" /obj/item/weapon/storage/handcuff_kit name = "Spare Handcuffs" + desc = "A box full of handcuffs." icon_state = "handcuff" item_state = "syringe_kit" /obj/item/weapon/storage/id_kit name = "Spare IDs" + desc = "Has so many empty ID's." icon_state = "id" item_state = "syringe_kit" /obj/item/weapon/storage/lglo_kit name = "Latex Gloves" + desc = "Contains white gloves." icon_state = "latex" item_state = "syringe_kit" /obj/item/weapon/storage/injectbox name = "DNA-Injectors" + desc = "This box contains injectors it seems." icon_state = "box" item_state = "syringe_kit" /obj/item/weapon/storage/stma_kit name = "Sterile Masks" + desc = "This box contains masks of sterility." icon_state = "latex" item_state = "syringe_kit" /obj/item/weapon/storage/trackimp_kit name = "Tracking Implant Kit" + desc = "Box full of scum-bag tracking utensils." icon_state = "implant" item_state = "syringe_kit" /obj/item/weapon/storage/chemimp_kit name = "Chemical Implant Kit" + desc = "Box of stuff used to implant chemicals." icon_state = "implant" item_state = "syringe_kit" /obj/item/weapon/storage/toolbox name = "toolbox" + desc = "Danger. Very robust." icon = 'storage.dmi' icon_state = "red" item_state = "toolbox_red" @@ -242,6 +268,7 @@ /obj/item/weapon/storage/bible name = "bible" + desc = "Apply to head repeatedly." icon_state ="bible" throw_speed = 1 throw_range = 5 @@ -252,6 +279,7 @@ /obj/item/weapon/storage/bible/booze name = "bible" + desc = "Apply to head repeatedly." icon_state ="bible" /obj/item/weapon/storage/mousetraps diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 172daf92e1e..6cf343028ac 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -264,6 +264,7 @@ /obj/item/weapon/melee/energy/sword var/color name = "energy sword" + desc = "May the force be within you." icon_state = "sword0" force = 3.0 throwforce = 5.0 @@ -280,6 +281,7 @@ /obj/item/weapon/melee/energy/sword/pirate name = "energy cutlass" + desc = "Arrrr matey." icon_state = "cutlass0" /obj/item/weapon/melee/energy/blade @@ -325,6 +327,7 @@ /obj/item/weapon/bedsheet name = "bedsheet" + desc = "Nice, linen, bedsheet. Perfect to put on." icon = 'items.dmi' icon_state = "sheet" layer = 4.0 @@ -368,6 +371,7 @@ /obj/item/stack/medical/ointment name = "ointment" + desc = "Used to treat those nasty burns." singular_name = "ointment" icon_state = "ointment" heal_burn = 40 @@ -375,6 +379,7 @@ /obj/item/weapon/c_tube name = "cardboard tube" + desc = "A tube...of cardboard." icon = 'items.dmi' icon_state = "c_tube" throwforce = 1 @@ -384,6 +389,7 @@ /obj/item/weapon/camera name = "camera" + desc = "Use this to take pictures." icon_state = "camera" var/last_pic = 1.0 item_state = "wrench" @@ -392,6 +398,7 @@ /obj/item/weapon/card name = "card" + desc = "Does card things." icon = 'card.dmi' w_class = 1.0 @@ -399,6 +406,7 @@ /obj/item/weapon/card/data name = "data disk" + desc = "A disk of data." icon_state = "data" var/function = "storage" var/data = "null" @@ -422,6 +430,7 @@ /obj/item/weapon/card/id name = "identification card" + desc = "An identification card. No shit." icon_state = "id" item_state = "card-id" var/access = list() @@ -431,16 +440,19 @@ /obj/item/weapon/card/id/gold name = "identification card" + desc = "A golden card which shows power and might." icon_state = "gold" item_state = "gold_id" /obj/item/weapon/card/id/syndicate name = "agent card" + desc = "Shhhhh." access = list(access_maint_tunnels) origin_tech = "syndicate=3" /obj/item/weapon/card/id/captains_spare name = "Captain's spare ID" + desc = "The spare ID of the High Lord himself." icon_state = "gold" item_state = "gold_id" registered = "Captain" @@ -451,6 +463,7 @@ /obj/item/weapon/card/id/centcom name = "CentCom ID" + desc = "An ID straight from Cent. Com." icon_state = "centcom" registered = "Central Command" assignment = "General" @@ -472,6 +485,7 @@ /obj/item/weapon/clipboard name = "clipboard" + desc = "Apply paper to this to write better. Can also hold pens." icon = 'items.dmi' icon_state = "clipboard00" var/obj/item/weapon/pen/pen = null @@ -483,6 +497,7 @@ /obj/item/weapon/cloaking_device name = "cloaking device" + desc = "Use this to become invisible to the human eyesocket." icon = 'device.dmi' icon_state = "shield0" var/active = 0.0 @@ -526,6 +541,7 @@ /obj/item/weapon/crowbar name = "crowbar" + desc = "Used to hit floors" icon = 'items.dmi' icon_state = "crowbar" flags = FPRINT | TABLEPASS| CONDUCT @@ -557,6 +573,7 @@ /obj/item/weapon/disk/nuclear name = "Nuclear Authentication Disk" + desc = "Better keep this safe." icon_state = "nucleardisk" item_state = "card-id" w_class = 1.0 @@ -569,6 +586,7 @@ /obj/item/weapon/extinguisher name = "fire extinguisher" + desc = "Contains water....dangit..." icon = 'items.dmi' icon_state = "fire_extinguisher0" var/last_use = 1.0 @@ -585,6 +603,7 @@ /obj/item/weapon/f_card name = "Finger Print Card" + desc = "Used to take fingerprints." icon = 'card.dmi' icon_state = "fingerprint0" var/amount = 10.0 @@ -597,6 +616,7 @@ /obj/item/weapon/fcardholder name = "Finger Print Case" + desc = "Apply finger print card." icon = 'items.dmi' icon_state = "fcardholder0" item_state = "clipboard" @@ -667,6 +687,7 @@ /obj/item/weapon/gift name = "gift" + desc = "A wrapped item." icon = 'items.dmi' icon_state = "gift3" var/size = 3.0 @@ -899,6 +920,7 @@ /obj/item/weapon/hand_tele name = "hand tele" + desc = "A portable item using blue-space technology." icon = 'device.dmi' icon_state = "hand_tele" item_state = "electronic" @@ -911,6 +933,7 @@ /obj/item/weapon/handcuffs name = "handcuffs" + desc = "Use this to keep prisoners in line." icon = 'items.dmi' icon_state = "handcuff" flags = FPRINT | TABLEPASS | CONDUCT | ONBELT @@ -930,23 +953,27 @@ /obj/item/weapon/implant/freedom name = "freedom" + desc = "Use this to escape from those evil Red Shirts." var/uses = 1.0 color = "r" var/activation_emote = "chuckle" /obj/item/weapon/implant/tracking name = "tracking" + desc = "Track with this." var/frequency = 1451 var/id = 1.0 /obj/item/weapon/implant/explosive name = "explosive" + desc = "And boom goes the weasel." /obj/item/weapon/implant/chem name = "chem" /obj/item/weapon/implantcase name = "Glass Case" + desc = "A case containing an implant." icon_state = "implantcase-0" var/obj/item/weapon/implant/imp = null item_state = "implantcase" @@ -956,16 +983,19 @@ /obj/item/weapon/implantcase/tracking name = "Glass Case- 'Tracking'" + desc = "A case containing a tracking implant." icon = 'items.dmi' icon_state = "implantcase-b" /obj/item/weapon/implantcase/explosive name = "Glass Case- 'Explosive'" + desc = "A case containing an explosive implant." icon = 'items.dmi' icon_state = "implantcase-r" /obj/item/weapon/implantcase/chem name = "Glass Case- 'Chem'" + desc = "A case containing a chemical implant." icon = 'items.dmi' icon_state = "implantcase-b" @@ -981,6 +1011,7 @@ /obj/item/weapon/implantpad name = "implantpad" + desc = "Used to modify implants." icon = 'items.dmi' icon_state = "implantpad-0" var/obj/item/weapon/implantcase/case = null @@ -994,6 +1025,7 @@ /obj/item/weapon/locator name = "locator" + desc = "Used to track those with locater implants." icon = 'device.dmi' icon_state = "locator" var/temp = null @@ -1039,6 +1071,7 @@ /obj/item/weapon/paint name = "Paint Can" + desc = "Used to recolor floors and walls. Can not be removed by the janitor." icon = 'items.dmi' icon_state = "paint_neutral" var/color = "neutral" @@ -1047,6 +1080,7 @@ /obj/item/weapon/paper name = "Paper" + desc = "It is made from wood." icon = 'items.dmi' icon_state = "paper" var/info = null @@ -1066,6 +1100,7 @@ /obj/item/weapon/directions name = "Crumpled Paper" + desc = "This is a crumpled piece fo paper." icon = 'weapons.dmi' icon_state = "crumpled" throwforce = 0 @@ -1178,6 +1213,7 @@ Total SMES charging rate should not exceed total power generation rate, or an ov /obj/item/weapon/paper_bin name = "Paper Bin" + desc = "This contains many papers." icon = 'items.dmi' icon_state = "paper_bin1" var/amount = 30.0 @@ -1223,6 +1259,7 @@ Total SMES charging rate should not exceed total power generation rate, or an ov /obj/item/weapon/rack_parts name = "rack parts" + desc = "Parts of a rack." icon = 'items.dmi' icon_state = "rack_parts" flags = FPRINT | TABLEPASS| CONDUCT @@ -1238,6 +1275,7 @@ Total SMES charging rate should not exceed total power generation rate, or an ov /obj/item/weapon/screwdriver name = "screwdriver" + desc = "You can be totally screwwy with this." icon = 'items.dmi' icon_state = "screwdriver" flags = FPRINT | TABLEPASS| CONDUCT @@ -1260,6 +1298,7 @@ Total SMES charging rate should not exceed total power generation rate, or an ov /obj/item/weapon/syndicate_uplink name = "station bounced radio" + desc = "Remain silent about this..." icon = 'radio.dmi' icon_state = "radio" var/temp = null @@ -1278,6 +1317,7 @@ Total SMES charging rate should not exceed total power generation rate, or an ov /obj/item/weapon/SWF_uplink name = "station bounced radio" + desc = "used to comunicate it appears." icon = 'radio.dmi' icon_state = "radio" var/temp = null @@ -1296,6 +1336,7 @@ Total SMES charging rate should not exceed total power generation rate, or an ov /obj/item/weapon/spellbook name = "Spell Book" + desc = "The legendary book of spells of the wizard." icon = 'library.dmi' icon_state ="book" throw_speed = 1 @@ -1312,6 +1353,7 @@ Total SMES charging rate should not exceed total power generation rate, or an ov /obj/item/weapon/staff name = "wizards staff" + desc = "Apparently a staff used by the wizard." icon = 'wizard.dmi' icon_state = "staff" force = 3.0 @@ -1323,6 +1365,7 @@ Total SMES charging rate should not exceed total power generation rate, or an ov /obj/item/weapon/table_parts name = "table parts" + desc = "Parts of a table. Poor table." icon = 'items.dmi' icon_state = "table_parts" m_amt = 3750 @@ -1330,6 +1373,7 @@ Total SMES charging rate should not exceed total power generation rate, or an ov /obj/item/weapon/table_parts/reinforced name = "reinforced table parts" + desc = "Hard table parts. Well...harder..." icon = 'items.dmi' icon_state = "reinf_tableparts" m_amt = 7500 @@ -1337,6 +1381,7 @@ Total SMES charging rate should not exceed total power generation rate, or an ov /obj/item/weapon/table_parts/wood name = "wooden table parts" + desc = "Keep away from fire." icon_state = "wood_tableparts" /obj/item/weapon/tank @@ -1357,11 +1402,13 @@ Total SMES charging rate should not exceed total power generation rate, or an ov /obj/item/weapon/tank/anesthetic name = "Gas Tank (Sleeping Agent)" + desc = "Seriously, who uses this anymore?" icon_state = "anesthetic" item_state = "an_tank" /obj/item/weapon/tank/jetpack name = "Jetpack (Oxygen)" + desc = "A pack of jets it appears." icon_state = "jetpack0" var/on = 0.0 w_class = 4.0 @@ -1372,29 +1419,35 @@ Total SMES charging rate should not exceed total power generation rate, or an ov /obj/item/weapon/tank/jetpack/void_jetpack name = "Void Jetpack (oxygen)" + desc = "It works well in a void." icon_state = "voidjetpack0" item_state = "jetpack" /obj/item/weapon/tank/jetpack/black_jetpack name = "Black Jetpack (oxygen)" + desc = "A black model of jetpacks." icon_state = "black_jetpack0" item_state = "black_jetpack" /obj/item/weapon/tank/oxygen name = "Gas Tank (Oxygen)" + desc = "A tank of oxygen" icon_state = "oxygen" distribute_pressure = ONE_ATMOSPHERE*O2STANDARD /obj/item/weapon/tank/air name = "Gas Tank (Air Mix)" + desc = "Mixed anyone?" icon_state = "oxygen" /obj/item/weapon/tank/plasma name = "Gas Tank (BIOHAZARD)" + desc = "Contains dangerous plasma. When inhaled." icon_state = "plasma" /obj/item/weapon/tank/emergency_oxygen name = "emergency oxygentank" + desc = "Used for emergencies." icon_state = "emergency" flags = FPRINT | TABLEPASS | ONBELT | CONDUCT w_class = 2.5 @@ -1404,6 +1457,7 @@ Total SMES charging rate should not exceed total power generation rate, or an ov /obj/item/weapon/teleportation_scroll name = "Teleportation Scroll" + desc = "A scroll for moving around." icon = 'wizard.dmi' icon_state = "scroll" var/uses = 4.0 @@ -1426,6 +1480,7 @@ Total SMES charging rate should not exceed total power generation rate, or an ov /obj/item/weapon/wirecutters name = "wirecutters" + desc = "This cuts wires." icon = 'items.dmi' icon_state = "cutters" flags = FPRINT | TABLEPASS| CONDUCT @@ -1442,12 +1497,14 @@ Total SMES charging rate should not exceed total power generation rate, or an ov /obj/item/weapon/wrapping_paper name = "wrapping paper" + desc = "You can use this to wrap items in." icon = 'items.dmi' icon_state = "wrap_paper" var/amount = 20.0 /obj/item/weapon/wrench name = "wrench" + desc = "A wrench with common uses. Can be found in your hand." icon = 'items.dmi' icon_state = "wrench" flags = FPRINT | TABLEPASS| CONDUCT @@ -1582,6 +1639,7 @@ Total SMES charging rate should not exceed total power generation rate, or an ov /obj/item/weapon/a_gift name = "gift" + desc = "A gift it appears." icon = 'items.dmi' icon_state = "gift" item_state = "gift" @@ -1603,6 +1661,7 @@ Total SMES charging rate should not exceed total power generation rate, or an ov /obj/item/weapon/kitchen/rollingpin name = "rolling pin" + desc = "Used to knock out the Bartender." icon_state = "rolling_pin" force = 8.0 throwforce = 10.0 @@ -1663,10 +1722,12 @@ Total SMES charging rate should not exceed total power generation rate, or an ov /obj/item/weapon/kitchen/utensil/fork name = "fork" + desc = "Pointy." icon_state = "fork" /obj/item/weapon/kitchen/utensil/knife name = "knife" + desc = "Can cut through any food." icon_state = "knife" force = 10.0 throwforce = 10.0 @@ -1678,6 +1739,7 @@ Total SMES charging rate should not exceed total power generation rate, or an ov /obj/item/weapon/scalpel name = "scalpel" + desc = "Cut, cut, and once more cut." icon = 'surgery.dmi' icon_state = "scalpel" flags = FPRINT | TABLEPASS | CONDUCT @@ -1692,6 +1754,7 @@ Total SMES charging rate should not exceed total power generation rate, or an ov /obj/item/weapon/retractor name = "retractor" + desc = "Retracts stuff." icon = 'surgery.dmi' icon_state = "retractor" flags = FPRINT | TABLEPASS | CONDUCT @@ -1700,6 +1763,7 @@ Total SMES charging rate should not exceed total power generation rate, or an ov /obj/item/weapon/hemostat name = "hemostat" + desc = "You think you have seen this before." icon = 'surgery.dmi' icon_state = "hemostat" flags = FPRINT | TABLEPASS | CONDUCT @@ -1708,6 +1772,7 @@ Total SMES charging rate should not exceed total power generation rate, or an ov /obj/item/weapon/cautery name = "cautery" + desc = "This stops bleeding." icon = 'surgery.dmi' icon_state = "cautery" flags = FPRINT | TABLEPASS | CONDUCT @@ -1716,6 +1781,7 @@ Total SMES charging rate should not exceed total power generation rate, or an ov /obj/item/weapon/surgicaldrill name = "surgical drill" + desc = "You can drill using this item. You dig?" icon = 'surgery.dmi' icon_state = "drill" flags = FPRINT | TABLEPASS | CONDUCT @@ -1724,6 +1790,7 @@ Total SMES charging rate should not exceed total power generation rate, or an ov /obj/item/weapon/circular_saw name = "circular saw" + desc = "For heavy duty cutting." icon = 'surgery.dmi' icon_state = "saw" flags = FPRINT | TABLEPASS | CONDUCT @@ -1738,6 +1805,7 @@ Total SMES charging rate should not exceed total power generation rate, or an ov /obj/item/weapon/syntiflesh name = "Syntiflesh" + desc = "Meat that appears...strange..." icon = 'food.dmi' icon_state = "meat" flags = FPRINT | TABLEPASS | CONDUCT @@ -1858,18 +1926,21 @@ Total SMES charging rate should not exceed total power generation rate, or an ov /obj/item/weapon/dice // -- TLE name = "d6" + desc = "A dice with six sides." var/sides = 6 icon_state = "dice" item_state = "dice" /obj/item/weapon/dice/d20 // -- TLE name = "d20" + desc = "A dice with...hell that is many sides." sides = 20 icon_state = "d20" item_state = "dice" /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" diff --git a/code/defines/turf.dm b/code/defines/turf.dm index 8b81e320bf6..8c53007de95 100644 --- a/code/defines/turf.dm +++ b/code/defines/turf.dm @@ -63,6 +63,7 @@ /turf/simulated/wall/r_wall name = "r wall" + desc = "A huge chunk of reinforced metal used to seperate rooms." icon_state = "r_wall" opacity = 1 density = 1 @@ -73,6 +74,7 @@ /turf/simulated/wall name = "wall" + desc = "A huge chunk of metal used to seperate rooms." icon = 'walls.dmi' opacity = 1 density = 1 diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi index 808f3a91086f79b48f46329b2a1ba6df97707971..50147e00b49184cb0dff7b39974a90c3d25e52a0 100644 GIT binary patch delta 3246 zcmYjTc{J307f0cFhmsdfw-B-tQmx+;i^zobS1x^SSqYdKDWL8!Lr@k5M9rWzJ0W zK<%$tWCyk{RgcKattr9Uc27$0eY!VgbGJPZ5WwJ^)E*k+m7Z!_18#+Hvyv(^0=^yaYBF`JZX7B|tIPL~81bs=um4XE+Gn?3 zXm=l1_zn1oLWQ37eYo)eW5;Z>yIss16-G7Gtw?k(swW4ysT0o@-b-2!tTe4rHO z23muC`My7KWAwEfty(y&e(ei>XYoUHsF08Z^qh^Aa}siCdMj}hzgHY~NnA(Ae{1IA zMAVzGY~6`Z8gET1em;O{Miv<7I&Ge(?kwmu{M5&3_!WeNE)HV?&30hA?=ML@ol4wJTatMTvYki({f%sQYbs5<+{KEl z$s2xWHzeUT3{SO_C2EGsa_g34KEJz2@%C#iVToAd&kwQvAj@!roGyhP9o4|c;vteD zu?jt?JNq_WspM;1vlxTd66z-d>zvP5eJA|*(dRVR6bHO>LYvxQG7fO{FjmswYXQijjTAs=|0!Rt%pBxm2ZqmZRuC|WvGZWY{4`*sTJ;l%6? zlGat^N~5xJolPmvD-Ms9qCJknCH}{uAl~!}&tpT9LVcS{tw;4 z3GyKyS{98m)Q9OWi`KKS)?*AYK>?^4=I-}18@Qf&IB+uE=yo6sZ*Xrwe!fc~+$-3J zOe!Cwc=Qe?BTY?}zOM1tGgj2ylM`BI+8AEZUqS{`98ch`-sQwhsy(r9CCVCAAKGK5 zicsV9ZX9W|>J>fVHo-p_MeD^^ZT*BYwS004M`T>DG~AgQ5HVSBsO$D;Edn9V%H};)9#+>^H_C9Mo6W+Rhs1w}9Pk`uJ+5tLk9Hit;tS{>Hoq&pK!OY=`N; zOd*dVV?rb+j)TVmNP_onM;HE45K@zo`9}hq0V~#X?f-y_=rjXbcKj%u1;ioVs ziJH$V8CBr%vL~&jr%#cV87O+3kKcg&I{7|D9%(qF3ch_EhJUP*#upBW?O6P<=y3}v zO&Wg<+u|Vor(8#WSn%00we#b|{NUaE79e?e&(;lCD`2K^#h%5A3*s-6xF*9UL0%Wr z*Lb+NtdQWuTj{no=G2G?w6aB#T4Uzw!_6 z9%u8bOA4ne?j>e&+?%IjGM{+nI&+Mt*AK9T{26>+19_lGlg+=)I96aA#AQsk=WybR zfXP0McNVvQLVrh%qnA(EoQZd{R<7wYC|SMO$qlSU({GfYZIsIm?)CeVzzSIQsm<-!cy zDdM!qJgoYYz(9EddoT>AiD=BJ?$jLCWXSEDV9u%5b!Gt8OcACsg{)HRz!wJGb>lX8VPMPj{_2T3Xz#h;&iv}GaRPri1)-)~6uvmrs%K+3VtTnb<8rG*E$ zFkMxpgpC+ry8**RPsi|eHn_7TcPGBn`E^~JbpFxu6AA6=hQF>>5TfdR?r`ou64@vO zn>FMS=3RKr-&lZcN^t7S6RR6IiXV>!6b!%r<|aTq9N^kS2Bm7NgK@A%OUURe9YY3z zKUb#md&Ew6pr27T?%75UdAQY%C(U7(Q`-|7g3UyA85;^HPY1!BMS0r&Iv~^EyvbF; zGaGX=O-nmJcPk?e71NFIJkJt1;tYvi%w#Q!V#-GMH5AXs1&|02sq~4(Yd0to+9bjn zjc!sUQa-&s>vL97>4va7IjU9tiv7nc_kJ`)0w;i2geooVz^mnkNcFP9tT%S5IQ9CC zcc;laW2F^}Fbx6tFA@1XQ~+^RF0^G}dkWTw#Tozo%0AmW;ZghsPlpQe9BNoR6;(8l zn*zK(fPUNYoDluh15pol|2?M=(n5~~kJ5hGV)WPG(h8Q_(e#J~YELEZ10rgyJls8f zWg}|xk;FK&Qb#|tT@Q|}Oih(6={UjKqdMyqXnC^kvnW|&*bzEfc-gvFU;Dw*@teBq z@Rgo1BrrHfl}FN|PY$Wh7_eL4lN->j92ZQ#G?U)-GKW*|?j2XFuLvbw>N<;dF!zX= zv255QS~gyUe8+PV+a(HE8k=tylj@MVuRlYNLjTzl6iu{jN>a5_q#wKA|3&AU#r9*j z^arW($kIn~WNpzsG^`JJavbUAs zPtk3jltYFJj|r!W)I^oX2Ls`*T(dhSPqj#kcQw0EkQadBcE@;3pVqn0u6^#F{J!gL zj>xtWs+0T?Z5{S3YAthc6FQ27o=z8ZmbH?+-j?1HV{Y-1}`RG=VyMe+%smi#RzsNs4VT?gL-)`Xp9B zMO4d};JVh=*YP>c&4(YQ4{&G|ccoO$;?-kUZbd|mLAKYDw!*n_ye~Xd@w^6z<0iWj zb4^&B*b|eQ36zNJOV=1)rG<&7SJXaLTQE_y*+03b=&jY?I*_vQuQIa9RC8(dspr%S zHr)Tn%6%a#eKZCG=8+}aQ}>2k!0k z*Gf#LvSdPwSkE1fUwC+<2B<>=I5eZC*ioeO&&mDQ|9rUJKKv*AU@us(cDoWx#EHZj zgwf^~0aKyjaR$jl9654X`N*)}z~-+cAMJ^;n)wTrBVa5YqjAv8ti-J9Q4B#Uf`-i$ zVD4-g{wk4hRqyDD&XYUfHb1V+E%lrw-JtU~?9)ZjLx zI9~epR1KkNp+U(UUSbOAXSOEKGW)`jh0TVHR0kvD(e0_@8>N?1*LIO_cbWO;Mu4H; z8ypJD7q?t4k?WSvLR18nNz13QT*b36J$@HC_Mpot>N4cdhV zTNrB2)%YZ5>Huf{m0X^SZy1TWkW9(-N&0EYUR~z#iqMfAq*=aa`)Lqhle( dc2x6ld~qdb1*dPlS4h8RJ!k7^Q-9ho?Z2%Xl&Js! delta 3266 zcmZvec{tST`^Tl^o25}%8{u%yNlc0&lBClRqGQj_Oj#Oa`I2S$9I0d(I`+{p;xI+_ zW$ZJ+?L&jdlhmqHz6r;{Ni}V3XDX(6tOFHeC$+2)4xMQ3(!e)_EdEJ z^jHO_Qa=+!nb>WNi*k9Up&-LZnJd zdi9jy*9}l0vm}NN`=jf+w=?d$kh=oVRsNS1S@f*58g(|~ElKCey+Ubwl*IhAMGd0} zEBR0C&|s4jT8p4(*+2FDD_jA#Iib=9`s|B_^&_7pDU$aOR9@PIhjOhR_;q5iyYXahL+W2ql#`ag5fB`X zGP2N0q#+eWGaj08Gx!#Cb~IkYi6&QR&nMzm)zLyi;=blLOza~uE7N-qM@?l#gKb11 z5O2h#kBzPYF7STc%_A$nW@#O<^ncM1l{Ml7JDqnZE&ec%PmA!mn|TP~lV$U@<$fnN ztVZ1lKK;3O<7TT_xT26?0sEVfkknuY-0)yy7iLAm_VPpCqZR2aF(@@c>^r9IPF=wx zTM{b}_k6I$k}U2v7!z+PGj&E?hD#KjyS@6LRRjLoPJCW_eBEe#Xiq5>9!xo((ks76 zQs_pzQG(CTJ?7n0#GnAM=xFQja~H}iO6`;R?*~004qAq}fM#h5s}3)fK+AqGH|+=Z zal;PfJtA`Ejq9siC6Rg+<*g$_4f5PVbzaW*ityo!?%BY+mL?F115Ow`^Z~X z2zGLZ^+vCqm^~8Z{G^1$?6-{s+9lP(pw;hvZpC|UC5K>L@OLC{#3z(*zEY6nU294L zQKru806^*Rn_6LNKB}UYZP4Q$YyndM6W;4{b@c|J3C39qYcKx=wmvC_S>A@7Ns;?C zC31K+{qBqHn~x<=ONLi1ek6}D&i)7C{vKMX)xkIUZ8=|nvD`C>kZ>JZF7t#jJaaWHjv%OiB%?-qBf*1ao}mhWi{WG<{va2t>1nOOfM#F@M!CL*5#ZXInNmeJ1F)SvF))+59VU7 zCvwJ8G2Lw+iw$d;T6d#UiPL-1|41g(jcc6R?FpMtWd6kDXLq*PGM~-!|AZXE(8TO@CMpq5K<`wvc^N+W zH@U;U%SAk;$?j(2?sUf|*#D&_zy8~r@$9X%h**F3l-Uc9rpjf4ZVxH=#Oe;ruz=g~ zenB0lTo=E2#*BtNB~ud&3jh&4xQmByJw5hPnW&Y2`m8MLI?#8n}_kaGorF z5}!Q#=i(>426E32#8}rpvfLjNHj(NdVlv6^7r<<9R$1Yr4p-~}b_4HLds7~oZ9IH? ze>6=GuT-%X7&V0$IrzAf&mjni_fbWL{& z{srKu4y|nGs;i5V-0!x+?#R02;x0~BiSFuNoRq%F>>dX`PwPkmPREFAZ^t7~fQkcO zJA-NC{EkH3z?q}vPNuEhlk}_EjSyd9Wj38Z z*ZKjU)Tq%C<1i_k6uk!Ya8aaMlvn0$t#==F3Xv zIe%vX&aqMZrDcaO?8RmQR=)R;kQdqx79-p{fsyf=zxc-udxgifI-|9hhWMq0%Kzj@ z1f0!Q3qQHOqT{j!n*X@a$&7Dx#QPhH{Iay;-`x>hy~V}19>M=Weo(NX=1x?$NZ!(*()3f9F26OP^xOUj;|K!IxkObKm#zG zPC-#9IkQrIZ)(x_+J3OFbc7&97^A$t{2kL*mOlZDJ4FpK%;5HNsL3xiD>Rq5j+F~^ zu}qQwO>|=ZIDy{O6l9o?^;vJFe+U6KsICFG0`8QEleP%(i{;dni|qyCjAABIseQGEna`Fq+j>%xVyL=(voXmGF*rq+c|)w<%^1adZWICg zw#dZxRk9{VT9NPmN-;zDiM4CH&!PuZbToqJ5XW-FFwLF)w>Dw2)Gho*!ZV(f_l(H{ z95Jah2z!qPwTWNA`a52w{;(?Seh^^o<2K74u(BZz3~Y-n&84ZYF#&ZA?zeOrN*vP~ z`)T1v<*BV0uLmj>!T9d7LsT9hXfgE0rhZ3lb5ChsI7^QHrR*!&L5^Nr)X;_GPmd%0 za z(6w!FRo3+=Y(70v^(s;kO#dt4bYxh??t1m;N_F25+m1u^$ye5#h1(E&)2MMzvs%$rAhgI6_&X9`U)DUV`zOt1KJ5E(U-{+m=EG%ff8?Vd7|@K8&H%Y3;QFaW{Xq?y{-)eKm zK}xfz-oW^+J;dnOhb|(Hm;OK;W||t+`S^VBe4$}XY5TWJ;n?5zKEdb5V!i-&6z=3XlZE{YkhlPMNH8?r4A4ijhoOM>;n_&$sQ9< z(viStHN@S+KN??eXa-l!r<6iG@*s22gayf2)qr&=&_9O0HsNlP8)mh+SgVk7Yhf1gDo(b*#IjD=;94)j8%lhrm-PBzr z1|5h6Q3Ty94|*4}bL9@T9rs`rZo=;DoqtgIoF5guAwsxBz&76w*mZ` zyDb&q4;qY$y-gfcLPnc1_K+9jQ0XxYabUA6lNol7e^o#7^(3V~A%T#ssqVKILt~K8 zY)+X@G!N-Uq}Q53-7zscb7LgZveV@{tM=&F;I*YE-tlKP1$U1Bnv&VmlKURv5bw#- geZSG~4>0)$I=od?Rg;_U@277LwZ2hx-Rsf+03&RwX8-^I