From 301c5be5f58f2a6bf56e455654fea10dbc687f32 Mon Sep 17 00:00:00 2001 From: Kyrah Abattoir Date: Mon, 18 Nov 2013 01:36:36 +0100 Subject: [PATCH 01/14] /code/ATMOSPHERICS/* lowercasing pass. --- .../components/binary_devices/dp_vent_pump.dm | 4 ++-- .../components/binary_devices/passive_gate.dm | 2 +- .../components/binary_devices/pump.dm | 2 +- .../components/binary_devices/volume_pump.dm | 2 +- .../components/portables_connector.dm | 2 +- .../components/trinary_devices/filter.dm | 2 +- .../components/trinary_devices/mixer.dm | 2 +- code/ATMOSPHERICS/components/unary/cold_sink.dm | 2 +- .../components/unary/generator_input.dm | 2 +- .../components/unary/heat_exchanger.dm | 2 +- .../ATMOSPHERICS/components/unary/heat_source.dm | 2 +- .../components/unary/outlet_injector.dm | 2 +- .../components/unary/oxygen_generator.dm | 2 +- code/ATMOSPHERICS/components/unary/vent_pump.dm | 6 +++--- .../components/unary/vent_scrubber.dm | 4 ++-- code/ATMOSPHERICS/pipes.dm | 16 ++++++++-------- 16 files changed, 27 insertions(+), 27 deletions(-) diff --git a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm index 547711c9c17..b761ad7150f 100644 --- a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm @@ -5,13 +5,13 @@ //node2 is output port //node1 is input port - name = "Dual Port Air Vent" + name = "dual-port air vent" desc = "Has a valve and pump attached to it. There are two ports." level = 1 high_volume - name = "Large Dual Port Air Vent" + name = "large dual-port air vent" New() ..() diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm index 8944d905d7d..9441b78e48d 100644 --- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm +++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm @@ -4,7 +4,7 @@ obj/machinery/atmospherics/binary/passive_gate icon = 'icons/obj/atmospherics/passive_gate.dmi' icon_state = "intact_off" - name = "Passive gate" + name = "passive gate" desc = "A one-way air valve that does not require power" can_unwrench = 1 diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm index 3efaa3797af..025cfded082 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm @@ -16,7 +16,7 @@ obj/machinery/atmospherics/binary/pump icon = 'icons/obj/atmospherics/pump.dmi' icon_state = "intact_off" - name = "Gas pump" + name = "gas pump" desc = "A pump" can_unwrench = 1 diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm index 9c2f4ce795b..049c3360362 100644 --- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm @@ -16,7 +16,7 @@ obj/machinery/atmospherics/binary/volume_pump icon = 'icons/obj/atmospherics/volume_pump.dmi' icon_state = "intact_off" - name = "Volumetric gas pump" + name = "volumetric gas pump" desc = "A volumetric pump" can_unwrench = 1 diff --git a/code/ATMOSPHERICS/components/portables_connector.dm b/code/ATMOSPHERICS/components/portables_connector.dm index 60a42eccf92..93e3e9435f7 100644 --- a/code/ATMOSPHERICS/components/portables_connector.dm +++ b/code/ATMOSPHERICS/components/portables_connector.dm @@ -2,7 +2,7 @@ icon = 'icons/obj/atmospherics/portables_connector.dmi' icon_state = "intact" - name = "Connector Port" + name = "connector port" desc = "For connecting portables devices related to atmospherics control." dir = SOUTH diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index d401503fb0f..31ffc3bfcd1 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -3,7 +3,7 @@ obj/machinery/atmospherics/trinary/filter icon_state = "intact_off" density = 1 - name = "Gas filter" + name = "gas filter" req_access = list(access_atmospherics) diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm index 34c5bd18a29..279d736f0ff 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm @@ -3,7 +3,7 @@ obj/machinery/atmospherics/trinary/mixer icon_state = "intact_off" density = 1 - name = "Gas mixer" + name = "gas mixer" req_access = list(access_atmospherics) diff --git a/code/ATMOSPHERICS/components/unary/cold_sink.dm b/code/ATMOSPHERICS/components/unary/cold_sink.dm index ef1d5f60bea..b3632c84a16 100644 --- a/code/ATMOSPHERICS/components/unary/cold_sink.dm +++ b/code/ATMOSPHERICS/components/unary/cold_sink.dm @@ -4,7 +4,7 @@ density = 1 use_power = 1 - name = "Cold Sink" + name = "cold sink" desc = "Cools gas when connected to pipe network" var/on = 0 diff --git a/code/ATMOSPHERICS/components/unary/generator_input.dm b/code/ATMOSPHERICS/components/unary/generator_input.dm index 2b31097dc41..97714f1f6e3 100644 --- a/code/ATMOSPHERICS/components/unary/generator_input.dm +++ b/code/ATMOSPHERICS/components/unary/generator_input.dm @@ -3,7 +3,7 @@ icon_state = "intact" density = 1 - name = "Generator Input" + name = "generator input" desc = "Placeholder" var/update_cycle diff --git a/code/ATMOSPHERICS/components/unary/heat_exchanger.dm b/code/ATMOSPHERICS/components/unary/heat_exchanger.dm index a278167b830..017afeaf7e9 100644 --- a/code/ATMOSPHERICS/components/unary/heat_exchanger.dm +++ b/code/ATMOSPHERICS/components/unary/heat_exchanger.dm @@ -4,7 +4,7 @@ icon_state = "intact" density = 1 - name = "Heat Exchanger" + name = "heat exchanger" desc = "Exchanges heat between two input gases. Setup for fast heat transfer" can_unwrench = 1 diff --git a/code/ATMOSPHERICS/components/unary/heat_source.dm b/code/ATMOSPHERICS/components/unary/heat_source.dm index 01438c32d99..a19503b7b61 100644 --- a/code/ATMOSPHERICS/components/unary/heat_source.dm +++ b/code/ATMOSPHERICS/components/unary/heat_source.dm @@ -6,7 +6,7 @@ density = 1 use_power = 1 - name = "Heat Reservoir" + name = "heat reservoir" desc = "Heats gas when connected to pipe network" var/on = 0 diff --git a/code/ATMOSPHERICS/components/unary/outlet_injector.dm b/code/ATMOSPHERICS/components/unary/outlet_injector.dm index 5ba60b66ca9..3a668a1dd0b 100644 --- a/code/ATMOSPHERICS/components/unary/outlet_injector.dm +++ b/code/ATMOSPHERICS/components/unary/outlet_injector.dm @@ -3,7 +3,7 @@ icon_state = "off" use_power = 1 - name = "Air Injector" + name = "air injector" desc = "Has a valve and pump attached to it" var/on = 0 diff --git a/code/ATMOSPHERICS/components/unary/oxygen_generator.dm b/code/ATMOSPHERICS/components/unary/oxygen_generator.dm index 9a58be7c302..f87b9982ce0 100644 --- a/code/ATMOSPHERICS/components/unary/oxygen_generator.dm +++ b/code/ATMOSPHERICS/components/unary/oxygen_generator.dm @@ -3,7 +3,7 @@ obj/machinery/atmospherics/unary/oxygen_generator icon_state = "intact_off" density = 1 - name = "Oxygen Generator" + name = "oxygen generator" desc = "" dir = SOUTH diff --git a/code/ATMOSPHERICS/components/unary/vent_pump.dm b/code/ATMOSPHERICS/components/unary/vent_pump.dm index e1dd0a1f619..8af45a38ba4 100644 --- a/code/ATMOSPHERICS/components/unary/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary/vent_pump.dm @@ -2,7 +2,7 @@ icon = 'icons/obj/atmospherics/vent_pump.dmi' icon_state = "off" - name = "Air Vent" + name = "air vent" desc = "Has a valve and pump attached to it" use_power = 1 @@ -58,7 +58,7 @@ src.broadcast_status() high_volume - name = "Large Air Vent" + name = "large air vent" power_channel = EQUIP New() ..() @@ -168,7 +168,7 @@ ) if(!initial_loc.air_vent_names[id_tag]) - var/new_name = "[initial_loc.name] Vent Pump #[initial_loc.air_vent_names.len+1]" + var/new_name = "\improper [initial_loc.name] vent pump #[initial_loc.air_vent_names.len+1]" initial_loc.air_vent_names[id_tag] = new_name src.name = new_name initial_loc.air_vent_info[id_tag] = signal.data diff --git a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm index 26aa0c3d9ba..2ee546a8de3 100644 --- a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm +++ b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm @@ -2,7 +2,7 @@ icon = 'icons/obj/atmospherics/vent_scrubber.dmi' icon_state = "off" - name = "Air Scrubber" + name = "air scrubber" desc = "Has a valve and pump attached to it" use_power = 1 @@ -78,7 +78,7 @@ "sigtype" = "status" ) if(!initial_loc.air_scrub_names[id_tag]) - var/new_name = "[initial_loc.name] Air Scrubber #[initial_loc.air_scrub_names.len+1]" + var/new_name = "\improper [initial_loc.name] air scrubber #[initial_loc.air_scrub_names.len+1]" initial_loc.air_scrub_names[id_tag] = new_name src.name = new_name initial_loc.air_scrub_info[id_tag] = signal.data diff --git a/code/ATMOSPHERICS/pipes.dm b/code/ATMOSPHERICS/pipes.dm index 7c3a338ab9b..a1a29627b42 100644 --- a/code/ATMOSPHERICS/pipes.dm +++ b/code/ATMOSPHERICS/pipes.dm @@ -336,7 +336,7 @@ obj/machinery/atmospherics/pipe icon = 'icons/obj/atmospherics/pipe_tank.dmi' icon_state = "intact" - name = "Pressure Tank" + name = "pressure tank" desc = "A large vessel containing pressurized gas." volume = 10000 //in liters, 1 meters by 1 meters by 2 meters @@ -367,7 +367,7 @@ obj/machinery/atmospherics/pipe nodealert = 0 */ carbon_dioxide - name = "Pressure Tank (Carbon Dioxide)" + name = "pressure tank (Carbon Dioxide)" New() air_temporary = new @@ -380,7 +380,7 @@ obj/machinery/atmospherics/pipe toxins icon = 'icons/obj/atmospherics/orange_pipe_tank.dmi' - name = "Pressure Tank (Plasma)" + name = "pressure tank (Plasma)" New() air_temporary = new @@ -393,7 +393,7 @@ obj/machinery/atmospherics/pipe oxygen_agent_b icon = 'icons/obj/atmospherics/red_orange_pipe_tank.dmi' - name = "Pressure Tank (Oxygen + Plasma)" + name = "pressure tank (Oxygen + Plasma)" New() air_temporary = new @@ -409,7 +409,7 @@ obj/machinery/atmospherics/pipe oxygen icon = 'icons/obj/atmospherics/blue_pipe_tank.dmi' - name = "Pressure Tank (Oxygen)" + name = "pressure tank (Oxygen)" New() air_temporary = new @@ -422,7 +422,7 @@ obj/machinery/atmospherics/pipe nitrogen icon = 'icons/obj/atmospherics/red_pipe_tank.dmi' - name = "Pressure Tank (Nitrogen)" + name = "pressure tank (Nitrogen)" New() air_temporary = new @@ -435,7 +435,7 @@ obj/machinery/atmospherics/pipe air icon = 'icons/obj/atmospherics/red_pipe_tank.dmi' - name = "Pressure Tank (Air)" + name = "pressure tank (Air)" New() air_temporary = new @@ -494,7 +494,7 @@ obj/machinery/atmospherics/pipe icon = 'icons/obj/atmospherics/pipe_vent.dmi' icon_state = "intact" - name = "Vent" + name = "vent" desc = "A large air vent" level = 1 From ccc06644a0c2716ae2aef5de08f3bacb90fe80e7 Mon Sep 17 00:00:00 2001 From: Kyrah Abattoir Date: Mon, 18 Nov 2013 02:16:23 +0100 Subject: [PATCH 02/14] /code/controllers/* lowercasing pass. --- code/controllers/supply_shuttle.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/controllers/supply_shuttle.dm b/code/controllers/supply_shuttle.dm index 9dfdbe8889d..c325a0a6a0d 100644 --- a/code/controllers/supply_shuttle.dm +++ b/code/controllers/supply_shuttle.dm @@ -88,7 +88,7 @@ var/global/datum/controller/supply_shuttle/supply_shuttle /obj/machinery/computer/ordercomp - name = "Supply Ordering Console" + name = "supply ordering console" icon = 'icons/obj/computer.dmi' icon_state = "request" circuit = /obj/item/weapon/circuitboard/ordercomp @@ -378,7 +378,7 @@ var/global/datum/controller/supply_shuttle/supply_shuttle return /obj/item/weapon/paper/manifest - name = "Supply Manifest" + name = "supply manifest" var/erroneous = 0 var/points = 0 var/ordernumber = 0 @@ -464,7 +464,7 @@ var/global/datum/controller/supply_shuttle/supply_shuttle supply_shuttle.ordernum++ var/obj/item/weapon/paper/reqform = new /obj/item/weapon/paper(loc) - reqform.name = "Requisition Form - [P.name]" + reqform.name = "requisition form - [P.name]" reqform.info += "

[station_name] Supply Requisition Form

" reqform.info += "INDEX: #[supply_shuttle.ordernum]
" reqform.info += "REQUESTED BY: [idname]
" @@ -654,7 +654,7 @@ var/global/datum/controller/supply_shuttle/supply_shuttle supply_shuttle.ordernum++ var/obj/item/weapon/paper/reqform = new /obj/item/weapon/paper(loc) - reqform.name = "Requisition Form - [P.name]" + reqform.name = "requisition form - [P.name]" reqform.info += "

[station_name] Supply Requisition Form

" reqform.info += "INDEX: #[supply_shuttle.ordernum]
" reqform.info += "REQUESTED BY: [idname]
" From 200b6759cce6f50ef9752bcdc3af6abfadafd2b8 Mon Sep 17 00:00:00 2001 From: Kyrah Abattoir Date: Mon, 18 Nov 2013 02:33:54 +0100 Subject: [PATCH 03/14] code/game/dna.dm made the DNA scanner access console improper. --- code/game/dna.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/dna.dm b/code/game/dna.dm index d0f8d1d5df4..32ef328b1fe 100644 --- a/code/game/dna.dm +++ b/code/game/dna.dm @@ -483,7 +483,7 @@ /obj/machinery/computer/scan_consolenew - name = "DNA Scanner Access Console" + name = "\improper DNA Scanner Access Console" desc = "Scan DNA." icon = 'icons/obj/computer.dmi' icon_state = "scanner" From cb669afcc4db16fa393a3a8386b46e5ce698be9c Mon Sep 17 00:00:00 2001 From: Kyrah Abattoir Date: Mon, 18 Nov 2013 02:57:30 +0100 Subject: [PATCH 04/14] code/game/machinery/* (root folder) lowercasing pass --- code/game/machinery/Beacon.dm | 2 +- code/game/machinery/PDApainter.dm | 2 +- code/game/machinery/ai_slipper.dm | 2 +- code/game/machinery/atmo_control.dm | 4 +-- code/game/machinery/cloning.dm | 4 +-- code/game/machinery/constructable_frame.dm | 38 +++++++++++----------- code/game/machinery/flasher.dm | 2 +- code/game/machinery/igniter.dm | 2 +- code/game/machinery/magnet.dm | 4 +-- code/game/machinery/newscaster.dm | 2 +- code/game/machinery/requests_console.dm | 4 +-- code/game/machinery/robot_fabricator.dm | 2 +- code/game/machinery/shieldgen.dm | 8 ++--- code/game/machinery/status_display.dm | 2 +- code/game/machinery/suit_storage_unit.dm | 2 +- code/game/machinery/syndicatebomb.dm | 2 +- code/game/machinery/transformer.dm | 2 +- code/game/machinery/turrets.dm | 4 +-- code/game/machinery/washing_machine.dm | 2 +- code/game/machinery/wishgranter.dm | 2 +- 20 files changed, 46 insertions(+), 46 deletions(-) diff --git a/code/game/machinery/Beacon.dm b/code/game/machinery/Beacon.dm index 7000471dfff..cc9a7b6a66d 100644 --- a/code/game/machinery/Beacon.dm +++ b/code/game/machinery/Beacon.dm @@ -2,7 +2,7 @@ icon = 'icons/obj/objects.dmi' icon_state = "floor_beaconf" - name = "Bluespace Gigabeacon" + name = "bluespace gigabeacon" desc = "A device that draws power from bluespace and creates a permanent tracking beacon." level = 1 // underfloor layer = 2.5 diff --git a/code/game/machinery/PDApainter.dm b/code/game/machinery/PDApainter.dm index a7124c21120..fb1a05ff1dd 100644 --- a/code/game/machinery/PDApainter.dm +++ b/code/game/machinery/PDApainter.dm @@ -1,5 +1,5 @@ /obj/machinery/pdapainter - name = "PDA painter" + name = "\improper PDA painter" desc = "A PDA painting machine. To use, simply insert your PDA and choose the desired preset paint scheme." icon = 'icons/obj/pda.dmi' icon_state = "pdapainter" diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index 87e4b8d6098..9b030f21d60 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -1,5 +1,5 @@ /obj/machinery/ai_slipper - name = "AI Liquid Dispenser" + name = "\improper AI liquid dispenser" icon = 'icons/obj/device.dmi' icon_state = "motion3" layer = 3 diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm index 984eb66c0a7..10edcb49407 100644 --- a/code/game/machinery/atmo_control.dm +++ b/code/game/machinery/atmo_control.dm @@ -1,7 +1,7 @@ obj/machinery/air_sensor icon = 'icons/obj/stationobjs.dmi' icon_state = "gsensor1" - name = "Gas Sensor" + name = "gas sensor" anchored = 1 var/state = 0 @@ -79,7 +79,7 @@ obj/machinery/computer/general_air_control icon_state = "tank" circuit = /obj/item/weapon/circuitboard/air_management - name = "Computer" + name = "computer" var/frequency = 1439 var/list/sensors = list() diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 4ea2e256696..958bd693066 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -22,7 +22,7 @@ //The return of data disks?? Just for transferring between genetics machine/cloning machine. //TO-DO: Make the genetics machine accept them. /obj/item/weapon/disk/data - name = "Cloning Data Disk" + name = "cloning data disk" icon = 'icons/obj/cloning.dmi' icon_state = "datadisk0" //Gosh I hope syndies don't mistake them for the nuke disk. item_state = "card-id" @@ -352,7 +352,7 @@ */ /obj/item/weapon/storage/box/disks - name = "Diskette Box" + name = "diskette box" icon_state = "disk_kit" /obj/item/weapon/storage/box/disks/New() diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index de873133890..a41d002efe0 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -160,7 +160,7 @@ Note: Once everything is added to the public areas, will add m_amt and g_amt to to destroy them and players will be able to make replacements. */ /obj/item/weapon/circuitboard/destructive_analyzer - name = "Circuit board (Destructive Analyzer)" + name = "circuit board (Destructive Analyzer)" build_path = "/obj/machinery/r_n_d/destructive_analyzer" board_type = "machine" origin_tech = "magnets=2;engineering=2;programming=2" @@ -170,7 +170,7 @@ to destroy them and players will be able to make replacements. "/obj/item/weapon/stock_parts/micro_laser" = 1) /obj/item/weapon/circuitboard/autolathe - name = "Circuit board (Autolathe)" + name = "circuit board (Autolathe)" build_path = "/obj/machinery/autolathe" board_type = "machine" origin_tech = "engineering=2;programming=2" @@ -180,7 +180,7 @@ to destroy them and players will be able to make replacements. "/obj/item/weapon/stock_parts/console_screen" = 1) /obj/item/weapon/circuitboard/protolathe - name = "Circuit board (Protolathe)" + name = "circuit board (Protolathe)" build_path = "/obj/machinery/r_n_d/protolathe" board_type = "machine" origin_tech = "engineering=2;programming=2" @@ -191,7 +191,7 @@ to destroy them and players will be able to make replacements. /obj/item/weapon/circuitboard/circuit_imprinter - name = "Circuit board (Circuit Imprinter)" + name = "circuit board (Circuit Imprinter)" build_path = "/obj/machinery/r_n_d/circuit_imprinter" board_type = "machine" origin_tech = "engineering=2;programming=2" @@ -201,7 +201,7 @@ to destroy them and players will be able to make replacements. "/obj/item/weapon/reagent_containers/glass/beaker" = 2) /obj/item/weapon/circuitboard/pacman - name = "Circuit Board (PACMAN-type Generator)" + name = "circuit board (PACMAN-type Generator)" build_path = "/obj/machinery/power/port_gen/pacman" board_type = "machine" origin_tech = "programming=3:powerstorage=3;plasmatech=3;engineering=3" @@ -212,17 +212,17 @@ to destroy them and players will be able to make replacements. "/obj/item/weapon/stock_parts/capacitor" = 1) /obj/item/weapon/circuitboard/pacman/super - name = "Circuit Board (SUPERPACMAN-type Generator)" + name = "circuit board (SUPERPACMAN-type Generator)" build_path = "/obj/machinery/power/port_gen/pacman/super" origin_tech = "programming=3;powerstorage=4;engineering=4" /obj/item/weapon/circuitboard/pacman/mrs - name = "Circuit Board (MRSPACMAN-type Generator)" + name = "circuit board (MRSPACMAN-type Generator)" build_path = "/obj/machinery/power/port_gen/pacman/mrs" origin_tech = "programming=3;powerstorage=5;engineering=5" obj/item/weapon/circuitboard/rdserver - name = "Circuit Board (R&D Server)" + name = "circuit board (R&D Server)" build_path = "/obj/machinery/r_n_d/server" board_type = "machine" origin_tech = "programming=3" @@ -231,7 +231,7 @@ obj/item/weapon/circuitboard/rdserver "/obj/item/weapon/stock_parts/scanning_module" = 1) /obj/item/weapon/circuitboard/mechfab - name = "Circuit board (Exosuit Fabricator)" + name = "circuit board (Exosuit Fabricator)" build_path = "/obj/machinery/mecha_part_fabricator" board_type = "machine" origin_tech = "programming=3;engineering=3" @@ -242,7 +242,7 @@ obj/item/weapon/circuitboard/rdserver "/obj/item/weapon/stock_parts/console_screen" = 1) /obj/item/weapon/circuitboard/clonepod - name = "Circuit board (Clone Pod)" + name = "circuit board (Clone Pod)" build_path = "/obj/machinery/clonepod" board_type = "machine" origin_tech = "programming=3;biotech=3" @@ -253,7 +253,7 @@ obj/item/weapon/circuitboard/rdserver "/obj/item/weapon/stock_parts/console_screen" = 1) /obj/item/weapon/circuitboard/clonescanner - name = "Circuit board (Cloning Scanner)" + name = "circuit board (Cloning Scanner)" build_path = "/obj/machinery/dna_scannernew" board_type = "machine" origin_tech = "programming=2;biotech=2" @@ -265,7 +265,7 @@ obj/item/weapon/circuitboard/rdserver "/obj/item/weapon/cable_coil" = 2,) /obj/item/weapon/circuitboard/cyborgrecharger - name = "Circuit board (Cyborg Recharger)" + name = "circuit board (Cyborg Recharger)" build_path = "/obj/machinery/recharge_station" board_type = "machine" origin_tech = "powerstorage=3;engineering=3" @@ -277,7 +277,7 @@ obj/item/weapon/circuitboard/rdserver // Telecomms circuit boards: /obj/item/weapon/circuitboard/telecomms/receiver - name = "Circuit Board (Subspace Receiver)" + name = "circuit board (Subspace Receiver)" build_path = "/obj/machinery/telecomms/receiver" board_type = "machine" origin_tech = "programming=2;engineering=2;bluespace=1" @@ -288,7 +288,7 @@ obj/item/weapon/circuitboard/rdserver "/obj/item/weapon/stock_parts/micro_laser" = 1) /obj/item/weapon/circuitboard/telecomms/hub - name = "Circuit Board (Hub Mainframe)" + name = "circuit board (Hub Mainframe)" build_path = "/obj/machinery/telecomms/hub" board_type = "machine" origin_tech = "programming=2;engineering=2" @@ -298,7 +298,7 @@ obj/item/weapon/circuitboard/rdserver "/obj/item/weapon/stock_parts/subspace/filter" = 2) /obj/item/weapon/circuitboard/telecomms/relay - name = "Circuit Board (Relay Mainframe)" + name = "circuit board (Relay Mainframe)" build_path = "/obj/machinery/telecomms/relay" board_type = "machine" origin_tech = "programming=2;engineering=2;bluespace=2" @@ -308,7 +308,7 @@ obj/item/weapon/circuitboard/rdserver "/obj/item/weapon/stock_parts/subspace/filter" = 2) /obj/item/weapon/circuitboard/telecomms/bus - name = "Circuit Board (Bus Mainframe)" + name = "circuit board (Bus Mainframe)" build_path = "/obj/machinery/telecomms/bus" board_type = "machine" origin_tech = "programming=2;engineering=2" @@ -318,7 +318,7 @@ obj/item/weapon/circuitboard/rdserver "/obj/item/weapon/stock_parts/subspace/filter" = 1) /obj/item/weapon/circuitboard/telecomms/processor - name = "Circuit Board (Processor Unit)" + name = "circuit board (Processor Unit)" build_path = "/obj/machinery/telecomms/processor" board_type = "machine" origin_tech = "programming=2;engineering=2" @@ -331,7 +331,7 @@ obj/item/weapon/circuitboard/rdserver "/obj/item/weapon/stock_parts/subspace/amplifier" = 1) /obj/item/weapon/circuitboard/telecomms/server - name = "Circuit Board (Telecommunication Server)" + name = "circuit board (Telecommunication Server)" build_path = "/obj/machinery/telecomms/server" board_type = "machine" origin_tech = "programming=2;engineering=2" @@ -341,7 +341,7 @@ obj/item/weapon/circuitboard/rdserver "/obj/item/weapon/stock_parts/subspace/filter" = 1) /obj/item/weapon/circuitboard/telecomms/broadcaster - name = "Circuit Board (Subspace Broadcaster)" + name = "circuit board (Subspace Broadcaster)" build_path = "/obj/machinery/telecomms/broadcaster" board_type = "machine" origin_tech = "programming=2;engineering=2;bluespace=1" diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 2dc8b0b8313..6dd2af1418d 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -1,7 +1,7 @@ // It is a gizmo that flashes a small area /obj/machinery/flasher - name = "Mounted flash" + name = "mounted flash" desc = "A wall-mounted flashbulb device." icon = 'icons/obj/stationobjs.dmi' icon_state = "mflash1" diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index 817a3603e84..9e72fb08979 100644 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -48,7 +48,7 @@ // Wall mounted remote-control igniter. /obj/machinery/sparker - name = "Mounted igniter" + name = "mounted igniter" desc = "A wall-mounted ignition device." icon = 'icons/obj/stationobjs.dmi' icon_state = "migniter" diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm index cb7dc75e7d4..8a30aab9651 100644 --- a/code/game/machinery/magnet.dm +++ b/code/game/machinery/magnet.dm @@ -8,7 +8,7 @@ icon = 'icons/obj/objects.dmi' icon_state = "floor_magnet-f" - name = "Electromagnetic Generator" + name = "electromagnetic generator" desc = "A device that uses station power to create points of magnetic energy." level = 1 // underfloor layer = 2.5 @@ -194,7 +194,7 @@ /obj/machinery/magnetic_controller - name = "Magnetic Control Console" + name = "magnetic control console" icon = 'icons/obj/airlock_machines.dmi' // uses an airlock machine icon, THINK GREEN HELP THE ENVIRONMENT - RECYCLING! icon_state = "airlock_control_standby" density = 1 diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 0c608456f96..35385ec64ff 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -95,7 +95,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co /obj/machinery/newscaster/security_unit //Security unit - name = "Security Newscaster" + name = "security newscaster" securityCaster = 1 /obj/machinery/newscaster/New() //Constructor, ho~ diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 9132d8a19f4..6ca5d450ef2 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -7,7 +7,7 @@ var/req_console_information = list() var/list/obj/machinery/requests_console/allConsoles = list() /obj/machinery/requests_console - name = "Requests Console" + name = "requests console" desc = "A console intended to send requests to diferent departments on the station." anchored = 1 icon = 'icons/obj/terminals.dmi' @@ -80,7 +80,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() icon_state = "req_comp0" /obj/machinery/requests_console/New() - name = "[department] Requests Console" + name = "\improper [department] requests console" allConsoles += src //req_console_departments += department switch(departmentType) diff --git a/code/game/machinery/robot_fabricator.dm b/code/game/machinery/robot_fabricator.dm index 3d185e47d7c..62973585332 100644 --- a/code/game/machinery/robot_fabricator.dm +++ b/code/game/machinery/robot_fabricator.dm @@ -1,5 +1,5 @@ /obj/machinery/robotic_fabricator - name = "Robotic Fabricator" + name = "robotic fabricator" icon = 'icons/obj/robotics.dmi' icon_state = "fab-idle" density = 1 diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index c57513d8510..989e897721d 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -1,5 +1,5 @@ /obj/machinery/shield - name = "Emergency energy shield" + name = "emergency energy shield" desc = "An energy shield used to contain hull breaches." icon = 'icons/effects/effects.dmi' icon_state = "shield-old" @@ -134,7 +134,7 @@ /obj/machinery/shieldgen - name = "Anti-breach shielding projector" + name = "anti-breach shielding projector" desc = "Used to seal minor hull breaches." icon = 'icons/obj/objects.dmi' icon_state = "shieldoff" @@ -313,7 +313,7 @@ ////FIELD GEN START //shameless copypasta from fieldgen, powersink, and grille #define maxstoredpower 500 /obj/machinery/shieldwallgen - name = "Shield Generator" + name = "shield generator" desc = "A shield generator." icon = 'icons/obj/stationobjs.dmi' icon_state = "Shield_Gen" @@ -536,7 +536,7 @@ //////////////Containment Field START /obj/machinery/shieldwall - name = "Shield" + name = "shield" desc = "An energy shield." icon = 'icons/effects/effects.dmi' icon_state = "shieldwall" diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index c30944731a7..9f85aa337b6 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -202,7 +202,7 @@ /obj/machinery/ai_status_display icon = 'icons/obj/status_display.dmi' icon_state = "frame" - name = "AI display" + name = "\improper AI display" anchored = 1 density = 0 diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 546261b66fe..a4060b67073 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -4,7 +4,7 @@ /obj/machinery/suit_storage_unit - name = "Suit Storage Unit" + name = "suit storage unit" desc = "An industrial U-Stor-It Storage unit designed to accomodate all kinds of space suits. Its on-board equipment also allows the user to decontaminate the contents through a UV-ray purging cycle. There's a warning label dangling from the control pad, reading \"STRICTLY NO BIOLOGICALS IN THE CONFINES OF THE UNIT\"." icon = 'icons/obj/suitstorage.dmi' icon_state = "suitstorage000000100" //order is: [has helmet][has suit][has human][is open][is locked][is UV cycling][is powered][is dirty/broken] [is superUVcycling] diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index d6b2a37dc4c..f78ca4b746d 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -1,6 +1,6 @@ /obj/machinery/syndicatebomb icon = 'icons/obj/assemblies.dmi' - name = "Syndicate Bomb" + name = "syndicate bomb" icon_state = "syndicate-bomb-inactive" desc = "A large and menacing device. Can be bolted down with a wrench." diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm index 0b1de5e1016..03660e68caa 100644 --- a/code/game/machinery/transformer.dm +++ b/code/game/machinery/transformer.dm @@ -1,5 +1,5 @@ /obj/machinery/transformer - name = "Automatic Robotic Factory 5000" + name = "\improper Automatic Robotic Factory 5000" desc = "A large metalic machine with an entrance and an exit. A sign on the side reads, 'human go in, robot come out', human must be lying down and alive. Has to cooldown between each use." icon = 'icons/obj/recycling.dmi' icon_state = "separator-AO1" diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm index 9d98e63a299..39da02b0e1d 100644 --- a/code/game/machinery/turrets.dm +++ b/code/game/machinery/turrets.dm @@ -304,7 +304,7 @@ del(src) /obj/machinery/turretid - name = "Turret deactivation control" + name = "turret deactivation control" icon = 'icons/obj/device.dmi' icon_state = "motion3" anchored = 1 @@ -473,7 +473,7 @@ /obj/structure/turret/gun_turret - name = "Gun Turret" + name = "gun turret" density = 1 anchored = 1 var/cooldown = 20 diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index 0628afd0ffe..5e66b5cd626 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -1,5 +1,5 @@ /obj/machinery/washing_machine - name = "Washing Machine" + name = "washing machine" icon = 'icons/obj/machines/washing_machine.dmi' icon_state = "wm_10" density = 1 diff --git a/code/game/machinery/wishgranter.dm b/code/game/machinery/wishgranter.dm index d79ef408ff4..cce6fe8bf1c 100644 --- a/code/game/machinery/wishgranter.dm +++ b/code/game/machinery/wishgranter.dm @@ -1,5 +1,5 @@ /obj/machinery/wish_granter - name = "Wish Granter" + name = "wish granter" desc = "You're not so sure about this, anymore..." icon = 'icons/obj/device.dmi' icon_state = "syndbeacon" From 7ccb42246697213a9782582635c189f890f0716f Mon Sep 17 00:00:00 2001 From: Kyrah Abattoir Date: Mon, 18 Nov 2013 17:43:37 +0100 Subject: [PATCH 05/14] code/game/atmoalter/* lowercasing pass --- .../machinery/atmoalter/area_atmos_computer.dm | 2 +- code/game/machinery/atmoalter/canister.dm | 14 +++++++------- code/game/machinery/atmoalter/pump.dm | 2 +- code/game/machinery/atmoalter/scrubber.dm | 6 +++--- code/game/machinery/atmoalter/zvent.dm | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/code/game/machinery/atmoalter/area_atmos_computer.dm b/code/game/machinery/atmoalter/area_atmos_computer.dm index eeeeb1c3009..fc38866bd5d 100644 --- a/code/game/machinery/atmoalter/area_atmos_computer.dm +++ b/code/game/machinery/atmoalter/area_atmos_computer.dm @@ -1,5 +1,5 @@ /obj/machinery/computer/area_atmos - name = "Area Air Control" + name = "area air control computer" desc = "A computer used to control the stationary scrubbers and pumps in the area." icon_state = "area_atmos" circuit = "/obj/item/weapon/circuitboard/area_atmos" diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 136f29645f7..49e23c55c05 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -19,32 +19,32 @@ var/release_log = "" /obj/machinery/portable_atmospherics/canister/sleeping_agent - name = "Canister: \[N2O\]" + name = "canister: \[N2O\]" icon_state = "redws" canister_color = "redws" can_label = 0 /obj/machinery/portable_atmospherics/canister/nitrogen - name = "Canister: \[N2\]" + name = "canister: \[N2\]" icon_state = "red" canister_color = "red" can_label = 0 /obj/machinery/portable_atmospherics/canister/oxygen - name = "Canister: \[O2\]" + name = "canister: \[O2\]" icon_state = "blue" canister_color = "blue" can_label = 0 /obj/machinery/portable_atmospherics/canister/toxins - name = "Canister \[Toxin (Bio)\]" + name = "canister \[Toxin (Bio)\]" icon_state = "orange" canister_color = "orange" can_label = 0 /obj/machinery/portable_atmospherics/canister/carbon_dioxide - name = "Canister \[CO2\]" + name = "canister \[CO2\]" icon_state = "black" canister_color = "black" can_label = 0 /obj/machinery/portable_atmospherics/canister/air - name = "Canister \[Air\]" + name = "canister \[Air\]" icon_state = "grey" canister_color = "grey" can_label = 0 @@ -301,7 +301,7 @@ Release Pressure: - Date: Mon, 18 Nov 2013 18:26:00 +0100 Subject: [PATCH 06/14] code/game/machinery/bots/* improper pass --- code/game/machinery/bots/cleanbot.dm | 2 +- code/game/machinery/bots/ed209bot.dm | 4 ++-- code/game/machinery/bots/floorbot.dm | 2 +- code/game/machinery/bots/medbot.dm | 4 ++-- code/game/machinery/bots/mulebot.dm | 4 ++-- code/game/machinery/bots/secbot.dm | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/game/machinery/bots/cleanbot.dm b/code/game/machinery/bots/cleanbot.dm index c64cf35c629..86fc807350e 100644 --- a/code/game/machinery/bots/cleanbot.dm +++ b/code/game/machinery/bots/cleanbot.dm @@ -15,7 +15,7 @@ //Cleanbot /obj/machinery/bot/cleanbot - name = "Cleanbot" + name = "\improper Cleanbot" desc = "A little cleaning robot, he looks so excited!" icon = 'icons/obj/aibots.dmi' icon_state = "cleanbot0" diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm index 0f768bce274..5992c0ce62e 100644 --- a/code/game/machinery/bots/ed209bot.dm +++ b/code/game/machinery/bots/ed209bot.dm @@ -1,5 +1,5 @@ /obj/machinery/bot/ed209 - name = "ED-209 Security Robot" + name = "\improper ED-209 Security Robot" desc = "A security robot. He looks less than thrilled." icon = 'icons/obj/aibots.dmi' icon_state = "ed2090" @@ -61,7 +61,7 @@ /obj/item/weapon/ed209_assembly - name = "ED-209 assembly" + name = "\improper ED-209 assembly" desc = "Some sort of bizarre assembly." icon = 'icons/obj/aibots.dmi' icon_state = "ed209_frame" diff --git a/code/game/machinery/bots/floorbot.dm b/code/game/machinery/bots/floorbot.dm index b130a2b9086..118586c31a8 100644 --- a/code/game/machinery/bots/floorbot.dm +++ b/code/game/machinery/bots/floorbot.dm @@ -27,7 +27,7 @@ //Floorbot /obj/machinery/bot/floorbot - name = "Floorbot" + name = "\improper Floorbot" desc = "A little floor repairing robot, he looks so excited!" icon = 'icons/obj/aibots.dmi' icon_state = "floorbot0" diff --git a/code/game/machinery/bots/medbot.dm b/code/game/machinery/bots/medbot.dm index e91a2b42bde..bd93f823b8f 100644 --- a/code/game/machinery/bots/medbot.dm +++ b/code/game/machinery/bots/medbot.dm @@ -4,7 +4,7 @@ /obj/machinery/bot/medbot - name = "Medibot" + name = "\improper Medibot" desc = "A little medical robot. He looks somewhat underwhelmed." icon = 'icons/obj/aibots.dmi' icon_state = "medibot0" @@ -40,7 +40,7 @@ var/shut_up = 0 //self explanatory :) /obj/machinery/bot/medbot/mysterious - name = "Mysterious Medibot" + name = "\improper Mysterious Medibot" desc = "International Medibot of mystery." skin = "bezerk" treatment_oxy = "dexalinp" diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm index 163fb4d2a1f..483bfcb0bb7 100644 --- a/code/game/machinery/bots/mulebot.dm +++ b/code/game/machinery/bots/mulebot.dm @@ -83,7 +83,7 @@ var/global/mulebot_count = 0 mulebot_count += 1 if(!suffix) suffix = "#[mulebot_count]" - name = "Mulebot ([suffix])" + name = "\improper Mulebot ([suffix])" verbs -= /atom/movable/verb/pull @@ -330,7 +330,7 @@ var/global/mulebot_count = 0 refresh=1 if(new_id) suffix = new_id - name = "Mulebot ([suffix])" + name = "\improper Mulebot ([suffix])" updateDialog() if("sethome") diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm index 1005222ee7f..f2c6ceb5446 100644 --- a/code/game/machinery/bots/secbot.dm +++ b/code/game/machinery/bots/secbot.dm @@ -1,5 +1,5 @@ /obj/machinery/bot/secbot - name = "Securitron" + name = "\improper Securitron" desc = "A little security robot. He looks less than thrilled." icon = 'icons/obj/aibots.dmi' icon_state = "secbot0" From 422f11900e7884e72f494588f44f1fc3b8296178 Mon Sep 17 00:00:00 2001 From: Kyrah Abattoir Date: Mon, 18 Nov 2013 18:54:40 +0100 Subject: [PATCH 07/14] code/game/machinery/computer/* lowercase pass --- .../machinery/computer/HolodeckControl.dm | 6 +- code/game/machinery/computer/ai_core.dm | 4 +- code/game/machinery/computer/aifixer.dm | 2 +- code/game/machinery/computer/atmos_alert.dm | 2 +- .../game/machinery/computer/buildandrepair.dm | 110 +++++++++--------- code/game/machinery/computer/camera.dm | 8 +- code/game/machinery/computer/card.dm | 4 +- code/game/machinery/computer/cloning.dm | 2 +- .../game/machinery/computer/communications.dm | 2 +- code/game/machinery/computer/crew.dm | 2 +- code/game/machinery/computer/law.dm | 4 +- code/game/machinery/computer/medical.dm | 4 +- code/game/machinery/computer/message.dm | 4 +- code/game/machinery/computer/pod.dm | 2 +- code/game/machinery/computer/power.dm | 2 +- code/game/machinery/computer/prisoner.dm | 2 +- code/game/machinery/computer/robot.dm | 2 +- code/game/machinery/computer/security.dm | 2 +- code/game/machinery/computer/shuttle.dm | 2 +- code/game/machinery/computer/station_alert.dm | 2 +- .../machinery/computer/telecrystalconsoles.dm | 6 +- 21 files changed, 87 insertions(+), 87 deletions(-) diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index 97c7797ccd6..f2b52bff051 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -1,5 +1,5 @@ /obj/machinery/computer/HolodeckControl - name = "Holodeck Control Console" + name = "holodeck control console" desc = "A computer used to control a nearby holodeck." icon_state = "holocontrol" var/area/linkedholodeck = null @@ -289,7 +289,7 @@ thermal_conductivity = 0 /turf/simulated/floor/holofloor/grass - name = "Lush Grass" + name = "\proper lush grass" icon_state = "grass1" floor_tile = new/obj/item/stack/tile/grass @@ -474,7 +474,7 @@ /obj/machinery/readybutton - name = "Ready Declaration Device" + name = "ready declaration device" desc = "This device is used to declare ready. If all devices in an area are ready, the event will begin!" icon = 'icons/obj/monitors.dmi' icon_state = "auth_off" diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm index 7a9b02e5b6a..620736969d9 100644 --- a/code/game/machinery/computer/ai_core.dm +++ b/code/game/machinery/computer/ai_core.dm @@ -1,7 +1,7 @@ /obj/structure/AIcore density = 1 anchored = 0 - name = "AI core" + name = "\improper AI core" icon = 'icons/mob/AI.dmi' icon_state = "0" var/state = 0 @@ -169,7 +169,7 @@ del(src) /obj/structure/AIcore/deactivated - name = "Inactive AI" + name = "inactive AI" icon = 'icons/mob/AI.dmi' icon_state = "ai-empty" anchored = 1 diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index 93dde1380c2..0339f223bf7 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -1,5 +1,5 @@ /obj/machinery/computer/aifixer - name = "AI System Integrity Restorer" + name = "\improper AI system integrity restorer" icon = 'icons/obj/computer.dmi' icon_state = "ai-fixer" req_access = list(access_captain, access_robotics, access_heads) diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index f600982cd86..614933c0635 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -2,7 +2,7 @@ /obj/machinery/computer/atmos_alert - name = "Atmospheric Alert Console" + name = "atmospheric alert console" desc = "Used to access the station's atmospheric sensors." circuit = /obj/item/weapon/circuitboard/atmos_alert icon_state = "alert:0" diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index d5ea8c91f3a..eda624aa1d4 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -3,7 +3,7 @@ /obj/structure/computerframe density = 1 anchored = 0 - name = "Computer-frame" + name = "computer-frame" icon = 'icons/obj/stock_parts.dmi' icon_state = "0" var/state = 0 @@ -14,7 +14,7 @@ density = 0 anchored = 0 w_class = 2.0 - name = "Circuit board" + name = "circuit board" icon = 'icons/obj/module.dmi' icon_state = "id_mod" item_state = "electronic" @@ -30,190 +30,190 @@ /obj/item/weapon/circuitboard/message_monitor - name = "Circuit board (Message Monitor)" + name = "circuit board (Message Monitor)" build_path = "/obj/machinery/computer/message_monitor" origin_tech = "programming=3" /obj/item/weapon/circuitboard/security - name = "Circuit board (Security)" + name = "circuit board (Security)" build_path = "/obj/machinery/computer/security" /obj/item/weapon/circuitboard/aicore - name = "Circuit board (AI core)" + name = "circuit board (AI core)" origin_tech = "programming=4;biotech=2" board_type = "other" /obj/item/weapon/circuitboard/aiupload - name = "Circuit board (AI Upload)" + name = "circuit board (AI Upload)" build_path = "/obj/machinery/computer/upload/ai" origin_tech = "programming=4" /obj/item/weapon/circuitboard/borgupload - name = "Circuit board (Cyborg Upload)" + name = "circuit board (Cyborg Upload)" build_path = "/obj/machinery/computer/upload/borg" origin_tech = "programming=4" /obj/item/weapon/circuitboard/med_data - name = "Circuit board (Medical Records Console)" + name = "circuit board (Medical Records Console)" build_path = "/obj/machinery/computer/med_data" /obj/item/weapon/circuitboard/pandemic - name = "Circuit board (PanD.E.M.I.C. 2200)" + name = "circuit board (PanD.E.M.I.C. 2200)" build_path = "/obj/machinery/computer/pandemic" origin_tech = "programming=2;biotech=2" /obj/item/weapon/circuitboard/scan_consolenew - name = "Circuit board (DNA Machine)" + name = "circuit board (DNA Machine)" build_path = "/obj/machinery/computer/scan_consolenew" origin_tech = "programming=2;biotech=2" /obj/item/weapon/circuitboard/communications - name = "Circuit board (Communications)" + name = "circuit board (Communications)" build_path = "/obj/machinery/computer/communications" origin_tech = "programming=2;magnets=2" /obj/item/weapon/circuitboard/card - name = "Circuit board (ID Console)" + name = "circuit board (ID Console)" build_path = "/obj/machinery/computer/card" /obj/item/weapon/circuitboard/card/centcom - name = "Circuit board (Centcom ID Console)" + name = "circuit board (Centcom ID Console)" build_path = "/obj/machinery/computer/card/centcom" //obj/item/weapon/circuitboard/shield // name = "Circuit board (Shield Control)" // build_path = "/obj/machinery/computer/stationshield" /obj/item/weapon/circuitboard/teleporter - name = "Circuit board (Teleporter)" + name = "circuit board (Teleporter)" build_path = "/obj/machinery/computer/teleporter" origin_tech = "programming=2;bluespace=2" /obj/item/weapon/circuitboard/secure_data - name = "Circuit board (Security Records Console)" + name = "circuit board (Security Records Console)" build_path = "/obj/machinery/computer/secure_data" /obj/item/weapon/circuitboard/stationalert - name = "Circuit board (Station Alerts)" + name = "circuit board (Station Alerts)" build_path = "/obj/machinery/computer/station_alert" /obj/item/weapon/circuitboard/atmospheresiphonswitch - name = "Circuit board (Atmosphere siphon control)" + name = "circuit board (Atmosphere siphon control)" build_path = "/obj/machinery/computer/atmosphere/siphonswitch" /obj/item/weapon/circuitboard/air_management - name = "Circuit board (Atmospheric monitor)" + name = "circuit board (Atmospheric monitor)" build_path = "/obj/machinery/computer/general_air_control" /obj/item/weapon/circuitboard/injector_control - name = "Circuit board (Injector control)" + name = "circuit board (Injector control)" build_path = "/obj/machinery/computer/general_air_control/fuel_injection" /obj/item/weapon/circuitboard/atmos_alert - name = "Circuit board (Atmospheric Alert)" + name = "circuit board (Atmospheric Alert)" build_path = "/obj/machinery/computer/atmos_alert" /obj/item/weapon/circuitboard/pod - name = "Circuit board (Massdriver control)" + name = "circuit board (Massdriver control)" build_path = "/obj/machinery/computer/pod" /obj/item/weapon/circuitboard/robotics - name = "Circuit board (Robotics Control)" + name = "circuit board (Robotics Control)" build_path = "/obj/machinery/computer/robotics" origin_tech = "programming=3" /obj/item/weapon/circuitboard/cloning - name = "Circuit board (Cloning)" + name = "circuit board (Cloning)" build_path = "/obj/machinery/computer/cloning" origin_tech = "programming=3;biotech=3" /obj/item/weapon/circuitboard/arcade - name = "Circuit board (Arcade)" + name = "circuit board (Arcade)" build_path = "/obj/machinery/computer/arcade" origin_tech = "programming=1" /obj/item/weapon/circuitboard/turbine_control - name = "Circuit board (Turbine control)" + name = "circuit board (Turbine control)" build_path = "/obj/machinery/computer/turbine_computer" /obj/item/weapon/circuitboard/solar_control - name = "Circuit board (Solar Control)" //name fixed 250810 + name = "circuit board (Solar Control)" //name fixed 250810 build_path = "/obj/machinery/power/solar_control" origin_tech = "programming=2;powerstorage=2" /obj/item/weapon/circuitboard/powermonitor - name = "Circuit board (Power Monitor)" //name fixed 250810 + name = "circuit board (Power Monitor)" //name fixed 250810 build_path = "/obj/machinery/computer/monitor" /obj/item/weapon/circuitboard/olddoor - name = "Circuit board (DoorMex)" + name = "circuit board (DoorMex)" build_path = "/obj/machinery/computer/pod/old" /obj/item/weapon/circuitboard/syndicatedoor - name = "Circuit board (ProComp Executive)" + name = "circuit board (ProComp Executive)" build_path = "/obj/machinery/computer/pod/old/syndicate" /obj/item/weapon/circuitboard/swfdoor - name = "Circuit board (Magix)" + name = "circuit board (Magix)" build_path = "/obj/machinery/computer/pod/old/swf" /obj/item/weapon/circuitboard/prisoner - name = "Circuit board (Prisoner Management Console)" + name = "circuit board (Prisoner Management Console)" build_path = "/obj/machinery/computer/prisoner" /obj/item/weapon/circuitboard/rdconsole - name = "Circuit Board (RD Console)" + name = "circuit Board (RD Console)" build_path = "/obj/machinery/computer/rdconsole/core" /obj/item/weapon/circuitboard/mecha_control - name = "Circuit Board (Exosuit Control Console)" + name = "circuit Board (Exosuit Control Console)" build_path = "/obj/machinery/computer/mecha" /obj/item/weapon/circuitboard/rdservercontrol - name = "Circuit Board (R&D Server Control)" + name = "circuit Board (R&D Server Control)" build_path = "/obj/machinery/computer/rdservercontrol" /obj/item/weapon/circuitboard/crew - name = "Circuit board (Crew Monitoring Console)" + name = "circuit board (Crew Monitoring Console)" build_path = "/obj/machinery/computer/crew" origin_tech = "programming=3;biotech=2;magnets=2" /obj/item/weapon/circuitboard/mech_bay_power_console - name = "Circuit board (Mech Bay Power Control Console)" + name = "circuit board (Mech Bay Power Control Console)" build_path = "/obj/machinery/computer/mech_bay_power_console" origin_tech = "programming=2;powerstorage=3" /obj/item/weapon/circuitboard/ordercomp - name = "Circuit board (Supply Ordering Console)" + name = "circuit board (Supply Ordering Console)" build_path = "/obj/machinery/computer/ordercomp" origin_tech = "programming=2" /obj/item/weapon/circuitboard/supplycomp - name = "Circuit board (Supply shuttle console)" + name = "circuit board (Supply shuttle console)" build_path = "/obj/machinery/computer/supplycomp" origin_tech = "programming=3" var/contraband_enabled = 0 /obj/item/weapon/circuitboard/operating - name = "Circuit board (Operating Computer)" + name = "circuit board (Operating Computer)" build_path = "/obj/machinery/computer/operating" origin_tech = "programming=2;biotech=2" /obj/item/weapon/circuitboard/mining - name = "Circuit board (Outpost Status Display)" + name = "circuit board (Outpost Status Display)" build_path = "/obj/machinery/computer/security/mining" origin_tech = "programming=2" /obj/item/weapon/circuitboard/comm_monitor - name = "Circuit board (Telecommunications Monitor)" + name = "circuit board (Telecommunications Monitor)" build_path = "/obj/machinery/computer/telecomms/monitor" origin_tech = "programming=3" /obj/item/weapon/circuitboard/comm_server - name = "Circuit board (Telecommunications Server Monitor)" + name = "circuit board (Telecommunications Server Monitor)" build_path = "/obj/machinery/computer/telecomms/server" origin_tech = "programming=3" /obj/item/weapon/circuitboard/comm_traffic - name = "Circuitboard (Telecommunications Traffic Control)" + name = "circuitboard (Telecommunications Traffic Control)" build_path = "/obj/machinery/computer/telecomms/traffic" origin_tech = "programming=3" /obj/item/weapon/circuitboard/curefab - name = "Circuit board (Cure fab)" + name = "circuit board (Cure fab)" build_path = "/obj/machinery/computer/curer" /obj/item/weapon/circuitboard/splicer - name = "Circuit board (Disease Splicer)" + name = "circuit board (Disease Splicer)" build_path = "/obj/machinery/computer/diseasesplicer" /obj/item/weapon/circuitboard/shuttle - name = "Circuit board (Shuttle)" + name = "circuit board (Shuttle)" build_path = "/obj/machinery/computer/shuttle" origin_tech = "programming=2" id = "1" /obj/item/weapon/circuitboard/labor_shuttle - name = "Circuit Board (Labor Shuttle)" + name = "circuit Board (Labor Shuttle)" build_path = "/obj/machinery/computer/shuttle/labor" origin_tech = "programming 2" /obj/item/weapon/circuitboard/labor_shuttle/one_way - name = "Circuit Board (Prisoner Shuttle Console)" + name = "circuit Board (Prisoner Shuttle Console)" build_path = "/obj/machinery/computer/shuttle/labor/one_way" origin_tech = "programming 2" /obj/item/weapon/circuitboard/mining_shuttle - name = "Circuit Board (Mining Shuttle)" + name = "circuit Board (Mining Shuttle)" build_path = "/obj/machinery/computer/shuttle/mining" origin_tech = "programming 2" /obj/item/weapon/circuitboard/HolodeckControl // Not going to let people get this, but it's just here for future - name = "Circuit board (Holodeck Control)" + name = "circuit board (Holodeck Control)" build_path = "/obj/machinery/computer/HolodeckControl" origin_tech = "programming=4" /obj/item/weapon/circuitboard/aifixer - name = "Circuit board (AI Integrity Restorer)" + name = "circuit board (AI Integrity Restorer)" build_path = "/obj/machinery/computer/aifixer" origin_tech = "programming=3;biotech=2" /obj/item/weapon/circuitboard/area_atmos - name = "Circuit board (Area Air Control)" + name = "circuit board (Area Air Control)" build_path = "/obj/machinery/computer/area_atmos" origin_tech = "programming=2" /obj/item/weapon/circuitboard/prison_shuttle - name = "Circuit board (Prison Shuttle)" + name = "circuit board (Prison Shuttle)" build_path = "/obj/machinery/computer/prison_shuttle" origin_tech = "programming=2" @@ -243,11 +243,11 @@ /obj/item/weapon/circuitboard/rdconsole/attackby(obj/item/I as obj, mob/user as mob) if(istype(I,/obj/item/weapon/screwdriver)) if(src.build_path == "/obj/machinery/computer/rdconsole/core") - src.name = "Circuit Board (RD Console - Robotics)" + src.name = "circuit board (RD Console - Robotics)" src.build_path = "/obj/machinery/computer/rdconsole/robotics" user << "\blue Access protocols succesfully updated." else - src.name = "Circuit Board (RD Console)" + src.name = "circuit board (RD Console)" src.build_path = "/obj/machinery/computer/rdconsole/core" user << "\blue Defaulting access protocols." return diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 1a387c162b2..4b2d0c782ab 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -1,5 +1,5 @@ /obj/machinery/computer/security - name = "Security Cameras" + name = "security camera console" desc = "Used to access the various cameras on the station." icon_state = "cameras" circuit = /obj/item/weapon/circuitboard/security @@ -85,7 +85,7 @@ /obj/machinery/computer/security/telescreen - name = "Telescreen" + name = "\improper Telescreen" desc = "Used for watching an empty arena." icon = 'icons/obj/stationobjs.dmi' icon_state = "telescreen" @@ -110,13 +110,13 @@ /obj/machinery/computer/security/wooden_tv - name = "Security Cameras" + name = "security camera monitor" desc = "An old TV hooked into the stations camera network." icon_state = "security_det" /obj/machinery/computer/security/mining - name = "Outpost Cameras" + name = "outpost camera console" desc = "Used to access the various cameras on the outpost." icon_state = "miningcameras" network = list("MINE") diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index e5619daa97f..149d5ab7556 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -1,7 +1,7 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 /obj/machinery/computer/card - name = "Identification Console" + name = "identification console" desc = "You can use this to change ID's." icon_state = "id" req_access = list(access_change_ids) @@ -407,7 +407,7 @@ /obj/machinery/computer/card/centcom - name = "Centcom Identification Console" + name = "\improper Centcom identification console" circuit = /obj/item/weapon/circuitboard/card/centcom req_access = list(access_cent_captain) diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index f622117c01b..ea04fbd5775 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -1,6 +1,6 @@ /obj/machinery/computer/cloning - name = "Cloning Console" + name = "cloning console" icon = 'icons/obj/computer.dmi' icon_state = "dna" circuit = /obj/item/weapon/circuitboard/cloning diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 12d2979f80b..9c268cb8cce 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -2,7 +2,7 @@ // The communications computer /obj/machinery/computer/communications - name = "Communications Console" + name = "communications console" desc = "This can be used for various important functions. Still under developement." icon_state = "comm" req_access = list(access_heads) diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index de73e5d3fb0..e48385c47a7 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -1,5 +1,5 @@ /obj/machinery/computer/crew - name = "Crew Monitoring Console" + name = "crew monitoring console" desc = "Used to monitor active health sensors built into most of the crew's uniforms." icon_state = "crew" use_power = 1 diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm index 1fb87be6c50..58991352c91 100644 --- a/code/game/machinery/computer/law.dm +++ b/code/game/machinery/computer/law.dm @@ -31,7 +31,7 @@ return 1 /obj/machinery/computer/upload/ai - name = "AI Upload" + name = "\improper AI upload console" desc = "Used to upload laws to the AI." icon_state = "command" circuit = /obj/item/weapon/circuitboard/aiupload @@ -56,7 +56,7 @@ /obj/machinery/computer/upload/borg - name = "Cyborg Upload" + name = "cyborg upload console" desc = "Used to upload laws to Cyborgs." icon_state = "command" circuit = /obj/item/weapon/circuitboard/borgupload diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 0f63c37cdce..227ce9d0695 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -1,7 +1,7 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 /obj/machinery/computer/med_data//TODO:SANITY - name = "Medical Records Console" + name = "medical records console" desc = "This can be used to check medical records." icon_state = "medcomp" req_one_access = list(access_medical, access_forensics_lockers) @@ -450,6 +450,6 @@ /obj/machinery/computer/med_data/laptop - name = "Medical Laptop" + name = "medical laptop" desc = "Cheap Nanotrasen Laptop." icon_state = "medlaptop" diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index ddf58aba8f0..b4ff2130b89 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -5,7 +5,7 @@ /obj/machinery/computer/message_monitor - name = "Message Monitor Console" + name = "message monitor console" desc = "Used to Monitor the crew's messages, that are sent via PDA. Can also be used to view Request Console messages." icon_state = "comm_logs" var/hack_icon = "comm_logsc" @@ -477,7 +477,7 @@ /obj/item/weapon/paper/monitorkey //..() - name = "Monitor Decryption Key" + name = "monitor decryption key" var/obj/machinery/message_server/server = null /obj/item/weapon/paper/monitorkey/New() diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index d17c44d7297..5b93f9e6d53 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -121,7 +121,7 @@ /obj/machinery/computer/pod/old icon_state = "old" - name = "\improper DoorMex Control Console" + name = "\improper DoorMex control console" title = "Door Controls" diff --git a/code/game/machinery/computer/power.dm b/code/game/machinery/computer/power.dm index 3c900b6fbe8..ad7c6abec34 100644 --- a/code/game/machinery/computer/power.dm +++ b/code/game/machinery/computer/power.dm @@ -1,7 +1,7 @@ // the power monitoring computer // for the moment, just report the status of all APCs in the same powernet /obj/machinery/computer/monitor - name = "Power Monitoring Console" + name = "power monitoring console" desc = "It monitors power levels across the station." icon = 'icons/obj/computer.dmi' icon_state = "power" diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index 25288d59c9b..b17f916ae58 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -1,5 +1,5 @@ /obj/machinery/computer/prisoner - name = "Prisoner Management Console" + name = "prisoner management console" icon = 'icons/obj/computer.dmi' icon_state = "explosive" req_access = list(access_brig) diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index 683a176655f..a02adde4d09 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -2,7 +2,7 @@ /obj/machinery/computer/robotics - name = "Robotics Control" + name = "robotics control console" desc = "Used to remotely lockdown or detonate linked Cyborgs." icon = 'icons/obj/computer.dmi' icon_state = "robot" diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 3145017d09c..5034a19f459 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -1,7 +1,7 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 /obj/machinery/computer/secure_data//TODO:SANITY - name = "Security Records Console" + name = "security records console" desc = "Used to view and edit personnel's security records" icon_state = "security" req_one_access = list(access_security, access_forensics_lockers) diff --git a/code/game/machinery/computer/shuttle.dm b/code/game/machinery/computer/shuttle.dm index 9ed590004aa..97c557f0e7f 100644 --- a/code/game/machinery/computer/shuttle.dm +++ b/code/game/machinery/computer/shuttle.dm @@ -1,5 +1,5 @@ /obj/machinery/computer/emergency_shuttle - name = "Emergency Shuttle Console" + name = "emergency shuttle console" desc = "For shuttle control." icon_state = "shuttle" var/auth_need = 3.0 diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm index 3ac3bec3f4f..0a8df996f74 100644 --- a/code/game/machinery/computer/station_alert.dm +++ b/code/game/machinery/computer/station_alert.dm @@ -1,6 +1,6 @@ /obj/machinery/computer/station_alert - name = "Station Alert Console" + name = "station alert console" desc = "Used to access the station's automated alert system." icon_state = "alert:0" circuit = /obj/item/weapon/circuitboard/stationalert diff --git a/code/game/machinery/computer/telecrystalconsoles.dm b/code/game/machinery/computer/telecrystalconsoles.dm index d2f5653196e..5409ba20ff0 100644 --- a/code/game/machinery/computer/telecrystalconsoles.dm +++ b/code/game/machinery/computer/telecrystalconsoles.dm @@ -4,13 +4,13 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F /obj/machinery/computer/telecrystals - name = "Telecrystal Assignment Machinery" + name = "\improper Telecrystal assignment station" desc = "A device used to manage telecrystals during group operations. You shouldn't be looking at this particular one..." icon_state = "tcstation" ///////////////////////////////////////////// /obj/machinery/computer/telecrystals/uplinker - name = "Telecrystal Upload/Recieve Station" + name = "\improper Telecrystal upload/recieve station" desc = "A device used to manage telecrystals during group operations. To use, simply insert your uplink. With your uplink installed \ you can upload your telecrystals to the group's pool using the console, or be assigned additional telecrystals by your lieutenant." icon_state = "tcstation" @@ -122,7 +122,7 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F ///////////////////////////////////////// /obj/machinery/computer/telecrystals/boss - name = "Team Telecrystal Management Console" + name = "team Telecrystal management console" desc = "A device used to manage telecrystals during group operations. To use, simply initialize the machine by scanning for nearby uplink stations. \ Once the consoles are linked up, you can assign any telecrystals amongst your operatives; be they donated by your agents or rationed to the squad \ based on the danger rating of the mission." From 595d4f8b003165d87d9b58d40efee12f4e709059 Mon Sep 17 00:00:00 2001 From: Kyrah Abattoir Date: Mon, 18 Nov 2013 20:07:13 +0100 Subject: [PATCH 08/14] FIX dna console and lush grass --- code/game/dna.dm | 4 ++-- code/game/machinery/computer/HolodeckControl.dm | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/game/dna.dm b/code/game/dna.dm index 32ef328b1fe..97b2843cc1d 100644 --- a/code/game/dna.dm +++ b/code/game/dna.dm @@ -324,7 +324,7 @@ /////////////////////////// DNA MACHINES /obj/machinery/dna_scannernew - name = "\improper DNA Scanner" + name = "\improper DNA scanner" desc = "It scans DNA structures." icon = 'icons/obj/Cryogenic2.dmi' icon_state = "scanner" @@ -483,7 +483,7 @@ /obj/machinery/computer/scan_consolenew - name = "\improper DNA Scanner Access Console" + name = "\improper DNA scanner access console" desc = "Scan DNA." icon = 'icons/obj/computer.dmi' icon_state = "scanner" diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index f2b52bff051..49c9ca2fa0b 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -289,7 +289,8 @@ thermal_conductivity = 0 /turf/simulated/floor/holofloor/grass - name = "\proper lush grass" + gender = PLURAL + name = "lush grass" icon_state = "grass1" floor_tile = new/obj/item/stack/tile/grass From 74ade687caf45146ad10eeebb2797cd5ecd23993 Mon Sep 17 00:00:00 2001 From: Kyrah Abattoir Date: Mon, 18 Nov 2013 20:23:29 +0100 Subject: [PATCH 09/14] code/game/machinery/doors/* lowercase pass --- code/game/machinery/doors/airlock.dm | 2 +- code/game/machinery/doors/alarmlock.dm | 2 +- code/game/machinery/doors/brigdoors.dm | 2 +- code/game/machinery/doors/firedoor.dm | 2 +- code/game/machinery/doors/shutters.dm | 2 ++ code/game/machinery/doors/windowdoor.dm | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 90d0c522be9..28bd134663f 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -86,7 +86,7 @@ doortype = 8 /obj/machinery/door/airlock/vault - name = "vault" + name = "vault door" icon = 'icons/obj/doors/vault.dmi' opacity = 1 doortype = 9 diff --git a/code/game/machinery/doors/alarmlock.dm b/code/game/machinery/doors/alarmlock.dm index 2dd1d7ac79e..cf306eed4a2 100644 --- a/code/game/machinery/doors/alarmlock.dm +++ b/code/game/machinery/doors/alarmlock.dm @@ -1,6 +1,6 @@ /obj/machinery/door/airlock/alarmlock - name = "Glass Alarm Airlock" + name = "glass alarm airlock" icon = 'icons/obj/doors/Doorglass.dmi' opacity = 0 doortype = 7 diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index b212cd33a7a..70990e6e753 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -14,7 +14,7 @@ // Programmer: Veryinky ///////////////////////////////////////////////////////////////////////////////////////////////// /obj/machinery/door_timer - name = "Door Timer" + name = "door timer" icon = 'icons/obj/status_display.dmi' icon_state = "frame" desc = "A remote control for a door." diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 52f8e1f9db5..55416e8082f 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -2,7 +2,7 @@ /var/const/CLOSED = 2 /obj/machinery/door/firedoor - name = "Firelock" + name = "firelock" desc = "Apply crowbar" icon = 'icons/obj/doors/Doorfire.dmi' icon_state = "door_open" diff --git a/code/game/machinery/doors/shutters.dm b/code/game/machinery/doors/shutters.dm index f49a7b759b7..75fa01a2979 100644 --- a/code/game/machinery/doors/shutters.dm +++ b/code/game/machinery/doors/shutters.dm @@ -1,5 +1,7 @@ /obj/machinery/door/poddoor/shutters + gender = PLURAL name = "shutters" + desc = "Heavy duty metal shutters that opens mechanically." icon = 'icons/obj/doors/shutters.dmi' layer = 3.1 diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index b7971e58bb0..3c095b71aba 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -228,7 +228,7 @@ /obj/machinery/door/window/brigdoor - name = "Secure Door" + name = "secure door" icon = 'icons/obj/doors/windoor.dmi' icon_state = "leftsecure" base_state = "leftsecure" From ec9acd165f7c972a9c407d65d288b298bd9a41a9 Mon Sep 17 00:00:00 2001 From: Kyrah Abattoir Date: Mon, 18 Nov 2013 20:40:56 +0100 Subject: [PATCH 10/14] code/game/machinery/embedded_controller/* lowercase pass --- .../game/machinery/embedded_controller/access_controller.dm | 2 +- .../machinery/embedded_controller/airlock_controller.dm | 2 +- .../embedded_controller/embedded_controller_base.dm | 6 +++--- .../machinery/embedded_controller/simple_vent_controller.dm | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/game/machinery/embedded_controller/access_controller.dm b/code/game/machinery/embedded_controller/access_controller.dm index fb5cc1575af..ae4939dcfcb 100644 --- a/code/game/machinery/embedded_controller/access_controller.dm +++ b/code/game/machinery/embedded_controller/access_controller.dm @@ -150,7 +150,7 @@ obj/machinery/embedded_controller/radio/access_controller icon = 'icons/obj/airlock_machines.dmi' icon_state = "access_control_standby" - name = "Access Console" + name = "access console" density = 0 power_channel = ENVIRON diff --git a/code/game/machinery/embedded_controller/airlock_controller.dm b/code/game/machinery/embedded_controller/airlock_controller.dm index 1067cfe3465..d284cd57350 100644 --- a/code/game/machinery/embedded_controller/airlock_controller.dm +++ b/code/game/machinery/embedded_controller/airlock_controller.dm @@ -205,7 +205,7 @@ obj/machinery/embedded_controller/radio/airlock_controller icon = 'icons/obj/airlock_machines.dmi' icon_state = "airlock_control_standby" - name = "Airlock Console" + name = "airlock console" density = 0 frequency = 1449 diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm index f92c309b6c7..ae2525ee59a 100644 --- a/code/game/machinery/embedded_controller/embedded_controller_base.dm +++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm @@ -21,12 +21,12 @@ datum/computer/file/embedded_program obj/machinery/embedded_controller var/datum/computer/file/embedded_program/program - name = "Embedded Controller" + name = "embedded controller" density = 0 anchored = 1 var/on = 1 - + interact(mob/user as mob) //user << browse(return_text(), "window=computer") //onclose(user, "computer") @@ -34,7 +34,7 @@ obj/machinery/embedded_controller var/datum/browser/popup = new(user, "computer", name) // Set up the popup browser window popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) popup.set_content(return_text()) - popup.open() + popup.open() attack_hand(mob/user as mob) interact(user) diff --git a/code/game/machinery/embedded_controller/simple_vent_controller.dm b/code/game/machinery/embedded_controller/simple_vent_controller.dm index f43031884da..953bc7d88d1 100644 --- a/code/game/machinery/embedded_controller/simple_vent_controller.dm +++ b/code/game/machinery/embedded_controller/simple_vent_controller.dm @@ -42,7 +42,7 @@ icon = 'icons/obj/airlock_machines.dmi' icon_state = "airlock_control_standby" - name = "Vent Controller" + name = "vent controller" density = 0 frequency = 1229 From 31e699f0dd676f3bd93690ecdb547e4b691b2579 Mon Sep 17 00:00:00 2001 From: Kyrah Abattoir Date: Mon, 18 Nov 2013 22:38:52 +0100 Subject: [PATCH 11/14] code/game/machinery/kitchen/* lowercase pass --- code/game/machinery/kitchen/gibber.dm | 4 ++-- code/game/machinery/kitchen/juicer.dm | 2 +- code/game/machinery/kitchen/microwave.dm | 8 ++++---- code/game/machinery/kitchen/monkeyrecycler.dm | 2 +- code/game/machinery/kitchen/processor.dm | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm index b8500393002..0e6306bc13a 100644 --- a/code/game/machinery/kitchen/gibber.dm +++ b/code/game/machinery/kitchen/gibber.dm @@ -1,6 +1,6 @@ /obj/machinery/gibber - name = "Gibber" + name = "gibber" desc = "The name isn't descriptive enough?" icon = 'icons/obj/kitchen.dmi' icon_state = "grinder" @@ -104,7 +104,7 @@ /obj/machinery/gibber/verb/eject() set category = "Object" - set name = "Empty Gibber" + set name = "empty gibber" set src in oview(1) if (usr.stat != 0) diff --git a/code/game/machinery/kitchen/juicer.dm b/code/game/machinery/kitchen/juicer.dm index b237f8223f6..3554877b6d7 100644 --- a/code/game/machinery/kitchen/juicer.dm +++ b/code/game/machinery/kitchen/juicer.dm @@ -1,6 +1,6 @@ /obj/machinery/juicer - name = "Juicer" + name = "juicer" icon = 'icons/obj/kitchen.dmi' icon_state = "juicer1" layer = 2.9 diff --git a/code/game/machinery/kitchen/microwave.dm b/code/game/machinery/kitchen/microwave.dm index 898e3b1cfb0..34f7358a6aa 100644 --- a/code/game/machinery/kitchen/microwave.dm +++ b/code/game/machinery/kitchen/microwave.dm @@ -1,6 +1,6 @@ /obj/machinery/microwave - name = "Microwave" + name = "microwave" icon = 'icons/obj/kitchen.dmi' icon_state = "mw" layer = 2.9 @@ -93,7 +93,7 @@ else user << "\red You need more space cleaner!" return 1 - + else if(istype(O, /obj/item/weapon/soap/)) // If they're trying to clean it then let them user.visible_message( \ "\blue [user] starts to clean the microwave.", \ @@ -206,9 +206,9 @@ for (var/datum/reagent/R in reagents.reagent_list) var/display_name = R.name if (R.id == "capsaicin") - display_name = "Hotsauce" + display_name = "hot sauce" if (R.id == "frostoil") - display_name = "Coldsauce" + display_name = "cold sauce" dat += {"[display_name]: [R.volume] unit\s
"} if (items_counts.len==0 && reagents.reagent_list.len==0) diff --git a/code/game/machinery/kitchen/monkeyrecycler.dm b/code/game/machinery/kitchen/monkeyrecycler.dm index f583a88bb59..11de65caff6 100644 --- a/code/game/machinery/kitchen/monkeyrecycler.dm +++ b/code/game/machinery/kitchen/monkeyrecycler.dm @@ -1,5 +1,5 @@ /obj/machinery/monkey_recycler - name = "Monkey Recycler" + name = "monkey recycler" desc = "A machine used for recycling dead monkeys into monkey cubes." icon = 'icons/obj/kitchen.dmi' icon_state = "grinder" diff --git a/code/game/machinery/kitchen/processor.dm b/code/game/machinery/kitchen/processor.dm index cf15b61b02a..cdc01e08eba 100644 --- a/code/game/machinery/kitchen/processor.dm +++ b/code/game/machinery/kitchen/processor.dm @@ -1,6 +1,6 @@ /obj/machinery/processor - name = "Food Processor" + name = "food processor" desc = "An industrial grinder used to process meat and other foods. Keep hands clear of intake area while operating." icon = 'icons/obj/kitchen.dmi' icon_state = "processor" From 73ab98139fa91883447168b960935d2dc3772805 Mon Sep 17 00:00:00 2001 From: Kyrah Abattoir Date: Mon, 18 Nov 2013 22:43:58 +0100 Subject: [PATCH 12/14] code/game/machinery/pipe/* lowercase pass --- code/game/machinery/pipe/pipe_dispenser.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index b640e0a37ac..2e64c41414e 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -1,5 +1,5 @@ /obj/machinery/pipedispenser - name = "Pipe Dispenser" + name = "pipe dispenser" icon = 'icons/obj/stationobjs.dmi' icon_state = "pipe_d" density = 1 @@ -105,7 +105,7 @@ /obj/machinery/pipedispenser/disposal - name = "Disposal Pipe Dispenser" + name = "disposal pipe dispenser" icon = 'icons/obj/stationobjs.dmi' icon_state = "pipe_d" density = 1 From 99f76bab8bb4f9076917ed7b1db7a2a94e558fdc Mon Sep 17 00:00:00 2001 From: Kyrah Abattoir Date: Mon, 18 Nov 2013 23:05:01 +0100 Subject: [PATCH 13/14] code/game/machinery/telecomms/* lowercase pass NOTE: some of the computer names where slightly altered to " console" --- code/game/machinery/telecomms/broadcaster.dm | 4 ++-- code/game/machinery/telecomms/logbrowser.dm | 2 +- code/game/machinery/telecomms/telecomunications.dm | 12 ++++++------ code/game/machinery/telecomms/telemonitor.dm | 2 +- code/game/machinery/telecomms/traffic_control.dm | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index 8d69c9daabd..9a600d06112 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -11,7 +11,7 @@ var/list/recentmessages = list() // global list of recent messages broadcasted : var/message_delay = 0 // To make sure restarting the recentmessages list is kept in sync /obj/machinery/telecomms/broadcaster - name = "Subspace Broadcaster" + name = "subspace broadcaster" icon = 'icons/obj/stationobjs.dmi' icon_state = "broadcaster" desc = "A dish-shaped machine used to broadcast processed subspace signals." @@ -109,7 +109,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept */ /obj/machinery/telecomms/allinone - name = "Telecommunications Mainframe" + name = "telecommunications mainframe" icon = 'icons/obj/stationobjs.dmi' icon_state = "comm_server" desc = "A compact machine used for portable subspace telecommuniations processing." diff --git a/code/game/machinery/telecomms/logbrowser.dm b/code/game/machinery/telecomms/logbrowser.dm index 608f54b542c..869665bca0c 100644 --- a/code/game/machinery/telecomms/logbrowser.dm +++ b/code/game/machinery/telecomms/logbrowser.dm @@ -1,7 +1,7 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 /obj/machinery/computer/telecomms/server - name = "Telecommunications Server Monitor" + name = "telecommunications server monitoring console" icon_state = "comm_logs" var/screen = 0 // the screen number: diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index a44326ebbcd..e2ade28a591 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -258,7 +258,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() */ /obj/machinery/telecomms/receiver - name = "Subspace Receiver" + name = "subspace receiver" icon = 'icons/obj/stationobjs.dmi' icon_state = "broadcast receiver" desc = "This machine has a dish-like shape and green lights. It is designed to detect and process subspace radio activity." @@ -315,7 +315,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() */ /obj/machinery/telecomms/hub - name = "Telecommunication Hub" + name = "telecommunication hub" icon = 'icons/obj/stationobjs.dmi' icon_state = "hub" desc = "A mighty piece of hardware used to send/receive massive amounts of data." @@ -350,7 +350,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() */ /obj/machinery/telecomms/relay - name = "Telecommunication Relay" + name = "telecommunication relay" icon = 'icons/obj/stationobjs.dmi' icon_state = "relay" desc = "A mighty piece of hardware used to send massive amounts of data far away." @@ -402,7 +402,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() */ /obj/machinery/telecomms/bus - name = "Bus Mainframe" + name = "bus mainframe" icon = 'icons/obj/stationobjs.dmi' icon_state = "bus" desc = "A mighty piece of hardware used to send massive amounts of data quickly." @@ -455,7 +455,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() */ /obj/machinery/telecomms/processor - name = "Processor Unit" + name = "processor unit" icon = 'icons/obj/stationobjs.dmi' icon_state = "processor" desc = "This machine is used to process large quantities of information." @@ -494,7 +494,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() /obj/machinery/telecomms/server - name = "Telecommunication Server" + name = "telecommunication server" icon = 'icons/obj/stationobjs.dmi' icon_state = "comm_server" desc = "A machine used to store data and network statistics." diff --git a/code/game/machinery/telecomms/telemonitor.dm b/code/game/machinery/telecomms/telemonitor.dm index 27c27f35fc5..cad29c238b3 100644 --- a/code/game/machinery/telecomms/telemonitor.dm +++ b/code/game/machinery/telecomms/telemonitor.dm @@ -8,7 +8,7 @@ /obj/machinery/computer/telecomms/monitor - name = "Telecommunications Monitor" + name = "telecommunications monitoring console" icon_state = "comm_monitor" var/screen = 0 // the screen number: diff --git a/code/game/machinery/telecomms/traffic_control.dm b/code/game/machinery/telecomms/traffic_control.dm index d2d6a484431..9a6f87c8d17 100644 --- a/code/game/machinery/telecomms/traffic_control.dm +++ b/code/game/machinery/telecomms/traffic_control.dm @@ -5,7 +5,7 @@ /obj/machinery/computer/telecomms/traffic - name = "Telecommunications Traffic Control" + name = "telecommunications traffic control console" icon_state = "computer_generic" var/screen = 0 // the screen number: From a977871182e7c9f96c5989e6cbc013cc8b354494 Mon Sep 17 00:00:00 2001 From: Kyrah Abattoir Date: Mon, 18 Nov 2013 23:32:10 +0100 Subject: [PATCH 14/14] code/game/mecha/* lowercase & improper pass --- code/game/mecha/combat/durand.dm | 2 +- code/game/mecha/combat/gygax.dm | 4 +- code/game/mecha/combat/honker.dm | 2 +- code/game/mecha/combat/marauder.dm | 6 +- code/game/mecha/combat/phazon.dm | 2 +- .../mecha/equipment/tools/medical_tools.dm | 6 +- code/game/mecha/equipment/tools/tools.dm | 30 ++--- .../mecha/equipment/tools/unused_tools.dm | 4 +- code/game/mecha/equipment/weapons/weapons.dm | 30 ++--- code/game/mecha/mech_bay.dm | 6 +- code/game/mecha/mech_fabricator.dm | 2 +- code/game/mecha/mecha.dm | 2 +- code/game/mecha/mecha_control_console.dm | 6 +- code/game/mecha/mecha_parts.dm | 118 +++++++++--------- code/game/mecha/mecha_wreckage.dm | 24 ++-- code/game/mecha/medical/odysseus.dm | 4 +- code/game/mecha/working/ripley.dm | 8 +- 17 files changed, 129 insertions(+), 127 deletions(-) diff --git a/code/game/mecha/combat/durand.dm b/code/game/mecha/combat/durand.dm index bb6626c1c10..8dfa3f33683 100644 --- a/code/game/mecha/combat/durand.dm +++ b/code/game/mecha/combat/durand.dm @@ -1,6 +1,6 @@ /obj/mecha/combat/durand desc = "An aging combat exosuit utilized by the Nanotrasen corporation. Originally developed to combat hostile alien lifeforms." - name = "Durand" + name = "\improper Durand" icon_state = "durand" step_in = 4 dir_in = 1 //Facing North. diff --git a/code/game/mecha/combat/gygax.dm b/code/game/mecha/combat/gygax.dm index 8b5eafafc8c..3d546e565bc 100644 --- a/code/game/mecha/combat/gygax.dm +++ b/code/game/mecha/combat/gygax.dm @@ -1,6 +1,6 @@ /obj/mecha/combat/gygax desc = "A lightweight, security exosuit. Popular among private and corporate security." - name = "Gygax" + name = "\improper Gygax" icon_state = "gygax" step_in = 3 dir_in = 1 //Facing North. @@ -17,7 +17,7 @@ /obj/mecha/combat/gygax/dark desc = "A lightweight exosuit, painted in a dark scheme. This model appears to have some modifications." - name = "Dark Gygax" + name = "\improper Dark Gygax" icon_state = "darkgygax" health = 300 deflect_chance = 15 diff --git a/code/game/mecha/combat/honker.dm b/code/game/mecha/combat/honker.dm index b63a2e6d2c7..e2187fe69e0 100644 --- a/code/game/mecha/combat/honker.dm +++ b/code/game/mecha/combat/honker.dm @@ -1,6 +1,6 @@ /obj/mecha/combat/honker desc = "Produced by \"Tyranny of Honk, INC\", this exosuit is designed as heavy clown-support. Used to spread the fun and joy of life. HONK!" - name = "H.O.N.K" + name = "\improper H.O.N.K" icon_state = "honker" step_in = 2 health = 140 diff --git a/code/game/mecha/combat/marauder.dm b/code/game/mecha/combat/marauder.dm index 3b23ab96831..b5a98f711ac 100644 --- a/code/game/mecha/combat/marauder.dm +++ b/code/game/mecha/combat/marauder.dm @@ -1,6 +1,6 @@ /obj/mecha/combat/marauder desc = "Heavy-duty, combat exosuit, developed after the Durand model. Rarely found among civilian populations." - name = "Marauder" + name = "\improper Marauder" icon_state = "marauder" step_in = 5 health = 500 @@ -23,7 +23,7 @@ /obj/mecha/combat/marauder/seraph desc = "Heavy-duty, command-type exosuit. This is a custom model, utilized only by high-ranking military personnel." - name = "Seraph" + name = "\improper Seraph" icon_state = "seraph" operation_req_access = list(access_cent_creed) step_in = 3 @@ -35,7 +35,7 @@ /obj/mecha/combat/marauder/mauler desc = "Heavy-duty, combat exosuit, developed off of the existing Marauder model." - name = "Mauler" + name = "\improper Mauler" icon_state = "mauler" operation_req_access = list(access_syndicate) wreckage = /obj/structure/mecha_wreckage/mauler diff --git a/code/game/mecha/combat/phazon.dm b/code/game/mecha/combat/phazon.dm index 730ced9eb9a..465a1b7a06e 100644 --- a/code/game/mecha/combat/phazon.dm +++ b/code/game/mecha/combat/phazon.dm @@ -1,6 +1,6 @@ /obj/mecha/combat/phazon desc = "An exosuit which can only be described as 'WTF?'." - name = "Phazon" + name = "\improper Phazon" icon_state = "phazon" step_in = 1 dir_in = 1 //Facing North. diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm index f890ae633df..596286850fc 100644 --- a/code/game/mecha/equipment/tools/medical_tools.dm +++ b/code/game/mecha/equipment/tools/medical_tools.dm @@ -1,5 +1,5 @@ /obj/item/mecha_parts/mecha_equipment/tool/sleeper - name = "Mounted Sleeper" + name = "mounted sleeper" desc = "Mounted Sleeper. (Can be attached to: Medical Exosuits)" icon = 'icons/obj/Cryogenic2.dmi' icon_state = "sleeper" @@ -244,7 +244,7 @@ /obj/item/mecha_parts/mecha_equipment/tool/cable_layer - name = "Cable Layer" + name = "cable layer" icon_state = "mecha_wire" var/datum/event/event var/turf/old_turf @@ -391,7 +391,7 @@ return 1 /obj/item/mecha_parts/mecha_equipment/tool/syringe_gun - name = "Syringe Gun" + name = "syringe gun" desc = "Exosuit-mounted chem synthesizer with syringe gun. Reagents inside are held in stasis, so no reactions will occur. (Can be attached to: Medical Exosuits)" icon = 'icons/obj/gun.dmi' icon_state = "syringegun" diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index e36a5507ce8..f98f7954982 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -1,5 +1,5 @@ /obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp - name = "Hydraulic Clamp" + name = "hydraulic clamp" icon_state = "mecha_clamp" equip_cooldown = 15 energy_drain = 10 @@ -67,7 +67,7 @@ return 1 /obj/item/mecha_parts/mecha_equipment/tool/drill - name = "Drill" + name = "drill" desc = "This is the drill that'll pierce the heavens! (Can be attached to: Combat and Engineering Exosuits)" icon_state = "mecha_drill" equip_cooldown = 30 @@ -128,7 +128,7 @@ return 0 /obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill - name = "Diamond Drill" + name = "diamond drill" desc = "This is an upgraded version of the drill that'll pierce the heavens! (Can be attached to: Combat and Engineering Exosuits)" icon_state = "mecha_diamond_drill" origin_tech = "materials=4;engineering=3" @@ -190,7 +190,7 @@ return 0 /obj/item/mecha_parts/mecha_equipment/tool/extinguisher - name = "Extinguisher" + name = "extinguisher" desc = "Exosuit-mounted extinguisher (Can be attached to: Engineering exosuits)" icon_state = "mecha_exting" equip_cooldown = 5 @@ -261,7 +261,7 @@ /obj/item/mecha_parts/mecha_equipment/tool/rcd - name = "Mounted RCD" + name = "mounted RCD" desc = "An exosuit-mounted Rapid Construction Device. (Can be attached to: Any exosuit)" icon_state = "mecha_rcd" origin_tech = "materials=4;bluespace=3;magnets=4;powerstorage=4" @@ -366,7 +366,7 @@ /obj/item/mecha_parts/mecha_equipment/teleporter - name = "Teleporter" + name = "teleporter" desc = "An exosuit module that allows exosuits to teleport to any position in view." icon_state = "mecha_teleport" origin_tech = "bluespace=10" @@ -386,7 +386,7 @@ /obj/item/mecha_parts/mecha_equipment/wormhole_generator - name = "Wormhole Generator" + name = "wormhole generator" desc = "An exosuit module that allows generating of small quasi-stable wormholes." icon_state = "mecha_wholegen" origin_tech = "bluespace=3" @@ -439,7 +439,7 @@ return /obj/item/mecha_parts/mecha_equipment/gravcatapult - name = "Gravitational Catapult" + name = "gravitational catapult" desc = "An exosuit mounted Gravitational Catapult." icon_state = "mecha_teleport" origin_tech = "bluespace=2;magnets=3" @@ -508,7 +508,7 @@ /obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster //what is that noise? A BAWWW from TK mutants. - name = "Armor Booster Module (Close Combat Weaponry)" + name = "armor booster module (Close Combat Weaponry)" desc = "Boosts exosuit armor against armed melee attacks. Requires energy to operate." icon_state = "mecha_abooster_ccw" origin_tech = "materials=3" @@ -559,7 +559,7 @@ /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster - name = "Armor Booster Module (Ranged Weaponry)" + name = "armor booster module (Ranged Weaponry)" desc = "Boosts exosuit armor against ranged attacks. Completely blocks taser shots. Requires energy to operate." icon_state = "mecha_abooster_proj" origin_tech = "materials=4" @@ -631,7 +631,7 @@ /obj/item/mecha_parts/mecha_equipment/repair_droid - name = "Repair Droid" + name = "repair droid" desc = "Automated repair droid. Scans exosuit for damage and repairs it. Can fix almost all types of external or internal damage." icon_state = "repair_droid" origin_tech = "magnets=3;programming=3" @@ -721,7 +721,7 @@ /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay - name = "Energy Relay" + name = "energy relay" desc = "Wirelessly drains energy from any available power channel in area. The performance index is quite low." icon_state = "tesla" origin_tech = "magnets=4;syndicate=2" @@ -833,7 +833,7 @@ /obj/item/mecha_parts/mecha_equipment/generator - name = "Plasma Converter" + name = "plasma converter" desc = "Generates power using solid plasma as fuel. Pollutes the environment." icon_state = "tesla" origin_tech = "plasmatech=2;powerstorage=2;engineering=1" @@ -973,7 +973,7 @@ /obj/item/mecha_parts/mecha_equipment/generator/nuclear - name = "ExoNuclear Reactor" + name = "exonuclear reactor" desc = "Generates power using uranium. Pollutes the environment." icon_state = "tesla" origin_tech = "powerstorage=3;engineering=3" @@ -1010,7 +1010,7 @@ //This is pretty much just for the death-ripley so that it is harmless /obj/item/mecha_parts/mecha_equipment/tool/safety_clamp - name = "KILL CLAMP" + name = "\improper KILL CLAMP" icon_state = "mecha_clamp" equip_cooldown = 15 energy_drain = 0 diff --git a/code/game/mecha/equipment/tools/unused_tools.dm b/code/game/mecha/equipment/tools/unused_tools.dm index 68578913813..4abfb18a726 100644 --- a/code/game/mecha/equipment/tools/unused_tools.dm +++ b/code/game/mecha/equipment/tools/unused_tools.dm @@ -9,7 +9,7 @@ //NEEDS SPRITE! (When this gets ticked in search for 'TODO MECHA JETPACK SPRITE MISSING' through code to uncomment the place where it's missing.) /obj/item/mecha_parts/mecha_equipment/jetpack - name = "Jetpack" + name = "jetpack" desc = "Using directed ion bursts and cunning solar wind reflection technique, this device enables controlled space flight." icon_state = "mecha_equip" equip_cooldown = 5 @@ -108,7 +108,7 @@ /obj/item/mecha_parts/mecha_equipment/defence_shocker - name = "Exosuit Defence Shocker" + name = "exosuit defence shocker" desc = "" icon_state = "mecha_teleport" equip_cooldown = 10 diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index 0a4cad676f8..0e3fe20bdc5 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -14,7 +14,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/energy - name = "General Energy Weapon" + name = "general energy weapon" action(target) if(!action_checks(target)) return @@ -41,7 +41,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser equip_cooldown = 8 - name = "CH-PS \"Immolator\" Laser" + name = "\improper CH-PS \"Immolator\" laser" icon_state = "mecha_laser" energy_drain = 30 projectile = /obj/item/projectile/beam @@ -49,7 +49,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy equip_cooldown = 15 - name = "CH-LC \"Solaris\" Laser Cannon" + name = "\improper CH-LC \"Solaris\" laser cannon" icon_state = "mecha_laser" energy_drain = 60 projectile = /obj/item/projectile/beam/heavylaser @@ -57,7 +57,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/energy/ion equip_cooldown = 40 - name = "mkIV Ion Heavy Cannon" + name = "\improper MKIV ion heavy cannon" icon_state = "mecha_ion" energy_drain = 120 projectile = /obj/item/projectile/ion @@ -66,7 +66,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/energy/pulse equip_cooldown = 30 - name = "eZ-13 mk2 Heavy pulse rifle" + name = "eZ-13 MK2 heavy pulse rifle" icon_state = "mecha_pulse" energy_drain = 120 origin_tech = "materials=3;combat=6;powerstorage=4" @@ -96,7 +96,7 @@ return /obj/item/mecha_parts/mecha_equipment/weapon/energy/taser - name = "PBT \"Pacifier\" Mounted Taser" + name = "\improper PBT \"Pacifier\" mounted taser" icon_state = "mecha_taser" energy_drain = 20 equip_cooldown = 8 @@ -105,7 +105,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/honker - name = "HoNkER BlAsT 5000" + name = "\improper HoNkER BlAsT 5000" icon_state = "mecha_honker" energy_drain = 200 equip_cooldown = 150 @@ -164,7 +164,7 @@ return /obj/item/mecha_parts/mecha_equipment/weapon/ballistic - name = "General Ballisic Weapon" + name = "general ballisic weapon" var/projectiles var/projectile_energy_cost @@ -196,7 +196,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot - name = "LBX AC 10 \"Scattershot\"" + name = "\improper LBX AC 10 \"Scattershot\"" icon_state = "mecha_scatter" equip_cooldown = 20 projectile = /obj/item/projectile/bullet/midbullet @@ -238,7 +238,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg - name = "Ultra AC 2" + name = "\improper Ultra AC 2" icon_state = "mecha_uac2" equip_cooldown = 10 projectile = /obj/item/projectile/bullet/weakbullet @@ -282,7 +282,7 @@ return /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack - name = "SRM-8 Missile Rack" + name = "\improper SRM-8 missile rack" icon_state = "mecha_missilerack" projectile = /obj/item/missile fire_sound = 'sound/effects/bang.ogg' @@ -323,7 +323,7 @@ return /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang - name = "SGL-6 Grenade Launcher" + name = "\improper SGL-6 grenade launcher" icon_state = "mecha_grenadelnchr" projectile = /obj/item/weapon/grenade/flashbang fire_sound = 'sound/effects/bang.ogg' @@ -350,7 +350,7 @@ return /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang/clusterbang//Because I am a heartless bastard -Sieve - name = "SOP-6 Grenade Launcher" + name = "\improper SOP-6 grenade launcher" projectile = /obj/item/weapon/grenade/flashbang/clusterbang construction_cost = list("metal"=20000,"gold"=6000,"uranium"=6000) @@ -361,7 +361,7 @@ return//Extra bit of security /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/banana_mortar - name = "Banana Mortar" + name = "banana mortar" icon_state = "mecha_bananamrtr" projectile = /obj/item/weapon/bananapeel fire_sound = 'sound/items/bikehorn.ogg' @@ -391,7 +391,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/mousetrap_mortar - name = "Mousetrap Mortar" + name = "mousetrap mortar" icon_state = "mecha_mousetrapmrtr" projectile = /obj/item/device/assembly/mousetrap fire_sound = 'sound/items/bikehorn.ogg' diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm index 936f44bf42c..e5b7b0426d5 100644 --- a/code/game/mecha/mech_bay.dm +++ b/code/game/mecha/mech_bay.dm @@ -1,5 +1,5 @@ /turf/simulated/floor/mech_bay_recharge_floor - name = "Mech Bay Recharge Station" + name = "mech bay recharge station" icon = 'icons/turf/floors.dmi' icon_state = "recharge_floor" var/obj/machinery/mech_bay_recharge_port/recharge_port @@ -50,7 +50,7 @@ /obj/machinery/mech_bay_recharge_port - name = "Mech Bay Power Port" + name = "mech bay power port" density = 1 anchored = 1 icon = 'icons/mecha/mech_bay.dmi' @@ -130,7 +130,7 @@ /obj/machinery/computer/mech_bay_power_console - name = "Mech Bay Power Control Console" + name = "mech bay power control console" density = 1 anchored = 1 icon = 'icons/obj/computer.dmi' diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index d992d64cf36..994724ef1b2 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -5,7 +5,7 @@ /obj/machinery/mecha_part_fabricator icon = 'icons/obj/robotics.dmi' icon_state = "fab-idle" - name = "Exosuit Fabricator" + name = "exosuit fabricator" desc = "Nothing is being built." density = 1 anchored = 1 diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index e8aa4092290..384b5731552 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -9,7 +9,7 @@ /obj/mecha - name = "Mecha" + name = "mecha" desc = "Exosuit" icon = 'icons/mecha/mecha.dmi' density = 1 //Dense. To raise the heat. diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm index e35e8268b89..0833013b96c 100644 --- a/code/game/mecha/mecha_control_console.dm +++ b/code/game/mecha/mecha_control_console.dm @@ -1,5 +1,5 @@ /obj/machinery/computer/mecha - name = "Exosuit Control" + name = "exosuit control console" icon = 'icons/obj/computer.dmi' icon_state = "mecha" req_access = list(access_robotics) @@ -60,7 +60,7 @@ /obj/item/mecha_parts/mecha_tracking - name = "Exosuit tracking beacon" + name = "exosuit tracking beacon" desc = "Device used to transmit exosuit data." icon = 'icons/obj/device.dmi' icon_state = "motion2" @@ -113,7 +113,7 @@ /obj/item/weapon/storage/box/mechabeacons - name = "Exosuit Tracking Beacons" + name = "exosuit tracking beacons" New() ..() new /obj/item/mecha_parts/mecha_tracking(src) diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm index 9d8c0696b29..ccb4040a3e3 100644 --- a/code/game/mecha/mecha_parts.dm +++ b/code/game/mecha/mecha_parts.dm @@ -31,14 +31,14 @@ /////////// Ripley /obj/item/mecha_parts/chassis/ripley - name = "Ripley Chassis" + name = "\improper Ripley chassis" New() ..() construct = new /datum/construction/mecha/ripley_chassis(src) /obj/item/mecha_parts/part/ripley_torso - name="Ripley Torso" + name="\improper Ripley torso" desc="A torso part of Ripley APLU. Contains power unit, processing core and life support systems." icon_state = "ripley_harness" origin_tech = "programming=2;materials=2;biotech=2;engineering=2" @@ -46,7 +46,7 @@ construction_cost = list("metal"=40000,"glass"=15000) /obj/item/mecha_parts/part/ripley_left_arm - name="Ripley Left Arm" + name="\improper Ripley left arm" desc="A Ripley APLU left arm. Data and power sockets are compatible with most exosuit tools." icon_state = "ripley_l_arm" origin_tech = "programming=2;materials=2;engineering=2" @@ -54,7 +54,7 @@ construction_cost = list("metal"=25000) /obj/item/mecha_parts/part/ripley_right_arm - name="Ripley Right Arm" + name="\improper Ripley right arm" desc="A Ripley APLU right arm. Data and power sockets are compatible with most exosuit tools." icon_state = "ripley_r_arm" origin_tech = "programming=2;materials=2;engineering=2" @@ -62,7 +62,7 @@ construction_cost = list("metal"=25000) /obj/item/mecha_parts/part/ripley_left_leg - name="Ripley Left Leg" + name="\improper Ripley left leg" desc="A Ripley APLU left leg. Contains somewhat complex servodrives and balance maintaining systems." icon_state = "ripley_l_leg" origin_tech = "programming=2;materials=2;engineering=2" @@ -70,7 +70,7 @@ construction_cost = list("metal"=30000) /obj/item/mecha_parts/part/ripley_right_leg - name="Ripley Right Leg" + name="\improper Ripley right leg" desc="A Ripley APLU right leg. Contains somewhat complex servodrives and balance maintaining systems." icon_state = "ripley_r_leg" origin_tech = "programming=2;materials=2;engineering=2" @@ -80,7 +80,7 @@ ///////// Gygax /obj/item/mecha_parts/chassis/gygax - name = "Gygax Chassis" + name = "\improper Gygax chassis" construction_cost = list("metal"=25000) New() @@ -88,7 +88,7 @@ construct = new /datum/construction/mecha/gygax_chassis(src) /obj/item/mecha_parts/part/gygax_torso - name="Gygax Torso" + name="\improper Gygax torso" desc="A torso part of Gygax. Contains power unit, processing core and life support systems. Has an additional equipment slot." icon_state = "gygax_harness" origin_tech = "programming=2;materials=2;biotech=3;engineering=3" @@ -96,7 +96,7 @@ construction_cost = list("metal"=50000,"glass"=20000) /obj/item/mecha_parts/part/gygax_head - name="Gygax Head" + name="\improper Gygax head" desc="A Gygax head. Houses advanced surveilance and targeting sensors." icon_state = "gygax_head" origin_tech = "programming=2;materials=2;magnets=3;engineering=3" @@ -104,7 +104,7 @@ construction_cost = list("metal"=20000,"glass"=10000) /obj/item/mecha_parts/part/gygax_left_arm - name="Gygax Left Arm" + name="\improper Gygax left arm" desc="A Gygax left arm. Data and power sockets are compatible with most exosuit tools and weapons." icon_state = "gygax_l_arm" origin_tech = "programming=2;materials=2;engineering=3" @@ -112,7 +112,7 @@ construction_cost = list("metal"=30000) /obj/item/mecha_parts/part/gygax_right_arm - name="Gygax Right Arm" + name="\improper Gygax right arm" desc="A Gygax right arm. Data and power sockets are compatible with most exosuit tools and weapons." icon_state = "gygax_r_arm" origin_tech = "programming=2;materials=2;engineering=3" @@ -120,21 +120,22 @@ construction_cost = list("metal"=30000) /obj/item/mecha_parts/part/gygax_left_leg - name="Gygax Left Leg" + name="\improper Gygax left leg" icon_state = "gygax_l_leg" origin_tech = "programming=2;materials=2;engineering=3" construction_time = 200 construction_cost = list("metal"=35000) /obj/item/mecha_parts/part/gygax_right_leg - name="Gygax Right Leg" + name="\improper Gygax right leg" icon_state = "gygax_r_leg" origin_tech = "programming=2;materials=2;engineering=3" construction_time = 200 construction_cost = list("metal"=35000) /obj/item/mecha_parts/part/gygax_armour - name="Gygax Armour Plates" + gender = PLURAL + name="\improper Gygax armour plates" icon_state = "gygax_armour" origin_tech = "materials=6;combat=4;engineering=5" construction_time = 600 @@ -144,7 +145,7 @@ //////////// Durand /obj/item/mecha_parts/chassis/durand - name = "Durand Chassis" + name = "\improper Durand chassis" construction_cost = list("metal"=25000) New() @@ -152,49 +153,50 @@ construct = new /datum/construction/mecha/durand_chassis(src) /obj/item/mecha_parts/part/durand_torso - name="Durand Torso" + name="\improper Durand torso" icon_state = "durand_harness" origin_tech = "programming=2;materials=3;biotech=3;engineering=3" construction_time = 300 construction_cost = list("metal"=55000,"glass"=20000,"silver"=10000) /obj/item/mecha_parts/part/durand_head - name="Durand Head" + name="\improper Durand head" icon_state = "durand_head" origin_tech = "programming=2;materials=3;magnets=3;engineering=3" construction_time = 200 construction_cost = list("metal"=25000,"glass"=10000,"silver"=3000) /obj/item/mecha_parts/part/durand_left_arm - name="Durand Left Arm" + name="\improper Durand left arm" icon_state = "durand_l_arm" origin_tech = "programming=2;materials=3;engineering=3" construction_time = 200 construction_cost = list("metal"=35000,"silver"=3000) /obj/item/mecha_parts/part/durand_right_arm - name="Durand Right Arm" + name="\improper Durand right arm" icon_state = "durand_r_arm" origin_tech = "programming=2;materials=3;engineering=3" construction_time = 200 construction_cost = list("metal"=35000,"silver"=3000) /obj/item/mecha_parts/part/durand_left_leg - name="Durand Left Leg" + name="\improper Durand left leg" icon_state = "durand_l_leg" origin_tech = "programming=2;materials=3;engineering=3" construction_time = 200 construction_cost = list("metal"=40000,"silver"=3000) /obj/item/mecha_parts/part/durand_right_leg - name="Durand Right Leg" + name="\improper Durand right leg" icon_state = "durand_r_leg" origin_tech = "programming=2;materials=3;engineering=3" construction_time = 200 construction_cost = list("metal"=40000,"silver"=3000) /obj/item/mecha_parts/part/durand_armour - name="Durand Armour Plates" + gender = PLURAL + name="\improper Durand armour plates" icon_state = "durand_armour" origin_tech = "materials=5;combat=4;engineering=5" construction_time = 600 @@ -205,7 +207,7 @@ ////////// Firefighter /obj/item/mecha_parts/chassis/firefighter - name = "Firefighter Chassis" + name = "Firefighter chassis" New() ..() @@ -235,44 +237,44 @@ ////////// HONK /obj/item/mecha_parts/chassis/honker - name = "H.O.N.K Chassis" + name = "\improper H.O.N.K chassis" New() ..() construct = new /datum/construction/mecha/honker_chassis(src) /obj/item/mecha_parts/part/honker_torso - name="H.O.N.K Torso" + name="\improper H.O.N.K torso" icon_state = "honker_harness" construction_time = 300 construction_cost = list("metal"=35000,"glass"=10000,"bananium"=10000) /obj/item/mecha_parts/part/honker_head - name="H.O.N.K Head" + name="\improper H.O.N.K head" icon_state = "honker_head" construction_time = 200 construction_cost = list("metal"=15000,"glass"=5000,"bananium"=5000) /obj/item/mecha_parts/part/honker_left_arm - name="H.O.N.K Left Arm" + name="\improper H.O.N.K left arm" icon_state = "honker_l_arm" construction_time = 200 construction_cost = list("metal"=20000,"bananium"=5000) /obj/item/mecha_parts/part/honker_right_arm - name="H.O.N.K Right Arm" + name="\improper H.O.N.K right arm" icon_state = "honker_r_arm" construction_time = 200 construction_cost = list("metal"=20000,"bananium"=5000) /obj/item/mecha_parts/part/honker_left_leg - name="H.O.N.K Left Leg" + name="\improper H.O.N.K left leg" icon_state = "honker_l_leg" construction_time = 200 construction_cost = list("metal"=20000,"bananium"=5000) /obj/item/mecha_parts/part/honker_right_leg - name="H.O.N.K Right Leg" + name="\improper H.O.N.K right leg" icon_state = "honker_r_leg" construction_time = 200 construction_cost = list("metal"=20000,"bananium"=5000) @@ -281,7 +283,7 @@ ////////// Phazon /obj/item/mecha_parts/chassis/phazon - name = "Phazon Chassis" + name = "\improper Phazon chassis" origin_tech = "materials=7" New() @@ -289,42 +291,42 @@ construct = new /datum/construction/mecha/phazon_chassis(src) /obj/item/mecha_parts/part/phazon_torso - name="Phazon Torso" + name="\improper Phazon torso" icon_state = "phazon_harness" construction_time = 300 construction_cost = list("metal"=35000,"glass"=10000,"plasma"=20000) origin_tech = "programming=5;materials=7;bluespace=6;powerstorage=6" /obj/item/mecha_parts/part/phazon_head - name="Phazon Head" + name="\improper Phazon head" icon_state = "phazon_head" construction_time = 200 construction_cost = list("metal"=15000,"glass"=5000,"plasma"=10000) origin_tech = "programming=4;materials=5;magnets=6" /obj/item/mecha_parts/part/phazon_left_arm - name="Phazon Left Arm" + name="\improper Phazon left arm" icon_state = "phazon_l_arm" construction_time = 200 construction_cost = list("metal"=20000,"plasma"=10000) origin_tech = "materials=5;bluespace=2;magnets=2" /obj/item/mecha_parts/part/phazon_right_arm - name="Phazon Right Arm" + name="\improper Phazon right arm" icon_state = "phazon_r_arm" construction_time = 200 construction_cost = list("metal"=20000,"plasma"=10000) origin_tech = "materials=5;bluespace=2;magnets=2" /obj/item/mecha_parts/part/phazon_left_leg - name="Phazon Left Leg" + name="\improper Phazon left leg" icon_state = "phazon_l_leg" construction_time = 200 construction_cost = list("metal"=20000,"plasma"=10000) origin_tech = "materials=5;bluespace=3;magnets=3" /obj/item/mecha_parts/part/phazon_right_leg - name="Phazon Right Leg" + name="\improper Phazon right leg" icon_state = "phazon_r_leg" construction_time = 200 construction_cost = list("metal"=20000,"plasma"=10000) @@ -334,21 +336,21 @@ /obj/item/mecha_parts/chassis/odysseus - name = "Odysseus Chassis" + name = "\improper Odysseus chassis" New() ..() construct = new /datum/construction/mecha/odysseus_chassis(src) /obj/item/mecha_parts/part/odysseus_head - name="Odysseus Head" + name="\improper Odysseus head" icon_state = "odysseus_head" construction_time = 100 construction_cost = list("metal"=2000,"glass"=10000) origin_tech = "programming=3;materials=2" /obj/item/mecha_parts/part/odysseus_torso - name="Odysseus Torso" + name="\improper Odysseus torso" desc="A torso part of Odysseus. Contains power unit, processing core and life support systems." icon_state = "odysseus_torso" origin_tech = "programming=2;materials=2;biotech=2;engineering=2" @@ -356,7 +358,7 @@ construction_cost = list("metal"=25000) /obj/item/mecha_parts/part/odysseus_left_arm - name="Odysseus Left Arm" + name="\improper Odysseus left arm" desc="An Odysseus left arm. Data and power sockets are compatible with most exosuit tools." icon_state = "odysseus_l_arm" origin_tech = "programming=2;materials=2;engineering=2" @@ -364,7 +366,7 @@ construction_cost = list("metal"=10000) /obj/item/mecha_parts/part/odysseus_right_arm - name="Odysseus Right Arm" + name="\improper Odysseus right arm" desc="An Odysseus right arm. Data and power sockets are compatible with most exosuit tools." icon_state = "odysseus_r_arm" origin_tech = "programming=2;materials=2;engineering=2" @@ -372,7 +374,7 @@ construction_cost = list("metal"=10000) /obj/item/mecha_parts/part/odysseus_left_leg - name="Odysseus Left Leg" + name="\improper Odysseus left leg" desc="An Odysseus left leg. Contains somewhat complex servodrives and balance maintaining systems." icon_state = "odysseus_l_leg" origin_tech = "programming=2;materials=2;engineering=2" @@ -380,7 +382,7 @@ construction_cost = list("metal"=15000) /obj/item/mecha_parts/part/odysseus_right_leg - name="Odysseus Right Leg" + name="\improper Odysseus right leg" desc="A Odysseus right leg. Contains somewhat complex servodrives and balance maintaining systems." icon_state = "odysseus_r_leg" origin_tech = "programming=2;materials=2;engineering=2" @@ -398,7 +400,7 @@ ///////// Circuitboards /obj/item/weapon/circuitboard/mecha - name = "Exosuit Circuit board" + name = "exosuit circuit board" icon = 'icons/obj/module.dmi' icon_state = "std_mod" item_state = "electronic" @@ -414,69 +416,69 @@ origin_tech = "programming=3" ripley/peripherals - name = "Circuit board (Ripley Peripherals Control module)" + name = "circuit board (Ripley Peripherals Control module)" icon_state = "mcontroller" ripley/main - name = "Circuit board (Ripley Central Control module)" + name = "circuit board (Ripley Central Control module)" icon_state = "mainboard" gygax origin_tech = "programming=4" gygax/peripherals - name = "Circuit board (Gygax Peripherals Control module)" + name = "circuit board (Gygax Peripherals Control module)" icon_state = "mcontroller" gygax/targeting - name = "Circuit board (Gygax Weapon Control and Targeting module)" + name = "circuit board (Gygax Weapon Control and Targeting module)" icon_state = "mcontroller" origin_tech = "programming=4;combat=4" gygax/main - name = "Circuit board (Gygax Central Control module)" + name = "circuit board (Gygax Central Control module)" icon_state = "mainboard" durand origin_tech = "programming=4" durand/peripherals - name = "Circuit board (Durand Peripherals Control module)" + name = "circuit board (Durand Peripherals Control module)" icon_state = "mcontroller" durand/targeting - name = "Circuit board (Durand Weapon Control and Targeting module)" + name = "circuit board (Durand Weapon Control and Targeting module)" icon_state = "mcontroller" origin_tech = "programming=4;combat=4" durand/main - name = "Circuit board (Durand Central Control module)" + name = "circuit board (Durand Central Control module)" icon_state = "mainboard" honker origin_tech = "programming=4" honker/peripherals - name = "Circuit board (H.O.N.K Peripherals Control module)" + name = "circuit board (H.O.N.K Peripherals Control module)" icon_state = "mcontroller" honker/targeting - name = "Circuit board (H.O.N.K Weapon Control and Targeting module)" + name = "circuit board (H.O.N.K Weapon Control and Targeting module)" icon_state = "mcontroller" honker/main - name = "Circuit board (H.O.N.K Central Control module)" + name = "circuit board (H.O.N.K Central Control module)" icon_state = "mainboard" odysseus origin_tech = "programming=3" odysseus/peripherals - name = "Circuit board (Odysseus Peripherals Control module)" + name = "circuit board (Odysseus Peripherals Control module)" icon_state = "mcontroller" odysseus/main - name = "Circuit board (Odysseus Central Control module)" + name = "circuit board (Odysseus Central Control module)" icon_state = "mainboard" diff --git a/code/game/mecha/mecha_wreckage.dm b/code/game/mecha/mecha_wreckage.dm index d40c6adf769..768716f489f 100644 --- a/code/game/mecha/mecha_wreckage.dm +++ b/code/game/mecha/mecha_wreckage.dm @@ -64,7 +64,7 @@ /obj/structure/mecha_wreckage/gygax - name = "Gygax wreckage" + name = "\improper Gygax wreckage" icon_state = "gygax-broken" /obj/structure/mecha_wreckage/gygax/New() @@ -84,26 +84,26 @@ /obj/structure/mecha_wreckage/gygax/dark - name = "Dark Gygax wreckage" + name = "\improper Dark Gygax wreckage" icon_state = "darkgygax-broken" /obj/structure/mecha_wreckage/marauder - name = "Marauder wreckage" + name = "\improper Marauder wreckage" icon_state = "marauder-broken" /obj/structure/mecha_wreckage/mauler - name = "Mauler Wreckage" + name = "\improper Mauler wreckage" icon_state = "mauler-broken" desc = "The syndicate won't be very happy about this..." /obj/structure/mecha_wreckage/seraph - name = "Seraph wreckage" + name = "\improper Seraph wreckage" icon_state = "seraph-broken" /obj/structure/mecha_wreckage/ripley - name = "Ripley wreckage" + name = "\improper Ripley wreckage" icon_state = "ripley-broken" /obj/structure/mecha_wreckage/ripley/New() @@ -121,7 +121,7 @@ /obj/structure/mecha_wreckage/ripley/firefighter - name = "Firefighter wreckage" + name = "\improper Firefighter wreckage" icon_state = "firefighter-broken" /obj/structure/mecha_wreckage/ripley/firefighter/New() @@ -140,12 +140,12 @@ /obj/structure/mecha_wreckage/ripley/deathripley - name = "Death-Ripley wreckage" + name = "\improper Death-Ripley wreckage" icon_state = "deathripley-broken" /obj/structure/mecha_wreckage/honker - name = "Honker wreckage" + name = "\improper H.O.N.K wreckage" icon_state = "honker-broken" /obj/structure/mecha_wreckage/honker/New() @@ -166,7 +166,7 @@ /obj/structure/mecha_wreckage/durand - name = "Durand wreckage" + name = "\improper Durand wreckage" icon_state = "durand-broken" /obj/structure/mecha_wreckage/durand/New() @@ -186,12 +186,12 @@ /obj/structure/mecha_wreckage/phazon - name = "Phazon wreckage" + name = "\improper Phazon wreckage" icon_state = "phazon-broken" /obj/structure/mecha_wreckage/odysseus - name = "Odysseus wreckage" + name = "\improper Odysseus wreckage" icon_state = "odysseus-broken" /obj/structure/mecha_wreckage/odysseus/New() diff --git a/code/game/mecha/medical/odysseus.dm b/code/game/mecha/medical/odysseus.dm index 127b67999b4..cbf37752fdb 100644 --- a/code/game/mecha/medical/odysseus.dm +++ b/code/game/mecha/medical/odysseus.dm @@ -1,6 +1,6 @@ /obj/mecha/medical/odysseus desc = "These exosuits are developed and produced by Vey-Med. (© All rights reserved)." - name = "Odysseus" + name = "\improper Odysseus" icon_state = "odysseus" step_in = 2 max_temperature = 15000 @@ -59,7 +59,7 @@ //TODO - Check documentation for client.eye and client.perspective... /obj/item/clothing/glasses/hud/health/mech - name = "Integrated Medical Hud" + name = "integrated medical Hud" process_hud(var/mob/M) diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm index e7a07644f62..bddf479fef0 100644 --- a/code/game/mecha/working/ripley.dm +++ b/code/game/mecha/working/ripley.dm @@ -1,6 +1,6 @@ /obj/mecha/working/ripley desc = "Autonomous Power Loader Unit. The workhorse of the exosuit world." - name = "APLU \"Ripley\"" + name = "\improper APLU \"Ripley\"" icon_state = "ripley" step_in = 6 max_temperature = 20000 @@ -17,7 +17,7 @@ /obj/mecha/working/ripley/firefighter desc = "Standart APLU chassis was refitted with additional thermal protection and cistern." - name = "APLU \"Firefighter\"" + name = "\improper APLU \"Firefighter\"" icon_state = "firefighter" max_temperature = 65000 health = 250 @@ -27,7 +27,7 @@ /obj/mecha/working/ripley/deathripley desc = "OH SHIT IT'S THE DEATHSQUAD WE'RE ALL GONNA DIE" - name = "DEATH-RIPLEY" + name = "\improper DEATH-RIPLEY" icon_state = "deathripley" step_in = 2 opacity=0 @@ -43,7 +43,7 @@ /obj/mecha/working/ripley/mining desc = "An old, dusty mining ripley." - name = "APLU \"Miner\"" + name = "\improper APLU \"Miner\"" /obj/mecha/working/ripley/mining/New() ..()