cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Grammar fixes to atom descriptions (#3165)

Browse Source 
* Grammar fixes to atom descriptions

* compile errors
This commit is contained in:
CitadelStationBot
2017-10-21 07:17:03 -05:00
committed by Poojawa
parent e827f02863
commit d25cb1ba5d
151 changed files with 296 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/_onclick/hud/alert.dm
View File

@@ -173,7 +173,7 @@
/obj/screen/alert/verygross
name = "Very grossed out."
desc = "I'm not feeling very well.."
desc = "You're not feeling very well..."
icon_state = "gross2"
/obj/screen/alert/disgusted

2
code/game/gamemodes/changeling/powers/linglink.dm
View File

@@ -1,6 +1,6 @@
/obj/effect/proc_holder/changeling/linglink
name = "Hivemind Link"
desc = "Link your victim's mind into the hivemind for personal interrogation"
desc = "Link your victim's mind into the hivemind for personal interrogation."
chemical_cost = 0
dna_cost = 0
req_human = 1

2
code/game/gamemodes/changeling/powers/mutations.dm
View File

@@ -257,7 +257,7 @@
/obj/item/ammo_casing/magic/tentacle
name = "tentacle"
desc = "a tentacle."
desc = "A tentacle."
projectile_type = /obj/item/projectile/tentacle
caliber = "tentacle"
icon_state = "tentacle_end"

2
code/game/gamemodes/changeling/powers/tiny_prick.dm
View File

@@ -1,6 +1,6 @@
/obj/effect/proc_holder/changeling/sting
name = "Tiny Prick"
desc = "Stabby stabby"
desc = "Stabby stabby."
var/sting_icon = null
/obj/effect/proc_holder/changeling/sting/Click()

2
code/game/gamemodes/cult/cult_items.dm
View File

@@ -302,7 +302,7 @@
/obj/item/clothing/suit/magusred
name = "magus robes"
desc = "A set of armored robes worn by the followers of Nar-Sie"
desc = "A set of armored robes worn by the followers of Nar-Sie."
icon_state = "magusred"
item_state = "magusred"
body_parts_covered = CHEST|GROIN|LEGS|ARMS

3
code/game/gamemodes/miniantags/abduction/abduction_gear.dm
View File

@@ -498,7 +498,6 @@ Congratulations! You are now trained for invasive xenobiology research!"}
origin_tech = "materials=4;magnets=5;abductor=2"
/obj/item/restraints/handcuffs/energy/used
desc = "energy discharge"
flags_1 = DROPDEL_1
/obj/item/restraints/handcuffs/energy/used/dropped(mob/user)
@@ -597,7 +596,7 @@ Congratulations! You are now trained for invasive xenobiology research!"}
/obj/structure/bed/abductor
name = "resting contraption"
desc = "This looks similar to contraptions from earth. Could aliens be stealing our technology?"
desc = "This looks similar to contraptions from Earth. Could aliens be stealing our technology?"
icon = 'icons/obj/abductor.dmi'
buildstacktype = /obj/item/stack/sheet/mineral/abductor
icon_state = "bed"

6
code/game/gamemodes/miniantags/monkey/monkey.dm
View File

@@ -42,8 +42,7 @@
/datum/game_mode/monkey/announce()
to_chat(world, "<B>The current game mode is - Monkey!</B>")
to_chat(world, "<B>One or more crewmembers have been infected with Jungle Fever! Crew: Contain the outbreak. None of the infected monkeys may escape alive to CentCom. \
Monkeys: Ensure that your kind lives on! Rise up against your captors!</B>")
to_chat(world, "<B>One or more crewmembers have been infected with Jungle Fever! Crew: Contain the outbreak. None of the infected monkeys may escape alive to CentCom. Monkeys: Ensure that your kind lives on! Rise up against your captors!</B>")
/datum/game_mode/monkey/proc/greet_carrier(datum/mind/carrier)
@@ -115,5 +114,4 @@
to_chat(world, "<span class='userdanger'>The staff managed to contain the monkey infestation!</span>")
/datum/game_mode/monkey/generate_report()
return "Reports of an ancient [pick("retrovirus", "flesh eating bacteria", "disease", "magical curse blamed on viruses", "bananna blight")] outbreak that turn humans into monkies has been \
reported in your quadrant. Any such infections may be treated with bananna juice. If an outbreak occurs, ensure the station is quarantined to prevent a largescale outbreak at Centcom."
return "Reports of an ancient [pick("retrovirus", "flesh eating bacteria", "disease", "magical curse blamed on viruses", "banana blight")] outbreak that turn humans into monkeys has been reported in your quadrant. Any such infections may be treated with banana juice. If an outbreak occurs, ensure the station is quarantined to prevent a largescale outbreak at CentCom."

2
code/game/gamemodes/traitor/double_agents.dm
View File

@@ -77,5 +77,5 @@
/datum/game_mode/traitor/internal_affairs/generate_report()
return "Nanotrasen denies any accusations of placing internal affairs agents onboard your station to eliminate inconvenient employees. Any further accusations against Centcom for such \
return "Nanotrasen denies any accusations of placing internal affairs agents onboard your station to eliminate inconvenient employees. Any further accusations against CentCom for such \
actions will be met with a conversation with an official internal affairs agent."

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

@@ -1,7 +1,7 @@
//computer that handle the points and teleports the prisoner
/obj/machinery/computer/gulag_teleporter_computer
name = "labor camp teleporter console"
desc = "Used to send criminals to the Labor Camp"
desc = "Used to send criminals to the Labor Camp."
icon_screen = "explosive"
icon_keyboard = "security_key"
req_access = list(ACCESS_ARMORY)

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

@@ -140,4 +140,4 @@
/obj/machinery/computer/pod/old/swf
name = "\improper Magix System IV"
desc = "An arcane artifact that holds much magic. Running E-Knock 2.2: Sorceror's Edition"
desc = "An arcane artifact that holds much magic. Running E-Knock 2.2: Sorceror's Edition."

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

@@ -4,7 +4,7 @@
/obj/item/wallframe/firealarm
name = "fire alarm frame"
desc = "Used for building fire alarms"
desc = "Used for building fire alarms."
icon = 'icons/obj/monitors.dmi'
icon_state = "fire_bitem"
result_path = /obj/machinery/firealarm

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

@@ -1,6 +1,6 @@
/obj/machinery/gulag_item_reclaimer
name = "equipment reclaimer station"
desc = "Used to reclaim your items after you finish your sentence at the labor camp"
desc = "Used to reclaim your items after you finish your sentence at the labor camp."
icon = 'icons/obj/terminals.dmi'
icon_state = "dorm_taken"
req_access = list(ACCESS_SECURITY) //REQACCESS TO ACCESS ALL STORED ITEMS

4
code/game/machinery/pipe/construction.dm
View File

@@ -9,7 +9,7 @@ Buildable meters
/obj/item/pipe
name = "pipe"
desc = "A pipe"
desc = "A pipe."
var/pipe_type = 0
var/pipename
force = 7
@@ -298,7 +298,7 @@ GLOBAL_LIST_INIT(pipeID2State, list(
/obj/item/pipe_meter
name = "meter"
desc = "A meter that can be laid on pipes"
desc = "A meter that can be laid on pipes."
icon = 'icons/obj/atmospherics/pipes/pipe_item.dmi'
icon_state = "meter"
item_state = "buildpipe"

2
code/game/machinery/porta_turret/portable_turret.dm
View File

@@ -790,7 +790,7 @@
/obj/item/wallframe/turret_control
name = "turret control frame"
desc = "Used for building turret control panels"
desc = "Used for building turret control panels."
icon_state = "apc"
result_path = /obj/machinery/turretid
materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT)

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

@@ -55,7 +55,7 @@
/obj/structure/emergency_shield/invoker
name = "Invoker's Shield"
desc = "A weak shield summoned by cultists to protect them while they carry out delicate rituals"
desc = "A weak shield summoned by cultists to protect them while they carry out delicate rituals."
color = "#FF0000"
max_integrity = 20
mouse_opacity = MOUSE_OPACITY_TRANSPARENT

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

@@ -515,7 +515,7 @@
/obj/item/device/syndicatedetonator
name = "big red button"
desc = "Your standard issue bomb synchronizing button. Five second safety delay to prevent 'accidents'"
desc = "Your standard issue bomb synchronizing button. Five second safety delay to prevent 'accidents'."
icon = 'icons/obj/assemblies.dmi'
icon_state = "bigred"
item_state = "electronic"

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

@@ -796,7 +796,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
//This one's from bay12
/obj/machinery/vending/cart
name = "\improper PTech"
desc = "Cartridges for PDAs"
desc = "Cartridges for PDAs."
product_slogans = "Carts to go!"
icon_state = "cart"
icon_deny = "cart-deny"
@@ -890,7 +890,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
/obj/machinery/vending/security
name = "\improper SecTech"
desc = "A security equipment vendor"
desc = "A security equipment vendor."
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?"
icon_state = "sec"
icon_deny = "sec-deny"
@@ -1006,7 +1006,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
/obj/machinery/vending/dinnerware
name = "\improper Plasteel Chef's Dinnerware Vendor"
desc = "A kitchen and restaurant equipment vendor"
desc = "A kitchen and restaurant equipment vendor."
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(/obj/item/storage/bag/tray = 8, /obj/item/kitchen/fork = 6, /obj/item/kitchen/knife = 6, /obj/item/kitchen/rollingpin = 2, /obj/item/reagent_containers/food/drinks/drinkingglass = 8, /obj/item/clothing/suit/apron/chef = 2, /obj/item/reagent_containers/food/condiment/pack/ketchup = 5, /obj/item/reagent_containers/food/condiment/pack/hotsauce = 5, /obj/item/reagent_containers/food/condiment/saltshaker = 5, /obj/item/reagent_containers/food/condiment/peppermill = 5, /obj/item/reagent_containers/glass/bowl = 20)
@@ -1016,7 +1016,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
/obj/machinery/vending/sovietsoda
name = "\improper BODA"
desc = "Old sweet water vending machine"
desc = "Old sweet water vending machine."
icon_state = "sovietsoda"
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."
products = list(/obj/item/reagent_containers/food/drinks/drinkingglass/filled/soda = 30)

2
code/game/mecha/equipment/weapons/weapons.dm
View File

@@ -101,7 +101,7 @@
/obj/item/mecha_parts/mecha_equipment/weapon/energy/tesla
equip_cooldown = 35
name = "\improper MKI Tesla Cannon"
desc = "A weapon for combat exosuits. Fires bolts of electricity similar to the experimental tesla engine"
desc = "A weapon for combat exosuits. Fires bolts of electricity similar to the experimental tesla engine."
icon_state = "mecha_ion"
origin_tech = "materials=4;engineering=4;combat=6;magnets=6"
energy_drain = 500

2
code/game/objects/effects/countdown.dm
View File

@@ -3,7 +3,7 @@
desc = "We're leaving together\n\
But still it's farewell\n\
And maybe we'll come back\n\
To earth, who can tell?"
To Earth, who can tell?"
var/displayed_text
var/atom/attached_to

4
code/game/objects/effects/effect_system/effects_foam.dm
View File

@@ -260,8 +260,8 @@
//Atmos Backpack Resin, transparent, prevents atmos and filters the air
/obj/structure/foamedmetal/resin
name = "ATMOS Resin"
desc = "A lightweight, transparent resin used to suffocate fires, scrub the air of toxins, and restore the air to a safe temperature"
name = "\improper ATMOS Resin"
desc = "A lightweight, transparent resin used to suffocate fires, scrub the air of toxins, and restore the air to a safe temperature."
opacity = FALSE
icon_state = "atmos_resin"
alpha = 120

6
code/game/objects/effects/spiders.dm
View File

@@ -2,7 +2,7 @@
/obj/structure/spider
name = "web"
icon = 'icons/effects/effects.dmi'
desc = "it's stringy and sticky"
desc = "It's stringy and sticky."
anchored = TRUE
density = FALSE
max_integrity = 15
@@ -48,7 +48,7 @@
/obj/structure/spider/eggcluster
name = "egg cluster"
desc = "They seem to pulse slightly with an inner life"
desc = "They seem to pulse slightly with an inner life."
icon_state = "eggs"
var/amount_grown = 0
var/player_spiders = 0
@@ -205,7 +205,7 @@
/obj/structure/spider/cocoon
name = "cocoon"
desc = "Something wrapped in silky spider web"
desc = "Something wrapped in silky spider web."
icon_state = "cocoon1"
max_integrity = 60

2
code/game/objects/items/RCD.dm
View File

@@ -431,7 +431,7 @@ ARCD
/obj/item/construction/rcd/arcd
name = "advanced rapid-construction-device (ARCD)"
desc = "A prototype RCD with ranged capability and extended capacity"
desc = "A prototype RCD with ranged capability and extended capacity."
max_matter = 300
matter = 300
delay_mod = 0.6

2
code/game/objects/items/apc_frame.dm
View File

@@ -83,7 +83,7 @@
// APC HULL
/obj/item/wallframe/apc
name = "\improper APC frame"
desc = "Used for repairing or building APCs"
desc = "Used for repairing or building APCs."
icon_state = "apc"
result_path = /obj/machinery/power/apc
inverse = 1

6
code/game/objects/items/cards_ids.dm
View File

@@ -224,7 +224,7 @@ update_label("John Doe", "Clowny")
/obj/item/card/id/centcom
name = "\improper CentCom ID"
desc = "An ID straight from Cent. Com."
desc = "An ID straight from Central Command."
icon_state = "centcom"
registered_name = "Central Command"
assignment = "General"
@@ -235,7 +235,7 @@ update_label("John Doe", "Clowny")
/obj/item/card/id/ert
name = "\improper CentCom ID"
desc = "A ERT ID card"
desc = "An ERT ID card."
icon_state = "centcom"
registered_name = "Emergency Response Team Commander"
assignment = "Emergency Response Team Commander"
@@ -351,6 +351,6 @@ update_label("John Doe", "Clowny")
/obj/item/card/id/away/old/apc
name = "APC Access ID"
desc = "Special ID card to allow access to APCs"
desc = "Special ID card to allow access to APCs."
icon_state = "centcom"
access = list(ACCESS_ENGINE_EQUIP)

2
code/game/objects/items/devices/PDA/virus_cart.dm
View File

@@ -20,7 +20,7 @@
/obj/item/cartridge/virus/clown
name = "\improper Honkworks 5.0 cartridge"
icon_state = "cart-clown"
desc = "A data cartridge for portable microcomputers. It smells vaguely of banannas"
desc = "A data cartridge for portable microcomputers. It smells vaguely of bananas."
access = CART_CLOWN
/obj/item/cartridge/virus/clown/send_virus(obj/item/device/pda/target, mob/living/U)

2
code/game/objects/items/devices/multitool.dm
View File

@@ -74,7 +74,7 @@
break
/obj/item/device/multitool/ai_detect/admin
desc = "Used for pulsing wires to test which to cut. Not recommended by doctors. Has a strange tag that says 'Grief in Safety'" //What else should I say for a meme item?
desc = "Used for pulsing wires to test which to cut. Not recommended by doctors. Has a strange tag that says 'Grief in Safety'." //What else should I say for a meme item?
track_delay = 5
/obj/item/device/multitool/ai_detect/admin/multitool_detect()

4
code/game/objects/items/devices/radio/encryptionkey.dm
View File

@@ -122,8 +122,8 @@
channels = list("Service" = 1)
/obj/item/device/encryptionkey/headset_cent
name = "centcom radio encryption key"
desc = "An encryption key for a radio headset. To access the centcom channel, use :y."
name = "\improper CentCom radio encryption key"
desc = "An encryption key for a radio headset. To access the CentCom channel, use :y."
icon_state = "cent_cypherkey"
independent = TRUE
channels = list("CentCom" = 1)

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

@@ -191,7 +191,7 @@
/obj/item/device/radio/headset/headset_cent
name = "\improper CentCom headset"
desc = "A headset used by the upper echelons of Nanotrasen. \nTo access the centcom channel, use :y."
desc = "A headset used by the upper echelons of Nanotrasen.\nTo access the CentCom channel, use :y."
icon_state = "cent_headset"
keyslot = new /obj/item/device/encryptionkey/headset_com
keyslot2 = new /obj/item/device/encryptionkey/headset_cent
@@ -201,7 +201,7 @@
/obj/item/device/radio/headset/headset_cent/alt
name = "\improper CentCom bowman headset"
desc = "A headset especially for emergency response personnel. Protects ears from flashbangs. \nTo access the centcom channel, use :y."
desc = "A headset especially for emergency response personnel. Protects ears from flashbangs.\nTo access the CentCom channel, use :y."
icon_state = "cent_headset_alt"
item_state = "cent_headset_alt"
keyslot = null

2
code/game/objects/items/devices/transfer_valve.dm
View File

@@ -5,7 +5,7 @@
item_state = "ttv"
lefthand_file = 'icons/mob/inhands/weapons/bombs_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/bombs_righthand.dmi'
desc = "Regulates the transfer of air between two tanks"
desc = "Regulates the transfer of air between two tanks."
var/obj/item/tank/tank_one
var/obj/item/tank/tank_two
var/obj/item/device/assembly/attached_device

2
code/game/objects/items/dna_injector.dm
View File

@@ -171,7 +171,7 @@
/obj/item/dnainjector/stuttmut
name = "\improper DNA injector (Stutt.)"
desc = "Makes you s-s-stuttterrr"
desc = "Makes you s-s-stuttterrr."
add_mutations_static = list(NERVOUS)
/obj/item/dnainjector/antistutt

2
code/game/objects/items/grenades/chem_grenade.dm
View File

@@ -529,7 +529,7 @@
/obj/item/grenade/chem_grenade/bioterrorfoam
name = "Bio terror foam grenade"
desc = "Tiger Cooperative chemical foam grenade. Causes temporary irration, blindness, confusion, mutism, and mutations to carbon based life forms. Contains additional spore toxin"
desc = "Tiger Cooperative chemical foam grenade. Causes temporary irration, blindness, confusion, mutism, and mutations to carbon based life forms. Contains additional spore toxin."
stage = READY
/obj/item/grenade/chem_grenade/bioterrorfoam/Initialize()

2
code/game/objects/items/holosign_creator.dm
View File

@@ -86,7 +86,7 @@
/obj/item/holosign_creator/cyborg
name = "Energy Barrier Projector"
desc = "A holographic projector that creates fragile energy fields"
desc = "A holographic projector that creates fragile energy fields."
creation_time = 15
max_signs = 9
holosign_type = /obj/structure/holosign/barrier/cyborg

2
code/game/objects/items/implants/implant_exile.dm
View File

@@ -3,7 +3,7 @@
/obj/item/implant/exile
name = "exile implant"
desc = "Prevents you from returning from away missions"
desc = "Prevents you from returning from away missions."
origin_tech = "materials=2;biotech=3;magnets=2;bluespace=3"
activated = 0

2
code/game/objects/items/implants/implant_misc.dm
View File

@@ -1,6 +1,6 @@
/obj/item/implant/weapons_auth
name = "firearms authentication implant"
desc = "Lets you shoot your guns"
desc = "Lets you shoot your guns."
icon_state = "auth"
origin_tech = "magnets=2;programming=7;biotech=5;syndicate=5"
activated = 0

2
code/game/objects/items/implants/implantchair.dm
View File

@@ -151,7 +151,7 @@
/obj/machinery/implantchair/genepurge
name = "Genetic purifier"
desc = "Used to purge human genome of foreign influences"
desc = "Used to purge a human genome of foreign influences."
special = TRUE
special_name = "Purge genome"
injection_cooldown = 0

2
code/game/objects/items/plushes.dm
View File

@@ -1,6 +1,6 @@
/obj/item/toy/plush
name = "plush"
desc = "this is the special coder plush, do not steal"
desc = "This is the special coder plush, do not steal."
icon = 'icons/obj/plushes.dmi'
icon_state = "debug"
attack_verb = list("thumped", "whomped", "bumped")

2
code/game/objects/items/pneumaticCannon.dm
View File

@@ -223,7 +223,7 @@
/obj/item/pneumatic_cannon/pie
name = "pie cannon"
desc = "Load cream pie for optimal results"
desc = "Load cream pie for optimal results."
force = 10
icon_state = "piecannon"
gasPerThrow = 0

2
code/game/objects/items/religion.dm
View File

@@ -207,7 +207,7 @@
name = "blue banner"
icon_state = "banner-blue"
item_state = "banner-blue"
desc = "A banner with the logo of the blue deity"
desc = "A banner with the logo of the blue deity."
/obj/item/storage/backpack/bannerpack
name = "nanotrasen banner backpack"

2
code/game/objects/items/robot/robot_upgrades.dm
View File

@@ -172,7 +172,7 @@
/obj/item/borg/upgrade/syndicate
name = "illegal equipment module"
desc = "Unlocks the hidden, deadlier functions of a cyborg"
desc = "Unlocks the hidden, deadlier functions of a cyborg."
icon_state = "cyborg_upgrade3"
require_module = 1
origin_tech = "combat=4;syndicate=1"

2
code/game/objects/items/storage/backpack.dm
View File

@@ -518,7 +518,7 @@
new /obj/item/ammo_box/foambox/riot(src)
/obj/item/storage/backpack/duffelbag/syndie/med/bioterrorbundle
desc = "A large duffel bag containing a deadly chemicals, a chemical spray, chemical grenade, a Donksoft assault rifle, riot grade darts, a minature syringe gun, and a box of syringes"
desc = "A large duffel bag containing a deadly chemicals, a chemical spray, chemical grenade, a Donksoft assault rifle, riot grade darts, a minature syringe gun, and a box of syringes."
/obj/item/storage/backpack/duffelbag/syndie/med/bioterrorbundle/PopulateContents()
new /obj/item/reagent_containers/spray/chemsprayer/bioterror(src)

2
code/game/objects/items/storage/belt.dm
View File

@@ -250,7 +250,7 @@
/obj/item/storage/belt/soulstone
name = "soul stone belt"
desc = "Designed for ease of access to the shards during a fight, as to not let a single enemy spirit slip away"
desc = "Designed for ease of access to the shards during a fight, as to not let a single enemy spirit slip away."
icon_state = "soulstonebelt"
item_state = "soulstonebelt"
storage_slots = 6

4
code/game/objects/items/toys.dm
View File

@@ -275,7 +275,7 @@
*/
/obj/item/toy/foamblade
name = "foam armblade"
desc = "it says \"Sternside Changs #1 fan\" on it. "
desc = "It says \"Sternside Changs #1 fan\" on it."
icon = 'icons/obj/toy.dmi'
icon_state = "foamblade"
item_state = "arm_blade"
@@ -288,7 +288,7 @@
/obj/item/toy/windupToolbox
name = "windup toolbox"
desc = "A replica toolbox that rumbles when you turn the key"
desc = "A replica toolbox that rumbles when you turn the key."
icon_state = "his_grace"
item_state = "artistic_toolbox"
lefthand_file = 'icons/mob/inhands/equipment/toolbox_lefthand.dmi'

8
code/game/objects/items/weaponry.dm
View File

@@ -1,5 +1,5 @@
/obj/item/banhammer
desc = "A banhammer"
desc = "A banhammer."
name = "banhammer"
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "toyhammer"
@@ -192,7 +192,7 @@
/obj/item/katana
name = "katana"
desc = "Woefully underpowered in D20"
desc = "Woefully underpowered in D20."
icon_state = "katana"
item_state = "katana"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
@@ -257,7 +257,7 @@
/obj/item/throwing_star
name = "throwing star"
desc = "An ancient weapon still used to this day due to it's ease of lodging itself into victim's body parts"
desc = "An ancient weapon still used to this day, due to its ease of lodging itself into its victim's body parts."
icon_state = "throwingstar"
item_state = "eshield0"
lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
@@ -390,7 +390,7 @@
/obj/item/ectoplasm
name = "ectoplasm"
desc = "spooky"
desc = "Spooky."
gender = PLURAL
icon = 'icons/obj/wizard.dmi'
icon_state = "ectoplasm"

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

@@ -1,6 +1,6 @@
/obj/structure/sign/barsign // All Signs are 64 by 32 pixels, they take two tiles
name = "Bar Sign"
desc = "A bar sign with no writing on it"
desc = "A bar sign with no writing on it."
icon = 'icons/obj/barsigns.dmi'
icon_state = "empty"
req_access = list(ACCESS_BAR)

8
code/game/objects/structures/beds_chairs/bed.dm
View File

@@ -21,10 +21,6 @@
var/buildstacktype = /obj/item/stack/sheet/metal
var/buildstackamount = 2
/obj/structure/bed/examine(mob/user)
..()
to_chat(user, "<span class='notice'>It's held together by a couple of <b>bolts</b>.</span>")
/obj/structure/bed/deconstruct(disassembled = TRUE)
if(!(flags_1 & NODECONSTRUCT_1))
if(buildstacktype)
@@ -145,7 +141,7 @@
/obj/item/roller/robo/examine(mob/user)
..()
to_chat(user, "The dock is [loaded ? "loaded" : "empty"].")
to_chat(user, "The dock is [loaded ? "loaded" : "empty"]")
/obj/item/roller/robo/deploy_roller(mob/user, atom/location)
if(loaded)
@@ -198,5 +194,5 @@
/obj/structure/bed/alien
name = "resting contraption"
desc = "This looks similar to contraptions from earth. Could aliens be stealing our technology?"
desc = "This looks similar to contraptions from Earth. Could aliens be stealing our technology?"
icon_state = "abed"

6
code/game/objects/structures/displaycase.dm
View File

@@ -115,7 +115,7 @@
/obj/structure/displaycase/attackby(obj/item/W, mob/user, params)
if(W.GetID() && !broken && openable)
if(allowed(user))
to_chat(user, "<span class='notice'>You [open ? "close":"open"] [src].</span>")
to_chat(user, "<span class='notice'>You [open ? "close":"open"] the [src]</span>")
toggle_lock(user)
else
to_chat(user, "<span class='warning'>Access denied.</span>")
@@ -140,9 +140,9 @@
to_chat(user, "<span class='notice'>You remove the destroyed case</span>")
qdel(src)
else
to_chat(user, "<span class='notice'>You start to [open ? "close":"open"] [src].</span>")
to_chat(user, "<span class='notice'>You start to [open ? "close":"open"] the [src]</span>")
if(do_after(user, 20*W.toolspeed, target = src))
to_chat(user, "<span class='notice'>You [open ? "close":"open"] [src].</span>")
to_chat(user, "<span class='notice'>You [open ? "close":"open"] the [src]</span>")
toggle_lock(user)
else if(open && !showpiece)
if(user.transferItemToLoc(W, src))

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

@@ -250,7 +250,7 @@
/obj/structure/door_assembly/door_assembly_clown
name = "bananium airlock assembly"
desc = "Honk"
desc = "Honk."
icon = 'icons/obj/doors/airlocks/station/bananium.dmi'
airlock_type = /obj/machinery/door/airlock/clown
anchored = TRUE

4
code/game/objects/structures/flora.dm
View File

@@ -323,7 +323,7 @@
/obj/structure/flora/rock
icon_state = "basalt"
desc = "A volcanic rock"
desc = "A volcanic rock."
icon = 'icons/obj/flora/rocks.dmi'
resistance_flags = FIRE_PROOF
density = TRUE
@@ -334,7 +334,7 @@
/obj/structure/flora/rock/pile
icon_state = "lavarocks"
desc = "A pile of rocks"
desc = "A pile of rocks."
/obj/structure/flora/rock/pile/Initialize()
. = ..()

6
code/game/objects/structures/ghost_role_spawners.dm
View File

@@ -458,7 +458,7 @@
//Ancient cryogenic sleepers. Players become NT crewmen from a hundred year old space station, now on the verge of collapse.
/obj/effect/mob_spawn/human/oldsec
name = "old cryogenics pod"
desc = "A humming cryo pod. You can barely recognise a security uniform underneath the built up ice. The machine is attempting to wake up its occupant"
desc = "A humming cryo pod. You can barely recognise a security uniform underneath the built up ice. The machine is attempting to wake up its occupant."
mob_name = "a security officer"
icon = 'icons/obj/cryogenic2.dmi'
icon_state = "sleeper"
@@ -482,7 +482,7 @@
/obj/effect/mob_spawn/human/oldeng
name = "old cryogenics pod"
desc = "A humming cryo pod. You can barely recognise an engineering uniform underneath the built up ice. The machine is attempting to wake up its occupant"
desc = "A humming cryo pod. You can barely recognise an engineering uniform underneath the built up ice. The machine is attempting to wake up its occupant."
mob_name = "an engineer"
icon = 'icons/obj/cryogenic2.dmi'
icon_state = "sleeper"
@@ -506,7 +506,7 @@
/obj/effect/mob_spawn/human/oldsci
name = "old cryogenics pod"
desc = "A humming cryo pod. You can barely recognise a science uniform underneath the built up ice. The machine is attempting to wake up its occupant"
desc = "A humming cryo pod. You can barely recognise a science uniform underneath the built up ice. The machine is attempting to wake up its occupant."
mob_name = "a scientist"
icon = 'icons/obj/cryogenic2.dmi'
icon_state = "sleeper"

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

@@ -101,7 +101,7 @@
/obj/structure/holosign/barrier/cyborg/hacked
name = "Charged Energy Field"
desc = "A powerful energy field that blocks movement. Energy arcs off it"
desc = "A powerful energy field that blocks movement. Energy arcs off it."
max_integrity = 20
var/shockcd = 0

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

@@ -45,7 +45,7 @@
name = "meat spike"
icon = 'icons/obj/kitchen.dmi'
icon_state = "spike"
desc = "A spike for collecting meat from animals"
desc = "A spike for collecting meat from animals."
density = TRUE
anchored = TRUE
buckle_lying = 0

4
code/game/objects/structures/showcase.dm
View File

@@ -24,7 +24,7 @@
/obj/structure/showcase/fakesec
name = "\improper CentCom security records"
desc = "Used to view and edit personnel's security records"
desc = "Used to view and edit personnel's security records."
icon = 'icons/obj/computer.dmi'
icon_state = "computer"
@@ -98,7 +98,7 @@
/obj/structure/showcase/machinery/signal_decrypter
name = "subsystem signal decrypter"
desc = "A strange machine thats supposedly used to help pick up and decrypt wave signals. "
desc = "A strange machine that's supposedly used to help pick up and decrypt wave signals."
icon = 'icons/obj/machines/telecomms.dmi'
icon_state = "processor"

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

@@ -217,7 +217,7 @@
/obj/structure/sign/kiddieplaque
name = "AI developers 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/kiddieplaque/badger

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

@@ -244,7 +244,7 @@
/obj/structure/statue/diamond
max_integrity = 1000
material_drop_type = /obj/item/stack/sheet/mineral/diamond
desc = "This is a very expensive diamond statue"
desc = "This is a very expensive diamond statue."
/obj/structure/statue/diamond/captain
name = "statue of THE captain."

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

@@ -1,6 +1,6 @@
/obj/structure/trap
name = "IT'S A TRAP"
desc = "stepping on me is a guaranteed bad day"
desc = "Stepping on me is a guaranteed bad day."
icon = 'icons/obj/hand_of_god_structures.dmi'
icon_state = "trap"
density = FALSE

2
code/game/turfs/simulated/floor/fancy_floor.dm
View File

@@ -122,7 +122,7 @@
/turf/open/floor/grass/fakebasalt //Heart is not a real planeteer power
name = "aesthetic volcanic flooring"
desc = "Safely recreated turf for your hellplanet-scaping"
desc = "Safely recreated turf for your hellplanet-scaping."
icon = 'icons/turf/floors.dmi'
icon_state = "basalt"
floor_tile = /obj/item/stack/tile/basalt

4
code/game/turfs/simulated/floor/misc_floor.dm
View File

@@ -231,12 +231,12 @@
/turf/open/floor/bluespace
slowdown = -1
icon_state = "bluespace"
desc = "Through a series of micro-teleports these tiles let people move at incredible speeds"
desc = "Through a series of micro-teleports these tiles let people move at incredible speeds."
floor_tile = /obj/item/stack/tile/bluespace
/turf/open/floor/sepia
slowdown = 2
icon_state = "sepia"
desc = "Time seems to flow very slowly around these tiles"
desc = "Time seems to flow very slowly around these tiles."
floor_tile = /obj/item/stack/tile/sepia

2
code/modules/VR/vr_sleeper.dm
View File

@@ -4,7 +4,7 @@
// it's """VR"""
/obj/machinery/vr_sleeper
name = "virtual reality sleeper"
desc = "a sleeper modified to alter the subconscious state of the user, allowing them to visit virtual worlds"
desc = "A sleeper modified to alter the subconscious state of the user, allowing them to visit virtual worlds."
icon = 'icons/obj/Cryogenic2.dmi'
icon_state = "sleeper"
state_open = TRUE

2
code/modules/admin/fun_balloon.dm
View File

@@ -104,7 +104,7 @@
/obj/effect/shuttle_build
name = "shuttle_build"
desc = "Some assembly required"
desc = "Some assembly required."
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "syndballoon"
anchored = TRUE

4
code/modules/admin/secrets.dm
View File

@@ -215,8 +215,8 @@
return
SSblackbox.add_details("admin_secrets_fun_used","Send CentCom Ferry")
if(!SSshuttle.toggleShuttle("ferry","ferry_home","ferry_away"))
message_admins("[key_name_admin(usr)] moved the centcom ferry")
log_admin("[key_name(usr)] moved the centcom ferry")
message_admins("[key_name_admin(usr)] moved the CentCom ferry")
log_admin("[key_name(usr)] moved the CentCom ferry")
if("togglearrivals")
if(!check_rights(R_ADMIN))

2
code/modules/admin/topic.dm
View File

@@ -2240,7 +2240,7 @@
if(!newname)
return
G.name = newname
var/description = input("Enter centcom message contents:") as message|null
var/description = input("Enter CentCom message contents:") as message|null
if(!description)
return
G.report_message = description

2
code/modules/atmospherics/machinery/airalarm.dm
View File

@@ -27,7 +27,7 @@
/obj/item/wallframe/airalarm
name = "air alarm frame"
desc = "Used for building Air Alarms"
desc = "Used for building Air Alarms."
icon = 'icons/obj/monitors.dmi'
icon_state = "alarm_bitem"
result_path = /obj/machinery/airalarm

2
code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm
View File

@@ -3,7 +3,7 @@
icon_state = "he_intact"
name = "heat exchanger"
desc = "Exchanges heat between two input gases. Setup for fast heat transfer"
desc = "Exchanges heat between two input gases. Set up for fast heat transfer."
can_unwrench = TRUE

2
code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
View File

@@ -1,6 +1,6 @@
/obj/machinery/atmospherics/components/unary/outlet_injector
name = "air injector"
desc = "Has a valve and pump attached to it"
desc = "Has a valve and pump attached to it."
icon_state = "inje_map"
use_power = IDLE_POWER_USE
can_unwrench = TRUE

2
code/modules/atmospherics/machinery/components/unary_devices/oxygen_generator.dm
View File

@@ -3,7 +3,7 @@
icon_state = "o2gen_map"
name = "oxygen generator"
desc = "Generates oxygen"
desc = "Generates oxygen."
dir = SOUTH
initialize_directions = SOUTH

2
code/modules/atmospherics/machinery/pipes/heat_exchange/junction.dm
View File

@@ -3,7 +3,7 @@
icon_state = "intact"
name = "junction"
desc = "A one meter junction that connects regular and heat-exchanging pipe"
desc = "A one meter junction that connects regular and heat-exchanging pipe."
minimum_temperature_difference = 300
thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT

4
code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm
View File

@@ -3,7 +3,7 @@
icon_state = "manifold"
name = "pipe manifold"
desc = "A manifold composed of regular pipes"
desc = "A manifold composed of regular pipes."
dir = SOUTH
initialize_directions_he = EAST|NORTH|WEST
@@ -38,7 +38,7 @@
icon_state = "manifold4w"
name = "4-way pipe manifold"
desc = "A manifold composed of heat-exchanging pipes"
desc = "A manifold composed of heat-exchanging pipes."
initialize_directions_he = NORTH|SOUTH|EAST|WEST

2
code/modules/atmospherics/machinery/pipes/heat_exchange/simple.dm
View File

@@ -2,7 +2,7 @@
icon_state = "intact"
name = "pipe"
desc = "A one meter section of heat-exchanging pipe"
desc = "A one meter section of heat-exchanging pipe."
dir = SOUTH
initialize_directions_he = SOUTH|NORTH

2
code/modules/atmospherics/machinery/pipes/manifold.dm
View File

@@ -6,7 +6,7 @@
icon_state = "manifold"
name = "pipe manifold"
desc = "A manifold composed of regular pipes"
desc = "A manifold composed of regular pipes."
dir = SOUTH
initialize_directions = EAST|NORTH|WEST

2
code/modules/atmospherics/machinery/pipes/manifold4w.dm
View File

@@ -6,7 +6,7 @@
icon_state = "manifold4w"
name = "4-way pipe manifold"
desc = "A manifold composed of regular pipes"
desc = "A manifold composed of regular pipes."
initialize_directions = NORTH|SOUTH|EAST|WEST

2
code/modules/awaymissions/mission_code/Academy.dm
View File

@@ -84,7 +84,7 @@
/obj/structure/academy_wizard_spawner
name = "Academy Defensive System"
desc = "Made by Abjuration Inc"
desc = "Made by Abjuration, Inc."
icon = 'icons/obj/cult.dmi'
icon_state = "forge"
anchored = TRUE

2
code/modules/awaymissions/mission_code/Cabin.dm
View File

@@ -18,7 +18,7 @@
/obj/structure/firepit
name = "firepit"
desc = "warm and toasty"
desc = "Warm and toasty."
icon = 'icons/obj/fireplace.dmi'
icon_state = "firepit-active"
density = FALSE

2
code/modules/awaymissions/mission_code/challenge.dm
View File

@@ -17,7 +17,7 @@
/obj/machinery/power/emitter/energycannon
name = "Energy Cannon"
desc = "A heavy duty industrial laser"
desc = "A heavy duty industrial laser."
icon = 'icons/obj/singularity.dmi'
icon_state = "emitter"
anchored = TRUE

10
code/modules/awaymissions/mission_code/snowdin.dm
View File

@@ -40,7 +40,7 @@
/obj/item/paper/crumpled/ruins/snowdin/snowdingatewaynotice
name = "scribbled note"
info = {"The gateway has been inactive for months, engineers think it's due to the recent drop in tempature fucking with the
circuitry or something. Without a constant supply of resources from central command, our stock is getting awfully low. Some of the security members have taken to
circuitry or something. Without a constant supply of resources from Central Command, our stock is getting awfully low. Some of the security members have taken to
using the sparse rifle ammo left to hunting some of the wildlife to try and keep our food supply from emptying. God forbid if the heating goes out, I don't want to
die as a fucking popsicle down here."}
@@ -65,9 +65,9 @@
The colder months are finally hitting, some of the machinery seems to be having trouble starting up sometimes. Central sent some portable heaters to help keep the airlocks from
freezing shut along with a couple storage crates with supplies. Nothing on the radio so far, what the hell do they even expect to hear down here, anyway?<br><br><b>September 15th</b>
<br>Another supply shipment through the gateway, they've sent some heavier sets of clothes for the coming winter months. Central said they might encounter issues with shipments
during December to Feburary, so we should try to be frugal with the next shipment.<br><br><b>November 20th</b><br>Final shipment from central for the next few months. Going outside
during December to Feburary, so we should try to be frugal with the next shipment.<br><br><b>November 20th</b><br>Final shipment from Central for the next few months. Going outside
for more than 10-15 minutes without losing feeling in your fingers is difficult. We've finally gotten a signal on the radio, it's mostly some weird static though. One of the researchers is trying to decypher it.
<br><br><b>December 10th</b><br>Signal has gotten much stronger, it almost seems like it's coming from under us according to what the researcher managed to decypher. We're waiting from the go from central before investigating.<br><br>
<br><br><b>December 10th</b><br>Signal has gotten much stronger, it almost seems like it's coming from under us according to what the researcher managed to decypher. We're waiting from the go from Central before investigating.<br><br>
<i>The rest of the paper seems to be a mixture of scribbles and smudged ink.</i>"}
/obj/item/paper/fluff/awaymissions/snowdin/log2
@@ -85,7 +85,7 @@
info = {"You have been assigned a position on a listening outpost. Here you'll be watching over several crewmembers assigned to watching signals of the general area.
As not much is expected in terms of issues, we've only assigned one guard per outpost. Crewmembers are expected to keep to their regulated work schedules and may be
disciplined properly if found slacking. Food hoarding is heavily discouraged as all outposts will be sharing from the same shipment every 2-3 months. Hoarding of supplies
should be punished severely as to prevent future incidients. Mutiny and/or rioting should be reported to central and dealt with swiftly. You're here to secure and protect
should be punished severely as to prevent future incidients. Mutiny and/or rioting should be reported to Central and dealt with swiftly. You're here to secure and protect
Nanotrasen assets, not be a police officer. Do what you must, but make sure it's not messy."}
/obj/item/paper/fluff/awaymissions/snowdin/syndienotice
@@ -199,7 +199,7 @@
/obj/item/clothing/under/syndicate/coldres
name = "insulated tactical turtleneck"
desc = "A non-descript and slightly suspicious looking turtleneck with digital camouflage cargo pants. The interior has been padded with special insulation for both warmth and protection"
desc = "A non-descript and slightly suspicious-looking turtleneck with digital camouflage cargo pants. The interior has been padded with special insulation for both warmth and protection."
armor = list(melee = 20, bullet = 10, laser = 0,energy = 5, bomb = 0, bio = 0, rad = 0, fire = 25, acid = 25)
cold_protection = CHEST|GROIN|ARMS|LEGS
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT

2
code/modules/awaymissions/zlevel.dm
View File

@@ -20,7 +20,7 @@ GLOBAL_LIST_INIT(potentialRandomZlevels, generateMapList(filename = "config/away
/obj/effect/landmark/awaystart
name = "away mission spawn"
desc = "Randomly picked away mission spawn points"
desc = "Randomly picked away mission spawn points."
/obj/effect/landmark/awaystart/New()
GLOB.awaydestinations += src

2
code/modules/clothing/head/misc.dm
View File

@@ -23,7 +23,7 @@
/obj/item/clothing/head/canada
name = "striped red tophat"
desc = "it smells like fresh donut holes / <i>il sent comme des trous de beignets frais</i>"
desc = "It smells like fresh donut holes. / <i>Il sent comme des trous de beignets frais.</i>"
icon_state = "canada"
item_state = "canada"

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

@@ -49,7 +49,7 @@
/obj/item/clothing/shoes/sandal/magic
name = "magical sandals"
desc = "A pair of sandals imbued with magic"
desc = "A pair of sandals imbued with magic."
resistance_flags = FIRE_PROOF | ACID_PROOF
/obj/item/clothing/shoes/galoshes

2
code/modules/clothing/spacesuits/chronosuit.dm
View File

@@ -20,7 +20,7 @@
/obj/item/clothing/suit/space/chronos
name = "Chronosuit"
desc = "An advanced spacesuit equipped with time-bluespace teleportation and anti-compression technology"
desc = "An advanced spacesuit equipped with time-bluespace teleportation and anti-compression technology."
icon_state = "chronosuit"
item_state = "chronosuit"
actions_types = list(/datum/action/item_action/toggle)

4
code/modules/clothing/spacesuits/hardsuit.dm
View File

@@ -475,7 +475,7 @@
//Head of Security hardsuit
/obj/item/clothing/head/helmet/space/hardsuit/security/hos
name = "head of security's hardsuit helmet"
desc = "a special bulky helmet designed for work in a hazardous, low pressure environment. Has an additional layer of armor."
desc = "A special bulky helmet designed for work in a hazardous, low pressure environment. Has an additional layer of armor."
icon_state = "hardsuit0-hos"
item_color = "hos"
armor = list(melee = 45, bullet = 25, laser = 30,energy = 10, bomb = 25, bio = 100, rad = 50, fire = 95, acid = 95)
@@ -720,7 +720,7 @@
///SWAT version
/obj/item/clothing/suit/space/hardsuit/shielded/swat
name = "death commando spacesuit"
desc = "an advanced hardsuit favored by commandos for use in special operations."
desc = "An advanced hardsuit favored by commandos for use in special operations."
icon_state = "deathsquad"
item_state = "swat_suit"
item_color = "syndi"

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

@@ -157,7 +157,7 @@ Contains:
//Emergency Response Team suits
/obj/item/clothing/head/helmet/space/hardsuit/ert
name = "emergency response unit helmet"
desc = "Standard issue command helmet for the ERT"
desc = "Standard issue command helmet for the ERT."
icon_state = "hardsuit0-ert_commander"
item_state = "hardsuit0-ert_commander"
item_color = "ert_commander"

2
code/modules/clothing/suits/cloaks.dm
View File

@@ -13,7 +13,7 @@
name = "cloak hood"
icon = 'icons/obj/clothing/hats.dmi'
icon_state = "golhood"
desc = "A hood for a cloak"
desc = "A hood for a cloak."
body_parts_covered = HEAD
flags_1 = NODROP_1
flags_inv = HIDEHAIR|HIDEEARS

24
code/modules/clothing/suits/miscellaneous.dm
View File

@@ -414,6 +414,24 @@
icon_state = "letterman_n"
item_state = "letterman_n"
/obj/item/clothing/suit/dracula
name = "dracula coat"
desc = "Looks like this belongs in a very old movie set."
icon_state = "draculacoat"
item_state = "draculacoat"
/obj/item/clothing/suit/drfreeze_coat
name = "doctor freeze's labcoat"
desc = "A labcoat imbued with the power of features and freezes."
icon_state = "drfreeze_coat"
item_state = "drfreeze_coat"
/obj/item/clothing/suit/gothcoat
name = "gothic coat"
desc = "Perfect for those who want stalk in a corner of a bar."
icon_state = "gothcoat"
item_state = "gothcoat"
/obj/item/clothing/suit/xenos
name = "xenos suit"
desc = "A suit made out of chitinous alien hide."
@@ -459,7 +477,7 @@
icon_state = "coatcaptain"
item_state = "coatcaptain"
armor = list(melee = 25, bullet = 30, laser = 30, energy = 10, bomb = 25, bio = 0, rad = 0, fire = 0, acid = 50)
allowed = list(/obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/gun/ballistic, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/device/flashlight/seclite, /obj/item/melee/classic_baton/telescopic)
allowed = list(/obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/gun/ballistic, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/melee/classic_baton/telescopic)
hoodtype = /obj/item/clothing/head/hooded/winterhood/captain
/obj/item/clothing/head/hooded/winterhood/captain
@@ -470,7 +488,7 @@
icon_state = "coatsecurity"
item_state = "coatsecurity"
armor = list(melee = 25, bullet = 15, laser = 30, energy = 10, bomb = 25, bio = 0, rad = 0, fire = 0, acid = 45)
allowed = list(/obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/gun/ballistic, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/device/flashlight/seclite, /obj/item/melee/classic_baton/telescopic)
allowed = list(/obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/gun/ballistic, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/device/flashlight, /obj/item/melee/classic_baton/telescopic)
hoodtype = /obj/item/clothing/head/hooded/winterhood/security
/obj/item/clothing/head/hooded/winterhood/security
@@ -550,7 +568,7 @@
/obj/item/clothing/suit/spookyghost
name = "spooky ghost"
desc = "this is obviously just a bedsheet, but maybe try it on?"
desc = "This is obviously just a bedsheet, but maybe try it on?"
icon_state = "bedsheet"
user_vars_to_edit = list("name" = "Spooky Ghost", "real_name" = "Spooky Ghost" , "incorporeal_move" = INCORPOREAL_MOVE_BASIC, "appearance_flags" = KEEP_TOGETHER|TILE_BOUND, "alpha" = 150)
alternate_worn_layer = ABOVE_BODY_FRONT_LAYER //so the bedsheet goes over everything but fire

29
code/modules/clothing/under/miscellaneous.dm
View File

@@ -24,7 +24,7 @@
/obj/item/clothing/under/scratch
name = "white suit"
desc = "A white suit, suitable for an excellent host"
desc = "A white suit, suitable for an excellent host."
icon_state = "scratch"
item_state = "scratch"
item_color = "scratch"
@@ -693,6 +693,33 @@
can_adjust = FALSE
resistance_flags = NONE
/obj/item/clothing/under/draculass
name = "draculass coat"
desc = "A dress inspired by the ancient \"Victorian\" era."
icon_state = "draculass"
item_state = "draculass"
item_color = "draculass"
body_parts_covered = CHEST|GROIN|ARMS
fitted = FEMALE_UNIFORM_TOP
can_adjust = FALSE
/obj/item/clothing/under/drfreeze
name = "doctor freeze's jumpsuit"
desc = "A modified scientist jumpsuit to look extra cool."
icon_state = "drfreeze"
item_state = "drfreeze"
item_color = "drfreeze"
can_adjust = FALSE
/obj/item/clothing/under/lobster
name = "foam lobster suit"
desc = "Who beheaded the college mascot?"
icon_state = "lobster"
item_state = "lobster"
item_color = "lobster"
fitted = NO_FEMALE_UNIFORM
can_adjust = FALSE
/obj/item/clothing/under/skeleton
name = "skeleton jumpsuit"
desc = "A black jumpsuit with a white bone pattern printed on it. Spooky!"

2
code/modules/clothing/under/syndicate.dm
View File

@@ -18,7 +18,7 @@
/obj/item/clothing/under/syndicate/sniper
name = "Tactical turtleneck suit"
desc = "A double seamed tactical turtleneck disguised as a civilian grade silk suit. Intended for the most formal operator. The collar is really sharp"
desc = "A double seamed tactical turtleneck disguised as a civilian grade silk suit. Intended for the most formal operator. The collar is really sharp."
icon_state = "really_black_suit"
item_state = "bl_suit"
item_color = "black_suit"

8
code/modules/clothing/under/trek.dm
View File

@@ -8,14 +8,14 @@
//TOS
/obj/item/clothing/under/trek/command
name = "command uniform"
desc = "The uniform worn by command officers"
desc = "The uniform worn by command officers."
icon_state = "trek_command"
item_color = "trek_command"
item_state = "y_suit"
/obj/item/clothing/under/trek/engsec
name = "engsec uniform"
desc = "The uniform worn by engineering/security officers"
desc = "The uniform worn by engineering/security officers."
icon_state = "trek_engsec"
item_color = "trek_engsec"
item_state = "r_suit"
@@ -24,7 +24,7 @@
/obj/item/clothing/under/trek/medsci
name = "medsci uniform"
desc = "The uniform worn by medical/science officers"
desc = "The uniform worn by medical/science officers."
icon_state = "trek_medsci"
item_color = "trek_medsci"
item_state = "b_suit"
@@ -66,7 +66,7 @@
//Q
/obj/item/clothing/under/trek/Q
name = "french marshall's uniform"
desc = "something about it feels off..."
desc = "Something about it feels off..."
icon_state = "trek_Q"
item_color = "trek_Q"
item_state = "r_suit"

2
code/modules/food_and_drinks/food/condiment.dm
View File

@@ -226,7 +226,7 @@
/obj/item/reagent_containers/food/condiment/pack
name = "condiment pack"
desc = "A small plastic pack with condiments to put on your food"
desc = "A small plastic pack with condiments to put on your food."
icon_state = "condi_empty"
volume = 10
amount_per_transfer_from_this = 10

4
code/modules/food_and_drinks/food/snacks/dough.dm
View File

@@ -43,7 +43,7 @@
/obj/item/reagent_containers/food/snacks/pizzabread
name = "pizza bread"
desc = "Add ingredients to make a pizza"
desc = "Add ingredients to make a pizza."
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "pizzabread"
custom_food_type = /obj/item/reagent_containers/food/snacks/customizable/pizza
@@ -124,7 +124,7 @@
/obj/item/reagent_containers/food/snacks/pastrybase
name = "pastry base"
desc = "A base for any self-respecting pastry"
desc = "A base for any self-respecting pastry."
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "pastrybase"
list_reagents = list("nutriment" = 1)

8
code/modules/food_and_drinks/food/snacks/meat.dm
View File

@@ -4,7 +4,7 @@
/obj/item/reagent_containers/food/snacks/meat/slab
name = "meat"
desc = "A slab of meat"
desc = "A slab of meat."
icon_state = "meat"
dried_type = /obj/item/reagent_containers/food/snacks/sosjerky/healthy
bitesize = 3
@@ -82,7 +82,7 @@
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard
icon_state = "lizardmeat"
desc = "Delicious dino damage"
desc = "Delicious dino damage."
filling_color = "#6B8E23"
tastes = list("meat" = 4, "scales" = 1)
foodtype = MEAT | RAW
@@ -96,7 +96,7 @@
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/shadow
icon_state = "shadowmeat"
desc = "Ow, the edge"
desc = "Ow, the edge."
filling_color = "#202020"
tastes = list("darkness" = 1, "meat" = 1)
foodtype = MEAT | RAW
@@ -180,7 +180,7 @@
/obj/item/reagent_containers/food/snacks/meat/slab/xeno
name = "xeno meat"
desc = "A slab of meat"
desc = "A slab of meat."
icon_state = "xenomeat"
list_reagents = list("nutriment" = 3, "vitamin" = 1)
bitesize = 4

2
code/modules/food_and_drinks/food/snacks_bread.dm
View File

@@ -19,7 +19,7 @@
/obj/item/reagent_containers/food/snacks/store/bread/plain
name = "bread"
desc = "Some plain old Earthen bread."
desc = "Some plain old earthen bread."
icon_state = "bread"
bonus_reagents = list("nutriment" = 7)
list_reagents = list("nutriment" = 10)

4
code/modules/food_and_drinks/food/snacks_other.dm
View File

@@ -151,7 +151,7 @@
/obj/item/reagent_containers/food/snacks/mint
name = "mint"
desc = "it is only wafer thin."
desc = "It is only wafer thin."
icon_state = "mint"
bitesize = 1
trash = /obj/item/trash/plate
@@ -229,7 +229,7 @@
/obj/item/reagent_containers/food/snacks/chocoorange
name = "chocolate orange"
desc = "A festive chocolate orange"
desc = "A festive chocolate orange."
icon_state = "chocoorange"
bonus_reagents = list("nutriment" = 1, "sugar" = 1)
list_reagents = list("nutriment" = 3, "sugar" = 1)

4
code/modules/food_and_drinks/food/snacks_pastry.dm
View File

@@ -303,7 +303,7 @@
/obj/item/reagent_containers/food/snacks/oatmealcookie
name = "oatmeal cookie"
desc = "The best of both cookie and oat"
desc = "The best of both cookie and oat."
icon_state = "oatmealcookie"
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
list_reagents = list("nutriment" = 5, "vitamin" = 1)
@@ -333,7 +333,7 @@
/obj/item/reagent_containers/food/snacks/bluecherrycupcake
name = "blue cherry cupcake"
desc = "Blue cherries inside a delicious cupcake"
desc = "Blue cherries inside a delicious cupcake."
icon_state = "bluecherrycupcake"
bonus_reagents = list("nutriment" = 1, "vitamin" = 3)
list_reagents = list("nutriment" = 5, "vitamin" = 1)

4
code/modules/food_and_drinks/food/snacks_vend.dm
View File

@@ -32,7 +32,7 @@
/obj/item/reagent_containers/food/snacks/chips
name = "chips"
desc = "Commander Riker's What-The-Crisps"
desc = "Commander Riker's What-The-Crisps."
icon_state = "chips"
trash = /obj/item/trash/chips
bitesize = 1
@@ -55,7 +55,7 @@
/obj/item/reagent_containers/food/snacks/no_raisin/healthy
name = "homemade raisins"
desc = "homemade raisins, the best in all of spess."
desc = "Homemade raisins, the best in all of spess."
list_reagents = list("nutriment" = 3, "vitamin" = 2)
junkiness = 0
foodtype = FRUIT

2
code/modules/food_and_drinks/kitchen_machinery/juicer.dm
View File

@@ -1,7 +1,7 @@
/obj/machinery/juicer
name = "juicer"
desc = "a centrifugal juicer with two speeds: Juice and Separate."
desc = "A centrifugal juicer with two speeds: Juice and Separate."
icon = 'icons/obj/kitchen.dmi'
icon_state = "juicer1"
layer = BELOW_OBJ_LAYER

2
code/modules/holiday/easter.dm
View File

@@ -89,7 +89,7 @@
name = "Easter Bunny Head"
icon_state = "bunnyhead"
item_state = "bunnyhead"
desc = "Considerably more cute than 'Frank'"
desc = "Considerably more cute than 'Frank'."
slowdown = -1
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR

2
code/modules/holodeck/items.dm
View File

@@ -12,7 +12,7 @@
/obj/item/holo/esword
name = "holographic energy sword"
desc = "May the force be with you. Sorta"
desc = "May the force be with you. Sorta."
icon_state = "sword0"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'

2
code/modules/hydroponics/grown/berries.dm
View File

@@ -126,7 +126,7 @@
// Blue Cherries
/obj/item/seeds/cherry/blue
name = "pack of blue cherry pits"
desc = "The blue kind of cherries"
desc = "The blue kind of cherries."
icon_state = "seed-bluecherry"
species = "bluecherry"
plantname = "Blue Cherry Tree"

2
code/modules/hydroponics/grown/chili.dm
View File

@@ -45,7 +45,7 @@
/obj/item/reagent_containers/food/snacks/grown/icepepper
seed = /obj/item/seeds/chili/ice
name = "ice pepper"
desc = "It's a mutant strain of chili"
desc = "It's a mutant strain of chili."
icon_state = "icepepper"
filling_color = "#0000CD"
bitesize_mod = 2

2
code/modules/hydroponics/grown/corn.dm
View File

@@ -58,7 +58,7 @@
/obj/item/grown/snapcorn
seed = /obj/item/seeds/corn/snapcorn
name = "snap corn"
desc = "A cob with snap pops"
desc = "A cob with snap pops."
icon_state = "snapcorn"
item_state = "corncob"
w_class = WEIGHT_CLASS_TINY

4
code/modules/hydroponics/grown/flowers.dm
View File

@@ -40,7 +40,7 @@
/obj/item/reagent_containers/food/snacks/grown/poppy/lily
seed = /obj/item/seeds/poppy/lily
name = "lily"
desc = "A beautiful orange flower"
desc = "A beautiful orange flower."
icon_state = "lily"
filling_color = "#FFA500"
@@ -57,7 +57,7 @@
/obj/item/reagent_containers/food/snacks/grown/poppy/geranium
seed = /obj/item/seeds/poppy/geranium
name = "geranium"
desc = "A beautiful blue flower"
desc = "A beautiful blue flower."
icon_state = "geranium"
filling_color = "#008B8B"

2
code/modules/hydroponics/grown/misc.dm
View File

@@ -1,7 +1,7 @@
// Starthistle
/obj/item/seeds/starthistle
name = "pack of starthistle seeds"
desc = "A robust species of weed that often springs up in-between the cracks of spaceship parking lots"
desc = "A robust species of weed that often springs up in-between the cracks of spaceship parking lots."
icon_state = "seed-starthistle"
species = "starthistle"
plantname = "Starthistle"

Some files were not shown because too many files have changed in this diff Show More