Merge pull request #6478 from VOREStation/upstream-merge-6621

[MIRROR] Moar descriptions for things
This commit is contained in:
Novacat
2020-01-21 01:33:06 -05:00
committed by GitHub
63 changed files with 85 additions and 6 deletions

View File

@@ -20,7 +20,7 @@ Thus, the two variables affect pump operation are set in New():
level = 1
name = "gas pump"
desc = "A pump"
desc = "A pump that moves gas from one place to another."
var/target_pressure = ONE_ATMOSPHERE

View File

@@ -6,7 +6,7 @@
level = 1
name = "high power gas pump"
desc = "A pump. Has double the power rating of the standard gas pump."
desc = "A pump that moves gas from one place to another. Has double the power rating of the standard gas pump."
power_rating = 15000 //15000 W ~ 20 HP

View File

@@ -3,6 +3,7 @@
//--------------------------------------------
/obj/machinery/atmospherics/omni/atmos_filter
name = "omni gas filter"
desc = "An advanced version of the gas filter, able to be configured for filtering of multiple gasses."
icon_state = "map_filter"
pipe_state = "omni_filter"

View File

@@ -7,6 +7,7 @@
level = 1
name = "Gas filter"
desc = "Filters one type of gas from an input, and pushes it out the side."
use_power = 1
idle_power_usage = 150 //internal circuitry, friction losses and stuff

View File

@@ -140,6 +140,7 @@
// Heat Exchange Junction - Interfaces HE pipes to normal pipes
//
/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction
desc = "An adaptor to transfer gasses between regular pipes and heat transferring ones. It doesn't conduct heat all that well."
icon = 'icons/atmos/junction.dmi'
icon_state = "intact"
pipe_icon = "hejunction"

View File

@@ -1,5 +1,6 @@
/obj/machinery/sleep_console
name = "sleeper console"
desc = "A control panel to operate a linked sleeper with."
icon = 'icons/obj/Cryogenic2_vr.dmi' //VOREStation Edit - Better icon.
icon_state = "sleeperconsole"
var/obj/machinery/sleeper/sleeper

View File

@@ -34,6 +34,7 @@
/obj/machinery/alarm
name = "alarm"
desc = "Used to control various station atmospheric systems. The light indicates the current air status of the area."
icon = 'icons/obj/monitors.dmi'
icon_state = "alarm0"
plane = TURF_PLANE

View File

@@ -2,6 +2,7 @@
icon = 'icons/obj/stationobjs.dmi'
icon_state = "gsensor1"
name = "Gas Sensor"
desc = "Senses atmospheric conditions."
anchored = 1
var/state = 0
@@ -77,6 +78,7 @@ obj/machinery/air_sensor/Destroy()
icon_keyboard = "atmos_key"
icon_screen = "tank"
name = "Computer"
desc = "Control atmospheric systems, remotely."
var/frequency = 1439
var/list/sensors = list()
var/list/sensor_information = list()

View File

@@ -1,5 +1,6 @@
/obj/machinery/portable_atmospherics/powered/scrubber
name = "Portable Air Scrubber"
desc = "Similar to room scrubbers, this device contains an internal tank to scrub gasses from the atmosphere."
icon = 'icons/obj/atmos.dmi'
icon_state = "pscrubber:0"
@@ -144,6 +145,7 @@
//Huge scrubber
/obj/machinery/portable_atmospherics/powered/scrubber/huge
name = "Huge Air Scrubber"
desc = "A larger variation of the portable scrubber, for industrial scrubbing of air. Must be turned on from a remote terminal."
icon = 'icons/obj/atmos_vr.dmi' //VOREStation Edit - New Sprite
icon_state = "scrubber:0"
anchored = 1
@@ -239,6 +241,10 @@
/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary
name = "Stationary Air Scrubber"
/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/Initialize()
. = ..()
desc += "This one seems to be tightly secured with large bolts."
/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/attackby(var/obj/item/I as obj, var/mob/user as mob)
if(I.is_wrench())
to_chat(user, "<span class='warning'>The bolts are too tight for you to unscrew!</span>")

View File

@@ -2,6 +2,7 @@
/obj/machinery/computer/operating
name = "patient monitoring console"
desc = "Used to monitor the vitals of a patient."
density = 1
anchored = 1.0
icon_keyboard = "med_key"

View File

@@ -6,7 +6,7 @@
/obj/machinery/computer/rcon
name = "\improper RCON console"
desc = "Console used to remotely control machinery on the station."
desc = "Console used to remotely control electrical machinery on the station."
icon_keyboard = "power_key"
icon_screen = "ai_fixer" //VOREStation Edit
light_color = "#a97faa"

View File

@@ -1,5 +1,6 @@
/obj/machinery/computer/aifixer
name = "\improper AI system integrity restorer"
desc = "Restores AI units to working condition, assuming you have one inside!"
icon_keyboard = "rd_key"
icon_screen = "ai-fixer"
light_color = "#a97faa"

View File

@@ -4,6 +4,7 @@
/obj/machinery/computer/atmoscontrol
name = "\improper Central Atmospherics Computer"
desc = "Control the station's atmospheric systems from afar! Certified atmospherics technicians only."
icon_keyboard = "generic_key"
icon_screen = "comm_logs"
light_color = "#00b000"

View File

@@ -244,7 +244,7 @@
/obj/machinery/computer/security/wooden_tv
name = "security camera monitor"
desc = "An old TV hooked into the stations camera network."
desc = "An old TV hooked into the station's camera network."
icon_state = "television"
icon_keyboard = null
icon_screen = "detective_tv"
@@ -254,7 +254,7 @@
/obj/machinery/computer/security/mining
name = "outpost camera monitor"
desc = "Used to access the various cameras on the outpost."
desc = "Used to watch over mining operations."
icon_keyboard = "mining_key"
icon_screen = "mining"
network = list("Mining Outpost")

View File

@@ -1,5 +1,6 @@
/obj/machinery/computer/cloning
name = "cloning control console"
desc = "Used to start cloning cycles, as well as manage clone records."
icon_keyboard = "med_key"
icon_screen = "dna"
light_color = "#315ab4"

View File

@@ -77,6 +77,7 @@
/obj/machinery/computer/guestpass
name = "guest pass terminal"
desc = "Used to print temporary passes for people. Handy!"
icon_state = "guest"
plane = TURF_PLANE
layer = ABOVE_TURF_LAYER

View File

@@ -549,7 +549,7 @@
/obj/machinery/computer/med_data/laptop
name = "Medical Laptop"
desc = "A cheap laptop."
desc = "A cheap laptop. It seems to have only the medical records program."
icon_state = "laptop"
icon_keyboard = "laptop_key"
icon_screen = "medlaptop"

View File

@@ -2,6 +2,7 @@
/obj/machinery/computer/prisoner
name = "prisoner management console"
desc = "Used to keep those sneaky prisoners in line, if they have an implant."
icon_keyboard = "security_key"
icon_screen = "explosive"
light_color = "#a91515"

View File

@@ -12,6 +12,7 @@ var/prison_shuttle_timeleft = 0
/obj/machinery/computer/prison_shuttle
name = "prison shuttle control console"
desc = "Used to move the prison shuttle to and from its destination."
icon_keyboard = "security_key"
icon_screen = "syndishuttle"
light_color = "#00ffff"

View File

@@ -5,6 +5,7 @@
// Supply requests console
/obj/machinery/computer/supplycomp
name = "supply ordering console"
desc = "Request crates from here! Delivery not guaranteed."
icon_screen = "request"
circuit = /obj/item/weapon/circuitboard/supplycomp
var/authorization = 0
@@ -18,6 +19,7 @@
// Supply control console
/obj/machinery/computer/supplycomp/control
name = "supply control console"
desc = "Control the cargo shuttle's functions remotely."
icon_keyboard = "tech_key"
icon_screen = "supply"
light_color = "#b88b2e"

View File

@@ -2,6 +2,7 @@
/obj/machinery/atmospherics/unary/cryo_cell
name = "cryo cell"
desc = "Used to cool people down for medical reasons. Totally."
icon = 'icons/obj/cryogenics.dmi' // map only
icon_state = "pod_preview"
density = 1

View File

@@ -145,6 +145,7 @@ obj/machinery/airlock_sensor
icon = 'icons/obj/airlock_machines.dmi'
icon_state = "airlock_sensor_off"
name = "airlock sensor"
desc = "Sends atmospheric readings to a nearby controller."
anchored = 1
power_channel = ENVIRON

View File

@@ -1,5 +1,6 @@
/obj/machinery/floodlight
name = "Emergency Floodlight"
desc = "Let there be light!"
icon = 'icons/obj/machines/floodlight.dmi'
icon_state = "flood00"
density = 1

View File

@@ -1,5 +1,6 @@
/obj/machinery/iv_drip
name = "\improper IV drip"
desc = "Helpful for giving someone blood! Or taking it away. It giveth, it taketh."
icon = 'icons/obj/iv_drip.dmi'
anchored = 0
density = 0

View File

@@ -10,6 +10,7 @@
/obj/machinery/media/jukebox/
name = "space jukebox"
desc = "Filled with songs both past and present!"
icon = 'icons/obj/jukebox.dmi'
icon_state = "jukebox2-nopower"
var/state_base = "jukebox2"

View File

@@ -231,6 +231,7 @@
/obj/machinery/oxygen_pump/anesthetic
name = "anesthetic pump"
desc = "A wall mounted anesthetic pump with a retractable mask that someone can pull over your face to knock you out."
spawn_type = /obj/item/weapon/tank/anesthetic
icon_state = "anesthetic_tank"
icon_state_closed = "anesthetic_tank"
@@ -266,6 +267,7 @@
/obj/machinery/oxygen_pump/mobile/anesthetic
name = "portable anesthetic pump"
desc = "A portable anesthetic pump with a retractable mask that someone can pull over your face to knock you out."
spawn_type = /obj/item/weapon/tank/anesthetic
icon_state = "medpump_n2o"
icon_state_closed = "medpump_n2o"

View File

@@ -1,5 +1,6 @@
/obj/machinery/pipedispenser
name = "Pipe Dispenser"
desc = "A large machine that can rapidly dispense pipes."
icon = 'icons/obj/stationobjs.dmi'
icon_state = "pipe_d"
density = 1
@@ -105,6 +106,7 @@
/obj/machinery/pipedispenser/disposal
name = "Disposal Pipe Dispenser"
desc = "A large machine that can rapidly dispense pipes. This one seems to dispsense disposal pipes."
icon = 'icons/obj/stationobjs.dmi'
icon_state = "pipe_d"
density = 1

View File

@@ -5,6 +5,7 @@
/obj/machinery/computer/telecomms/server
name = "Telecommunications Server Monitor"
desc = "View communication logs here. Translation not guaranteed."
icon_screen = "comm_logs"
var/screen = 0 // the screen number:

View File

@@ -9,6 +9,7 @@
/obj/machinery/computer/telecomms/monitor
name = "Telecommunications Monitor"
desc = "Used to traverse a telecommunication network. Helpful for debugging connection issues."
icon_screen = "comm_monitor"
var/screen = 0 // the screen number:

View File

@@ -6,6 +6,7 @@
/obj/machinery/computer/telecomms/traffic
name = "Telecommunications Traffic Control"
desc = "Used to upload code to telecommunication consoles for execution."
icon_screen = "generic"
var/screen = 0 // the screen number:

View File

@@ -1,5 +1,6 @@
/obj/machinery/washing_machine
name = "Washing Machine"
desc = "Not a hiding place."
icon = 'icons/obj/machines/washing_machine.dmi'
icon_state = "wm_10"
density = 1

View File

@@ -1,5 +1,6 @@
/obj/machinery/computer/mecha
name = "Exosuit Control"
desc = "Used to track exosuits, as well as view their logs and activate EMP beacons."
icon_keyboard = "rd_key"
icon_screen = "mecha"
light_color = "#a97faa"

View File

@@ -1,5 +1,6 @@
/obj/item/device/pipe_painter
name = "pipe painter"
desc = "Used to apply a even coat of paint to pipes. Atmospheric usage reccomended."
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "labeler1"
var/list/modes

View File

@@ -27,6 +27,7 @@ var/global/list/default_medbay_channels = list(
/obj/item/device/radio
icon = 'icons/obj/radio_vr.dmi' //VOREStation Edit
name = "shortwave radio" //VOREStation Edit
desc = "Used to talk to people when headsets don't function. Range is limited."
suffix = "\[3\]"
icon_state = "walkietalkie"
item_state = "radio"

View File

@@ -976,6 +976,7 @@
/obj/item/weapon/book/manual/barman_recipes
name = "Barman Recipes"
desc = "For the enterprising drink server."
icon_state = "barbook"
author = "Sir John Rose"
title = "Barman Recipes"

View File

@@ -103,6 +103,7 @@
/obj/item/weapon/storage/box/beakers
name = "box of beakers"
desc = "A box full of beakers."
icon_state = "beaker"
starts_with = list(/obj/item/weapon/reagent_containers/glass/beaker = 7)

View File

@@ -357,6 +357,7 @@
icon_state = "vialbox6"
icon_type = "vial"
name = "vial storage box"
desc = "A helpful rack to hold test tubes."
storage_slots = 6
can_hold = list(/obj/item/weapon/reagent_containers/glass/beaker/vial)
starts_with = list(/obj/item/weapon/reagent_containers/glass/beaker/vial = 6)

View File

@@ -6,6 +6,7 @@
icon = 'icons/obj/food.dmi'
icon_state = "donutbox"
name = "donut box"
desc = "A box that holds tasty donuts, if you're lucky."
max_storage_space = ITEMSIZE_COST_SMALL * 6
can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/donut)
foldable = /obj/item/stack/material/cardboard

View File

@@ -173,6 +173,7 @@
/obj/item/weapon/storage/secure/safe
name = "secure safe"
desc = "It doesn't seem all that secure. Oh well, it'll do."
icon = 'icons/obj/storage.dmi'
icon_state = "safe"
icon_opened = "safe0"

View File

@@ -1,5 +1,6 @@
/obj/structure/curtain
name = "curtain"
desc = "The show must go on! At least, until you close these."
icon = 'icons/obj/curtain.dmi'
icon_state = "closed"
plane = MOB_PLANE

View File

@@ -1,5 +1,6 @@
/obj/machinery/microwave
name = "microwave"
desc = "Studies are inconclusive on whether pressing your face against the glass is harmful."
icon = 'icons/obj/kitchen.dmi'
icon_state = "mw"
density = 1

View File

@@ -13,6 +13,7 @@
/obj/structure/bookcase
name = "bookcase"
desc = "A set of wooden shelves, perfect for placing books on."
icon = 'icons/obj/library.dmi'
icon_state = "book-0"
anchored = 1

View File

@@ -116,6 +116,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
// It is August 22nd, 2012... This TODO has already been here for months.. I wonder how long it'll last before someone does something about it. // Nov 2019. Nope.
/obj/machinery/librarycomp
name = "Check-In/Out Computer"
desc = "Print books from the archives! (You aren't quite sure how they're printed by it, though.)"
icon = 'icons/obj/library.dmi'
icon_state = "computer"
anchored = 1
@@ -521,6 +522,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
*/
/obj/machinery/bookbinder
name = "Book Binder"
desc = "Bundles up a stack of inserted paper into a convenient book format."
icon = 'icons/obj/library.dmi'
icon_state = "binder"
anchored = 1

View File

@@ -3,6 +3,7 @@
/obj/item/weapon/coin
icon = 'icons/obj/items.dmi'
name = "Coin"
desc = "A simple coin you can flip."
icon_state = "coin"
force = 0.0
throwforce = 0.0

View File

@@ -1,5 +1,6 @@
/obj/item/weapon/clipboard
name = "clipboard"
desc = "Used to clip paper to, for an on-the-go writing board."
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "clipboard"
item_state = "clipboard"

View File

@@ -6,6 +6,7 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins
/obj/machinery/photocopier/faxmachine
name = "fax machine"
desc = "Sent papers and pictures far away! Or to your co-worker's office a few doors down."
icon = 'icons/obj/library.dmi'
icon_state = "fax"
insert_anim = "faxsend"

View File

@@ -1,5 +1,6 @@
/obj/item/weapon/hand_labeler
name = "hand labeler"
desc = "Label everything like you've always wanted to! Stuck to the side is a label reading \'Labeler\'. Seems you're too late for that one."
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "labeler0"
var/label = null

View File

@@ -1,5 +1,6 @@
/obj/item/weapon/paper_bin
name = "paper bin"
desc = "A plastic bin full of paper. It seems to have both regular and carbon-copy paper to choose from."
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "paper_bin1"
item_icons = list(

View File

@@ -1,5 +1,6 @@
/obj/machinery/photocopier
name = "photocopier"
desc = "Copy all your important papers here!"
icon = 'icons/obj/library.dmi'
icon_state = "bigscanner"
var/insert_anim = "bigscanner1"
@@ -24,6 +25,10 @@
component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)
RefreshParts()
/obj/machinery/photocopier/examine(mob/user as mob)
if(..(user, 1))
to_chat(user, "The screen shows there's [toner ? "[toner]" : "no"] toner left in the printer.")
/obj/machinery/photocopier/attack_ai(mob/user as mob)
return attack_hand(user)

View File

@@ -1,5 +1,6 @@
/obj/machinery/computer/fusion_fuel_control
name = "fuel injection control computer"
desc = "Displays information about the fuel rods."
icon = 'icons/obj/machines/power/fusion.dmi'
icon_state = "fuel"
circuit = /obj/item/weapon/circuitboard/fusion_fuel_control

View File

@@ -1,5 +1,6 @@
/obj/machinery/computer/gyrotron_control
name = "gyrotron control console"
desc = "Used to control the R-UST stability beams."
icon = 'icons/obj/machines/power/fusion.dmi'
icon_state = "engine"
light_color = COLOR_BLUE

View File

@@ -10,6 +10,7 @@
/obj/machinery/chem_master
name = "ChemMaster 3000"
desc = "Used to seperate and package chemicals in to patches, pills, or bottles. Warranty void if used to create Space Drugs."
density = 1
anchored = 1
icon = 'icons/obj/chemical.dmi'
@@ -327,6 +328,7 @@
/obj/machinery/reagentgrinder
name = "All-In-One Grinder"
desc = "Grinds stuff into itty bitty bits."
icon = 'icons/obj/kitchen.dmi'
icon_state = "juicer1"
density = 0

View File

@@ -1,5 +1,6 @@
/obj/machinery/chemical_dispenser
name = "chemical dispenser"
desc = "Automagically fabricates chemicals from electricity."
icon = 'icons/obj/chemical.dmi'
icon_state = "dispenser"

View File

@@ -212,6 +212,7 @@
/obj/item/weapon/packageWrap
name = "package wrapper"
desc = "Like wrapping paper, but less festive."
icon = 'icons/obj/items.dmi'
icon_state = "deliveryPaper"
w_class = ITEMSIZE_NORMAL

View File

@@ -51,6 +51,7 @@ var/global/list/obj/machinery/message_server/message_servers = list()
icon = 'icons/obj/machines/research.dmi'
icon_state = "server"
name = "Messaging Server"
desc = "Facilitates both PDA messages and request console functions."
density = 1
anchored = 1.0
use_power = 1
@@ -80,6 +81,11 @@ var/global/list/obj/machinery/message_server/message_servers = list()
..()
return
/obj/machinery/message_server/examine(mob/user, distance, infix, suffix)
if(..())
to_chat(user, "It appears to be [active ? "online" : "offline"].")
/obj/machinery/message_server/proc/GenerateKey()
//Feel free to move to Helpers.
var/newKey
@@ -231,6 +237,7 @@ var/obj/machinery/blackbox_recorder/blackbox
icon = 'icons/obj/stationobjs.dmi'
icon_state = "blackbox"
name = "Blackbox Recorder"
desc = "Records all radio communications, as well as various other information in case of the worst."
density = 1
anchored = 1.0
use_power = 1

View File

@@ -29,6 +29,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
/obj/machinery/computer/rdconsole
name = "R&D control console"
desc = "Science, in a computer! Experiment results not guaranteed."
icon_keyboard = "rd_key"
icon_screen = "rdcomp"
light_color = "#a97faa"

View File

@@ -150,6 +150,7 @@
/obj/machinery/computer/rdservercontrol
name = "R&D Server Controller"
desc = "Manage the research designs and servers. Can also modify upload/download permissions to R&D consoles."
icon_keyboard = "rd_key"
icon_screen = "rdcomp"
light_color = "#a97faa"

View File

@@ -1,5 +1,6 @@
/obj/machinery/computer/shuttle_control
name = "shuttle control console"
desc = "Used to control a linked shuttle."
icon_keyboard = "atmos_key"
icon_screen = "shuttle"
circuit = null

View File

@@ -116,6 +116,7 @@
// Panel. Lists floors (HTML), moves with the elevator, schedules a move to a given floor.
/obj/structure/lift/panel
name = "elevator control panel"
desc = "A control panel for moving the elevator. There's a slot for swiping IDs to enable additional controls."
icon_state = "panel"
req_access = list(access_eva)
req_one_access = list(access_heads, access_atmospherics, access_medical)

View File

@@ -26,6 +26,7 @@
/obj/vehicle/train/trolley
name = "cargo train trolley"
desc = "A large, flat platform made for putting things on. Or people."
icon = 'icons/obj/vehicles_vr.dmi' //VOREStation Edit
icon_state = "cargo_trailer"
anchored = 0

View File

@@ -1,5 +1,6 @@
/obj/machinery/disease2/diseaseanalyser
name = "disease analyser"
desc = "Analyzes diseases to find out information about them!"
icon = 'icons/obj/virology.dmi'
icon_state = "analyser"
anchored = 1

View File

@@ -1,5 +1,6 @@
/obj/machinery/disease2/incubator/
name = "pathogenic incubator"
desc = "Encourages the growth of diseases. This model comes with a dispenser system and a small radiation generator."
density = 1
anchored = 1
icon = 'icons/obj/virology.dmi'

View File

@@ -5,6 +5,7 @@
/obj/machinery/disease2/isolator/
name = "pathogenic isolator"
desc = "Used to isolate and identify diseases, allowing for comparison with a remote database."
density = 1
anchored = 1
icon = 'icons/obj/virology.dmi'