cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-09 16:14:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Spelling/grammar/wording/etc fixes (#12993)

Browse Source 
* mainly standardized the vending machine descriptions with exceptions

* oops

* more

* this time i changed a proc name but there was only one use of it

* everything gets changed!

* this commit sponsored by low-quality forum posting

* buisness

* i broke it

* but is it really robust?

* why didn't this commit

* finally, spent a lot of my morning for this

* colour

* sure it's not atomic, celt
This commit is contained in:
Wizardcrying
2016-12-23 03:01:09 -08:00
committed by Probe1
parent e87480292a
commit 6ea0489065
52 changed files with 221 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/WorkInProgress/Chinsky/ashtray.dm
View File

@@ -90,7 +90,7 @@
/obj/item/ashtray/bronze
name = "bronze ashtray"
desc = "Massive bronze ashtray."
desc = "A large ashtray made of bronze."
icon_state = "ashtray_br"
icon_empty = "ashtray_br"
icon_half = "ashtray_half_br"
@@ -100,7 +100,7 @@
health = 72.0
starting_materials = list(MAT_IRON = 80)
w_type = RECYK_METAL
empty_desc = "Massive bronze ashtray."
empty_desc = "A large ashtray made of bronze."
throwforce = 10.0
die()
@@ -112,7 +112,7 @@
/obj/item/ashtray/glass
name = "glass ashtray"
desc = "Glass ashtray. Looks fragile."
desc = "An ashtray made of glass."
icon_state = "ashtray_gl"
icon_empty = "ashtray_gl"
icon_half = "ashtray_half_gl"

90
code/datums/uplink_item.dm
View File

@@ -119,7 +119,7 @@ var/list/uplink_items = list()
//Librarian
/datum/uplink_item/jobspecific/etwenty
name = "The E20"
desc = "A seemingly innocent die, those who are not afraid to roll for attack will find it's effects quite explosive. Has a four second timer."
desc = "A seemingly innocent die. Those who are not afraid to roll for attack will find its effects quite explosive. Has a four second timer."
item = /obj/item/weapon/dice/d20/e20
cost = 6
job = list("Librarian")
@@ -140,7 +140,7 @@ var/list/uplink_items = list()
//Shaft Miner
/datum/uplink_item/jobspecific/mastertrainer
name = "Master Trainer's Belt"
desc = "A Trainer's belt containing 6 random hostile mobs loyal to you alone."
desc = "A trainer's belt containing 6 random hostile mobs loyal to you alone."
item = /obj/item/weapon/storage/belt/lazarus/antag
cost = 8
job = list("Shaft Miner")
@@ -148,14 +148,14 @@ var/list/uplink_items = list()
//Clown
/datum/uplink_item/jobspecific/clowngrenade
name = "1 Banana Grenade"
desc = "A grenade that explodes into HONK! brand banana peels that are genetically modified to be extra slippery and extrude caustic acid when stepped on"
desc = "A grenade that, when exploded, releases banana peels that are genetically modified to be extra slippery and release caustic acid when stepped on."
item = /obj/item/weapon/grenade/clown_grenade
cost = 5
job = list("Clown")
/datum/uplink_item/jobspecific/bsword
name = "Energized Bananium Sword"
desc = "When concealed a simple banana, when active a deadly means of executing swift justice. Highly regarded for their utility on away missions from the Clown Planet"
desc = "When concealed a simple banana, when active a deadly means of executing swift justice. Highly regarded for their utility on away missions from the Clown Planet."
item = /obj/item/weapon/melee/energy/sword/bsword
cost = 8
job = list("Clown")
@@ -169,7 +169,7 @@ var/list/uplink_items = list()
/datum/uplink_item/jobspecific/advancedmime
name = "Advanced Mime Gloves"
desc = "Grants the user the ability to periodically fire an invisible gun from their hands!"
desc = "Grants the user the ability to periodically fire an invisible gun from their hands."
item = /obj/item/clothing/gloves/white/advanced
cost = 12
job = list("Mime")
@@ -185,14 +185,14 @@ var/list/uplink_items = list()
//Detective
/datum/uplink_item/jobspecific/evidenceforger
name = "Evidence Forger"
desc = "An evidence scanner that allows you forge evidence by setting the output before scanning the item."
desc = "An evidence scanner that allows you to forge evidence by setting the output before scanning the item."
item = /obj/item/device/detective_scanner/forger
cost = 6
job = list("Detective")
/datum/uplink_item/jobspecific/conversionkit
name = "Conversion Kit Bundle"
desc = "A bundle that comes with a professional revolver conversion kit and 1 box of .357 ammo. The kit allows you to convert your revolver to fire lethal rounds or vice versa, modification is nearly perfect and will not result in catastrophic failure."
desc = "A bundle that comes with a professional revolver conversion kit and 1 box of .357 ammo. The kit allows you to convert your revolver to fire lethal rounds or vice versa. The modification is perfect and will not result in catastrophic failure, but remember to empty your gun first!"
item = /obj/item/weapon/storage/box/syndie_kit/conversion
cost = 12
job = list("Detective")
@@ -200,7 +200,7 @@ var/list/uplink_items = list()
//Botanist
/datum/uplink_item/jobspecific/ambrosiacruciatus
name = "Ambrosia Cruciatus Seeds"
desc = "Part of the notorious Ambrosia family, this species is nearly indistinguishable from Ambrosia Vulgaris- but its' branches contain a revolting toxin. Eight units are enough to drive victims insane after a three-minute delay."
desc = "Part of the notorious Ambrosia family, this species is nearly indistinguishable from Ambrosia Vulgaris. However, its branches contain a revolting toxin. Eight units are enough to drive victims insane after a three-minute delay."
item = /obj/item/seeds/ambrosiacruciatusseed
cost = 2
job = list("Botanist")
@@ -208,7 +208,7 @@ var/list/uplink_items = list()
//Chef
/datum/uplink_item/jobspecific/specialsauce
name = "Chef Excellence's Special Sauce"
desc = "A custom made sauce made from the toxin glands of 1000 space carp, if somebody ingests enough they'll be dead in 3 minutes or less guaranteed."
desc = "A custom made sauce made from the toxin glands of many space carp. If one ingests enough, he or she will be dead in 3 minutes or less."
item = /obj/item/weapon/reagent_containers/food/condiment/syndisauce
cost = 2
job = list("Chef")
@@ -223,7 +223,7 @@ var/list/uplink_items = list()
//Janitor
/datum/uplink_item/jobspecific/cautionsign
name = "Proximity Mine"
desc = "An Anti-Personnel proximity mine cleverly disguised as a wet floor caution sign that is triggered by running past it, activate it to start the 15 second timer and activate again to disarm."
desc = "An Anti-Personnel proximity mine cleverly disguised as a wet floor caution sign that is triggered by running past it. Interact with it to start the 15 second timer and activate again to disarm."
item = /obj/item/weapon/caution/proximity_sign
cost = 4
job = list("Janitor")
@@ -232,14 +232,14 @@ var/list/uplink_items = list()
//Assistant
/datum/uplink_item/jobspecific/pickpocketgloves
name = "Pickpocket's Gloves"
desc = "A pair of sleek gloves to aid in pickpocketing, while wearing these you can sneakily empty pockets and strip clothing with nobody seeing you. Pickpocketed items will also be put into your hand rather than fall to the ground."
desc = "A pair of sleek gloves to aid in pickpocketing, while wearing these you can sneakily strip any item without the other person being alerted. Pickpocketed items will also be put into your hand rather than fall to the ground."
item = /obj/item/clothing/gloves/black/thief
cost = 6
job = list("Assistant")
/datum/uplink_item/jobspecific/greytide
name = "Greytide Implant"
desc = "A box containing an implanter filled with a greytide implant when injected into another person makes them loyal to the greytide and your cause, unless of course they're already implanted by someone else. Loyalty ends if the implant is no longer in their system."
desc = "A box containing an implanter filled with a greytide implant when injected into another person makes them loyal to the greytide and your cause, unless they're already implanted by someone else. Loyalty ends if he or she no longer has the implant."
item = /obj/item/weapon/storage/box/syndie_kit/greytide
cost = 14
job = list("Assistant")
@@ -247,7 +247,7 @@ var/list/uplink_items = list()
//Bartender
/datum/uplink_item/jobspecific/drunkbullets
name = "Boozey Shotgun Shells"
desc = "A box containing 6 shotgun shells that simulate the effects of extreme drunkeness on the target, more effective for each type of alcohol in the target's system."
desc = "A box containing 6 shotgun shells that simulate the effects of extreme drunkenness on the target. Efficacy increases for each type of alcohol in the target's bloodstream."
item = /obj/item/weapon/storage/box/syndie_kit/boolets
cost = 6
job = list("Bartender")
@@ -255,7 +255,7 @@ var/list/uplink_items = list()
//Chemist
/datum/uplink_item/jobspecific/chemsprayer
name = "Chemical Sprayer"
desc = "A powerful industrial spraygun that holds 600 units of any liquid, and can cover area faster than a standard spray bottle."
desc = "A powerful industrial spraygun that holds 600 units of any liquid and can cover large areas faster than a standard spray bottle."
item = /obj/item/weapon/reagent_containers/spray/chemsprayer
cost = 8
job = list("Chemist", "Chief Medical Officer")
@@ -294,7 +294,7 @@ var/list/uplink_items = list()
//Geneticist
/datum/uplink_item/jobspecific/radgun
name = "Radgun"
desc = "An experimental energy gun that fires radioactive projectiles that burn, irradiate, and scramble DNA, giving the victim a different appearance and name, and potentially harmful or beneficial mutations. Recharges automatically."
desc = "An experimental energy gun that fires radioactive projectiles that burn, irradiate, and scramble DNA, giving the victim a different appearance and name, and potentially harmful or beneficial mutations. Recharges on its own."
item = /obj/item/weapon/gun/energy/radgun
cost = 12
job = list("Geneticist", "Chief Medical Officer")
@@ -329,28 +329,28 @@ var/list/uplink_items = list()
/datum/uplink_item/nukeprice/crossbow
name = "Energy Crossbow"
desc = "A miniature energy crossbow that is small enough both to fit into a pocket and to slip into a backpack unnoticed by observers. Fires bolts tipped with toxin, a poisonous substance that is the product of a living organism. Stuns enemies for a short period of time. Recharges automatically."
desc = "A miniature energy crossbow that is small enough both to fit into a pocket and to slip into a backpack unnoticed by observers. Fires bolts tipped with an organic, poisonous substance. Stuns enemies for a short period of time. Recharges on its own."
category = "Highly Visible and Dangerous Weapons"
item = /obj/item/weapon/gun/energy/crossbow
cost = 10
/datum/uplink_item/nukeprice/voice_changer
name = "Voice Changer"
desc = "A conspicuous gas mask that mimics the voice named on your identification card. When no identification is worn, the mask will render your voice unrecognizable."
desc = "A conspicuous gas mask that mimics the voice named on your identification card. When no identification is worn, the mask will render your voice distinguishably unrecognizable."
category = "Stealth and Camouflage Items"
item = /obj/item/clothing/mask/gas/voice
cost = 8
/datum/uplink_item/nukeprice/syndigolashes
/datum/uplink_item/nukeprice/syndigaloshes
name = "No-Slip Syndicate Shoes"
desc = "These allow you to run on wet floors. They do not work on lubricated surfaces."
desc = "Allows you to run on wet floors. They do not work on lubricated surfaces and are distinguishable by their extra grip when examined closely."
category = "Stealth and Camouflage Items"
item = /obj/item/clothing/shoes/syndigaloshes
cost = 4
/datum/uplink_item/nukeprice/chameleon_jumpsuit
name = "Chameleon Jumpsuit"
desc = "A jumpsuit used to imitate the uniforms of Nanotrasen crewmembers."
desc = "A jumpsuit used to imitate the uniforms of Nanotrasen crewmembers. When caught in an EMP blast, will become psychedelic and unchangeable. When interacted with by another jumpsuit, will scan and add its appearance."
category = "Stealth and Camouflage Items"
item = /obj/item/clothing/under/chameleon
cost = 6
@@ -368,13 +368,13 @@ var/list/uplink_items = list()
/datum/uplink_item/dangerous/ammo
name = "Ammo-357"
desc = "A speedloader and seven additional rounds for the revolver. Reports indicate the presence of machinery aboard Nanotrasen space stations suitable for producing extra .357 cartridges."
desc = "A speedloader and seven additional rounds for the revolver. Extra seven-piece boxes of .357 rounds can be made in a modified protolathe."
item = /obj/item/weapon/storage/box/syndie_kit/ammo
cost = 4
/datum/uplink_item/dangerous/crossbow
name = "Energy Crossbow"
desc = "A miniature energy crossbow that is small enough both to fit into a pocket and to slip into a backpack unnoticed by observers. Fires bolts tipped with toxin, a poisonous substance that is the product of a living organism. Stuns enemies for a short period of time. Recharges automatically."
desc = "A miniature energy crossbow that is small enough both to fit into a pocket and to slip into a backpack unnoticed by observers. Fires bolts tipped with an organic, poisonous substance. Stuns enemies for a short period of time. Recharges on its own."
item = /obj/item/weapon/gun/energy/crossbow
cost = 12
excludefrom = list("nuclear emergency")
@@ -411,7 +411,7 @@ var/list/uplink_items = list()
/datum/uplink_item/stealthy_weapons/para_pen
name = "Paralysis Pen"
desc = "A syringe disguised as a functional pen, filled with a neuromuscular-blocking drug that renders a target immobile on injection and makes them seem dead to observers. Side effects of the drug include noticeable drooling. The pen holds one dose of paralyzing agent, and cannot be refilled."
desc = "A syringe disguised as a functional pen, filled with a neuromuscular-blocking drug that renders a target immobile on injection and makes them appear dead to observers and scanners. Side effects of the drug include noticeable drooling. The pen holds one dose of paralyzing agent, and cannot be refilled."
item = /obj/item/weapon/pen/paralysis
cost = 8
@@ -423,7 +423,7 @@ var/list/uplink_items = list()
/datum/uplink_item/stealthy_weapons/detomatix
name = "Detomatix PDA Cartridge"
desc = "When inserted into a personal digital assistant, this cartridge gives you five opportunities to detonate PDAs of crewmembers who have their message feature enabled. The concussive effect from the explosion will knock the recipient out for a short period, and deafen them for longer. It has a chance to detonate your PDA."
desc = "When inserted into a Personal Data Assistant, this cartridge gives you five opportunities to detonate PDAs of crewmembers who have their message feature enabled. The concussive effect from the explosion will knock the recipient out for a short period, and deafen them for longer. It has a chance to detonate your PDA."
item = /obj/item/weapon/cartridge/syndicate
cost = 6
@@ -440,14 +440,14 @@ var/list/uplink_items = list()
/datum/uplink_item/stealthy_tools/chameleon_jumpsuit
name = "Chameleon Jumpsuit"
desc = "A jumpsuit used to imitate the uniforms of Nanotrasen crewmembers."
desc = "A jumpsuit used to imitate the uniforms of Nanotrasen crewmembers. When caught in an EMP blast, will become psychedelic and unchangeable. When interacted with by another jumpsuit, will scan and add its appearance."
item = /obj/item/clothing/under/chameleon
cost = 2
excludefrom = list("nuclear emergency")
/datum/uplink_item/stealthy_tools/syndigolashes
/datum/uplink_item/stealthy_tools/syndigaloshes
name = "No-Slip Syndicate Shoes"
desc = "These allow you to run on wet floors. They do not work on lubricated surfaces."
desc = "Allows you to run on wet floors. They do not work on lubricated surfaces and are distinguishable by their extra grip when examined closely."
item = /obj/item/clothing/shoes/syndigaloshes
cost = 2
excludefrom = list("nuclear emergency")
@@ -460,14 +460,14 @@ var/list/uplink_items = list()
/datum/uplink_item/stealthy_tools/voice_changer
name = "Voice Changer"
desc = "A conspicuous gas mask that mimics the voice named on your identification card. When no identification is worn, the mask will render your voice unrecognizable."
desc = "A conspicuous gas mask that mimics the voice named on your identification card. When no identification is worn, the mask will render your voice distinguishably unrecognizable."
item = /obj/item/clothing/mask/gas/voice
cost = 5
excludefrom = list("nuclear emergency")
/datum/uplink_item/stealthy_tools/dnascrambler
name = "DNA Scrambler"
desc = "A syringe with one injection that randomizes appearance and name upon use. A cheaper but less versatile alternative to an agent card and voice changer."
desc = "A syringe with one injection that randomizes appearance and name upon use. A cheaper but less versatile alternative to an agent card and voice changer. A crewmember with a copy of the crew manifest and/or a security HUD could question your identity."
item = /obj/item/weapon/dnascrambler
cost = 4
@@ -492,19 +492,19 @@ var/list/uplink_items = list()
/datum/uplink_item/device_tools/emag
name = "Cryptographic Sequencer"
desc = "The emag is a small card that unlocks hidden functions in electronic devices, subverts intended functions and characteristically breaks security mechanisms."
desc = "Also referred to as the \"emag\", a small card that unlocks hidden functions in electronic devices, subverts intended functions and characteristically breaks security mechanisms. Many machines will show signs of tampering if used."
item = /obj/item/weapon/card/emag
cost = 6
/datum/uplink_item/device_tools/toolbox
name = "Fully Loaded Toolbox"
desc = "The syndicate toolbox is a suspicious black and red. Aside from tools, it comes with cable and a multitool. Insulated gloves are not included."
desc = "A suspicious black and red toolbox with a cable coil and multitool. Insulated gloves are not included."
item = /obj/item/weapon/storage/toolbox/syndicate
cost = 1
/datum/uplink_item/device_tools/bugdetector
name = "Bug Detector"
desc = "A functional multitool that can detect certain surveillance devices. Its screen changes color if the AI or a pAI can see you, or if a tape recorder or voice analyzer is nearby. Examine it to see everything it detects."
desc = "A functional multitool that can detect certain surveillance devices. Its screen changes color if the AI or a pAI can see you, or if a tape recorder or voice analyzer is nearby. Conspicuous if currently detecting something. Examine it to see everything it detects. "
item = /obj/item/device/multitool/ai_detect
cost = 3
@@ -516,37 +516,37 @@ var/list/uplink_items = list()
/datum/uplink_item/device_tools/thermal
name = "Thermal Imaging Glasses"
desc = "These glasses are thermals disguised as engineers' optical meson scanners. They allow you to see organisms through walls by capturing the upper portion of the infrared light spectrum, emitted as heat and light by objects. Hotter objects, such as warm bodies, cybernetic organisms and artificial intelligence cores emit more of this light than cooler objects like walls and airlocks."
desc = "These glasses are thermals disguised as engineers' optical meson scanners. Allows you to see organisms through walls and regardless of light."
item = /obj/item/clothing/glasses/thermal/syndi
cost = 6
/datum/uplink_item/device_tools/surveillance
name = "Camera Surveillance Kit"
desc = "This kit contains 5 Camera bugs and one mobile receiver. Attach camera bugs to a camera to enable remote viewing."
desc = "A kit containing five camera bugs and one mobile receiver. Attach camera bugs to a camera to enable remote viewing."
item = /obj/item/weapon/storage/box/syndie_kit/surveillance
cost = 6
/datum/uplink_item/device_tools/camerabugs
name = "Camera Bugs"
desc = "This is a Camera bug resupply giving you 5 more camera bugs."
desc = "A box of five camera bugs. Does not come with a receiver."
item = /obj/item/weapon/storage/box/surveillance
cost = 4
/datum/uplink_item/device_tools/binary
name = "Binary Translator Key"
desc = "A key, that when inserted into a radio headset, allows you to listen to and talk with artificial intelligences and cybernetic organisms in binary."
desc = "A key that, when inserted into a radio headset, allows you to listen to and talk with artificial intelligences and cybernetic organisms in binary."
item = /obj/item/device/encryptionkey/binary
cost = 5
/datum/uplink_item/device_tools/cipherkey
name = "Centcomm Encryption Key"
desc = "A key, that when inserted into a radio headset, allows you to listen to and talk on all known radio channels."
desc = "A key that, when inserted into a radio headset, allows you to listen to and talk on all known radio channels."
item = /obj/item/device/encryptionkey/syndicate/hacked
cost = 4
/datum/uplink_item/device_tools/hacked_module
name = "Hacked AI Upload Module"
desc = "When used with an upload console, this module allows you to upload priority laws to an artificial intelligence. Be careful with their wording, as artificial intelligences may look for loopholes to exploit."
desc = "When used with an upload console, this module allows you to upload priority laws to an artificial intelligence. Be careful with their wording, as artificial intelligences may look for loopholes to exploit. The laws uploaded surpass core laws and have priority in the order they are uploaded."
item = /obj/item/weapon/aiModule/freeform/syndicate
cost = 14
@@ -558,7 +558,7 @@ var/list/uplink_items = list()
/datum/uplink_item/device_tools/powersink
name = "Power Sink"
desc = "When screwed to wiring attached to an electric grid, then activated, this large device places excessive load on the grid, causing a stationwide blackout. The sink cannot be carried because of its excessive size. Ordering this sends you a small beacon that will teleport the power sink to your location on activation."
desc = "When screwed to wiring attached to an electric grid, then activated, this large device places excessive load on the grid, causing a stationwide blackout. The sink cannot be carried because of its massive size. Ordering this sends you a small beacon that will teleport the power sink to your location on activation."
item = /obj/item/device/powersink
cost = 10
@@ -576,7 +576,7 @@ var/list/uplink_items = list()
/datum/uplink_item/device_tools/teleporter
name = "Teleporter Circuit Board"
desc = "A printed circuit board that completes the teleporter onboard the mothership. Advise you test fire the teleporter before entering it, as malfunctions can occur."
desc = "A printed circuit board that completes the teleporter onboard the mothership. It is advised to test fire the teleporter before entering it, as malfunctions can occur."
item = /obj/item/weapon/circuitboard/teleporter
cost = 40
gamemodes = list("nuclear emergency")
@@ -595,25 +595,25 @@ var/list/uplink_items = list()
/datum/uplink_item/implants/freedom
name = "Freedom Implant"
desc = "An implant injected into the body and later activated using a bodily gesture to attempt to slip restraints."
desc = "An implant usable after injection into the body. Activated using a bodily gesture to slip restraints. Has four uses."
item = /obj/item/weapon/storage/box/syndie_kit/imp_freedom
cost = 5
/datum/uplink_item/implants/uplink
name = "Uplink Implant"
desc = "An implant injected into the body, and later activated using a bodily gesture to open an uplink with 10 telecrystals. The ability for an agent to open an uplink after their posessions have been stripped from them makes this implant excellent for escaping confinement."
desc = "An implant usable after injection into the body. Activated using a bodily gesture to open an uplink with 10 telecrystals. The ability for an agent to open an uplink after their posessions have been stripped from them makes this implant excellent for escaping confinement."
item = /obj/item/weapon/storage/box/syndie_kit/imp_uplink
cost = 18
/datum/uplink_item/implants/explosive
name = "Explosive Implant"
desc = "An implant injected into the body, and later activated using a vocal command to cause a large explosion from the implant."
desc = "An implant usable after injection into the body. Activated using a vocal command to cause a large explosion from the implant."
item = /obj/item/weapon/storage/box/syndie_kit/imp_explosive
cost = 12
/datum/uplink_item/implants/compression
name = "Compressed Matter Implant"
desc = "An implant injected into the body, and later activated using a bodily gesture to retrieve an item that was earlier compressed."
desc = "An implant usable after injection into the body. Activated using a bodily gesture to retrieve an item that was earlier compressed."
item = /obj/item/weapon/storage/box/syndie_kit/imp_compress
cost = 8
@@ -625,7 +625,7 @@ var/list/uplink_items = list()
/datum/uplink_item/badass/bundle
name = "Syndicate Bundle"
desc = "Syndicate Bundles are specialised groups of items that arrive in a plain box. These items are collectively worth more than 20 telecrystals, but you do not know which specialisation you will receive."
desc = "Syndicate Bundles are specialised bundles of Syndicate items that arrive in a plain box. These items are collectively worth more than 20 telecrystals, but you do not know which bundle you will receive."
item = /obj/item/weapon/storage/box/syndicate
cost = 20

26
code/game/dna/dna_modifier.dm
View File

@@ -37,7 +37,7 @@
/////////////////////////// DNA MACHINES
/obj/machinery/dna_scannernew
name = "\improper DNA modifier"
desc = "It scans DNA structures."
desc = "A machine that scans the DNA structures of an organism for use with adjacent machinery. Can modify an organism's DNA as well as perform other functions with the use of a console."
icon = 'icons/obj/Cryogenic2.dmi'
icon_state = "scanner_0"
density = 1
@@ -100,7 +100,7 @@
/obj/machinery/dna_scannernew/crowbarDestroy(mob/user)
if(occupant)
to_chat(user, "<span class='warning'>You cannot disassemble \the [src], it's occupado.</span>")
to_chat(user, "<span class='warning'>\the [src] is occupied.</span>")
return
return ..()
@@ -134,7 +134,7 @@
if(usr.incapacitated() || usr.lying) //are you cuffed, dying, lying, stunned or other
return
if (!ishuman(usr) && !ismonkey(usr)) //Make sure they're a mob that has dna
to_chat(usr, "<span class='notice'> Try as you might, you can not climb up into the scanner.</span>")
to_chat(usr, "<span class='notice'>You cannot enter \the [src].</span>")
return
if (istype(usr, /mob/living/carbon/human/manifested))
to_chat(usr, "<span class='notice'> For some reason, the scanner is unable to read your genes.</span>")//to prevent a loophole that allows cultist to turn manifested ghosts into normal humans
@@ -275,7 +275,7 @@
if(ghost)
if(ghost.client && ghost.can_reenter_corpse)
ghost << 'sound/effects/adminhelp.ogg'
to_chat(ghost, "<span class='interface big'><span class='bold'>Your corpse has been placed into a cloning scanner. Return to your body if you want to be resurrected/cloned!</span> \
to_chat(ghost, "<span class='interface big'><span class='bold'>Your corpse has been placed into a cloning scanner. Return to your body if you want to be cloned!</span> \
(Verbs -> Ghost -> Re-enter corpse, or <a href='?src=\ref[ghost];reentercorpse=1'>click here!</a>)</span>")
break
break
@@ -314,7 +314,7 @@
var/mob/dead/observer/ghost = get_ghost_from_mind(M.mind)
if(ghost && ghost.client)
ghost << 'sound/effects/adminhelp.ogg'
to_chat(ghost, "<span class='interface big'><span class='bold'>Your corpse has been placed into a cloning scanner. Return to your body if you want to be resurrected/cloned!</span> \
to_chat(ghost, "<span class='interface big'><span class='bold'>Your corpse has been placed into a cloning scanner. Return to your body if you want to be cloned!</span> \
(Verbs -> Ghost -> Re-enter corpse, or <a href='?src=\ref[src];reentercorpse=1'>click here!</a>)</span>")
/obj/machinery/dna_scannernew/ex_act(severity)
@@ -360,7 +360,7 @@
/obj/machinery/computer/scan_consolenew
name = "DNA Modifier Access Console"
desc = "Scans DNA."
desc = "Uses a DNA modifier to manipulate DNA via radiation as well as perform other functions."
icon = 'icons/obj/computer.dmi'
icon_state = "dna"
density = 1
@@ -644,7 +644,7 @@
if (href_list["pulseRadiation"])
if(connected.contains_husk())
to_chat(usr, "<span class='notice'>You cannot do this to a husked corpse.</span>")
to_chat(usr, "<span class='notice'>The organism inside does not have DNA.</span>")
return 1
irradiating = src.radiation_duration
var/lock_state = src.connected.locked
@@ -745,7 +745,7 @@
if (href_list["pulseUIRadiation"])
if(connected.contains_husk())
to_chat(usr, "<span class='notice'>You cannot do this to a husked corpse.</span>")
to_chat(usr, "<span class='notice'>The organism inside does not have DNA.</span>")
return 1
var/block = src.connected.occupant.dna.GetUISubBlock(src.selected_ui_block,src.selected_ui_subblock)
@@ -804,7 +804,7 @@
if (href_list["pulseSERadiation"])
if(connected.contains_husk())
to_chat(usr, "<span class='notice'>You cannot do this to a husked corpse.</span>")
to_chat(usr, "<span class='notice'>The organism inside does not have DNA.</span>")
return 1
var/block = src.connected.occupant.dna.GetSESubBlock(src.selected_se_block,src.selected_se_subblock)
//var/original_block=block
@@ -923,7 +923,7 @@
if (bufferOption == "saveUI")
if(connected.contains_husk())
to_chat(usr, "<span class='notice'>You cannot do this to a husked corpse.</span>")
to_chat(usr, "<span class='notice'>The organism inside does not have DNA.</span>")
return 1
if(src.connected.occupant && src.connected.occupant.dna)
var/datum/dna2/record/databuf=new
@@ -937,7 +937,7 @@
if (bufferOption == "saveUIAndUE")
if(connected.contains_husk())
to_chat(usr, "<span class='notice'>You cannot do this to a husked corpse.</span>")
to_chat(usr, "<span class='notice'>The organism inside does not have DNA.</span>")
return 1
if(src.connected.occupant && src.connected.occupant.dna)
var/datum/dna2/record/databuf=new
@@ -951,7 +951,7 @@
if (bufferOption == "saveSE")
if(connected.contains_husk())
to_chat(usr, "<span class='notice'>You cannot do this to a husked corpse.</span>")
to_chat(usr, "<span class='notice'>The organism inside does not have DNA.</span>")
return 1
if(src.connected.occupant && src.connected.occupant.dna)
var/datum/dna2/record/databuf=new
@@ -976,7 +976,7 @@
if (bufferOption == "transfer")
if(connected.contains_husk())
to_chat(usr, "<span class='notice'>You cannot do this to a husked corpse.</span>")
to_chat(usr, "<span class='notice'>The organism inside does not have DNA.</span>")
return 1
if (!src.connected.occupant || (M_NOCLONE in src.connected.occupant.mutations) || !src.connected.occupant.dna)
return

2
code/game/gamemodes/blob/blobs/core.dm
View File

@@ -1,7 +1,7 @@
/obj/effect/blob/core
name = "blob core"
icon_state = "core"
desc = "Some big pulsating blob creature thingy"
desc = "A part of a blob. It is large and pulsating."
health = 200
maxhealth = 200
fire_resist = 2

2
code/game/gamemodes/blob/blobs/factory.dm
View File

@@ -1,7 +1,7 @@
/obj/effect/blob/factory
name = "factory blob"
icon_state = "factory"
desc = "Some antibodies-producing blob creature thingy"
desc = "A part of a blob. It makes the sound of organic tissue being torn."
health = 100
maxhealth = 100
fire_resist = 2

2
code/game/gamemodes/blob/blobs/node.dm
View File

@@ -1,7 +1,7 @@
/obj/effect/blob/node
name = "blob node"
icon_state = "node"
desc = "Some pulsating blob creature thingy"
desc = "A part of a blob."
health = 100
maxhealth = 100
fire_resist = 2

2
code/game/gamemodes/blob/blobs/resource.dm
View File

@@ -1,7 +1,7 @@
/obj/effect/blob/resource
name = "resource blob"
icon_state = "resource"
desc = "Some smoke-producing blob creature thingy"
desc = "A part of a blob. It makes a slow, deep breathing sound."
health = 30
maxhealth = 30
fire_resist = 2

2
code/game/gamemodes/blob/blobs/shield.dm
View File

@@ -1,7 +1,7 @@
/obj/effect/blob/shield
name = "strong blob"
icon_state = "strong"
desc = "Some very dense blob creature thingy"
desc = "A dense part of a blob."
health = 75
maxhealth = 75
fire_resist = 2

2
code/game/gamemodes/blob/theblob.dm
View File

@@ -41,7 +41,7 @@ var/list/blob_looks
icon = 'icons/mob/blob/blob_64x64.dmi'
icon_state = "center"
luminosity = 2
desc = "Some blob creature thingy"
desc = "A part of a blob."
density = 0 //Necessary for spore pathfinding
opacity = 0
anchored = 1

4
code/game/gamemodes/cult/runes.dm
View File

@@ -614,7 +614,7 @@
D.canmove = 0
var/atom/movable/overlay/animation = null
usr.visible_message("<span class='warning'> A shape forms in the center of the rune. A shape of... a man.<BR>The world feels blury as your soul permeates this temporary body.</span>", \
usr.visible_message("<span class='warning'> A shape forms in the center of the rune. A shape of... a man.<BR>The world feels blurry as your soul permeates this temporary body.</span>", \
"<span class='warning'> A shape forms in the center of the rune. A shape of... a man.</span>", \
"<span class='warning'>You hear liquid flowing.</span>")
@@ -1309,7 +1309,7 @@
usr.whisper("Sa tatha najin")
if(ishuman(user))
var/mob/living/carbon/human/P = user
usr.visible_message("<span class='warning'> In flash of red light, a set of armor appears on [usr]...</span>", \
usr.visible_message("<span class='warning'> In flash of red light, a set of armor appears on [usr].</span>", \
"<span class='warning'>You are blinded by the flash of red light! After you're able to see again, you see that you are now wearing a set of armor.</span>")
var/datum/game_mode/cult/mode_ticker = ticker.mode
if(isplasmaman(P))

2
code/game/machinery/OpTable.dm
View File

@@ -1,5 +1,5 @@
/obj/machinery/optable
name = "Operating Table"
name = "operating table"
desc = "Used for advanced medical procedures."
icon = 'icons/obj/surgery.dmi'
icon_state = "table2-idle"

4
code/game/machinery/bioprinter.dm
View File

@@ -2,7 +2,7 @@
/obj/machinery/bioprinter
name = "bioprinter"
desc = "It's a machine that grows replacement organs using meat and metal."
desc = "A machine that grows replacement organs using meat and metal."
icon = 'icons/obj/surgery.dmi'
icon_state = "bioprinter"
@@ -53,7 +53,7 @@
/obj/machinery/bioprinter/prosthetics
name = "prosthetics fabricator"
desc = "It's a machine that prints prosthetic organs."
desc = "A machine that prints prosthetic organs."
prints_prosthetics = 1
/obj/machinery/bioprinter/attack_hand(mob/user)

2
code/game/machinery/computer/HolodeckControl.dm
View File

@@ -368,7 +368,7 @@
/obj/structure/table/holotable/wood
name = "table"
desc = "A square piece of wood standing on four wooden legs. It can not move."
desc = "A square piece of wood standing on four wooden legs. It cannot move."
icon = 'icons/obj/structures.dmi'
icon_state = "woodtable"

3
code/game/machinery/computer/Operating.dm
View File

@@ -1,7 +1,8 @@
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
/obj/machinery/computer/operating
name = "Operating Computer"
name = "operating computer"
desc = "Used to monitor an organism's health on an adjacent operating table."
density = 1
anchored = 1.0
icon_state = "operating"

2
code/game/machinery/computer/communications.dm
View File

@@ -36,7 +36,7 @@ var/shuttle_call/shuttle_calls[0]
// The communications computer
/obj/machinery/computer/communications
name = "Communications Console"
desc = "This can be used for various important functions. Still under developement."
desc = "A console that is used for various important Command functions."
icon_state = "comm"
req_access = list(access_heads)
circuit = "/obj/item/weapon/circuitboard/communications"

2
code/game/machinery/computer/medical.dm
View File

@@ -515,7 +515,7 @@
/obj/machinery/computer/med_data/laptop
name = "Medical Laptop"
desc = "Cheap Nanotrasen Laptop."
desc = "A cheap laptop connected to the medical records."
icon_state = "medlaptop"
machine_flags = 0

2
code/game/machinery/computer/security.dm
View File

@@ -2,7 +2,7 @@
/obj/machinery/computer/secure_data//TODO:SANITY
name = "Security Records"
desc = "Used to view and edit personnel's security records"
desc = "Used to view and edit personnel's security records."
icon_state = "security"
req_one_access = list(access_security, access_forensics_lockers)
circuit = "/obj/item/weapon/circuitboard/secure_data"

4
code/game/machinery/defibcharger.dm
View File

@@ -1,6 +1,6 @@
obj/machinery/recharger/defibcharger/wallcharger // obj/machinery/recharger/defibcharger define doesn't exist, don't bother trying to look for it
name = "defibrillator recharger"
desc = "A special wall mounted recharger meant for emergency defibrillators"
desc = "A special wall-mounted recharger used to recharge defibrillators."
icon = 'icons/obj/stationobjs.dmi'
icon_state = "wrecharger0"
anchored = 1
@@ -102,4 +102,4 @@ obj/machinery/recharger/defibcharger/wallcharger/attackby(obj/item/weapon/G as o
else if (isscrewdriver(G) || iscrowbar(G))
..()
else
to_chat(user, "<span class='warning'>\The [G] isn't a defibrillator, it won't fit!</span>")
to_chat(user, "<span class='warning'>\The [G] isn't a defibrillator, it won't fit!</span>")

2
code/game/machinery/igniter.dm
View File

@@ -78,7 +78,7 @@ var/global/list/igniters = list()
return
else
:
to_chat(user, "<span class='warning'>You need more welder fuel to do that.</span>")
to_chat(user, "<span class='warning'>You need more welding fuel to do that.</span>")
return 1

2
code/game/machinery/requests_console.dm
View File

@@ -7,7 +7,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
/obj/machinery/requests_console
name = "requests console"
desc = "A console intended to send requests to diferent departments on the station."
desc = "A console intended to send requests to various departments on the station."
anchored = 1
icon = 'icons/obj/terminals.dmi'
icon_state = "req_comp0"

78
code/game/machinery/vending.dm
View File

@@ -28,7 +28,7 @@ var/global/num_vending_terminals = 1
/obj/machinery/vending
name = "Empty vending machine"
desc = "Just add some capitalism."
desc = "Just add capitalism!"
icon = 'icons/obj/vending.dmi'
icon_state = "empty"
var/obj/structure/vendomatpack/pack = null
@@ -397,7 +397,7 @@ var/global/num_vending_terminals = 1
if(bag.contents.len > 0)
to_chat(user, "<span class='notice'>Some items are refused.</span>")
src.updateUsrDialog()
else if(istype(W, /obj/item/weapon/spacecash))
var/obj/item/weapon/spacecash/C = W
pay_with_cash(C, user)
@@ -427,7 +427,7 @@ var/global/num_vending_terminals = 1
* usr is the mob who gets the change.
*/
/obj/machinery/vending/proc/pay_with_cash(var/obj/item/weapon/spacecash/cashmoney, mob/user)
if(!currently_vending)
if(!currently_vending)
return
if(currently_vending.price > cashmoney.get_total())
// This is not a status display message, since it's something the character
@@ -1010,7 +1010,7 @@ var/global/num_vending_terminals = 1
/obj/machinery/vending/boozeomat
name = "Booze-O-Mat"
desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one."
desc = "A vending machine containing multiple drinks for bartending."
req_access = list(access_bar)
icon_state = "boozeomat" //////////////18 drink entities below, plus the glasses, in case someone wants to edit the number of bottles
icon_deny = "boozeomat-deny"
@@ -1049,7 +1049,7 @@ var/global/num_vending_terminals = 1
/obj/machinery/vending/assist
name = "Vendomat"
desc = "A generic vending machine."
desc = "A vending machine containing generic parts."
icon_state = "generic"
products = list(
/obj/item/device/assembly/prox_sensor = 5,
@@ -1076,7 +1076,7 @@ var/global/num_vending_terminals = 1
/obj/machinery/vending/coffee
name = "Hot Drinks machine"
desc = "A vending machine which dispenses hot drinks."
desc = "A vending machine that dispenses hot drinks."
product_ads = "Have a drink!;Drink up!;It's good for you!;Would you like a hot joe?;I'd kill for some coffee!;The best beans in the galaxy.;Only the finest brew for you.;Mmmm. Nothing like a coffee.;I like coffee, don't you?;Coffee helps you work!;Try some tea.;We hope you like the best!;Try our new chocolate!;Admin conspiracies"
icon_state = COFFEE
icon_vend = "coffee-vend"
@@ -1101,7 +1101,7 @@ var/global/num_vending_terminals = 1
/obj/machinery/vending/snack
name = "Getmore Chocolate Corp"
desc = "A snack machine courtesy of the Getmore Chocolate Corporation, based out of Mars"
desc = "A vending machine containing snacks."
product_slogans = "Try our new nougat bar!;Half the calories for double the price!;It's better than Dan's!"
product_ads = "The healthiest!;Award-winning chocolate bars!;Mmm! So good!;Oh my god it's so juicy!;Have a snack.;Snacks are good for you!;Have some more Getmore!;Best quality snacks straight from mars.;We love chocolate!;Try our new jerky!"
icon_state = "snack"
@@ -1163,7 +1163,7 @@ var/global/num_vending_terminals = 1
//This one's from bay12
/obj/machinery/vending/cart
name = "PTech"
desc = "Cartridges for PDAs"
desc = "A vending machine containing Personal Data Assistant cartridges."
req_access = list(access_change_ids)
product_slogans = "Carts to go!"
icon_state = "cart"
@@ -1195,7 +1195,7 @@ var/global/num_vending_terminals = 1
/obj/machinery/vending/cigarette
name = "Cigarette machine" //OCD had to be uppercase to look nice with the new formating
desc = "If you want to get cancer, might as well do it in style"
desc = "A vending machine containing smoking supplies."
product_slogans = "Space cigs taste good like a cigarette should.;I'd rather toolbox than switch.;Smoke!;Don't believe the reports - smoke today!"
product_ads = "Probably not bad for you!;Don't believe the scientists!;It's good for you!;Don't quit, buy more!;Smoke!;Nicotine heaven.;Best cigarettes since 2150.;Award-winning cigs."
icon_state = "cigs"
@@ -1221,7 +1221,7 @@ var/global/num_vending_terminals = 1
/obj/machinery/vending/medical
name = "NanoMed Plus"
desc = "Medical drug dispenser."
desc = "A vending machine containing medical supplies."
req_access = list(access_medical)
icon_state = "med"
icon_deny = "med-deny"
@@ -1270,7 +1270,7 @@ var/global/num_vending_terminals = 1
/obj/machinery/vending/wallmed1
name = "NanoMed"
desc = "Wall-mounted Medical Equipment dispenser."
desc = "Wall-mounted medical equipment dispenser."
//req_access = list(access_medical)
product_ads = "Go save some lives!;The best stuff for your medbay.;Only the finest tools.;Natural chemicals!;This stuff saves lives.;Don't you want some?"
icon_state = "wallmed"
@@ -1293,7 +1293,7 @@ var/global/num_vending_terminals = 1
/obj/machinery/vending/wallmed2
name = "NanoMed"
desc = "Wall-mounted Medical Equipment dispenser."
desc = "Wall-mounted medical equipment dispenser."
//req_access = list(access_medical)
icon_state = "wallmed"
icon_deny = "wallmed-deny"
@@ -1500,9 +1500,9 @@ var/global/num_vending_terminals = 1
/obj/machinery/vending/security
name = "SecTech"
desc = "A security equipment vendor"
desc = "A vending machine containing Security equipment. A label reads \"SECURITY PERSONNEL ONLY\"."
req_access = list(access_security)
product_ads = "Crack capitalist skulls!;Beat some heads in!;Don't forget - harm is good!;Your weapons are right here.;Handcuffs!;Freeze, scumbag!;Don't tase me bro!;Tase them, bro.;Why not have a donut?"
product_ads = "Crack capitalist skulls!;Beat some heads in!;Don't forget - harm is good!;Your weapons are right here.;Handcuffs!;Freeze, scumbag!;Tase them, bro.;Why not have a donut?"
icon_state = "sec"
icon_deny = "sec-deny"
products = list(
@@ -1541,7 +1541,7 @@ var/global/num_vending_terminals = 1
/obj/machinery/vending/hydronutrients
name = "NutriMax"
desc = "A plant nutrients vendor"
desc = "A vending machine containing nutritional substances for plants and botanical tools."
product_slogans = "Aren't you glad you don't have to fertilize the natural way?;Now with 50% less stink!;Plants are people too!"
product_ads = "We like plants!;Don't you want some?;The greenest thumbs ever.;We like big plants.;Soft soil..."
icon_state = "nutri"
@@ -1565,7 +1565,7 @@ var/global/num_vending_terminals = 1
/obj/machinery/vending/hydroseeds
name = "MegaSeed Servitor"
desc = "When you need seeds fast!"
desc = "A vending machine containing plant seeds."
product_slogans = "THIS'S WHERE TH' SEEDS LIVE! GIT YOU SOME!;Hands down the best seed selection on the station!;Also certain mushroom varieties available, more for experts! Get certified today!"
product_ads = "We like plants!;Grow some crops!;Grow, baby, growww!;Aw h'yeah son!"
icon_state = "seeds"
@@ -1620,7 +1620,7 @@ var/global/num_vending_terminals = 1
/obj/machinery/vending/voxseeds
name = "Vox Seed 'n' Feed"
desc = "When not having time to steal human seeds!"
desc = "A vending machine containing exotic seeds. A label reads: \"When not having time to get human seeds!\""
product_slogans = "SEEDS LIVING HERE! GETTING SOME!;Claws down, best seed selection on Vox Outpost.;Sell, sell!"
product_ads = "Making more gravy soon?;Growing profits!;Is good!;Vox food being best."
icon_state = "voxseed"
@@ -1645,12 +1645,12 @@ var/global/num_vending_terminals = 1
/obj/machinery/vending/magivend
name = "MagiVend"
desc = "A magic vending machine."
desc = "A mystical vending machine containing magical garments and magic supplies."
icon_state = "MagiVend"
product_slogans = "Sling spells the proper way with MagiVend!;Be your own Houdini! Use MagiVend!"
vend_delay = 15
vend_reply = "Have an enchanted evening!"
product_ads = "FJKLFJSD;AJKFLBJAKL;1234 LOONIES LOL!;>MFW;Kill them fuckers!;GET DAT FUKKEN DISK;HONK!;EI NATH;Destroy the station!;Admin conspiracies since forever!;Space-time bending hardware!"
product_ads = "FJKLFJSD;AJKFLBJAKL;1234 LOONIES LOL!;>MFW;Kill them fuckers!;GET DAT FUKKEN DISK;HONK!;EI NATH!;Destroy the station!;Admin conspiracies since forever!;Space-time bending hardware!"
products = list(
/obj/item/clothing/head/wizard = 5,
/obj/item/clothing/suit/wizrobe = 5,
@@ -1689,7 +1689,7 @@ var/global/num_vending_terminals = 1
/obj/machinery/vending/dinnerware
name = "Dinnerware"
desc = "A kitchen and restaurant equipment vendor"
desc = "A vending machine containing kitchen and restaurant equipment."
product_ads = "Mm, food stuffs!;Food and food accessories.;Get your plates!;You like forks?;I like forks.;Woo, utensils.;You don't really need these..."
icon_state = "dinnerware"
products = list(
@@ -1717,7 +1717,7 @@ var/global/num_vending_terminals = 1
/obj/machinery/vending/sovietsoda
name = "BODA"
desc = "Old sweet water vending machine"
desc = "An old vending machine containing sweet water."
icon_state = "sovietsoda"
product_slogans = "BODA: We sell drink.;BODA: Drink today.;BODA: We're better then Comrade Dan."
product_ads = "For Tsar and Country.;Have you fulfilled your nutrition quota today?;Very nice!;We are simple people, for this is all we eat.;If there is a person, there is a problem. If there is no person, then there is no problem."
@@ -1739,7 +1739,7 @@ var/global/num_vending_terminals = 1
/obj/machinery/vending/tool
name = "YouTool"
desc = "Tools for tools."
desc = "A vending machine containing standard tools. A label reads: \"Tools for tools.\""
//req_access = list(access_maint_tunnels)
icon_state = "tool"
icon_deny = "tool-deny"
@@ -1801,7 +1801,7 @@ var/global/num_vending_terminals = 1
//This one's from bay12
/obj/machinery/vending/engineering
name = "Robco Tool Maker"
desc = "Everything you need for do-it-yourself station repair."
desc = "A vending machine containing many engineering supplies. A label reads: \"Everything you need for do-it-yourself station repair.\""
req_access = list(access_engine_equip)
icon_state = "engi"
icon_deny = "engi-deny"
@@ -1857,7 +1857,7 @@ var/global/num_vending_terminals = 1
//This one's from bay12
/obj/machinery/vending/robotics
name = "Robotech Deluxe"
desc = "All the tools you need to create your own robot army."
desc = "A vending machine containing roboticizing supplies. A label reads: \"All the tools you need to create your own robot army.\""
req_access = list(access_robotics)
icon_state = "robotics"
icon_deny = "robotics-deny"
@@ -1883,7 +1883,7 @@ var/global/num_vending_terminals = 1
/obj/machinery/vending/autodrobe
name = "\improper AutoDrobe"
desc = "A vending machine for costumes."
desc = "A vending machine containing costumes."
icon_state = "theater"
icon_deny = "theater-deny"
req_access = list(access_theatre)
@@ -2018,7 +2018,7 @@ var/global/num_vending_terminals = 1
/obj/machinery/vending/hatdispenser
name = "Hatlord 9000"
desc = "It doesn't seem the slightist bit unusual. This frustrates you immensly."
desc = "A vending machine containing hats."
icon_state = "hats"
vend_reply = "Take care now!"
product_ads = "Buy some hats!;A bare head is absoloutly ASKING for a robusting!"
@@ -2048,7 +2048,7 @@ var/global/num_vending_terminals = 1
/obj/machinery/vending/suitdispenser
name = "Suitlord 9000"
desc = "You wonder for a moment why all of your shirts and pants come conjoined. This hurts your head and you stop thinking about it."
desc = "A vending machine containing jumpsuits and dress garments."
icon_state = "suits"
vend_reply = "Come again!"
product_ads = "Skinny? Looking for some clothes? Suitlord is the machine for you!;BUY MY PRODUCT!"
@@ -2096,10 +2096,10 @@ var/global/num_vending_terminals = 1
//THIS IS WHERE THE FEET LIVE, GIT YE SOME
/obj/machinery/vending/shoedispenser
name = "Shoelord 9000"
desc = "Wow, hatlord looked fancy, suitlord looked streamlined, and this is just normal. The guy who designed these must be an idiot."
desc = "A vending machine containing footwear."
icon_state = "shoes"
vend_reply = "Enjoy your pair!"
product_ads = "Dont be a hobbit: Choose shoelord.;Shoes snatched? Get on it with shoelord."
product_ads = "Dont be a hobbit: Choose Shoelord.;Shoes snatched? Get on it with Shoelord."
product_slogans = "Put your foot down!;One size fits all!;IM WALKING ON SUNSHINE!;No hobbits allowed.;NO PLEASE WILLY, DONT HURT ME- *BZZT*"
products = list(
/obj/item/clothing/shoes/black = 10,
@@ -2125,7 +2125,7 @@ var/global/num_vending_terminals = 1
//HEIL ADMINBUS
/obj/machinery/vending/nazivend
name = "Nazivend"
desc = "Remember the gorrilions lost."
desc = "A vending machine containing Nazi German supplies. A label reads: \"Remember the gorrilions lost.\""
icon_state = "nazi"
vend_reply = "SIEG HEIL!"
product_ads = "BESTRAFEN die Juden.;BESTRAFEN die Alliierten."
@@ -2149,8 +2149,8 @@ var/global/num_vending_terminals = 1
/obj/machinery/vending/nazivend/emag(mob/user)
if(!emagged)
to_chat(user, "<span class='warning'>As you slide the emag on the machine, you can hear something unlocking inside, and the machine starts emitting an evil glow.</span>")
message_admins("[key_name_admin(user)] unlocked a Nazivend's DANGERMODE")
to_chat(user, "<span class='warning'>As you slide the card into the machine, you hear something unlocking inside. The machine emits an evil glow.</span>")
message_admins("[key_name_admin(user)] unlocked a Nazivend's DANGERMODE!")
contraband[/obj/item/clothing/head/helmet/space/rig/nazi] = 3
contraband[/obj/item/clothing/suit/space/rig/nazi] = 3
contraband[/obj/item/weapon/gun/energy/plasma/MP40k] = 4
@@ -2197,7 +2197,7 @@ var/global/num_vending_terminals = 1
name = "KomradeVendtink"
desc = "Rodina-mat' zovyot!"
icon_state = "soviet"
vend_reply = "The fascist and capitalist svin'ya shall fall komrade!"
vend_reply = "The fascist and capitalist svin'ya shall fall, komrade!"
product_ads = "Quality worth waiting in line for!; Get Hammer and Sickled!; Sosvietsky soyuz above all!; With capitalist pigsky, you would have paid a fortunetink!"
product_slogans = "Craftink in Motherland herself!"
products = list(
@@ -2223,8 +2223,8 @@ var/global/num_vending_terminals = 1
/obj/machinery/vending/sovietvend/emag(mob/user)
if(!emagged)
to_chat(user, "<span class='warning'>As you slide the emag on the machine, you can hear something unlocking inside, and the machine starts emitting an evil glow.</span>")
message_admins("[key_name_admin(user)] unlocked a Sovietvend's DANGERMODE")
to_chat(user, "<span class='warning'>As you slide the card into the machine, you hear something unlocking inside. The machine emits an evil glow.</span>")
message_admins("[key_name_admin(user)] unlocked a Sovietvend's DANGERMODE!")
contraband[/obj/item/clothing/head/helmet/space/rig/soviet] = 3
contraband[/obj/item/clothing/suit/space/rig/soviet] = 3
contraband[/obj/item/weapon/gun/energy/laser/LaserAK] = 4
@@ -2272,7 +2272,7 @@ var/global/num_vending_terminals = 1
/obj/machinery/vending/discount
name = "Discount Dan's"
desc = "A snack machine owned by the infamous 'Discount Dan' franchise."
desc = "A vending machine containing discount snacks. It is owned by the infamous 'Discount Dan' franchise."
product_slogans = "Discount Dan, he's the man!;There 'aint nothing better in this world than a bite of mystery.;Don't listen to those other machines, buy my product!;Quantity over Quality!;Don't listen to those eggheads at the CDC, buy now!;Discount Dan's: We're good for you! Nope, couldn't say it with a straight face.;Discount Dan's: Only the best quality produ-*BZZT*"
product_ads = "Discount Dan(tm) is not responsible for any damages caused by misuse of his product."
vend_reply = "No refunds."
@@ -2302,7 +2302,7 @@ var/global/num_vending_terminals = 1
/obj/machinery/vending/groans
name = "Groans Soda"
desc = "A soda machine owned by the infamous 'Groans' franchise."
desc = "A vending machine containing discount drinks. It is owned by the infamous 'Groans' franchise."
product_slogans = "Groans: Drink up!;Sponsored by Discount Dan!;Take a sip!;Just one sip, do it!"
product_ads = "Try our new 'Double Dan' flavor!"
vend_reply = "No refunds."
@@ -2330,7 +2330,7 @@ var/global/num_vending_terminals = 1
/obj/machinery/vending/nuka
name = "Nuka Cola Machine"
desc = "A machine filled to the brim with ice cold Nuka Cola!"
desc = "A vending machine filled to the brim with ice cold Nuka Cola!"
product_slogans = "A refreshing burst of atomic energy!;Drink like there's no tomorrow!;Take the leap... enjoy a Quantum!"
product_ads = "Wouldn't you enjoy an ice cold Nuka Cola right about now?"
vend_reply = "Enjoy a Nuka break!"
@@ -2343,7 +2343,7 @@ var/global/num_vending_terminals = 1
/obj/machinery/vending/chapel
name = "PietyVend"
desc = "A holy vendor for a pious man."
desc = "A vending machine containing religious supplies and clothing. A label reads: \"A holy vendor for a pious man.\""
req_access = list(access_chapel_office)
product_slogans = "Bene orasse est bene studuisse.;Beati pauperes spiritu.;Di immortales virtutem approbare, non adhibere debent."
product_ads = "Deus tecum."

6
code/game/objects/effects/decals/posters/bs12.dm
View File

@@ -97,7 +97,7 @@
/datum/poster/bay_20
icon_state="bsposter20"
name = "Skrell Twilight"
desc = "This poster depicts a mysteriously inscrutable, alien scene. Numerous Skrell can be seen conversing amidst great, crystalline towers rising above crashing waves"
desc = "This poster depicts a mysteriously inscrutable, alien scene. Numerous Skrell can be seen conversing amidst great, crystalline towers rising above crashing waves."
/datum/poster/bay_21
icon_state="bsposter21"
@@ -107,7 +107,7 @@
/datum/poster/bay_22
icon_state="bsposter22"
name = "Looking for a career with excitement?"
desc = "A recruitment poster starring a dark haired woman with glasses and a purple shirt that has \"Got Brains? Got Talent? Not afraid of electric flying monsters that want to suck the soul out of you? Then Xenobiology could use someone like you!\" written on the bottom."
desc = "A recruitment poster starring a dark haired woman with glasses and a purple shirt that has \"Got Brains? Got Talent? Not afraid of electric monsters that want to suck the soul out of you? Then Xenobiology could use someone like you!\" written on the bottom."
/datum/poster/bay_23
icon_state="bsposter23"
@@ -142,4 +142,4 @@
/datum/poster/bay_29
icon_state="bsposter29"
name = "Winter Is Coming"
desc = "On the poster is a frighteningly large wolf, he warns: \"Only YOU can keep the station from freezing during planetary occultation!\""
desc = "On the poster is a frighteningly large wolf, he warns: \"Only YOU can keep the station from freezing during planetary occultation!\""

2
code/game/objects/items/devices/radio/headset.dm
View File

@@ -1,6 +1,6 @@
/obj/item/device/radio/headset
name = "radio headset"
desc = "An updated, modular intercom that fits over the head. Takes encryption keys"
desc = "An updated, modular intercom that fits over the head. Takes encryption keys."
icon_state = "headset"
item_state = "headset"
starting_materials = list(MAT_IRON = 75)

16
code/game/objects/items/weapons/cards_ids.dm
View File

@@ -542,7 +542,7 @@
name = "Research ID"
registered_name = "Scientist"
icon_state = "research"
desc = "Pinnacle of name technology."
desc = "The pinnacle of name technology."
access = list(access_science, access_rnd, access_tox_storage, access_robotics, access_xenobiology, access_rd)
/obj/item/weapon/card/id/supply
@@ -563,21 +563,21 @@
name = "Head of Security ID"
registered_name = "HoS"
icon_state = "HoS"
desc = "An ID awarded to only the most robust shits in the buisness."
desc = "An ID awarded to only the most robust shits in the business."
access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers, access_science, access_engine, access_mining, access_medical, access_construction, access_mailsorting, access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway)
/obj/item/weapon/card/id/cmo
name = "Chief Medical Officer ID"
registered_name = "CMO"
icon_state = "CMO"
desc = "It gives off the faint smell of chloral, mixed with a backdraft of shittery."
desc = "It gives off the faint smell of chloral hydrate, mixed with a backdraft of equipment abuse."
access = list(access_medical, access_morgue, access_genetics, access_heads, access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce, access_keycard_auth, access_sec_doors, access_paramedic, access_maint_tunnels)
/obj/item/weapon/card/id/rd
name = "Research Director ID"
registered_name = "RD"
icon_state = "RD"
desc = "If you put your ear to the card, you can faintly hear screaming, glomping, and mechs. What the fuck."
desc = "If you put your ear to the card, you can faintly hear screaming, glomping, and mechs. What the fuck?"
access = list(access_rd, access_heads, access_rnd, access_genetics, access_morgue, access_tox_storage, access_teleporter, access_sec_doors, access_science, access_robotics, access_xenobiology, access_ai_upload, access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway)
/obj/item/weapon/card/id/ce
@@ -591,7 +591,7 @@
name = "Pink ID"
registered_name = "HONK!"
icon_state = "clown"
desc = "Even looking at the card strikes you with deep fear."
desc = "Just looking at the card strikes you with deep fear."
access = list(access_clown, access_theatre, access_maint_tunnels)
/obj/item/weapon/card/id/mime
@@ -606,18 +606,18 @@
registered_name = "Red Team Fighter"
assignment = "Red Team Fighter"
icon_state = "TDred"
desc = "This ID card is given to those who fought inside the thunderdome for the Red Team. Not many have lived to see one of those, even fewer lived to keep it."
desc = "This ID card is given to those who fought inside the thunderdome for the Red Team. Not many have lived to see one of these, and even fewer lived to keep them."
/obj/item/weapon/card/id/thunderdome/green
name = "Thunderdome Green ID"
registered_name = "Green Team Fighter"
assignment = "Green Team Fighter"
icon_state = "TDgreen"
desc = "This ID card is given to those who fought inside the thunderdome for the Green Team. Not many have lived to see one of those, even fewer lived to keep it."
desc = "This ID card is given to those who fought inside the thunderdome for the Green Team. Not many have lived to see one of these, and even fewer lived to keep them."
/obj/item/weapon/card/id/vox
name = "traveler's ID"
desc = "A traveler's ID card, required to legally travel in human-controlled territories. It's very worn out and the photo is almost unrecognizable."
desc = "A traveler's ID card, required to legally travel in human-controlled territories. It shows signs of wear and the photo is almost unrecognizable."
registered_name = "traveler"
assignment = "visitor"
icon_state = "trader"

2
code/game/objects/items/weapons/defib.dm
View File

@@ -4,7 +4,7 @@
/obj/item/weapon/melee/defibrillator
name = "emergency defibrillator"
desc = "Used to restore fibrilating patients, and somehow bring them back from the dead too."
desc = "Used to restore fibrillating patients."
icon = 'icons/obj/weapons.dmi'
icon_state = "defib_full"
item_state = "defib"

4
code/game/objects/items/weapons/extinguisher.dm
View File

@@ -128,8 +128,8 @@
to_chat(user, "<span class='notice'>You empty \the [src] onto [target].</span>")
user.investigation_log(I_CHEMS, "has splashed [reagents.get_reagent_ids(1)] from \a [src] ([type]) onto \the [target].")
if(reagents.has_reagent(FUEL))
message_admins("[user.name] ([user.ckey]) poured Welder Fuel onto [target]. (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
log_game("[user.name] ([user.ckey]) poured Welder Fuel onto [target]. (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
message_admins("[user.name] ([user.ckey]) poured welding fuel onto [target]. (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
log_game("[user.name] ([user.ckey]) poured welding fuel onto [target]. (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
src.reagents.reaction(target, TOUCH)
spawn(5) src.reagents.clear_reagents()
return

2
code/game/objects/items/weapons/grenades/clowngrenade.dm
View File

@@ -1,6 +1,6 @@
/obj/item/weapon/grenade/clown_grenade
name = "Banana Grenade"
desc = "HONK! brand Bananas. In a special applicator for rapid slipping of wide areas."
desc = "A grenade used for rapid slipping of larger areas. Contains banana peels that release acid when slipped on."
icon_state = "chemg"
item_state = "flashbang"
w_class = W_CLASS_SMALL

2
code/game/objects/items/weapons/paint.dm
View File

@@ -3,7 +3,7 @@
var/global/list/cached_icons = list()
/obj/item/weapon/reagent_containers/glass/paint
desc = "It's a paint bucket."
desc = "A bucket containing paint."
name = "paint bucket"
icon = 'icons/obj/items.dmi'
icon_state = "paint_neutral"

2
code/game/objects/items/weapons/shields.dm
View File

@@ -3,7 +3,7 @@
/obj/item/weapon/shield/riot
name = "riot shield"
desc = "A shield adept at blocking blunt objects from connecting with the torso of the shield wielder."
desc = "A shield adept at blocking blunt objects from connecting with the shield's wielder."
icon = 'icons/obj/weapons.dmi'
icon_state = "riot"
flags = FPRINT

28
code/game/objects/items/weapons/storage/boxes.dm
View File

@@ -48,7 +48,7 @@
/obj/item/weapon/storage/box/surveillance
name = "\improper DromedaryCo packet"
desc = "A packet of six imported DromedaryCo cancer sticks. A label on the packaging reads, \"Wouldn't a slow death make a change?\""
desc = "A packet of six imported DromedaryCo cigarettes. A label on the packaging reads: \"Wouldn't a slow death make a change?\""
icon = 'icons/obj/cigarettes.dmi'
icon_state = "Dpacket"
item_state = "Dpacket"
@@ -98,7 +98,7 @@
/obj/item/weapon/storage/box/gloves
name = "box of latex gloves"
desc = "Contains white gloves."
desc = "A box containing white latex gloves. gloves."
icon_state = "latex"
/obj/item/weapon/storage/box/gloves/New()
@@ -108,7 +108,7 @@
/obj/item/weapon/storage/box/bgloves
name = "box of black gloves"
desc = "Contains black gloves."
desc = "A box containing black gloves."
icon_state = "bgloves"
/obj/item/weapon/storage/box/bgloves/New()
@@ -118,7 +118,7 @@
/obj/item/weapon/storage/box/sunglasses
name = "box of sunglasses"
desc = "Contains sunglasses."
desc = "A box containing sunglasses."
icon_state = "sunglass"
/obj/item/weapon/storage/box/sunglasses/New()
@@ -128,7 +128,7 @@
/obj/item/weapon/storage/box/masks
name = "sterile masks"
desc = "This box contains masks of sterility."
desc = "This box contains sterile masks."
icon_state = "sterile"
/obj/item/weapon/storage/box/masks/New()
@@ -139,7 +139,7 @@
/obj/item/weapon/storage/box/syringes
name = "syringes"
desc = "A biohazard alert warning is printed on the box"
desc = "A box containing syringes. A reminder label warns of syringes becoming potential biohazards when not properly sanitized."
icon_state = "syringe"
/obj/item/weapon/storage/box/syringes/New()
@@ -181,7 +181,7 @@
/obj/item/weapon/storage/box/flashbangs
name = "box of flashbangs (WARNING)"
desc = "<B>WARNING: These devices are extremely dangerous and can cause blindness or deafness in repeated use.</B>"
desc = "<span class='userdanger'>WARNING: These devices are extremely dangerous and can cause blindness or deafness in repeated use.</span>"
icon_state = "flashbang"
/obj/item/weapon/storage/box/flashbangs/New()
@@ -209,7 +209,7 @@
/obj/item/weapon/storage/box/emps
name = "emp grenades"
desc = "A box with 5 emp grenades."
desc = "A box containing emp grenades."
icon_state = "flashbang"
/obj/item/weapon/storage/box/emps/New()
@@ -219,7 +219,7 @@
/obj/item/weapon/storage/box/wind
name = "wind grenades"
desc = "A box containing 3 wind grenades"
desc = "A box containing wind grenades."
icon_state = "flashbang"
/obj/item/weapon/storage/box/wind/New()
@@ -229,7 +229,7 @@
/obj/item/weapon/storage/box/foam
name = "metal foam grenades"
desc = "A box containing 7 metal foam grenades"
desc = "A box containing metal foam grenades."
icon_state = "metalfoam"
/obj/item/weapon/storage/box/foam/New()
@@ -327,7 +327,7 @@
/obj/item/weapon/storage/box/cups
name = "box of paper cups"
desc = "It has pictures of paper cups on the front."
desc = "It has a picture of a paper cup on the front."
/obj/item/weapon/storage/box/cups/New()
..()
@@ -337,7 +337,7 @@
/obj/item/weapon/storage/box/donkpockets
name = "box of donk-pockets"
desc = "<B>Instructions:</B> <I>Heat in microwave. Product will cool if not eaten within seven minutes.</I>"
desc = "<span class='notice'>Instructions: Heat in microwave. Product will cool if not eaten within seven minutes.</span>"
icon_state = "donk_kit"
var/pocket_amount = 6
@@ -394,7 +394,7 @@
/obj/item/weapon/storage/box/ids
name = "spare IDs"
desc = "Has so many empty IDs."
desc = "Contains blank identification cards."
icon_state = "id"
/obj/item/weapon/storage/box/ids/New()
@@ -425,7 +425,7 @@
/obj/item/weapon/storage/box/mousetraps
name = "box of Pest-B-Gon Mousetraps"
desc = "<span class='danger'>WARNING:</span> <I>Keep out of reach of children</I>."
desc = "<span class='userdanger'>WARNING: Keep out of reach of children.</span>"
icon_state = "mousetraps"
/obj/item/weapon/storage/box/mousetraps/New()

10
code/game/objects/structures/barricade.dm
View File

@@ -23,16 +23,16 @@
/obj/structure/window/barricade/examine_health(mob/user)
//Switch most likely can't take inequalities, so here's that if block
if(health >= initial(health)) //Sanity
to_chat(user, "It's in perfect shape, not even a scratch.")
to_chat(user, "It's in perfect shape without a single scratch.")
else if(health >= 0.8*initial(health))
to_chat(user, "It has a few splinters and a plank is broken.")
to_chat(user, "It has a few splinters and a broken plank.")
else if(health >= 0.5*initial(health))
to_chat(user, "It has a fair amount of splinters and broken planks.")
else if(health >= 0.2*initial(health))
to_chat(user, "It has most of its planks broken, you can barely tell how much weight the support beams are bearing.")
to_chat(user, "It has most of its planks broken and is somewhat unstable.")
else
to_chat(user, "It has only one or two planks still in shape, it's a miracle it's even standing.")
to_chat(user, "It has only one or two planks still in shape and is unstable.")
//Allows us to quickly check if we should break the barricade, can handle not having an user
//Sound is technically deprecated, but barricades should really have a build sound
/obj/structure/window/barricade/healthcheck(var/mob/M, var/sound = 1)

30
code/game/objects/structures/signs.dm
View File

@@ -125,47 +125,47 @@
/obj/structure/sign/biohazard
name = "BIOHAZARD"
desc = "A warning sign which reads 'BIOHAZARD'"
desc = "A warning sign which reads 'BIOHAZARD'."
icon_state = "bio"
/obj/structure/sign/electricshock
name = "HIGH VOLTAGE"
desc = "A warning sign which reads 'HIGH VOLTAGE'"
desc = "A warning sign which reads 'HIGH VOLTAGE'."
icon_state = "shock"
/obj/structure/sign/examroom
name = "EXAM"
desc = "A guidance sign which reads 'EXAM ROOM'"
desc = "A guidance sign which reads 'EXAM ROOM'."
icon_state = "examroom"
/obj/structure/sign/vacuum
name = "HARD VACUUM AHEAD"
desc = "A warning sign which reads 'HARD VACUUM AHEAD'"
desc = "A warning sign which reads 'HARD VACUUM AHEAD'."
icon_state = "space"
/obj/structure/sign/deathsposal
name = "DISPOSAL LEADS TO SPACE"
desc = "A warning sign which reads 'DISPOSAL LEADS TO SPACE'"
desc = "A warning sign which reads 'DISPOSAL LEADS TO SPACE'."
icon_state = "deathsposal"
/obj/structure/sign/pods
name = "ESCAPE PODS"
desc = "A warning sign which reads 'ESCAPE PODS'"
desc = "A warning sign which reads 'ESCAPE PODS'."
icon_state = "pods"
/obj/structure/sign/fire
name = "DANGER: FIRE"
desc = "A warning sign which reads 'DANGER: FIRE'"
desc = "A warning sign which reads 'DANGER: FIRE'."
icon_state = "fire"
/obj/structure/sign/nosmoking_1
name = "NO SMOKING"
desc = "A warning sign which reads 'NO SMOKING'"
desc = "A warning sign which reads 'NO SMOKING'."
icon_state = "nosmoking"
/obj/structure/sign/nosmoking_2
name = "NO SMOKING"
desc = "A warning sign which reads 'NO SMOKING'"
desc = "A warning sign which reads 'NO SMOKING'."
icon_state = "nosmoking2"
/obj/structure/sign/redcross
@@ -180,12 +180,12 @@
/obj/structure/sign/goldenplaque
name = "The Most Robust Men Award for Robustness"
desc = "To be Robust is not an action or a way of life, but a mental state. Only those with the force of Will strong enough to act during a crisis, saving friend from foe, are truly Robust. Stay Robust my friends."
desc = "\"To be robust is not an action or a way of life, but a mental state. Only those with the force of will strong enough to act during a crisis, saving friend from foe, acting when everyone else may think and act against you, are truly robust. Stay robust, my friends.\""
icon_state = "goldenplaque"
/obj/structure/sign/kiddieplaque
name = "\improper AI developer's plaque"
desc = "Next to the extremely long list of names and job titles, there is a drawing of a little child. The child appears to be retarded. Beneath the image, someone has scratched the word \"PACKETS\""
desc = "Next to the extremely long list of names and job titles, there is a drawing of a little child. The child appears to be retarded. Beneath the image, someone has scratched the word \"PACKETS\"."
icon_state = "kiddieplaque"
/obj/structure/sign/atmosplaque
@@ -195,12 +195,12 @@
/obj/structure/sign/science //These 3 have multiple types, just var-edit the icon_state to whatever one you want on the map
name = "SCIENCE!"
desc = "A warning sign which reads 'SCIENCE!'"
desc = "A warning sign which reads 'SCIENCE!'."
icon_state = "science1"
/obj/structure/sign/chemistry
name = "CHEMISTRY"
desc = "A warning sign which reads 'CHEMISTRY'"
desc = "A warning sign which reads 'CHEMISTRY'."
icon_state = "chemistry1"
/obj/structure/sign/chemtable
@@ -210,7 +210,7 @@
/obj/structure/sign/botany
name = "HYDROPONICS"
desc = "A warning sign which reads 'HYDROPONICS'"
desc = "A warning sign which reads 'HYDROPONICS'."
icon_state = "hydro1"
/obj/structure/sign/directions/science
@@ -230,7 +230,7 @@
/obj/structure/sign/directions/medical
name = "Medical Bay"
desc = "A direction sign, pointing out which way Meducal Bay is."
desc = "A direction sign, pointing out the direction of the medical bay."
icon_state = "direction_med"
/obj/structure/sign/directions/evac

2
code/game/objects/structures/stool_bed_chair_nest/bed.dm
View File

@@ -165,7 +165,7 @@
if(locked_atoms.len)
return 0
visible_message("[usr] collapses \the [src.name]")
visible_message("[usr] collapses \the [src.name].")
new/obj/item/roller(get_turf(src))

2
code/game/objects/structures/tables_racks.dm
View File

@@ -13,7 +13,7 @@
*/
/obj/structure/table
name = "table"
desc = "A square piece of metal standing on four metal legs. It can not move."
desc = "A square piece of metal standing on four metal legs. It cannot move."
icon = 'icons/obj/structures.dmi'
icon_state = "table"
density = 1

8
code/game/objects/structures/window.dm
View File

@@ -53,15 +53,15 @@
to_chat(user, "It appears to be completely loose and movable.")
//switch most likely can't take inequalities, so here's that if block
if(health >= initial(health)) //Sanity
to_chat(user, "It's in perfect shape, not even a scratch.")
to_chat(user, "It's in perfect shape without a single scratch.")
else if(health >= 0.8*initial(health))
to_chat(user, "It has a few scratches and a small impact.")
else if(health >= 0.5*initial(health))
to_chat(user, "It has a few impacts and some cracks running from them.")
to_chat(user, "It has a few impacts with some cracks running from them.")
else if(health >= 0.2*initial(health))
to_chat(user, "It's covered in impact marks and most of the outer sheet is crackled.")
to_chat(user, "It's covered in impact marks and most of the outer layer is cracked.")
else
to_chat(user, "It's completely crackled over multiple layers, it's a miracle it's even standing.")
to_chat(user, "It's cracked over multiple layers and has many impact marks.")
if(reinforced) //Normal windows can be loose or not, reinforced windows are more complex
switch(d_state)
if(WINDOWSECURE)

2
code/modules/clothing/accessories/accessory.dm
View File

@@ -279,7 +279,7 @@
/obj/item/weapon/storage/box/holobadge
name = "holobadge box"
desc = "A box claiming to contain holobadges."
desc = "A box containing holobadges."
/obj/item/weapon/storage/box/holobadge/New()
new /obj/item/clothing/accessory/holobadge(src)

6
code/modules/clothing/clothing.dm
View File

@@ -249,7 +249,7 @@
/obj/item/clothing/ears/earmuffs
name = "earmuffs"
desc = "Protects your hearing from loud noises, and quiet ones as well."
desc = "Protects your hearing from both loud and quiet noises."
icon_state = "earmuffs"
item_state = "earmuffs"
slot_flags = SLOT_EARS
@@ -417,7 +417,7 @@ BLIND // can't see anything
if(stepstaken % 2 == 1)
playsound(H, step_sound, 50, 1) // this will NEVER GET ANNOYING!
if("walk")
playsound(H, step_sound, 20, 1)
playsound(H, step_sound, 20, 1)
/obj/item/clothing/shoes/proc/on_kick(mob/living/user, mob/living/victim)
return
@@ -462,7 +462,7 @@ BLIND // can't see anything
/obj/item/clothing/suit/space
name = "Space suit"
desc = "A suit that protects against low pressure environments. Has a big 13 on the back."
desc = "A suit that protects against low pressure environments. Has a big \"13\" on the back."
icon_state = "space"
item_state = "s_suit"
w_class = W_CLASS_LARGE//bulky item

2
code/modules/clothing/shoes/miscellaneous.dm
View File

@@ -1,5 +1,5 @@
/obj/item/clothing/shoes/syndigaloshes
desc = "A pair of brown shoes. They seem to have extra grip."
desc = "A pair of brown shoes. They seem to have extra grip." //change line ~346 in code/datums/uplink_item.dm if you remove the second sentence
name = "brown shoes"
icon_state = "brown"
item_state = "brown"

4
code/modules/clothing/under/chameleon.dm
View File

@@ -54,11 +54,11 @@
set src in usr
if(icon_state == "psyche")
to_chat(usr, "<span class='warning'>Your suit is malfunctioning</span>")
to_chat(usr, "<span class='warning'>Your suit is malfunctioning.</span>")
return
var/obj/item/clothing/under/A
A = input("Select Colour to change it to", "BOOYEA", A) in clothing_choices
A = input("Select the jumpsuit's new appearance.", "BOOYEA", A) in clothing_choices
if(!A)
return

12
code/modules/clothing/under/jobs/security.dm
View File

@@ -9,7 +9,7 @@
* Security
*/
/obj/item/clothing/under/rank/warden
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."
desc = "A jumpsuit made of strong material, providing robust protection. It has the word \"WARDEN\" written on the shoulders."
name = "warden's jumpsuit"
icon_state = "warden"
item_state = "r_suit"
@@ -21,7 +21,7 @@
/obj/item/clothing/under/rank/security
name = "security officer's jumpsuit"
desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection."
desc = "A jumpsuit made of strong material, providing robust protection."
icon_state = "security"
item_state = "r_suit"
_color = "secred"
@@ -32,7 +32,7 @@
/obj/item/clothing/under/rank/security/sneaksuit
name = "sneaking suit"
desc = "It's made of a slightly sturdier material developed by the Soviet Union centuries ago, allows for robust protection."
desc = "It's made of a strong material developed by the Soviet Union centuries ago which provides robust protection."
icon_state = "sneakingsuit"
item_state = "sneakingsuit"
_color = "sneakingsuit"
@@ -51,7 +51,7 @@
/obj/item/clothing/under/rank/security2
name = "security officer's uniform"
desc = "It's made of a slightly sturdier material, to allow for robust protection."
desc = "A jumpsuit made of strong material, providing robust protection."
icon_state = "redshirt2"
item_state = "r_suit"
_color = "redshirt2"
@@ -104,7 +104,7 @@
/obj/item/clothing/suit/armor/hos
name = "armored coat"
desc = "A greatcoat enchanced with a special alloy for some protection and style."
desc = "A greatcoat enhanced with a special alloy for protection and style."
icon_state = "hos"
item_state = "hos"
body_parts_covered = ARMS|LEGS|FULL_TORSO|IGNORE_INV
@@ -123,7 +123,7 @@
/obj/item/clothing/suit/armor/hos/jensen
name = "armored trenchcoat"
desc = "A trenchcoat augmented with a special alloy for some protection and style."
desc = "A trenchcoat augmented with a special alloy for protection and style."
icon_state = "jensencoat"
item_state = "jensencoat"
siemens_coefficient = 0.6

2
code/modules/detectivework/evidence.dm
View File

@@ -84,7 +84,7 @@ obj/item/weapon/evidencebag/attackby(obj/item/weapon/W as obj, mob/living/user a
/obj/item/weapon/storage/box/evidence
name = "evidence bag box"
desc = "A box claiming to contain evidence bags."
desc = "A box containing evidence bags."
New()
new /obj/item/weapon/evidencebag(src)
new /obj/item/weapon/evidencebag(src)

1
code/modules/medical/computer/cloning.dm
View File

@@ -1,6 +1,7 @@
#define CLONEPODRANGE 7
/obj/machinery/computer/cloning
name = "cloning console"
desc = "A computer that takes DNA from a DNA scanner and uses it to clone an organism with a cloning pod."
icon = 'icons/obj/computer.dmi'
icon_state = "cloning"
circuit = "/obj/item/weapon/circuitboard/cloning"

6
code/modules/mob/living/silicon/robot/robot.dm
View File

@@ -618,10 +618,10 @@
if(G)
stat(null, text("Reinforced Glass Sheets: [G.amount]/50"))
*/
/mob/living/silicon/robot/proc/show_welder_fuel()
/mob/living/silicon/robot/proc/show_welding_fuel()
var/obj/item/weapon/weldingtool/WT = installed_module(/obj/item/weapon/weldingtool)
if(WT)
stat(null, text("Welder Fuel: [WT.get_fuel()]/[WT.max_fuel]"))
stat(null, text("Welding fuel: [WT.get_fuel()]/[WT.max_fuel]"))
/mob/living/silicon/robot/proc/show_stacks()
if(!module)
@@ -640,7 +640,7 @@
show_metal_sheets()
show_glass_sheets()
show_rglass_sheets()*/
show_welder_fuel()
show_welding_fuel()
show_stacks()

4
code/modules/power/antimatter/control.dm
View File

@@ -1,6 +1,6 @@
/obj/machinery/power/am_control_unit
name = "antimatter control unit"
desc = "This device injects antimatter into connected shielding units, the more antimatter injected the more power produced. Wrench the device to set it up."
desc = "This device injects antimatter into connected shielding units. Wrench the device to set it up."
//icon = 'icons/obj/machines/antimatter.dmi'
icon = 'icons/obj/machines/new_ame.dmi'
icon_state = "control"
@@ -403,4 +403,4 @@
return 1
updateDialog()
return 1
return 1

2
code/modules/power/antimatter/shielding.dm
View File

@@ -10,7 +10,7 @@ proc/cardinalrange(var/center)
/obj/machinery/am_shielding
name = "antimatter reactor section"
desc = "This device was built using a plasma life-form that seems to increase plasma's natural ability to react with neutrinos while reducing the combustibility."
desc = "This device was built using a plasma life-form that increases plasma's natural ability to react with neutrinos while reducing the combustibility."
//icon = 'icons/obj/machines/antimatter.dmi'
icon = 'icons/obj/machines/new_ame.dmi'

2
code/modules/power/apc.dm
View File

@@ -44,7 +44,7 @@
/obj/machinery/power/apc
desc = "A control terminal for the area electrical systems."
desc = "A control terminal for the area's electrical systems."
icon_state = "apc0"
anchored = 1
use_power = 0

28
code/modules/projectiles/guns/lawgiver.dm
View File

@@ -130,9 +130,9 @@
/obj/item/weapon/gun/lawgiver/proc/self_destruct(mob/user)
var/req_access = list(access_security)
if(can_access(user.GetAccess(),req_access))
say("ERROR: DNA PROFILE DOES NOT MATCH")
say("ERROR: DNA PROFILE DOES NOT MATCH.")
return
say("UNAUTHORIZED ACCESS DETECTED")
say("UNAUTHORIZED ACCESS DETECTED.")
explosion(user, -1, 0, 2)
qdel(src)
@@ -174,14 +174,14 @@
projectile_type = "/obj/item/projectile/energy/electrode"
fire_delay = 0
sleep(3)
say("STUN")
say("STUN.")
else if((findtext(speech.message, "laser")) || (findtext(speech.message, "lethal")) || (findtext(speech.message, "beam")))
firing_mode = LASER
fire_sound = 'sound/weapons/Laser.ogg'
projectile_type = "/obj/item/projectile/beam"
fire_delay = 5
sleep(3)
say("LASER")
say("LASER.")
else if((findtext(speech.message, "rapid")) || (findtext(speech.message, "automatic")))
firing_mode = RAPID
fire_sound = 'sound/weapons/Gunshot_c20.ogg'
@@ -189,7 +189,7 @@
fire_delay = 0
recoil = 1
sleep(3)
say("RAPID FIRE")
say("RAPID FIRE.")
else if((findtext(speech.message, "flare")) || (findtext(speech.message, "incendiary")))
firing_mode = FLARE
fire_sound = 'sound/weapons/shotgun.ogg'
@@ -197,7 +197,7 @@
fire_delay = 5
recoil = 1
sleep(3)
say("FLARE")
say("FLARE.")
else if((findtext(speech.message, "ricochet")) || (findtext(speech.message, "bounce")))
firing_mode = RICOCHET
fire_sound = 'sound/weapons/gatling_fire.ogg'
@@ -205,7 +205,7 @@
fire_delay = 5
recoil = 1
sleep(3)
say("RICOCHET")
say("RICOCHET.")
update_icon()
/obj/item/weapon/gun/lawgiver/process_chambered()
@@ -261,7 +261,7 @@
else
user.visible_message("<span class = 'warning'>[user] pulls the trigger.</span>")
click_empty(user)
say("PLEASE REGISTER A DNA SAMPLE")
say("PLEASE REGISTER A DNA SAMPLE.")
return
if (chamber_round())
user.visible_message("<span class = 'warning'>[user] pulls the trigger.</span>")
@@ -463,7 +463,7 @@
return
else
click_empty(user)
say("PLEASE REGISTER A DNA SAMPLE")
say("PLEASE REGISTER A DNA SAMPLE.")
return
if(in_chamber)
@@ -530,14 +530,14 @@
projectile_type = "/obj/item/projectile/energy/electrode"
fire_delay = 0
sleep(3)
say("STUN")
say("STUN.")
else if((findtext(speech.message, "laser")) || (findtext(speech.message, "lethal")) || (findtext(speech.message, "beam")))
firing_mode = LASER
fire_sound = 'sound/weapons/lasercannonfire.ogg'
projectile_type = "/obj/item/projectile/beam/heavylaser"
fire_delay = 5
sleep(3)
say("LASER")
say("LASER.")
else if((findtext(speech.message, "rapid")) || (findtext(speech.message, "automatic")))
firing_mode = RAPID
fire_sound = 'sound/weapons/Gunshot_c20.ogg'
@@ -545,7 +545,7 @@
fire_delay = 0
recoil = 1
sleep(3)
say("RAPID FIRE")
say("RAPID FIRE.")
else if((findtext(speech.message, "hi ex")) || (findtext(speech.message, "hi-ex")) || (findtext(speech.message, "explosive")) || (findtext(speech.message, "rocket")))
firing_mode = FLARE
fire_sound = 'sound/weapons/elecfire.ogg'
@@ -553,7 +553,7 @@
fire_delay = 5
recoil = 1
sleep(3)
say("HI-EX")
say("HIGH EXPLOSIVE.")
else if((findtext(speech.message, "ricochet")) || (findtext(speech.message, "bounce")))
firing_mode = RICOCHET
fire_sound = 'sound/weapons/gatling_fire.ogg'
@@ -561,7 +561,7 @@
fire_delay = 5
recoil = 1
sleep(3)
say("RICOCHET")
say("RICOCHET.")
update_icon()
/obj/item/weapon/gun/lawgiver/demolition/check_mag_type(obj/item/I, mob/user)

2
code/modules/reagents/reagent_containers/food/snacks.dm
View File

@@ -3454,7 +3454,7 @@
/obj/item/weapon/reagent_containers/food/snacks/bucheslice
name = "\improper Buche de Noel slice"
desc = "A slice of winter magic"
desc = "A slice of winter magic."
icon_state = "buche_slice"
trash = /obj/item/trash/plate
bitesize = 2

4
code/modules/reagents/reagent_dispenser.dm
View File

@@ -77,7 +77,7 @@
//Dispensers
/obj/structure/reagent_dispensers/watertank
name = "watertank"
desc = "A watertank"
desc = "A storage tank containing water."
icon = 'icons/obj/objects.dmi'
icon_state = "watertank"
amount_per_transfer_from_this = 10
@@ -88,7 +88,7 @@
/obj/structure/reagent_dispensers/fueltank
name = "fueltank"
desc = "A fueltank"
desc = "A storage tank containing welding fuel."
icon = 'icons/obj/objects.dmi'
icon_state = "weldtank"
amount_per_transfer_from_this = 10

2
code/modules/recycling/conveyor2.dm
View File

@@ -9,7 +9,7 @@
icon_state = "conveyor0"
name = "conveyor belt"
desc = "A conveyor belt.\
<br><span class='info'>It looks like it can be pried into a different direction using a crowbar but cannot be moved without welding it apart.</span>"
<br><span class='info'>It can be pried into a different direction using a crowbar, but cannot be moved without welding it apart.</span>"
anchored = 1
var/operating = 0 // 1 if running forward, -1 if backwards, 0 if off

2
code/modules/research/xenoarchaeology/tools/tools_coresampler.dm
View File

@@ -2,7 +2,7 @@
/obj/item/weapon/storage/box/samplebags
name = "sample bag box"
desc = "A box claiming to contain sample bags."
desc = "A box containing sample bags."
/obj/item/weapon/storage/box/samplebags/New()
for(var/i=0, i<7, i++)

2
maps/ministation/uplink_item.dm
View File

@@ -20,7 +20,7 @@
..()
item = null // Disabled
/datum/uplink_item/stealthy_tools/syndigolashes/New()
/datum/uplink_item/stealthy_tools/syndigaloshes/New()
..()
cost = 10