From 1e769b4314d7310247e8e6fe8013bd48dfcdaa48 Mon Sep 17 00:00:00 2001 From: Amunak Date: Wed, 10 Dec 2014 20:37:18 +0100 Subject: [PATCH 01/35] Attempt to normalize computer and circuit board names and their research names. Also moved RCON console board and SMES board where they belong. Formatted some board code and fixed some typos, too. Cloning console renamed to Cloning Control Console. The teleporter console is now called Teleporter Control Console. The power monitor is now called Power Monitoring Console. SMES board glass and acid construction price normalized (though other resources are still required; is that a good thing? It would be better to just introduce a new expensive part that is used to build it (if the coils aren't enough) rather than have a single board with atypical price. --- .../overmap/ships/computers/engine_control.dm | 2 +- code/game/machinery/computer/Operating.dm | 2 +- code/game/machinery/computer/RCON_Console.dm | 9 -- .../game/machinery/computer/buildandrepair.dm | 80 ++++++------ code/game/machinery/computer/cloning.dm | 2 +- code/game/machinery/computer/crew.dm | 2 +- code/game/machinery/computer/station_alert.dm | 2 +- code/game/machinery/constructable_frame.dm | 13 +- code/game/machinery/teleporter.dm | 2 +- code/game/mecha/mecha_parts.dm | 55 +++----- code/game/supplyshuttle.dm | 4 +- .../power/sensors/sensor_monitoring.dm | 2 +- code/modules/power/smes_construction.dm | 21 +-- code/modules/research/designs.dm | 120 +++++++++--------- 14 files changed, 139 insertions(+), 177 deletions(-) diff --git a/code/WorkInProgress/Chinsky/overmap/ships/computers/engine_control.dm b/code/WorkInProgress/Chinsky/overmap/ships/computers/engine_control.dm index 41f2c4cdf9d..2a27a63019c 100644 --- a/code/WorkInProgress/Chinsky/overmap/ships/computers/engine_control.dm +++ b/code/WorkInProgress/Chinsky/overmap/ships/computers/engine_control.dm @@ -1,7 +1,7 @@ //Engine control and monitoring console /obj/machinery/computer/engines - name = "engines control console" + name = "Engine Control Console" icon_state = "id" var/state = "status" var/list/engines = list() diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index f1a1f02db70..1601347a310 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -1,7 +1,7 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 /obj/machinery/computer/operating - name = "Operating Computer" + name = "Patient Monitor Console" density = 1 anchored = 1.0 icon_state = "operating" diff --git a/code/game/machinery/computer/RCON_Console.dm b/code/game/machinery/computer/RCON_Console.dm index b57266b7fa4..6e0eab2e558 100644 --- a/code/game/machinery/computer/RCON_Console.dm +++ b/code/game/machinery/computer/RCON_Console.dm @@ -1,8 +1,3 @@ -/obj/item/weapon/circuitboard/rcon_console - name = "\improper RCON Remote Control Console circuit board" - build_path = /obj/machinery/computer/rcon - origin_tech = "programming=4;engineering=3;powerstorage=5" - /obj/machinery/computer/rcon name = "RCON Console" desc = "Console used to remotely control machinery on the station." @@ -48,10 +43,6 @@ ))) data["breaker_info"] = breakerlist - - - - // update the ui if it exists, returns null if no ui is passed/found ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 3c30ffa198e..b496cdc7eed 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 @@ -51,7 +51,7 @@ */ /obj/item/weapon/circuitboard/message_monitor - name = "Circuit board (Message Monitor)" + name = "Circuit board (Message Monitor Console)" build_path = /obj/machinery/computer/message_monitor origin_tech = "programming=3" @@ -87,15 +87,15 @@ origin_tech = "programming=4;biotech=2" board_type = "other" /obj/item/weapon/circuitboard/aiupload - name = "Circuit board (AI Upload)" + name = "Circuit board (AI Upload Console)" build_path = /obj/machinery/computer/aiupload origin_tech = "programming=4" /obj/item/weapon/circuitboard/borgupload - name = "Circuit board (Cyborg Upload)" + name = "Circuit board (Cyborg Upload Console)" build_path = /obj/machinery/computer/borgupload origin_tech = "programming=4" /obj/item/weapon/circuitboard/med_data - name = "Circuit board (Medical Records)" + 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)" @@ -106,36 +106,36 @@ 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 Console)" build_path = /obj/machinery/computer/communications origin_tech = "programming=2;magnets=2" /obj/item/weapon/circuitboard/card - name = "Circuit board (ID Computer)" + name = "Circuit board (ID Card Modification Console)" build_path = /obj/machinery/computer/card /obj/item/weapon/circuitboard/card/centcom - name = "Circuit board (CentCom ID Computer)" + name = "Circuit board (CentCom ID Card Modification 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 Control Console)" build_path = /obj/machinery/computer/teleporter origin_tech = "programming=2;bluespace=2" /obj/item/weapon/circuitboard/secure_data - name = "Circuit board (Security Records)" + name = "Circuit board (Security Records Console)" build_path = /obj/machinery/computer/secure_data /obj/item/weapon/circuitboard/skills - name = "Circuit board (Employment Records)" + name = "Circuit board (Employment Records Console)" build_path = /obj/machinery/computer/skills /obj/item/weapon/circuitboard/stationalert - name = "Circuit board (Station Alerts)" + name = "Circuit board (Station Alert Console)" build_path = /obj/machinery/computer/station_alert ///obj/item/weapon/circuitboard/atmospheresiphonswitch // 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 (Atmosphere Monitoring Console)" build_path = /obj/machinery/computer/general_air_control var/frequency = 1439 /obj/item/weapon/circuitboard/air_management/tank_control @@ -159,36 +159,36 @@ frequency = C.frequency /obj/item/weapon/circuitboard/atmos_alert - name = "Circuit board (Atmospheric Alert)" + name = "Circuit board (Atmospheric Alert Console)" build_path = /obj/machinery/computer/atmos_alert /obj/item/weapon/circuitboard/pod 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 Console)" build_path = /obj/machinery/computer/robotics origin_tech = "programming=3" /obj/item/weapon/circuitboard/drone_control - name = "Circuit board (Drone Control)" + name = "Circuit board (Drone Control Console)" build_path = /obj/machinery/computer/drone_control origin_tech = "programming=3" /obj/item/weapon/circuitboard/cloning - name = "Circuit board (Cloning)" + name = "Circuit board (Cloning Control Console)" 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 Machine)" 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 Console)" build_path = /obj/machinery/computer/turbine_computer /obj/item/weapon/circuitboard/solar_control - name = "Circuit board (Solar Control)" + name = "Circuit board (Solar Control Console)" build_path = /obj/machinery/power/solar_control origin_tech = "programming=2;powerstorage=2" /obj/item/weapon/circuitboard/powermonitor - name = "Circuit board (Power Monitor)" + name = "Circuit board (Power Monitoring Console)" build_path = /obj/machinery/computer/power_monitor /obj/item/weapon/circuitboard/olddoor name = "Circuit board (DoorMex)" @@ -200,19 +200,19 @@ name = "Circuit board (Magix)" build_path = /obj/machinery/computer/pod/old/swf /obj/item/weapon/circuitboard/prisoner - name = "Circuit board (Prisoner Management)" + 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 (R&D Control Console)" build_path = /obj/machinery/computer/rdconsole/core /obj/item/weapon/circuitboard/mecha_control 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 Console)" build_path = /obj/machinery/computer/rdservercontrol /obj/item/weapon/circuitboard/crew - name = "Circuit board (Crew monitoring computer)" + 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 @@ -220,12 +220,11 @@ 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 @@ -239,19 +238,19 @@ contraband_enabled = SC.can_order_contraband /obj/item/weapon/circuitboard/operating - name = "Circuit board (Operating Computer)" + name = "Circuit board (Patient Monitoring Console)" build_path = /obj/machinery/computer/operating origin_tech = "programming=2;biotech=2" /obj/item/weapon/circuitboard/comm_monitor - name = "Circuit board (Telecommunications Monitor)" + name = "Circuit board (Telecommunications Monitor Console)" 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 Console)" 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 Console)" build_path = /obj/machinery/computer/telecomms/traffic origin_tech = "programming=3" @@ -262,19 +261,19 @@ name = "Circuit board (Disease Splicer)" build_path = /obj/machinery/computer/diseasesplicer /obj/item/weapon/circuitboard/mining_shuttle - name = "Circuit board (Mining Shuttle)" + name = "Circuit board (Mining Shuttle Console)" build_path = /obj/machinery/computer/shuttle_control/mining origin_tech = "programming=2" /obj/item/weapon/circuitboard/engineering_shuttle - name = "Circuit board (Engineering Shuttle)" + name = "Circuit board (Engineering Shuttle Console)" build_path = /obj/machinery/computer/shuttle_control/engineering origin_tech = "programming=2" /obj/item/weapon/circuitboard/research_shuttle - name = "Circuit board (Research Shuttle)" + name = "Circuit board (Research Shuttle Console)" build_path = /obj/machinery/computer/shuttle_control/research 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 Console)" build_path = /obj/machinery/computer/HolodeckControl origin_tech = "programming=4" /obj/item/weapon/circuitboard/aifixer @@ -282,14 +281,17 @@ 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 Console)" 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 Console)" build_path = /obj/machinery/computer/prison_shuttle origin_tech = "programming=2" - +/obj/item/weapon/circuitboard/rcon_console + name = "Circuit board (RCON Remote Control Console)" + build_path = /obj/machinery/computer/rcon + origin_tech = "programming=4;engineering=3;powerstorage=5" /obj/item/weapon/circuitboard/supplycomp/attackby(obj/item/I as obj, mob/user as mob) if(istype(I,/obj/item/device/multitool)) diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index dadda5cfd70..402f7bb91b1 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -1,5 +1,5 @@ /obj/machinery/computer/cloning - name = "Cloning console" + name = "Cloning Control Console" icon = 'icons/obj/computer.dmi' icon_state = "dna" circuit = "/obj/item/weapon/circuitboard/cloning" diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index 760de399a83..1c7352f4168 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 computer" + name = "Crew Monitoring Computer" 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/station_alert.dm b/code/game/machinery/computer/station_alert.dm index 35e80f54e7a..028be6e3a3d 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 Computer" + 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/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 148abdb51df..e1d096808ef 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -308,8 +308,15 @@ obj/item/weapon/circuitboard/rdserver "/obj/item/weapon/stock_parts/capacitor" = 2, "/obj/item/weapon/stock_parts/manipulator" = 1) -// Telecomms circuit boards: +/obj/item/weapon/circuitboard/smes + name = "Circuit Board (Superconductive Magnetic Energy Storage)" + build_path = "/obj/machinery/power/smes/buildable" + board_type = "machine" + origin_tech = "powerstorage=6;engineering=4" + frame_desc = "Requires 1 superconducting magnetic coil and 30 wires." + req_components = list("/obj/item/weapon/smes_component/coil" = 1, "/obj/item/stack/cable_coil" = 30) +// Telecomms circuit boards: /obj/item/weapon/circuitboard/telecomms/receiver name = "Circuit Board (Subspace Receiver)" build_path = "/obj/machinery/telecomms/receiver" @@ -392,7 +399,3 @@ obj/item/weapon/circuitboard/rdserver "/obj/item/weapon/stock_parts/subspace/filter" = 1, "/obj/item/weapon/stock_parts/subspace/crystal" = 1, "/obj/item/weapon/stock_parts/micro_laser/high" = 2) - - - - diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index b014ece92a6..04b8c5644ae 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -1,5 +1,5 @@ /obj/machinery/computer/teleporter - name = "Teleporter" + name = "Teleporter Control Console" desc = "Used to control a linked teleportation Hub and Station." icon_state = "teleport" circuit = "/obj/item/weapon/circuitboard/teleporter" diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm index 479c8f7d09a..ddff723806e 100644 --- a/code/game/mecha/mecha_parts.dm +++ b/code/game/mecha/mecha_parts.dm @@ -364,73 +364,54 @@ throw_speed = 3 throw_range = 15 - ripley +/obj/item/weapon/circuitboard/mecha/ripley origin_tech = "programming=3" - - ripley/peripherals +/obj/item/weapon/circuitboard/mecha/ripley/peripherals name = "Circuit board (Ripley Peripherals Control module)" icon_state = "mcontroller" - - ripley/main +/obj/item/weapon/circuitboard/mecha/ripley/main name = "Circuit board (Ripley Central Control module)" icon_state = "mainboard" - - gygax +/obj/item/weapon/circuitboard/mecha/gygax origin_tech = "programming=4" - - gygax/peripherals +/obj/item/weapon/circuitboard/mecha/gygax/peripherals name = "Circuit board (Gygax Peripherals Control module)" icon_state = "mcontroller" - - gygax/targeting +/obj/item/weapon/circuitboard/mecha/gygax/targeting name = "Circuit board (Gygax Weapon Control and Targeting module)" icon_state = "mcontroller" origin_tech = "programming=4;combat=4" - - gygax/main +/obj/item/weapon/circuitboard/mecha/gygax/main name = "Circuit board (Gygax Central Control module)" icon_state = "mainboard" - - durand +/obj/item/weapon/circuitboard/mecha/durand origin_tech = "programming=4" - - durand/peripherals +/obj/item/weapon/circuitboard/mecha/durand/peripherals name = "Circuit board (Durand Peripherals Control module)" icon_state = "mcontroller" - - durand/targeting +/obj/item/weapon/circuitboard/mecha/durand/targeting name = "Circuit board (Durand Weapon Control and Targeting module)" icon_state = "mcontroller" origin_tech = "programming=4;combat=4" - - durand/main +/obj/item/weapon/circuitboard/mecha/durand/main name = "Circuit board (Durand Central Control module)" icon_state = "mainboard" - - honker +/obj/item/weapon/circuitboard/mecha/honker origin_tech = "programming=4" - - honker/peripherals +/obj/item/weapon/circuitboard/mecha/honker/peripherals name = "Circuit board (H.O.N.K Peripherals Control module)" icon_state = "mcontroller" - - honker/targeting +/obj/item/weapon/circuitboard/mecha/honker/targeting name = "Circuit board (H.O.N.K Weapon Control and Targeting module)" icon_state = "mcontroller" - - honker/main +/obj/item/weapon/circuitboard/mecha/honker/main name = "Circuit board (H.O.N.K Central Control module)" icon_state = "mainboard" - - odysseus +/obj/item/weapon/circuitboard/mecha/odysseus origin_tech = "programming=3" - - odysseus/peripherals +/obj/item/weapon/circuitboard/mecha/odysseus/peripherals name = "Circuit board (Odysseus Peripherals Control module)" icon_state = "mcontroller" - - odysseus/main +/obj/item/weapon/circuitboard/mecha/odysseus/main name = "Circuit board (Odysseus Central Control module)" icon_state = "mainboard" - - diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index 349be88f5d2..0564cde442c 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -92,7 +92,7 @@ var/list/mechtoys = list( ..() /obj/machinery/computer/supplycomp - name = "Supply shuttle console" + name = "Supply Shuttle Console" icon = 'icons/obj/computer.dmi' icon_state = "supply" req_access = list(access_cargo) @@ -104,7 +104,7 @@ var/list/mechtoys = list( var/last_viewed_group = "categories" /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" diff --git a/code/modules/power/sensors/sensor_monitoring.dm b/code/modules/power/sensors/sensor_monitoring.dm index e3f39ede6dc..353eb761158 100644 --- a/code/modules/power/sensors/sensor_monitoring.dm +++ b/code/modules/power/sensors/sensor_monitoring.dm @@ -5,7 +5,7 @@ */ /obj/machinery/computer/power_monitor - name = "Power Monitor" + name = "Power Monitoring Console" desc = "Computer designed to remotely monitor power levels around the station" icon = 'icons/obj/computer.dmi' icon_state = "power" diff --git a/code/modules/power/smes_construction.dm b/code/modules/power/smes_construction.dm index 72687dfcf62..1c15c046a08 100644 --- a/code/modules/power/smes_construction.dm +++ b/code/modules/power/smes_construction.dm @@ -1,20 +1,8 @@ -// Constructable SMES version. Based on Coils. Each SMES can hold 6 Coils by default. -// Each coil adds 250kW I/O and 5M capacity. -// This is second version, now subtype of regular SMES. +// Constructable SMES version (based on SMES Coils) - -//Board -/obj/item/weapon/circuitboard/smes - name = "Circuit board (SMES Cell)" - build_path = "/obj/machinery/power/smes/buildable" - board_type = "machine" - origin_tech = "powerstorage=6;engineering=4" // Board itself is high tech. Coils have to be ordered from cargo or salvaged from existing SMESs. - frame_desc = "Requires 1 superconducting magnetic coil and 30 wires." - req_components = list("/obj/item/weapon/smes_coil" = 1, "/obj/item/stack/cable_coil" = 30) - -//Construction Item +//Construction Items /obj/item/weapon/smes_coil - name = "Superconducting Magnetic Coil" + name = "Superconductive Magnetic Coil" desc = "Heavy duty superconducting magnetic coil, mainly used in construction of SMES units." icon = 'icons/obj/stock_parts.dmi' icon_state = "smes_coil" // Just few icons patched together. If someone wants to make better icon, feel free to do so! @@ -22,9 +10,6 @@ var/ChargeCapacity = 5000000 var/IOCapacity = 250000 - - - // SMES itself /obj/machinery/power/smes/buildable var/max_coils = 6 //30M capacity, 1.5MW input/output when fully upgraded /w default coils diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index f52ca5cb16d..eaa1474cf52 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -68,8 +68,8 @@ datum/design/proc/CalcReliability(var/list/temp_techs) ///////////////////Computer Boards/////////////////////////////////// datum/design/seccamera - name = "Circuit Design (Security)" - desc = "Allows for the construction of circuit boards used to build security camera computers." + name = "Circuit Design (Security Camera Monitor)" + desc = "Allows for the construction of circuit boards used to build a Security Camera Monitor." id = "seccamera" req_tech = list("programming" = 2) build_type = IMPRINTER @@ -78,7 +78,7 @@ datum/design/seccamera datum/design/aicore name = "Circuit Design (AI Core)" - desc = "Allows for the construction of circuit boards used to build new AI cores." + desc = "Allows for the construction of circuit boards used to build AI cores." id = "aicore" req_tech = list("programming" = 4, "biotech" = 3) build_type = IMPRINTER @@ -87,7 +87,7 @@ datum/design/aicore datum/design/aiupload name = "Circuit Design (AI Upload)" - desc = "Allows for the construction of circuit boards used to build an AI Upload Console." + desc = "Allows for the construction of circuit boards used to build an AI Upload console." id = "aiupload" req_tech = list("programming" = 4) build_type = IMPRINTER @@ -96,7 +96,7 @@ datum/design/aiupload datum/design/borgupload name = "Circuit Design (Cyborg Upload)" - desc = "Allows for the construction of circuit boards used to build a Cyborg Upload Console." + desc = "Allows for the construction of circuit boards used to build a Cyborg Upload console." id = "borgupload" req_tech = list("programming" = 4) build_type = IMPRINTER @@ -105,7 +105,7 @@ datum/design/borgupload datum/design/med_data name = "Circuit Design (Medical Records)" - desc = "Allows for the construction of circuit boards used to build a medical records console." + desc = "Allows for the construction of circuit boards used to build a Medical Records console." id = "med_data" req_tech = list("programming" = 2) build_type = IMPRINTER @@ -113,8 +113,8 @@ datum/design/med_data build_path = /obj/item/weapon/circuitboard/med_data datum/design/operating - name = "Circuit Design (Operating Computer)" - desc = "Allows for the construction of circuit boards used to build an operating computer console." + name = "Circuit Design (Patient Monitoring)" + desc = "Allows for the construction of circuit boards used to build a Patient Monitoring console." id = "operating" req_tech = list("programming" = 2, "biotech" = 2) build_type = IMPRINTER @@ -132,7 +132,7 @@ datum/design/pandemic datum/design/scan_console name = "Circuit Design (DNA Machine)" - desc = "Allows for the construction of circuit boards used to build a new DNA scanning console." + desc = "Allows for the construction of circuit boards used to build a DNA scanning console." id = "scan_console" req_tech = list("programming" = 2, "biotech" = 3) build_type = IMPRINTER @@ -149,8 +149,8 @@ datum/design/comconsole build_path = /obj/item/weapon/circuitboard/communications datum/design/idcardconsole - name = "Circuit Design (ID Computer)" - desc = "Allows for the construction of circuit boards used to build an ID computer." + name = "Circuit Design (ID Card Modification)" + desc = "Allows for the construction of circuit boards used to build an ID Card Modification console." id = "idcardconsole" req_tech = list("programming" = 2) build_type = IMPRINTER @@ -158,8 +158,8 @@ datum/design/idcardconsole build_path = /obj/item/weapon/circuitboard/card datum/design/crewconsole - name = "Circuit Design (Crew monitoring computer)" - desc = "Allows for the construction of circuit boards used to build a Crew monitoring computer." + name = "Circuit Design (Crew Monitoring)" + desc = "Allows for the construction of circuit boards used to build a Crew Monitoring console." id = "crewconsole" req_tech = list("programming" = 3, "magnets" = 2, "biotech" = 2) build_type = IMPRINTER @@ -167,8 +167,8 @@ datum/design/crewconsole build_path = /obj/item/weapon/circuitboard/crew datum/design/teleconsole - name = "Circuit Design (Teleporter Console)" - desc = "Allows for the construction of circuit boards used to build a teleporter control console." + name = "Circuit Design (Teleporter Control)" + desc = "Allows for the construction of circuit boards used to build a Teleporter Control console." id = "teleconsole" req_tech = list("programming" = 3, "bluespace" = 2) build_type = IMPRINTER @@ -176,8 +176,8 @@ datum/design/teleconsole build_path = /obj/item/weapon/circuitboard/teleporter datum/design/secdata - name = "Circuit Design (Security Records Console)" - desc = "Allows for the construction of circuit boards used to build a security records console." + name = "Circuit Design (Security Records)" + desc = "Allows for the construction of circuit boards used to build a Security Records console." id = "secdata" req_tech = list("programming" = 2) build_type = IMPRINTER @@ -186,7 +186,7 @@ datum/design/secdata datum/design/atmosalerts name = "Circuit Design (Atmosphere Alert)" - desc = "Allows for the construction of circuit boards used to build an atmosphere alert console.." + desc = "Allows for the construction of circuit boards used to build an Atmosphere Alert console." id = "atmosalerts" req_tech = list("programming" = 2) build_type = IMPRINTER @@ -194,8 +194,8 @@ datum/design/atmosalerts build_path = /obj/item/weapon/circuitboard/atmos_alert datum/design/air_management - name = "Circuit Design (Atmospheric Monitor)" - desc = "Allows for the construction of circuit boards used to build an Atmospheric Monitor." + name = "Circuit Design (Atmosphere Monitoring)" + desc = "Allows for the construction of circuit boards used to build an Atmosphere Monitoring console." id = "air_management" req_tech = list("programming" = 2) build_type = IMPRINTER @@ -203,17 +203,17 @@ datum/design/air_management build_path = /obj/item/weapon/circuitboard/air_management datum/design/rcon_console - name = "Circuit Design (RCON Console)" - desc = "Allows for the construction of circuit boards used to build an RCON Remote Control Console." + name = "Circuit Design (RCON Remote Control)" + desc = "Allows for the construction of circuit boards used to build a RCON Remote Control console." id = "rcon_console" - req_tech = list("programming" = 4, "engineering" = 3, "powerstorage" = 5) + req_tech = list("programming" = 3, "engineering" = 3, "powerstorage" = 2, "bluespace" = 1) build_type = IMPRINTER materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/rcon_console /* Uncomment if someone makes these buildable datum/design/general_alert - name = "Circuit Design (General Alert Console)" + name = "Circuit Design (General Alert)" desc = "Allows for the construction of circuit boards used to build a General Alert console." id = "general_alert" req_tech = list("programming" = 2) @@ -223,7 +223,7 @@ datum/design/general_alert */ datum/design/robocontrol - name = "Circuit Design (Robotics Control Console)" + name = "Circuit Design (Robotics Control)" desc = "Allows for the construction of circuit boards used to build a Robotics Control console." id = "robocontrol" req_tech = list("programming" = 4) @@ -232,7 +232,7 @@ datum/design/robocontrol build_path = /obj/item/weapon/circuitboard/robotics datum/design/dronecontrol - name = "Circuit Design (Drone Control Console)" + name = "Circuit Design (Drone Control)" desc = "Allows for the construction of circuit boards used to build a Drone Control console." id = "dronecontrol" req_tech = list("programming" = 4) @@ -241,8 +241,8 @@ datum/design/dronecontrol build_path = /obj/item/weapon/circuitboard/drone_control datum/design/clonecontrol - name = "Circuit Design (Cloning Machine Console)" - desc = "Allows for the construction of circuit boards used to build a new Cloning Machine console." + name = "Circuit Design (Cloning Control)" + desc = "Allows for the construction of circuit boards used to build a Cloning Control console." id = "clonecontrol" req_tech = list("programming" = 3, "biotech" = 3) build_type = IMPRINTER @@ -251,7 +251,7 @@ datum/design/clonecontrol datum/design/clonepod name = "Circuit Design (Clone Pod)" - desc = "Allows for the construction of circuit boards used to build a Cloning Pod." + desc = "Allows for the construction of circuit boards used to build a Clone Pod." id = "clonepod" req_tech = list("programming" = 3, "biotech" = 3) build_type = IMPRINTER @@ -269,7 +269,7 @@ datum/design/clonescanner datum/design/arcademachine name = "Circuit Design (Arcade Machine)" - desc = "Allows for the construction of circuit boards used to build a new arcade machine." + desc = "Allows for the construction of circuit boards used to build an Arcade Machine." id = "arcademachine" req_tech = list("programming" = 1) build_type = IMPRINTER @@ -277,8 +277,8 @@ datum/design/arcademachine build_path = /obj/item/weapon/circuitboard/arcade datum/design/powermonitor - name = "Circuit Design (Power Monitor)" - desc = "Allows for the construction of circuit boards used to build a new power monitor" + name = "Circuit Design (Power Monitoring)" + desc = "Allows for the construction of circuit boards used to build a Power Monitoring console" id = "powermonitor" req_tech = list("programming" = 2) build_type = IMPRINTER @@ -287,7 +287,7 @@ datum/design/powermonitor datum/design/solarcontrol name = "Circuit Design (Solar Control)" - desc = "Allows for the construction of circuit boards used to build a solar control console" + desc = "Allows for the construction of circuit boards used to build a Solar Control console" id = "solarcontrol" req_tech = list("programming" = 2, "powerstorage" = 2) build_type = IMPRINTER @@ -295,8 +295,8 @@ datum/design/solarcontrol build_path = /obj/item/weapon/circuitboard/solar_control datum/design/prisonmanage - name = "Circuit Design (Prisoner Management Console)" - desc = "Allows for the construction of circuit boards used to build a prisoner management console." + name = "Circuit Design (Prisoner Management)" + desc = "Allows for the construction of circuit boards used to build a Prisoner Management console." id = "prisonmanage" req_tech = list("programming" = 2) build_type = IMPRINTER @@ -304,8 +304,8 @@ datum/design/prisonmanage build_path = /obj/item/weapon/circuitboard/prisoner datum/design/mechacontrol - name = "Circuit Design (Exosuit Control Console)" - desc = "Allows for the construction of circuit boards used to build an exosuit control console." + name = "Circuit Design (Exosuit Control)" + desc = "Allows for the construction of circuit boards used to build an Exosuit Control console." id = "mechacontrol" req_tech = list("programming" = 3) build_type = IMPRINTER @@ -313,8 +313,8 @@ datum/design/mechacontrol build_path = /obj/item/weapon/circuitboard/mecha_control datum/design/mechapower - name = "Circuit Design (Mech Bay Power Control Console)" - desc = "Allows for the construction of circuit boards used to build a mech bay power control console." + name = "Circuit Design (Mech Bay Power Control)" + desc = "Allows for the construction of circuit boards used to build a Mech Bay Power Control console." id = "mechapower" req_tech = list("programming" = 2, "powerstorage" = 3) build_type = IMPRINTER @@ -322,8 +322,8 @@ datum/design/mechapower build_path = /obj/item/weapon/circuitboard/mech_bay_power_console datum/design/rdconsole - name = "Circuit Design (R&D Console)" - desc = "Allows for the construction of circuit boards used to build a new R&D console." + name = "Circuit Design (R&D Control)" + desc = "Allows for the construction of circuit boards used to build a R&D Control console." id = "rdconsole" req_tech = list("programming" = 4) build_type = IMPRINTER @@ -331,8 +331,8 @@ datum/design/rdconsole build_path = /obj/item/weapon/circuitboard/rdconsole datum/design/ordercomp - name = "Circuit Design (Supply ordering console)" - desc = "Allows for the construction of circuit boards used to build a Supply ordering console." + name = "Circuit Design (Supply Ordering)" + desc = "Allows for the construction of circuit boards used to build a Supply Ordering console." id = "ordercomp" req_tech = list("programming" = 2) build_type = IMPRINTER @@ -340,8 +340,8 @@ datum/design/ordercomp build_path = /obj/item/weapon/circuitboard/ordercomp datum/design/supplycomp - name = "Circuit Design (Supply shuttle console)" - desc = "Allows for the construction of circuit boards used to build a Supply shuttle console." + name = "Circuit Design (Supply Shuttle)" + desc = "Allows for the construction of circuit boards used to build a Supply Shuttle console." id = "supplycomp" req_tech = list("programming" = 3) build_type = IMPRINTER @@ -349,8 +349,8 @@ datum/design/supplycomp build_path = /obj/item/weapon/circuitboard/supplycomp datum/design/comm_monitor - name = "Circuit Design (Telecommunications Monitoring Console)" - desc = "Allows for the construction of circuit boards used to build a telecommunications monitor." + name = "Circuit Design (Telecommunications Monitoring)" + desc = "Allows for the construction of circuit boards used to build a Telecommunications Monitor console." id = "comm_monitor" req_tech = list("programming" = 3) build_type = IMPRINTER @@ -358,8 +358,8 @@ datum/design/comm_monitor build_path = /obj/item/weapon/circuitboard/comm_monitor datum/design/comm_server - name = "Circuit Design (Telecommunications Server Monitoring Console)" - desc = "Allows for the construction of circuit boards used to build a telecommunication server browser and monitor." + name = "Circuit Design (Telecommunications Server Monitoring)" + desc = "Allows for the construction of circuit boards used to build a Telecommunication Server Monitoring console." id = "comm_server" req_tech = list("programming" = 3) build_type = IMPRINTER @@ -384,16 +384,6 @@ datum/design/aifixer materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/aifixer -// VERY VERY EXPENSIVE (needs diamonds and stuff) -datum/design/smes_cell - name = "Circuit Design (SMES Cell)" - desc = "Allows for the construction of circuit boards used to build an SMES Cell." - id = "smes_cell" - req_tech = list("powerstorage" = 7, "engineering" = 5) // Higher than obtained by deconstructing existing boards. Needs more RnD effor to make - build_type = IMPRINTER - materials = list("$glass" = 4000, "sacid" = 40, "$gold" = 1000, "$silver" = 1000, "$diamond" = 500) - build_path = /obj/item/weapon/circuitboard/smes - /////////////////////////////////// //////////AI Module Disks////////// /////////////////////////////////// @@ -1077,7 +1067,9 @@ datum/design/super_matter_bin reliability_base = 75 build_path = /obj/item/weapon/stock_parts/matter_bin/super - +///////////////////////////////////////// +//////////Tcommsat Stock Parts/////////// +///////////////////////////////////////// datum/design/subspace_ansible name = "Subspace Ansible" @@ -1334,6 +1326,14 @@ datum/design/batteryrack materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/batteryrack +datum/design/smes_cell + name = "Circuit Design (Superconductive Magnetic Energy Storage)" + desc = "Allows for the construction of circuit boards used to build a SMES." + id = "smes_cell" + req_tech = list("powerstorage" = 7, "engineering" = 5) + build_type = IMPRINTER + materials = list("$glass" = 2000, "sacid" = 20, "$gold" = 1000, "$silver" = 1000, "$diamond" = 500) + build_path = /obj/item/weapon/circuitboard/smes ///////////////////////////////////////// ////////////Medical Tools//////////////// From 94a93ac97d4c36053739b092c6706e021e3a848e Mon Sep 17 00:00:00 2001 From: Amunak Date: Thu, 11 Dec 2014 11:27:01 +0100 Subject: [PATCH 02/35] Reverted accidental changes to SMES building and RCON research --- code/game/machinery/constructable_frame.dm | 2 +- code/modules/research/designs.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index e1d096808ef..78c7b309b65 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -314,7 +314,7 @@ obj/item/weapon/circuitboard/rdserver board_type = "machine" origin_tech = "powerstorage=6;engineering=4" frame_desc = "Requires 1 superconducting magnetic coil and 30 wires." - req_components = list("/obj/item/weapon/smes_component/coil" = 1, "/obj/item/stack/cable_coil" = 30) + req_components = list("/obj/item/weapon/smees_coil" = 1, "/obj/item/stack/cable_coil" = 30) // Telecomms circuit boards: /obj/item/weapon/circuitboard/telecomms/receiver diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index eaa1474cf52..932f9836ad5 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -206,7 +206,7 @@ datum/design/rcon_console name = "Circuit Design (RCON Remote Control)" desc = "Allows for the construction of circuit boards used to build a RCON Remote Control console." id = "rcon_console" - req_tech = list("programming" = 3, "engineering" = 3, "powerstorage" = 2, "bluespace" = 1) + req_tech = list("programming" = 4, "engineering" = 3, "powerstorage" = 5) build_type = IMPRINTER materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/rcon_console From ddc598702c2315aa80add0cca019aabff33d22cc Mon Sep 17 00:00:00 2001 From: Amunak Date: Thu, 11 Dec 2014 11:31:47 +0100 Subject: [PATCH 03/35] Fixed typo. Apparently I'm bad with letters. --- code/game/machinery/constructable_frame.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 78c7b309b65..085550f61dc 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -314,7 +314,7 @@ obj/item/weapon/circuitboard/rdserver board_type = "machine" origin_tech = "powerstorage=6;engineering=4" frame_desc = "Requires 1 superconducting magnetic coil and 30 wires." - req_components = list("/obj/item/weapon/smees_coil" = 1, "/obj/item/stack/cable_coil" = 30) + req_components = list("/obj/item/weapon/smes_coil" = 1, "/obj/item/stack/cable_coil" = 30) // Telecomms circuit boards: /obj/item/weapon/circuitboard/telecomms/receiver From 6419f3426eb7c2c4ec0f143c754ac74a11202a4d Mon Sep 17 00:00:00 2001 From: Amunak Date: Sat, 13 Dec 2014 07:02:54 +0100 Subject: [PATCH 04/35] Destructor now asks for confirmation using alert instead of list --- code/modules/research/rdconsole.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 7299f801bef..0cd7eb9c61b 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -250,8 +250,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, if(linked_destroy.busy) usr << "\red The destructive analyzer is busy at the moment." else - var/choice = input("Proceeding will destroy loaded item.") in list("Proceed", "Cancel") - if(choice == "Cancel" || !linked_destroy) return + if(alert("Proceeding will destroy loaded item. Continue?", "Destructive analyzer confirmation", "Yes", "No") == "No" || !linked_destroy) return linked_destroy.busy = 1 screen = 0.1 updateUsrDialog() From 6e15257df94286bf49f0318b73a7a7e2bf351c10 Mon Sep 17 00:00:00 2001 From: Amunak Date: Sat, 13 Dec 2014 07:06:42 +0100 Subject: [PATCH 05/35] R&D console refactor, formatting and output format improvements --- code/modules/research/rdconsole.dm | 259 +++++++++++++++-------------- 1 file changed, 135 insertions(+), 124 deletions(-) diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 0cd7eb9c61b..4b379f9066a 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -50,9 +50,6 @@ won't update every console in existence) but it's more of a hassle to do. Also, req_access = list(access_research) //Data and setting manipulation requires scientist access. - - - /obj/machinery/computer/rdconsole/proc/CallTechName(var/ID) //A simple helper proc to find the name of a tech with a given ID. var/datum/tech/check_tech var/return_name = null @@ -125,7 +122,6 @@ won't update every console in existence) but it's more of a hassle to do. Also, C.files.AddDesign2Known(D) C.files.RefreshResearch() - /obj/machinery/computer/rdconsole/New() ..() files = new /datum/research(src) //Setup the research data holder. @@ -440,7 +436,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, linked_lathe.reagents.clear_reagents() else if(href_list["lathe_ejectsheet"] && linked_lathe) //Causes the protolathe to eject a sheet of material - var/desired_num_sheets = text2num(href_list["lathe_ejectsheet_amt"]) + var/desired_num_sheets = text2num(href_list["amount"]) var/res_amount, type switch(href_list["lathe_ejectsheet"]) if("metal") @@ -474,7 +470,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, else del sheet else if(href_list["imprinter_ejectsheet"] && linked_imprinter) //Causes the protolathe to eject a sheet of material - var/desired_num_sheets = text2num(href_list["imprinter_ejectsheet_amt"]) + var/desired_num_sheets = text2num(href_list["amount"]) var/res_amount, type switch(href_list["imprinter_ejectsheet"]) if("glass") @@ -576,22 +572,37 @@ won't update every console in existence) but it's more of a hassle to do. Also, if(1.0) //Main Menu dat += "Main Menu:

" - dat += "Current Research Levels
" - if(t_disk) dat += "Disk Operations
" - else if(d_disk) dat += "Disk Operations
" - else dat += "(Please Insert Disk)
" - if(linked_destroy != null) dat += "Destructive Analyzer Menu
" - if(linked_lathe != null) dat += "Protolathe Construction Menu
" - if(linked_imprinter != null) dat += "Circuit Construction Menu
" - dat += "Settings" + dat += "Loaded disk: " + dat += (t_disk || d_disk) ? (t_disk ? "technology storage disk" : "design storage disk") : "none" + dat += "
" if(1.1) //Research viewer + dat += "Main Menu
" dat += "Current Research Levels:

" + dat += "
    " for(var/datum/tech/T in files.known_tech) - dat += "[T.name]
    " - dat += "* Level: [T.level]
    " - dat += "* Summary: [T.desc]
    " - dat += "Main Menu" + dat += "
  • " + dat += "[T.name]" + dat += "
      " + dat += "
    • Level: [T.level]
      • " + dat += "
    • Summary: [T.desc]
      • " + dat += "
    • " + dat += "
" if(1.2) //Technology Disk Menu @@ -614,9 +625,11 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += "
Main Menu || " dat += "Return to Disk Operations
" dat += "Load Technology to Disk:

" + dat += "
    " for(var/datum/tech/T in files.known_tech) - dat += "[T.name] " - dat += "(Copy to Disk)
    " + dat += "
  • [T.name] " + dat += "\[copy to disk\]" + dat += "
" if(1.4) //Design Disk menu. dat += "Main Menu
" @@ -644,13 +657,16 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += "Main Menu || " dat += "Return to Disk Operations
" dat += "Load Design to Disk:

" + dat += "
    " for(var/datum/design/D in files.known_designs) - dat += "[D.name] " - dat += "(Copy to Disk)
    " + if(D.build_path) + dat += "
  • [D.name] " + dat += "\[copy to disk\]" + dat += "
" if(1.6) //R&D console settings dat += "Main Menu
" - dat += "R&D Console Setting:

" + dat += "R&D Console Setting:
" if(sync) dat += "Sync Database with Network
" dat += "Disconnect from Research Network
" @@ -662,40 +678,44 @@ won't update every console in existence) but it's more of a hassle to do. Also, if(1.7) //R&D device linkage dat += "Main Menu || " - dat += "Settings Menu
" + dat += "Settings Menu
" dat += "R&D Console Device Linkage Menu:

" - dat += "Re-sync with Nearby Devices
" - dat += "Linked Devices:
" + dat += "Re-sync with Nearby Devices
" + dat += "Linked Devices:" + dat += "
    " if(linked_destroy) - dat += "* Destructive Analyzer (Disconnect)
    " + dat += "
  • Destructive Analyzer (Disconnect)
    • " else - dat += "* (No Destructive Analyzer Linked)
    " + dat += "
  • (No Destructive Analyzer Linked)
    • " if(linked_lathe) - dat += "* Protolathe (Disconnect)
    " + dat += "
  • Protolathe (Disconnect)
    • " else - dat += "* (No Protolathe Linked)
    " + dat += "
  • (No Protolathe Linked)
    • " if(linked_imprinter) - dat += "* Circuit Imprinter (Disconnect)
    " + dat += "
  • Circuit Imprinter (Disconnect)
    • " else - dat += "* (No Circuit Imprinter Linked)
    " + dat += "
  • (No Circuit Imprinter Linked)
    • " + dat += "
" ////////////////////DESTRUCTIVE ANALYZER SCREENS//////////////////////////// if(2.0) + dat += "Main Menu
" dat += "NO DESTRUCTIVE ANALYZER LINKED TO CONSOLE

" - dat += "Main Menu" if(2.1) + dat += "Main Menu
" dat += "No Item Loaded. Standing-by...
" - dat += "Main Menu" if(2.2) dat += "Main Menu
" dat += "Deconstruction Menu
" dat += "Name: [linked_destroy.loaded_item.name]
" - dat += "Origin Tech:
" + dat += "Origin Tech:" + dat += "
    " var/list/temp_tech = linked_destroy.ConvertReqString2List(linked_destroy.loaded_item.origin_tech) for(var/T in temp_tech) - dat += "* [CallTechName(T)] [temp_tech[T]]
    " + dat += "
  • [CallTechName(T)] [temp_tech[T]]
    • " + dat += "
" dat += "
Deconstruct Item || " dat += "Eject Item || " @@ -711,13 +731,14 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += "Protolathe Menu:

" dat += "Material Amount: [linked_lathe.TotalMaterials()] cm3 (MAX: [linked_lathe.max_material_storage])
" dat += "Chemical Volume: [linked_lathe.reagents.total_volume] (MAX: [linked_lathe.reagents.maximum_volume])
" + dat += "
    " for(var/datum/design/D in files.known_designs) - if(!(D.build_type & PROTOLATHE)) + if(!D.build_path || !(D.build_type & PROTOLATHE)) continue - var/temp_dat = "[D.name]" + var/temp_dat var/check_materials = 1 for(var/M in D.materials) - temp_dat += " [D.materials[M]] [CallMaterialName(M)]" + temp_dat += ", [D.materials[M]] [CallMaterialName(M)]" if(copytext(M, 1, 2) == "$") switch(M) if("$glass") @@ -736,64 +757,52 @@ won't update every console in existence) but it's more of a hassle to do. Also, if(D.materials[M] > linked_lathe.diamond_amount) check_materials = 0 else if (!linked_lathe.reagents.has_reagent(M, D.materials[M])) check_materials = 0 + if(temp_dat) + temp_dat = " \[[copytext(temp_dat,3)]\]" if (check_materials) - dat += "* [temp_dat]
    " + dat += "
  • [D.name][temp_dat]
    • " else - dat += "* [temp_dat]
    " + dat += "
  • [D.name][temp_dat]
    • " + dat += "
" if(3.2) //Protolathe Material Storage Sub-menu dat += "Main Menu || " dat += "Protolathe Menu
" dat += "Material Storage
" - //Metal - dat += "* [linked_lathe.m_amount] cm3 of Metal || " - dat += "Eject: " - if(linked_lathe.m_amount >= 3750) dat += "(1 Sheet) " - if(linked_lathe.m_amount >= 18750) dat += "(5 Sheets) " - if(linked_lathe.m_amount >= 3750) dat += "(Max Sheets)" - dat += "
" - //Glass - dat += "* [linked_lathe.g_amount] cm3 of Glass || " - dat += "Eject: " - if(linked_lathe.g_amount >= 3750) dat += "(1 Sheet) " - if(linked_lathe.g_amount >= 18750) dat += "(5 Sheets) " - if(linked_lathe.g_amount >= 3750) dat += "(Max Sheets)" - dat += "
" - //Gold - dat += "* [linked_lathe.gold_amount] cm3 of Gold || " - dat += "Eject: " - if(linked_lathe.gold_amount >= 2000) dat += "(1 Sheet) " - if(linked_lathe.gold_amount >= 10000) dat += "(5 Sheets) " - if(linked_lathe.gold_amount >= 2000) dat += "(Max Sheets)" - dat += "
" - //Silver - dat += "* [linked_lathe.silver_amount] cm3 of Silver || " - dat += "Eject: " - if(linked_lathe.silver_amount >= 2000) dat += "(1 Sheet) " - if(linked_lathe.silver_amount >= 10000) dat += "(5 Sheets) " - if(linked_lathe.silver_amount >= 2000) dat += "(Max Sheets)" - dat += "
" - //Phoron - dat += "* [linked_lathe.phoron_amount] cm3 of Solid Phoron || " - dat += "Eject: " - if(linked_lathe.phoron_amount >= 2000) dat += "(1 Sheet) " - if(linked_lathe.phoron_amount >= 10000) dat += "(5 Sheets) " - if(linked_lathe.phoron_amount >= 2000) dat += "(Max Sheets)" - dat += "
" - //Uranium - dat += "* [linked_lathe.uranium_amount] cm3 of Uranium || " - dat += "Eject: " - if(linked_lathe.uranium_amount >= 2000) dat += "(1 Sheet) " - if(linked_lathe.uranium_amount >= 10000) dat += "(5 Sheets) " - if(linked_lathe.uranium_amount >= 2000) dat += "(Max Sheets)" - dat += "
" - //Diamond - dat += "* [linked_lathe.diamond_amount] cm3 of Diamond || " - dat += "Eject: " - if(linked_lathe.diamond_amount >= 2000) dat += "(1 Sheet) " - if(linked_lathe.diamond_amount >= 10000) dat += "(5 Sheets) " - if(linked_lathe.diamond_amount >= 2000) dat += "(Max Sheets)" - dat += "
" + dat += "
    " + for(var/M in list("metal", "glass", "gold", "silver", "phoron", "uranium", "diamond")) + var/amount + var/sheetsize = 2000 + switch(M) + if("metal") + amount = linked_lathe.m_amount + sheetsize = 3750 + if("glass") + amount = linked_lathe.g_amount + sheetsize = 3750 + if("gold") + amount = linked_lathe.gold_amount + if("silver") + amount = linked_lathe.silver_amount + if("phoron") + amount = linked_lathe.phoron_amount + if("uranium") + amount = linked_lathe.uranium_amount + if("diamond") + amount = linked_lathe.diamond_amount + else + continue + dat += "
  • [capitalize(M)]: [amount] cm3" + if(amount >= sheetsize) + dat += " || Eject " + for (var/C in list(1,3,5,10,15,20,25,30,40)) + if(amount < C * sheetsize) + break + dat += "[C > 1 ? ", " : ""][C] " + + dat += " or max sheets" + dat += "
    • " + dat += "
" if(3.3) //Protolathe Chemical Storage Submenu dat += "Main Menu || " @@ -816,14 +825,14 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += "Circuit Imprinter Menu:

" dat += "Material Amount: [linked_imprinter.TotalMaterials()] cm3
" dat += "Chemical Volume: [linked_imprinter.reagents.total_volume]
" - + dat += "
    " for(var/datum/design/D in files.known_designs) - if(!(D.build_type & IMPRINTER)) + if(!D.build_path || !(D.build_type & IMPRINTER)) continue - var/temp_dat = "[D.name]" + var/temp_dat var/check_materials = 1 for(var/M in D.materials) - temp_dat += " [D.materials[M]] [CallMaterialName(M)]" + temp_dat += ", [D.materials[M]] [CallMaterialName(M)]" if(copytext(M, 1, 2) == "$") switch(M) if("$glass") @@ -836,10 +845,13 @@ won't update every console in existence) but it's more of a hassle to do. Also, if(D.materials[M] > linked_imprinter.uranium_amount) check_materials = 0 else if (!linked_imprinter.reagents.has_reagent(M, D.materials[M])) check_materials = 0 + if(temp_dat) + temp_dat = " \[[copytext(temp_dat,3)]\]" if (check_materials) - dat += "* [temp_dat]
    " + dat += "
  • [D.name][temp_dat]
    • " else - dat += "* [temp_dat]
    " + dat += "
  • [D.name][temp_dat]
    • " + dat += "
" if(4.2) dat += "Main Menu || " @@ -854,35 +866,34 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += "Main Menu || " dat += "Circuit Imprinter Menu
" dat += "Material Storage
" - //Glass - dat += "* [linked_imprinter.g_amount] cm3 of Glass || " - dat += "Eject: " - if(linked_imprinter.g_amount >= 3750) dat += "(1 Sheet) " - if(linked_imprinter.g_amount >= 18750) dat += "(5 Sheets) " - if(linked_imprinter.g_amount >= 3750) dat += "(Max Sheets)" - dat += "
" - //Gold - dat += "* [linked_imprinter.gold_amount] cm3 of Gold || " - dat += "Eject: " - if(linked_imprinter.gold_amount >= 2000) dat += "(1 Sheet) " - if(linked_imprinter.gold_amount >= 10000) dat += "(5 Sheets) " - if(linked_imprinter.gold_amount >= 2000) dat += "(Max Sheets)" - dat += "
" - //Diamond - dat += "* [linked_imprinter.diamond_amount] cm3 of Diamond || " - dat += "Eject: " - if(linked_imprinter.diamond_amount >= 2000) dat += "(1 Sheet) " - if(linked_imprinter.diamond_amount >= 10000) dat += "(5 Sheets) " - if(linked_imprinter.diamond_amount >= 2000) dat += "(Max Sheets)" - dat += "
" - //Uranium - dat += "* [linked_imprinter.uranium_amount] cm3 of Uranium || " - dat += "Eject: " - if(linked_imprinter.uranium_amount >= 2000) dat += "(1 Sheet) " - if(linked_imprinter.uranium_amount >= 10000) dat += "(5 Sheets) " - if(linked_imprinter.uranium_amount >= 2000) dat += "(Max Sheets)" + dat += "
    " + for(var/M in list("glass", "gold", "diamond", "uranium")) + var/amount + var/sheetsize = 2000 + switch(M) + if("glass") + amount = linked_imprinter.g_amount + sheetsize = 3750 + if("gold") + amount = linked_imprinter.gold_amount + if("diamond") + amount = linked_imprinter.diamond_amount + if("uranium") + amount = linked_imprinter.uranium_amount + dat += "
  • [capitalize(M)]: [amount] cm3" + if(amount >= sheetsize) + dat += " || Eject: " + for (var/C in list(1,3,5,10,15,20,25,30,40)) + if(amount < C * sheetsize) + break + dat += "[C > 1 ? ", " : ""][C] " - user << browse("Research and Development Console
    [dat]", "window=rdconsole;size=575x400") + dat += " or max sheets" + dat += "
    • " + dat += "
" + + + user << browse("Research and Development Console
[dat]", "window=rdconsole;size=850x600") onclose(user, "rdconsole") /obj/machinery/computer/rdconsole/robotics From b60e9eedbe0805f66c3b4c6988be76d540da82ec Mon Sep 17 00:00:00 2001 From: Amunak Date: Sat, 13 Dec 2014 07:08:39 +0100 Subject: [PATCH 06/35] Added detailed research information to R&D console It lists 'desc' of each researched and 'buildable' datum/design, which was a previously unobtainable information. And it's all-access (just like technology level listing). --- code/modules/research/rdconsole.dm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 4b379f9066a..dc490f869f3 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -576,6 +576,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += (t_disk || d_disk) ? (t_disk ? "technology storage disk" : "design storage disk") : "none" dat += "
" + ///////////////////Research Information Browser//////////////////// + if(5.0) + dat += "Main Menu
" + dat += "List of Researched Technologies and Designs:" + dat += "
    " + for(var/datum/design/D in files.known_designs) + if(D.build_path) + dat += "
  • [D.name]: [D.desc]
    • " + dat += "
" + user << browse("Research and Development Console
[dat]", "window=rdconsole;size=850x600") onclose(user, "rdconsole") From 41d81a14efa4a20f4aaa3d269dfdc284d3b83e14 Mon Sep 17 00:00:00 2001 From: Amunak Date: Sat, 13 Dec 2014 07:10:37 +0100 Subject: [PATCH 07/35] Buffed the research testing item, made more clear that it's for testing only. --- code/defines/obj/weapon.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 79074cfbe68..6d8392e4adf 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -629,9 +629,9 @@ icon = 'icons/obj/wizard.dmi' icon_state = "ectoplasm" -/obj/item/weapon/research//Makes testing much less of a pain -Sieve - name = "research" +/obj/item/weapon/research + name = "research debugging device" + desc = "Instant research tool. For testing purposes only." icon = 'icons/obj/stock_parts.dmi' - icon_state = "capacitor" - desc = "A debug item for research." - origin_tech = "materials=8;programming=8;magnets=8;powerstorage=8;bluespace=8;combat=8;biotech=8;syndicate=8;phorontech=8;engineering=8" + icon_state = "smes_coil" + origin_tech = "materials=19;programming=19;magnets=19;powerstorage=19;bluespace=19;combat=19;biotech=19;syndicate=19;phorontech=19;engineering=19" From d3237d69e7e6ad46a7ea0e3eee1c2b2b50770e13 Mon Sep 17 00:00:00 2001 From: Amunak Date: Sat, 13 Dec 2014 07:27:00 +0100 Subject: [PATCH 08/35] Updated circuitboard properties. Moved stuff from circuitboard/mecha to just circuitboard, since it is basically the same item and they should all have the same properties. --- code/game/machinery/computer/buildandrepair.dm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index b496cdc7eed..e2277045b0b 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -11,14 +11,19 @@ // weight = 1.0E8 /obj/item/weapon/circuitboard - 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" origin_tech = "programming=2" + density = 0 + anchored = 0 + w_class = 2.0 + flags = FPRINT | TABLEPASS | CONDUCT + force = 5.0 + throwforce = 5.0 + throw_speed = 3 + throw_range = 15 var/build_path = null var/board_type = "computer" var/list/req_components = null From c313a413efee6f1f54098a3e2fccc677974d404f Mon Sep 17 00:00:00 2001 From: Amunak Date: Sat, 13 Dec 2014 07:39:14 +0100 Subject: [PATCH 09/35] Added macro for computer boards to assemble their name. Adds the ability to change it from a single place. Also makes arguably cleaner code. Capitalization of nouns fixed. --- .../game/machinery/computer/buildandrepair.dm | 127 +++++++++--------- 1 file changed, 67 insertions(+), 60 deletions(-) diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index e2277045b0b..c9fca4f19bb 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -1,9 +1,14 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 +#ifdef T_BOARD +#error T_BOARD already defined elsewhere, we can't use it. +#endif +#define T_BOARD(name) "circuit board (" + (name) + ")" + /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 @@ -56,13 +61,13 @@ */ /obj/item/weapon/circuitboard/message_monitor - name = "Circuit board (Message Monitor Console)" + name = T_BOARD("message monitor console") build_path = /obj/machinery/computer/message_monitor origin_tech = "programming=3" //TODO: Move these into computer/camera.dm /obj/item/weapon/circuitboard/security - name = "Circuit board (Security Camera Monitor)" + name = T_BOARD("security camera monitor") build_path = /obj/machinery/computer/security var/network = list("SS13") req_access = list(access_security) @@ -78,81 +83,81 @@ network = C.network /obj/item/weapon/circuitboard/security/engineering - name = "Circuit board (Engineering Camera Monitor)" + name = T_BOARD("engineering camera monitor") build_path = /obj/machinery/computer/security/engineering network = list("Engineering","Power Alarms","Atmosphere Alarms","Fire Alarms") req_access = list() /obj/item/weapon/circuitboard/security/mining - name = "Circuit board (Mining Camera Monitor)" + name = T_BOARD("mining camera monitor") build_path = /obj/machinery/computer/security/mining network = list("MINE") req_access = list() /obj/item/weapon/circuitboard/aicore - name = "Circuit board (AI Core)" + name = T_BOARD("AI core") origin_tech = "programming=4;biotech=2" board_type = "other" /obj/item/weapon/circuitboard/aiupload - name = "Circuit board (AI Upload Console)" + name = T_BOARD("AI upload console") build_path = /obj/machinery/computer/aiupload origin_tech = "programming=4" /obj/item/weapon/circuitboard/borgupload - name = "Circuit board (Cyborg Upload Console)" + name = T_BOARD("cyborg upload console") build_path = /obj/machinery/computer/borgupload origin_tech = "programming=4" /obj/item/weapon/circuitboard/med_data - name = "Circuit board (Medical Records Console)" + name = T_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 = T_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 = T_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 Console)" + name = T_BOARD("communications console") build_path = /obj/machinery/computer/communications origin_tech = "programming=2;magnets=2" /obj/item/weapon/circuitboard/card - name = "Circuit board (ID Card Modification Console)" + name = T_BOARD("ID card modification console") build_path = /obj/machinery/computer/card /obj/item/weapon/circuitboard/card/centcom - name = "Circuit board (CentCom ID Card Modification Console)" + name = T_BOARD("CentCom ID card modification console") build_path = /obj/machinery/computer/card/centcom //obj/item/weapon/circuitboard/shield -// name = "Circuit board (Shield Control)" +// name = T_BOARD("Shield Control") // build_path = "/obj/machinery/computer/stationshield" /obj/item/weapon/circuitboard/teleporter - name = "Circuit board (Teleporter Control Console)" + name = T_BOARD("teleporter control console") 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 = T_BOARD("security records console") build_path = /obj/machinery/computer/secure_data /obj/item/weapon/circuitboard/skills - name = "Circuit board (Employment Records Console)" + name = T_BOARD("employment records console") build_path = /obj/machinery/computer/skills /obj/item/weapon/circuitboard/stationalert - name = "Circuit board (Station Alert Console)" + name = T_BOARD("station alert console") build_path = /obj/machinery/computer/station_alert ///obj/item/weapon/circuitboard/atmospheresiphonswitch -// name = "Circuit board (Atmosphere Siphon Control)" +// name = T_BOARD("Atmosphere Siphon Control") // build_path = /obj/machinery/computer/atmosphere/siphonswitch /obj/item/weapon/circuitboard/air_management - name = "Circuit board (Atmosphere Monitoring Console)" + name = T_BOARD("atmosphere monitoring console") build_path = /obj/machinery/computer/general_air_control var/frequency = 1439 /obj/item/weapon/circuitboard/air_management/tank_control - name = "Circuit board (Tank Control)" + name = T_BOARD("tank control") build_path = /obj/machinery/computer/general_air_control/large_tank_control frequency = 1441 /obj/item/weapon/circuitboard/air_management/supermatter_core - name = "Circuit board (Core Control)" + name = T_BOARD("core control") build_path = /obj/machinery/computer/general_air_control/supermatter_core frequency = 1438 /obj/item/weapon/circuitboard/air_management/injector_control - name = "Circuit board (Injector Control)" + name = T_BOARD("injector control") build_path = /obj/machinery/computer/general_air_control/fuel_injection /obj/item/weapon/circuitboard/air_management/construct(var/obj/machinery/computer/general_air_control/C) @@ -164,72 +169,72 @@ frequency = C.frequency /obj/item/weapon/circuitboard/atmos_alert - name = "Circuit board (Atmospheric Alert Console)" + name = T_BOARD("atmospheric alert console") build_path = /obj/machinery/computer/atmos_alert /obj/item/weapon/circuitboard/pod - name = "Circuit board (Massdriver control)" + name = T_BOARD("massdriver control") build_path = /obj/machinery/computer/pod /obj/item/weapon/circuitboard/robotics - name = "Circuit board (Robotics Control Console)" + name = T_BOARD("robotics control console") build_path = /obj/machinery/computer/robotics origin_tech = "programming=3" /obj/item/weapon/circuitboard/drone_control - name = "Circuit board (Drone Control Console)" + name = T_BOARD("drone control console") build_path = /obj/machinery/computer/drone_control origin_tech = "programming=3" /obj/item/weapon/circuitboard/cloning - name = "Circuit board (Cloning Control Console)" + name = T_BOARD("cloning control console") build_path = /obj/machinery/computer/cloning origin_tech = "programming=3;biotech=3" /obj/item/weapon/circuitboard/arcade - name = "Circuit board (Arcade Machine)" + name = T_BOARD("arcade machine") build_path = /obj/machinery/computer/arcade origin_tech = "programming=1" /obj/item/weapon/circuitboard/turbine_control - name = "Circuit board (Turbine Control Console)" + name = T_BOARD("turbine control console") build_path = /obj/machinery/computer/turbine_computer /obj/item/weapon/circuitboard/solar_control - name = "Circuit board (Solar Control Console)" + name = T_BOARD("solar control console") build_path = /obj/machinery/power/solar_control origin_tech = "programming=2;powerstorage=2" /obj/item/weapon/circuitboard/powermonitor - name = "Circuit board (Power Monitoring Console)" + name = T_BOARD("power monitoring console") build_path = /obj/machinery/computer/power_monitor /obj/item/weapon/circuitboard/olddoor - name = "Circuit board (DoorMex)" + name = T_BOARD("DoorMex") build_path = /obj/machinery/computer/pod/old /obj/item/weapon/circuitboard/syndicatedoor - name = "Circuit board (ProComp Executive)" + name = T_BOARD("ProComp Executive") build_path = /obj/machinery/computer/pod/old/syndicate /obj/item/weapon/circuitboard/swfdoor - name = "Circuit board (Magix)" + name = T_BOARD("Magix") build_path = /obj/machinery/computer/pod/old/swf /obj/item/weapon/circuitboard/prisoner - name = "Circuit board (Prisoner Management Console)" + name = T_BOARD("prisoner management console") build_path = /obj/machinery/computer/prisoner /obj/item/weapon/circuitboard/rdconsole - name = "Circuit Board (R&D Control Console)" + name = T_BOARD("R&D control console") build_path = /obj/machinery/computer/rdconsole/core /obj/item/weapon/circuitboard/mecha_control - name = "Circuit Board (Exosuit Control Console)" + name = T_BOARD("exosuit control console") build_path = /obj/machinery/computer/mecha /obj/item/weapon/circuitboard/rdservercontrol - name = "Circuit Board (R&D Server Control Console)" + name = T_BOARD("R&D server control console") build_path = /obj/machinery/computer/rdservercontrol /obj/item/weapon/circuitboard/crew - name = "Circuit board (Crew Monitoring Console)" + name = T_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 = T_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 = T_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 = T_BOARD("supply shuttle console") build_path = /obj/machinery/computer/supplycomp origin_tech = "programming=3" var/contraband_enabled = 0 @@ -243,58 +248,58 @@ contraband_enabled = SC.can_order_contraband /obj/item/weapon/circuitboard/operating - name = "Circuit board (Patient Monitoring Console)" + name = T_BOARD("patient monitoring console") build_path = /obj/machinery/computer/operating origin_tech = "programming=2;biotech=2" /obj/item/weapon/circuitboard/comm_monitor - name = "Circuit board (Telecommunications Monitor Console)" + name = T_BOARD("telecommunications monitor console") build_path = /obj/machinery/computer/telecomms/monitor origin_tech = "programming=3" /obj/item/weapon/circuitboard/comm_server - name = "Circuit board (Telecommunications Server Monitor Console)" + name = T_BOARD("telecommunications server monitor console") build_path = /obj/machinery/computer/telecomms/server origin_tech = "programming=3" /obj/item/weapon/circuitboard/comm_traffic - name = "Circuitboard (Telecommunications Traffic Control Console)" + name = T_BOARD("telecommunications traffic control console") build_path = /obj/machinery/computer/telecomms/traffic origin_tech = "programming=3" /obj/item/weapon/circuitboard/curefab - name = "Circuit board (Cure fab)" + name = T_BOARD("cure fabricator") build_path = /obj/machinery/computer/curer /obj/item/weapon/circuitboard/splicer - name = "Circuit board (Disease Splicer)" + name = T_BOARD("disease splicer") build_path = /obj/machinery/computer/diseasesplicer /obj/item/weapon/circuitboard/mining_shuttle - name = "Circuit board (Mining Shuttle Console)" + name = T_BOARD("mining shuttle console") build_path = /obj/machinery/computer/shuttle_control/mining origin_tech = "programming=2" /obj/item/weapon/circuitboard/engineering_shuttle - name = "Circuit board (Engineering Shuttle Console)" + name = T_BOARD("engineering shuttle console") build_path = /obj/machinery/computer/shuttle_control/engineering origin_tech = "programming=2" /obj/item/weapon/circuitboard/research_shuttle - name = "Circuit board (Research Shuttle Console)" + name = T_BOARD("research shuttle console") build_path = /obj/machinery/computer/shuttle_control/research 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 Console)" + name = T_BOARD("holodeck control console") build_path = /obj/machinery/computer/HolodeckControl origin_tech = "programming=4" /obj/item/weapon/circuitboard/aifixer - name = "Circuit board (AI Integrity Restorer)" + name = T_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 Console)" + name = T_BOARD("area air control console") build_path = /obj/machinery/computer/area_atmos origin_tech = "programming=2" /obj/item/weapon/circuitboard/prison_shuttle - name = "Circuit board (Prison Shuttle Console)" + name = T_BOARD("prison shuttle console") build_path = /obj/machinery/computer/prison_shuttle origin_tech = "programming=2" /obj/item/weapon/circuitboard/rcon_console - name = "Circuit board (RCON Remote Control Console)" + name = T_BOARD("RCON remote control console") build_path = /obj/machinery/computer/rcon origin_tech = "programming=4;engineering=3;powerstorage=5" @@ -358,11 +363,11 @@ if(istype(I,/obj/item/weapon/screwdriver)) user.visible_message("\blue \the [user] adjusts the jumper on the [src]'s access protocol pins.", "\blue You adjust the jumper on the access protocol pins.") if(src.build_path == /obj/machinery/computer/rdconsole/core) - src.name = "Circuit Board (RD Console - Robotics)" + src.name = T_BOARD("RD Console - Robotics") src.build_path = /obj/machinery/computer/rdconsole/robotics user << "\blue Access protocols set to robotics." else - src.name = "Circuit Board (RD Console)" + src.name = T_BOARD("RD Console") src.build_path = /obj/machinery/computer/rdconsole/core user << "\blue Access protocols set to default." return @@ -469,3 +474,5 @@ var/B = new src.circuit.build_path ( src.loc ) src.circuit.construct(B) del(src) + +#undef T_BOARD From 8961ee90140c4b4682f95323d9394290355e7411 Mon Sep 17 00:00:00 2001 From: Amunak Date: Sat, 13 Dec 2014 07:43:46 +0100 Subject: [PATCH 10/35] Refactoring designs.dm. They now use a better system of assigning names and descriptions. Removes the need to copypaste most of the lines. For now only computer boards were changed. Also attempt to do proper capitalization. --- code/modules/research/designs.dm | 309 +++++++++++-------------------- 1 file changed, 103 insertions(+), 206 deletions(-) diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index 932f9836ad5..7d9bc8cb706 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -35,23 +35,22 @@ other types of metals and chemistry for reagents). #define PROTOLATHE 2 //New stuff. Uses glass/metal/chemicals #define AUTOLATHE 4 //Uses glass/metal only. #define CRAFTLATHE 8 //Uses fuck if I know. For use eventually. -#define MECHFAB 16 //Remember, objects utilising this flag should have construction_time and construction_cost vars. +#define MECHFAB 16 //Remember, objects utilising this flag should have construction_time and construction_cost vars. //Note: More then one of these can be added to a design but imprinter and lathe designs are incompatable. datum/design //Datum for object designs, used in construction - var/name = "Name" //Name of the created object. - var/desc = "Desc" //Description of the created object. - var/id = "id" //ID of the created object for easy refernece. Alphanumeric, lower-case, no symbols - var/list/req_tech = list() //IDs of that techs the object originated from and the minimum level requirements. - var/reliability_mod = 0 //Reliability modifier of the device at it's starting point. - var/reliability_base = 100 //Base reliability of a device before modifiers. - var/reliability = 100 //Reliability of the device. - var/build_type = null //Flag as to what kind machine the design is built in. See defines. - var/list/materials = list() //List of materials. Format: "id" = amount. - var/build_path = null //The path of the object that gets created - var/locked = 0 //If true it will spawn inside a lockbox with currently sec access - var/category = null //Primarily used for Mech Fabricators, but can be used for anything - + var/name = null //Name of the created object. If null it will be 'guessed' from build_path if possible. + var/desc = null //Description of the created object. If null it will use group_desc and name where applicable. + var/id = "id" //ID of the created object for easy refernece. Alphanumeric, lower-case, no symbols. + var/list/req_tech = list() //IDs of that techs the object originated from and the minimum level requirements. + var/reliability_mod = 0 //Reliability modifier of the device at it's starting point. + var/reliability_base = 100 //Base reliability of a device before modifiers. + var/reliability = 100 //Reliability of the device. + var/build_type = null //Flag as to what kind machine the design is built in. See defines. + var/list/materials = list() //List of materials. Format: "id" = amount. + var/build_path = null //The path of the object that gets created. + var/locked = 0 //If true it will spawn inside a lockbox with currently sec access. + var/category = null //Primarily used for Mech Fabricators, but can be used for anything. //A proc to calculate the reliability of a design based on tech levels and innate modifiers. //Input: A list of /datum/tech; Output: The new reliabilty. @@ -64,324 +63,222 @@ datum/design/proc/CalcReliability(var/list/temp_techs) reliability = new_reliability return +//This proc is used in subtypes for assigning names and descriptions dynamically +datum/design/proc/AssembleDesignInfo() + if(!name && build_path) //Get name from build path if posible + var/atom/movable/A = build_path + name = initial(A.name) + return + +datum/design/New() + ..() + AssembleDesignInfo() + ///////////////////Computer Boards/////////////////////////////////// - -datum/design/seccamera - name = "Circuit Design (Security Camera Monitor)" - desc = "Allows for the construction of circuit boards used to build a Security Camera Monitor." - id = "seccamera" +datum/design/circuit req_tech = list("programming" = 2) build_type = IMPRINTER materials = list("$glass" = 2000, "sacid" = 20) + +datum/design/circuit/AssembleDesignInfo() + desc = "Allows for the construction of circuit boards used to build \a [name]." + name = "Circuit design ([name])" + + +datum/design/circuit/seccamera + name = "security camera monitor" + id = "seccamera" build_path = /obj/item/weapon/circuitboard/security -datum/design/aicore - name = "Circuit Design (AI Core)" - desc = "Allows for the construction of circuit boards used to build AI cores." +datum/design/circuit/aicore + name = "AI core" id = "aicore" req_tech = list("programming" = 4, "biotech" = 3) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/aicore -datum/design/aiupload - name = "Circuit Design (AI Upload)" - desc = "Allows for the construction of circuit boards used to build an AI Upload console." +datum/design/circuit/aiupload + name = "AI upload console" id = "aiupload" req_tech = list("programming" = 4) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/aiupload -datum/design/borgupload - name = "Circuit Design (Cyborg Upload)" - desc = "Allows for the construction of circuit boards used to build a Cyborg Upload console." +datum/design/circuit/borgupload + name = "cyborg upload console" id = "borgupload" req_tech = list("programming" = 4) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/borgupload -datum/design/med_data - name = "Circuit Design (Medical Records)" - desc = "Allows for the construction of circuit boards used to build a Medical Records console." +datum/design/circuit/med_data + name = "medical records console" id = "med_data" - req_tech = list("programming" = 2) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/med_data -datum/design/operating - name = "Circuit Design (Patient Monitoring)" - desc = "Allows for the construction of circuit boards used to build a Patient Monitoring console." +datum/design/circuit/operating + name = "patient monitoring console" id = "operating" - req_tech = list("programming" = 2, "biotech" = 2) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/operating -datum/design/pandemic - name = "Circuit Design (PanD.E.M.I.C. 2200)" - desc = "Allows for the construction of circuit boards used to build a PanD.E.M.I.C. 2200 console." +datum/design/circuit/pandemic + name = "PanD.E.M.I.C. 2200" id = "pandemic" - req_tech = list("programming" = 2, "biotech" = 2) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/pandemic -datum/design/scan_console - name = "Circuit Design (DNA Machine)" - desc = "Allows for the construction of circuit boards used to build a DNA scanning console." +datum/design/circuit/scan_console + name = "DNA machine" id = "scan_console" - req_tech = list("programming" = 2, "biotech" = 3) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/scan_consolenew -datum/design/comconsole - name = "Circuit Design (Communications)" - desc = "Allows for the construction of circuit boards used to build a communications console." +datum/design/circuit/comconsole + name = "communications console" id = "comconsole" - req_tech = list("programming" = 2, "magnets" = 2) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/communications -datum/design/idcardconsole - name = "Circuit Design (ID Card Modification)" - desc = "Allows for the construction of circuit boards used to build an ID Card Modification console." +datum/design/circuit/idcardconsole + name = "ID card modification console" id = "idcardconsole" - req_tech = list("programming" = 2) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/card -datum/design/crewconsole - name = "Circuit Design (Crew Monitoring)" - desc = "Allows for the construction of circuit boards used to build a Crew Monitoring console." +datum/design/circuit/crewconsole + name = "crew monitoring console" id = "crewconsole" req_tech = list("programming" = 3, "magnets" = 2, "biotech" = 2) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/crew -datum/design/teleconsole - name = "Circuit Design (Teleporter Control)" - desc = "Allows for the construction of circuit boards used to build a Teleporter Control console." +datum/design/circuit/teleconsole + name = "teleporter control console" id = "teleconsole" req_tech = list("programming" = 3, "bluespace" = 2) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) - build_path = /obj/item/weapon/circuitboard/teleporter -datum/design/secdata - name = "Circuit Design (Security Records)" - desc = "Allows for the construction of circuit boards used to build a Security Records console." +datum/design/circuit/secdata + name = "security records console" id = "secdata" - req_tech = list("programming" = 2) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/secure_data -datum/design/atmosalerts - name = "Circuit Design (Atmosphere Alert)" - desc = "Allows for the construction of circuit boards used to build an Atmosphere Alert console." +datum/design/circuit/atmosalerts + name = "atmosphere alert console" id = "atmosalerts" - req_tech = list("programming" = 2) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/atmos_alert -datum/design/air_management - name = "Circuit Design (Atmosphere Monitoring)" - desc = "Allows for the construction of circuit boards used to build an Atmosphere Monitoring console." +datum/design/circuit/air_management + name = "atmosphere monitoring console" id = "air_management" - req_tech = list("programming" = 2) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/air_management -datum/design/rcon_console - name = "Circuit Design (RCON Remote Control)" - desc = "Allows for the construction of circuit boards used to build a RCON Remote Control console." +datum/design/circuit/rcon_console + name = "RCON remote control console" id = "rcon_console" req_tech = list("programming" = 4, "engineering" = 3, "powerstorage" = 5) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/rcon_console /* Uncomment if someone makes these buildable -datum/design/general_alert - name = "Circuit Design (General Alert)" - desc = "Allows for the construction of circuit boards used to build a General Alert console." +datum/design/circuit/general_alert + name = "general alert console" id = "general_alert" - req_tech = list("programming" = 2) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) - build_path = /obj/item/weapon/circuitboard/general_alert" + build_path = /obj/item/weapon/circuitboard/general_alert */ -datum/design/robocontrol - name = "Circuit Design (Robotics Control)" - desc = "Allows for the construction of circuit boards used to build a Robotics Control console." +datum/design/circuit/robocontrol + name = "robotics control console" id = "robocontrol" req_tech = list("programming" = 4) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/robotics -datum/design/dronecontrol - name = "Circuit Design (Drone Control)" - desc = "Allows for the construction of circuit boards used to build a Drone Control console." +datum/design/circuit/dronecontrol + name = "drone control console" id = "dronecontrol" req_tech = list("programming" = 4) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/drone_control -datum/design/clonecontrol - name = "Circuit Design (Cloning Control)" - desc = "Allows for the construction of circuit boards used to build a Cloning Control console." +datum/design/circuit/clonecontrol + name = "cloning control console" id = "clonecontrol" req_tech = list("programming" = 3, "biotech" = 3) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/cloning -datum/design/clonepod - name = "Circuit Design (Clone Pod)" - desc = "Allows for the construction of circuit boards used to build a Clone Pod." +datum/design/circuit/clonepod + name = "clone pod" id = "clonepod" req_tech = list("programming" = 3, "biotech" = 3) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/clonepod -datum/design/clonescanner - name = "Circuit Design (Cloning Scanner)" - desc = "Allows for the construction of circuit boards used to build a Cloning Scanner." +datum/design/circuit/clonescanner + name = "cloning scanner console" id = "clonescanner" req_tech = list("programming" = 3, "biotech" = 3) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/clonescanner -datum/design/arcademachine - name = "Circuit Design (Arcade Machine)" - desc = "Allows for the construction of circuit boards used to build an Arcade Machine." +datum/design/circuit/arcademachine + name = "arcade machine" id = "arcademachine" req_tech = list("programming" = 1) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/arcade -datum/design/powermonitor - name = "Circuit Design (Power Monitoring)" - desc = "Allows for the construction of circuit boards used to build a Power Monitoring console" +datum/design/circuit/powermonitor + name = "power monitoring console" id = "powermonitor" - req_tech = list("programming" = 2) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/powermonitor -datum/design/solarcontrol - name = "Circuit Design (Solar Control)" - desc = "Allows for the construction of circuit boards used to build a Solar Control console" +datum/design/circuit/solarcontrol + name = "solar control console" id = "solarcontrol" - req_tech = list("programming" = 2, "powerstorage" = 2) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/solar_control -datum/design/prisonmanage - name = "Circuit Design (Prisoner Management)" - desc = "Allows for the construction of circuit boards used to build a Prisoner Management console." +datum/design/circuit/prisonmanage + name = "prisoner management console" id = "prisonmanage" - req_tech = list("programming" = 2) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/prisoner -datum/design/mechacontrol - name = "Circuit Design (Exosuit Control)" - desc = "Allows for the construction of circuit boards used to build an Exosuit Control console." +datum/design/circuit/mechacontrol + name = "exosuit control console" id = "mechacontrol" req_tech = list("programming" = 3) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mecha_control -datum/design/mechapower - name = "Circuit Design (Mech Bay Power Control)" - desc = "Allows for the construction of circuit boards used to build a Mech Bay Power Control console." +datum/design/circuit/mechapower + name = "mech bay power control console" id = "mechapower" - req_tech = list("programming" = 2, "powerstorage" = 3) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mech_bay_power_console -datum/design/rdconsole - name = "Circuit Design (R&D Control)" - desc = "Allows for the construction of circuit boards used to build a R&D Control console." +datum/design/circuit/rdconsole + name = "R&D control console" id = "rdconsole" req_tech = list("programming" = 4) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/rdconsole -datum/design/ordercomp - name = "Circuit Design (Supply Ordering)" - desc = "Allows for the construction of circuit boards used to build a Supply Ordering console." +datum/design/circuit/ordercomp + name = "supply ordering console" id = "ordercomp" - req_tech = list("programming" = 2) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/ordercomp -datum/design/supplycomp - name = "Circuit Design (Supply Shuttle)" - desc = "Allows for the construction of circuit boards used to build a Supply Shuttle console." +datum/design/circuit/supplycomp + name = "supply shuttle console" id = "supplycomp" req_tech = list("programming" = 3) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/supplycomp -datum/design/comm_monitor - name = "Circuit Design (Telecommunications Monitoring)" - desc = "Allows for the construction of circuit boards used to build a Telecommunications Monitor console." +datum/design/circuit/comm_monitor + name = "telecommunications monitoring console" id = "comm_monitor" req_tech = list("programming" = 3) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/comm_monitor -datum/design/comm_server - name = "Circuit Design (Telecommunications Server Monitoring)" - desc = "Allows for the construction of circuit boards used to build a Telecommunication Server Monitoring console." +datum/design/circuit/comm_server + name = "telecommunications server monitoring console" id = "comm_server" req_tech = list("programming" = 3) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/comm_server -datum/design/message_monitor - name = "Circuit Design (Messaging Monitor Console)" - desc = "Allows for the construction of circuit boards used to build a messaging monitor console." +datum/design/circuit/message_monitor + name = "messaging monitor console" id = "message_monitor" req_tech = list("programming" = 5) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/message_monitor -datum/design/aifixer - name = "Circuit Design (AI Integrity Restorer)" - desc = "Allows for the construction of circuit boards used to build an AI Integrity Restorer." +datum/design/circuit/aifixer + name = "AI integrity restorer" id = "aifixer" req_tech = list("programming" = 3, "biotech" = 2) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/aifixer /////////////////////////////////// From 9cf4de5faa449afdeefdb1379bca4cd9164228f5 Mon Sep 17 00:00:00 2001 From: Amunak Date: Sat, 13 Dec 2014 07:44:31 +0100 Subject: [PATCH 11/35] Removes redundant item info from circuitboard/mecha. Also fixes capitalization. --- code/game/mecha/mecha_parts.dm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm index ddff723806e..3af04a8f3fb 100644 --- a/code/game/mecha/mecha_parts.dm +++ b/code/game/mecha/mecha_parts.dm @@ -352,17 +352,11 @@ ///////// 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" board_type = "other" - flags = FPRINT | TABLEPASS | CONDUCT - force = 5.0 - w_class = 2.0 - throwforce = 5.0 - throw_speed = 3 - throw_range = 15 /obj/item/weapon/circuitboard/mecha/ripley origin_tech = "programming=3" From 429a898e723295457ce9fe0362f612b75952eb6e Mon Sep 17 00:00:00 2001 From: Amunak Date: Sun, 14 Dec 2014 04:56:23 +0100 Subject: [PATCH 12/35] Fixes a bug that made bubble shield gen unconstructable --- code/modules/shieldgen/circuits_and_designs.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/shieldgen/circuits_and_designs.dm b/code/modules/shieldgen/circuits_and_designs.dm index a831d40798b..c7fd23a3bf8 100644 --- a/code/modules/shieldgen/circuits_and_designs.dm +++ b/code/modules/shieldgen/circuits_and_designs.dm @@ -31,7 +31,7 @@ datum/design/shield_gen_ex /obj/item/weapon/circuitboard/shield_gen name = "Circuit board (Bubble shield generator)" board_type = "machine" - build_path = "/obj/machinery/shield_gen/external" + build_path = "/obj/machinery/shield_gen" origin_tech = "bluespace=4;phorontech=3" frame_desc = "Requires 2 Pico Manipulators, 1 Subspace Transmitter, 5 Pieces of cable, 1 Subspace Crystal, 1 Subspace Amplifier and 1 Console Screen." req_components = list( @@ -49,7 +49,7 @@ datum/design/shield_gen req_tech = list("bluespace" = 4, "phorontech" = 3) build_type = IMPRINTER materials = list("$glass" = 2000, "sacid" = 20, "$phoron" = 10000, "$diamond" = 5000, "$gold" = 10000) - build_path = "/obj/machinery/shield_gen/external" + build_path = "/obj/machinery/shield_gen" //////////////////////////////////////// // Shield Capacitor From 158573f0661346855badd488798e18c8182b1e0c Mon Sep 17 00:00:00 2001 From: Amunak Date: Sun, 14 Dec 2014 05:00:38 +0100 Subject: [PATCH 13/35] Corrects names of computers, code formatting, updated computer descriptions. Everything in game/machinery/computers/ and modules/shuttles should now have properly (de)capitalized names. Computer, board and research names should now be coherent, too. Adds a research for employment records circuit board. --- .../machinery/computer/HolodeckControl.dm | 2 +- code/game/machinery/computer/Operating.dm | 2 +- code/game/machinery/computer/RCON_Console.dm | 2 +- 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 | 8 ++-- code/game/machinery/computer/camera.dm | 10 ++--- code/game/machinery/computer/card.dm | 4 +- code/game/machinery/computer/cloning.dm | 2 +- .../game/machinery/computer/communications.dm | 4 +- code/game/machinery/computer/crew.dm | 2 +- code/game/machinery/computer/hologram.dm | 2 +- code/game/machinery/computer/law.dm | 4 +- code/game/machinery/computer/lockdown.dm | 2 +- code/game/machinery/computer/medical.dm | 6 +-- code/game/machinery/computer/message.dm | 8 +--- code/game/machinery/computer/pod.dm | 4 +- code/game/machinery/computer/prisoner.dm | 4 +- code/game/machinery/computer/prisonshuttle.dm | 2 +- code/game/machinery/computer/robot.dm | 5 +-- code/game/machinery/computer/security.dm | 4 +- code/game/machinery/computer/skills.dm | 4 +- .../machinery/computer/specops_shuttle.dm | 2 +- .../computer/syndicate_specops_shuttle.dm | 2 +- code/modules/power/smes_construction.dm | 4 +- code/modules/research/designs.dm | 42 +++++++++++++++---- code/modules/research/rdconsole.dm | 2 +- code/modules/shuttles/antagonist.dm | 4 +- code/modules/shuttles/departmental.dm | 8 ++-- code/modules/shuttles/shuttle.dm | 2 +- code/modules/shuttles/shuttle_emergency.dm | 1 - code/modules/shuttles/shuttle_ferry.dm | 1 - code/modules/shuttles/shuttle_supply.dm | 7 +--- code/modules/shuttles/shuttles_multi.dm | 2 +- 35 files changed, 90 insertions(+), 76 deletions(-) diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index 1c9fe7cfe5a..ba91ec2eea8 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -16,7 +16,7 @@ var/global/list/holodeck_programs = list( ) /obj/machinery/computer/HolodeckControl - name = "Holodeck Control Computer" + name = "holodeck control console" desc = "A computer used to control a nearby holodeck." icon_state = "holocontrol" diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index 1601347a310..bcd7beda082 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -1,7 +1,7 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 /obj/machinery/computer/operating - name = "Patient Monitor Console" + name = "patient monitoring console" density = 1 anchored = 1.0 icon_state = "operating" diff --git a/code/game/machinery/computer/RCON_Console.dm b/code/game/machinery/computer/RCON_Console.dm index 6e0eab2e558..e88de45c940 100644 --- a/code/game/machinery/computer/RCON_Console.dm +++ b/code/game/machinery/computer/RCON_Console.dm @@ -1,5 +1,5 @@ /obj/machinery/computer/rcon - name = "RCON Console" + name = "\improper RCON remote control console" desc = "Console used to remotely control machinery on the station." icon = 'icons/obj/computer.dmi' icon_state = "ai-fixer" diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm index 2dbfcd96207..69c884ec708 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 @@ -175,7 +175,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 2182d989dcc..223f9523cc1 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" circuit = /obj/item/weapon/circuitboard/aifixer diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index 6047b221b8e..292d86fa906 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 Computer" + name = "atmospheric alert computer" 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 c9fca4f19bb..2323355c307 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -116,7 +116,7 @@ build_path = /obj/machinery/computer/scan_consolenew origin_tech = "programming=2;biotech=2" /obj/item/weapon/circuitboard/communications - name = T_BOARD("communications console") + name = T_BOARD("command and communications console") build_path = /obj/machinery/computer/communications origin_tech = "programming=2;magnets=2" /obj/item/weapon/circuitboard/card @@ -126,7 +126,7 @@ name = T_BOARD("CentCom ID card modification console") build_path = /obj/machinery/computer/card/centcom //obj/item/weapon/circuitboard/shield -// name = T_BOARD("Shield Control") +// name = T_BOARD("shield control console") // build_path = "/obj/machinery/computer/stationshield" /obj/item/weapon/circuitboard/teleporter name = T_BOARD("teleporter control console") @@ -142,7 +142,7 @@ name = T_BOARD("station alert console") build_path = /obj/machinery/computer/station_alert ///obj/item/weapon/circuitboard/atmospheresiphonswitch -// name = T_BOARD("Atmosphere Siphon Control") +// name = T_BOARD("atmosphere siphon control console") // build_path = /obj/machinery/computer/atmosphere/siphonswitch /obj/item/weapon/circuitboard/air_management name = T_BOARD("atmosphere monitoring console") @@ -295,7 +295,7 @@ build_path = /obj/machinery/computer/area_atmos origin_tech = "programming=2" /obj/item/weapon/circuitboard/prison_shuttle - name = T_BOARD("prison shuttle console") + name = T_BOARD("prison shuttle control console") build_path = /obj/machinery/computer/prison_shuttle origin_tech = "programming=2" /obj/item/weapon/circuitboard/rcon_console diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 14c7847c6ad..b93855f0931 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -2,7 +2,7 @@ /obj/machinery/computer/security - name = "Security Cameras" + name = "security camera monitor" desc = "Used to access the various cameras on the station." icon_state = "cameras" var/obj/machinery/camera/current = null @@ -151,28 +151,28 @@ circuit = null /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" circuit = null /obj/machinery/computer/security/mining - name = "Outpost Cameras" + name = "outpost camera monitor" desc = "Used to access the various cameras on the outpost." icon_state = "miningcameras" network = list("MINE") circuit = /obj/item/weapon/circuitboard/security/mining /obj/machinery/computer/security/engineering - name = "Engineering Cameras" + name = "engineering camera monitor" desc = "Used to monitor fires and breaches." icon_state = "engineeringcameras" network = list("Engineering","Power Alarms","Atmosphere Alarms","Fire Alarms") circuit = /obj/item/weapon/circuitboard/security/engineering /obj/machinery/computer/security/nuclear - name = "Mission Monitor" + name = "head mounted camera monitor" desc = "Used to access the built-in cameras in helmets." icon_state = "syndicam" network = list("NUKE") diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 76d1e0fb939..fddc8635759 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 Computer" + name = "\improper ID card modification console" desc = "Terminal for programming NanoTrasen employee ID cards to access parts of the station." icon_state = "id" req_access = list(access_change_ids) @@ -282,7 +282,7 @@ return 1 /obj/machinery/computer/card/centcom - name = "CentCom Identification Computer" + name = "\improper CentCom ID card modification 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 402f7bb91b1..484f39df250 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -1,5 +1,5 @@ /obj/machinery/computer/cloning - name = "Cloning Control Console" + name = "cloning control 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 0af60a14c75..f187957f5b6 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -2,8 +2,8 @@ // The communications computer /obj/machinery/computer/communications - name = "Communications Console" - desc = "This can be used for various important functions. Still under developement." + name = "command and communications console" + desc = "Used to command and control the station. Can relay long-range communications." icon_state = "comm" req_access = list(access_heads) circuit = "/obj/item/weapon/circuitboard/communications" diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index 1c7352f4168..a85b24d8fb1 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 Computer" + name = "crew monitoring computer" 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/hologram.dm b/code/game/machinery/computer/hologram.dm index e57aa56fe78..e0ceb33c177 100644 --- a/code/game/machinery/computer/hologram.dm +++ b/code/game/machinery/computer/hologram.dm @@ -1,7 +1,7 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 /obj/machinery/computer/hologram_comp - name = "Hologram Computer" + name = "hologram computer" desc = "Rumoured to control holograms." icon = 'icons/obj/stationobjs.dmi' icon_state = "holo_console0" diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm index b77e483203a..5c970f9d678 100644 --- a/code/game/machinery/computer/law.dm +++ b/code/game/machinery/computer/law.dm @@ -1,7 +1,7 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 /obj/machinery/computer/aiupload - 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" @@ -54,7 +54,7 @@ /obj/machinery/computer/borgupload - 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/lockdown.dm b/code/game/machinery/computer/lockdown.dm index 1e81af168ae..bb1fff338d5 100644 --- a/code/game/machinery/computer/lockdown.dm +++ b/code/game/machinery/computer/lockdown.dm @@ -3,7 +3,7 @@ /obj/machinery/computer/lockdown //for reference - /*name = "Lockdown Control" + /*name = "lockdown control" desc = "Used to control blast doors." icon_state = "lockdown" circuit = "/obj/item/weapon/circuitboard/lockdown" diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 1a7a8ea33a2..fe8e098a7e3 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -1,8 +1,8 @@ //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" - desc = "This can be used to check medical records." + name = "medical records console" + desc = "This can be used to view, edit and maintain medical records." icon_state = "medcomp" req_one_access = list(access_medical, access_forensics_lockers) circuit = "/obj/item/weapon/circuitboard/med_data" @@ -551,4 +551,4 @@ /obj/machinery/computer/med_data/laptop name = "Medical Laptop" desc = "Cheap Nanotrasen Laptop." - icon_state = "medlaptop" \ No newline at end of file + icon_state = "medlaptop" diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index 9a5ad3ed3b5..8cdd7f10fe9 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -1,12 +1,8 @@ - // Allows you to monitor messages that passes the server. - - - /obj/machinery/computer/message_monitor - 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." + name = "messaging monitor console" + desc = "Used to access and maintain data on messaging servers. Allows you to view PDA and request console messages." icon_state = "comm_logs" var/hack_icon = "comm_logsc" var/normal_icon = "comm_logs" diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 042555fe001..f707f8ffb7b 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -1,8 +1,8 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 /obj/machinery/computer/pod - name = "Pod Launch Control" - desc = "A controll for launching pods. Some people prefer firing Mechas." + name = "pod launch control console" + desc = "A control console for launching pods. Some people prefer firing Mechas." icon_state = "computer_generic" circuit = /obj/item/weapon/circuitboard/pod var/id = 1.0 diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index 56f093276af..cdbdfe048f6 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -1,7 +1,7 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 /obj/machinery/computer/prisoner - name = "Prisoner Management" + name = "prisoner management console" icon = 'icons/obj/computer.dmi' icon_state = "explosive" req_access = list(access_armory) @@ -100,5 +100,3 @@ src.add_fingerprint(usr) src.updateUsrDialog() return - - diff --git a/code/game/machinery/computer/prisonshuttle.dm b/code/game/machinery/computer/prisonshuttle.dm index f1c57104cc0..84ba06fa021 100644 --- a/code/game/machinery/computer/prisonshuttle.dm +++ b/code/game/machinery/computer/prisonshuttle.dm @@ -11,7 +11,7 @@ var/prison_shuttle_time = 0 var/prison_shuttle_timeleft = 0 /obj/machinery/computer/prison_shuttle - name = "Prison Shuttle Console" + name = "prison shuttle control console" icon = 'icons/obj/computer.dmi' icon_state = "shuttle" req_access = list(access_security) diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index 43e65b12734..b429c70306a 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -1,9 +1,8 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 - /obj/machinery/computer/robotics - name = "Robotics Control" - desc = "Used to remotely lockdown or detonate linked Cyborgs." + name = "robotics control console" + desc = "Used to remotely lockdown or detonate linked cyborgs." icon = 'icons/obj/computer.dmi' icon_state = "robot" req_access = list(access_robotics) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 5aed27cc564..ca692bbbee3 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -1,8 +1,8 @@ //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" - desc = "Used to view and edit personnel's security records" + name = "security records console" + desc = "Used to view, edit and maintain security records" icon_state = "security" req_one_access = list(access_security, access_forensics_lockers) circuit = "/obj/item/weapon/circuitboard/secure_data" diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm index 98c75daf570..aa573e39aaa 100644 --- a/code/game/machinery/computer/skills.dm +++ b/code/game/machinery/computer/skills.dm @@ -1,8 +1,8 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 /obj/machinery/computer/skills//TODO:SANITY - name = "Employment Records" - desc = "Used to view personnel's employment records" + name = "employment records console" + desc = "Used to view, edit and maintain employment records." icon_state = "medlaptop" req_one_access = list(access_heads) circuit = "/obj/item/weapon/circuitboard/skills" diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm index ba44553b16b..bc1f3427eec 100644 --- a/code/game/machinery/computer/specops_shuttle.dm +++ b/code/game/machinery/computer/specops_shuttle.dm @@ -12,7 +12,7 @@ var/specops_shuttle_time = 0 var/specops_shuttle_timeleft = 0 /obj/machinery/computer/specops_shuttle - name = "Spec. Ops. Shuttle Console" + name = "special operations shuttle control console" icon = 'icons/obj/computer.dmi' icon_state = "shuttle" req_access = list(access_cent_specops) diff --git a/code/game/machinery/computer/syndicate_specops_shuttle.dm b/code/game/machinery/computer/syndicate_specops_shuttle.dm index 970a68b64a9..eb8acc83f54 100644 --- a/code/game/machinery/computer/syndicate_specops_shuttle.dm +++ b/code/game/machinery/computer/syndicate_specops_shuttle.dm @@ -11,7 +11,7 @@ var/syndicate_elite_shuttle_time = 0 var/syndicate_elite_shuttle_timeleft = 0 /obj/machinery/computer/syndicate_elite_shuttle - name = "Elite Syndicate Squad Shuttle Console" + name = "elite syndicate squad shuttle control console" icon = 'icons/obj/computer.dmi' icon_state = "syndishuttle" req_access = list(access_cent_specops) diff --git a/code/modules/power/smes_construction.dm b/code/modules/power/smes_construction.dm index 1c15c046a08..17b24858f97 100644 --- a/code/modules/power/smes_construction.dm +++ b/code/modules/power/smes_construction.dm @@ -2,8 +2,8 @@ //Construction Items /obj/item/weapon/smes_coil - name = "Superconductive Magnetic Coil" - desc = "Heavy duty superconducting magnetic coil, mainly used in construction of SMES units." + name = "superconductive magnetic coil" + desc = "Heavy duty superconductive magnetic coil, mainly used in construction of SMES units." icon = 'icons/obj/stock_parts.dmi' icon_state = "smes_coil" // Just few icons patched together. If someone wants to make better icon, feel free to do so! w_class = 4.0 // It's LARGE (backpack size) diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index 7d9bc8cb706..b2ad08aced5 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -77,8 +77,8 @@ datum/design/New() ///////////////////Computer Boards/////////////////////////////////// datum/design/circuit - req_tech = list("programming" = 2) build_type = IMPRINTER + req_tech = list("programming" = 2) materials = list("$glass" = 2000, "sacid" = 20) datum/design/circuit/AssembleDesignInfo() @@ -109,11 +109,6 @@ datum/design/circuit/borgupload req_tech = list("programming" = 4) build_path = /obj/item/weapon/circuitboard/borgupload -datum/design/circuit/med_data - name = "medical records console" - id = "med_data" - build_path = /obj/item/weapon/circuitboard/med_data - datum/design/circuit/operating name = "patient monitoring console" id = "operating" @@ -150,9 +145,19 @@ datum/design/circuit/teleconsole id = "teleconsole" req_tech = list("programming" = 3, "bluespace" = 2) +datum/design/circuit/emp_data + name = "employment records console" + id = "emp_data" + build_path = /obj/item/weapon/circuitboard/skills + +datum/design/circuit/med_data + name = "medical records console" + id = "med_data" + build_path = /obj/item/weapon/circuitboard/med_data + datum/design/circuit/secdata name = "security records console" - id = "secdata" + id = "sec_data" build_path = /obj/item/weapon/circuitboard/secure_data datum/design/circuit/atmosalerts @@ -281,6 +286,29 @@ datum/design/circuit/aifixer req_tech = list("programming" = 3, "biotech" = 2) build_path = /obj/item/weapon/circuitboard/aifixer +/////////////////////////////////// +/////////Shield Generators///////// +/////////////////////////////////// +datum/design/shield + req_tech = list("bluespace" = 4, "phorontech" = 3) + materials = list("$glass" = 2000, "sacid" = 20, "$phoron" = 10000, "$diamond" = 5000, "$gold" = 10000) + +datum/design/shield/bubble + name = "bubble shield generator" + id = "shield_gen" + build_path = "/obj/machinery/shield_gen/external" + +datum/design/shield/hull + name = "hull shield generator" + id = "shield_gen_ex" + build_path = "/obj/machinery/shield_gen/external" + +datum/design/shield/capacitor + name = "shield capacitor" + id = "shield_cap" + req_tech = list("magnets" = 3, "powerstorage" = 4) + build_path = "/obj/machinery/shield_gen/external" + /////////////////////////////////// //////////AI Module Disks////////// /////////////////////////////////// diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index dc490f869f3..5ae180ac303 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -32,7 +32,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, */ /obj/machinery/computer/rdconsole - name = "R&D Console" + name = "R&D control console" icon_state = "rdcomp" circuit = /obj/item/weapon/circuitboard/rdconsole var/datum/research/files //Stores all the collected research data. diff --git a/code/modules/shuttles/antagonist.dm b/code/modules/shuttles/antagonist.dm index 43836267890..5bad5364cb0 100644 --- a/code/modules/shuttles/antagonist.dm +++ b/code/modules/shuttles/antagonist.dm @@ -4,6 +4,6 @@ shuttle_tag = "Vox Skipjack" /obj/machinery/computer/shuttle_control/multi/syndicate - name = "Syndicate control console" + name = "mercenary shuttle control console" req_access = list(access_syndicate) - shuttle_tag = "Mercenary" \ No newline at end of file + shuttle_tag = "Mercenary" diff --git a/code/modules/shuttles/departmental.dm b/code/modules/shuttles/departmental.dm index 9efd0ed7955..018d194a719 100644 --- a/code/modules/shuttles/departmental.dm +++ b/code/modules/shuttles/departmental.dm @@ -1,17 +1,17 @@ /obj/machinery/computer/shuttle_control/mining - name = "mining shuttle console" + name = "mining shuttle control console" shuttle_tag = "Mining" //req_access = list(access_mining) circuit = /obj/item/weapon/circuitboard/mining_shuttle /obj/machinery/computer/shuttle_control/engineering - name = "engineering shuttle console" + name = "engineering shuttle control console" shuttle_tag = "Engineering" //req_one_access_txt = "11;24" circuit = /obj/item/weapon/circuitboard/engineering_shuttle /obj/machinery/computer/shuttle_control/research - name = "research shuttle console" + name = "research shuttle control console" shuttle_tag = "Research" //req_access = list(access_research) - circuit = /obj/item/weapon/circuitboard/research_shuttle \ No newline at end of file + circuit = /obj/item/weapon/circuitboard/research_shuttle diff --git a/code/modules/shuttles/shuttle.dm b/code/modules/shuttles/shuttle.dm index c0783074906..c0e8d315467 100644 --- a/code/modules/shuttles/shuttle.dm +++ b/code/modules/shuttles/shuttle.dm @@ -126,4 +126,4 @@ //returns 1 if the shuttle has a valid arrive time /datum/shuttle/proc/has_arrive_time() - return (moving_status == SHUTTLE_INTRANSIT) \ No newline at end of file + return (moving_status == SHUTTLE_INTRANSIT) diff --git a/code/modules/shuttles/shuttle_emergency.dm b/code/modules/shuttles/shuttle_emergency.dm index 013b77144fe..814401cb5a5 100644 --- a/code/modules/shuttles/shuttle_emergency.dm +++ b/code/modules/shuttles/shuttle_emergency.dm @@ -1,4 +1,3 @@ - /datum/shuttle/ferry/emergency //pass diff --git a/code/modules/shuttles/shuttle_ferry.dm b/code/modules/shuttles/shuttle_ferry.dm index 0fb54b2396c..5d6663f3b57 100644 --- a/code/modules/shuttles/shuttle_ferry.dm +++ b/code/modules/shuttles/shuttle_ferry.dm @@ -1,4 +1,3 @@ - #define DOCK_ATTEMPT_TIMEOUT 200 //how long in ticks we wait before assuming the docking controller is broken or blown up. /datum/shuttle/ferry diff --git a/code/modules/shuttles/shuttle_supply.dm b/code/modules/shuttles/shuttle_supply.dm index 82f921ff90f..c4122434e76 100644 --- a/code/modules/shuttles/shuttle_supply.dm +++ b/code/modules/shuttles/shuttle_supply.dm @@ -1,8 +1,3 @@ - - - - - /datum/shuttle/ferry/supply var/away_location = 1 //the location to hide at while pretending to be in-transit var/late_chance = 80 @@ -76,4 +71,4 @@ //returns the ETA in minutes /datum/shuttle/ferry/supply/proc/eta_minutes() var/ticksleft = arrive_time - world.time - return round(ticksleft/600,1) \ No newline at end of file + return round(ticksleft/600,1) diff --git a/code/modules/shuttles/shuttles_multi.dm b/code/modules/shuttles/shuttles_multi.dm index 4c3b7bdf37e..9c2528adaa6 100644 --- a/code/modules/shuttles/shuttles_multi.dm +++ b/code/modules/shuttles/shuttles_multi.dm @@ -140,4 +140,4 @@ MS.short_jump(MS.last_departed, MS.destinations[choice]) MS.last_departed = MS.destinations[choice] - updateUsrDialog() \ No newline at end of file + updateUsrDialog() From 67c719d9d69500bf3b0992f8d19ef054027d7da2 Mon Sep 17 00:00:00 2001 From: Amunak Date: Sun, 14 Dec 2014 05:03:15 +0100 Subject: [PATCH 14/35] Updated medical records console description. --- code/game/machinery/computer/medical.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index fe8e098a7e3..b8fb87bc31e 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -2,7 +2,7 @@ /obj/machinery/computer/med_data//TODO:SANITY name = "medical records console" - desc = "This can be used to view, edit and maintain medical records." + desc = "Used to view, edit and maintain medical records." icon_state = "medcomp" req_one_access = list(access_medical, access_forensics_lockers) circuit = "/obj/item/weapon/circuitboard/med_data" From b7e7d0859919cf5d8011d5b7f982c1ec0507aea3 Mon Sep 17 00:00:00 2001 From: Amunak Date: Sun, 14 Dec 2014 05:05:09 +0100 Subject: [PATCH 15/35] Fixes destructive analyzer name. Removed oldcode. --- code/modules/research/destructive_analyzer.dm | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm index f6ed81ae41b..aef24dd8bea 100644 --- a/code/modules/research/destructive_analyzer.dm +++ b/code/modules/research/destructive_analyzer.dm @@ -8,7 +8,7 @@ It is used to destroy hand-held objects and advance technological research. Cont Note: Must be placed within 3 tiles of the R&D Console */ /obj/machinery/r_n_d/destructive_analyzer - name = "Destructive Analyzer" + name = "destructive analyzer" icon_state = "d_analyzer" var/obj/item/weapon/loaded_item = null var/decon_mod = 1 @@ -105,13 +105,3 @@ Note: Must be placed within 3 tiles of the R&D Console busy = 0 return 1 return - -//For testing purposes only. -/*/obj/item/weapon/deconstruction_test - name = "Test Item" - desc = "WTF?" - icon = 'icons/obj/weapons.dmi' - icon_state = "d20" - g_amt = 5000 - m_amt = 5000 - origin_tech = "materials=5;phorontech=5;syndicate=5;programming=9"*/ From b84cc64027f42f0c3d7979bdf2f05a10406a8ae9 Mon Sep 17 00:00:00 2001 From: Amunak Date: Sun, 14 Dec 2014 05:05:55 +0100 Subject: [PATCH 16/35] Removes duplicate shield research definitions. They were moved to the common designs file by a previous commit. --- .../modules/shieldgen/circuits_and_designs.dm | 37 ------------------- 1 file changed, 37 deletions(-) diff --git a/code/modules/shieldgen/circuits_and_designs.dm b/code/modules/shieldgen/circuits_and_designs.dm index c7fd23a3bf8..e055bddcabd 100644 --- a/code/modules/shieldgen/circuits_and_designs.dm +++ b/code/modules/shieldgen/circuits_and_designs.dm @@ -1,7 +1,3 @@ - -//////////////////////////////////////// -// External Shield Generator - /obj/item/weapon/circuitboard/shield_gen_ex name = "Circuit board (Hull shield generator)" board_type = "machine" @@ -16,18 +12,6 @@ "/obj/item/weapon/stock_parts/console_screen" = 1, "/obj/item/stack/cable_coil" = 5) -datum/design/shield_gen_ex - name = "Circuit Design (Experimental hull shield generator)" - desc = "Allows for the construction of circuit boards used to build an experimental hull shield generator." - id = "shield_gen" - req_tech = list("bluespace" = 4, "phorontech" = 3) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20, "$phoron" = 10000, "$diamond" = 5000, "$gold" = 10000) - build_path = "/obj/machinery/shield_gen/external" - -//////////////////////////////////////// -// Shield Generator - /obj/item/weapon/circuitboard/shield_gen name = "Circuit board (Bubble shield generator)" board_type = "machine" @@ -42,18 +26,6 @@ datum/design/shield_gen_ex "/obj/item/weapon/stock_parts/console_screen" = 1, "/obj/item/stack/cable_coil" = 5) -datum/design/shield_gen - name = "Circuit Design (Bubble shield generator)" - desc = "Allows for the construction of circuit boards used to build an experimental shield generator." - id = "shield_gen" - req_tech = list("bluespace" = 4, "phorontech" = 3) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20, "$phoron" = 10000, "$diamond" = 5000, "$gold" = 10000) - build_path = "/obj/machinery/shield_gen" - -//////////////////////////////////////// -// Shield Capacitor - /obj/item/weapon/circuitboard/shield_cap name = "Circuit board (Shield capacitor)" board_type = "machine" @@ -67,12 +39,3 @@ datum/design/shield_gen "/obj/item/weapon/stock_parts/subspace/analyzer" = 1, "/obj/item/weapon/stock_parts/console_screen" = 1, "/obj/item/stack/cable_coil" = 5) - -datum/design/shield_cap - name = "Circuit Design (Shield capacitor)" - desc = "Allows for the construction of circuit boards used to build an experimental shielding capacitor." - id = "shield_cap" - req_tech = list("magnets" = 3, "powerstorage" = 4) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20, "$phoron" = 10000, "$diamond" = 5000, "$silver" = 10000) - build_path = "/obj/machinery/shield_gen/external" From 6bf59253fd610d9af3e43d978c97a7055b0f6d02 Mon Sep 17 00:00:00 2001 From: Amunak Date: Sun, 14 Dec 2014 05:16:49 +0100 Subject: [PATCH 17/35] Fixes wrong shield design path --- code/modules/research/designs.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index b2ad08aced5..64d64b198bc 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -289,21 +289,21 @@ datum/design/circuit/aifixer /////////////////////////////////// /////////Shield Generators///////// /////////////////////////////////// -datum/design/shield +datum/design/circuit/shield req_tech = list("bluespace" = 4, "phorontech" = 3) materials = list("$glass" = 2000, "sacid" = 20, "$phoron" = 10000, "$diamond" = 5000, "$gold" = 10000) -datum/design/shield/bubble +datum/design/circuit/shield/bubble name = "bubble shield generator" id = "shield_gen" build_path = "/obj/machinery/shield_gen/external" -datum/design/shield/hull +datum/design/circuit/shield/hull name = "hull shield generator" id = "shield_gen_ex" build_path = "/obj/machinery/shield_gen/external" -datum/design/shield/capacitor +datum/design/circuit/shield/capacitor name = "shield capacitor" id = "shield_cap" req_tech = list("magnets" = 3, "powerstorage" = 4) From b2c266ff93e864279735b3a2b1baca507fc99420 Mon Sep 17 00:00:00 2001 From: Amunak Date: Sun, 14 Dec 2014 05:18:43 +0100 Subject: [PATCH 18/35] More research console GUI formatting. Also simplified the
  • st definitions. --- code/modules/research/rdconsole.dm | 48 ++++++++++++++++-------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 5ae180ac303..3f40be01df4 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -600,9 +600,9 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += "
  • " dat += "[T.name]" dat += "
      " - dat += "
    • Level: [T.level]
      • " - dat += "
    • Summary: [T.desc]
      • " - dat += "
    • " + dat += "
  • Level: [T.level]" + dat += "
  • Summary: [T.desc]" + dat += "" dat += "" if(1.2) //Technology Disk Menu @@ -668,14 +668,16 @@ won't update every console in existence) but it's more of a hassle to do. Also, if(1.6) //R&D console settings dat += "Main Menu
    " dat += "R&D Console Setting:
    " + dat += "
      " if(sync) - dat += "Sync Database with Network
      " - dat += "Disconnect from Research Network
      " + dat += "
    • Sync Database with Network
      " + dat += "
    • Disconnect from Research Network
      " else - dat += "Connect to Research Network
      " - dat += "Device Linkage Menu
      " - dat += "Lock Console
      " - dat += "Reset R&D Database.
      " + dat += "
    • Connect to Research Network
      " + dat += "
    • Device Linkage Menu
      " + dat += "
    • Lock Console
      " + dat += "
    • Reset R&D Database
      " + dat += "
        " if(1.7) //R&D device linkage dat += "Main Menu || " @@ -685,17 +687,17 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += "Linked Devices:" dat += "
          " if(linked_destroy) - dat += "
        • Destructive Analyzer (Disconnect)
          • " + dat += "
        • Destructive Analyzer (Disconnect)" else - dat += "
        • (No Destructive Analyzer Linked)
          • " + dat += "
        • (No Destructive Analyzer Linked)" if(linked_lathe) - dat += "
        • Protolathe (Disconnect)
          • " + dat += "
        • Protolathe (Disconnect)" else - dat += "
        • (No Protolathe Linked)
          • " + dat += "
        • (No Protolathe Linked)" if(linked_imprinter) - dat += "
        • Circuit Imprinter (Disconnect)
          • " + dat += "
        • Circuit Imprinter (Disconnect)" else - dat += "
        • (No Circuit Imprinter Linked)
          • " + dat += "
        • (No Circuit Imprinter Linked)" dat += "
        " ////////////////////DESTRUCTIVE ANALYZER SCREENS//////////////////////////// @@ -715,7 +717,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += "
          " var/list/temp_tech = linked_destroy.ConvertReqString2List(linked_destroy.loaded_item.origin_tech) for(var/T in temp_tech) - dat += "
        • [CallTechName(T)] [temp_tech[T]]
          • " + dat += "
        • [CallTechName(T)] [temp_tech[T]]" dat += "
        " dat += "
        Deconstruct Item || " dat += "Eject Item || " @@ -761,9 +763,9 @@ won't update every console in existence) but it's more of a hassle to do. Also, if(temp_dat) temp_dat = " \[[copytext(temp_dat,3)]\]" if (check_materials) - dat += "
      • [D.name][temp_dat]
        • " + dat += "
      • [D.name][temp_dat]" else - dat += "
      • [D.name][temp_dat]
        • " + dat += "
      • [D.name][temp_dat]" dat += "
      " if(3.2) //Protolathe Material Storage Sub-menu @@ -802,7 +804,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += "[C > 1 ? ", " : ""][C] " dat += " or max sheets" - dat += "
      • " + dat += "" dat += "
    " if(3.3) //Protolathe Chemical Storage Submenu @@ -849,9 +851,9 @@ won't update every console in existence) but it's more of a hassle to do. Also, if(temp_dat) temp_dat = " \[[copytext(temp_dat,3)]\]" if (check_materials) - dat += "
  • [D.name][temp_dat]
    • " + dat += "
  • [D.name][temp_dat]" else - dat += "
  • [D.name][temp_dat]
    • " + dat += "
  • [D.name][temp_dat]" dat += "" if(4.2) @@ -890,7 +892,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += "[C > 1 ? ", " : ""][C] " dat += " or max sheets" - dat += "
    • " + dat += "" dat += "" ///////////////////Research Information Browser//////////////////// @@ -900,7 +902,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += "
      " for(var/datum/design/D in files.known_designs) if(D.build_path) - dat += "
    • [D.name]: [D.desc]
      • " + dat += "
    • [D.name]: [D.desc]" dat += "
    " From ae8829cabec63fa5a2b72b8d1a839dd92f33aeb0 Mon Sep 17 00:00:00 2001 From: Amunak Date: Wed, 17 Dec 2014 12:53:18 +0100 Subject: [PATCH 19/35] Moved supply computers to a separate file in machinery/computer/. Renamed supply shuttle console to supply control console and properly de-capitalized both console names. --- baystation12.dme | 1 + code/game/machinery/computer/supply.dm | 416 ++++++++++++++++++++++++ code/game/supplyshuttle.dm | 434 +------------------------ 3 files changed, 424 insertions(+), 427 deletions(-) create mode 100644 code/game/machinery/computer/supply.dm diff --git a/baystation12.dme b/baystation12.dme index 46381879bb6..905aa258fee 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -395,6 +395,7 @@ #include "code\game\machinery\computer\skills.dm" #include "code\game\machinery\computer\specops_shuttle.dm" #include "code\game\machinery\computer\station_alert.dm" +#include "code\game\machinery\computer\supply.dm" #include "code\game\machinery\computer\syndicate_specops_shuttle.dm" #include "code\game\machinery\doors\airlock.dm" #include "code\game\machinery\doors\airlock_control.dm" diff --git a/code/game/machinery/computer/supply.dm b/code/game/machinery/computer/supply.dm new file mode 100644 index 00000000000..fe109c47719 --- /dev/null +++ b/code/game/machinery/computer/supply.dm @@ -0,0 +1,416 @@ +/obj/machinery/computer/supplycomp + name = "supply control console" + icon = 'icons/obj/computer.dmi' + icon_state = "supply" + req_access = list(access_cargo) + circuit = "/obj/item/weapon/circuitboard/supplycomp" + var/temp = null + var/reqtime = 0 //Cooldown for requisitions - Quarxink + var/hacked = 0 + var/can_order_contraband = 0 + var/last_viewed_group = "categories" + +/obj/machinery/computer/ordercomp + name = "supply ordering console" + icon = 'icons/obj/computer.dmi' + icon_state = "request" + circuit = "/obj/item/weapon/circuitboard/ordercomp" + var/temp = null + var/reqtime = 0 //Cooldown for requisitions - Quarxink + var/last_viewed_group = "categories" + +/obj/machinery/computer/ordercomp/attack_ai(var/mob/user as mob) + return attack_hand(user) + +/obj/machinery/computer/supplycomp/attack_ai(var/mob/user as mob) + return attack_hand(user) + +/obj/machinery/computer/ordercomp/attack_hand(var/mob/user as mob) + if(..()) + return + user.set_machine(src) + var/dat + if(temp) + dat = temp + else + var/datum/shuttle/ferry/supply/shuttle = supply_controller.shuttle + if (shuttle) + dat += {"
    Supply shuttle
    + Location: [shuttle.has_arrive_time() ? "Moving to station ([shuttle.eta_minutes()] Mins.)":shuttle.at_station() ? "Docked":"Away"]
    +
    Supply points: [supply_controller.points]
    +
    \nRequest items

    + View approved orders

    + View requests

    + Close"} + + user << browse(dat, "window=computer;size=575x450") + onclose(user, "computer") + return + +/obj/machinery/computer/ordercomp/Topic(href, href_list) + if(..()) + return + + if( isturf(loc) && (in_range(src, usr) || istype(usr, /mob/living/silicon)) ) + usr.set_machine(src) + + if(href_list["order"]) + if(href_list["order"] == "categories") + //all_supply_groups + //Request what? + last_viewed_group = "categories" + temp = "Supply points: [supply_controller.points]
    " + temp += "Main Menu


    " + temp += "Select a category

    " + for(var/supply_group_name in all_supply_groups ) + temp += "[supply_group_name]
    " + else + last_viewed_group = href_list["order"] + temp = "Supply points: [supply_controller.points]
    " + temp += "Back to all categories


    " + temp += "Request from: [last_viewed_group]

    " + for(var/supply_name in supply_controller.supply_packs ) + var/datum/supply_packs/N = supply_controller.supply_packs[supply_name] + if(N.hidden || N.contraband || N.group != last_viewed_group) continue //Have to send the type instead of a reference to + temp += "[supply_name] Cost: [N.cost]
    " //the obj because it would get caught by the garbage + + else if (href_list["doorder"]) + if(world.time < reqtime) + for(var/mob/V in hearers(src)) + V.show_message("[src]'s monitor flashes, \"[world.time - reqtime] seconds remaining until another requisition form may be printed.\"") + return + + //Find the correct supply_pack datum + var/datum/supply_packs/P = supply_controller.supply_packs[href_list["doorder"]] + if(!istype(P)) return + + var/timeout = world.time + 600 + var/reason = copytext(sanitize(input(usr,"Reason:","Why do you require this item?","") as null|text),1,MAX_MESSAGE_LEN) + if(world.time > timeout) return + if(!reason) return + + var/idname = "*None Provided*" + var/idrank = "*None Provided*" + if(ishuman(usr)) + var/mob/living/carbon/human/H = usr + idname = H.get_authentification_name() + idrank = H.get_assignment() + else if(issilicon(usr)) + idname = usr.real_name + + supply_controller.ordernum++ + var/obj/item/weapon/paper/reqform = new /obj/item/weapon/paper(loc) + reqform.name = "Requisition Form - [P.name]" + reqform.info += "

    [station_name] Supply Requisition Form

    " + reqform.info += "INDEX: #[supply_controller.ordernum]
    " + reqform.info += "REQUESTED BY: [idname]
    " + reqform.info += "RANK: [idrank]
    " + reqform.info += "REASON: [reason]
    " + reqform.info += "SUPPLY CRATE TYPE: [P.name]
    " + reqform.info += "ACCESS RESTRICTION: [replacetext(get_access_desc(P.access))]
    " + reqform.info += "CONTENTS:
    " + reqform.info += P.manifest + reqform.info += "
    " + reqform.info += "STAMP BELOW TO APPROVE THIS REQUISITION:
    " + + reqform.update_icon() //Fix for appearing blank when printed. + reqtime = (world.time + 5) % 1e5 + + //make our supply_order datum + var/datum/supply_order/O = new /datum/supply_order() + O.ordernum = supply_controller.ordernum + O.object = P + O.orderedby = idname + supply_controller.requestlist += O + + temp = "Thanks for your request. The cargo team will process it as soon as possible.
    " + temp += "
    Back Main Menu" + + else if (href_list["vieworders"]) + temp = "Current approved orders:

    " + for(var/S in supply_controller.shoppinglist) + var/datum/supply_order/SO = S + temp += "[SO.object.name] approved by [SO.orderedby] [SO.comment ? "([SO.comment])":""]
    " + temp += "
    OK" + + else if (href_list["viewrequests"]) + temp = "Current requests:

    " + for(var/S in supply_controller.requestlist) + var/datum/supply_order/SO = S + temp += "#[SO.ordernum] - [SO.object.name] requested by [SO.orderedby]
    " + temp += "
    OK" + + else if (href_list["mainmenu"]) + temp = null + + add_fingerprint(usr) + updateUsrDialog() + return + +/obj/machinery/computer/supplycomp/attack_hand(var/mob/user as mob) + if(!allowed(user)) + user << "\red Access Denied." + return + + if(..()) + return + user.set_machine(src) + post_signal("supply") + var/dat + if (temp) + dat = temp + else + var/datum/shuttle/ferry/supply/shuttle = supply_controller.shuttle + if (shuttle) + dat += "
    Supply shuttle
    " + dat += "\nLocation: " + if (shuttle.has_arrive_time()) + dat += "In transit ([shuttle.eta_minutes()] Mins.)
    " + else + if (shuttle.at_station()) + if (shuttle.docking_controller) + switch(shuttle.docking_controller.get_docking_status()) + if ("docked") dat += "Docked at station
    " + if ("undocked") dat += "Undocked from station
    " + if ("docking") dat += "Docking with station [shuttle.can_force()? "Force Launch" : ""]
    " + if ("undocking") dat += "Undocking from station [shuttle.can_force()? "Force Launch" : ""]
    " + else + dat += "Station
    " + + if (shuttle.can_launch()) + dat += "Send away" + else if (shuttle.can_cancel()) + dat += "Cancel launch" + else + dat += "*Shuttle is busy*" + dat += "
    \n
    " + else + dat += "Away
    " + if (shuttle.can_launch()) + dat += "Request supply shuttle" + else if (shuttle.can_cancel()) + dat += "Cancel request" + else + dat += "*Shuttle is busy*" + dat += "
    \n
    " + + + dat += {"
    \nSupply points: [supply_controller.points]
    \n
    + \nOrder items
    \n
    + \nView requests
    \n
    + \nView orders
    \n
    + \nClose"} + + + user << browse(dat, "window=computer;size=575x450") + onclose(user, "computer") + return + +/obj/machinery/computer/supplycomp/attackby(I as obj, user as mob) + if(istype(I,/obj/item/weapon/card/emag) && !hacked) + user << "\blue Special supplies unlocked." + hacked = 1 + return + else + ..() + return + +/obj/machinery/computer/supplycomp/Topic(href, href_list) + if(!supply_controller) + world.log << "## ERROR: Eek. The supply_controller controller datum is missing somehow." + return + var/datum/shuttle/ferry/supply/shuttle = supply_controller.shuttle + if (!shuttle) + world.log << "## ERROR: Eek. The supply/shuttle datum is missing somehow." + return + if(..()) + return + + if(isturf(loc) && ( in_range(src, usr) || istype(usr, /mob/living/silicon) ) ) + usr.set_machine(src) + + //Calling the shuttle + if(href_list["send"]) + if(shuttle.at_station()) + if (shuttle.forbidden_atoms_check()) + temp = "For safety reasons the automated supply shuttle cannot transport live organisms, classified nuclear weaponry or homing beacons.

    OK" + else + shuttle.launch(src) + temp = "Initiating launch sequence. \[Force Launch\]

    OK" + else + shuttle.launch(src) + temp = "The supply shuttle has been called and will arrive in approximately [round(supply_controller.movetime/600,1)] minutes.

    OK" + post_signal("supply") + + if (href_list["force_send"]) + shuttle.force_launch(src) + + if (href_list["cancel_send"]) + shuttle.cancel_launch(src) + + else if (href_list["order"]) + //if(!shuttle.idle()) return //this shouldn't be necessary it seems + if(href_list["order"] == "categories") + //all_supply_groups + //Request what? + last_viewed_group = "categories" + temp = "Supply points: [supply_controller.points]
    " + temp += "Main Menu


    " + temp += "Select a category

    " + for(var/supply_group_name in all_supply_groups ) + temp += "[supply_group_name]
    " + else + last_viewed_group = href_list["order"] + temp = "Supply points: [supply_controller.points]
    " + temp += "Back to all categories


    " + temp += "Request from: [last_viewed_group]

    " + for(var/supply_name in supply_controller.supply_packs ) + var/datum/supply_packs/N = supply_controller.supply_packs[supply_name] + if((N.hidden && !hacked) || (N.contraband && !can_order_contraband) || N.group != last_viewed_group) continue //Have to send the type instead of a reference to + temp += "[supply_name] Cost: [N.cost]
    " //the obj because it would get caught by the garbage + + /*temp = "Supply points: [supply_controller.points]

    Request what?

    " + + for(var/supply_name in supply_controller.supply_packs ) + var/datum/supply_packs/N = supply_controller.supply_packs[supply_name] + if(N.hidden && !hacked) continue + if(N.contraband && !can_order_contraband) continue + temp += "[supply_name] Cost: [N.cost]
    " //the obj because it would get caught by the garbage + temp += "
    OK"*/ + + else if (href_list["doorder"]) + if(world.time < reqtime) + for(var/mob/V in hearers(src)) + V.show_message("[src]'s monitor flashes, \"[world.time - reqtime] seconds remaining until another requisition form may be printed.\"") + return + + //Find the correct supply_pack datum + var/datum/supply_packs/P = supply_controller.supply_packs[href_list["doorder"]] + if(!istype(P)) return + + var/timeout = world.time + 600 + var/reason = copytext(sanitize(input(usr,"Reason:","Why do you require this item?","") as null|text),1,MAX_MESSAGE_LEN) + if(world.time > timeout) return + if(!reason) return + + var/idname = "*None Provided*" + var/idrank = "*None Provided*" + if(ishuman(usr)) + var/mob/living/carbon/human/H = usr + idname = H.get_authentification_name() + idrank = H.get_assignment() + else if(issilicon(usr)) + idname = usr.real_name + + supply_controller.ordernum++ + var/obj/item/weapon/paper/reqform = new /obj/item/weapon/paper(loc) + reqform.name = "Requisition Form - [P.name]" + reqform.info += "

    [station_name] Supply Requisition Form

    " + reqform.info += "INDEX: #[supply_controller.ordernum]
    " + reqform.info += "REQUESTED BY: [idname]
    " + reqform.info += "RANK: [idrank]
    " + reqform.info += "REASON: [reason]
    " + reqform.info += "SUPPLY CRATE TYPE: [P.name]
    " + reqform.info += "ACCESS RESTRICTION: [replacetext(get_access_desc(P.access))]
    " + reqform.info += "CONTENTS:
    " + reqform.info += P.manifest + reqform.info += "
    " + reqform.info += "STAMP BELOW TO APPROVE THIS REQUISITION:
    " + + reqform.update_icon() //Fix for appearing blank when printed. + reqtime = (world.time + 5) % 1e5 + + //make our supply_order datum + var/datum/supply_order/O = new /datum/supply_order() + O.ordernum = supply_controller.ordernum + O.object = P + O.orderedby = idname + supply_controller.requestlist += O + + temp = "Order request placed.
    " + temp += "
    Back | Main Menu | Authorize Order" + + else if(href_list["confirmorder"]) + //Find the correct supply_order datum + var/ordernum = text2num(href_list["confirmorder"]) + var/datum/supply_order/O + var/datum/supply_packs/P + temp = "Invalid Request" + for(var/i=1, i<=supply_controller.requestlist.len, i++) + var/datum/supply_order/SO = supply_controller.requestlist[i] + if(SO.ordernum == ordernum) + O = SO + P = O.object + if(supply_controller.points >= P.cost) + supply_controller.requestlist.Cut(i,i+1) + supply_controller.points -= P.cost + supply_controller.shoppinglist += O + temp = "Thanks for your order.
    " + temp += "
    Back Main Menu" + else + temp = "Not enough supply points.
    " + temp += "
    Back Main Menu" + break + + else if (href_list["vieworders"]) + temp = "Current approved orders:

    " + for(var/S in supply_controller.shoppinglist) + var/datum/supply_order/SO = S + temp += "#[SO.ordernum] - [SO.object.name] approved by [SO.orderedby][SO.comment ? " ([SO.comment])":""]
    "// (Cancel)
    " + temp += "
    OK" +/* + else if (href_list["cancelorder"]) + var/datum/supply_order/remove_supply = href_list["cancelorder"] + supply_shuttle_shoppinglist -= remove_supply + supply_shuttle_points += remove_supply.object.cost + temp += "Canceled: [remove_supply.object.name]


    " + + for(var/S in supply_shuttle_shoppinglist) + var/datum/supply_order/SO = S + temp += "[SO.object.name] approved by [SO.orderedby][SO.comment ? " ([SO.comment])":""] (Cancel)
    " + temp += "
    OK" +*/ + else if (href_list["viewrequests"]) + temp = "Current requests:

    " + for(var/S in supply_controller.requestlist) + var/datum/supply_order/SO = S + temp += "#[SO.ordernum] - [SO.object.name] requested by [SO.orderedby] Approve Remove
    " + + temp += "
    Clear list" + temp += "
    OK" + + else if (href_list["rreq"]) + var/ordernum = text2num(href_list["rreq"]) + temp = "Invalid Request.
    " + for(var/i=1, i<=supply_controller.requestlist.len, i++) + var/datum/supply_order/SO = supply_controller.requestlist[i] + if(SO.ordernum == ordernum) + supply_controller.requestlist.Cut(i,i+1) + temp = "Request removed.
    " + break + temp += "
    Back Main Menu" + + else if (href_list["clearreq"]) + supply_controller.requestlist.Cut() + temp = "List cleared.
    " + temp += "
    OK" + + else if (href_list["mainmenu"]) + temp = null + + add_fingerprint(usr) + updateUsrDialog() + return + +/obj/machinery/computer/supplycomp/proc/post_signal(var/command) + + var/datum/radio_frequency/frequency = radio_controller.return_frequency(1435) + + if(!frequency) return + + var/datum/signal/status_signal = new + status_signal.source = src + status_signal.transmission_method = 1 + status_signal.data["command"] = command + + frequency.post_signal(src, status_signal) diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index 0564cde442c..81ad18ee5d4 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -4,6 +4,9 @@ #define SUPPLY_STATION_AREATYPE "/area/supply/station" //Type of the supply shuttle area for station #define SUPPLY_DOCK_AREATYPE "/area/supply/dock" //Type of the supply shuttle area for dock +//Supply packs are in /code/defines/obj/supplypacks.dm +//Computers are in /code/game/machinery/computer/supply.dm + var/datum/controller/supply/supply_controller = new() var/list/mechtoys = list( @@ -20,6 +23,9 @@ var/list/mechtoys = list( /obj/item/toy/prize/phazon ) +/obj/item/weapon/paper/manifest + name = "supply manifest" + /area/supply/station //DO NOT TURN THE lighting_use_dynamic STUFF ON FOR SHUTTLES. IT BREAKS THINGS. name = "Supply Shuttle" icon_state = "shuttle3" @@ -34,8 +40,6 @@ var/list/mechtoys = list( lighting_use_dynamic = 0 requires_power = 0 -//SUPPLY PACKS MOVED TO /code/defines/obj/supplypacks.dm - /obj/structure/plasticflaps //HOW DO YOU CALL THOSE THINGS ANYWAY name = "\improper plastic flaps" desc = "Completely impassable - or are they?" @@ -75,7 +79,7 @@ var/list/mechtoys = list( del(src) /obj/structure/plasticflaps/mining //A specific type for mining that doesn't allow airflow because of them damn crates - name = "\improper Airtight plastic flaps" + name = "airtight plastic flaps" desc = "Heavy duty, airtight, plastic flaps." New() //set the turf below the flaps to block air @@ -91,27 +95,6 @@ var/list/mechtoys = list( T.blocks_air = 0 ..() -/obj/machinery/computer/supplycomp - name = "Supply Shuttle Console" - icon = 'icons/obj/computer.dmi' - icon_state = "supply" - req_access = list(access_cargo) - circuit = "/obj/item/weapon/circuitboard/supplycomp" - var/temp = null - var/reqtime = 0 //Cooldown for requisitions - Quarxink - var/hacked = 0 - var/can_order_contraband = 0 - var/last_viewed_group = "categories" - -/obj/machinery/computer/ordercomp - name = "Supply Ordering Console" - icon = 'icons/obj/computer.dmi' - icon_state = "request" - circuit = "/obj/item/weapon/circuitboard/ordercomp" - var/temp = null - var/reqtime = 0 //Cooldown for requisitions - Quarxink - var/last_viewed_group = "categories" - /* /obj/effect/marker/supplymarker icon_state = "X" @@ -290,406 +273,3 @@ var/list/mechtoys = list( shoppinglist.Cut() return - -/obj/item/weapon/paper/manifest - name = "Supply Manifest" - -/obj/machinery/computer/ordercomp/attack_ai(var/mob/user as mob) - return attack_hand(user) - -/obj/machinery/computer/supplycomp/attack_ai(var/mob/user as mob) - return attack_hand(user) - -/obj/machinery/computer/ordercomp/attack_hand(var/mob/user as mob) - if(..()) - return - user.set_machine(src) - var/dat - if(temp) - dat = temp - else - var/datum/shuttle/ferry/supply/shuttle = supply_controller.shuttle - if (shuttle) - dat += {"
    Supply shuttle
    - Location: [shuttle.has_arrive_time() ? "Moving to station ([shuttle.eta_minutes()] Mins.)":shuttle.at_station() ? "Docked":"Away"]
    -
    Supply points: [supply_controller.points]
    -
    \nRequest items

    - View approved orders

    - View requests

    - Close"} - - user << browse(dat, "window=computer;size=575x450") - onclose(user, "computer") - return - -/obj/machinery/computer/ordercomp/Topic(href, href_list) - if(..()) - return - - if( isturf(loc) && (in_range(src, usr) || istype(usr, /mob/living/silicon)) ) - usr.set_machine(src) - - if(href_list["order"]) - if(href_list["order"] == "categories") - //all_supply_groups - //Request what? - last_viewed_group = "categories" - temp = "Supply points: [supply_controller.points]
    " - temp += "Main Menu


    " - temp += "Select a category

    " - for(var/supply_group_name in all_supply_groups ) - temp += "[supply_group_name]
    " - else - last_viewed_group = href_list["order"] - temp = "Supply points: [supply_controller.points]
    " - temp += "Back to all categories


    " - temp += "Request from: [last_viewed_group]

    " - for(var/supply_name in supply_controller.supply_packs ) - var/datum/supply_packs/N = supply_controller.supply_packs[supply_name] - if(N.hidden || N.contraband || N.group != last_viewed_group) continue //Have to send the type instead of a reference to - temp += "[supply_name] Cost: [N.cost]
    " //the obj because it would get caught by the garbage - - else if (href_list["doorder"]) - if(world.time < reqtime) - for(var/mob/V in hearers(src)) - V.show_message("[src]'s monitor flashes, \"[world.time - reqtime] seconds remaining until another requisition form may be printed.\"") - return - - //Find the correct supply_pack datum - var/datum/supply_packs/P = supply_controller.supply_packs[href_list["doorder"]] - if(!istype(P)) return - - var/timeout = world.time + 600 - var/reason = copytext(sanitize(input(usr,"Reason:","Why do you require this item?","") as null|text),1,MAX_MESSAGE_LEN) - if(world.time > timeout) return - if(!reason) return - - var/idname = "*None Provided*" - var/idrank = "*None Provided*" - if(ishuman(usr)) - var/mob/living/carbon/human/H = usr - idname = H.get_authentification_name() - idrank = H.get_assignment() - else if(issilicon(usr)) - idname = usr.real_name - - supply_controller.ordernum++ - var/obj/item/weapon/paper/reqform = new /obj/item/weapon/paper(loc) - reqform.name = "Requisition Form - [P.name]" - reqform.info += "

    [station_name] Supply Requisition Form

    " - reqform.info += "INDEX: #[supply_controller.ordernum]
    " - reqform.info += "REQUESTED BY: [idname]
    " - reqform.info += "RANK: [idrank]
    " - reqform.info += "REASON: [reason]
    " - reqform.info += "SUPPLY CRATE TYPE: [P.name]
    " - reqform.info += "ACCESS RESTRICTION: [replacetext(get_access_desc(P.access))]
    " - reqform.info += "CONTENTS:
    " - reqform.info += P.manifest - reqform.info += "
    " - reqform.info += "STAMP BELOW TO APPROVE THIS REQUISITION:
    " - - reqform.update_icon() //Fix for appearing blank when printed. - reqtime = (world.time + 5) % 1e5 - - //make our supply_order datum - var/datum/supply_order/O = new /datum/supply_order() - O.ordernum = supply_controller.ordernum - O.object = P - O.orderedby = idname - supply_controller.requestlist += O - - temp = "Thanks for your request. The cargo team will process it as soon as possible.
    " - temp += "
    Back Main Menu" - - else if (href_list["vieworders"]) - temp = "Current approved orders:

    " - for(var/S in supply_controller.shoppinglist) - var/datum/supply_order/SO = S - temp += "[SO.object.name] approved by [SO.orderedby] [SO.comment ? "([SO.comment])":""]
    " - temp += "
    OK" - - else if (href_list["viewrequests"]) - temp = "Current requests:

    " - for(var/S in supply_controller.requestlist) - var/datum/supply_order/SO = S - temp += "#[SO.ordernum] - [SO.object.name] requested by [SO.orderedby]
    " - temp += "
    OK" - - else if (href_list["mainmenu"]) - temp = null - - add_fingerprint(usr) - updateUsrDialog() - return - -/obj/machinery/computer/supplycomp/attack_hand(var/mob/user as mob) - if(!allowed(user)) - user << "\red Access Denied." - return - - if(..()) - return - user.set_machine(src) - post_signal("supply") - var/dat - if (temp) - dat = temp - else - var/datum/shuttle/ferry/supply/shuttle = supply_controller.shuttle - if (shuttle) - dat += "
    Supply shuttle
    " - dat += "\nLocation: " - if (shuttle.has_arrive_time()) - dat += "In transit ([shuttle.eta_minutes()] Mins.)
    " - else - if (shuttle.at_station()) - if (shuttle.docking_controller) - switch(shuttle.docking_controller.get_docking_status()) - if ("docked") dat += "Docked at station
    " - if ("undocked") dat += "Undocked from station
    " - if ("docking") dat += "Docking with station [shuttle.can_force()? "Force Launch" : ""]
    " - if ("undocking") dat += "Undocking from station [shuttle.can_force()? "Force Launch" : ""]
    " - else - dat += "Station
    " - - if (shuttle.can_launch()) - dat += "Send away" - else if (shuttle.can_cancel()) - dat += "Cancel launch" - else - dat += "*Shuttle is busy*" - dat += "
    \n
    " - else - dat += "Away
    " - if (shuttle.can_launch()) - dat += "Request supply shuttle" - else if (shuttle.can_cancel()) - dat += "Cancel request" - else - dat += "*Shuttle is busy*" - dat += "
    \n
    " - - - dat += {"
    \nSupply points: [supply_controller.points]
    \n
    - \nOrder items
    \n
    - \nView requests
    \n
    - \nView orders
    \n
    - \nClose"} - - - user << browse(dat, "window=computer;size=575x450") - onclose(user, "computer") - return - -/obj/machinery/computer/supplycomp/attackby(I as obj, user as mob) - if(istype(I,/obj/item/weapon/card/emag) && !hacked) - user << "\blue Special supplies unlocked." - hacked = 1 - return - else - ..() - return - -/obj/machinery/computer/supplycomp/Topic(href, href_list) - if(!supply_controller) - world.log << "## ERROR: Eek. The supply_controller controller datum is missing somehow." - return - var/datum/shuttle/ferry/supply/shuttle = supply_controller.shuttle - if (!shuttle) - world.log << "## ERROR: Eek. The supply/shuttle datum is missing somehow." - return - if(..()) - return - - if(isturf(loc) && ( in_range(src, usr) || istype(usr, /mob/living/silicon) ) ) - usr.set_machine(src) - - //Calling the shuttle - if(href_list["send"]) - if(shuttle.at_station()) - if (shuttle.forbidden_atoms_check()) - temp = "For safety reasons the automated supply shuttle cannot transport live organisms, classified nuclear weaponry or homing beacons.

    OK" - else - shuttle.launch(src) - temp = "Initiating launch sequence. \[Force Launch\]

    OK" - else - shuttle.launch(src) - temp = "The supply shuttle has been called and will arrive in approximately [round(supply_controller.movetime/600,1)] minutes.

    OK" - post_signal("supply") - - if (href_list["force_send"]) - shuttle.force_launch(src) - - if (href_list["cancel_send"]) - shuttle.cancel_launch(src) - - else if (href_list["order"]) - //if(!shuttle.idle()) return //this shouldn't be necessary it seems - if(href_list["order"] == "categories") - //all_supply_groups - //Request what? - last_viewed_group = "categories" - temp = "Supply points: [supply_controller.points]
    " - temp += "Main Menu


    " - temp += "Select a category

    " - for(var/supply_group_name in all_supply_groups ) - temp += "[supply_group_name]
    " - else - last_viewed_group = href_list["order"] - temp = "Supply points: [supply_controller.points]
    " - temp += "Back to all categories


    " - temp += "Request from: [last_viewed_group]

    " - for(var/supply_name in supply_controller.supply_packs ) - var/datum/supply_packs/N = supply_controller.supply_packs[supply_name] - if((N.hidden && !hacked) || (N.contraband && !can_order_contraband) || N.group != last_viewed_group) continue //Have to send the type instead of a reference to - temp += "[supply_name] Cost: [N.cost]
    " //the obj because it would get caught by the garbage - - /*temp = "Supply points: [supply_controller.points]

    Request what?

    " - - for(var/supply_name in supply_controller.supply_packs ) - var/datum/supply_packs/N = supply_controller.supply_packs[supply_name] - if(N.hidden && !hacked) continue - if(N.contraband && !can_order_contraband) continue - temp += "[supply_name] Cost: [N.cost]
    " //the obj because it would get caught by the garbage - temp += "
    OK"*/ - - else if (href_list["doorder"]) - if(world.time < reqtime) - for(var/mob/V in hearers(src)) - V.show_message("[src]'s monitor flashes, \"[world.time - reqtime] seconds remaining until another requisition form may be printed.\"") - return - - //Find the correct supply_pack datum - var/datum/supply_packs/P = supply_controller.supply_packs[href_list["doorder"]] - if(!istype(P)) return - - var/timeout = world.time + 600 - var/reason = copytext(sanitize(input(usr,"Reason:","Why do you require this item?","") as null|text),1,MAX_MESSAGE_LEN) - if(world.time > timeout) return - if(!reason) return - - var/idname = "*None Provided*" - var/idrank = "*None Provided*" - if(ishuman(usr)) - var/mob/living/carbon/human/H = usr - idname = H.get_authentification_name() - idrank = H.get_assignment() - else if(issilicon(usr)) - idname = usr.real_name - - supply_controller.ordernum++ - var/obj/item/weapon/paper/reqform = new /obj/item/weapon/paper(loc) - reqform.name = "Requisition Form - [P.name]" - reqform.info += "

    [station_name] Supply Requisition Form

    " - reqform.info += "INDEX: #[supply_controller.ordernum]
    " - reqform.info += "REQUESTED BY: [idname]
    " - reqform.info += "RANK: [idrank]
    " - reqform.info += "REASON: [reason]
    " - reqform.info += "SUPPLY CRATE TYPE: [P.name]
    " - reqform.info += "ACCESS RESTRICTION: [replacetext(get_access_desc(P.access))]
    " - reqform.info += "CONTENTS:
    " - reqform.info += P.manifest - reqform.info += "
    " - reqform.info += "STAMP BELOW TO APPROVE THIS REQUISITION:
    " - - reqform.update_icon() //Fix for appearing blank when printed. - reqtime = (world.time + 5) % 1e5 - - //make our supply_order datum - var/datum/supply_order/O = new /datum/supply_order() - O.ordernum = supply_controller.ordernum - O.object = P - O.orderedby = idname - supply_controller.requestlist += O - - temp = "Order request placed.
    " - temp += "
    Back | Main Menu | Authorize Order" - - else if(href_list["confirmorder"]) - //Find the correct supply_order datum - var/ordernum = text2num(href_list["confirmorder"]) - var/datum/supply_order/O - var/datum/supply_packs/P - temp = "Invalid Request" - for(var/i=1, i<=supply_controller.requestlist.len, i++) - var/datum/supply_order/SO = supply_controller.requestlist[i] - if(SO.ordernum == ordernum) - O = SO - P = O.object - if(supply_controller.points >= P.cost) - supply_controller.requestlist.Cut(i,i+1) - supply_controller.points -= P.cost - supply_controller.shoppinglist += O - temp = "Thanks for your order.
    " - temp += "
    Back Main Menu" - else - temp = "Not enough supply points.
    " - temp += "
    Back Main Menu" - break - - else if (href_list["vieworders"]) - temp = "Current approved orders:

    " - for(var/S in supply_controller.shoppinglist) - var/datum/supply_order/SO = S - temp += "#[SO.ordernum] - [SO.object.name] approved by [SO.orderedby][SO.comment ? " ([SO.comment])":""]
    "// (Cancel)
    " - temp += "
    OK" -/* - else if (href_list["cancelorder"]) - var/datum/supply_order/remove_supply = href_list["cancelorder"] - supply_shuttle_shoppinglist -= remove_supply - supply_shuttle_points += remove_supply.object.cost - temp += "Canceled: [remove_supply.object.name]


    " - - for(var/S in supply_shuttle_shoppinglist) - var/datum/supply_order/SO = S - temp += "[SO.object.name] approved by [SO.orderedby][SO.comment ? " ([SO.comment])":""] (Cancel)
    " - temp += "
    OK" -*/ - else if (href_list["viewrequests"]) - temp = "Current requests:

    " - for(var/S in supply_controller.requestlist) - var/datum/supply_order/SO = S - temp += "#[SO.ordernum] - [SO.object.name] requested by [SO.orderedby] Approve Remove
    " - - temp += "
    Clear list" - temp += "
    OK" - - else if (href_list["rreq"]) - var/ordernum = text2num(href_list["rreq"]) - temp = "Invalid Request.
    " - for(var/i=1, i<=supply_controller.requestlist.len, i++) - var/datum/supply_order/SO = supply_controller.requestlist[i] - if(SO.ordernum == ordernum) - supply_controller.requestlist.Cut(i,i+1) - temp = "Request removed.
    " - break - temp += "
    Back Main Menu" - - else if (href_list["clearreq"]) - supply_controller.requestlist.Cut() - temp = "List cleared.
    " - temp += "
    OK" - - else if (href_list["mainmenu"]) - temp = null - - add_fingerprint(usr) - updateUsrDialog() - return - -/obj/machinery/computer/supplycomp/proc/post_signal(var/command) - - var/datum/radio_frequency/frequency = radio_controller.return_frequency(1435) - - if(!frequency) return - - var/datum/signal/status_signal = new - status_signal.source = src - status_signal.transmission_method = 1 - status_signal.data["command"] = command - - frequency.post_signal(src, status_signal) - - - - From 1a972974bc85db35a1f4c19911ff61eeebecbf4c Mon Sep 17 00:00:00 2001 From: Amunak Date: Wed, 17 Dec 2014 14:31:21 +0100 Subject: [PATCH 20/35] Moves all circuitboards to their respective files. Computer boards are now in /code/game/objects/items/weapons/circuitboards/computer/. Buildable machinery boards are in /code/game/objects/items/weapons/circuitboards/machinery/. Everything else is just in /code/game/objects/items/weapons/circuitboards/. The circuitboard parent definition is in /code/game/objects/items/weapons/circuitboards/circuitboard.dm. Did some minor renaming and capitalization fixes on the boards. --- baystation12.dme | 18 +- .../game/machinery/computer/buildandrepair.dm | 364 ------------------ code/game/machinery/constructable_frame.dm | 247 +----------- code/game/mecha/mecha_parts.dm | 64 +-- .../items/weapons/circuitboards/broken.dm | 6 + .../weapons/circuitboards/circuitboard.dm | 38 ++ .../circuitboards/computer/air_management.dm | 27 ++ .../circuitboards/computer/camera_monitor.dm | 65 ++++ .../circuitboards/computer/computer.dm | 190 +++++++++ .../circuitboards/computer/research.dm | 20 + .../weapons/circuitboards/computer/supply.dm | 39 ++ .../circuitboards/computer/telecomms.dm | 18 + .../circuitboards/machinery/cloning.dm | 28 ++ .../weapons/circuitboards/machinery/pacman.dm | 25 ++ .../weapons/circuitboards/machinery/power.dm | 27 ++ .../circuitboards/machinery/research.dm | 70 ++++ .../circuitboards/machinery/shieldgen.dm} | 10 +- .../circuitboards/machinery/telecomms.dm | 82 ++++ .../circuitboards/machinery/unary_atmos.dm | 35 ++ .../items/weapons/circuitboards/mecha.dm | 88 +++++ .../items/weapons/circuitboards/other.dm | 10 + code/modules/power/batteryrack.dm | 20 - 22 files changed, 796 insertions(+), 695 deletions(-) create mode 100644 code/game/objects/items/weapons/circuitboards/broken.dm create mode 100644 code/game/objects/items/weapons/circuitboards/circuitboard.dm create mode 100644 code/game/objects/items/weapons/circuitboards/computer/air_management.dm create mode 100644 code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm create mode 100644 code/game/objects/items/weapons/circuitboards/computer/computer.dm create mode 100644 code/game/objects/items/weapons/circuitboards/computer/research.dm create mode 100644 code/game/objects/items/weapons/circuitboards/computer/supply.dm create mode 100644 code/game/objects/items/weapons/circuitboards/computer/telecomms.dm create mode 100644 code/game/objects/items/weapons/circuitboards/machinery/cloning.dm create mode 100644 code/game/objects/items/weapons/circuitboards/machinery/pacman.dm create mode 100644 code/game/objects/items/weapons/circuitboards/machinery/power.dm create mode 100644 code/game/objects/items/weapons/circuitboards/machinery/research.dm rename code/{modules/shieldgen/circuits_and_designs.dm => game/objects/items/weapons/circuitboards/machinery/shieldgen.dm} (91%) create mode 100644 code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm create mode 100644 code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm create mode 100644 code/game/objects/items/weapons/circuitboards/mecha.dm create mode 100644 code/game/objects/items/weapons/circuitboards/other.dm diff --git a/baystation12.dme b/baystation12.dme index 905aa258fee..a9731c00214 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -586,6 +586,23 @@ #include "code\game\objects\items\weapons\twohanded.dm" #include "code\game\objects\items\weapons\weaponry.dm" #include "code\game\objects\items\weapons\wires.dm" +#include "code\game\objects\items\weapons\circuitboards\broken.dm" +#include "code\game\objects\items\weapons\circuitboards\circuitboard.dm" +#include "code\game\objects\items\weapons\circuitboards\mecha.dm" +#include "code\game\objects\items\weapons\circuitboards\other.dm" +#include "code\game\objects\items\weapons\circuitboards\computer\air_management.dm" +#include "code\game\objects\items\weapons\circuitboards\computer\camera_monitor.dm" +#include "code\game\objects\items\weapons\circuitboards\computer\computer.dm" +#include "code\game\objects\items\weapons\circuitboards\computer\research.dm" +#include "code\game\objects\items\weapons\circuitboards\computer\supply.dm" +#include "code\game\objects\items\weapons\circuitboards\computer\telecomms.dm" +#include "code\game\objects\items\weapons\circuitboards\machinery\cloning.dm" +#include "code\game\objects\items\weapons\circuitboards\machinery\pacman.dm" +#include "code\game\objects\items\weapons\circuitboards\machinery\research.dm" +#include "code\game\objects\items\weapons\circuitboards\machinery\shieldgen.dm" +#include "code\game\objects\items\weapons\circuitboards\machinery\smes.dm" +#include "code\game\objects\items\weapons\circuitboards\machinery\telecomms.dm" +#include "code\game\objects\items\weapons\circuitboards\machinery\unary_atmos.dm" #include "code\game\objects\items\weapons\grenades\chem_grenade.dm" #include "code\game\objects\items\weapons\grenades\emgrenade.dm" #include "code\game\objects\items\weapons\grenades\flashbang.dm" @@ -1373,7 +1390,6 @@ #include "code\modules\scripting\Scanner\Tokens.dm" #include "code\modules\security levels\keycard authentication.dm" #include "code\modules\security levels\security levels.dm" -#include "code\modules\shieldgen\circuits_and_designs.dm" #include "code\modules\shieldgen\emergency_shield.dm" #include "code\modules\shieldgen\energy_field.dm" #include "code\modules\shieldgen\sheldwallgen.dm" diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 2323355c307..ac648624f26 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -1,10 +1,5 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 -#ifdef T_BOARD -#error T_BOARD already defined elsewhere, we can't use it. -#endif -#define T_BOARD(name) "circuit board (" + (name) + ")" - /obj/structure/computerframe density = 1 anchored = 0 @@ -15,363 +10,6 @@ var/obj/item/weapon/circuitboard/circuit = null // weight = 1.0E8 -/obj/item/weapon/circuitboard - name = "circuit board" - icon = 'icons/obj/module.dmi' - icon_state = "id_mod" - item_state = "electronic" - origin_tech = "programming=2" - density = 0 - anchored = 0 - w_class = 2.0 - flags = FPRINT | TABLEPASS | CONDUCT - force = 5.0 - throwforce = 5.0 - throw_speed = 3 - throw_range = 15 - var/build_path = null - var/board_type = "computer" - var/list/req_components = null - var/frame_desc = null - var/contain_parts = 1 - -//Not sure where else to put this -/obj/item/weapon/circuitboard/broken - name = "broken electronics" - icon = 'icons/obj/doors/door_assembly.dmi' - icon_state = "door_electronics_smoked" - origin_tech = null - board_type = "other" - -//Called when the circuitboard is used to contruct a new machine. -/obj/item/weapon/circuitboard/proc/construct(var/obj/machinery/M) - if (istype(M, build_path)) - return 1 - return 0 - -//Called when a computer is deconstructed to produce a circuitboard. -//Only used by computers, as other machines store their circuitboard instance. -/obj/item/weapon/circuitboard/proc/deconstruct(var/obj/machinery/M) - if (istype(M, build_path)) - return 1 - return 0 - -/* - Circuit Board Definitions -*/ - -/obj/item/weapon/circuitboard/message_monitor - name = T_BOARD("message monitor console") - build_path = /obj/machinery/computer/message_monitor - origin_tech = "programming=3" - -//TODO: Move these into computer/camera.dm -/obj/item/weapon/circuitboard/security - name = T_BOARD("security camera monitor") - build_path = /obj/machinery/computer/security - var/network = list("SS13") - req_access = list(access_security) - var/locked = 1 - var/emagged = 0 - -/obj/item/weapon/circuitboard/security/construct(var/obj/machinery/computer/security/C) - if (..(C)) - C.network = network - -/obj/item/weapon/circuitboard/security/deconstruct(var/obj/machinery/computer/security/C) - if (..(C)) - network = C.network - -/obj/item/weapon/circuitboard/security/engineering - name = T_BOARD("engineering camera monitor") - build_path = /obj/machinery/computer/security/engineering - network = list("Engineering","Power Alarms","Atmosphere Alarms","Fire Alarms") - req_access = list() -/obj/item/weapon/circuitboard/security/mining - name = T_BOARD("mining camera monitor") - build_path = /obj/machinery/computer/security/mining - network = list("MINE") - req_access = list() -/obj/item/weapon/circuitboard/aicore - name = T_BOARD("AI core") - origin_tech = "programming=4;biotech=2" - board_type = "other" -/obj/item/weapon/circuitboard/aiupload - name = T_BOARD("AI upload console") - build_path = /obj/machinery/computer/aiupload - origin_tech = "programming=4" -/obj/item/weapon/circuitboard/borgupload - name = T_BOARD("cyborg upload console") - build_path = /obj/machinery/computer/borgupload - origin_tech = "programming=4" -/obj/item/weapon/circuitboard/med_data - name = T_BOARD("medical records console") - build_path = /obj/machinery/computer/med_data -/obj/item/weapon/circuitboard/pandemic - name = T_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 = T_BOARD("DNA machine") - build_path = /obj/machinery/computer/scan_consolenew - origin_tech = "programming=2;biotech=2" -/obj/item/weapon/circuitboard/communications - name = T_BOARD("command and communications console") - build_path = /obj/machinery/computer/communications - origin_tech = "programming=2;magnets=2" -/obj/item/weapon/circuitboard/card - name = T_BOARD("ID card modification console") - build_path = /obj/machinery/computer/card -/obj/item/weapon/circuitboard/card/centcom - name = T_BOARD("CentCom ID card modification console") - build_path = /obj/machinery/computer/card/centcom -//obj/item/weapon/circuitboard/shield -// name = T_BOARD("shield control console") -// build_path = "/obj/machinery/computer/stationshield" -/obj/item/weapon/circuitboard/teleporter - name = T_BOARD("teleporter control console") - build_path = /obj/machinery/computer/teleporter - origin_tech = "programming=2;bluespace=2" -/obj/item/weapon/circuitboard/secure_data - name = T_BOARD("security records console") - build_path = /obj/machinery/computer/secure_data -/obj/item/weapon/circuitboard/skills - name = T_BOARD("employment records console") - build_path = /obj/machinery/computer/skills -/obj/item/weapon/circuitboard/stationalert - name = T_BOARD("station alert console") - build_path = /obj/machinery/computer/station_alert -///obj/item/weapon/circuitboard/atmospheresiphonswitch -// name = T_BOARD("atmosphere siphon control console") -// build_path = /obj/machinery/computer/atmosphere/siphonswitch -/obj/item/weapon/circuitboard/air_management - name = T_BOARD("atmosphere monitoring console") - build_path = /obj/machinery/computer/general_air_control - var/frequency = 1439 -/obj/item/weapon/circuitboard/air_management/tank_control - name = T_BOARD("tank control") - build_path = /obj/machinery/computer/general_air_control/large_tank_control - frequency = 1441 -/obj/item/weapon/circuitboard/air_management/supermatter_core - name = T_BOARD("core control") - build_path = /obj/machinery/computer/general_air_control/supermatter_core - frequency = 1438 -/obj/item/weapon/circuitboard/air_management/injector_control - name = T_BOARD("injector control") - build_path = /obj/machinery/computer/general_air_control/fuel_injection - -/obj/item/weapon/circuitboard/air_management/construct(var/obj/machinery/computer/general_air_control/C) - if (..(C)) - C.frequency = frequency - -/obj/item/weapon/circuitboard/air_management/deconstruct(var/obj/machinery/computer/general_air_control/C) - if (..(C)) - frequency = C.frequency - -/obj/item/weapon/circuitboard/atmos_alert - name = T_BOARD("atmospheric alert console") - build_path = /obj/machinery/computer/atmos_alert -/obj/item/weapon/circuitboard/pod - name = T_BOARD("massdriver control") - build_path = /obj/machinery/computer/pod -/obj/item/weapon/circuitboard/robotics - name = T_BOARD("robotics control console") - build_path = /obj/machinery/computer/robotics - origin_tech = "programming=3" -/obj/item/weapon/circuitboard/drone_control - name = T_BOARD("drone control console") - build_path = /obj/machinery/computer/drone_control - origin_tech = "programming=3" -/obj/item/weapon/circuitboard/cloning - name = T_BOARD("cloning control console") - build_path = /obj/machinery/computer/cloning - origin_tech = "programming=3;biotech=3" -/obj/item/weapon/circuitboard/arcade - name = T_BOARD("arcade machine") - build_path = /obj/machinery/computer/arcade - origin_tech = "programming=1" -/obj/item/weapon/circuitboard/turbine_control - name = T_BOARD("turbine control console") - build_path = /obj/machinery/computer/turbine_computer -/obj/item/weapon/circuitboard/solar_control - name = T_BOARD("solar control console") - build_path = /obj/machinery/power/solar_control - origin_tech = "programming=2;powerstorage=2" -/obj/item/weapon/circuitboard/powermonitor - name = T_BOARD("power monitoring console") - build_path = /obj/machinery/computer/power_monitor -/obj/item/weapon/circuitboard/olddoor - name = T_BOARD("DoorMex") - build_path = /obj/machinery/computer/pod/old -/obj/item/weapon/circuitboard/syndicatedoor - name = T_BOARD("ProComp Executive") - build_path = /obj/machinery/computer/pod/old/syndicate -/obj/item/weapon/circuitboard/swfdoor - name = T_BOARD("Magix") - build_path = /obj/machinery/computer/pod/old/swf -/obj/item/weapon/circuitboard/prisoner - name = T_BOARD("prisoner management console") - build_path = /obj/machinery/computer/prisoner -/obj/item/weapon/circuitboard/rdconsole - name = T_BOARD("R&D control console") - build_path = /obj/machinery/computer/rdconsole/core -/obj/item/weapon/circuitboard/mecha_control - name = T_BOARD("exosuit control console") - build_path = /obj/machinery/computer/mecha -/obj/item/weapon/circuitboard/rdservercontrol - name = T_BOARD("R&D server control console") - build_path = /obj/machinery/computer/rdservercontrol -/obj/item/weapon/circuitboard/crew - name = T_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 = T_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 = T_BOARD("supply ordering console") - build_path = /obj/machinery/computer/ordercomp - origin_tech = "programming=2" -/obj/item/weapon/circuitboard/supplycomp - name = T_BOARD("supply shuttle console") - build_path = /obj/machinery/computer/supplycomp - origin_tech = "programming=3" - var/contraband_enabled = 0 - -/obj/item/weapon/circuitboard/supplycomp/construct(var/obj/machinery/computer/supplycomp/SC) - if (..(SC)) - SC.can_order_contraband = contraband_enabled - -/obj/item/weapon/circuitboard/supplycomp/deconstruct(var/obj/machinery/computer/supplycomp/SC) - if (..(SC)) - contraband_enabled = SC.can_order_contraband - -/obj/item/weapon/circuitboard/operating - name = T_BOARD("patient monitoring console") - build_path = /obj/machinery/computer/operating - origin_tech = "programming=2;biotech=2" -/obj/item/weapon/circuitboard/comm_monitor - name = T_BOARD("telecommunications monitor console") - build_path = /obj/machinery/computer/telecomms/monitor - origin_tech = "programming=3" -/obj/item/weapon/circuitboard/comm_server - name = T_BOARD("telecommunications server monitor console") - build_path = /obj/machinery/computer/telecomms/server - origin_tech = "programming=3" -/obj/item/weapon/circuitboard/comm_traffic - name = T_BOARD("telecommunications traffic control console") - build_path = /obj/machinery/computer/telecomms/traffic - origin_tech = "programming=3" - -/obj/item/weapon/circuitboard/curefab - name = T_BOARD("cure fabricator") - build_path = /obj/machinery/computer/curer -/obj/item/weapon/circuitboard/splicer - name = T_BOARD("disease splicer") - build_path = /obj/machinery/computer/diseasesplicer -/obj/item/weapon/circuitboard/mining_shuttle - name = T_BOARD("mining shuttle console") - build_path = /obj/machinery/computer/shuttle_control/mining - origin_tech = "programming=2" -/obj/item/weapon/circuitboard/engineering_shuttle - name = T_BOARD("engineering shuttle console") - build_path = /obj/machinery/computer/shuttle_control/engineering - origin_tech = "programming=2" -/obj/item/weapon/circuitboard/research_shuttle - name = T_BOARD("research shuttle console") - build_path = /obj/machinery/computer/shuttle_control/research - origin_tech = "programming=2" -/obj/item/weapon/circuitboard/HolodeckControl // Not going to let people get this, but it's just here for future - name = T_BOARD("holodeck control console") - build_path = /obj/machinery/computer/HolodeckControl - origin_tech = "programming=4" -/obj/item/weapon/circuitboard/aifixer - name = T_BOARD("AI integrity restorer") - build_path = /obj/machinery/computer/aifixer - origin_tech = "programming=3;biotech=2" -/obj/item/weapon/circuitboard/area_atmos - name = T_BOARD("area air control console") - build_path = /obj/machinery/computer/area_atmos - origin_tech = "programming=2" -/obj/item/weapon/circuitboard/prison_shuttle - name = T_BOARD("prison shuttle control console") - build_path = /obj/machinery/computer/prison_shuttle - origin_tech = "programming=2" -/obj/item/weapon/circuitboard/rcon_console - name = T_BOARD("RCON remote control console") - build_path = /obj/machinery/computer/rcon - origin_tech = "programming=4;engineering=3;powerstorage=5" - -/obj/item/weapon/circuitboard/supplycomp/attackby(obj/item/I as obj, mob/user as mob) - if(istype(I,/obj/item/device/multitool)) - var/catastasis = src.contraband_enabled - var/opposite_catastasis - if(catastasis) - opposite_catastasis = "STANDARD" - catastasis = "BROAD" - else - opposite_catastasis = "BROAD" - catastasis = "STANDARD" - - switch( alert("Current receiver spectrum is set to: [catastasis]","Multitool-Circuitboard interface","Switch to [opposite_catastasis]","Cancel") ) - //switch( alert("Current receiver spectrum is set to: " {(src.contraband_enabled) ? ("BROAD") : ("STANDARD")} , "Multitool-Circuitboard interface" , "Switch to " {(src.contraband_enabled) ? ("STANDARD") : ("BROAD")}, "Cancel") ) - if("Switch to STANDARD","Switch to BROAD") - src.contraband_enabled = !src.contraband_enabled - - if("Cancel") - return - else - user << "DERP! BUG! Report this (And what you were doing to cause it) to Agouri" - return - -/obj/item/weapon/circuitboard/security/attackby(obj/item/I as obj, mob/user as mob) - if(istype(I,/obj/item/weapon/card/emag)) - if(emagged) - user << "Circuit lock is already removed." - return - user << "\blue You override the circuit lock and open controls." - emagged = 1 - locked = 0 - else if(istype(I,/obj/item/weapon/card/id)) - if(emagged) - user << "\red Circuit lock does not respond." - return - if(check_access(I)) - locked = !locked - user << "\blue You [locked ? "" : "un"]lock the circuit controls." - else - user << "\red Access denied." - else if(istype(I,/obj/item/device/multitool)) - if(locked) - user << "\red Circuit controls are locked." - return - var/existing_networks = list2text(network,",") - var/input = strip_html(input(usr, "Which networks would you like to connect this camera console circuit to? Seperate networks with a comma. No Spaces!\nFor example: SS13,Security,Secret ", "Multitool-Circuitboard interface", existing_networks)) - if(!input) - usr << "No input found please hang up and try your call again." - return - var/list/tempnetwork = text2list(input, ",") - tempnetwork = difflist(tempnetwork,RESTRICTED_CAMERA_NETWORKS,1) - if(tempnetwork.len < 1) - usr << "No network found please hang up and try your call again." - return - network = tempnetwork - return - -/obj/item/weapon/circuitboard/rdconsole/attackby(obj/item/I as obj, mob/user as mob) - if(istype(I,/obj/item/weapon/screwdriver)) - user.visible_message("\blue \the [user] adjusts the jumper on the [src]'s access protocol pins.", "\blue You adjust the jumper on the access protocol pins.") - if(src.build_path == /obj/machinery/computer/rdconsole/core) - src.name = T_BOARD("RD Console - Robotics") - src.build_path = /obj/machinery/computer/rdconsole/robotics - user << "\blue Access protocols set to robotics." - else - src.name = T_BOARD("RD Console") - src.build_path = /obj/machinery/computer/rdconsole/core - user << "\blue Access protocols set to default." - return - /obj/structure/computerframe/attackby(obj/item/P as obj, mob/user as mob) switch(state) if(0) @@ -474,5 +112,3 @@ var/B = new src.circuit.build_path ( src.loc ) src.circuit.construct(B) del(src) - -#undef T_BOARD diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 085550f61dc..0f906ad4b28 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -1,5 +1,7 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 +//Circuit boards are in /code/game/objects/items/weapons/circuitboards/machinery/ + /obj/machinery/constructable_frame //Made into a seperate type to make future revisions easier. name = "machine frame" icon = 'icons/obj/stock_parts.dmi' @@ -154,248 +156,3 @@ user << desc if(P && P.loc != src && !istype(P, /obj/item/stack/cable_coil)) user << "\red You cannot add that component to the machine!" - - -//Machine Frame Circuit Boards -/*Common Parts: Parts List: Ignitor, Timer, Infra-red laser, Infra-red sensor, t_scanner, Capacitor, Valve, sensor unit, -micro-manipulator, console screen, beaker, Microlaser, matter bin, power cells. -Note: Once everything is added to the public areas, will add materials to circuit boards since autolathe won't be able -to destroy them and players will be able to make replacements. -*/ -/obj/item/weapon/circuitboard/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" - frame_desc = "Requires 1 Scanning Module, 1 Micro Manipulator, and 1 Micro-Laser." - req_components = list( - "/obj/item/weapon/stock_parts/scanning_module" = 1, - "/obj/item/weapon/stock_parts/manipulator" = 1, - "/obj/item/weapon/stock_parts/micro_laser" = 1) - -/obj/item/weapon/circuitboard/autolathe - name = "Circuit board (Autolathe)" - build_path = "/obj/machinery/autolathe" - board_type = "machine" - origin_tech = "engineering=2;programming=2" - frame_desc = "Requires 3 Matter Bins, 1 Micro Manipulator, and 1 Console Screen." - req_components = list( - "/obj/item/weapon/stock_parts/matter_bin" = 3, - "/obj/item/weapon/stock_parts/manipulator" = 1, - "/obj/item/weapon/stock_parts/console_screen" = 1) - -/obj/item/weapon/circuitboard/protolathe - name = "Circuit board (Protolathe)" - build_path = "/obj/machinery/r_n_d/protolathe" - board_type = "machine" - origin_tech = "engineering=2;programming=2" - frame_desc = "Requires 2 Matter Bins, 2 Micro Manipulators, and 2 Beakers." - req_components = list( - "/obj/item/weapon/stock_parts/matter_bin" = 2, - "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/weapon/reagent_containers/glass/beaker" = 2) - - -/obj/item/weapon/circuitboard/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" - frame_desc = "Requires 1 Matter Bin, 1 Micro Manipulator, and 2 Beakers." - req_components = list( - "/obj/item/weapon/stock_parts/matter_bin" = 1, - "/obj/item/weapon/stock_parts/manipulator" = 1, - "/obj/item/weapon/reagent_containers/glass/beaker" = 2) - -/obj/item/weapon/circuitboard/pacman - name = "Circuit Board (PACMAN-type Generator)" - build_path = "/obj/machinery/power/port_gen/pacman" - board_type = "machine" - origin_tech = "programming=3;powerstorage=3;phorontech=3;engineering=3" - frame_desc = "Requires 1 Matter Bin, 1 Micro-Laser, 2 Pieces of Cable, and 1 Capacitor." - req_components = list( - "/obj/item/weapon/stock_parts/matter_bin" = 1, - "/obj/item/weapon/stock_parts/micro_laser" = 1, - "/obj/item/stack/cable_coil" = 2, - "/obj/item/weapon/stock_parts/capacitor" = 1) - -/obj/item/weapon/circuitboard/pacman/super - 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)" - 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)" - build_path = "/obj/machinery/r_n_d/server" - board_type = "machine" - origin_tech = "programming=3" - frame_desc = "Requires 2 pieces of cable, and 1 Scanning Module." - req_components = list( - "/obj/item/stack/cable_coil" = 2, - "/obj/item/weapon/stock_parts/scanning_module" = 1) - -/obj/item/weapon/circuitboard/mechfab - name = "Circuit board (Exosuit Fabricator)" - build_path = "/obj/machinery/mecha_part_fabricator" - board_type = "machine" - origin_tech = "programming=3;engineering=3" - frame_desc = "Requires 2 Matter Bins, 1 Micro Manipulator, 1 Micro-Laser and 1 Console Screen." - req_components = list( - "/obj/item/weapon/stock_parts/matter_bin" = 2, - "/obj/item/weapon/stock_parts/manipulator" = 1, - "/obj/item/weapon/stock_parts/micro_laser" = 1, - "/obj/item/weapon/stock_parts/console_screen" = 1) - -/obj/item/weapon/circuitboard/clonepod - name = "Circuit board (Clone Pod)" - build_path = "/obj/machinery/clonepod" - board_type = "machine" - origin_tech = "programming=3;biotech=3" - frame_desc = "Requires 2 Manipulator, 2 Scanning Module, 2 pieces of cable and 1 Console Screen." - req_components = list( - "/obj/item/stack/cable_coil" = 2, - "/obj/item/weapon/stock_parts/scanning_module" = 2, - "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/weapon/stock_parts/console_screen" = 1) - -/obj/item/weapon/circuitboard/clonescanner - name = "Circuit board (Cloning Scanner)" - build_path = "/obj/machinery/dna_scannernew" - board_type = "machine" - origin_tech = "programming=2;biotech=2" - frame_desc = "Requires 1 Scanning module, 1 Micro Manipulator, 1 Micro-Laser, 2 pieces of cable and 1 Console Screen." - req_components = list( - "/obj/item/weapon/stock_parts/scanning_module" = 1, - "/obj/item/weapon/stock_parts/manipulator" = 1, - "/obj/item/weapon/stock_parts/micro_laser" = 1, - "/obj/item/weapon/stock_parts/console_screen" = 1, - "/obj/item/stack/cable_coil" = 2,) - -/obj/item/weapon/circuitboard/unary_atmos - board_type = "machine" - -/obj/item/weapon/circuitboard/unary_atmos/construct(var/obj/machinery/atmospherics/unary/U) - //TODO: Move this stuff into the relevant constructor when pipe/construction.dm is cleaned up. - U.initialize() - U.build_network() - if (U.node) - U.node.initialize() - U.node.build_network() - -/obj/item/weapon/circuitboard/unary_atmos/heater - name = "Circuit Board (Gas Heating System)" - build_path = "/obj/machinery/atmospherics/unary/heater" - origin_tech = "powerstorage=2;engineering=1" - frame_desc = "Requires 5 Pieces of Cable, 1 Matter Bin, and 2 Capacitors." - req_components = list( - "/obj/item/stack/cable_coil" = 5, - "/obj/item/weapon/stock_parts/matter_bin" = 1, - "/obj/item/weapon/stock_parts/capacitor" = 2) - -/obj/item/weapon/circuitboard/unary_atmos/cooler - name = "Circuit Board (Gas Cooling System)" - build_path = "/obj/machinery/atmospherics/unary/freezer" - origin_tech = "magnets=2;engineering=2" - frame_desc = "Requires 2 Pieces of Cable, 1 Matter Bin, 1 Micro Manipulator, and 2 Capacitors." - req_components = list( - "/obj/item/stack/cable_coil" = 2, - "/obj/item/weapon/stock_parts/matter_bin" = 1, - "/obj/item/weapon/stock_parts/capacitor" = 2, - "/obj/item/weapon/stock_parts/manipulator" = 1) - -/obj/item/weapon/circuitboard/smes - name = "Circuit Board (Superconductive Magnetic Energy Storage)" - build_path = "/obj/machinery/power/smes/buildable" - board_type = "machine" - origin_tech = "powerstorage=6;engineering=4" - frame_desc = "Requires 1 superconducting magnetic coil and 30 wires." - req_components = list("/obj/item/weapon/smes_coil" = 1, "/obj/item/stack/cable_coil" = 30) - -// Telecomms circuit boards: -/obj/item/weapon/circuitboard/telecomms/receiver - name = "Circuit Board (Subspace Receiver)" - build_path = "/obj/machinery/telecomms/receiver" - board_type = "machine" - origin_tech = "programming=4;engineering=3;bluespace=2" - frame_desc = "Requires 1 Subspace Ansible, 1 Hyperwave Filter, 2 Micro Manipulators, and 1 Micro-Laser." - req_components = list( - "/obj/item/weapon/stock_parts/subspace/ansible" = 1, - "/obj/item/weapon/stock_parts/subspace/filter" = 1, - "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/weapon/stock_parts/micro_laser" = 1) - -/obj/item/weapon/circuitboard/telecomms/hub - name = "Circuit Board (Hub Mainframe)" - build_path = "/obj/machinery/telecomms/hub" - board_type = "machine" - origin_tech = "programming=4;engineering=4" - frame_desc = "Requires 2 Micro Manipulators, 2 Cable Coil and 2 Hyperwave Filter." - req_components = list( - "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/stack/cable_coil" = 2, - "/obj/item/weapon/stock_parts/subspace/filter" = 2) - -/obj/item/weapon/circuitboard/telecomms/relay - name = "Circuit Board (Relay Mainframe)" - build_path = "/obj/machinery/telecomms/relay" - board_type = "machine" - origin_tech = "programming=3;engineering=4;bluespace=3" - frame_desc = "Requires 2 Micro Manipulators, 2 Cable Coil and 2 Hyperwave Filters." - req_components = list( - "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/stack/cable_coil" = 2, - "/obj/item/weapon/stock_parts/subspace/filter" = 2) - -/obj/item/weapon/circuitboard/telecomms/bus - name = "Circuit Board (Bus Mainframe)" - build_path = "/obj/machinery/telecomms/bus" - board_type = "machine" - origin_tech = "programming=4;engineering=4" - frame_desc = "Requires 2 Micro Manipulators, 1 Cable Coil and 1 Hyperwave Filter." - req_components = list( - "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/stack/cable_coil" = 1, - "/obj/item/weapon/stock_parts/subspace/filter" = 1) - -/obj/item/weapon/circuitboard/telecomms/processor - name = "Circuit Board (Processor Unit)" - build_path = "/obj/machinery/telecomms/processor" - board_type = "machine" - origin_tech = "programming=4;engineering=4" - frame_desc = "Requires 3 Micro Manipulators, 1 Hyperwave Filter, 2 Treatment Disks, 1 Wavelength Analyzer, 2 Cable Coils and 1 Subspace Amplifier." - req_components = list( - "/obj/item/weapon/stock_parts/manipulator" = 3, - "/obj/item/weapon/stock_parts/subspace/filter" = 1, - "/obj/item/weapon/stock_parts/subspace/treatment" = 2, - "/obj/item/weapon/stock_parts/subspace/analyzer" = 1, - "/obj/item/stack/cable_coil" = 2, - "/obj/item/weapon/stock_parts/subspace/amplifier" = 1) - -/obj/item/weapon/circuitboard/telecomms/server - name = "Circuit Board (Telecommunication Server)" - build_path = "/obj/machinery/telecomms/server" - board_type = "machine" - origin_tech = "programming=4;engineering=4" - frame_desc = "Requires 2 Micro Manipulators, 1 Cable Coil and 1 Hyperwave Filter." - req_components = list( - "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/stack/cable_coil" = 1, - "/obj/item/weapon/stock_parts/subspace/filter" = 1) - -/obj/item/weapon/circuitboard/telecomms/broadcaster - name = "Circuit Board (Subspace Broadcaster)" - build_path = "/obj/machinery/telecomms/broadcaster" - board_type = "machine" - origin_tech = "programming=4;engineering=4;bluespace=2" - frame_desc = "Requires 2 Micro Manipulators, 1 Cable Coil, 1 Hyperwave Filter, 1 Ansible Crystal and 2 High-Powered Micro-Lasers. " - req_components = list( - "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/stack/cable_coil" = 1, - "/obj/item/weapon/stock_parts/subspace/filter" = 1, - "/obj/item/weapon/stock_parts/subspace/crystal" = 1, - "/obj/item/weapon/stock_parts/micro_laser/high" = 2) diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm index 3af04a8f3fb..b9a6ab4e785 100644 --- a/code/game/mecha/mecha_parts.dm +++ b/code/game/mecha/mecha_parts.dm @@ -2,6 +2,8 @@ ////// Mecha Parts ////// ///////////////////////// +// Mecha circuitboards can be found in /code/game/objects/items/weapons/circuitboards/mecha.dm + /obj/item/mecha_parts name = "mecha part" icon = 'icons/mecha/mech_construct.dmi' @@ -347,65 +349,3 @@ origin_tech = "materials=3;engineering=3" construction_time = 200 construction_cost = list("metal"=15000)*/ - - -///////// Circuitboards - -/obj/item/weapon/circuitboard/mecha - name = "exosuit circuit board" - icon = 'icons/obj/module.dmi' - icon_state = "std_mod" - item_state = "electronic" - board_type = "other" - -/obj/item/weapon/circuitboard/mecha/ripley - origin_tech = "programming=3" -/obj/item/weapon/circuitboard/mecha/ripley/peripherals - name = "Circuit board (Ripley Peripherals Control module)" - icon_state = "mcontroller" -/obj/item/weapon/circuitboard/mecha/ripley/main - name = "Circuit board (Ripley Central Control module)" - icon_state = "mainboard" -/obj/item/weapon/circuitboard/mecha/gygax - origin_tech = "programming=4" -/obj/item/weapon/circuitboard/mecha/gygax/peripherals - name = "Circuit board (Gygax Peripherals Control module)" - icon_state = "mcontroller" -/obj/item/weapon/circuitboard/mecha/gygax/targeting - name = "Circuit board (Gygax Weapon Control and Targeting module)" - icon_state = "mcontroller" - origin_tech = "programming=4;combat=4" -/obj/item/weapon/circuitboard/mecha/gygax/main - name = "Circuit board (Gygax Central Control module)" - icon_state = "mainboard" -/obj/item/weapon/circuitboard/mecha/durand - origin_tech = "programming=4" -/obj/item/weapon/circuitboard/mecha/durand/peripherals - name = "Circuit board (Durand Peripherals Control module)" - icon_state = "mcontroller" -/obj/item/weapon/circuitboard/mecha/durand/targeting - name = "Circuit board (Durand Weapon Control and Targeting module)" - icon_state = "mcontroller" - origin_tech = "programming=4;combat=4" -/obj/item/weapon/circuitboard/mecha/durand/main - name = "Circuit board (Durand Central Control module)" - icon_state = "mainboard" -/obj/item/weapon/circuitboard/mecha/honker - origin_tech = "programming=4" -/obj/item/weapon/circuitboard/mecha/honker/peripherals - name = "Circuit board (H.O.N.K Peripherals Control module)" - icon_state = "mcontroller" -/obj/item/weapon/circuitboard/mecha/honker/targeting - name = "Circuit board (H.O.N.K Weapon Control and Targeting module)" - icon_state = "mcontroller" -/obj/item/weapon/circuitboard/mecha/honker/main - name = "Circuit board (H.O.N.K Central Control module)" - icon_state = "mainboard" -/obj/item/weapon/circuitboard/mecha/odysseus - origin_tech = "programming=3" -/obj/item/weapon/circuitboard/mecha/odysseus/peripherals - name = "Circuit board (Odysseus Peripherals Control module)" - icon_state = "mcontroller" -/obj/item/weapon/circuitboard/mecha/odysseus/main - name = "Circuit board (Odysseus Central Control module)" - icon_state = "mainboard" diff --git a/code/game/objects/items/weapons/circuitboards/broken.dm b/code/game/objects/items/weapons/circuitboards/broken.dm new file mode 100644 index 00000000000..ce2cbb72603 --- /dev/null +++ b/code/game/objects/items/weapons/circuitboards/broken.dm @@ -0,0 +1,6 @@ +/obj/item/weapon/circuitboard/broken + name = "broken electronics" + icon = 'icons/obj/doors/door_assembly.dmi' + icon_state = "door_electronics_smoked" + origin_tech = null + board_type = "other" diff --git a/code/game/objects/items/weapons/circuitboards/circuitboard.dm b/code/game/objects/items/weapons/circuitboards/circuitboard.dm new file mode 100644 index 00000000000..bc44b3d7dff --- /dev/null +++ b/code/game/objects/items/weapons/circuitboards/circuitboard.dm @@ -0,0 +1,38 @@ +//Define a macro that we can use to assemble all the circuit board names +#ifdef T_BOARD +#error T_BOARD already defined elsewhere, we can't use it. +#endif +#define T_BOARD(name) "circuit board (" + (name) + ")" + +/obj/item/weapon/circuitboard + name = "circuit board" + icon = 'icons/obj/module.dmi' + icon_state = "id_mod" + item_state = "electronic" + origin_tech = "programming=2" + density = 0 + anchored = 0 + w_class = 2.0 + flags = FPRINT | TABLEPASS | CONDUCT + force = 5.0 + throwforce = 5.0 + throw_speed = 3 + throw_range = 15 + var/build_path = null + var/board_type = "computer" + var/list/req_components = null + var/frame_desc = null + var/contain_parts = 1 + +//Called when the circuitboard is used to contruct a new machine. +/obj/item/weapon/circuitboard/proc/construct(var/obj/machinery/M) + if (istype(M, build_path)) + return 1 + return 0 + +//Called when a computer is deconstructed to produce a circuitboard. +//Only used by computers, as other machines store their circuitboard instance. +/obj/item/weapon/circuitboard/proc/deconstruct(var/obj/machinery/M) + if (istype(M, build_path)) + return 1 + return 0 diff --git a/code/game/objects/items/weapons/circuitboards/computer/air_management.dm b/code/game/objects/items/weapons/circuitboards/computer/air_management.dm new file mode 100644 index 00000000000..d244fd6b5c0 --- /dev/null +++ b/code/game/objects/items/weapons/circuitboards/computer/air_management.dm @@ -0,0 +1,27 @@ +#ifndef T_BOARD +#error T_BOARD macro is not defined but we need it! +#endif + +/obj/item/weapon/circuitboard/air_management + name = T_BOARD("atmosphere monitoring console") + build_path = /obj/machinery/computer/general_air_control + var/frequency = 1439 +/obj/item/weapon/circuitboard/air_management/tank_control + name = T_BOARD("tank control") + build_path = /obj/machinery/computer/general_air_control/large_tank_control + frequency = 1441 +/obj/item/weapon/circuitboard/air_management/supermatter_core + name = T_BOARD("core control") + build_path = /obj/machinery/computer/general_air_control/supermatter_core + frequency = 1438 +/obj/item/weapon/circuitboard/air_management/injector_control + name = T_BOARD("injector control") + build_path = /obj/machinery/computer/general_air_control/fuel_injection + +/obj/item/weapon/circuitboard/air_management/construct(var/obj/machinery/computer/general_air_control/C) + if (..(C)) + C.frequency = frequency + +/obj/item/weapon/circuitboard/air_management/deconstruct(var/obj/machinery/computer/general_air_control/C) + if (..(C)) + frequency = C.frequency diff --git a/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm b/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm new file mode 100644 index 00000000000..f87123422e2 --- /dev/null +++ b/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm @@ -0,0 +1,65 @@ +#ifndef T_BOARD +#error T_BOARD macro is not defined but we need it! +#endif + +/obj/item/weapon/circuitboard/security + name = T_BOARD("security camera monitor") + build_path = /obj/machinery/computer/security + var/network = list("SS13") + req_access = list(access_security) + var/locked = 1 + var/emagged = 0 + +/obj/item/weapon/circuitboard/security/engineering + name = T_BOARD("engineering camera monitor") + build_path = /obj/machinery/computer/security/engineering + network = list("Engineering","Power Alarms","Atmosphere Alarms","Fire Alarms") + req_access = list() + +/obj/item/weapon/circuitboard/security/mining + name = T_BOARD("mining camera monitor") + build_path = /obj/machinery/computer/security/mining + network = list("MINE") + req_access = list() + +/obj/item/weapon/circuitboard/security/construct(var/obj/machinery/computer/security/C) + if (..(C)) + C.network = network + +/obj/item/weapon/circuitboard/security/deconstruct(var/obj/machinery/computer/security/C) + if (..(C)) + network = C.network + +/obj/item/weapon/circuitboard/security/attackby(obj/item/I as obj, mob/user as mob) + if(istype(I,/obj/item/weapon/card/emag)) + if(emagged) + user << "Circuit lock is already removed." + return + user << "\blue You override the circuit lock and open controls." + emagged = 1 + locked = 0 + else if(istype(I,/obj/item/weapon/card/id)) + if(emagged) + user << "\red Circuit lock does not respond." + return + if(check_access(I)) + locked = !locked + user << "\blue You [locked ? "" : "un"]lock the circuit controls." + else + user << "\red Access denied." + else if(istype(I,/obj/item/device/multitool)) + if(locked) + user << "\red Circuit controls are locked." + return + var/existing_networks = list2text(network,",") + var/input = strip_html(input(usr, "Which networks would you like to connect this camera console circuit to? Seperate networks with a comma. No Spaces!\nFor example: SS13,Security,Secret ", "Multitool-Circuitboard interface", existing_networks)) + if(!input) + usr << "No input found please hang up and try your call again." + return + var/list/tempnetwork = text2list(input, ",") + tempnetwork = difflist(tempnetwork,RESTRICTED_CAMERA_NETWORKS,1) + if(tempnetwork.len < 1) + usr << "No network found please hang up and try your call again." + return + network = tempnetwork + return diff --git a/code/game/objects/items/weapons/circuitboards/computer/computer.dm b/code/game/objects/items/weapons/circuitboards/computer/computer.dm new file mode 100644 index 00000000000..281f31869c7 --- /dev/null +++ b/code/game/objects/items/weapons/circuitboards/computer/computer.dm @@ -0,0 +1,190 @@ +#ifndef T_BOARD +#error T_BOARD macro is not defined but we need it! +#endif + +/obj/item/weapon/circuitboard/message_monitor + name = T_BOARD("message monitor console") + build_path = /obj/machinery/computer/message_monitor + origin_tech = "programming=3" + +/obj/item/weapon/circuitboard/aiupload + name = T_BOARD("AI upload console") + build_path = /obj/machinery/computer/aiupload + origin_tech = "programming=4" + +/obj/item/weapon/circuitboard/borgupload + name = T_BOARD("cyborg upload console") + build_path = /obj/machinery/computer/borgupload + origin_tech = "programming=4" + +/obj/item/weapon/circuitboard/med_data + name = T_BOARD("medical records console") + build_path = /obj/machinery/computer/med_data + +/obj/item/weapon/circuitboard/pandemic + name = T_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 = T_BOARD("DNA machine") + build_path = /obj/machinery/computer/scan_consolenew + origin_tech = "programming=2;biotech=2" + +/obj/item/weapon/circuitboard/communications + name = T_BOARD("command and communications console") + build_path = /obj/machinery/computer/communications + origin_tech = "programming=2;magnets=2" + +/obj/item/weapon/circuitboard/card + name = T_BOARD("ID card modification console") + build_path = /obj/machinery/computer/card + +/obj/item/weapon/circuitboard/card/centcom + name = T_BOARD("CentCom ID card modification console") + build_path = /obj/machinery/computer/card/centcom + +/obj/item/weapon/circuitboard/teleporter + name = T_BOARD("teleporter control console") + build_path = /obj/machinery/computer/teleporter + origin_tech = "programming=2;bluespace=2" + +/obj/item/weapon/circuitboard/secure_data + name = T_BOARD("security records console") + build_path = /obj/machinery/computer/secure_data + +/obj/item/weapon/circuitboard/skills + name = T_BOARD("employment records console") + build_path = /obj/machinery/computer/skills + +/obj/item/weapon/circuitboard/stationalert + name = T_BOARD("station alert console") + build_path = /obj/machinery/computer/station_alert + +/obj/item/weapon/circuitboard/atmos_alert + name = T_BOARD("atmospheric alert console") + build_path = /obj/machinery/computer/atmos_alert + +/obj/item/weapon/circuitboard/pod + name = T_BOARD("massdriver control") + build_path = /obj/machinery/computer/pod + +/obj/item/weapon/circuitboard/robotics + name = T_BOARD("robotics control console") + build_path = /obj/machinery/computer/robotics + origin_tech = "programming=3" + +/obj/item/weapon/circuitboard/drone_control + name = T_BOARD("drone control console") + build_path = /obj/machinery/computer/drone_control + origin_tech = "programming=3" + +/obj/item/weapon/circuitboard/cloning + name = T_BOARD("cloning control console") + build_path = /obj/machinery/computer/cloning + origin_tech = "programming=3;biotech=3" + +/obj/item/weapon/circuitboard/arcade + name = T_BOARD("arcade machine") + build_path = /obj/machinery/computer/arcade + origin_tech = "programming=1" + +/obj/item/weapon/circuitboard/turbine_control + name = T_BOARD("turbine control console") + build_path = /obj/machinery/computer/turbine_computer + +/obj/item/weapon/circuitboard/solar_control + name = T_BOARD("solar control console") + build_path = /obj/machinery/power/solar_control + origin_tech = "programming=2;powerstorage=2" + +/obj/item/weapon/circuitboard/powermonitor + name = T_BOARD("power monitoring console") + build_path = /obj/machinery/computer/power_monitor + +/obj/item/weapon/circuitboard/olddoor + name = T_BOARD("DoorMex") + build_path = /obj/machinery/computer/pod/old + +/obj/item/weapon/circuitboard/syndicatedoor + name = T_BOARD("ProComp Executive") + build_path = /obj/machinery/computer/pod/old/syndicate + +/obj/item/weapon/circuitboard/swfdoor + name = T_BOARD("Magix") + build_path = /obj/machinery/computer/pod/old/swf + +/obj/item/weapon/circuitboard/prisoner + name = T_BOARD("prisoner management console") + build_path = /obj/machinery/computer/prisoner + +/obj/item/weapon/circuitboard/mecha_control + name = T_BOARD("exosuit control console") + build_path = /obj/machinery/computer/mecha + +/obj/item/weapon/circuitboard/rdservercontrol + name = T_BOARD("R&D server control console") + build_path = /obj/machinery/computer/rdservercontrol + +/obj/item/weapon/circuitboard/crew + name = T_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 = T_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/operating + name = T_BOARD("patient monitoring console") + build_path = /obj/machinery/computer/operating + origin_tech = "programming=2;biotech=2" + +/obj/item/weapon/circuitboard/curefab + name = T_BOARD("cure fabricator") + build_path = /obj/machinery/computer/curer + +/obj/item/weapon/circuitboard/splicer + name = T_BOARD("disease splicer") + build_path = /obj/machinery/computer/diseasesplicer + +/obj/item/weapon/circuitboard/ordercomp + name = T_BOARD("supply ordering console") + build_path = /obj/machinery/computer/ordercomp + origin_tech = "programming=2" + +/obj/item/weapon/circuitboard/mining_shuttle + name = T_BOARD("mining shuttle console") + build_path = /obj/machinery/computer/shuttle_control/mining + origin_tech = "programming=2" + +/obj/item/weapon/circuitboard/engineering_shuttle + name = T_BOARD("engineering shuttle console") + build_path = /obj/machinery/computer/shuttle_control/engineering + origin_tech = "programming=2" + +/obj/item/weapon/circuitboard/research_shuttle + name = T_BOARD("research shuttle console") + build_path = /obj/machinery/computer/shuttle_control/research + origin_tech = "programming=2" + +/obj/item/weapon/circuitboard/aifixer + name = T_BOARD("AI integrity restorer") + build_path = /obj/machinery/computer/aifixer + origin_tech = "programming=3;biotech=2" + +/obj/item/weapon/circuitboard/area_atmos + name = T_BOARD("area air control console") + build_path = /obj/machinery/computer/area_atmos + origin_tech = "programming=2" + +/obj/item/weapon/circuitboard/prison_shuttle + name = T_BOARD("prison shuttle control console") + build_path = /obj/machinery/computer/prison_shuttle + origin_tech = "programming=2" + +/obj/item/weapon/circuitboard/rcon_console + name = T_BOARD("RCON remote control console") + build_path = /obj/machinery/computer/rcon + origin_tech = "programming=4;engineering=3;powerstorage=5" diff --git a/code/game/objects/items/weapons/circuitboards/computer/research.dm b/code/game/objects/items/weapons/circuitboards/computer/research.dm new file mode 100644 index 00000000000..48ab7333cec --- /dev/null +++ b/code/game/objects/items/weapons/circuitboards/computer/research.dm @@ -0,0 +1,20 @@ +#ifndef T_BOARD +#error T_BOARD macro is not defined but we need it! +#endif + +/obj/item/weapon/circuitboard/rdconsole + name = T_BOARD("R&D control console") + build_path = /obj/machinery/computer/rdconsole/core + +/obj/item/weapon/circuitboard/rdconsole/attackby(obj/item/I as obj, mob/user as mob) + if(istype(I,/obj/item/weapon/screwdriver)) + user.visible_message("\blue \the [user] adjusts the jumper on the [src]'s access protocol pins.", "\blue You adjust the jumper on the access protocol pins.") + if(src.build_path == /obj/machinery/computer/rdconsole/core) + src.name = T_BOARD("RD Console - Robotics") + src.build_path = /obj/machinery/computer/rdconsole/robotics + user << "\blue Access protocols set to robotics." + else + src.name = T_BOARD("RD Console") + src.build_path = /obj/machinery/computer/rdconsole/core + user << "\blue Access protocols set to default." + return diff --git a/code/game/objects/items/weapons/circuitboards/computer/supply.dm b/code/game/objects/items/weapons/circuitboards/computer/supply.dm new file mode 100644 index 00000000000..84c9aa3476c --- /dev/null +++ b/code/game/objects/items/weapons/circuitboards/computer/supply.dm @@ -0,0 +1,39 @@ +#ifndef T_BOARD +#error T_BOARD macro is not defined but we need it! +#endif + +/obj/item/weapon/circuitboard/supplycomp + name = T_BOARD("supply control console") + build_path = /obj/machinery/computer/supplycomp + origin_tech = "programming=3" + var/contraband_enabled = 0 + +/obj/item/weapon/circuitboard/supplycomp/construct(var/obj/machinery/computer/supplycomp/SC) + if (..(SC)) + SC.can_order_contraband = contraband_enabled + +/obj/item/weapon/circuitboard/supplycomp/deconstruct(var/obj/machinery/computer/supplycomp/SC) + if (..(SC)) + contraband_enabled = SC.can_order_contraband + +/obj/item/weapon/circuitboard/supplycomp/attackby(obj/item/I as obj, mob/user as mob) + if(istype(I,/obj/item/device/multitool)) + var/catastasis = src.contraband_enabled + var/opposite_catastasis + if(catastasis) + opposite_catastasis = "STANDARD" + catastasis = "BROAD" + else + opposite_catastasis = "BROAD" + catastasis = "STANDARD" + + switch( alert("Current receiver spectrum is set to: [catastasis]","Multitool-Circuitboard interface","Switch to [opposite_catastasis]","Cancel") ) + //switch( alert("Current receiver spectrum is set to: " {(src.contraband_enabled) ? ("BROAD") : ("STANDARD")} , "Multitool-Circuitboard interface" , "Switch to " {(src.contraband_enabled) ? ("STANDARD") : ("BROAD")}, "Cancel") ) + if("Switch to STANDARD","Switch to BROAD") + src.contraband_enabled = !src.contraband_enabled + + if("Cancel") + return + else + user << "DERP! BUG! Report this (And what you were doing to cause it) to Agouri" + return diff --git a/code/game/objects/items/weapons/circuitboards/computer/telecomms.dm b/code/game/objects/items/weapons/circuitboards/computer/telecomms.dm new file mode 100644 index 00000000000..9a18f0df99f --- /dev/null +++ b/code/game/objects/items/weapons/circuitboards/computer/telecomms.dm @@ -0,0 +1,18 @@ +#ifndef T_BOARD +#error T_BOARD macro is not defined but we need it! +#endif + +/obj/item/weapon/circuitboard/comm_monitor + name = T_BOARD("telecommunications monitor console") + build_path = /obj/machinery/computer/telecomms/monitor + origin_tech = "programming=3" + +/obj/item/weapon/circuitboard/comm_server + name = T_BOARD("telecommunications server monitor console") + build_path = /obj/machinery/computer/telecomms/server + origin_tech = "programming=3" + +/obj/item/weapon/circuitboard/comm_traffic + name = T_BOARD("telecommunications traffic control console") + build_path = /obj/machinery/computer/telecomms/traffic + origin_tech = "programming=3" diff --git a/code/game/objects/items/weapons/circuitboards/machinery/cloning.dm b/code/game/objects/items/weapons/circuitboards/machinery/cloning.dm new file mode 100644 index 00000000000..fdc0865f9cb --- /dev/null +++ b/code/game/objects/items/weapons/circuitboards/machinery/cloning.dm @@ -0,0 +1,28 @@ +#ifndef T_BOARD +#error T_BOARD macro is not defined but we need it! +#endif + +/obj/item/weapon/circuitboard/clonepod + name = T_BOARD("clone pod") + build_path = "/obj/machinery/clonepod" + board_type = "machine" + origin_tech = "programming=3;biotech=3" + frame_desc = "Requires 2 Manipulator, 2 Scanning Module, 2 pieces of cable and 1 Console Screen." + req_components = list( + "/obj/item/stack/cable_coil" = 2, + "/obj/item/weapon/stock_parts/scanning_module" = 2, + "/obj/item/weapon/stock_parts/manipulator" = 2, + "/obj/item/weapon/stock_parts/console_screen" = 1) + +/obj/item/weapon/circuitboard/clonescanner + name = T_BOARD("cloning scanner") + build_path = "/obj/machinery/dna_scannernew" + board_type = "machine" + origin_tech = "programming=2;biotech=2" + frame_desc = "Requires 1 Scanning module, 1 Micro Manipulator, 1 Micro-Laser, 2 pieces of cable and 1 Console Screen." + req_components = list( + "/obj/item/weapon/stock_parts/scanning_module" = 1, + "/obj/item/weapon/stock_parts/manipulator" = 1, + "/obj/item/weapon/stock_parts/micro_laser" = 1, + "/obj/item/weapon/stock_parts/console_screen" = 1, + "/obj/item/stack/cable_coil" = 2) diff --git a/code/game/objects/items/weapons/circuitboards/machinery/pacman.dm b/code/game/objects/items/weapons/circuitboards/machinery/pacman.dm new file mode 100644 index 00000000000..77d313e414c --- /dev/null +++ b/code/game/objects/items/weapons/circuitboards/machinery/pacman.dm @@ -0,0 +1,25 @@ +#ifndef T_BOARD +#error T_BOARD macro is not defined but we need it! +#endif + +/obj/item/weapon/circuitboard/pacman + name = T_BOARD("PACMAN-type generator") + build_path = "/obj/machinery/power/port_gen/pacman" + board_type = "machine" + origin_tech = "programming=3;powerstorage=3;phorontech=3;engineering=3" + frame_desc = "Requires 1 Matter Bin, 1 Micro-Laser, 2 Pieces of Cable, and 1 Capacitor." + req_components = list( + "/obj/item/weapon/stock_parts/matter_bin" = 1, + "/obj/item/weapon/stock_parts/micro_laser" = 1, + "/obj/item/stack/cable_coil" = 2, + "/obj/item/weapon/stock_parts/capacitor" = 1) + +/obj/item/weapon/circuitboard/pacman/super + name = T_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 = T_BOARD("MRSPACMAN-type generator") + build_path = "/obj/machinery/power/port_gen/pacman/mrs" + origin_tech = "programming=3;powerstorage=5;engineering=5" diff --git a/code/game/objects/items/weapons/circuitboards/machinery/power.dm b/code/game/objects/items/weapons/circuitboards/machinery/power.dm new file mode 100644 index 00000000000..80955b1b8e3 --- /dev/null +++ b/code/game/objects/items/weapons/circuitboards/machinery/power.dm @@ -0,0 +1,27 @@ +#ifndef T_BOARD +#error T_BOARD macro is not defined but we need it! +#endif + +/obj/item/weapon/circuitboard/smes + name = T_BOARD("superconductive magnetic energy storage") + build_path = "/obj/machinery/power/smes/buildable" + board_type = "machine" + origin_tech = "powerstorage=6;engineering=4" + frame_desc = "Requires 1 superconducting magnetic coil and 30 wires." + req_components = list("/obj/item/weapon/smes_coil" = 1, "/obj/item/stack/cable_coil" = 30) + +/obj/item/weapon/circuitboard/batteryrack + name = T_BOARD("battery rack PSU") + build_path = "/obj/machinery/power/smes/batteryrack" + board_type = "machine" + origin_tech = "powerstorage=3;engineering=2" + frame_desc = "Requires 3 power cells." + req_components = list("/obj/item/weapon/cell" = 3) + +/obj/item/weapon/circuitboard/ghettosmes + name = T_BOARD("makeshift PSU") + desc = "An APC circuit repurposed into some power storage device controller" + build_path = "/obj/machinery/power/smes/batteryrack/makeshift" + board_type = "machine" + frame_desc = "Requires 3 power cells." + req_components = list("/obj/item/weapon/cell" = 3) diff --git a/code/game/objects/items/weapons/circuitboards/machinery/research.dm b/code/game/objects/items/weapons/circuitboards/machinery/research.dm new file mode 100644 index 00000000000..9853150b17e --- /dev/null +++ b/code/game/objects/items/weapons/circuitboards/machinery/research.dm @@ -0,0 +1,70 @@ +#ifndef T_BOARD +#error T_BOARD macro is not defined but we need it! +#endif + +obj/item/weapon/circuitboard/rdserver + name = T_BOARD("R&D server") + build_path = "/obj/machinery/r_n_d/server" + board_type = "machine" + origin_tech = "programming=3" + frame_desc = "Requires 2 pieces of cable, and 1 Scanning Module." + req_components = list( + "/obj/item/stack/cable_coil" = 2, + "/obj/item/weapon/stock_parts/scanning_module" = 1) + +/obj/item/weapon/circuitboard/destructive_analyzer + name = T_BOARD("destructive analyzer") + build_path = "/obj/machinery/r_n_d/destructive_analyzer" + board_type = "machine" + origin_tech = "magnets=2;engineering=2;programming=2" + frame_desc = "Requires 1 Scanning Module, 1 Micro Manipulator, and 1 Micro-Laser." + req_components = list( + "/obj/item/weapon/stock_parts/scanning_module" = 1, + "/obj/item/weapon/stock_parts/manipulator" = 1, + "/obj/item/weapon/stock_parts/micro_laser" = 1) + +/obj/item/weapon/circuitboard/autolathe + name = T_BOARD("autolathe") + build_path = "/obj/machinery/autolathe" + board_type = "machine" + origin_tech = "engineering=2;programming=2" + frame_desc = "Requires 3 Matter Bins, 1 Micro Manipulator, and 1 Console Screen." + req_components = list( + "/obj/item/weapon/stock_parts/matter_bin" = 3, + "/obj/item/weapon/stock_parts/manipulator" = 1, + "/obj/item/weapon/stock_parts/console_screen" = 1) + +/obj/item/weapon/circuitboard/protolathe + name = T_BOARD("protolathe") + build_path = "/obj/machinery/r_n_d/protolathe" + board_type = "machine" + origin_tech = "engineering=2;programming=2" + frame_desc = "Requires 2 Matter Bins, 2 Micro Manipulators, and 2 Beakers." + req_components = list( + "/obj/item/weapon/stock_parts/matter_bin" = 2, + "/obj/item/weapon/stock_parts/manipulator" = 2, + "/obj/item/weapon/reagent_containers/glass/beaker" = 2) + + +/obj/item/weapon/circuitboard/circuit_imprinter + name = T_BOARD("circuit imprinter") + build_path = "/obj/machinery/r_n_d/circuit_imprinter" + board_type = "machine" + origin_tech = "engineering=2;programming=2" + frame_desc = "Requires 1 Matter Bin, 1 Micro Manipulator, and 2 Beakers." + req_components = list( + "/obj/item/weapon/stock_parts/matter_bin" = 1, + "/obj/item/weapon/stock_parts/manipulator" = 1, + "/obj/item/weapon/reagent_containers/glass/beaker" = 2) + +/obj/item/weapon/circuitboard/mechfab + name = "Circuit board (Exosuit Fabricator)" + build_path = "/obj/machinery/mecha_part_fabricator" + board_type = "machine" + origin_tech = "programming=3;engineering=3" + frame_desc = "Requires 2 Matter Bins, 1 Micro Manipulator, 1 Micro-Laser and 1 Console Screen." + req_components = list( + "/obj/item/weapon/stock_parts/matter_bin" = 2, + "/obj/item/weapon/stock_parts/manipulator" = 1, + "/obj/item/weapon/stock_parts/micro_laser" = 1, + "/obj/item/weapon/stock_parts/console_screen" = 1) diff --git a/code/modules/shieldgen/circuits_and_designs.dm b/code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm similarity index 91% rename from code/modules/shieldgen/circuits_and_designs.dm rename to code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm index e055bddcabd..6e892a66030 100644 --- a/code/modules/shieldgen/circuits_and_designs.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm @@ -1,5 +1,9 @@ +#ifndef T_BOARD +#error T_BOARD macro is not defined but we need it! +#endif + /obj/item/weapon/circuitboard/shield_gen_ex - name = "Circuit board (Hull shield generator)" + name = T_BOARD("hull shield generator") board_type = "machine" build_path = "/obj/machinery/shield_gen/external" origin_tech = "bluespace=4;phorontech=3" @@ -13,7 +17,7 @@ "/obj/item/stack/cable_coil" = 5) /obj/item/weapon/circuitboard/shield_gen - name = "Circuit board (Bubble shield generator)" + name = T_BOARD("bubble shield generator") board_type = "machine" build_path = "/obj/machinery/shield_gen" origin_tech = "bluespace=4;phorontech=3" @@ -27,7 +31,7 @@ "/obj/item/stack/cable_coil" = 5) /obj/item/weapon/circuitboard/shield_cap - name = "Circuit board (Shield capacitor)" + name = T_BOARD("shield capacitor") board_type = "machine" build_path = "/obj/machinery/shield_capacitor" origin_tech = "magnets=3;powerstorage=4" diff --git a/code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm b/code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm new file mode 100644 index 00000000000..a312d2995a0 --- /dev/null +++ b/code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm @@ -0,0 +1,82 @@ +#ifndef T_BOARD +#error T_BOARD macro is not defined but we need it! +#endif + +/obj/item/weapon/circuitboard/telecomms + board_type = "machine" + +/obj/item/weapon/circuitboard/telecomms/receiver + name = T_BOARD("subspace receiver") + build_path = "/obj/machinery/telecomms/receiver" + origin_tech = "programming=4;engineering=3;bluespace=2" + frame_desc = "Requires 1 Subspace Ansible, 1 Hyperwave Filter, 2 Micro Manipulators, and 1 Micro-Laser." + req_components = list( + "/obj/item/weapon/stock_parts/subspace/ansible" = 1, + "/obj/item/weapon/stock_parts/subspace/filter" = 1, + "/obj/item/weapon/stock_parts/manipulator" = 2, + "/obj/item/weapon/stock_parts/micro_laser" = 1) + +/obj/item/weapon/circuitboard/telecomms/hub + name = T_BOARD("hub mainframe") + build_path = "/obj/machinery/telecomms/hub" + origin_tech = "programming=4;engineering=4" + frame_desc = "Requires 2 Micro Manipulators, 2 Cable Coil and 2 Hyperwave Filter." + req_components = list( + "/obj/item/weapon/stock_parts/manipulator" = 2, + "/obj/item/stack/cable_coil" = 2, + "/obj/item/weapon/stock_parts/subspace/filter" = 2) + +/obj/item/weapon/circuitboard/telecomms/relay + name = T_BOARD("relay mainframe") + build_path = "/obj/machinery/telecomms/relay" + origin_tech = "programming=3;engineering=4;bluespace=3" + frame_desc = "Requires 2 Micro Manipulators, 2 Cable Coil and 2 Hyperwave Filters." + req_components = list( + "/obj/item/weapon/stock_parts/manipulator" = 2, + "/obj/item/stack/cable_coil" = 2, + "/obj/item/weapon/stock_parts/subspace/filter" = 2) + +/obj/item/weapon/circuitboard/telecomms/bus + name = T_BOARD("bus mainframe") + build_path = "/obj/machinery/telecomms/bus" + origin_tech = "programming=4;engineering=4" + frame_desc = "Requires 2 Micro Manipulators, 1 Cable Coil and 1 Hyperwave Filter." + req_components = list( + "/obj/item/weapon/stock_parts/manipulator" = 2, + "/obj/item/stack/cable_coil" = 1, + "/obj/item/weapon/stock_parts/subspace/filter" = 1) + +/obj/item/weapon/circuitboard/telecomms/processor + name = T_BOARD("processor unit") + build_path = "/obj/machinery/telecomms/processor" + origin_tech = "programming=4;engineering=4" + frame_desc = "Requires 3 Micro Manipulators, 1 Hyperwave Filter, 2 Treatment Disks, 1 Wavelength Analyzer, 2 Cable Coils and 1 Subspace Amplifier." + req_components = list( + "/obj/item/weapon/stock_parts/manipulator" = 3, + "/obj/item/weapon/stock_parts/subspace/filter" = 1, + "/obj/item/weapon/stock_parts/subspace/treatment" = 2, + "/obj/item/weapon/stock_parts/subspace/analyzer" = 1, + "/obj/item/stack/cable_coil" = 2, + "/obj/item/weapon/stock_parts/subspace/amplifier" = 1) + +/obj/item/weapon/circuitboard/telecomms/server + name = T_BOARD("telecommunication server") + build_path = "/obj/machinery/telecomms/server" + origin_tech = "programming=4;engineering=4" + frame_desc = "Requires 2 Micro Manipulators, 1 Cable Coil and 1 Hyperwave Filter." + req_components = list( + "/obj/item/weapon/stock_parts/manipulator" = 2, + "/obj/item/stack/cable_coil" = 1, + "/obj/item/weapon/stock_parts/subspace/filter" = 1) + +/obj/item/weapon/circuitboard/telecomms/broadcaster + name = T_BOARD("subspace broadcaster") + build_path = "/obj/machinery/telecomms/broadcaster" + origin_tech = "programming=4;engineering=4;bluespace=2" + frame_desc = "Requires 2 Micro Manipulators, 1 Cable Coil, 1 Hyperwave Filter, 1 Ansible Crystal and 2 High-Powered Micro-Lasers. " + req_components = list( + "/obj/item/weapon/stock_parts/manipulator" = 2, + "/obj/item/stack/cable_coil" = 1, + "/obj/item/weapon/stock_parts/subspace/filter" = 1, + "/obj/item/weapon/stock_parts/subspace/crystal" = 1, + "/obj/item/weapon/stock_parts/micro_laser/high" = 2) diff --git a/code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm b/code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm new file mode 100644 index 00000000000..db76bbcc8e3 --- /dev/null +++ b/code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm @@ -0,0 +1,35 @@ +#ifndef T_BOARD +#error T_BOARD macro is not defined but we need it! +#endif + +/obj/item/weapon/circuitboard/unary_atmos + board_type = "machine" + +/obj/item/weapon/circuitboard/unary_atmos/construct(var/obj/machinery/atmospherics/unary/U) + //TODO: Move this stuff into the relevant constructor when pipe/construction.dm is cleaned up. + U.initialize() + U.build_network() + if (U.node) + U.node.initialize() + U.node.build_network() + +/obj/item/weapon/circuitboard/unary_atmos/heater + name = T_BOARD("gas heating system") + build_path = "/obj/machinery/atmospherics/unary/heater" + origin_tech = "powerstorage=2;engineering=1" + frame_desc = "Requires 5 Pieces of Cable, 1 Matter Bin, and 2 Capacitors." + req_components = list( + "/obj/item/stack/cable_coil" = 5, + "/obj/item/weapon/stock_parts/matter_bin" = 1, + "/obj/item/weapon/stock_parts/capacitor" = 2) + +/obj/item/weapon/circuitboard/unary_atmos/cooler + name = T_BOARD("gas cooling system") + build_path = "/obj/machinery/atmospherics/unary/freezer" + origin_tech = "magnets=2;engineering=2" + frame_desc = "Requires 2 Pieces of Cable, 1 Matter Bin, 1 Micro Manipulator, and 2 Capacitors." + req_components = list( + "/obj/item/stack/cable_coil" = 2, + "/obj/item/weapon/stock_parts/matter_bin" = 1, + "/obj/item/weapon/stock_parts/capacitor" = 2, + "/obj/item/weapon/stock_parts/manipulator" = 1) diff --git a/code/game/objects/items/weapons/circuitboards/mecha.dm b/code/game/objects/items/weapons/circuitboards/mecha.dm new file mode 100644 index 00000000000..ad859479c56 --- /dev/null +++ b/code/game/objects/items/weapons/circuitboards/mecha.dm @@ -0,0 +1,88 @@ +#ifdef T_BOARD_MECHA +#error T_BOARD_MECHA already defined elsewhere, we can't use it. +#endif +#define T_BOARD_MECHA(name) "exosuit module circuit board (" + (name) + ")" + +/obj/item/weapon/circuitboard/mecha + name = "exosuit circuit board" + icon = 'icons/obj/module.dmi' + icon_state = "std_mod" + item_state = "electronic" + board_type = "other" + + +/obj/item/weapon/circuitboard/mecha/ripley + origin_tech = "programming=3" + +/obj/item/weapon/circuitboard/mecha/ripley/peripherals + name = T_BOARD_MECHA("Ripley peripherals control") + icon_state = "mcontroller" + +/obj/item/weapon/circuitboard/mecha/ripley/main + name = T_BOARD_MECHA("Ripley central control") + icon_state = "mainboard" + + +/obj/item/weapon/circuitboard/mecha/gygax + origin_tech = "programming=4" + +/obj/item/weapon/circuitboard/mecha/gygax/peripherals + name = T_BOARD_MECHA("Gygax peripherals control") + icon_state = "mcontroller" + +/obj/item/weapon/circuitboard/mecha/gygax/targeting + name = T_BOARD_MECHA("Gygax weapon control and targeting") + icon_state = "mcontroller" + origin_tech = "programming=4;combat=4" + +/obj/item/weapon/circuitboard/mecha/gygax/main + name = T_BOARD_MECHA("Gygax central control") + icon_state = "mainboard" + + +/obj/item/weapon/circuitboard/mecha/durand + origin_tech = "programming=4" + +/obj/item/weapon/circuitboard/mecha/durand/peripherals + name = T_BOARD_MECHA("Durand peripherals control") + icon_state = "mcontroller" + +/obj/item/weapon/circuitboard/mecha/durand/targeting + name = T_BOARD_MECHA("Durand weapon control and targeting") + icon_state = "mcontroller" + origin_tech = "programming=4;combat=4" + +/obj/item/weapon/circuitboard/mecha/durand/main + name = T_BOARD_MECHA("Durand central control") + icon_state = "mainboard" + + +/obj/item/weapon/circuitboard/mecha/honker + origin_tech = "programming=4" + +/obj/item/weapon/circuitboard/mecha/honker/peripherals + name = T_BOARD_MECHA("H.O.N.K peripherals control") + icon_state = "mcontroller" + +/obj/item/weapon/circuitboard/mecha/honker/targeting + name = T_BOARD_MECHA("H.O.N.K weapon control and targeting") + icon_state = "mcontroller" + +/obj/item/weapon/circuitboard/mecha/honker/main + name = T_BOARD_MECHA("H.O.N.K central control") + icon_state = "mainboard" + + +/obj/item/weapon/circuitboard/mecha/odysseus + origin_tech = "programming=3" + +/obj/item/weapon/circuitboard/mecha/odysseus/peripherals + name = T_BOARD_MECHA("Odysseus peripherals control") + icon_state = "mcontroller" + +/obj/item/weapon/circuitboard/mecha/odysseus/main + name = T_BOARD_MECHA("Odysseus central control") + icon_state = "mainboard" + +//Undef the macro, shouldn't be needed anywhere else +#undef T_BOARD_MECHA diff --git a/code/game/objects/items/weapons/circuitboards/other.dm b/code/game/objects/items/weapons/circuitboards/other.dm new file mode 100644 index 00000000000..ec38643bed3 --- /dev/null +++ b/code/game/objects/items/weapons/circuitboards/other.dm @@ -0,0 +1,10 @@ +#ifndef T_BOARD +#error T_BOARD macro is not defined but we need it! +#endif + +//Stuff that doesn't fit into any category goes here + +/obj/item/weapon/circuitboard/aicore + name = T_BOARD("AI core") + origin_tech = "programming=4;biotech=2" + board_type = "other" diff --git a/code/modules/power/batteryrack.dm b/code/modules/power/batteryrack.dm index bfba755eb79..08087e9ced4 100644 --- a/code/modules/power/batteryrack.dm +++ b/code/modules/power/batteryrack.dm @@ -1,23 +1,3 @@ -//Boards -/obj/item/weapon/circuitboard/batteryrack - name = "Circuit board (Battery rack PSU)" - build_path = "/obj/machinery/power/smes/batteryrack" - board_type = "machine" - origin_tech = "powerstorage=3;engineering=2" - frame_desc = "Requires 3 power cells." - req_components = list("/obj/item/weapon/cell" = 3) - - -/obj/item/weapon/circuitboard/ghettosmes - name = "Circuit board (makeshift PSU)" - desc = "An APC circuit repurposed into some power storage device controller" - build_path = "/obj/machinery/power/smes/batteryrack/makeshift" - board_type = "machine" - frame_desc = "Requires 3 power cells." - req_components = list("/obj/item/weapon/cell" = 3) - - -//Machines //The one that works safely. /obj/machinery/power/smes/batteryrack name = "power cell rack PSU" From 4a7fdbf5951300356275690c06fa98627a0fcab0 Mon Sep 17 00:00:00 2001 From: Amunak Date: Wed, 17 Dec 2014 14:31:57 +0100 Subject: [PATCH 21/35] Removed unused substation batteryrack code. --- code/modules/power/batteryrack.dm | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/code/modules/power/batteryrack.dm b/code/modules/power/batteryrack.dm index 08087e9ced4..ad47a4eb285 100644 --- a/code/modules/power/batteryrack.dm +++ b/code/modules/power/batteryrack.dm @@ -12,36 +12,12 @@ var/cells_amount = 0 var/capacitors_amount = 0 - // Smaller capacity, but higher I/O - // Starts fully charged, as it's used in substations. This replaces Engineering SMESs round start charge. -/obj/machinery/power/smes/batteryrack/substation - name = "Substation PSU" - desc = "A rack of power cells working as a PSU. This one seems to be equipped for higher power loads." - output_level = 150000 - input_level = 150000 - output_attempt = 1 - - // One high capacity cell, two regular cells. Lots of room for engineer upgrades - // Also five basic capacitors. Again, upgradeable. -/obj/machinery/power/smes/batteryrack/substation/add_parts() - component_parts = list() - component_parts += new /obj/item/weapon/circuitboard/batteryrack - component_parts += new /obj/item/weapon/cell/high - component_parts += new /obj/item/weapon/cell - component_parts += new /obj/item/weapon/cell - component_parts += new /obj/item/weapon/stock_parts/capacitor - component_parts += new /obj/item/weapon/stock_parts/capacitor - component_parts += new /obj/item/weapon/stock_parts/capacitor - component_parts += new /obj/item/weapon/stock_parts/capacitor - component_parts += new /obj/item/weapon/stock_parts/capacitor - /obj/machinery/power/smes/batteryrack/New() ..() add_parts() RefreshParts() return - //Maybe this should be moved up to obj/machinery /obj/machinery/power/smes/batteryrack/proc/add_parts() component_parts = list() From 703de1ccc086c4f2e309aca7fa096a0aca65c9af Mon Sep 17 00:00:00 2001 From: Amunak Date: Wed, 17 Dec 2014 14:36:47 +0100 Subject: [PATCH 22/35] Fixes compile error. DreamMaker is dumb and doesn't like to save the .dme file. --- baystation12.dme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/baystation12.dme b/baystation12.dme index a9731c00214..24731e803ed 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -598,9 +598,9 @@ #include "code\game\objects\items\weapons\circuitboards\computer\telecomms.dm" #include "code\game\objects\items\weapons\circuitboards\machinery\cloning.dm" #include "code\game\objects\items\weapons\circuitboards\machinery\pacman.dm" +#include "code\game\objects\items\weapons\circuitboards\machinery\power.dm" #include "code\game\objects\items\weapons\circuitboards\machinery\research.dm" #include "code\game\objects\items\weapons\circuitboards\machinery\shieldgen.dm" -#include "code\game\objects\items\weapons\circuitboards\machinery\smes.dm" #include "code\game\objects\items\weapons\circuitboards\machinery\telecomms.dm" #include "code\game\objects\items\weapons\circuitboards\machinery\unary_atmos.dm" #include "code\game\objects\items\weapons\grenades\chem_grenade.dm" From 42bdf427b8ec6e096ea965edb05e95f8a0602bd7 Mon Sep 17 00:00:00 2001 From: Amunak Date: Wed, 17 Dec 2014 19:10:31 +0100 Subject: [PATCH 23/35] Properly decapitalized mecha equipment. --- .../mecha/equipment/tools/medical_tools.dm | 6 +-- code/game/mecha/equipment/tools/tools.dm | 38 +++++++++--------- .../mecha/equipment/tools/unused_tools.dm | 4 +- code/game/mecha/equipment/weapons/weapons.dm | 39 +++++++------------ 4 files changed, 38 insertions(+), 49 deletions(-) diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm index 8a527e1b084..08d6f2cca49 100644 --- a/code/game/mecha/equipment/tools/medical_tools.dm +++ b/code/game/mecha/equipment/tools/medical_tools.dm @@ -1,6 +1,6 @@ /obj/item/mecha_parts/mecha_equipment/tool/sleeper - name = "Mounted Sleeper" - desc = "Mounted Sleeper. (Can be attached to: Medical Exosuits)" + name = "mounted sleeper" + desc = "A sleeper. Mountable to an exosuit. (Can be attached to: Medical Exosuits)" icon = 'icons/obj/Cryogenic2.dmi' icon_state = "sleeper_0" origin_tech = "programming=2;biotech=3" @@ -373,7 +373,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 3d318a891ac..999df5b8d5a 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 @@ -64,7 +64,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 @@ -115,7 +115,7 @@ return 1 /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" @@ -166,7 +166,7 @@ return 1 /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 @@ -240,7 +240,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" @@ -345,7 +345,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" @@ -365,7 +365,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" @@ -415,7 +415,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" @@ -491,8 +491,8 @@ /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)" - desc = "Boosts exosuit armor against armed melee attacks. Requires energy to operate." + name = "\improper CCW armor booster" + desc = "Close-combat armor booster. Boosts exosuit armor against armed melee attacks. Requires energy to operate." icon_state = "mecha_abooster_ccw" origin_tech = "materials=3" equip_cooldown = 10 @@ -541,8 +541,8 @@ /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster - name = "Armor Booster Module (Ranged Weaponry)" - desc = "Boosts exosuit armor against ranged attacks. Completely blocks taser shots. Requires energy to operate." + name = "\improper RW armor booster" + desc = "Ranged-weaponry armor booster. Boosts exosuit armor against ranged attacks. Completely blocks taser shots, but requires energy to operate." icon_state = "mecha_abooster_proj" origin_tech = "materials=4" equip_cooldown = 10 @@ -612,8 +612,8 @@ /obj/item/mecha_parts/mecha_equipment/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." + name = "repair droid" + desc = "Automated repair droid. Scans exosuit for damage and repairs it. Can fix almost any type of external or internal damage." icon_state = "repair_droid" origin_tech = "magnets=3;programming=3" equip_cooldown = 20 @@ -702,7 +702,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" @@ -814,7 +814,7 @@ /obj/item/mecha_parts/mecha_equipment/generator - name = "Phoron Generator" + name = "phoron generator" desc = "Generates power using solid phoron as fuel. Pollutes the environment." icon_state = "tesla" origin_tech = "phorontech=2;powerstorage=2;engineering=1" @@ -952,7 +952,7 @@ /obj/item/mecha_parts/mecha_equipment/generator/nuclear - name = "ExoNuclear Reactor" + name = "\improper ExoNuclear reactor" desc = "Generates power using uranium. Pollutes the environment." icon_state = "tesla" origin_tech = "powerstorage=3;engineering=3" @@ -989,7 +989,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 @@ -1208,4 +1208,4 @@ if (OCCUPIED|LOCKED) usr << "\red All of the passenger compartments are already occupied or locked!" if (0) - usr << "\red \The [src] doesn't have a passenger compartment." \ No newline at end of file + usr << "\red \The [src] doesn't have a passenger compartment." diff --git a/code/game/mecha/equipment/tools/unused_tools.dm b/code/game/mecha/equipment/tools/unused_tools.dm index 470159e06fb..012d7979e1a 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 da6188263a3..fa4bc3858ce 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -58,12 +58,12 @@ P.process() /obj/item/mecha_parts/mecha_equipment/weapon/energy - name = "General Energy Weapon" + name = "general energy weapon" auto_rearm = 1 /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 @@ -71,7 +71,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/energy/riggedlaser equip_cooldown = 30 - name = "Jury-rigged Welder-Laser" + name = "jury-rigged welder-Laser" desc = "While not regulation, this inefficient weapon can be attached to working exo-suits in desperate, or malicious, times." icon_state = "mecha_laser" energy_drain = 80 @@ -81,7 +81,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 @@ -89,7 +89,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/energy/ion equip_cooldown = 40 - name = "mkIV Ion Heavy Cannon" + name = "mkIV ion heavy cannon" icon_state = "mecha_ion" energy_drain = 120 projectile = /obj/item/projectile/ion @@ -97,7 +97,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" @@ -117,7 +117,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 @@ -126,7 +126,7 @@ /* Commenting this out rather than removing it because it may be useful for reference. /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,17 +164,6 @@ M.Paralyse(4) else M.make_jittery(500) - /* //else the mousetraps are useless - if(istype(M, /mob/living/carbon/human)) - var/mob/living/carbon/human/H = M - if(isobj(H.shoes)) - var/thingy = H.shoes - H.drop_from_inventory(H.shoes) - walk_away(thingy,chassis,15,2) - spawn(20) - if(thingy) - walk(thingy,0) - */ chassis.use_power(energy_drain) log_message("Honked from [src.name]. HONK!") do_after_cooldown() @@ -182,7 +171,7 @@ */ /obj/item/mecha_parts/mecha_equipment/weapon/ballistic - name = "General Ballisic Weapon" + name = "general ballisic weapon" var/projectile_energy_cost get_equip_info() @@ -207,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 @@ -219,7 +208,7 @@ projectile_energy_cost = 25 /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 @@ -238,7 +227,7 @@ AM.throw_at(target,missile_range, missile_speed, chassis) /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/explosive - 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' @@ -266,7 +255,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' @@ -283,7 +272,7 @@ F.prime() /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) From cc327cb671147aa7cfc1a6ea77ab5aa73527033e Mon Sep 17 00:00:00 2001 From: Amunak Date: Wed, 17 Dec 2014 20:03:04 +0100 Subject: [PATCH 24/35] Fixes typos in powercells.dm --- code/game/objects/items/weapons/power_cells.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/power_cells.dm b/code/game/objects/items/weapons/power_cells.dm index ba75d32990a..b0b8fbdc04f 100644 --- a/code/game/objects/items/weapons/power_cells.dm +++ b/code/game/objects/items/weapons/power_cells.dm @@ -112,5 +112,4 @@ icon = 'icons/mob/slimes.dmi' //'icons/obj/harvest.dmi' icon_state = "yellow slime extract" //"potato_battery" maxcharge = 10000 - maxcharge = 10000 - matter = null \ No newline at end of file + matter = null From 1fcf11cdb5368370019afa6cb572e9ae559e35dd Mon Sep 17 00:00:00 2001 From: Amunak Date: Thu, 18 Dec 2014 01:17:50 +0100 Subject: [PATCH 25/35] You can no longer plant explosives on webbing. --- code/game/objects/items/weapons/explosives.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index 97e5630d949..cb3fb36374d 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -38,7 +38,7 @@ /obj/item/weapon/plastique/afterattack(atom/movable/target, mob/user, flag) if (!flag) return - if (ismob(target) || istype(target, /turf/unsimulated) || istype(target, /turf/simulated/shuttle) || istype(target, /obj/item/weapon/storage/)) + if (ismob(target) || istype(target, /turf/unsimulated) || istype(target, /turf/simulated/shuttle) || istype(target, /obj/item/weapon/storage/) || istype(target, /obj/item/clothing/tie/storage/)) return user << "Planting explosives..." From edffbc680d09813e67d5e2c3efa8790b6e8971b3 Mon Sep 17 00:00:00 2001 From: Amunak Date: Thu, 18 Dec 2014 03:10:36 +0100 Subject: [PATCH 26/35] Fixed capitalization of most game items --- code/game/objects/items/apc_frame.dm | 2 +- code/game/objects/items/contraband.dm | 4 +- code/game/objects/items/devices/PDA/PDA.dm | 4 +- code/game/objects/items/devices/PDA/cart.dm | 40 ++++---- code/game/objects/items/devices/PDA/radio.dm | 2 +- .../objects/items/devices/chameleonproj.dm | 2 +- .../objects/items/devices/radio/beacon.dm | 2 +- .../items/devices/radio/encryptionkey.dm | 40 ++++---- .../objects/items/devices/radio/headset.dm | 6 +- code/game/objects/items/devices/scanners.dm | 12 +-- code/game/objects/items/devices/uplinks.dm | 2 +- code/game/objects/items/latexballoon.dm | 4 +- code/game/objects/items/robot/robot_items.dm | 2 +- .../objects/items/weapons/dna_injector.dm | 96 +++++++++---------- .../items/weapons/grenades/chem_grenade.dm | 8 +- .../items/weapons/implants/implantcase.dm | 22 ++--- .../objects/items/weapons/storage/backpack.dm | 2 +- .../objects/items/weapons/storage/bags.dm | 10 +- .../objects/items/weapons/storage/boxes.dm | 2 +- .../objects/items/weapons/storage/firstaid.dm | 7 +- .../items/weapons/storage/uplink_kits.dm | 2 +- .../objects/items/weapons/tanks/jetpack.dm | 8 +- code/game/objects/items/weapons/weaponry.dm | 2 +- code/game/objects/random/random.dm | 14 +-- .../crates_lockers/closets/fireaxe.dm | 2 +- .../crates_lockers/closets/job_closets.dm | 2 +- .../crates_lockers/closets/secure/bar.dm | 2 +- .../crates_lockers/closets/secure/cargo.dm | 4 +- .../closets/secure/engineering.dm | 10 +- .../crates_lockers/closets/secure/freezer.dm | 8 +- .../closets/secure/hydroponics.dm | 2 +- .../crates_lockers/closets/secure/medical.dm | 16 ++-- .../closets/secure/scientist.dm | 4 +- .../crates_lockers/closets/secure/security.dm | 20 ++-- .../crates_lockers/closets/syndicate.dm | 2 +- .../crates_lockers/closets/wardrobe.dm | 2 +- .../structures/crates_lockers/crates.dm | 32 +++---- .../structures/crates_lockers/largecrate.dm | 2 +- code/game/objects/structures/lamarr_cage.dm | 2 +- code/game/objects/structures/mirror.dm | 2 +- code/game/objects/structures/signs.dm | 4 +- .../objects/structures/windoor_assembly.dm | 3 +- code/modules/mob/living/carbon/brain/MMI.dm | 4 +- code/modules/power/singularity/singularity.dm | 4 +- .../projectiles/guns/energy/nuclear.dm | 2 +- .../projectiles/guns/energy/special.dm | 2 +- .../projectiles/guns/projectile/automatic.dm | 2 +- .../projectiles/guns/projectile/revolver.dm | 2 +- 48 files changed, 214 insertions(+), 216 deletions(-) diff --git a/code/game/objects/items/apc_frame.dm b/code/game/objects/items/apc_frame.dm index f2e760a34a5..5d8240ebf70 100644 --- a/code/game/objects/items/apc_frame.dm +++ b/code/game/objects/items/apc_frame.dm @@ -1,7 +1,7 @@ // APC HULL /obj/item/apc_frame - name = "APC frame" + name = "\improper APC frame" desc = "Used for repairing or building APCs" icon = 'icons/obj/apc_repair.dmi' icon_state = "apc_frame" diff --git a/code/game/objects/items/contraband.dm b/code/game/objects/items/contraband.dm index 68d7547bb05..5a61859e41d 100644 --- a/code/game/objects/items/contraband.dm +++ b/code/game/objects/items/contraband.dm @@ -2,7 +2,7 @@ //Illicit drugs~ /obj/item/weapon/storage/pill_bottle/happy - name = "Happy pills" + name = "bottle of Happy pills" desc = "Highly illegal drug. When you want to see the rainbow." /obj/item/weapon/storage/pill_bottle/happy/New() @@ -16,7 +16,7 @@ new /obj/item/weapon/reagent_containers/pill/happy( src ) /obj/item/weapon/storage/pill_bottle/zoom - name = "Zoom pills" + name = "bottle of Zoom pills" desc = "Highly illegal drug. Trade brain for speed." /obj/item/weapon/storage/pill_bottle/zoom/New() diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 6a25b46444f..7a8b8efc635 100755 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -4,7 +4,7 @@ var/global/list/obj/item/device/pda/PDAs = list() /obj/item/device/pda - name = "PDA" + name = "\improper PDA" desc = "A portable microcomputer by Thinktronic Systems, LTD. Functionality determined by a preprogrammed ROM cartridge." icon = 'icons/obj/pda.dmi' icon_state = "pda" @@ -1391,7 +1391,7 @@ var/global/list/obj/item/device/pda/PDAs = list() //Some spare PDAs in a box /obj/item/weapon/storage/box/PDAs - name = "spare PDAs" + name = "box of spare PDAs" desc = "A box of spare PDA microcomputers." icon = 'icons/obj/pda.dmi' icon_state = "pdabox" diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index 982ac98ff3b..416da91a869 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -35,27 +35,27 @@ var/list/stored_data = list() /obj/item/weapon/cartridge/engineering - name = "Power-ON Cartridge" + name = "\improper Power-ON cartridge" icon_state = "cart-e" access_engine = 1 /obj/item/weapon/cartridge/atmos - name = "BreatheDeep Cartridge" + name = "\improper BreatheDeep cartridge" icon_state = "cart-a" access_atmos = 1 /obj/item/weapon/cartridge/medical - name = "Med-U Cartridge" + name = "\improper Med-U cartridge" icon_state = "cart-m" access_medical = 1 /obj/item/weapon/cartridge/chemistry - name = "ChemWhiz Cartridge" + name = "\improper ChemWhiz cartridge" icon_state = "cart-chem" access_reagent_scanner = 1 /obj/item/weapon/cartridge/security - name = "R.O.B.U.S.T. Cartridge" + name = "\improper R.O.B.U.S.T. cartridge" icon_state = "cart-s" access_security = 1 @@ -65,31 +65,31 @@ radio = new /obj/item/radio/integrated/beepsky(src) /obj/item/weapon/cartridge/detective - name = "D.E.T.E.C.T. Cartridge" + name = "\improper D.E.T.E.C.T. cartridge" icon_state = "cart-s" access_security = 1 access_medical = 1 /obj/item/weapon/cartridge/janitor - name = "CustodiPRO Cartridge" + name = "\improper CustodiPRO cartridge" desc = "The ultimate in clean-room design." icon_state = "cart-j" access_janitor = 1 /obj/item/weapon/cartridge/lawyer - name = "P.R.O.V.E. Cartridge" + name = "\improper P.R.O.V.E. cartridge" icon_state = "cart-s" access_security = 1 /obj/item/weapon/cartridge/clown - name = "Honkworks 5.0" + name = "\improper Honkworks 5.0 cartridge" icon_state = "cart-clown" access_clown = 1 charges = 5 /obj/item/weapon/cartridge/mime - name = "Gestur-O 1000" + name = "\improper Gestur-O 1000 cartridge" icon_state = "cart-mi" access_mime = 1 charges = 5 @@ -105,7 +105,7 @@ desc = "A data cartridge with an integrated radio signaler module." /obj/item/weapon/cartridge/signal/science - name = "Signal Ace 2" + name = "\improper Signal Ace 2 cartridge" desc = "Complete with integrated radio signaler!" icon_state = "cart-tox" access_reagent_scanner = 1 @@ -119,7 +119,7 @@ /obj/item/weapon/cartridge/quartermaster - name = "Space Parts & Space Vendors Cartridge" + name = "\improper Space Parts & Space Vendors cartridge" desc = "Perfect for the Quartermaster on the go!" icon_state = "cart-q" access_quartermaster = 1 @@ -130,12 +130,12 @@ radio = new /obj/item/radio/integrated/mule(src) /obj/item/weapon/cartridge/head - name = "Easy-Record DELUXE" + name = "\improper Easy-Record DELUXE" icon_state = "cart-h" access_status_display = 1 /obj/item/weapon/cartridge/hop - name = "HumanResources9001" + name = "\improper HumanResources9001 cartridge" icon_state = "cart-h" access_status_display = 1 access_quartermaster = 1 @@ -148,7 +148,7 @@ radio = new /obj/item/radio/integrated/mule(src) /obj/item/weapon/cartridge/hos - name = "R.O.B.U.S.T. DELUXE" + name = "\improper R.O.B.U.S.T. DELUXE" icon_state = "cart-hos" access_status_display = 1 access_security = 1 @@ -159,21 +159,21 @@ radio = new /obj/item/radio/integrated/beepsky(src) /obj/item/weapon/cartridge/ce - name = "Power-On DELUXE" + name = "\improper Power-On DELUXE" icon_state = "cart-ce" access_status_display = 1 access_engine = 1 access_atmos = 1 /obj/item/weapon/cartridge/cmo - name = "Med-U DELUXE" + name = "\improper Med-U DELUXE" icon_state = "cart-cmo" access_status_display = 1 access_reagent_scanner = 1 access_medical = 1 /obj/item/weapon/cartridge/rd - name = "Signal Ace DELUXE" + name = "\improper Signal Ace DELUXE" icon_state = "cart-rd" access_status_display = 1 access_reagent_scanner = 1 @@ -185,7 +185,7 @@ radio = new /obj/item/radio/integrated/signal(src) /obj/item/weapon/cartridge/captain - name = "Value-PAK Cartridge" + name = "\improper Value-PAK cartridge" desc = "Now with 200% more value!" icon_state = "cart-c" access_quartermaster = 1 @@ -198,7 +198,7 @@ access_atmos = 1 /obj/item/weapon/cartridge/syndicate - name = "Detomatix Cartridge" + name = "\improper Detomatix cartridge" icon_state = "cart" access_remote_door = 1 access_detonate_pda = 1 diff --git a/code/game/objects/items/devices/PDA/radio.dm b/code/game/objects/items/devices/PDA/radio.dm index 0835f6de258..0c7105118fb 100644 --- a/code/game/objects/items/devices/PDA/radio.dm +++ b/code/game/objects/items/devices/PDA/radio.dm @@ -1,5 +1,5 @@ /obj/item/radio/integrated - name = "PDA radio module" + name = "\improper PDA radio module" desc = "An electronic radio system of nanotrasen origin." icon = 'icons/obj/module.dmi' icon_state = "power_mod" diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index af350bd56bc..23ae4724bc3 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -1,5 +1,5 @@ /obj/item/device/chameleon - name = "chameleon-projector" + name = "chameleon projector" icon_state = "shield0" flags = FPRINT | TABLEPASS| CONDUCT slot_flags = SLOT_BELT diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm index 0de7faad362..de084253bf3 100644 --- a/code/game/objects/items/devices/radio/beacon.dm +++ b/code/game/objects/items/devices/radio/beacon.dm @@ -1,5 +1,5 @@ /obj/item/device/radio/beacon - name = "Tracking Beacon" + name = "tracking beacon" desc = "A beacon used by a teleporter." icon_state = "beacon" item_state = "signaler" diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index 8067fd33293..823940a53cb 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -1,6 +1,6 @@ /obj/item/device/encryptionkey/ - name = "Standard Encrpytion Key" + name = "standard encrpytion key" desc = "An encryption key for a radio headset. Contains cypherkeys." icon = 'icons/obj/radio.dmi' icon_state = "cypherkey" @@ -28,96 +28,96 @@ origin_tech = "syndicate=3" /obj/item/device/encryptionkey/headset_sec - name = "Security Radio Encryption Key" + name = "security radio encryption key" icon_state = "sec_cypherkey" channels = list("Security" = 1) /obj/item/device/encryptionkey/headset_eng - name = "Engineering Radio Encryption Key" + name = "engineering radio encryption key" icon_state = "eng_cypherkey" channels = list("Engineering" = 1) /obj/item/device/encryptionkey/headset_rob - name = "Robotics Radio Encryption Key" + name = "robotics radio encryption key" icon_state = "rob_cypherkey" channels = list("Engineering" = 1, "Science" = 1) /obj/item/device/encryptionkey/headset_med - name = "Medical Radio Encryption Key" + name = "medical radio encryption key" icon_state = "med_cypherkey" channels = list("Medical" = 1) /obj/item/device/encryptionkey/headset_sci - name = "Science Radio Encryption Key" + name = "science radio encryption key" icon_state = "sci_cypherkey" channels = list("Science" = 1) /obj/item/device/encryptionkey/headset_medsci - name = "Medical Research Radio Encryption Key" + name = "medical research radio encryption key" icon_state = "medsci_cypherkey" channels = list("Medical" = 1, "Science" = 1) /obj/item/device/encryptionkey/headset_com - name = "Command Radio Encryption Key" + name = "command radio encryption key" icon_state = "com_cypherkey" channels = list("Command" = 1) /obj/item/device/encryptionkey/heads/captain - name = "Captain's Encryption Key" + name = "captain's encryption key" icon_state = "cap_cypherkey" channels = list("Command" = 1, "Security" = 1, "Engineering" = 0, "Science" = 0, "Medical" = 0, "Supply" = 0, "Service" = 0) /obj/item/device/encryptionkey/heads/ai_integrated - name = "AI Integrated Encryption Key" + name = "ai integrated encryption key" desc = "Integrated encryption key" icon_state = "cap_cypherkey" channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1, "AI Private" = 1) /obj/item/device/encryptionkey/heads/rd - name = "Research Director's Encryption Key" + name = "research director's encryption key" icon_state = "rd_cypherkey" channels = list("Science" = 1, "Command" = 1) /obj/item/device/encryptionkey/heads/hos - name = "Head of Security's Encryption Key" + name = "head of security's encryption key" icon_state = "hos_cypherkey" channels = list("Security" = 1, "Command" = 1) /obj/item/device/encryptionkey/heads/ce - name = "Chief Engineer's Encryption Key" + name = "chief engineer's encryption key" icon_state = "ce_cypherkey" channels = list("Engineering" = 1, "Command" = 1) /obj/item/device/encryptionkey/heads/cmo - name = "Chief Medical Officer's Encryption Key" + name = "chief medical officer's encryption key" icon_state = "cmo_cypherkey" channels = list("Medical" = 1, "Command" = 1) /obj/item/device/encryptionkey/heads/hop - name = "Head of Personnel's Encryption Key" + name = "head of personnel's encryption key" icon_state = "hop_cypherkey" channels = list("Supply" = 1, "Service" = 1, "Command" = 1, "Security" = 0) /* /obj/item/device/encryptionkey/headset_mine - name = "Mining Radio Encryption Key" + name = "mining radio encryption key" icon_state = "mine_cypherkey" channels = list("Mining" = 1) /obj/item/device/encryptionkey/heads/qm - name = "Quartermaster's Encryption Key" + name = "quartermaster's encryption key" icon_state = "qm_cypherkey" channels = list("Cargo" = 1, "Mining" = 1) */ /obj/item/device/encryptionkey/headset_cargo - name = "Supply Radio Encryption Key" + name = "supply radio encryption key" icon_state = "cargo_cypherkey" channels = list("Supply" = 1) /obj/item/device/encryptionkey/headset_service - name = "Service Radio Encryption Key" + name = "service radio encryption key" icon_state = "srv_cypherkey" channels = list("Service" = 1) /obj/item/device/encryptionkey/ert - name = "NanoTrasen ERT Radio Encryption Key" + name = "\improper NanoTrasen ERT radio encryption key" channels = list("Response Team" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Supply" = 1, "Service" = 1) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index feffa9096d6..3e57d9d03c9 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -120,7 +120,7 @@ ks2type = /obj/item/device/encryptionkey/heads/captain /obj/item/device/radio/headset/heads/ai_integrated //No need to care about icons, it should be hidden inside the AI anyway. - name = "AI Subspace Transceiver" + name = "\improper AI subspace transceiver" desc = "Integrated AI radio transceiver." icon = 'icons/obj/robot_component.dmi' icon_state = "radio" @@ -135,7 +135,7 @@ return ..(freq, level, 1) /obj/item/device/radio/headset/heads/rd - name = "Research Director's headset" + name = "research director's headset" desc = "Headset of the researching God." icon_state = "com_headset" item_state = "headset" @@ -198,7 +198,7 @@ ks2type = /obj/item/device/encryptionkey/headset_service /obj/item/device/radio/headset/ert - name = "CentCom Response Team headset" + name = "emergency response team radio headset" desc = "The headset of the boss's boss." icon_state = "com_headset" item_state = "headset" diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index aa7e260371b..5afc8ebc103 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -9,7 +9,7 @@ MASS SPECTROMETER REAGENT SCANNER */ /obj/item/device/t_scanner - name = "T-ray scanner" + name = "\improper T-ray scanner" desc = "A terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes." icon_state = "t-ray0" var/on = 0 @@ -65,10 +65,10 @@ REAGENT SCANNER /obj/item/device/healthanalyzer - name = "Health Analyzer" + name = "health analyzer" + desc = "A hand-held body scanner able to distinguish vital signs of the subject." icon_state = "health" item_state = "analyzer" - desc = "A hand-held body scanner able to distinguish vital signs of the subject." flags = FPRINT | TABLEPASS | CONDUCT slot_flags = SLOT_BELT throwforce = 3 @@ -227,8 +227,8 @@ REAGENT SCANNER /obj/item/device/analyzer - desc = "A hand-held environmental scanner which reports current gas levels." name = "analyzer" + desc = "A hand-held environmental scanner which reports current gas levels." icon_state = "atmos" item_state = "analyzer" w_class = 2.0 @@ -274,8 +274,8 @@ REAGENT SCANNER return /obj/item/device/mass_spectrometer + name = "mass spectrometer" desc = "A hand-held mass spectrometer which identifies trace chemicals in a blood sample." - name = "mass-spectrometer" icon_state = "spectrometer" item_state = "analyzer" w_class = 2.0 @@ -342,7 +342,7 @@ REAGENT SCANNER return /obj/item/device/mass_spectrometer/adv - name = "advanced mass-spectrometer" + name = "advanced mass spectrometer" icon_state = "adv_spectrometer" details = 1 origin_tech = "magnets=4;biotech=2" diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index 9b58a812ce1..cd2ff9b5fbc 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -146,7 +146,7 @@ datum/nano_item_lists */ /obj/item/device/uplink/hidden - name = "Hidden Uplink." + name = "hidden uplink" desc = "There is something wrong if you're examining this." var/active = 0 diff --git a/code/game/objects/items/latexballoon.dm b/code/game/objects/items/latexballoon.dm index a923de6183f..db77317eada 100644 --- a/code/game/objects/items/latexballoon.dm +++ b/code/game/objects/items/latexballoon.dm @@ -1,6 +1,6 @@ /obj/item/latexballon - name = "Latex glove" - desc = "" //todo + name = "latex glove" + desc = "A latex glove, usually used as a balloon." icon_state = "latexballon" item_state = "lgloves" force = 0 diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index a50743a83fa..dfc53d3a874 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -40,7 +40,7 @@ /obj/item/borg/sight/xray - name = "\proper x-ray Vision" + name = "\proper x-ray vision" sight_mode = BORGXRAY diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm index e41b29364eb..fb3cd66e99c 100644 --- a/code/game/objects/items/weapons/dna_injector.dm +++ b/code/game/objects/items/weapons/dna_injector.dm @@ -1,5 +1,5 @@ /obj/item/weapon/dnainjector - name = "DNA-Injector" + name = "\improperDNA injector" desc = "This injects the person with DNA." icon = 'icons/obj/items.dmi' icon_state = "dnainjector" @@ -194,7 +194,7 @@ /obj/item/weapon/dnainjector/hulkmut - name = "DNA-Injector (Hulk)" + name = "\improper DNA injector (Hulk)" desc = "This will make you big and strong, but give you a bad skin condition." datatype = DNA2_BUF_SE value = 0xFFF @@ -204,7 +204,7 @@ ..() /obj/item/weapon/dnainjector/antihulk - name = "DNA-Injector (Anti-Hulk)" + name = "\improper DNA injector (Anti-Hulk)" desc = "Cures green skin." datatype = DNA2_BUF_SE value = 0x001 @@ -214,7 +214,7 @@ ..() /obj/item/weapon/dnainjector/xraymut - name = "DNA-Injector (Xray)" + name = "\improper DNA injector (Xray)" desc = "Finally you can see what the Captain does." datatype = DNA2_BUF_SE value = 0xFFF @@ -224,7 +224,7 @@ ..() /obj/item/weapon/dnainjector/antixray - name = "DNA-Injector (Anti-Xray)" + name = "\improper DNA injector (Anti-Xray)" desc = "It will make you see harder." datatype = DNA2_BUF_SE value = 0x001 @@ -234,7 +234,7 @@ ..() /obj/item/weapon/dnainjector/firemut - name = "DNA-Injector (Fire)" + name = "\improper DNA injector (Fire)" desc = "Gives you fire." datatype = DNA2_BUF_SE value = 0xFFF @@ -244,7 +244,7 @@ ..() /obj/item/weapon/dnainjector/antifire - name = "DNA-Injector (Anti-Fire)" + name = "\improper DNA injector (Anti-Fire)" desc = "Cures fire." datatype = DNA2_BUF_SE value = 0x001 @@ -254,7 +254,7 @@ ..() /obj/item/weapon/dnainjector/telemut - name = "DNA-Injector (Tele.)" + name = "\improper DNA injector (Tele.)" desc = "Super brain man!" datatype = DNA2_BUF_SE value = 0xFFF @@ -264,7 +264,7 @@ ..() /obj/item/weapon/dnainjector/antitele - name = "DNA-Injector (Anti-Tele.)" + name = "\improper DNA injector (Anti-Tele.)" desc = "Will make you not able to control your mind." datatype = DNA2_BUF_SE value = 0x001 @@ -274,7 +274,7 @@ ..() /obj/item/weapon/dnainjector/nobreath - name = "DNA-Injector (No Breath)" + name = "\improper DNA injector (No Breath)" desc = "Hold your breath and count to infinity." datatype = DNA2_BUF_SE value = 0xFFF @@ -284,7 +284,7 @@ ..() /obj/item/weapon/dnainjector/antinobreath - name = "DNA-Injector (Anti-No Breath)" + name = "\improper DNA injector (Anti-No Breath)" desc = "Hold your breath and count to 100." datatype = DNA2_BUF_SE value = 0x001 @@ -294,7 +294,7 @@ ..() /obj/item/weapon/dnainjector/remoteview - name = "DNA-Injector (Remote View)" + name = "\improper DNA injector (Remote View)" desc = "Stare into the distance for a reason." datatype = DNA2_BUF_SE value = 0xFFF @@ -304,7 +304,7 @@ ..() /obj/item/weapon/dnainjector/antiremoteview - name = "DNA-Injector (Anti-Remote View)" + name = "\improper DNA injector (Anti-Remote View)" desc = "Cures green skin." datatype = DNA2_BUF_SE value = 0x001 @@ -314,7 +314,7 @@ ..() /obj/item/weapon/dnainjector/regenerate - name = "DNA-Injector (Regeneration)" + name = "\improper DNA injector (Regeneration)" desc = "Healthy but hungry." datatype = DNA2_BUF_SE value = 0xFFF @@ -324,7 +324,7 @@ ..() /obj/item/weapon/dnainjector/antiregenerate - name = "DNA-Injector (Anti-Regeneration)" + name = "\improper DNA injector (Anti-Regeneration)" desc = "Sickly but sated." datatype = DNA2_BUF_SE value = 0x001 @@ -334,7 +334,7 @@ ..() /obj/item/weapon/dnainjector/runfast - name = "DNA-Injector (Increase Run)" + name = "\improper DNA injector (Increase Run)" desc = "Running Man." datatype = DNA2_BUF_SE value = 0xFFF @@ -344,7 +344,7 @@ ..() /obj/item/weapon/dnainjector/antirunfast - name = "DNA-Injector (Anti-Increase Run)" + name = "\improper DNA injector (Anti-Increase Run)" desc = "Walking Man." datatype = DNA2_BUF_SE value = 0x001 @@ -354,7 +354,7 @@ ..() /obj/item/weapon/dnainjector/morph - name = "DNA-Injector (Morph)" + name = "\improper DNA injector (Morph)" desc = "A total makeover." datatype = DNA2_BUF_SE value = 0xFFF @@ -364,7 +364,7 @@ ..() /obj/item/weapon/dnainjector/antimorph - name = "DNA-Injector (Anti-Morph)" + name = "\improper DNA injector (Anti-Morph)" desc = "Cures identity crisis." datatype = DNA2_BUF_SE value = 0x001 @@ -375,7 +375,7 @@ /* No COLDBLOCK on bay /obj/item/weapon/dnainjector/cold - name = "DNA-Injector (Cold)" + name = "\improper DNA injector (Cold)" desc = "Feels a bit chilly." datatype = DNA2_BUF_SE value = 0xFFF @@ -385,7 +385,7 @@ ..() /obj/item/weapon/dnainjector/anticold - name = "DNA-Injector (Anti-Cold)" + name = "\improper DNA injector (Anti-Cold)" desc = "Feels room-temperature." datatype = DNA2_BUF_SE value = 0x001 @@ -396,7 +396,7 @@ */ /obj/item/weapon/dnainjector/noprints - name = "DNA-Injector (No Prints)" + name = "\improper DNA injector (No Prints)" desc = "Better than a pair of budget insulated gloves." datatype = DNA2_BUF_SE value = 0xFFF @@ -406,7 +406,7 @@ ..() /obj/item/weapon/dnainjector/antinoprints - name = "DNA-Injector (Anti-No Prints)" + name = "\improper DNA injector (Anti-No Prints)" desc = "Not quite as good as a pair of budget insulated gloves." datatype = DNA2_BUF_SE value = 0x001 @@ -416,7 +416,7 @@ ..() /obj/item/weapon/dnainjector/insulation - name = "DNA-Injector (Shock Immunity)" + name = "\improper DNA injector (Shock Immunity)" desc = "Better than a pair of real insulated gloves." datatype = DNA2_BUF_SE value = 0xFFF @@ -426,7 +426,7 @@ ..() /obj/item/weapon/dnainjector/antiinsulation - name = "DNA-Injector (Anti-Shock Immunity)" + name = "\improper DNA injector (Anti-Shock Immunity)" desc = "Not quite as good as a pair of real insulated gloves." datatype = DNA2_BUF_SE value = 0x001 @@ -436,7 +436,7 @@ ..() /obj/item/weapon/dnainjector/midgit - name = "DNA-Injector (Small Size)" + name = "\improper DNA injector (Small Size)" desc = "Makes you shrink." datatype = DNA2_BUF_SE value = 0xFFF @@ -446,7 +446,7 @@ ..() /obj/item/weapon/dnainjector/antimidgit - name = "DNA-Injector (Anti-Small Size)" + name = "\improper DNA injector (Anti-Small Size)" desc = "Makes you grow. But not too much." datatype = DNA2_BUF_SE value = 0x001 @@ -457,7 +457,7 @@ ///////////////////////////////////// /obj/item/weapon/dnainjector/antiglasses - name = "DNA-Injector (Anti-Glasses)" + name = "\improper DNA injector (Anti-Glasses)" desc = "Toss away those glasses!" datatype = DNA2_BUF_SE value = 0x001 @@ -467,7 +467,7 @@ ..() /obj/item/weapon/dnainjector/glassesmut - name = "DNA-Injector (Glasses)" + name = "\improper DNA injector (Glasses)" desc = "Will make you need dorkish glasses." datatype = DNA2_BUF_SE value = 0xFFF @@ -477,7 +477,7 @@ ..() /obj/item/weapon/dnainjector/epimut - name = "DNA-Injector (Epi.)" + name = "\improper DNA injector (Epi.)" desc = "Shake shake shake the room!" datatype = DNA2_BUF_SE value = 0xFFF @@ -487,7 +487,7 @@ ..() /obj/item/weapon/dnainjector/antiepi - name = "DNA-Injector (Anti-Epi.)" + name = "\improper DNA injector (Anti-Epi.)" desc = "Will fix you up from shaking the room." datatype = DNA2_BUF_SE value = 0x001 @@ -497,7 +497,7 @@ ..() /obj/item/weapon/dnainjector/anticough - name = "DNA-Injector (Anti-Cough)" + name = "\improper DNA injector (Anti-Cough)" desc = "Will stop that awful noise." datatype = DNA2_BUF_SE value = 0x001 @@ -507,7 +507,7 @@ ..() /obj/item/weapon/dnainjector/coughmut - name = "DNA-Injector (Cough)" + name = "\improper DNA injector (Cough)" desc = "Will bring forth a sound of horror from your throat." datatype = DNA2_BUF_SE value = 0xFFF @@ -517,7 +517,7 @@ ..() /obj/item/weapon/dnainjector/clumsymut - name = "DNA-Injector (Clumsy)" + name = "\improper DNA injector (Clumsy)" desc = "Makes clumsy minions." datatype = DNA2_BUF_SE value = 0xFFF @@ -527,7 +527,7 @@ ..() /obj/item/weapon/dnainjector/anticlumsy - name = "DNA-Injector (Anti-Clumy)" + name = "\improper DNA injector (Anti-Clumy)" desc = "Cleans up confusion." datatype = DNA2_BUF_SE value = 0x001 @@ -537,7 +537,7 @@ ..() /obj/item/weapon/dnainjector/antitour - name = "DNA-Injector (Anti-Tour.)" + name = "\improper DNA injector (Anti-Tour.)" desc = "Will cure tourrets." datatype = DNA2_BUF_SE value = 0x001 @@ -547,7 +547,7 @@ ..() /obj/item/weapon/dnainjector/tourmut - name = "DNA-Injector (Tour.)" + name = "\improper DNA injector (Tour.)" desc = "Gives you a nasty case off tourrets." datatype = DNA2_BUF_SE value = 0xFFF @@ -557,7 +557,7 @@ ..() /obj/item/weapon/dnainjector/stuttmut - name = "DNA-Injector (Stutt.)" + name = "\improper DNA injector (Stutt.)" desc = "Makes you s-s-stuttterrr" datatype = DNA2_BUF_SE value = 0xFFF @@ -567,7 +567,7 @@ ..() /obj/item/weapon/dnainjector/antistutt - name = "DNA-Injector (Anti-Stutt.)" + name = "\improper DNA injector (Anti-Stutt.)" desc = "Fixes that speaking impairment." datatype = DNA2_BUF_SE value = 0x001 @@ -577,7 +577,7 @@ ..() /obj/item/weapon/dnainjector/blindmut - name = "DNA-Injector (Blind)" + name = "\improper DNA injector (Blind)" desc = "Makes you not see anything." datatype = DNA2_BUF_SE value = 0xFFF @@ -587,7 +587,7 @@ ..() /obj/item/weapon/dnainjector/antiblind - name = "DNA-Injector (Anti-Blind)" + name = "\improper DNA injector (Anti-Blind)" desc = "ITS A MIRACLE!!!" datatype = DNA2_BUF_SE value = 0x001 @@ -597,7 +597,7 @@ ..() /obj/item/weapon/dnainjector/deafmut - name = "DNA-Injector (Deaf)" + name = "\improper DNA injector (Deaf)" desc = "Sorry, what did you say?" datatype = DNA2_BUF_SE value = 0xFFF @@ -607,7 +607,7 @@ ..() /obj/item/weapon/dnainjector/antideaf - name = "DNA-Injector (Anti-Deaf)" + name = "\improper DNA injector (Anti-Deaf)" desc = "Will make you hear once more." datatype = DNA2_BUF_SE value = 0x001 @@ -617,7 +617,7 @@ ..() /obj/item/weapon/dnainjector/hallucination - name = "DNA-Injector (Halluctination)" + name = "\improper DNA injector (Halluctination)" desc = "What you see isn't always what you get." datatype = DNA2_BUF_SE value = 0xFFF @@ -627,7 +627,7 @@ ..() /obj/item/weapon/dnainjector/antihallucination - name = "DNA-Injector (Anti-Hallucination)" + name = "\improper DNA injector (Anti-Hallucination)" desc = "What you see is what you get." datatype = DNA2_BUF_SE value = 0x001 @@ -637,7 +637,7 @@ ..() /obj/item/weapon/dnainjector/h2m - name = "DNA-Injector (Human > Monkey)" + name = "\improper DNA injector (Human > Monkey)" desc = "Will make you a flea bag." datatype = DNA2_BUF_SE value = 0xFFF @@ -647,11 +647,11 @@ ..() /obj/item/weapon/dnainjector/m2h - name = "DNA-Injector (Monkey > Human)" + name = "\improper DNA injector (Monkey > Human)" desc = "Will make you...less hairy." datatype = DNA2_BUF_SE value = 0x001 //block = 14 New() block = MONKEYBLOCK - ..() \ No newline at end of file + ..() diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index d827567646e..bb440d1215a 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -1,5 +1,5 @@ /obj/item/weapon/grenade/chem_grenade - name = "Grenade Casing" + name = "grenade casing" icon_state = "chemg" item_state = "flashbang" desc = "A hand made chemical grenade." @@ -171,7 +171,7 @@ /obj/item/weapon/grenade/chem_grenade/large - name = "Large Chem Grenade" + name = "large chem grenade" desc = "An oversized grenade that affects a larger area." icon_state = "large_grenade" allowed_containers = list(/obj/item/weapon/reagent_containers/glass) @@ -179,7 +179,7 @@ affected_area = 4 /obj/item/weapon/grenade/chem_grenade/metalfoam - name = "Metal-Foam Grenade" + name = "metal-foam grenade" desc = "Used for emergency sealing of air breaches." path = 1 stage = 2 @@ -200,7 +200,7 @@ icon_state = initial(icon_state) +"_locked" /obj/item/weapon/grenade/chem_grenade/incendiary - name = "Incendiary Grenade" + name = "incendiary grenade" desc = "Used for clearing rooms of living things." path = 1 stage = 2 diff --git a/code/game/objects/items/weapons/implants/implantcase.dm b/code/game/objects/items/weapons/implants/implantcase.dm index 03776c78ded..ae77d373da0 100644 --- a/code/game/objects/items/weapons/implants/implantcase.dm +++ b/code/game/objects/items/weapons/implants/implantcase.dm @@ -1,7 +1,7 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32 /obj/item/weapon/implantcase - name = "Glass Case" + name = "glass case" desc = "A case containing an implant." icon = 'icons/obj/items.dmi' icon_state = "implantcase-0" @@ -63,7 +63,7 @@ /obj/item/weapon/implantcase/tracking - name = "Glass Case - 'Tracking'" + name = "glass case - 'tracking'" desc = "A case containing a tracking implant." icon_state = "implantcase-b" @@ -74,7 +74,7 @@ /obj/item/weapon/implantcase/explosive - name = "Glass Case - 'Explosive'" + name = "glass case - 'explosive'" desc = "A case containing an explosive implant." icon_state = "implantcase-r" @@ -85,7 +85,7 @@ /obj/item/weapon/implantcase/chem - name = "Glass Case - 'Chem'" + name = "glass case - 'chem'" desc = "A case containing a chemical implant." icon_state = "implantcase-b" @@ -96,7 +96,7 @@ /obj/item/weapon/implantcase/loyalty - name = "Glass Case - 'Loyalty'" + name = "glass case - 'loyalty'" desc = "A case containing a loyalty implant." icon_state = "implantcase-r" @@ -107,7 +107,7 @@ /obj/item/weapon/implantcase/death_alarm - name = "Glass Case - 'Death Alarm'" + name = "glass case - 'death alarm'" desc = "A case containing a death alarm implant." icon_state = "implantcase-b" @@ -118,7 +118,7 @@ /obj/item/weapon/implantcase/freedom - name = "Glass Case - 'Freedom'" + name = "glass case - 'freedom'" desc = "A case containing a freedom implant." icon_state = "implantcase-r" @@ -129,7 +129,7 @@ /obj/item/weapon/implantcase/adrenalin - name = "Glass Case - 'Adrenalin'" + name = "glass case - 'adrenalin'" desc = "A case containing an adrenalin implant." icon_state = "implantcase-b" @@ -140,7 +140,7 @@ /obj/item/weapon/implantcase/dexplosive - name = "Glass Case - 'Explosive'" + name = "glass case - 'explosive'" desc = "A case containing an explosive." icon_state = "implantcase-r" @@ -151,11 +151,11 @@ /obj/item/weapon/implantcase/health - name = "Glass Case - 'Health'" + name = "glass case - 'health'" desc = "A case containing a health tracking implant." icon_state = "implantcase-b" /obj/item/weapon/implantcase/health/New() src.imp = new /obj/item/weapon/implant/health( src ) ..() - return \ No newline at end of file + return diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index c71a5d72985..972c639f74e 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -82,7 +82,7 @@ /obj/item/weapon/storage/backpack/santabag - name = "Santa's Gift Bag" + name = "\improper Santa's gift bag" desc = "Space Santa uses this to deliver toys to all the nice children in space in Christmas! Wow, it's pretty big!" icon_state = "giftbag0" item_state = "giftbag" diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index f7da60688e4..b2d54be9476 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -71,7 +71,7 @@ // ----------------------------- /obj/item/weapon/storage/bag/ore - name = "Mining Satchel" + name = "mining satchel" desc = "This little bugger can be used to store and transport ores." icon = 'icons/obj/mining.dmi' icon_state = "satchel" @@ -88,9 +88,9 @@ // ----------------------------- /obj/item/weapon/storage/bag/plants + name = "plant bag" icon = 'icons/obj/hydroponics.dmi' icon_state = "plantbag" - name = "Plant Bag" storage_slots = 50; //the number of plant pieces it can carry. max_combined_w_class = 200 //Doesn't matter what this is, so long as it's more or equal to storage_slots * plants.w_class max_w_class = 3 @@ -105,9 +105,9 @@ // However, making it a storage/bag allows us to reuse existing code in some places. -Sayu /obj/item/weapon/storage/bag/sheetsnatcher + name = "sheet snatcher" icon = 'icons/obj/mining.dmi' icon_state = "sheetsnatcher" - name = "Sheet Snatcher" desc = "A patented Nanotrasen storage system designed for any kind of mineral sheet." var/capacity = 300; //the number of sheets it can carry. @@ -236,7 +236,7 @@ // ----------------------------- /obj/item/weapon/storage/bag/sheetsnatcher/borg - name = "Sheet Snatcher 9000" + name = "sheet snatcher 9000" desc = "" capacity = 500//Borgs get more because >specialization @@ -245,9 +245,9 @@ // ----------------------------- /obj/item/weapon/storage/bag/cash + name = "cash bag" icon = 'icons/obj/storage.dmi' icon_state = "cashbag" - name = "Cash bag" desc = "A bag for carrying lots of cash. It's got a big dollar sign printed on the front." storage_slots = 50; //the number of cash pieces it can carry. max_combined_w_class = 200 //Doesn't matter what this is, so long as it's more or equal to storage_slots * cash.w_class diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index f480e921855..4b9a7dbe649 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -252,7 +252,7 @@ new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src) /obj/item/weapon/storage/box/cdeathalarm_kit - name = "Death Alarm Kit" + name = "death alarm kit" desc = "Box of stuff used to implant death alarms." icon_state = "implant" item_state = "syringe_kit" diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index 48a64626512..6e2eca01c50 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -140,7 +140,7 @@ new /obj/item/weapon/reagent_containers/pill/kelotane( src ) /obj/item/weapon/storage/pill_bottle/antitox - name = "Dylovene pills" + name = "bottle of Dylovene pills" desc = "Contains pills used to counter toxins." New() @@ -154,7 +154,7 @@ new /obj/item/weapon/reagent_containers/pill/antitox( src ) /obj/item/weapon/storage/pill_bottle/inaprovaline - name = "Inaprovaline pills" + name = "bottle of Inaprovaline pills" desc = "Contains pills used to stabilize patients." New() @@ -168,7 +168,7 @@ new /obj/item/weapon/reagent_containers/pill/inaprovaline( src ) /obj/item/weapon/storage/pill_bottle/tramadol - name = "Tramadol Pills" + name = "bottle of Tramadol Pills" desc = "Contains pills used to relieve pain." New() @@ -180,4 +180,3 @@ new /obj/item/weapon/reagent_containers/pill/tramadol( src ) new /obj/item/weapon/reagent_containers/pill/tramadol( src ) new /obj/item/weapon/reagent_containers/pill/tramadol( src ) - diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index d28586b0a21..d3726f823f1 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -124,7 +124,7 @@ return /obj/item/weapon/storage/box/syndie_kit/chameleon - name = "Chameleon Kit" + name = "chameleon kit" desc = "Comes with all the clothes you need to impersonate most people. Acting lessons sold seperately." storage_slots = 10 diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm index 7b41c1b18ba..07dc6638a9b 100644 --- a/code/game/objects/items/weapons/tanks/jetpack.dm +++ b/code/game/objects/items/weapons/tanks/jetpack.dm @@ -1,7 +1,7 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32 /obj/item/weapon/tank/jetpack - name = "Jetpack (Empty)" + name = "jetpack (empty)" desc = "A tank of compressed gas for use as propulsion in zero-gravity areas. Use with caution." icon_state = "jetpack" w_class = 4.0 @@ -71,7 +71,7 @@ /obj/item/weapon/tank/jetpack/void - name = "Void Jetpack (Oxygen)" + name = "void jetpack (oxygen)" desc = "It works well in a void." icon_state = "jetpack-void" item_state = "jetpack-void" @@ -82,7 +82,7 @@ return /obj/item/weapon/tank/jetpack/oxygen - name = "Jetpack (Oxygen)" + name = "jetpack (oxygen)" desc = "A tank of compressed oxygen for use as propulsion in zero-gravity areas. Use with caution." icon_state = "jetpack" item_state = "jetpack" @@ -93,7 +93,7 @@ return /obj/item/weapon/tank/jetpack/carbondioxide - name = "Jetpack (Carbon Dioxide)" + name = "jetpack (carbon dioxide)" desc = "A tank of compressed carbon dioxide for use as propulsion in zero-gravity areas. Painted black to indicate that it should not be used as a source for internals." distribute_pressure = 0 icon_state = "jetpack-black" diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index dac6e5a260e..405e41aab2e 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -1,5 +1,5 @@ /obj/item/weapon/banhammer - desc = "A banhammer" + desc = "banhammer" name = "banhammer" icon = 'icons/obj/items.dmi' icon_state = "toyhammer" diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index 83923831506..9a0a0d4fe0a 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -1,5 +1,5 @@ /obj/random - name = "Random Object" + name = "random object" desc = "This item type is used to spawn random objects at round-start" icon = 'icons/misc/mark.dmi' icon_state = "rup" @@ -26,7 +26,7 @@ /obj/random/tool - name = "Random Tool" + name = "random tool" desc = "This is a random tool" icon = 'icons/obj/items.dmi' icon_state = "welder" @@ -40,7 +40,7 @@ /obj/random/technology_scanner - name = "Random Scanner" + name = "random scanner" desc = "This is a random technology scanner." icon = 'icons/obj/device.dmi' icon_state = "atmos" @@ -51,7 +51,7 @@ /obj/random/powercell - name = "Random Powercell" + name = "random powercell" desc = "This is a random powercell." icon = 'icons/obj/power.dmi' icon_state = "cell" @@ -64,7 +64,7 @@ /obj/random/bomb_supply - name = "Bomb Supply" + name = "bomb supply" desc = "This is a random bomb supply." icon = 'icons/obj/assemblies/new_assemblies.dmi' icon_state = "signaller" @@ -76,7 +76,7 @@ /obj/random/toolbox - name = "Random Toolbox" + name = "random toolbox" desc = "This is a random toolbox." icon = 'icons/obj/storage.dmi' icon_state = "red" @@ -87,7 +87,7 @@ /obj/random/tech_supply - name = "Random Tech Supply" + name = "random tech supply" desc = "This is a random piece of technology supplies." icon = 'icons/obj/power.dmi' icon_state = "cell" diff --git a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm index 73295477f0a..178172c4409 100644 --- a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm +++ b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm @@ -1,6 +1,6 @@ //I still dont think this should be a closet but whatever /obj/structure/closet/fireaxecabinet - name = "Fire Axe Cabinet" + name = "fire axe cabinet" desc = "There is small label that reads \"For Emergency use only\" along with details for safe use of the axe. As if." var/obj/item/weapon/twohanded/fireaxe/fireaxe icon_state = "fireaxe1000" diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 061f34266e2..824e52d8bc4 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -35,7 +35,7 @@ * Chef */ /obj/structure/closet/chefcloset - name = "\proper chef's closet" + name = "chef's closet" desc = "It's a storage unit for foodservice garments." icon_state = "black" icon_closed = "black" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm index 42759e3380f..7f8192156d5 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm @@ -1,5 +1,5 @@ /obj/structure/closet/secure_closet/bar - name = "Booze" + name = "booze closet" req_access = list(access_bar) icon_state = "cabinetdetective_locked" icon_closed = "cabinetdetective" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm index f7e3a25bb33..6859800f785 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -1,5 +1,5 @@ /obj/structure/closet/secure_closet/cargotech - name = "Cargo Technician's Locker" + name = "cargo technician's locker" req_access = list(access_cargo) icon_state = "securecargo1" icon_closed = "securecargo" @@ -19,7 +19,7 @@ return /obj/structure/closet/secure_closet/quartermaster - name = "Quartermaster's Locker" + name = "quartermaster's locker" req_access = list(access_qm) icon_state = "secureqm1" icon_closed = "secureqm" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 76528200fef..803f07616e0 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -1,5 +1,5 @@ /obj/structure/closet/secure_closet/engineering_chief - name = "Chief Engineer's Locker" + name = "chief engineer's locker" req_access = list(access_ce) icon_state = "securece1" icon_closed = "securece" @@ -38,7 +38,7 @@ /obj/structure/closet/secure_closet/engineering_electrical - name = "Electrical Supplies" + name = "electrical supplies" req_access = list(access_engine_equip) icon_state = "secureengelec1" icon_closed = "secureengelec" @@ -66,7 +66,7 @@ /obj/structure/closet/secure_closet/engineering_welding - name = "Welding Supplies" + name = "welding supplies" req_access = list(access_construction) icon_state = "secureengweld1" icon_closed = "secureengweld" @@ -92,7 +92,7 @@ /obj/structure/closet/secure_closet/engineering_personal - name = "Engineer's Locker" + name = "engineer's locker" req_access = list(access_engine_equip) icon_state = "secureeng1" icon_closed = "secureeng" @@ -121,7 +121,7 @@ new /obj/item/taperoll/engineering(src) return /obj/structure/closet/secure_closet/atmos_personal - name = "Technician's Locker" + name = "technician's locker" req_access = list(access_atmospherics) icon_state = "secureatm1" icon_closed = "secureatm" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm index 4f326f0fb8f..13711ca6f66 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -13,7 +13,7 @@ icon_state = icon_opened /obj/structure/closet/secure_closet/freezer/kitchen - name = "Kitchen Cabinet" + name = "kitchen cabinet" req_access = list(access_kitchen) New() @@ -32,7 +32,7 @@ /obj/structure/closet/secure_closet/freezer/meat - name = "Meat Fridge" + name = "meat fridge" icon_state = "fridge1" icon_closed = "fridge" icon_locked = "fridge1" @@ -50,7 +50,7 @@ /obj/structure/closet/secure_closet/freezer/fridge - name = "Refrigerator" + name = "refrigerator" icon_state = "fridge1" icon_closed = "fridge" icon_locked = "fridge1" @@ -72,7 +72,7 @@ /obj/structure/closet/secure_closet/freezer/money - name = "Freezer" + name = "freezer" icon_state = "fridge1" icon_closed = "fridge" icon_locked = "fridge1" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm index 3f7d24542ee..5ad3d8c6e0e 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm @@ -1,5 +1,5 @@ /obj/structure/closet/secure_closet/hydroponics - name = "Botanist's locker" + name = "botanist's locker" req_access = list(access_hydroponics) icon_state = "hydrosecure1" icon_closed = "hydrosecure" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 0ee184429af..c242e5f8c07 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -1,5 +1,5 @@ /obj/structure/closet/secure_closet/medical1 - name = "Medicine Closet" + name = "medicine closet" desc = "Filled with medical junk." icon_state = "medical1" icon_closed = "medical" @@ -27,7 +27,7 @@ /obj/structure/closet/secure_closet/medical2 - name = "Anesthetic" + name = "anesthetics closet" desc = "Used to knock people out." icon_state = "medical1" icon_closed = "medical" @@ -51,7 +51,7 @@ /obj/structure/closet/secure_closet/medical3 - name = "Medical Doctor's Locker" + name = "medical doctor's locker" req_access = list(access_surgery) icon_state = "securemed1" icon_closed = "securemed" @@ -101,7 +101,7 @@ /obj/structure/closet/secure_closet/CMO - name = "Chief Medical Officer's Locker" + name = "chief medical officer's locker" req_access = list(access_cmo) icon_state = "cmosecure1" icon_closed = "cmosecure" @@ -143,7 +143,7 @@ /obj/structure/closet/secure_closet/animal - name = "Animal Control" + name = "animal control closet" req_access = list(access_surgery) @@ -158,7 +158,7 @@ /obj/structure/closet/secure_closet/chemical - name = "Chemical Closet" + name = "chemical closet" desc = "Store dangerous chemicals in here." icon_state = "medical1" icon_closed = "medical" @@ -176,7 +176,7 @@ return /obj/structure/closet/secure_closet/medical_wall - name = "First Aid Closet" + name = "first aid closet" desc = "It's a secure wall-mounted storage unit for first aid supplies." icon_state = "medical_wall_locked" icon_closed = "medical_wall_unlocked" @@ -199,4 +199,4 @@ else icon_state = icon_closed else - icon_state = icon_opened \ No newline at end of file + icon_state = icon_opened diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index 5d6e7c3a0e1..2cef42a82b6 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -1,5 +1,5 @@ /obj/structure/closet/secure_closet/scientist - name = "Scientist's Locker" + name = "scientist's locker" req_access = list(access_tox_storage) icon_state = "secureres1" icon_closed = "secureres" @@ -23,7 +23,7 @@ /obj/structure/closet/secure_closet/RD - name = "Research Director's Locker" + name = "research director's locker" req_access = list(access_rd) icon_state = "rdsecure1" icon_closed = "rdsecure" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index b772f95e9a3..b5b8796b3c0 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -1,5 +1,5 @@ /obj/structure/closet/secure_closet/captains - name = "Captain's Locker" + name = "captain's locker" req_access = list(access_captain) icon_state = "capsecure1" icon_closed = "capsecure" @@ -35,7 +35,7 @@ /obj/structure/closet/secure_closet/hop - name = "Head of Personnel's Locker" + name = "head of personnel's locker" req_access = list(access_hop) icon_state = "hopsecure1" icon_closed = "hopsecure" @@ -58,7 +58,7 @@ return /obj/structure/closet/secure_closet/hop2 - name = "Head of Personnel's Attire" + name = "head of personnel's attire" req_access = list(access_hop) icon_state = "hopsecure1" icon_closed = "hopsecure" @@ -87,7 +87,7 @@ /obj/structure/closet/secure_closet/hos - name = "Head of Security's Locker" + name = "head of security's locker" req_access = list(access_hos) icon_state = "hossecure1" icon_closed = "hossecure" @@ -127,7 +127,7 @@ /obj/structure/closet/secure_closet/warden - name = "Warden's Locker" + name = "warden's locker" req_access = list(access_armory) icon_state = "wardensecure1" icon_closed = "wardensecure" @@ -164,7 +164,7 @@ /obj/structure/closet/secure_closet/security - name = "Security Officer's Locker" + name = "security officer's locker" req_access = list(access_security) icon_state = "sec1" icon_closed = "sec" @@ -232,7 +232,7 @@ /obj/structure/closet/secure_closet/detective - name = "Detective's Cabinet" + name = "detective's cabinet" req_access = list(access_forensics_lockers) icon_state = "cabinetdetective_locked" icon_closed = "cabinetdetective" @@ -278,7 +278,7 @@ icon_state = icon_opened /obj/structure/closet/secure_closet/injection - name = "Lethal Injections" + name = "lethal injections locker" req_access = list(access_captain) @@ -291,7 +291,7 @@ /obj/structure/closet/secure_closet/brig - name = "Brig Locker" + name = "brig locker" req_access = list(access_brig) anchored = 1 var/id = null @@ -305,7 +305,7 @@ /obj/structure/closet/secure_closet/courtroom - name = "Courtroom Locker" + name = "courtroom locker" req_access = list(access_court) New() diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm index cd06efb60f5..3e95b5837dc 100644 --- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm +++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm @@ -1,5 +1,5 @@ /obj/structure/closet/syndicate - name = "armoury closet" + name = "armory closet" desc = "Why is this here?" icon_state = "syndicate" icon_closed = "syndicate" diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index a4c0ca78e80..1df05570972 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -213,7 +213,7 @@ /obj/structure/closet/wardrobe/pjs - name = "Pajama wardrobe" + name = "pajama wardrobe" icon_state = "white" icon_closed = "white" diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index df7b63a1995..998328a1bf5 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -230,15 +230,15 @@ icon_closed = "plasticcrate" /obj/structure/closet/crate/internals + name = "internals crate" desc = "A internals crate." - name = "Internals crate" icon_state = "o2crate" icon_opened = "o2crateopen" icon_closed = "o2crate" /obj/structure/closet/crate/trashcart + name = "trash cart" desc = "A heavy, metal trashcart with wheels." - name = "Trash Cart" icon_state = "trashcart" icon_opened = "trashcartopen" icon_closed = "trashcart" @@ -260,15 +260,15 @@ */ /obj/structure/closet/crate/medical + name = "medical crate" desc = "A medical crate." - name = "Medical crate" icon_state = "medicalcrate" icon_opened = "medicalcrateopen" icon_closed = "medicalcrate" /obj/structure/closet/crate/rcd - desc = "A crate for the storage of the RCD." - name = "RCD crate" + name = "\improper RCD crate" + desc = "A crate with rapid construction device." icon_state = "crate" icon_opened = "crateopen" icon_closed = "crate" @@ -281,7 +281,7 @@ new /obj/item/weapon/rcd(src) /obj/structure/closet/crate/solar - name = "Solar Pack crate" + name = "solar pack crate" /obj/structure/closet/crate/solar/New() ..() @@ -311,8 +311,8 @@ new /obj/item/weapon/paper/solar(src) /obj/structure/closet/crate/freezer + name = "freezer" desc = "A freezer." - name = "Freezer" icon_state = "freezer" icon_opened = "freezeropen" icon_closed = "freezer" @@ -333,8 +333,8 @@ return newgas /obj/structure/closet/crate/freezer/rations //Fpr use in the escape shuttle + name = "emergency rations" desc = "A crate of emergency rations." - name = "Emergency Rations" /obj/structure/closet/crate/freezer/rations/New() @@ -343,15 +343,15 @@ new /obj/item/weapon/storage/box/donkpockets(src) /obj/structure/closet/crate/bin + name = "large bin" desc = "A large bin." - name = "Large bin" icon_state = "largebin" icon_opened = "largebinopen" icon_closed = "largebin" /obj/structure/closet/crate/radiation + name = "radioactive gear crate" desc = "A crate with a radiation sign on it." - name = "Radioactive gear crate" icon_state = "radiation" icon_opened = "radiationopen" icon_closed = "radiation" @@ -368,36 +368,36 @@ new /obj/item/clothing/head/radiation(src) /obj/structure/closet/crate/secure/weapon + name = "weapons crate" desc = "A secure weapons crate." - name = "Weapons crate" icon_state = "weaponcrate" icon_opened = "weaponcrateopen" icon_closed = "weaponcrate" /obj/structure/closet/crate/secure/phoron + name = "phoron crate" desc = "A secure phoron crate." - name = "Phoron crate" icon_state = "phoroncrate" icon_opened = "phoroncrateopen" icon_closed = "phoroncrate" /obj/structure/closet/crate/secure/gear + name = "gear crate" desc = "A secure gear crate." - name = "Gear crate" icon_state = "secgearcrate" icon_opened = "secgearcrateopen" icon_closed = "secgearcrate" /obj/structure/closet/crate/secure/hydrosec - desc = "A crate with a lock on it, painted in the scheme of the station's botanists." name = "secure hydroponics crate" + desc = "A crate with a lock on it, painted in the scheme of the station's botanists." icon_state = "hydrosecurecrate" icon_opened = "hydrosecurecrateopen" icon_closed = "hydrosecurecrate" /obj/structure/closet/crate/secure/bin + name = "secure bin" desc = "A secure bin." - name = "Secure bin" icon_state = "largebins" icon_opened = "largebinsopen" icon_closed = "largebins" @@ -468,7 +468,7 @@ icon_closed = "largermetal" /obj/structure/closet/crate/hydroponics - name = "Hydroponics crate" + name = "hydroponics crate" desc = "All you need to destroy those pesky weeds and pests." icon_state = "hydrocrate" icon_opened = "hydrocrateopen" diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index 1958bac750c..9f7795b9889 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -64,7 +64,7 @@ ..() /obj/structure/largecrate/hoverpod - name = "Hoverpod assembly crate" + name = "\improper Hoverpod assembly crate" desc = "It comes in a box for the fabricator's sake. Where does the wood come from? ... And why is it lighter?" icon_state = "mulecrate" diff --git a/code/game/objects/structures/lamarr_cage.dm b/code/game/objects/structures/lamarr_cage.dm index 14377992bbc..4598e29f1aa 100644 --- a/code/game/objects/structures/lamarr_cage.dm +++ b/code/game/objects/structures/lamarr_cage.dm @@ -1,5 +1,5 @@ /obj/structure/lamarr - name = "Lab Cage" + name = "lab cage" icon = 'icons/obj/stationobjs.dmi' icon_state = "labcage1" desc = "A glass lab container for storing interesting creatures." diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index b82a3495df1..c2ac05c3c00 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -1,6 +1,6 @@ //wip wip wup /obj/structure/mirror - name = "SalonPro Nano-Mirror(TM)" + name = "\improper SalonPro Nano-Mirror(TM)" desc = "The leading technology in hair salon products, utilizing nano-machinery to style your hair just right." icon = 'icons/obj/watercloset.dmi' icon_state = "mirror" diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index 388dcf41b38..0b11d09fccc 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -141,12 +141,12 @@ icon_state = "goldenplaque" /obj/structure/sign/kiddieplaque - name = "AI developers plaque" + name = "\improper AI developers plaque" desc = "Next to the extremely long list of names and job titles, there is a drawing of a little child. The child appears to be retarded. Beneath the image, someone has scratched the word \"PACKETS\"" icon_state = "kiddieplaque" /obj/structure/sign/atmosplaque - name = "\improper FEA Atmospherics Division plaque" + name = "\improper FEA atmospherics division plaque" desc = "This plaque commemorates the fall of the Atmos FEA division. For all the charred, dizzy, and brittle men who have died in its hands." icon_state = "atmosplaque" diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index c115f230e2b..a0855a35b08 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -10,9 +10,8 @@ obj/structure/windoor_assembly + name = "windoor assembly" icon = 'icons/obj/doors/windoor.dmi' - - name = "Windoor Assembly" icon_state = "l_windoor_assembly01" anchored = 0 density = 0 diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm index 546e0ec81a4..bd02ce1b36a 100644 --- a/code/modules/mob/living/carbon/brain/MMI.dm +++ b/code/modules/mob/living/carbon/brain/MMI.dm @@ -18,7 +18,7 @@ return /obj/item/device/mmi - name = "Man-Machine Interface" + name = "man-machine interface" desc = "The Warrior's bland acronym, MMI, obscures the true horror of this monstrosity." icon = 'icons/obj/assemblies.dmi' icon_state = "mmi_empty" @@ -116,7 +116,7 @@ return /obj/item/device/mmi/radio_enabled - name = "Radio-enabled Man-Machine Interface" + name = "radio-enabled man-machine interface" desc = "The Warrior's bland acronym, MMI, obscures the true horror of this monstrosity. This one comes with a built-in radio." origin_tech = "biotech=4" diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index 6de6cd9ee28..8f90743e468 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -6,8 +6,8 @@ var/global/list/uneatable = list( ) /obj/machinery/singularity/ - name = "Gravitational Singularity" - desc = "A Gravitational Singularity." + name = "gravitational singularity" + desc = "A gravitational singularity." icon = 'icons/obj/singularity.dmi' icon_state = "singularity_s1" anchored = 1 diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index 61c65165abf..a52119c1686 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -53,7 +53,7 @@ return 0 /obj/item/weapon/gun/energy/gun/nuclear - name = "Advanced Energy Gun" + name = "advanced energy gun" desc = "An energy gun with an experimental miniaturized reactor." icon_state = "nucgun" origin_tech = "combat=3;materials=5;powerstorage=3" diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 44941eb5329..a87218d12cb 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -214,7 +214,7 @@ obj/item/weapon/gun/energy/staff/focus projectile_type = "/obj/item/projectile/energy/phoron" /obj/item/weapon/gun/energy/sniperrifle - name = "L.W.A.P. Sniper Rifle" + name = "\improper L.W.A.P. sniper rifle" desc = "A rifle constructed of lightweight materials, fitted with a SMART aiming-system scope." icon = 'icons/obj/gun.dmi' icon_state = "sniper" diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 93a7010d7d1..4cbb7ec2f86 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -16,7 +16,7 @@ /obj/item/weapon/gun/projectile/automatic/mini_uzi - name = "Uzi" + name = "\improper Uzi" desc = "A lightweight, fast firing gun, for when you want someone dead. Uses .45 rounds." icon_state = "mini-uzi" w_class = 3.0 diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index 19806429a31..8e981259779 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -103,7 +103,7 @@ // You can spin the chamber to randomize the position of the bullet. /obj/item/weapon/gun/projectile/russian - name = "Russian Revolver" + name = "\improper Russian revolver" desc = "A Russian made revolver. Uses .357 ammo. It has a single slot in it's chamber for a bullet." max_shells = 6 origin_tech = "combat=2;materials=2" From 488207473998819b6c3996a2cfcb888e22fc0ffa Mon Sep 17 00:00:00 2001 From: Amunak Date: Thu, 18 Dec 2014 03:11:49 +0100 Subject: [PATCH 27/35] Code formatting, EOL at EOF fixes, refactoring --- code/game/objects/items/contraband.dm | 2 +- code/game/objects/items/devices/PDA/PDA.dm | 2 +- code/game/objects/items/devices/aicard.dm | 2 +- code/game/objects/items/devices/binoculars.dm | 2 +- .../objects/items/devices/chameleonproj.dm | 2 +- code/game/objects/items/devices/debugger.dm | 4 +- code/game/objects/items/devices/flashlight.dm | 2 +- .../objects/items/devices/lightreplacer.dm | 2 +- code/game/objects/items/devices/megaphone.dm | 2 +- code/game/objects/items/devices/modkit.dm | 2 +- code/game/objects/items/devices/multitool.dm | 2 +- code/game/objects/items/devices/powersink.dm | 2 +- .../objects/items/devices/radio/beacon.dm | 2 +- .../objects/items/devices/radio/headset.dm | 4 +- .../objects/items/devices/suit_cooling.dm | 2 +- .../objects/items/devices/taperecorder.dm | 2 +- .../objects/items/devices/traitordevices.dm | 5 -- .../objects/items/devices/transfer_valve.dm | 6 +- code/game/objects/items/devices/violin.dm | 2 +- code/game/objects/items/devices/whistle.dm | 2 +- code/game/objects/items/latexballoon.dm | 2 +- code/game/objects/items/shooting_range.dm | 2 +- code/game/objects/items/stacks/medical.dm | 2 +- code/game/objects/items/stacks/nanopaste.dm | 2 +- .../objects/items/stacks/sheets/leather.dm | 2 +- .../objects/items/stacks/sheets/mineral.dm | 2 +- .../items/stacks/sheets/sheet_types.dm | 2 +- .../objects/items/stacks/sheets/sheets.dm | 2 +- code/game/objects/items/stacks/stack.dm | 2 +- code/game/objects/items/stacks/tiles/light.dm | 2 +- code/game/objects/items/toys.dm | 6 +- code/game/objects/items/trash.dm | 77 +++++++++++-------- code/game/objects/items/weapons/RCD.dm | 4 +- code/game/objects/items/weapons/RSF.dm | 2 +- .../game/objects/items/weapons/clown_items.dm | 2 +- code/game/objects/items/weapons/dice.dm | 2 +- .../objects/items/weapons/extinguisher.dm | 2 +- .../objects/items/weapons/flamethrower.dm | 2 +- .../objects/items/weapons/gift_wrappaper.dm | 2 +- .../items/weapons/grenades/emgrenade.dm | 1 - .../items/weapons/grenades/flashbang.dm | 2 +- .../objects/items/weapons/grenades/grenade.dm | 2 +- .../items/weapons/grenades/spawnergrenade.dm | 2 +- code/game/objects/items/weapons/handcuffs.dm | 2 +- .../objects/items/weapons/implants/implant.dm | 2 +- .../items/weapons/implants/implantfreedom.dm | 2 - .../items/weapons/implants/implantuplink.dm | 2 +- code/game/objects/items/weapons/melee/misc.dm | 2 +- code/game/objects/items/weapons/paiwire.dm | 2 +- code/game/objects/items/weapons/scrolls.dm | 2 +- code/game/objects/items/weapons/shards.dm | 2 +- .../objects/items/weapons/storage/backpack.dm | 2 +- .../objects/items/weapons/storage/fancy.dm | 2 +- .../objects/items/weapons/storage/internal.dm | 2 +- .../objects/items/weapons/storage/storage.dm | 2 +- .../objects/items/weapons/storage/toolbox.dm | 2 +- .../items/weapons/storage/uplink_kits.dm | 2 +- .../objects/items/weapons/storage/wallets.dm | 2 +- .../items/weapons/surgery_limbattachment.dm | 2 +- .../objects/items/weapons/swords_axes_etc.dm | 1 - code/game/objects/items/weapons/syndie.dm | 2 +- .../objects/items/weapons/table_rack_parts.dm | 2 +- .../objects/items/weapons/tanks/jetpack.dm | 2 +- code/game/objects/items/weapons/tape.dm | 2 +- .../objects/items/weapons/teleportation.dm | 2 - code/game/objects/items/weapons/tools.dm | 8 +- code/game/objects/items/weapons/twohanded.dm | 1 - code/game/objects/items/weapons/weaponry.dm | 2 +- code/game/objects/items/weapons/wires.dm | 2 - code/game/objects/random/random.dm | 2 +- code/game/objects/structures/barsign.dm | 2 +- code/game/objects/structures/bedsheet_bin.dm | 4 +- code/game/objects/structures/coathanger.dm | 2 +- .../structures/crates_lockers/closets.dm | 2 +- .../crates_lockers/closets/coffin.dm | 2 +- .../crates_lockers/closets/crittercrate.dm | 2 +- .../crates_lockers/closets/fireaxe.dm | 2 +- .../crates_lockers/closets/fitness.dm | 2 +- .../crates_lockers/closets/gimmick.dm | 1 - .../crates_lockers/closets/job_closets.dm | 2 +- .../crates_lockers/closets/l3closet.dm | 2 +- .../crates_lockers/closets/malfunction.dm | 3 +- .../crates_lockers/closets/secure/bar.dm | 2 +- .../crates_lockers/closets/secure/cargo.dm | 2 +- .../crates_lockers/closets/secure/freezer.dm | 8 -- .../closets/secure/guncabinet.dm | 2 +- .../closets/secure/hydroponics.dm | 2 +- .../crates_lockers/closets/secure/personal.dm | 4 +- .../closets/secure/scientist.dm | 2 +- .../closets/secure/secure_closets.dm | 2 +- .../crates_lockers/closets/syndicate.dm | 2 +- .../crates_lockers/closets/utility_closets.dm | 2 +- .../crates_lockers/closets/wardrobe.dm | 2 +- .../structures/crates_lockers/crates.dm | 2 +- .../structures/crates_lockers/largecrate.dm | 2 +- code/game/objects/structures/curtains.dm | 2 +- code/game/objects/structures/displaycase.dm | 2 - code/game/objects/structures/door_assembly.dm | 33 ++++---- code/game/objects/structures/electricchair.dm | 2 +- code/game/objects/structures/false_walls.dm | 1 - code/game/objects/structures/flora.dm | 2 +- code/game/objects/structures/girders.dm | 2 +- code/game/objects/structures/grille.dm | 4 +- code/game/objects/structures/janicart.dm | 2 +- code/game/objects/structures/kitchen_spike.dm | 2 +- code/game/objects/structures/ladders.dm | 2 +- code/game/objects/structures/lamarr_cage.dm | 2 +- code/game/objects/structures/lattice.dm | 2 +- code/game/objects/structures/mineral_doors.dm | 1 - code/game/objects/structures/mirror.dm | 2 +- code/game/objects/structures/mop_bucket.dm | 2 +- code/game/objects/structures/morgue.dm | 1 - code/game/objects/structures/safe.dm | 2 +- .../structures/stool_bed_chair_nest/chairs.dm | 2 +- .../stool_bed_chair_nest/wheelchair.dm | 2 +- code/game/objects/structures/tables_racks.dm | 2 +- .../game/objects/structures/tank_dispenser.dm | 2 +- code/game/objects/structures/target_stake.dm | 2 +- code/modules/mob/living/carbon/brain/MMI.dm | 2 +- code/modules/projectiles/guns/alien.dm | 4 +- code/modules/projectiles/guns/energy.dm | 2 +- code/modules/projectiles/guns/energy/laser.dm | 4 +- code/modules/projectiles/guns/energy/pulse.dm | 3 +- code/modules/projectiles/guns/energy/stun.dm | 9 --- code/modules/projectiles/guns/projectile.dm | 3 +- .../projectiles/guns/projectile/automatic.dm | 3 +- .../projectiles/guns/projectile/crossbow.dm | 7 +- .../projectiles/guns/projectile/launcher.dm | 3 +- .../projectiles/guns/projectile/pistol.dm | 2 +- .../projectiles/guns/projectile/pneumatic.dm | 5 +- .../projectiles/guns/projectile/revolver.dm | 9 +-- .../projectiles/guns/projectile/rocket.dm | 5 +- .../projectiles/guns/projectile/shotgun.dm | 2 +- code/modules/projectiles/projectile/beams.dm | 2 +- code/modules/projectiles/projectile/change.dm | 1 - code/modules/projectiles/projectile/energy.dm | 1 - code/modules/projectiles/projectile/force.dm | 2 +- 137 files changed, 197 insertions(+), 243 deletions(-) diff --git a/code/game/objects/items/contraband.dm b/code/game/objects/items/contraband.dm index 5a61859e41d..5441f83cca2 100644 --- a/code/game/objects/items/contraband.dm +++ b/code/game/objects/items/contraband.dm @@ -27,4 +27,4 @@ new /obj/item/weapon/reagent_containers/pill/zoom( src ) new /obj/item/weapon/reagent_containers/pill/zoom( src ) new /obj/item/weapon/reagent_containers/pill/zoom( src ) - new /obj/item/weapon/reagent_containers/pill/zoom( src ) \ No newline at end of file + new /obj/item/weapon/reagent_containers/pill/zoom( src ) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 7a8b8efc635..16bde74e693 100755 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -1414,4 +1414,4 @@ var/global/list/obj/item/device/pda/PDAs = list() // Pass along the pulse to atoms in contents, largely added so pAIs are vulnerable to EMP /obj/item/device/pda/emp_act(severity) for(var/atom/A in src) - A.emp_act(severity) \ No newline at end of file + A.emp_act(severity) diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm index 7767ecd3074..f1f5b9502aa 100644 --- a/code/game/objects/items/devices/aicard.dm +++ b/code/game/objects/items/devices/aicard.dm @@ -173,4 +173,4 @@ var/obj/item/rig_module/module = src.loc.loc if(!module.holder || !direction) return - module.holder.forced_move(direction)*/ \ No newline at end of file + module.holder.forced_move(direction)*/ diff --git a/code/game/objects/items/devices/binoculars.dm b/code/game/objects/items/devices/binoculars.dm index e1c7b18a72a..0cafa7679c9 100644 --- a/code/game/objects/items/devices/binoculars.dm +++ b/code/game/objects/items/devices/binoculars.dm @@ -15,4 +15,4 @@ /obj/item/device/binoculars/attack_self(mob/user) - zoom() \ No newline at end of file + zoom() diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index 23ae4724bc3..978cfdb304a 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -142,4 +142,4 @@ /obj/effect/dummy/chameleon/Del() master.disrupt(0) - ..() \ No newline at end of file + ..() diff --git a/code/game/objects/items/devices/debugger.dm b/code/game/objects/items/devices/debugger.dm index 3e952671a08..3168e00feb2 100644 --- a/code/game/objects/items/devices/debugger.dm +++ b/code/game/objects/items/devices/debugger.dm @@ -5,9 +5,9 @@ */ /obj/item/device/debugger - icon = 'icons/obj/hacktool.dmi' name = "debugger" desc = "Used to debug electronic equipment." + icon = 'icons/obj/hacktool.dmi' icon_state = "hacktool-g" flags = FPRINT | TABLEPASS| CONDUCT force = 5.0 @@ -43,4 +43,4 @@ user << "\red There is a software error with the device." else user << "\blue The device's software appears to be fine." - return 1 \ No newline at end of file + return 1 diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 14f22059ad2..35ff3b720ab 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -223,4 +223,4 @@ icon_state = initial(icon_state) /obj/item/device/flashlight/slime/attack_self(mob/user) - return //Bio-luminescence does not toggle. \ No newline at end of file + return //Bio-luminescence does not toggle. diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index ff9ffbcda39..c6238f26483 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -191,4 +191,4 @@ #undef LIGHT_OK #undef LIGHT_EMPTY #undef LIGHT_BROKEN -#undef LIGHT_BURNED \ No newline at end of file +#undef LIGHT_BURNED diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index 371fe3b8c40..db79c6390bc 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -52,4 +52,4 @@ emagged = 1 insults = rand(1, 3)//to prevent dickflooding return - return \ No newline at end of file + return diff --git a/code/game/objects/items/devices/modkit.dm b/code/game/objects/items/devices/modkit.dm index e038d137605..8788eaf0f2a 100644 --- a/code/game/objects/items/devices/modkit.dm +++ b/code/game/objects/items/devices/modkit.dm @@ -69,4 +69,4 @@ /obj/item/device/modkit/tajaran name = "tajaran hardsuit modification kit" desc = "A kit containing all the needed tools and parts to modify a hardsuit for another user. This one looks like it's meant for Tajaran." - target_species = "Tajara" \ No newline at end of file + target_species = "Tajara" diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index 2a5df89510a..6378f8823f0 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -19,4 +19,4 @@ matter = list("metal" = 50,"glass" = 20) origin_tech = "magnets=1;engineering=1" - var/obj/machinery/telecomms/buffer // simple machine buffer for device linkage \ No newline at end of file + var/obj/machinery/telecomms/buffer // simple machine buffer for device linkage diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index d328169d1e7..e8ca9c39299 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -1,8 +1,8 @@ // Powersink - used to drain station power /obj/item/device/powersink - desc = "A nulling power sink which drains energy from electrical systems." name = "power sink" + desc = "A nulling power sink which drains energy from electrical systems." icon_state = "powersink0" item_state = "electronic" w_class = 4.0 diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm index de084253bf3..ef332fa336b 100644 --- a/code/game/objects/items/devices/radio/beacon.dm +++ b/code/game/objects/items/devices/radio/beacon.dm @@ -46,4 +46,4 @@ new /obj/machinery/power/singularity_beacon/syndicate( user.loc ) playsound(src, 'sound/effects/pop.ogg', 100, 1, 1) del(src) - return \ No newline at end of file + return diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 3e57d9d03c9..bfc9e8f69b4 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -31,7 +31,7 @@ return user << "The following channels are built-in:" - user << radio_desc + user << radio_desc /obj/item/device/radio/headset/handle_message_mode(mob/living/M as mob, message, channel) if (channel == "special") @@ -61,7 +61,7 @@ /obj/item/device/radio/headset/binary origin_tech = "syndicate=3" - ks1type = /obj/item/device/encryptionkey/binary + ks1type = /obj/item/device/encryptionkey/binary /obj/item/device/radio/headset/headset_sec name = "security radio headset" diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm index 21ed5cf2aaf..f32b5256b54 100644 --- a/code/game/objects/items/devices/suit_cooling.dm +++ b/code/game/objects/items/devices/suit_cooling.dm @@ -182,4 +182,4 @@ if (cell) user << "The charge meter reads [round(cell.percent())]%." else - user << "It doesn't have a power cell installed." \ No newline at end of file + user << "It doesn't have a power cell installed." diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 88f5ad18308..f5e43436b9a 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -1,6 +1,6 @@ /obj/item/device/taperecorder - desc = "A device that can record up to an hour of dialogue and play it back. It automatically translates the content in playback." name = "universal recorder" + desc = "A device that can record up to an hour of dialogue and play it back. It automatically translates the content in playback." icon_state = "taperecorderidle" item_state = "analyzer" w_class = 2.0 diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 33149b06a4b..52e5e220f24 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -29,7 +29,6 @@ effective or pretty fucking useless. var/times_used = 0 //Number of times it's been used. var/max_uses = 2 - /obj/item/device/batterer/attack_self(mob/living/carbon/user as mob, flag = 0, emp = 0) if(!user) return if(times_used >= max_uses) @@ -55,7 +54,3 @@ effective or pretty fucking useless. times_used += 1 if(times_used >= max_uses) icon_state = "battererburnt" - - - - diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 8cace9a2235..36c3b3d11f2 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -1,8 +1,8 @@ /obj/item/device/transfer_valve - icon = 'icons/obj/assemblies.dmi' name = "tank transfer valve" - icon_state = "valve_1" desc = "Regulates the transfer of air between two tanks" + icon = 'icons/obj/assemblies.dmi' + icon_state = "valve_1" var/obj/item/weapon/tank/tank_one var/obj/item/weapon/tank/tank_two var/obj/item/device/attached_device @@ -210,4 +210,4 @@ // this doesn't do anything but the timer etc. expects it to be here // eventually maybe have it update icon to show state (timer, prox etc.) like old bombs /obj/item/device/transfer_valve/proc/c_state() - return \ No newline at end of file + return diff --git a/code/game/objects/items/devices/violin.dm b/code/game/objects/items/devices/violin.dm index 63f7828fc80..e116689c9ad 100644 --- a/code/game/objects/items/devices/violin.dm +++ b/code/game/objects/items/devices/violin.dm @@ -390,4 +390,4 @@ for(var/mob/M in viewers(1, loc)) if((M.client && M.machine == src)) attack_self(M) - return \ No newline at end of file + return diff --git a/code/game/objects/items/devices/whistle.dm b/code/game/objects/items/devices/whistle.dm index 3100b914349..befba4b133e 100644 --- a/code/game/objects/items/devices/whistle.dm +++ b/code/game/objects/items/devices/whistle.dm @@ -35,4 +35,4 @@ emagged = 1 insults = rand(1, 3)//to prevent dickflooding return - return \ No newline at end of file + return diff --git a/code/game/objects/items/latexballoon.dm b/code/game/objects/items/latexballoon.dm index db77317eada..e341a8747f0 100644 --- a/code/game/objects/items/latexballoon.dm +++ b/code/game/objects/items/latexballoon.dm @@ -45,4 +45,4 @@ /obj/item/latexballon/attackby(obj/item/W as obj, mob/user as mob) if (can_puncture(W)) - burst() \ No newline at end of file + burst() diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm index 2f0b67d31d8..1d92cb9a818 100644 --- a/code/game/objects/items/shooting_range.dm +++ b/code/game/objects/items/shooting_range.dm @@ -178,4 +178,4 @@ b2y1 = pixel_y + pick(1,1,1,1,2,2,3,3,4) b2y2 = pixel_y - pick(1,1,1,1,2,2,3,3,4) - Target.bulletholes.Add(src) \ No newline at end of file + Target.bulletholes.Add(src) diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index eeca2089ee8..c87b57b043a 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -259,4 +259,4 @@ return affecting.status |= ORGAN_SPLINTED use(1) - return \ No newline at end of file + return diff --git a/code/game/objects/items/stacks/nanopaste.dm b/code/game/objects/items/stacks/nanopaste.dm index db0ab6b0884..798c6c0511f 100644 --- a/code/game/objects/items/stacks/nanopaste.dm +++ b/code/game/objects/items/stacks/nanopaste.dm @@ -42,4 +42,4 @@ if (do_surgery(H,user,src)) return else - user << "Nothing to fix in here." \ No newline at end of file + user << "Nothing to fix in here." diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index 72339452e77..a3e7ed53e28 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -133,4 +133,4 @@ var/obj/item/stack/sheet/leather/HS = new(src.loc) HS.amount = 1 wetness = initial(wetness) - src.use(1) \ No newline at end of file + src.use(1) diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 530c9b5b88e..f3b8face4eb 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -200,4 +200,4 @@ obj/item/stack/sheet/mineral/iron/New() sheettype = "osmium" origin_tech = "materials=5" color = "#9999FF" - perunit = 2000 \ No newline at end of file + perunit = 2000 diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index de2973fc794..907bbdf2493 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -200,4 +200,4 @@ var/global/list/datum/stack_recipe/cardboard_recipes = list ( \ /obj/item/stack/sheet/cardboard/New(var/loc, var/amount=null) recipes = cardboard_recipes - return ..() \ No newline at end of file + return ..() diff --git a/code/game/objects/items/stacks/sheets/sheets.dm b/code/game/objects/items/stacks/sheets/sheets.dm index fdcc6747b64..b140b4e6fd9 100644 --- a/code/game/objects/items/stacks/sheets/sheets.dm +++ b/code/game/objects/items/stacks/sheets/sheets.dm @@ -23,4 +23,4 @@ else for (var/obj/item/stack/sheet/stack in locate(src.x,src.y,src.z)) S.add(stack,user) - ..()*/ \ No newline at end of file + ..()*/ diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index c3fa049b17e..e14c7f2b1e6 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -265,4 +265,4 @@ New(title, recipes, req_amount = 1) src.title = title src.recipes = recipes - src.req_amount = req_amount \ No newline at end of file + src.req_amount = req_amount diff --git a/code/game/objects/items/stacks/tiles/light.dm b/code/game/objects/items/stacks/tiles/light.dm index e869c8d0ee4..f346d216a77 100644 --- a/code/game/objects/items/stacks/tiles/light.dm +++ b/code/game/objects/items/stacks/tiles/light.dm @@ -33,4 +33,4 @@ new/obj/item/stack/light_w(user.loc) if(amount <= 0) user.drop_from_inventory(src) - del(src) \ No newline at end of file + del(src) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 7ca0d4b2235..837824bf395 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -113,7 +113,7 @@ * Fake singularity */ /obj/item/toy/spinningtoy - name = "Gravitational Singularity" + name = "gravitational singularity" desc = "\"Singulo\" brand spinning toy." icon = 'icons/obj/singularity.dmi' icon_state = "singularity_s1" @@ -420,7 +420,7 @@ * Water flower */ /obj/item/toy/waterflower - name = "Water Flower" + name = "water flower" desc = "A seemingly innocent sunflower...with a twist." icon = 'icons/obj/harvest.dmi' icon_state = "sunflower" @@ -645,4 +645,4 @@ item_state = "inflatable" flags = FPRINT | TABLEPASS icon = 'icons/obj/clothing/belts.dmi' - slot_flags = SLOT_BELT \ No newline at end of file + slot_flags = SLOT_BELT diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 756812ccb18..fb86d964c69 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -2,56 +2,71 @@ //TODO: Make this an item var or something... //Added by Jack Rost -/obj/item/trash - icon = 'icons/obj/trash.dmi' +obj/item/trash + icon = 'iconsobj/trash.dmi' w_class = 2.0 desc = "This is rubbish." - raisins - name = "4no raisins" + +obj/item/trash/raisins + name = "\improper 4no raisins" icon_state= "4no_raisins" - candy - name = "Candy" + +obj/item/trash/candy + name = "candy" icon_state= "candy" - cheesie - name = "Cheesie honkers" + +obj/item/trash/cheesie + name = "\improper Cheesie Honkers" icon_state = "cheesie_honkers" - chips - name = "Chips" + +obj/item/trash/chips + name = "chips" icon_state = "chips" - popcorn - name = "Popcorn" + +obj/item/trash/popcorn + name = "popcorn" icon_state = "popcorn" - sosjerky + +obj/item/trash/sosjerky name = "Scaredy's Private Reserve Beef Jerky" icon_state = "sosjerky" - syndi_cakes - name = "Syndi cakes" + +obj/item/trash/syndi_cakes + name = "syndi cakes" icon_state = "syndi_cakes" - waffles - name = "Waffles" + +obj/item/trash/waffles + name = "waffles" icon_state = "waffles" - plate - name = "Plate" + +obj/item/trash/plate + name = "plate" icon_state = "plate" - snack_bowl - name = "Snack bowl" + +obj/item/trash/snack_bowl + name = "snack bowl" icon_state = "snack_bowl" - pistachios - name = "Pistachios pack" + +obj/item/trash/pistachios + name = "pistachios pack" icon_state = "pistachios_pack" - semki - name = "Semki pack" + +obj/item/trash/semki + name = "semki pack" icon_state = "semki_pack" - tray - name = "Tray" + +obj/item/trash/tray + name = "tray" icon_state = "tray" - candle + +obj/item/trash/candle name = "candle" - icon = 'icons/obj/candle.dmi' + icon = 'iconsobj/candle.dmi' icon_state = "candle4" - liquidfood + +obj/item/trash/liquidfood name = "\improper \"LiquidFood\" ration" icon_state = "liquidfood" -/obj/item/trash/attack(mob/M as mob, mob/living/user as mob) +obj/item/trash/attack(mob/M as mob, mob/living/user as mob) return diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index d08377a7042..fb79d5307f6 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -1,6 +1,6 @@ //Contains the rapid construction device. /obj/item/weapon/rcd - name = "rapid-construction-device (RCD)" + name = "rapid construction device (RCD)" desc = "A device used to rapidly build walls and floors." icon = 'icons/obj/items.dmi' icon_state = "rcd" @@ -174,4 +174,4 @@ return 0 /obj/item/weapon/rcd/mounted/attackby() - return \ No newline at end of file + return diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm index 45e66d80be6..f9f32bbeb1c 100644 --- a/code/game/objects/items/weapons/RSF.dm +++ b/code/game/objects/items/weapons/RSF.dm @@ -112,4 +112,4 @@ RSF R.cell.use(used_energy) else stored_matter-- - user << "The RSF now holds [stored_matter]/30 fabrication-units." \ No newline at end of file + user << "The RSF now holds [stored_matter]/30 fabrication-units." diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index 3ae5094dd03..fe6e94ad073 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -65,4 +65,4 @@ src.add_fingerprint(user) spawn(20) spam_flag = 0 - return \ No newline at end of file + return diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm index 72c45893439..c0db7773a8b 100644 --- a/code/game/objects/items/weapons/dice.dm +++ b/code/game/objects/items/weapons/dice.dm @@ -26,4 +26,4 @@ icon_state = "[name][result]" user.visible_message("[user] has thrown [src]. It lands on [result]. [comment]", \ "You throw [src]. It lands on a [result]. [comment]", \ - "You hear [src] landing on a [result]. [comment]") \ No newline at end of file + "You hear [src] landing on a [result]. [comment]") diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index 0a0545b5138..364fe8e7477 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -144,4 +144,4 @@ step(user, user.inertia_dir) else return ..() - return \ No newline at end of file + return diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index e16b9dd38c1..3830f105fda 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -218,4 +218,4 @@ igniter.secured = 0 status = 1 update_icon() - return \ No newline at end of file + return diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index 9b5007166d9..e96d0367217 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -187,4 +187,4 @@ else user << "\blue You need more paper." else - user << "They are moving around too much. A straightjacket would help." \ No newline at end of file + user << "They are moving around too much. A straightjacket would help." diff --git a/code/game/objects/items/weapons/grenades/emgrenade.dm b/code/game/objects/items/weapons/grenades/emgrenade.dm index 9edf68a60ac..3446fa46c3b 100644 --- a/code/game/objects/items/weapons/grenades/emgrenade.dm +++ b/code/game/objects/items/weapons/grenades/emgrenade.dm @@ -9,4 +9,3 @@ if(empulse(src, 4, 10)) del(src) return - diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm index f5ad4fa9fde..f9120d54911 100644 --- a/code/game/objects/items/weapons/grenades/flashbang.dm +++ b/code/game/objects/items/weapons/grenades/flashbang.dm @@ -180,4 +180,4 @@ var/dettime = rand(15,60) spawn(dettime) prime() - ..() \ No newline at end of file + ..() diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index 46854c6a2a8..d1fb667e993 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -108,4 +108,4 @@ /obj/item/weapon/grenade/attack_hand() walk(src, null, null) ..() - return \ No newline at end of file + return diff --git a/code/game/objects/items/weapons/grenades/spawnergrenade.dm b/code/game/objects/items/weapons/grenades/spawnergrenade.dm index 31b06ef5b7b..8b6b6e938de 100644 --- a/code/game/objects/items/weapons/grenades/spawnergrenade.dm +++ b/code/game/objects/items/weapons/grenades/spawnergrenade.dm @@ -41,4 +41,4 @@ name = "carp delivery grenade" spawner_type = /mob/living/simple_animal/hostile/carp deliveryamt = 5 - origin_tech = "materials=3;magnets=4;syndicate=4" \ No newline at end of file + origin_tech = "materials=3;magnets=4;syndicate=4" diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 531c8fa7ee1..a1ea44daa99 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -166,4 +166,4 @@ var/last_chew = 0 if(!C) return if(p_loc == user.loc && p_loc_m == C.loc) C.handcuffed = new /obj/item/weapon/handcuffs(C) - C.update_inv_handcuffed() \ No newline at end of file + C.update_inv_handcuffed() diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index 89e265aed8b..c45ed4eac8a 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -498,4 +498,4 @@ the implant may become unstable and either pre-maturely inject the subject or si return 1 islegal() - return 0 \ No newline at end of file + return 0 diff --git a/code/game/objects/items/weapons/implants/implantfreedom.dm b/code/game/objects/items/weapons/implants/implantfreedom.dm index 58d73d835ab..d7be3686657 100644 --- a/code/game/objects/items/weapons/implants/implantfreedom.dm +++ b/code/game/objects/items/weapons/implants/implantfreedom.dm @@ -67,5 +67,3 @@ mechanisms
    life can drive down to only 1 use.
    No Implant Specifics"} return dat - - diff --git a/code/game/objects/items/weapons/implants/implantuplink.dm b/code/game/objects/items/weapons/implants/implantuplink.dm index 2cba026e320..0469cd56d5c 100644 --- a/code/game/objects/items/weapons/implants/implantuplink.dm +++ b/code/game/objects/items/weapons/implants/implantuplink.dm @@ -20,4 +20,4 @@ /obj/item/weapon/implant/uplink/trigger(emote, mob/source as mob) if(hidden_uplink && usr == source) // Let's not have another people activate our uplink hidden_uplink.check_trigger(source, emote, activation_emote) - return \ No newline at end of file + return diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index 3b3e611575e..36dbc265379 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -13,4 +13,4 @@ suicide_act(mob/user) viewers(user) << "\red [user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide." - return (OXYLOSS) \ No newline at end of file + return (OXYLOSS) diff --git a/code/game/objects/items/weapons/paiwire.dm b/code/game/objects/items/weapons/paiwire.dm index 83bc76517a6..990453f423b 100644 --- a/code/game/objects/items/weapons/paiwire.dm +++ b/code/game/objects/items/weapons/paiwire.dm @@ -8,4 +8,4 @@ user.visible_message("[user] dumbly fumbles to find a place on [M] to plug in [src].", "There aren't any ports on [M] that match the jack belonging to [src].") /obj/item/weapon/pai_cable/attack(obj/machinery/M as obj, mob/user as mob) - src.plugin(M, user) \ No newline at end of file + src.plugin(M, user) diff --git a/code/game/objects/items/weapons/scrolls.dm b/code/game/objects/items/weapons/scrolls.dm index fbaab9a3015..e9aa6f3ca67 100644 --- a/code/game/objects/items/weapons/scrolls.dm +++ b/code/game/objects/items/weapons/scrolls.dm @@ -87,4 +87,4 @@ user.loc = pick(L) smoke.start() - src.uses -= 1 \ No newline at end of file + src.uses -= 1 diff --git a/code/game/objects/items/weapons/shards.dm b/code/game/objects/items/weapons/shards.dm index 0ecbe900d2e..8bd126584cf 100644 --- a/code/game/objects/items/weapons/shards.dm +++ b/code/game/objects/items/weapons/shards.dm @@ -111,4 +111,4 @@ src.pixel_x = rand(-5, 5) src.pixel_y = rand(-5, 5) else - return \ No newline at end of file + return diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 972c639f74e..0304aac95e7 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -252,4 +252,4 @@ /obj/item/weapon/storage/backpack/ert/medical name = "emergency response team medical backpack" desc = "A spacious backpack with lots of pockets, worn by medical members of a Nanotrasen Emergency Response Team." - icon_state = "ert_medical" \ No newline at end of file + icon_state = "ert_medical" diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 82d3f78b0e5..64d8e89bb79 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -281,4 +281,4 @@ /obj/item/weapon/storage/lockbox/vials/attackby(obj/item/weapon/W as obj, mob/user as mob) ..() - update_icon() \ No newline at end of file + update_icon() diff --git a/code/game/objects/items/weapons/storage/internal.dm b/code/game/objects/items/weapons/storage/internal.dm index 67205c76198..082002a5b9a 100644 --- a/code/game/objects/items/weapons/storage/internal.dm +++ b/code/game/objects/items/weapons/storage/internal.dm @@ -82,4 +82,4 @@ return 1 /obj/item/weapon/storage/internal/Adjacent(var/atom/neighbor) - return master_item.Adjacent(neighbor) \ No newline at end of file + return master_item.Adjacent(neighbor) diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index 12078e0addf..2e1d4d2a4cf 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -492,4 +492,4 @@ if (!cur_atom) return -1 //inside something with a null loc. - return depth \ No newline at end of file + return depth diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index 2c25e8adacb..b6b11af106b 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -83,4 +83,4 @@ new /obj/item/weapon/crowbar(src) new /obj/item/stack/cable_coil(src,30,color) new /obj/item/weapon/wirecutters(src) - new /obj/item/device/multitool(src) \ No newline at end of file + new /obj/item/device/multitool(src) diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index d3726f823f1..2605dca5b33 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -139,4 +139,4 @@ new /obj/item/clothing/mask/chameleon(src) new /obj/item/clothing/glasses/chameleon(src) new /obj/item/weapon/gun/projectile/chameleon(src) - new /obj/item/ammo_magazine/chameleon(src) \ No newline at end of file + new /obj/item/ammo_magazine/chameleon(src) diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm index 8f6579c8300..505263cf46c 100644 --- a/code/game/objects/items/weapons/storage/wallets.dm +++ b/code/game/objects/items/weapons/storage/wallets.dm @@ -88,4 +88,4 @@ if(item2_type) new item2_type(src) if(item3_type) - new item3_type(src) \ No newline at end of file + new item3_type(src) diff --git a/code/game/objects/items/weapons/surgery_limbattachment.dm b/code/game/objects/items/weapons/surgery_limbattachment.dm index 04f0ac5db7f..e5a65ba9c76 100644 --- a/code/game/objects/items/weapons/surgery_limbattachment.dm +++ b/code/game/objects/items/weapons/surgery_limbattachment.dm @@ -68,4 +68,4 @@ del(src) return 1 - return 0 \ No newline at end of file + return 0 diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index 3a0f29a3da7..34516e875fd 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -134,4 +134,3 @@ return else return ..() - diff --git a/code/game/objects/items/weapons/syndie.dm b/code/game/objects/items/weapons/syndie.dm index 4593bf932f4..e205f20bb09 100644 --- a/code/game/objects/items/weapons/syndie.dm +++ b/code/game/objects/items/weapons/syndie.dm @@ -81,4 +81,4 @@ if("Close the lighter.") src.icon_state = "c-4detonator_0" user << "You close the lighter." - pr_open = 0 \ No newline at end of file + pr_open = 0 diff --git a/code/game/objects/items/weapons/table_rack_parts.dm b/code/game/objects/items/weapons/table_rack_parts.dm index 50a2c8a2e4d..1082723b247 100644 --- a/code/game/objects/items/weapons/table_rack_parts.dm +++ b/code/game/objects/items/weapons/table_rack_parts.dm @@ -121,4 +121,4 @@ R.add_fingerprint(user) user.drop_item() del(src) - return \ No newline at end of file + return diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm index 07dc6638a9b..422af1d652d 100644 --- a/code/game/objects/items/weapons/tanks/jetpack.dm +++ b/code/game/objects/items/weapons/tanks/jetpack.dm @@ -144,4 +144,4 @@ if(allgases >= 0.005) return 1 del(G) - return \ No newline at end of file + return diff --git a/code/game/objects/items/weapons/tape.dm b/code/game/objects/items/weapons/tape.dm index 0514e7d1d25..2d82cacaad5 100644 --- a/code/game/objects/items/weapons/tape.dm +++ b/code/game/objects/items/weapons/tape.dm @@ -87,4 +87,4 @@ if(dir_offset & NORTH) pixel_y += 32 else if(dir_offset & SOUTH) - pixel_y -= 32 \ No newline at end of file + pixel_y -= 32 diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm index 8472723f48b..e04a5f08886 100644 --- a/code/game/objects/items/weapons/teleportation.dm +++ b/code/game/objects/items/weapons/teleportation.dm @@ -172,5 +172,3 @@ Frequency: P.creator = src src.add_fingerprint(user) return - - diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 214044a88ed..a0ea6d97121 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -394,20 +394,20 @@ /obj/item/weapon/weldingtool/largetank - name = "Industrial Welding Tool" + name = "industrial welding tool" max_fuel = 40 matter = list("metal" = 70, "glass" = 60) origin_tech = "engineering=2" /obj/item/weapon/weldingtool/hugetank - name = "Upgraded Welding Tool" + name = "upgraded welding tool" max_fuel = 80 w_class = 3.0 matter = list("metal" = 70, "glass" = 120) origin_tech = "engineering=3" /obj/item/weapon/weldingtool/experimental - name = "Experimental Welding Tool" + name = "experimental welding tool" max_fuel = 40 w_class = 3.0 matter = list("metal" = 70, "glass" = 120) @@ -518,4 +518,4 @@ var/resolved = target.attackby(tool,user) if(!resolved && tool && target) tool.afterattack(target,user,1) - return 1 \ No newline at end of file + return 1 diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 70485e67a2a..0c32f4c0228 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -198,4 +198,3 @@ /obj/item/weapon/twohanded/spear/update_icon() icon_state = "spearglass[wielded]" return - diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index 405e41aab2e..a584f3db4b0 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -482,4 +482,4 @@ obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob) /obj/effect/energy_net/attackby(obj/item/weapon/W as obj, mob/user as mob) health -= W.force healthcheck() - ..() \ No newline at end of file + ..() diff --git a/code/game/objects/items/weapons/wires.dm b/code/game/objects/items/weapons/wires.dm index 284be5284c3..df2033f8871 100644 --- a/code/game/objects/items/weapons/wires.dm +++ b/code/game/objects/items/weapons/wires.dm @@ -16,5 +16,3 @@ else user << "\blue You are not using this to lay wire..." return - - diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index 9a0a0d4fe0a..53f4cc09032 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -103,4 +103,4 @@ prob(2);/obj/random/toolbox,\ prob(2);/obj/item/weapon/storage/belt/utility,\ prob(5);/obj/random/tool,\ - prob(2);/obj/item/weapon/tape_roll) \ No newline at end of file + prob(2);/obj/item/weapon/tape_roll) diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm index 8ef3fd463d0..68681f081aa 100644 --- a/code/game/objects/structures/barsign.dm +++ b/code/game/objects/structures/barsign.dm @@ -21,4 +21,4 @@ else sign_type = replacetext(lowertext(sign_type), " ", "") // lowercase, strip spaces - along with choices for user options, avoids huge if-else-else src.ChangeSign(sign_type) - user << "You change the barsign." \ No newline at end of file + user << "You change the barsign." diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 8a3cccae466..d838d41e5b0 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -93,8 +93,6 @@ LINEN BINS item_color = "brown" - - /obj/structure/bedsheetbin name = "linen bin" desc = "A linen bin. It looks rather cosy." @@ -183,4 +181,4 @@ LINEN BINS hidden = null - add_fingerprint(user) \ No newline at end of file + add_fingerprint(user) diff --git a/code/game/objects/structures/coathanger.dm b/code/game/objects/structures/coathanger.dm index 0d09d57c645..155c1a575d1 100644 --- a/code/game/objects/structures/coathanger.dm +++ b/code/game/objects/structures/coathanger.dm @@ -50,4 +50,4 @@ if (istype(coat, /obj/item/clothing/suit/storage/toggle/labcoat/cmo)) overlays += image(icon, icon_state = "coat_cmo") if (istype(coat, /obj/item/clothing/suit/storage/det_suit)) - overlays += image(icon, icon_state = "coat_det") \ No newline at end of file + overlays += image(icon, icon_state = "coat_det") diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 8ff522a8585..a929ff7201a 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -305,4 +305,4 @@ visible_message("[user] [attack_message] the [src]!") dump_contents() spawn(1) del(src) - return 1 \ No newline at end of file + return 1 diff --git a/code/game/objects/structures/crates_lockers/closets/coffin.dm b/code/game/objects/structures/crates_lockers/closets/coffin.dm index 256f72522e8..67de5d38b9d 100644 --- a/code/game/objects/structures/crates_lockers/closets/coffin.dm +++ b/code/game/objects/structures/crates_lockers/closets/coffin.dm @@ -9,4 +9,4 @@ if(!opened) icon_state = icon_closed else - icon_state = icon_opened \ No newline at end of file + icon_state = icon_opened diff --git a/code/game/objects/structures/crates_lockers/closets/crittercrate.dm b/code/game/objects/structures/crates_lockers/closets/crittercrate.dm index d3ab79e7688..3546cd52e7b 100644 --- a/code/game/objects/structures/crates_lockers/closets/crittercrate.dm +++ b/code/game/objects/structures/crates_lockers/closets/crittercrate.dm @@ -3,4 +3,4 @@ desc = "A crate which can sustain life for a while." icon_state = "critter" icon_opened = "critteropen" - icon_closed = "critter" \ No newline at end of file + icon_closed = "critter" diff --git a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm index 178172c4409..0728a9befae 100644 --- a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm +++ b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm @@ -207,4 +207,4 @@ return close() - return \ No newline at end of file + return diff --git a/code/game/objects/structures/crates_lockers/closets/fitness.dm b/code/game/objects/structures/crates_lockers/closets/fitness.dm index 6536e065e52..05e7968a931 100644 --- a/code/game/objects/structures/crates_lockers/closets/fitness.dm +++ b/code/game/objects/structures/crates_lockers/closets/fitness.dm @@ -71,4 +71,4 @@ new /obj/item/weapon/gun/energy/laser/bluetag(src) new /obj/item/weapon/gun/energy/laser/bluetag(src) new /obj/item/clothing/suit/bluetag(src) - new /obj/item/clothing/suit/bluetag(src) \ No newline at end of file + new /obj/item/clothing/suit/bluetag(src) diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm index 62412f10933..1a62db2dfbf 100644 --- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm +++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm @@ -134,4 +134,3 @@ new /obj/item/clothing/head/helmet/thunderdome(src) new /obj/item/clothing/head/helmet/thunderdome(src) new /obj/item/clothing/head/helmet/thunderdome(src) - diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 824e52d8bc4..7113c1b45a0 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -97,4 +97,4 @@ new /obj/item/clothing/under/lawyer/purpsuit(src) new /obj/item/clothing/suit/storage/lawyer/purpjacket(src) new /obj/item/clothing/shoes/brown(src) - new /obj/item/clothing/shoes/black(src) \ No newline at end of file + new /obj/item/clothing/shoes/black(src) diff --git a/code/game/objects/structures/crates_lockers/closets/l3closet.dm b/code/game/objects/structures/crates_lockers/closets/l3closet.dm index a6890430ef3..bb5fe26e4fc 100644 --- a/code/game/objects/structures/crates_lockers/closets/l3closet.dm +++ b/code/game/objects/structures/crates_lockers/closets/l3closet.dm @@ -70,4 +70,4 @@ ..() contents = list() new /obj/item/clothing/suit/bio_suit/scientist( src ) - new /obj/item/clothing/head/bio_hood/scientist( src ) \ No newline at end of file + new /obj/item/clothing/head/bio_hood/scientist( src ) diff --git a/code/game/objects/structures/crates_lockers/closets/malfunction.dm b/code/game/objects/structures/crates_lockers/closets/malfunction.dm index 02b81a13e0e..bd17ba98411 100644 --- a/code/game/objects/structures/crates_lockers/closets/malfunction.dm +++ b/code/game/objects/structures/crates_lockers/closets/malfunction.dm @@ -1,4 +1,3 @@ - /obj/structure/closet/malf/suits desc = "It's a storage unit for operational gear." icon_state = "syndicate" @@ -13,4 +12,4 @@ new /obj/item/clothing/suit/space/void(src) new /obj/item/weapon/crowbar(src) new /obj/item/weapon/cell(src) - new /obj/item/device/multitool(src) \ No newline at end of file + new /obj/item/device/multitool(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm index 7f8192156d5..96a7e8131ac 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm @@ -33,4 +33,4 @@ else icon_state = icon_closed else - icon_state = icon_opened \ No newline at end of file + icon_state = icon_opened diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm index 6859800f785..a28e629a981 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -40,4 +40,4 @@ new /obj/item/clothing/mask/gas(src) new /obj/item/clothing/glasses/meson(src) new /obj/item/clothing/head/soft(src) - return \ No newline at end of file + return diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm index 13711ca6f66..0513efd943a 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -91,11 +91,3 @@ for(var/i = 0, i < 6, i++) new /obj/item/weapon/spacecash/c200(src) return - - - - - - - - diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm index 8fb8b0c92cc..969185741d1 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm @@ -50,4 +50,4 @@ else if (locked) overlays += icon(src.icon,"locked") else - overlays += icon(src.icon,"open") \ No newline at end of file + overlays += icon(src.icon,"open") diff --git a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm index 5ad3d8c6e0e..2a1547e4bad 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm @@ -24,4 +24,4 @@ new /obj/item/weapon/minihoe(src) new /obj/item/weapon/hatchet(src) // new /obj/item/weapon/bee_net(src) //No more bees, March 2014 - return \ No newline at end of file + return diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm index 867dc9cd917..8fc77c5b92a 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm @@ -1,6 +1,6 @@ /obj/structure/closet/secure_closet/personal - desc = "It's a secure locker for personnel. The first card swiped gains control." name = "personal closet" + desc = "It's a secure locker for personnel. The first card swiped gains control." req_access = list(access_all_personal_lockers) var/registered_name = null @@ -120,4 +120,4 @@ src.icon_state = src.icon_locked src.registered_name = null src.desc = "It's a secure locker for personnel. The first card swiped gains control." - return \ No newline at end of file + return diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index 2cef42a82b6..0578b793569 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -48,4 +48,4 @@ new /obj/item/weapon/tank/air(src) new /obj/item/clothing/mask/gas(src) new /obj/item/device/flash(src) - return \ No newline at end of file + return diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm index 479fdcb262d..09810842d40 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm @@ -128,4 +128,4 @@ if(welded) overlays += "welded" else - icon_state = icon_opened \ No newline at end of file + icon_state = icon_opened diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm index 3e95b5837dc..2f6b66e5ce9 100644 --- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm +++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm @@ -144,4 +144,4 @@ var/obj/item/stack/R = new res(src) R.amount = R.max_amount - return \ No newline at end of file + return diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index 090b2c8145c..fd548974afe 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -230,4 +230,4 @@ if(!opened) icon_state = icon_closed else - icon_state = icon_opened \ No newline at end of file + icon_state = icon_opened diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index 1df05570972..d2d26ec0b59 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -420,4 +420,4 @@ new /obj/item/clothing/under/suit_jacket/female(src) new /obj/item/clothing/under/suit_jacket/really_black(src) new /obj/item/clothing/under/suit_jacket/red(src) - new /obj/item/clothing/under/scratch(src) \ No newline at end of file + new /obj/item/clothing/under/scratch(src) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 998328a1bf5..3f6f321129b 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -486,4 +486,4 @@ // new /obj/item/weapon/weedspray(src) // new /obj/item/weapon/pestspray(src) // new /obj/item/weapon/pestspray(src) -// new /obj/item/weapon/pestspray(src) \ No newline at end of file +// new /obj/item/weapon/pestspray(src) diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index 9f7795b9889..e9fdd409665 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -77,4 +77,4 @@ ME.attach(H) ME = new /obj/item/mecha_parts/mecha_equipment/tool/passenger ME.attach(H) - ..() \ No newline at end of file + ..() diff --git a/code/game/objects/structures/curtains.dm b/code/game/objects/structures/curtains.dm index e48e8419d2c..741dc371db6 100644 --- a/code/game/objects/structures/curtains.dm +++ b/code/game/objects/structures/curtains.dm @@ -1,6 +1,6 @@ /obj/structure/curtain - icon = 'icons/obj/curtain.dmi' name = "curtain" + icon = 'icons/obj/curtain.dmi' icon_state = "closed" layer = MOB_LAYER + 0.1 opacity = 1 diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index f30e0e25454..0ab10debe9b 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -92,5 +92,3 @@ src.health -= 2 healthcheck() return - - diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index 9fbf63ba182..b53f086291a 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -1,7 +1,6 @@ obj/structure/door_assembly - icon = 'icons/obj/doors/door_assembly.dmi' - name = "airlock assembly" + icon = 'icons/obj/doors/door_assembly.dmi' icon_state = "door_as_0" anchored = 0 density = 1 @@ -17,91 +16,91 @@ obj/structure/door_assembly New() update_state() - door_assembly_com +obj/structure/door_assembly/door_assembly_com base_icon_state = "com" base_name = "Command Airlock" glass_type = "/glass_command" airlock_type = "/command" - door_assembly_sec +obj/structure/door_assembly/door_assembly_sec base_icon_state = "sec" base_name = "Security Airlock" glass_type = "/glass_security" airlock_type = "/security" - door_assembly_eng +obj/structure/door_assembly/door_assembly_eng base_icon_state = "eng" base_name = "Engineering Airlock" glass_type = "/glass_engineering" airlock_type = "/engineering" - door_assembly_min +obj/structure/door_assembly/door_assembly_min base_icon_state = "min" base_name = "Mining Airlock" glass_type = "/glass_mining" airlock_type = "/mining" - door_assembly_atmo +obj/structure/door_assembly/door_assembly_atmo base_icon_state = "atmo" base_name = "Atmospherics Airlock" glass_type = "/glass_atmos" airlock_type = "/atmos" - door_assembly_research +obj/structure/door_assembly/door_assembly_research base_icon_state = "res" base_name = "Research Airlock" glass_type = "/glass_research" airlock_type = "/research" - door_assembly_science +obj/structure/door_assembly/door_assembly_science base_icon_state = "sci" base_name = "Science Airlock" glass_type = "/glass_science" airlock_type = "/science" - door_assembly_med +obj/structure/door_assembly/door_assembly_med base_icon_state = "med" base_name = "Medical Airlock" glass_type = "/glass_medical" airlock_type = "/medical" - door_assembly_mai +obj/structure/door_assembly/door_assembly_mai base_icon_state = "mai" base_name = "Maintenance Airlock" airlock_type = "/maintenance" glass = -1 - door_assembly_ext +obj/structure/door_assembly/door_assembly_ext base_icon_state = "ext" base_name = "External Airlock" airlock_type = "/external" glass = -1 - door_assembly_fre +obj/structure/door_assembly/door_assembly_fre base_icon_state = "fre" base_name = "Freezer Airlock" airlock_type = "/freezer" glass = -1 - door_assembly_hatch +obj/structure/door_assembly/door_assembly_hatch base_icon_state = "hatch" base_name = "Airtight Hatch" airlock_type = "/hatch" glass = -1 - door_assembly_mhatch +obj/structure/door_assembly/door_assembly_mhatch base_icon_state = "mhatch" base_name = "Maintenance Hatch" airlock_type = "/maintenance_hatch" glass = -1 - door_assembly_highsecurity // Borrowing this until WJohnston makes sprites for the assembly +obj/structure/door_assembly/door_assembly_highsecurity // Borrowing this until WJohnston makes sprites for the assembly base_icon_state = "highsec" base_name = "High Security Airlock" airlock_type = "/highsecurity" glass = -1 - multi_tile +obj/structure/door_assembly/multi_tile icon = 'icons/obj/doors/door_assembly2x1.dmi' dir = EAST var/width = 1 diff --git a/code/game/objects/structures/electricchair.dm b/code/game/objects/structures/electricchair.dm index 28d9ebc6232..da680710904 100644 --- a/code/game/objects/structures/electricchair.dm +++ b/code/game/objects/structures/electricchair.dm @@ -74,4 +74,4 @@ A.power_light = light A.updateicon() - return \ No newline at end of file + return diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index 014ecae9ac4..f68c7ae7cb9 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -331,4 +331,3 @@ desc = "A wall with sandstone plating." icon_state = "" mineral = "sandstone" -//------------wtf?------------end \ No newline at end of file diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 85de4b62f5c..71a87b18b4e 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -193,4 +193,4 @@ /obj/structure/flora/ausbushes/fullgrass/New() ..() - icon_state = "fullgrass_[rand(1, 3)]" \ No newline at end of file + icon_state = "fullgrass_[rand(1, 3)]" diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index e3ae4353ddd..5e0edbef0a6 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -268,4 +268,4 @@ del(src) return else - return \ No newline at end of file + return diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 304710b5780..9bb1cec396f 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -1,6 +1,6 @@ /obj/structure/grille - desc = "A flimsy lattice of metal rods, with screws to secure it to the floor." name = "grille" + desc = "A flimsy lattice of metal rods, with screws to secure it to the floor." icon = 'icons/obj/structures.dmi' icon_state = "grille" density = 1 @@ -189,4 +189,4 @@ visible_message("[user] [attack_verb] the [src]!") health -= damage spawn(1) healthcheck() - return 1 + return 1 diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index 535b73d3b56..0b542dd2bb2 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -299,4 +299,4 @@ desc = "A keyring with a small steel key, and a pink fob reading \"Pussy Wagon\"." icon = 'icons/obj/vehicles.dmi' icon_state = "keys" - w_class = 1 \ No newline at end of file + w_class = 1 diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm index 40becb871f6..f480cdd9779 100644 --- a/code/game/objects/structures/kitchen_spike.dm +++ b/code/game/objects/structures/kitchen_spike.dm @@ -75,4 +75,4 @@ new /obj/item/weapon/reagent_containers/food/snacks/xenomeat(src.loc) usr << "You remove the last piece of meat from the alien!" src.icon_state = "spike" - src.occupied = 0 \ No newline at end of file + src.occupied = 0 diff --git a/code/game/objects/structures/ladders.dm b/code/game/objects/structures/ladders.dm index cce8a064c0d..fc57ac4f8e7 100644 --- a/code/game/objects/structures/ladders.dm +++ b/code/game/objects/structures/ladders.dm @@ -67,4 +67,4 @@ add_fingerprint(user) /obj/structure/ladder/attackby(obj/item/weapon/W, mob/user as mob) - return attack_hand(user) \ No newline at end of file + return attack_hand(user) diff --git a/code/game/objects/structures/lamarr_cage.dm b/code/game/objects/structures/lamarr_cage.dm index 4598e29f1aa..6bbb8cfa245 100644 --- a/code/game/objects/structures/lamarr_cage.dm +++ b/code/game/objects/structures/lamarr_cage.dm @@ -98,4 +98,4 @@ gender = FEMALE /obj/item/clothing/mask/facehugger/lamarr/New()//to prevent deleting it if aliums are disabled - return \ No newline at end of file + return diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index 672011cef9b..a32af450d5e 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -1,6 +1,6 @@ /obj/structure/lattice - desc = "A lightweight support lattice." name = "lattice" + desc = "A lightweight support lattice." icon = 'icons/obj/structures.dmi' icon_state = "latticefull" density = 0 diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm index ff37b0bfb2d..47d9f7289ba 100644 --- a/code/game/objects/structures/mineral_doors.dm +++ b/code/game/objects/structures/mineral_doors.dm @@ -284,4 +284,3 @@ CheckHardness() playsound(loc, 'sound/effects/attackblob.ogg', 100, 1) ..() - diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index c2ac05c3c00..58e1a81b973 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -100,4 +100,4 @@ shatter() else user.visible_message("[user] hits [src] and bounces off!") - return 1 \ No newline at end of file + return 1 diff --git a/code/game/objects/structures/mop_bucket.dm b/code/game/objects/structures/mop_bucket.dm index d64e2d6ade9..06aae9557b2 100644 --- a/code/game/objects/structures/mop_bucket.dm +++ b/code/game/objects/structures/mop_bucket.dm @@ -24,4 +24,4 @@ else reagents.trans_to(I, 5) user << "You wet [I] in [src]." - playsound(loc, 'sound/effects/slosh.ogg', 25, 1) \ No newline at end of file + playsound(loc, 'sound/effects/slosh.ogg', 25, 1) diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index e1c8427ecf6..0b0c063af27 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -388,4 +388,3 @@ else usr << "\red Access denied." return - diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index 00946b8678c..a219268d041 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -188,4 +188,4 @@ obj/structure/safe/meteorhit(obj/O as obj) /obj/structure/safe/floor/hide(var/intact) - invisibility = intact ? 101 : 0 \ No newline at end of file + invisibility = intact ? 101 : 0 diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 0e8e7d5850a..16d84f6aad7 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -175,4 +175,4 @@ icon_state = "officechair_white" /obj/structure/stool/bed/chair/office/dark - icon_state = "officechair_dark" \ No newline at end of file + icon_state = "officechair_dark" diff --git a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm index 0ed780ebddf..59a819b8b92 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm @@ -189,4 +189,4 @@ if(M == pulling) pulling = null usr.pulledby = null - ..() \ No newline at end of file + ..() diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 2dc9ae80572..983c2d61ad5 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -584,4 +584,4 @@ return user.drop_item() if(W && W.loc) W.loc = src.loc - return \ No newline at end of file + return diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index 68ecbe0d876..4cea8bffc1d 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -116,4 +116,4 @@ else usr << browse(null, "window=dispenser") return - return \ No newline at end of file + return diff --git a/code/game/objects/structures/target_stake.dm b/code/game/objects/structures/target_stake.dm index 2a8d7719b2a..bf80024a5e2 100644 --- a/code/game/objects/structures/target_stake.dm +++ b/code/game/objects/structures/target_stake.dm @@ -49,4 +49,4 @@ pinned_target.loc = get_turf(user) user << "You take the target out of the stake." - pinned_target = null \ No newline at end of file + pinned_target = null diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm index bd02ce1b36a..61a655cc32e 100644 --- a/code/modules/mob/living/carbon/brain/MMI.dm +++ b/code/modules/mob/living/carbon/brain/MMI.dm @@ -165,4 +165,4 @@ brainmob.emp_damage += rand(10,20) if(3) brainmob.emp_damage += rand(0,10) - ..() \ No newline at end of file + ..() diff --git a/code/modules/projectiles/guns/alien.dm b/code/modules/projectiles/guns/alien.dm index a755f33cff8..fb678d9b4de 100644 --- a/code/modules/projectiles/guns/alien.dm +++ b/code/modules/projectiles/guns/alien.dm @@ -1,6 +1,5 @@ //Vox pinning weapon. /obj/item/weapon/gun/launcher/spikethrower - name = "Vox spike thrower" desc = "A vicious alien projectile weapon. Parts of it quiver gelatinously, as though the thing is insectile and alive." @@ -65,7 +64,6 @@ //This gun only functions for armalis. The on-sprite is too huge to render properly on other sprites. /obj/item/weapon/gun/energy/noisecannon - name = "alien heavy cannon" desc = "It's some kind of enormous alien weapon, as long as a man is tall." @@ -119,4 +117,4 @@ /obj/item/projectile/energy/sonic/proc/split() //TODO: create two more projectiles to either side of this one, fire at targets to the side of target turf. - return \ No newline at end of file + return diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index fb506def213..8a38a0325db 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -1,7 +1,7 @@ /obj/item/weapon/gun/energy - icon_state = "energy" name = "energy gun" desc = "A basic energy-based gun." + icon_state = "energy" fire_sound = 'sound/weapons/Taser.ogg' var/obj/item/weapon/cell/power_supply //What type of power cell this uses diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 9493dc0e148..394ac3a8f68 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -1,6 +1,6 @@ /obj/item/weapon/gun/energy/laser name = "laser carbine" - desc = "a basic weapon designed kill with concentrated energy bolts" + desc = "A basic weapon designed to kill with concentrated energy bolts." icon_state = "laser" item_state = "laser" fire_sound = 'sound/weapons/Laser.ogg' @@ -186,4 +186,4 @@ obj/item/weapon/gun/energy/laser/retro if(!power_supply) return 0 power_supply.give(100) update_icon() - return 1 \ No newline at end of file + return 1 diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm index b4ba69a5a02..55302d5c44a 100644 --- a/code/modules/projectiles/guns/energy/pulse.dm +++ b/code/modules/projectiles/guns/energy/pulse.dm @@ -64,5 +64,4 @@ icon_state = "m1911-p" cell_type = "/obj/item/weapon/cell/infinite" - isHandgun() - return 1 \ No newline at end of file + isHandgun() return 1 diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index 38a78c31b86..91b64a1de4c 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -1,4 +1,3 @@ - /obj/item/weapon/gun/energy/taser name = "taser gun" desc = "A small, low capacity gun used for non-lethal takedowns." @@ -10,12 +9,6 @@ cell_type = "/obj/item/weapon/cell/crap" /obj/item/weapon/gun/energy/taser/cyborg - name = "taser gun" - desc = "A small, low capacity gun used for non-lethal takedowns." - icon_state = "taser" - fire_sound = 'sound/weapons/Taser.ogg' - charge_cost = 100 - projectile_type = "/obj/item/projectile/beam/stun" cell_type = "/obj/item/weapon/cell/secborg" var/charge_tick = 0 var/recharge_time = 10 //Time it takes for shots to recharge (in ticks) @@ -107,5 +100,3 @@ force = 10 matter = list("metal" = 200000) projectile_type = "/obj/item/projectile/energy/bolt/large" - - diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index 372bcd4cf29..4d7195b6a54 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -3,8 +3,8 @@ #define MAGAZINE 2 /obj/item/weapon/gun/projectile - desc = "A classic revolver. Uses 357 ammo" name = "revolver" + desc = "A classic revolver. Uses 357 ammo" icon_state = "revolver" caliber = "357" origin_tech = "combat=2;materials=2" @@ -118,4 +118,3 @@ if(istype(AC)) bullets += 1 return bullets - diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 4cbb7ec2f86..ee0d8a6427d 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -143,4 +143,5 @@ However, it looks like subsequent guns that use removable magazines don't take that into account and just get around simulating a removable magazine by adding the casings into the loaded list and spawning an empty magazine when the gun is out of rounds. Which means you can't eject magazines with rounds in them. The below is a very - rough and poor attempt at making that happen. -Ausops */ \ No newline at end of file + rough and poor attempt at making that happen. -Ausops */ + \ No newline at end of file diff --git a/code/modules/projectiles/guns/projectile/crossbow.dm b/code/modules/projectiles/guns/projectile/crossbow.dm index e7bc073f0ab..0f5cdbb2c86 100644 --- a/code/modules/projectiles/guns/projectile/crossbow.dm +++ b/code/modules/projectiles/guns/projectile/crossbow.dm @@ -1,7 +1,6 @@ //AMMUNITION /obj/item/weapon/arrow - name = "bolt" desc = "It's got a tip for you - get the point?" icon = 'icons/obj/weapons.dmi' @@ -28,7 +27,6 @@ item_state = "bolt" /obj/item/weapon/arrow/quill - name = "vox quill" desc = "A wickedly barbed quill from some bizarre animal." icon = 'icons/obj/weapons.dmi' @@ -37,7 +35,6 @@ throwforce = 5 /obj/item/weapon/arrow/rod - name = "metal rod" desc = "Don't cry for me, Orithena." icon_state = "metal-rod" @@ -50,7 +47,6 @@ src.Del() /obj/item/weapon/gun/launcher/crossbow - name = "powered crossbow" desc = "A 2557AD twist on an old classic. Pick up that can." icon_state = "crossbow" @@ -173,7 +169,6 @@ ..() /obj/item/weapon/gun/launcher/crossbow/proc/superheat_rod(var/mob/user) - if(!user || !cell || !in_chamber) return if(cell.charge < 500) return if(in_chamber.throwforce >= 15) return @@ -262,4 +257,4 @@ del(src) return else - ..() \ No newline at end of file + ..() diff --git a/code/modules/projectiles/guns/projectile/launcher.dm b/code/modules/projectiles/guns/projectile/launcher.dm index 5f9d9fdfde5..ee0da727c70 100644 --- a/code/modules/projectiles/guns/projectile/launcher.dm +++ b/code/modules/projectiles/guns/projectile/launcher.dm @@ -1,5 +1,4 @@ /obj/item/weapon/gun/launcher - name = "launcher" desc = "A device that launches things." icon = 'icons/obj/weapons.dmi' @@ -87,4 +86,4 @@ return 1 /obj/item/weapon/gun/launcher/attack_self(mob/living/user as mob) - return \ No newline at end of file + return diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index c7748091e9f..b963924614e 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -149,4 +149,4 @@ desc = "a silencer" icon = 'icons/obj/gun.dmi' icon_state = "silencer" - w_class = 2 \ No newline at end of file + w_class = 2 diff --git a/code/modules/projectiles/guns/projectile/pneumatic.dm b/code/modules/projectiles/guns/projectile/pneumatic.dm index feb32d15bd2..2a6e519d0db 100644 --- a/code/modules/projectiles/guns/projectile/pneumatic.dm +++ b/code/modules/projectiles/guns/projectile/pneumatic.dm @@ -27,7 +27,6 @@ tank_container.tag = "gas_tank_holder" /obj/item/weapon/gun/launcher/pneumatic/verb/set_pressure() //set amount of tank pressure. - set name = "Set Valve Pressure" set category = "Object" set src in range(0) @@ -37,7 +36,6 @@ usr << "You dial the pressure valve to [pressure_setting]%." /obj/item/weapon/gun/launcher/pneumatic/verb/eject_tank() //Remove the tank. - set name = "Eject Tank" set category = "Object" set src in range(0) @@ -79,7 +77,6 @@ user << "That won't fit into the hopper." /obj/item/weapon/gun/launcher/pneumatic/attack_self(mob/user as mob) - if(contents.len > 0) var/obj/item/removing = contents[contents.len] if(removing == in_chamber) @@ -210,4 +207,4 @@ del(src) return else - ..() \ No newline at end of file + ..() diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index 8e981259779..f1eac3e8580 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -1,6 +1,6 @@ /obj/item/weapon/gun/projectile/detective - desc = "A cheap Martian knock-off of a Smith & Wesson Model 10. Uses .38-Special rounds." name = "revolver" + desc = "A cheap Martian knock-off of a Smith & Wesson Model 10. Uses .38-Special rounds." icon_state = "detective" max_shells = 6 caliber = "38" @@ -71,8 +71,8 @@ /obj/item/weapon/gun/projectile/detective/semiauto - desc = "A cheap Martian knock-off of a Colt M1911. Uses less-than-lethal .45 rounds." name = "\improper Colt M1911" + desc = "A cheap Martian knock-off of a Colt M1911. Uses less-than-lethal .45 rounds." icon_state = "colt" max_shells = 7 caliber = ".45" @@ -113,7 +113,6 @@ update_icon() /obj/item/weapon/gun/projectile/russian/proc/Spin() - for(var/obj/item/ammo_casing/AC in loaded) del(AC) loaded = list() @@ -126,7 +125,6 @@ /obj/item/weapon/gun/projectile/russian/attackby(var/obj/item/A as obj, mob/user as mob) - if(!A) return var/num_loaded = 0 @@ -155,13 +153,11 @@ return /obj/item/weapon/gun/projectile/russian/attack_self(mob/user as mob) - user.visible_message("[user] spins the chamber of the revolver.", "You spin the revolver's chamber.") if(getAmmo() > 0) Spin() /obj/item/weapon/gun/projectile/russian/attack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj) - if(!loaded.len) user.visible_message("\red *click*", "\red *click*") playsound(user, 'sound/weapons/empty.ogg', 100, 1) @@ -186,4 +182,3 @@ user.apply_damage(300, BRUTE, affecting, sharp=1) // You are dead, dead, dead. return ..() - diff --git a/code/modules/projectiles/guns/projectile/rocket.dm b/code/modules/projectiles/guns/projectile/rocket.dm index 8183de4d4e1..ea88e7956a7 100644 --- a/code/modules/projectiles/guns/projectile/rocket.dm +++ b/code/modules/projectiles/guns/projectile/rocket.dm @@ -1,5 +1,4 @@ /obj/item/weapon/gun/rocketlauncher - var/projectile name = "rocket launcher" desc = "MAGGOT." icon_state = "rocket" @@ -11,7 +10,7 @@ flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY slot_flags = 0 origin_tech = "combat=8;materials=5" - projectile = /obj/item/missile + var/projectile = /obj/item/missile var/missile_speed = 2 var/missile_range = 30 var/max_rockets = 1 @@ -49,4 +48,4 @@ del(I) return else - usr << "\red [src] is empty." \ No newline at end of file + usr << "\red [src] is empty." diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index aef481cc0ef..9c30e31102c 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -134,4 +134,4 @@ slot_flags |= SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) name = "sawn-off shotgun" desc = "Omar's coming!" - user << "You shorten the barrel of \the [src]!" \ No newline at end of file + user << "You shorten the barrel of \the [src]!" diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 84c9347ed08..b811eb92817 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -170,4 +170,4 @@ var/list/beam_master = list() icon_state = "stun" nodamage = 1 agony = 40 - damage_type = HALLOSS \ No newline at end of file + damage_type = HALLOSS diff --git a/code/modules/projectiles/projectile/change.dm b/code/modules/projectiles/projectile/change.dm index 90157efd625..215c1173424 100644 --- a/code/modules/projectiles/projectile/change.dm +++ b/code/modules/projectiles/projectile/change.dm @@ -85,4 +85,3 @@ del(M) return new_mob - diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm index 00fd886f3dc..b94bda70adf 100644 --- a/code/modules/projectiles/projectile/energy.dm +++ b/code/modules/projectiles/projectile/energy.dm @@ -65,4 +65,3 @@ damage = 20 damage_type = TOX irradiate = 20 - diff --git a/code/modules/projectiles/projectile/force.dm b/code/modules/projectiles/projectile/force.dm index a0f1da84b5d..4dffe4ce895 100644 --- a/code/modules/projectiles/projectile/force.dm +++ b/code/modules/projectiles/projectile/force.dm @@ -25,4 +25,4 @@ throwdir = get_dir(src,target) M.throw_at(get_edge_target_turf(M, throwdir),15,1) return ..() -*/ \ No newline at end of file +*/ From 064357495d04b4ad23abd790a40ea870a04e5d9f Mon Sep 17 00:00:00 2001 From: Amunak Date: Thu, 18 Dec 2014 03:13:04 +0100 Subject: [PATCH 28/35] Decreased fire delay on the unobtainable pulse funguns. They were as lame as the death squad guns. --- code/modules/projectiles/guns/energy/pulse.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm index 55302d5c44a..74b6af43c3d 100644 --- a/code/modules/projectiles/guns/energy/pulse.dm +++ b/code/modules/projectiles/guns/energy/pulse.dm @@ -52,6 +52,7 @@ name = "pulse destroyer" desc = "A heavy-duty, pulse-based energy weapon." cell_type = "/obj/item/weapon/cell/infinite" + fire_delay = 10 attack_self(mob/living/user as mob) user << "\red [src.name] has three settings, and they are all DESTROY." @@ -59,9 +60,11 @@ /obj/item/weapon/gun/energy/pulse_rifle/M1911 - name = "m1911-P" + name = "\improper M1911-P" desc = "It's not the size of the gun, it's the size of the hole it puts through people." icon_state = "m1911-p" cell_type = "/obj/item/weapon/cell/infinite" + fire_delay = 10 - isHandgun() return 1 + isHandgun() + return 1 From d20ccdb6b4de40bfbbb6400e916b28d58cb370fc Mon Sep 17 00:00:00 2001 From: Amunak Date: Thu, 18 Dec 2014 03:21:15 +0100 Subject: [PATCH 29/35] More name updates and refactoring for research Also fixes compile errors --- code/game/objects/items/trash.dm | 98 +- .../objects/items/weapons/dna_injector.dm | 2 +- code/game/objects/structures/door_assembly.dm | 194 +-- code/modules/research/designs.dm | 1185 +++++++---------- 4 files changed, 630 insertions(+), 849 deletions(-) diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index fb86d964c69..e8bae92fee2 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -2,71 +2,71 @@ //TODO: Make this an item var or something... //Added by Jack Rost -obj/item/trash - icon = 'iconsobj/trash.dmi' +/obj/item/trash + icon = 'icons/obj/trash.dmi' w_class = 2.0 desc = "This is rubbish." -obj/item/trash/raisins - name = "\improper 4no raisins" - icon_state= "4no_raisins" +/obj/item/trash/raisins + name = "\improper 4no raisins" + icon_state= "4no_raisins" -obj/item/trash/candy - name = "candy" - icon_state= "candy" +/obj/item/trash/candy + name = "candy" + icon_state= "candy" -obj/item/trash/cheesie - name = "\improper Cheesie Honkers" - icon_state = "cheesie_honkers" +/obj/item/trash/cheesie + name = "\improper Cheesie Honkers" + icon_state = "cheesie_honkers" -obj/item/trash/chips - name = "chips" - icon_state = "chips" +/obj/item/trash/chips + name = "chips" + icon_state = "chips" -obj/item/trash/popcorn - name = "popcorn" - icon_state = "popcorn" +/obj/item/trash/popcorn + name = "popcorn" + icon_state = "popcorn" -obj/item/trash/sosjerky - name = "Scaredy's Private Reserve Beef Jerky" - icon_state = "sosjerky" +/obj/item/trash/sosjerky + name = "Scaredy's Private Reserve Beef Jerky" + icon_state = "sosjerky" -obj/item/trash/syndi_cakes - name = "syndi cakes" - icon_state = "syndi_cakes" +/obj/item/trash/syndi_cakes + name = "syndi cakes" + icon_state = "syndi_cakes" -obj/item/trash/waffles - name = "waffles" - icon_state = "waffles" +/obj/item/trash/waffles + name = "waffles" + icon_state = "waffles" -obj/item/trash/plate - name = "plate" - icon_state = "plate" +/obj/item/trash/plate + name = "plate" + icon_state = "plate" -obj/item/trash/snack_bowl - name = "snack bowl" - icon_state = "snack_bowl" +/obj/item/trash/snack_bowl + name = "snack bowl" + icon_state = "snack_bowl" -obj/item/trash/pistachios - name = "pistachios pack" - icon_state = "pistachios_pack" +/obj/item/trash/pistachios + name = "pistachios pack" + icon_state = "pistachios_pack" -obj/item/trash/semki - name = "semki pack" - icon_state = "semki_pack" +/obj/item/trash/semki + name = "semki pack" + icon_state = "semki_pack" -obj/item/trash/tray - name = "tray" - icon_state = "tray" +/obj/item/trash/tray + name = "tray" + icon_state = "tray" -obj/item/trash/candle - name = "candle" - icon = 'iconsobj/candle.dmi' - icon_state = "candle4" +/obj/item/trash/candle + name = "candle" + icon = 'icons/obj/candle.dmi' + icon_state = "candle4" -obj/item/trash/liquidfood - name = "\improper \"LiquidFood\" ration" - icon_state = "liquidfood" +/obj/item/trash/liquidfood + name = "\improper \"LiquidFood\" ration" + icon_state = "liquidfood" -obj/item/trash/attack(mob/M as mob, mob/living/user as mob) +/obj/item/trash/attack(mob/M as mob, mob/living/user as mob) return diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm index fb3cd66e99c..651cc2e27f1 100644 --- a/code/game/objects/items/weapons/dna_injector.dm +++ b/code/game/objects/items/weapons/dna_injector.dm @@ -1,5 +1,5 @@ /obj/item/weapon/dnainjector - name = "\improperDNA injector" + name = "\improper DNA injector" desc = "This injects the person with DNA." icon = 'icons/obj/items.dmi' icon_state = "dnainjector" diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index b53f086291a..7e3c853750f 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -1,4 +1,4 @@ -obj/structure/door_assembly +/obj/structure/door_assembly name = "airlock assembly" icon = 'icons/obj/doors/door_assembly.dmi' icon_state = "door_as_0" @@ -16,120 +16,120 @@ obj/structure/door_assembly New() update_state() -obj/structure/door_assembly/door_assembly_com - base_icon_state = "com" - base_name = "Command Airlock" - glass_type = "/glass_command" - airlock_type = "/command" +/obj/structure/door_assembly/door_assembly_com + base_icon_state = "com" + base_name = "Command Airlock" + glass_type = "/glass_command" + airlock_type = "/command" -obj/structure/door_assembly/door_assembly_sec - base_icon_state = "sec" - base_name = "Security Airlock" - glass_type = "/glass_security" - airlock_type = "/security" +/obj/structure/door_assembly/door_assembly_sec + base_icon_state = "sec" + base_name = "Security Airlock" + glass_type = "/glass_security" + airlock_type = "/security" -obj/structure/door_assembly/door_assembly_eng - base_icon_state = "eng" - base_name = "Engineering Airlock" - glass_type = "/glass_engineering" - airlock_type = "/engineering" +/obj/structure/door_assembly/door_assembly_eng + base_icon_state = "eng" + base_name = "Engineering Airlock" + glass_type = "/glass_engineering" + airlock_type = "/engineering" -obj/structure/door_assembly/door_assembly_min - base_icon_state = "min" - base_name = "Mining Airlock" - glass_type = "/glass_mining" - airlock_type = "/mining" +/obj/structure/door_assembly/door_assembly_min + base_icon_state = "min" + base_name = "Mining Airlock" + glass_type = "/glass_mining" + airlock_type = "/mining" -obj/structure/door_assembly/door_assembly_atmo - base_icon_state = "atmo" - base_name = "Atmospherics Airlock" - glass_type = "/glass_atmos" - airlock_type = "/atmos" +/obj/structure/door_assembly/door_assembly_atmo + base_icon_state = "atmo" + base_name = "Atmospherics Airlock" + glass_type = "/glass_atmos" + airlock_type = "/atmos" -obj/structure/door_assembly/door_assembly_research - base_icon_state = "res" - base_name = "Research Airlock" - glass_type = "/glass_research" - airlock_type = "/research" +/obj/structure/door_assembly/door_assembly_research + base_icon_state = "res" + base_name = "Research Airlock" + glass_type = "/glass_research" + airlock_type = "/research" -obj/structure/door_assembly/door_assembly_science - base_icon_state = "sci" - base_name = "Science Airlock" - glass_type = "/glass_science" - airlock_type = "/science" +/obj/structure/door_assembly/door_assembly_science + base_icon_state = "sci" + base_name = "Science Airlock" + glass_type = "/glass_science" + airlock_type = "/science" -obj/structure/door_assembly/door_assembly_med - base_icon_state = "med" - base_name = "Medical Airlock" - glass_type = "/glass_medical" - airlock_type = "/medical" +/obj/structure/door_assembly/door_assembly_med + base_icon_state = "med" + base_name = "Medical Airlock" + glass_type = "/glass_medical" + airlock_type = "/medical" -obj/structure/door_assembly/door_assembly_mai - base_icon_state = "mai" - base_name = "Maintenance Airlock" - airlock_type = "/maintenance" - glass = -1 +/obj/structure/door_assembly/door_assembly_mai + base_icon_state = "mai" + base_name = "Maintenance Airlock" + airlock_type = "/maintenance" + glass = -1 -obj/structure/door_assembly/door_assembly_ext - base_icon_state = "ext" - base_name = "External Airlock" - airlock_type = "/external" - glass = -1 +/obj/structure/door_assembly/door_assembly_ext + base_icon_state = "ext" + base_name = "External Airlock" + airlock_type = "/external" + glass = -1 -obj/structure/door_assembly/door_assembly_fre - base_icon_state = "fre" - base_name = "Freezer Airlock" - airlock_type = "/freezer" - glass = -1 +/obj/structure/door_assembly/door_assembly_fre + base_icon_state = "fre" + base_name = "Freezer Airlock" + airlock_type = "/freezer" + glass = -1 -obj/structure/door_assembly/door_assembly_hatch - base_icon_state = "hatch" - base_name = "Airtight Hatch" - airlock_type = "/hatch" - glass = -1 +/obj/structure/door_assembly/door_assembly_hatch + base_icon_state = "hatch" + base_name = "Airtight Hatch" + airlock_type = "/hatch" + glass = -1 -obj/structure/door_assembly/door_assembly_mhatch - base_icon_state = "mhatch" - base_name = "Maintenance Hatch" - airlock_type = "/maintenance_hatch" - glass = -1 +/obj/structure/door_assembly/door_assembly_mhatch + base_icon_state = "mhatch" + base_name = "Maintenance Hatch" + airlock_type = "/maintenance_hatch" + glass = -1 -obj/structure/door_assembly/door_assembly_highsecurity // Borrowing this until WJohnston makes sprites for the assembly - base_icon_state = "highsec" - base_name = "High Security Airlock" - airlock_type = "/highsecurity" - glass = -1 +/obj/structure/door_assembly/door_assembly_highsecurity // Borrowing this until WJohnston makes sprites for the assembly + base_icon_state = "highsec" + base_name = "High Security Airlock" + airlock_type = "/highsecurity" + glass = -1 -obj/structure/door_assembly/multi_tile - icon = 'icons/obj/doors/door_assembly2x1.dmi' - dir = EAST - var/width = 1 +/obj/structure/door_assembly/multi_tile + icon = 'icons/obj/doors/door_assembly2x1.dmi' + dir = EAST + var/width = 1 /*Temporary until we get sprites. - glass_type = "/multi_tile/glass" - airlock_type = "/multi_tile/maint" - glass = 1*/ - base_icon_state = "g" //Remember to delete this line when reverting "glass" var to 1. - airlock_type = "/multi_tile/glass" - glass = -1 //To prevent bugs in deconstruction process. + glass_type = "/multi_tile/glass" + airlock_type = "/multi_tile/maint" + glass = 1*/ + base_icon_state = "g" //Remember to delete this line when reverting "glass" var to 1. + airlock_type = "/multi_tile/glass" + glass = -1 //To prevent bugs in deconstruction process. - New() - if(dir in list(EAST, WEST)) - bound_width = width * world.icon_size - bound_height = world.icon_size - else - bound_width = world.icon_size - bound_height = width * world.icon_size - update_state() + New() + if(dir in list(EAST, WEST)) + bound_width = width * world.icon_size + bound_height = world.icon_size + else + bound_width = world.icon_size + bound_height = width * world.icon_size + update_state() - Move() - . = ..() - if(dir in list(EAST, WEST)) - bound_width = width * world.icon_size - bound_height = world.icon_size - else - bound_width = world.icon_size - bound_height = width * world.icon_size + Move() + . = ..() + if(dir in list(EAST, WEST)) + bound_width = width * world.icon_size + bound_height = world.icon_size + else + bound_width = world.icon_size + bound_height = width * world.icon_size diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index 64d64b198bc..da27da12d58 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -41,6 +41,7 @@ other types of metals and chemistry for reagents). datum/design //Datum for object designs, used in construction var/name = null //Name of the created object. If null it will be 'guessed' from build_path if possible. var/desc = null //Description of the created object. If null it will use group_desc and name where applicable. + var/item_name = null //An item name before it is modified by various name-modifying procs var/id = "id" //ID of the created object for easy refernece. Alphanumeric, lower-case, no symbols. var/list/req_tech = list() //IDs of that techs the object originated from and the minimum level requirements. var/reliability_mod = 0 //Reliability modifier of the device at it's starting point. @@ -63,29 +64,51 @@ datum/design/proc/CalcReliability(var/list/temp_techs) reliability = new_reliability return -//This proc is used in subtypes for assigning names and descriptions dynamically +datum/design/New() + ..() + item_name = name + AssembleDesignInfo() + +//These procs are used in subtypes for assigning names and descriptions dynamically datum/design/proc/AssembleDesignInfo() + AssembleDesignName() + AssembleDesignDesc() + return + +datum/design/proc/AssembleDesignName() if(!name && build_path) //Get name from build path if posible var/atom/movable/A = build_path name = initial(A.name) + item_name = name return -datum/design/New() - ..() - AssembleDesignInfo() +datum/design/proc/AssembleDesignDesc() + if(!desc) //Try to make up a nice description if we don't have one + desc = "Allows for the construction of \a [item_name]." + return - -///////////////////Computer Boards/////////////////////////////////// +/////////////////////////////////// +/////General Type Definitions////// +/////////////////////////////////// datum/design/circuit build_type = IMPRINTER req_tech = list("programming" = 2) materials = list("$glass" = 2000, "sacid" = 20) -datum/design/circuit/AssembleDesignInfo() - desc = "Allows for the construction of circuit boards used to build \a [name]." - name = "Circuit design ([name])" +datum/design/circuit/AssembleDesignName() + ..() + name = "Circuit design ([item_name])" +datum/design/circuit/AssembleDesignDesc() + if(!desc) + desc = "Allows for the construction of \a [item_name] circuit board." +datum/design/item + build_type = PROTOLATHE + +/////////////////////////////////// +//////////Computer Boards////////// +/////////////////////////////////// datum/design/circuit/seccamera name = "security camera monitor" id = "seccamera" @@ -208,7 +231,7 @@ datum/design/circuit/clonepod build_path = /obj/item/weapon/circuitboard/clonepod datum/design/circuit/clonescanner - name = "cloning scanner console" + name = "cloning scanner" id = "clonescanner" req_tech = list("programming" = 3, "biotech" = 3) build_path = /obj/item/weapon/circuitboard/clonescanner @@ -257,7 +280,7 @@ datum/design/circuit/ordercomp build_path = /obj/item/weapon/circuitboard/ordercomp datum/design/circuit/supplycomp - name = "supply shuttle console" + name = "supply control console" id = "supplycomp" req_tech = list("programming" = 3) build_path = /obj/item/weapon/circuitboard/supplycomp @@ -293,18 +316,25 @@ datum/design/circuit/shield req_tech = list("bluespace" = 4, "phorontech" = 3) materials = list("$glass" = 2000, "sacid" = 20, "$phoron" = 10000, "$diamond" = 5000, "$gold" = 10000) +datum/design/circuit/shield/AssembleDesignName() + name = "Shield generator circuit design ([name])" +datum/design/circuit/shield/AssembleDesignDesc() + if(!desc) + desc = "Allows for the construction of \a [name] shield generator." + datum/design/circuit/shield/bubble - name = "bubble shield generator" + name = "bubble" id = "shield_gen" build_path = "/obj/machinery/shield_gen/external" datum/design/circuit/shield/hull - name = "hull shield generator" + name = "hull" id = "shield_gen_ex" build_path = "/obj/machinery/shield_gen/external" datum/design/circuit/shield/capacitor - name = "shield capacitor" + name = "capacitor" + desc = "Allows for the construction of a shield capacitor circuit board." id = "shield_cap" req_tech = list("magnets" = 3, "powerstorage" = 4) build_path = "/obj/machinery/shield_gen/external" @@ -312,519 +342,362 @@ datum/design/circuit/shield/capacitor /////////////////////////////////// //////////AI Module Disks////////// /////////////////////////////////// -datum/design/safeguard_module - name = "Module Design (Safeguard)" - desc = "Allows for the construction of a Safeguard AI Module." - id = "safeguard_module" - req_tech = list("programming" = 3, "materials" = 4) +datum/design/aimodule/ build_type = IMPRINTER materials = list("$glass" = 2000, "sacid" = 20, "$gold" = 100) + +datum/design/aimodule/AssembleDesignName() + name = "AI module design ([name])" +datum/design/aimodule/AssembleDesignDesc() + desc = "Allows for the construction of \a '[name]' AI module." + +datum/design/aimodule/safeguard + name = "Safeguard" + id = "safeguard" + req_tech = list("programming" = 3, "materials" = 4) build_path = /obj/item/weapon/aiModule/safeguard -datum/design/onehuman_module - name = "Module Design (OneHuman)" - desc = "Allows for the construction of a OneHuman AI Module." - id = "onehuman_module" +datum/design/aimodule/onehuman + name = "OneHuman" + id = "onehuman" req_tech = list("programming" = 4, "materials" = 6) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20, "$diamond" = 100) build_path = /obj/item/weapon/aiModule/oneHuman -datum/design/protectstation_module - name = "Module Design (ProtectStation)" - desc = "Allows for the construction of a ProtectStation AI Module." - id = "protectstation_module" +datum/design/aimodule/protectstation + name = "ProtectStation" + id = "protectstation" req_tech = list("programming" = 3, "materials" = 6) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20, "$gold" = 100) build_path = /obj/item/weapon/aiModule/protectStation -datum/design/notele_module - name = "Module Design (TeleporterOffline Module)" - desc = "Allows for the construction of a TeleporterOffline AI Module." - id = "notele_module" +datum/design/aimodule/notele + name = "TeleporterOffline" + id = "notele" req_tech = list("programming" = 3) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20, "$gold" = 100) build_path = /obj/item/weapon/aiModule/teleporterOffline -datum/design/quarantine_module - name = "Module Design (Quarantine)" - desc = "Allows for the construction of a Quarantine AI Module." - id = "quarantine_module" +datum/design/aimodule/quarantine + name = "Quarantine" + id = "quarantine" req_tech = list("programming" = 3, "biotech" = 2, "materials" = 4) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20, "$gold" = 100) build_path = /obj/item/weapon/aiModule/quarantine -datum/design/oxygen_module - name = "Module Design (OxygenIsToxicToHumans)" - desc = "Allows for the construction of a Safeguard AI Module." - id = "oxygen_module" +datum/design/aimodule/oxygen + name = "OxygenIsToxicToHumans" + id = "oxygen" req_tech = list("programming" = 3, "biotech" = 2, "materials" = 4) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20, "$gold" = 100) build_path = /obj/item/weapon/aiModule/oxygen -datum/design/freeform_module - name = "Module Design (Freeform)" - desc = "Allows for the construction of a Freeform AI Module." - id = "freeform_module" +datum/design/aimodule/freeform + name = "Freeform" + id = "freeform" req_tech = list("programming" = 4, "materials" = 4) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20, "$gold" = 100) build_path = /obj/item/weapon/aiModule/freeform -datum/design/reset_module - name = "Module Design (Reset)" - desc = "Allows for the construction of a Reset AI Module." - id = "reset_module" +datum/design/aimodule/reset + name = "Reset" + id = "reset" req_tech = list("programming" = 3, "materials" = 6) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20, "$gold" = 100) build_path = /obj/item/weapon/aiModule/reset -datum/design/purge_module - name = "Module Design (Purge)" - desc = "Allows for the construction of a Purge AI Module." - id = "purge_module" +datum/design/aimodule/purge + name = "Purge" + id = "purge" req_tech = list("programming" = 4, "materials" = 6) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20, "$diamond" = 100) build_path = /obj/item/weapon/aiModule/purge -datum/design/freeformcore_module - name = "Core Module Design (Freeform)" - desc = "Allows for the construction of a Freeform AI Core Module." - id = "freeformcore_module" +// *** Core modules +datum/design/aimodule/core req_tech = list("programming" = 4, "materials" = 6) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20, "$diamond" = 100) + +datum/design/aimodule/core/AssembleDesignName() + name = "AI core module design ([name])" +datum/design/aimodule/core/AssembleDesignDesc() + desc = "Allows for the construction of \a '[name]' AI core module." + +datum/design/aimodule/core/freeformcore + name = "Freeform" + id = "freeformcore" build_path = /obj/item/weapon/aiModule/freeformcore -datum/design/asimov - name = "Core Module Design (Asimov)" - desc = "Allows for the construction of a Asimov AI Core Module." - id = "asimov_module" - req_tech = list("programming" = 3, "materials" = 6) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20, "$diamond" = 100) +datum/design/aimodule/core/asimov + name = "Asimov" + id = "asimov" build_path = /obj/item/weapon/aiModule/asimov -datum/design/paladin_module - name = "Core Module Design (P.A.L.A.D.I.N.)" - desc = "Allows for the construction of a P.A.L.A.D.I.N. AI Core Module." - id = "paladin_module" - req_tech = list("programming" = 4, "materials" = 6) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20, "$diamond" = 100) +datum/design/aimodule/core/paladin + name = "P.A.L.A.D.I.N." + id = "paladin" build_path = /obj/item/weapon/aiModule/paladin -datum/design/tyrant_module - name = "Core Module Design (T.Y.R.A.N.T.)" - desc = "Allows for the construction of a T.Y.R.A.N.T. AI Module." - id = "tyrant_module" +datum/design/aimodule/core/tyrant + name = "T.Y.R.A.N.T." + id = "tyrant" req_tech = list("programming" = 4, "syndicate" = 2, "materials" = 6) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20, "$diamond" = 100) build_path = /obj/item/weapon/aiModule/tyrant - - /////////////////////////////////// -/////Subspace Telecomms//////////// +////////Telecomms Machinery//////// /////////////////////////////////// -datum/design/subspace_receiver - name = "Circuit Design (Subspace Receiver)" - desc = "Allows for the construction of Subspace Receiver equipment." - id = "s-receiver" - req_tech = list("programming" = 4, "engineering" = 3, "bluespace" = 2) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) - build_path = /obj/item/weapon/circuitboard/telecomms/receiver - -datum/design/telecomms_bus - name = "Circuit Design (Bus Mainframe)" - desc = "Allows for the construction of Telecommunications Bus Mainframes." - id = "s-bus" +datum/design/circuit/tcom req_tech = list("programming" = 4, "engineering" = 4) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) - build_path = /obj/item/weapon/circuitboard/telecomms/bus -datum/design/telecomms_hub - name = "Circuit Design (Hub Mainframe)" - desc = "Allows for the construction of Telecommunications Hub Mainframes." - id = "s-hub" - req_tech = list("programming" = 4, "engineering" = 4) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) - build_path = /obj/item/weapon/circuitboard/telecomms/hub +datum/design/circuit/tcom/AssembleDesignName() + name = "Telecommunications machinery circuit design ([name])" +datum/design/circuit/tcom/AssembleDesignDesc() + desc = "Allows for the construction of a telecommunications [name] circuit board." -datum/design/telecomms_relay - name = "Circuit Design (Relay Mainframe)" - desc = "Allows for the construction of Telecommunications Relay Mainframes." - id = "s-relay" - req_tech = list("programming" = 3, "engineering" = 4, "bluespace" = 3) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) - build_path = /obj/item/weapon/circuitboard/telecomms/relay -datum/design/telecomms_processor - name = "Circuit Design (Processor Unit)" - desc = "Allows for the construction of Telecommunications Processor equipment." - id = "s-processor" - req_tech = list("programming" = 4, "engineering" = 4) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) +datum/design/circuit/tcom/server + name = "server mainframe" + id = "tcom-server" + build_path = /obj/item/weapon/circuitboard/telecomms/server + +datum/design/circuit/tcom/processor + name = "processor unit" + id = "tcom-processor" build_path = /obj/item/weapon/circuitboard/telecomms/processor -datum/design/telecomms_server - name = "Circuit Design (Server Mainframe)" - desc = "Allows for the construction of Telecommunications Servers." - id = "s-server" - req_tech = list("programming" = 4, "engineering" = 4) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) - build_path = /obj/item/weapon/circuitboard/telecomms/server +datum/design/circuit/tcom/bus + name = "bus mainframe" + id = "tcom-bus" + build_path = /obj/item/weapon/circuitboard/telecomms/bus -datum/design/subspace_broadcaster - name = "Circuit Design (Subspace Broadcaster)" - desc = "Allows for the construction of Subspace Broadcasting equipment." - id = "s-broadcaster" +datum/design/circuit/tcom/hub + name = "hub mainframe" + id = "tcom-hub" + build_path = /obj/item/weapon/circuitboard/telecomms/hub + +datum/design/circuit/tcom/relay + name = "relay mainframe" + id = "tcom-relay" + req_tech = list("programming" = 3, "engineering" = 4, "bluespace" = 3) + build_path = /obj/item/weapon/circuitboard/telecomms/relay + +datum/design/circuit/tcom/broadcaster + name = "subspace broadcaster" + id = "tcom-broadcaster" req_tech = list("programming" = 4, "engineering" = 4, "bluespace" = 2) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/telecomms/broadcaster +datum/design/circuit/tcom/receiver + name = "subspace receiver" + id = "tcom-receiver" + req_tech = list("programming" = 4, "engineering" = 3, "bluespace" = 2) + build_path = /obj/item/weapon/circuitboard/telecomms/receiver /////////////////////////////////// -/////Non-Board Computer Stuff////// +////////////Mecha Modules////////// /////////////////////////////////// - -datum/design/intellicard - name = "Intellicard AI Transportation System" - desc = "Allows for the construction of an intellicard." - id = "intellicard" - req_tech = list("programming" = 4, "materials" = 4) - build_type = PROTOLATHE - materials = list("$glass" = 1000, "$gold" = 200) - build_path = /obj/item/device/aicard - -datum/design/paicard - name = "Personal Artificial Intelligence Card" - desc = "Allows for the construction of a pAI Card" - id = "paicard" - req_tech = list("programming" = 2) - build_type = PROTOLATHE - materials = list("$glass" = 500, "$metal" = 500) - build_path = /obj/item/device/paicard - -datum/design/posibrain - name = "Positronic Brain" - desc = "Allows for the construction of a positronic brain" - id = "posibrain" - req_tech = list("engineering" = 4, "materials" = 6, "bluespace" = 2, "programming" = 4) - - build_type = PROTOLATHE - materials = list("$metal" = 2000, "$glass" = 1000, "$silver" = 1000, "$gold" = 500, "$phoron" = 500, "$diamond" = 100) - build_path = /obj/item/device/mmi/digital/posibrain - -/////////////////////////////////// -//////////Mecha Module Disks/////// -/////////////////////////////////// - -datum/design/ripley_main - name = "Circuit Design (APLU \"Ripley\" Central Control module)" - desc = "Allows for the construction of a \"Ripley\" Central Control module." - id = "ripley_main" +datum/design/circuit/mecha req_tech = list("programming" = 3) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + +datum/design/circuit/mecha/AssembleDesignName() + name = "Exosuit module circuit design ([name])" +datum/design/circuit/mecha/AssembleDesignDesc() + desc = "Allows for the construction of \a [name] module." + + +datum/design/circuit/mecha/ripley_main + name = "APLU 'Ripley' central control" + id = "ripley_main" build_path = /obj/item/weapon/circuitboard/mecha/ripley/main -datum/design/ripley_peri - name = "Circuit Design (APLU \"Ripley\" Peripherals Control module)" - desc = "Allows for the construction of a \"Ripley\" Peripheral Control module." +datum/design/circuit/mecha/ripley_peri + name = "APLU 'Ripley' peripherals control" id = "ripley_peri" - req_tech = list("programming" = 3) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mecha/ripley/peripherals -datum/design/odysseus_main - name = "Circuit Design (\"Odysseus\" Central Control module)" - desc = "Allows for the construction of a \"Odysseus\" Central Control module." +datum/design/circuit/mecha/odysseus_main + name = "'Odysseus' central control" id = "odysseus_main" req_tech = list("programming" = 3,"biotech" = 2) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mecha/odysseus/main -datum/design/odysseus_peri - name = "Circuit Design (\"Odysseus\" Peripherals Control module)" - desc = "Allows for the construction of a \"Odysseus\" Peripheral Control module." +datum/design/circuit/mecha/odysseus_peri + name = "'Odysseus' peripherals control" id = "odysseus_peri" req_tech = list("programming" = 3,"biotech" = 2) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mecha/odysseus/peripherals -datum/design/gygax_main - name = "Circuit Design (\"Gygax\" Central Control module)" - desc = "Allows for the construction of a \"Gygax\" Central Control module." +datum/design/circuit/mecha/gygax_main + name = "'Gygax' central control" id = "gygax_main" req_tech = list("programming" = 4) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mecha/gygax/main -datum/design/gygax_peri - name = "Circuit Design (\"Gygax\" Peripherals Control module)" - desc = "Allows for the construction of a \"Gygax\" Peripheral Control module." +datum/design/circuit/mecha/gygax_peri + name = "'Gygax' peripherals control" id = "gygax_peri" req_tech = list("programming" = 4) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mecha/gygax/peripherals -datum/design/gygax_targ - name = "Circuit Design (\"Gygax\" Weapons & Targeting Control module)" - desc = "Allows for the construction of a \"Gygax\" Weapons & Targeting Control module." +datum/design/circuit/mecha/gygax_targ + name = "'Gygax' weapon control and targeting" id = "gygax_targ" req_tech = list("programming" = 4, "combat" = 2) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mecha/gygax/targeting -datum/design/durand_main - name = "Circuit Design (\"Durand\" Central Control module)" - desc = "Allows for the construction of a \"Durand\" Central Control module." +datum/design/circuit/mecha/durand_main + name = "'Durand' central control" id = "durand_main" req_tech = list("programming" = 4) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mecha/durand/main -datum/design/durand_peri - name = "Circuit Design (\"Durand\" Peripherals Control module)" - desc = "Allows for the construction of a \"Durand\" Peripheral Control module." +datum/design/circuit/mecha/durand_peri + name = "'Durand' peripherals control" id = "durand_peri" req_tech = list("programming" = 4) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mecha/durand/peripherals -datum/design/durand_targ - name = "Circuit Design (\"Durand\" Weapons & Targeting Control module)" - desc = "Allows for the construction of a \"Durand\" Weapons & Targeting Control module." +datum/design/circuit/mecha/durand_targ + name = "'Durand' weapon control and targeting" id = "durand_targ" req_tech = list("programming" = 4, "combat" = 2) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mecha/durand/targeting -datum/design/honker_main - name = "Circuit Design (\"H.O.N.K\" Central Control module)" - desc = "Allows for the construction of a \"H.O.N.K\" Central Control module." +datum/design/circuit/mecha/honker_main + name = "'H.O.N.K' central control" id = "honker_main" - req_tech = list("programming" = 3) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mecha/honker/main -datum/design/honker_peri - name = "Circuit Design (\"H.O.N.K\" Peripherals Control module)" - desc = "Allows for the construction of a \"H.O.N.K\" Peripheral Control module." +datum/design/circuit/mecha/honker_peri + name = "'H.O.N.K' peripherals control" id = "honker_peri" - req_tech = list("programming" = 3) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mecha/honker/peripherals -datum/design/honker_targ - name = "Circuit Design (\"H.O.N.K\" Weapons & Targeting Control module)" - desc = "Allows for the construction of a \"H.O.N.K\" Weapons & Targeting Control module." +datum/design/circuit/mecha/honker_targ + name = "'H.O.N.K' weapon control and targeting" id = "honker_targ" - req_tech = list("programming" = 3) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mecha/honker/targeting //////////////////////////////////////// /////////// Mecha Equpment ///////////// //////////////////////////////////////// -datum/design/mech_scattershot - name = "Exosuit Weapon Design (LBX AC 10 \"Scattershot\")" - desc = "Allows for the construction of LBX AC 10." - id = "mech_scattershot" - build_type = MECHFAB - req_tech = list("combat" = 4) - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot - category = "Exosuit Equipment" - -datum/design/mech_laser - name = "Exosuit Weapon Design (CH-PS \"Immolator\" Laser)" - desc = "Allows for the construction of CH-PS Laser." - id = "mech_laser" - build_type = MECHFAB - req_tech = list("combat" = 3, "magnets" = 3) - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser - category = "Exosuit Equipment" - -datum/design/mech_laser_rigged - name = "Exosuit Weapon Design (Jury-rigged Laser)" - desc = "Allows for the construction a welder-laser assembly package for non-combat exosuits." - id = "mech_laser_rigged" - build_type = MECHFAB - req_tech = list("combat" = 2, "magnets" = 2) - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/riggedlaser - category = "Exosuit Equipment" - -datum/design/mech_laser_heavy - name = "Exosuit Weapon Design (CH-LC \"Solaris\" Laser Cannon)" - desc = "Allows for the construction of CH-LC Laser Cannon." - id = "mech_laser_heavy" - build_type = MECHFAB - req_tech = list("combat" = 4, "magnets" = 4) - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy - category = "Exosuit Equipment" - -datum/design/mech_ion - name = "Exosuit Weapon Design (mkIV Ion Heavy Cannon)" - desc = "Allows for the construction of the Ion Cannon." - id = "mech_ion" - build_type = MECHFAB - req_tech = list("combat" = 4, "magnets" = 4) - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/ion - category = "Exosuit Equipment" - -datum/design/mech_grenade_launcher - name = "Exosuit Weapon Design (SGL-6 Grenade Launcher)" - desc = "Allows for the construction of SGL-6 Grenade Launcher." - id = "mech_grenade_launcher" +datum/design/item/mecha build_type = MECHFAB req_tech = list("combat" = 3) - build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang category = "Exosuit Equipment" -datum/design/clusterbang_launcher - name = "Exosuit Module Design (SOP-6 Clusterbang Launcher)" - desc = "A weapon that violates the Geneva Convention at 6 rounds per minute" +datum/design/item/mecha/AssembleDesignName() + ..() + name = "Exosuit module design ([item_name])" +datum/design/item/mecha/weapon/AssembleDesignName() + ..() + name = "Exosuit weapon design ([item_name])" +datum/design/item/mecha/AssembleDesignDesc() + if(!desc) + desc = "Allows for the construction of \a '[item_name]' exosuit module." + +// *** Weapon modules +datum/design/item/mecha/weapon/scattershot + id = "mech_scattershot" + req_tech = list("combat" = 4) + build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot + +datum/design/item/mecha/weapon/laser + id = "mech_laser" + req_tech = list("combat" = 3, "magnets" = 3) + build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser + +datum/design/item/mecha/weapon/laser_rigged + desc = "Allows for the construction of a welder-laser assembly package for non-combat exosuits." + id = "mech_laser_rigged" + req_tech = list("combat" = 2, "magnets" = 2) + build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/riggedlaser + +datum/design/item/mecha/weapon/laser_heavy + id = "mech_laser_heavy" + req_tech = list("combat" = 4, "magnets" = 4) + build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy + +datum/design/item/mecha/weapon/ion + id = "mech_ion" + req_tech = list("combat" = 4, "magnets" = 4) + build_path = /obj/item/mecha_parts/mecha_equipment/weapon/energy/ion + +datum/design/item/mecha/weapon/grenade_launcher + id = "mech_grenade_launcher" + req_tech = list("combat" = 3) + build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang + +datum/design/item/mecha/weapon/clusterbang_launcher + desc = "A weapon that violates the Geneva Convention at 6 rounds per minute." id = "clusterbang_launcher" - build_type = MECHFAB req_tech = list("combat"= 5, "materials" = 5, "syndicate" = 3) build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang/clusterbang/limited - category = "Exosuit Equipment" -datum/design/mech_wormhole_gen - name = "Exosuit Module Design (Localized Wormhole Generator)" - desc = "An exosuit module that allows generating of small quasi-stable wormholes." +// *** Nonweapon modules +datum/design/item/mecha/wormhole_gen + desc = "An exosuit module that can generate small quasi-stable wormholes." id = "mech_wormhole_gen" - build_type = MECHFAB req_tech = list("bluespace" = 3, "magnets" = 2) build_path = /obj/item/mecha_parts/mecha_equipment/wormhole_generator - category = "Exosuit Equipment" -datum/design/mech_teleporter - name = "Exosuit Module Design (Teleporter Module)" - desc = "An exosuit module that allows exosuits to teleport to any position in view." +datum/design/item/mecha/teleporter + desc = "An exosuit module that allows teleportation to any position in view." id = "mech_teleporter" - build_type = MECHFAB req_tech = list("bluespace" = 10, "magnets" = 5) build_path = /obj/item/mecha_parts/mecha_equipment/teleporter - category = "Exosuit Equipment" -datum/design/mech_rcd - name = "Exosuit Module Design (RCD Module)" - desc = "An exosuit-mounted Rapid Construction Device." +datum/design/item/mecha/rcd + desc = "An exosuit-mounted rapid construction device." id = "mech_rcd" - build_type = MECHFAB req_tech = list("materials" = 4, "bluespace" = 3, "magnets" = 4, "powerstorage"=4, "engineering" = 4) build_path = /obj/item/mecha_parts/mecha_equipment/tool/rcd - category = "Exosuit Equipment" -datum/design/mech_gravcatapult - name = "Exosuit Module Design (Gravitational Catapult Module)" - desc = "An exosuit mounted Gravitational Catapult." +datum/design/item/mecha/gravcatapult + desc = "An exosuit-mounted gravitational catapult." id = "mech_gravcatapult" - build_type = MECHFAB req_tech = list("bluespace" = 2, "magnets" = 3, "engineering" = 3) build_path = /obj/item/mecha_parts/mecha_equipment/gravcatapult - category = "Exosuit Equipment" -datum/design/mech_repair_droid - name = "Exosuit Module Design (Repair Droid Module)" - desc = "Automated Repair Droid. BEEP BOOP" +datum/design/item/mecha/repair_droid + desc = "Automated repair droid, exosuits' best companion. BEEP BOOP" id = "mech_repair_droid" - build_type = MECHFAB req_tech = list("magnets" = 3, "programming" = 3, "engineering" = 3) build_path = /obj/item/mecha_parts/mecha_equipment/repair_droid - category = "Exosuit Equipment" -datum/design/mech_phoron_generator - name = "Exosuit Module Design (Phoron Generator Module)" +datum/design/item/mecha/phoron_generator desc = "Exosuit-mounted phoron generator." id = "mech_phoron_generator" - build_type = MECHFAB req_tech = list("phorontech" = 2, "powerstorage"= 2, "engineering" = 2) build_path = /obj/item/mecha_parts/mecha_equipment/generator - category = "Exosuit Equipment" -datum/design/mech_energy_relay - name = "Exosuit Module Design (Tesla Energy Relay)" - desc = "Tesla Energy Relay" +datum/design/item/mecha/energy_relay id = "mech_energy_relay" - build_type = MECHFAB req_tech = list("magnets" = 4, "powerstorage" = 3) build_path = /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay - category = "Exosuit Equipment" -datum/design/mech_ccw_armor - name = "Exosuit Module Design(Reactive Armor Booster Module)" - desc = "Exosuit-mounted armor booster." +datum/design/item/mecha/ccw_armor + desc = "Exosuit close-combat armor booster." id = "mech_ccw_armor" - build_type = MECHFAB req_tech = list("materials" = 5, "combat" = 4) build_path = /obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster - category = "Exosuit Equipment" -datum/design/mech_proj_armor - name = "Exosuit Module Design(Reflective Armor Booster Module)" - desc = "Exosuit-mounted armor booster." +datum/design/item/mecha/proj_armor + desc = "Exosuit projectile armor booster." id = "mech_proj_armor" - build_type = MECHFAB req_tech = list("materials" = 5, "combat" = 5, "engineering"=3) build_path = /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster - category = "Exosuit Equipment" -datum/design/mech_syringe_gun - name = "Exosuit Module Design(Syringe Gun)" +datum/design/item/mecha/syringe_gun desc = "Exosuit-mounted syringe gun and chemical synthesizer." id = "mech_syringe_gun" - build_type = MECHFAB req_tech = list("materials" = 3, "biotech"=4, "magnets"=4, "programming"=3) build_path = /obj/item/mecha_parts/mecha_equipment/tool/syringe_gun - category = "Exosuit Equipment" -datum/design/mech_diamond_drill - name = "Exosuit Module Design (Diamond Mining Drill)" - desc = "An upgraded version of the standard drill" +datum/design/item/mecha/diamond_drill + desc = "A diamond version of the exosuit drill. It's harder, better, faster, stronger." id = "mech_diamond_drill" - build_type = MECHFAB req_tech = list("materials" = 4, "engineering" = 3) build_path = /obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill - category = "Exosuit Equipment" -datum/design/mech_generator_nuclear - name = "Exosuit Module Design (ExoNuclear Reactor)" - desc = "Compact nuclear reactor module" +datum/design/item/mecha/generator_nuclear + desc = "Exosuit-held nuclear reactor. Converts uranium and everyone's health to energy." id = "mech_generator_nuclear" - build_type = MECHFAB req_tech = list("powerstorage"= 3, "engineering" = 3, "materials" = 3) build_path = /obj/item/mecha_parts/mecha_equipment/generator/nuclear - category = "Exosuit Equipment" //////////////////////////////////////// @@ -848,146 +721,140 @@ datum/design/tech_disk materials = list("$metal" = 30, "$glass" = 10) build_path = /obj/item/weapon/disk/tech_disk +/////////////////////////////////// +/////Non-Board Computer Stuff////// +/////////////////////////////////// + +datum/design/item/intellicard + name = "'intelliCard', AI preservation and transportation system" + desc = "Allows for the construction of an intelliCard." + id = "intellicard" + req_tech = list("programming" = 4, "materials" = 4) + materials = list("$glass" = 1000, "$gold" = 200) + build_path = /obj/item/device/aicard + +datum/design/item/paicard + name = "'pAI', personal artificial intelligence device" + id = "paicard" + req_tech = list("programming" = 2) + materials = list("$glass" = 500, "$metal" = 500) + build_path = /obj/item/device/paicard + +datum/design/item/posibrain + id = "posibrain" + req_tech = list("engineering" = 4, "materials" = 6, "bluespace" = 2, "programming" = 4) + materials = list("$metal" = 2000, "$glass" = 1000, "$silver" = 1000, "$gold" = 500, "$phoron" = 500, "$diamond" = 100) + build_path = /obj/item/device/mmi/digital/posibrain + //////////////////////////////////////// /////////////Stock Parts//////////////// //////////////////////////////////////// +datum/design/item/stock_part + build_type = PROTOLATHE -datum/design/basic_capacitor - name = "Basic Capacitor" - desc = "A stock part used in the construction of various devices." +datum/design/item/stock_part/AssembleDesignName() + name = "Component design ([item_name])" + +datum/design/item/stock_part/AssembleDesignDesc() + if(!desc) + desc = "A stock part used in the construction of various devices." + +datum/design/item/stock_part/basic_capacitor + build_type = PROTOLATHE | AUTOLATHE id = "basic_capacitor" req_tech = list("powerstorage" = 1) - build_type = PROTOLATHE | AUTOLATHE materials = list("$metal" = 50, "$glass" = 50) build_path = /obj/item/weapon/stock_parts/capacitor -datum/design/basic_sensor - name = "Basic Sensor Module" - desc = "A stock part used in the construction of various devices." +datum/design/item/stock_part/basic_sensor + build_type = PROTOLATHE | AUTOLATHE id = "basic_sensor" req_tech = list("magnets" = 1) - build_type = PROTOLATHE | AUTOLATHE materials = list("$metal" = 50, "$glass" = 20) build_path = /obj/item/weapon/stock_parts/scanning_module -datum/design/micro_mani - name = "Micro Manipulator" - desc = "A stock part used in the construction of various devices." +datum/design/item/stock_part/micro_mani + build_type = PROTOLATHE | AUTOLATHE id = "micro_mani" req_tech = list("materials" = 1, "programming" = 1) - build_type = PROTOLATHE | AUTOLATHE materials = list("$metal" = 30) build_path = /obj/item/weapon/stock_parts/manipulator -datum/design/basic_micro_laser - name = "Basic Micro-Laser" - desc = "A stock part used in the construction of various devices." +datum/design/item/stock_part/basic_micro_laser + build_type = PROTOLATHE | AUTOLATHE id = "basic_micro_laser" req_tech = list("magnets" = 1) - build_type = PROTOLATHE | AUTOLATHE materials = list("$metal" = 10, "$glass" = 20) build_path = /obj/item/weapon/stock_parts/micro_laser -datum/design/basic_matter_bin - name = "Basic Matter Bin" - desc = "A stock part used in the construction of various devices." +datum/design/item/stock_part/basic_matter_bin + build_type = PROTOLATHE | AUTOLATHE id = "basic_matter_bin" req_tech = list("materials" = 1) - build_type = PROTOLATHE | AUTOLATHE materials = list("$metal" = 80) build_path = /obj/item/weapon/stock_parts/matter_bin -datum/design/adv_capacitor - name = "Advanced Capacitor" - desc = "A stock part used in the construction of various devices." +datum/design/item/stock_part/adv_capacitor id = "adv_capacitor" req_tech = list("powerstorage" = 3) - build_type = PROTOLATHE materials = list("$metal" = 50, "$glass" = 50) build_path = /obj/item/weapon/stock_parts/capacitor/adv -datum/design/adv_sensor - name = "Advanced Sensor Module" - desc = "A stock part used in the construction of various devices." +datum/design/item/stock_part/adv_sensor id = "adv_sensor" req_tech = list("magnets" = 3) - build_type = PROTOLATHE materials = list("$metal" = 50, "$glass" = 20) build_path = /obj/item/weapon/stock_parts/scanning_module/adv -datum/design/nano_mani - name = "Nano Manipulator" - desc = "A stock part used in the construction of various devices." +datum/design/item/stock_part/nano_mani id = "nano_mani" req_tech = list("materials" = 3, "programming" = 2) - build_type = PROTOLATHE materials = list("$metal" = 30) build_path = /obj/item/weapon/stock_parts/manipulator/nano -datum/design/high_micro_laser - name = "High-Power Micro-Laser" - desc = "A stock part used in the construction of various devices." +datum/design/item/stock_part/high_micro_laser id = "high_micro_laser" req_tech = list("magnets" = 3) - build_type = PROTOLATHE materials = list("$metal" = 10, "$glass" = 20) build_path = /obj/item/weapon/stock_parts/micro_laser/high -datum/design/adv_matter_bin - name = "Advanced Matter Bin" - desc = "A stock part used in the construction of various devices." +datum/design/item/stock_part/adv_matter_bin id = "adv_matter_bin" req_tech = list("materials" = 3) - build_type = PROTOLATHE materials = list("$metal" = 80) build_path = /obj/item/weapon/stock_parts/matter_bin/adv -datum/design/super_capacitor - name = "Super Capacitor" - desc = "A stock part used in the construction of various devices." +datum/design/item/stock_part/super_capacitor id = "super_capacitor" req_tech = list("powerstorage" = 5, "materials" = 4) - build_type = PROTOLATHE reliability_base = 71 materials = list("$metal" = 50, "$glass" = 50, "$gold" = 20) build_path = /obj/item/weapon/stock_parts/capacitor/super -datum/design/phasic_sensor - name = "Phasic Sensor Module" - desc = "A stock part used in the construction of various devices." +datum/design/item/stock_part/phasic_sensor id = "phasic_sensor" req_tech = list("magnets" = 5, "materials" = 3) - build_type = PROTOLATHE materials = list("$metal" = 50, "$glass" = 20, "$silver" = 10) reliability_base = 72 build_path = /obj/item/weapon/stock_parts/scanning_module/phasic -datum/design/pico_mani - name = "Pico Manipulator" - desc = "A stock part used in the construction of various devices." +datum/design/item/stock_part/pico_mani id = "pico_mani" req_tech = list("materials" = 5, "programming" = 2) - build_type = PROTOLATHE materials = list("$metal" = 30) reliability_base = 73 build_path = /obj/item/weapon/stock_parts/manipulator/pico -datum/design/ultra_micro_laser - name = "Ultra-High-Power Micro-Laser" - desc = "A stock part used in the construction of various devices." +datum/design/item/stock_part/ultra_micro_laser id = "ultra_micro_laser" req_tech = list("magnets" = 5, "materials" = 5) - build_type = PROTOLATHE materials = list("$metal" = 10, "$glass" = 20, "$uranium" = 10) reliability_base = 70 build_path = /obj/item/weapon/stock_parts/micro_laser/ultra -datum/design/super_matter_bin - name = "Super Matter Bin" - desc = "A stock part used in the construction of various devices." +datum/design/item/stock_part/super_matter_bin id = "super_matter_bin" req_tech = list("materials" = 5) - build_type = PROTOLATHE materials = list("$metal" = 80) reliability_base = 75 build_path = /obj/item/weapon/stock_parts/matter_bin/super @@ -996,326 +863,262 @@ datum/design/super_matter_bin //////////Tcommsat Stock Parts/////////// ///////////////////////////////////////// -datum/design/subspace_ansible - name = "Subspace Ansible" - desc = "A compact module capable of sensing extradimensional activity." +datum/design/item/stock_part/subspace_ansible id = "s-ansible" req_tech = list("programming" = 3, "magnets" = 4, "materials" = 4, "bluespace" = 2) - build_type = PROTOLATHE materials = list("$metal" = 80, "$silver" = 20) build_path = /obj/item/weapon/stock_parts/subspace/ansible -datum/design/hyperwave_filter - name = "Hyperwave Filter" - desc = "A tiny device capable of filtering and converting super-intense radiowaves." +datum/design/item/stock_part/hyperwave_filter id = "s-filter" req_tech = list("programming" = 3, "magnets" = 3) - build_type = PROTOLATHE materials = list("$metal" = 40, "$silver" = 10) build_path = /obj/item/weapon/stock_parts/subspace/filter -datum/design/subspace_amplifier - name = "Subspace Amplifier" - desc = "A compact micro-machine capable of amplifying weak subspace transmissions." +datum/design/item/stock_part/subspace_amplifier id = "s-amplifier" req_tech = list("programming" = 3, "magnets" = 4, "materials" = 4, "bluespace" = 2) - build_type = PROTOLATHE materials = list("$metal" = 10, "$gold" = 30, "$uranium" = 15) build_path = /obj/item/weapon/stock_parts/subspace/amplifier -datum/design/subspace_treatment - name = "Subspace Treatment Disk" - desc = "A compact micro-machine capable of stretching out hyper-compressed radio waves." +datum/design/item/stock_part/subspace_treatment id = "s-treatment" req_tech = list("programming" = 3, "magnets" = 2, "materials" = 4, "bluespace" = 2) - build_type = PROTOLATHE materials = list("$metal" = 10, "$silver" = 20) build_path = /obj/item/weapon/stock_parts/subspace/treatment -datum/design/subspace_analyzer - name = "Subspace Analyzer" - desc = "A sophisticated analyzer capable of analyzing cryptic subspace wavelengths." +datum/design/item/stock_part/subspace_analyzer id = "s-analyzer" req_tech = list("programming" = 3, "magnets" = 4, "materials" = 4, "bluespace" = 2) - build_type = PROTOLATHE materials = list("$metal" = 10, "$gold" = 15) build_path = /obj/item/weapon/stock_parts/subspace/analyzer -datum/design/subspace_crystal - name = "Ansible Crystal" - desc = "A sophisticated analyzer capable of analyzing cryptic subspace wavelengths." +datum/design/item/stock_part/subspace_crystal id = "s-crystal" req_tech = list("magnets" = 4, "materials" = 4, "bluespace" = 2) - build_type = PROTOLATHE materials = list("$glass" = 1000, "$silver" = 20, "$gold" = 20) build_path = /obj/item/weapon/stock_parts/subspace/crystal -datum/design/subspace_transmitter - name = "Subspace Transmitter" - desc = "A large piece of equipment used to open a window into the subspace dimension." +datum/design/item/stock_part/subspace_transmitter id = "s-transmitter" req_tech = list("magnets" = 5, "materials" = 5, "bluespace" = 3) - build_type = PROTOLATHE materials = list("$glass" = 100, "$silver" = 10, "$uranium" = 15) build_path = /obj/item/weapon/stock_parts/subspace/transmitter //////////////////////////////////////// //////////////////Power///////////////// //////////////////////////////////////// - -datum/design/basic_cell - name = "Basic Power Cell" - desc = "A basic power cell that holds 1000 units of energy" - id = "basic_cell" - req_tech = list("powerstorage" = 1) - build_type = PROTOLATHE | AUTOLATHE |MECHFAB - materials = list("$metal" = 700, "$glass" = 50) - build_path = /obj/item/weapon/cell - category = "Misc" - -datum/design/high_cell - name = "High-Capacity Power Cell" - desc = "A power cell that holds 10000 units of energy" - id = "high_cell" - req_tech = list("powerstorage" = 2) - build_type = PROTOLATHE | AUTOLATHE | MECHFAB - materials = list("$metal" = 700, "$glass" = 60) - build_path = /obj/item/weapon/cell/high - category = "Misc" - -datum/design/super_cell - name = "Super-Capacity Power Cell" - desc = "A power cell that holds 20000 units of energy" - id = "super_cell" - req_tech = list("powerstorage" = 3, "materials" = 2) - reliability_base = 75 - build_type = PROTOLATHE | MECHFAB - materials = list("$metal" = 700, "$glass" = 70) - build_path = /obj/item/weapon/cell/super - category = "Misc" - -datum/design/hyper_cell - name = "Hyper-Capacity Power Cell" - desc = "A power cell that holds 30000 units of energy" - id = "hyper_cell" - req_tech = list("powerstorage" = 5, "materials" = 4) - reliability_base = 70 - build_type = PROTOLATHE | MECHFAB - materials = list("$metal" = 400, "$gold" = 150, "$silver" = 150, "$glass" = 70) - build_path = /obj/item/weapon/cell/hyper - category = "Misc" - -datum/design/light_replacer +datum/design/item/light_replacer name = "Light Replacer" desc = "A device to automatically replace lights. Refill with working lightbulbs." id = "light_replacer" req_tech = list("magnets" = 3, "materials" = 4) - build_type = PROTOLATHE materials = list("$metal" = 1500, "$silver" = 150, "$glass" = 3000) build_path = /obj/item/device/lightreplacer +// *** Power cells +datum/design/item/powercell + build_type = PROTOLATHE | MECHFAB + +datum/design/item/powercell/AssembleDesignName() + name = "Power cell model ([item_name])" + +datum/design/item/powercell/AssembleDesignDesc() + if(build_path) + var/obj/item/weapon/cell/C = build_path + desc = "Allows the construction of power cells that can hold [initial(C.maxcharge)] units of energy." + +datum/design/item/powercell/basic + name = "basic" + build_type = PROTOLATHE | AUTOLATHE | MECHFAB + id = "basic_cell" + req_tech = list("powerstorage" = 1) + materials = list("$metal" = 700, "$glass" = 50) + build_path = /obj/item/weapon/cell + category = "Misc" + +datum/design/item/powercell/high + name = "high-capacity" + build_type = PROTOLATHE | AUTOLATHE | MECHFAB + id = "high_cell" + req_tech = list("powerstorage" = 2) + materials = list("$metal" = 700, "$glass" = 60) + build_path = /obj/item/weapon/cell/high + category = "Misc" + +datum/design/item/powercell/super + name = "super-capacity" + id = "super_cell" + req_tech = list("powerstorage" = 3, "materials" = 2) + reliability_base = 75 + materials = list("$metal" = 700, "$glass" = 70) + build_path = /obj/item/weapon/cell/super + category = "Misc" + +datum/design/item/powercell/hyper + name = "hyper-capacity" + id = "hyper_cell" + req_tech = list("powerstorage" = 5, "materials" = 4) + reliability_base = 70 + materials = list("$metal" = 400, "$gold" = 150, "$silver" = 150, "$glass" = 70) + build_path = /obj/item/weapon/cell/hyper + category = "Misc" + //////////////////////////////////////// -//////////////MISC Boards/////////////// +//////////Misc Circuit Boards/////////// //////////////////////////////////////// -datum/design/destructive_analyzer - name = "Destructive Analyzer Board" - desc = "The circuit board for a destructive analyzer." +datum/design/circuit/destructive_analyzer + name = "destructive analyzer" id = "destructive_analyzer" req_tech = list("programming" = 2, "magnets" = 2, "engineering" = 2) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/destructive_analyzer -datum/design/protolathe - name = "Protolathe Board" - desc = "The circuit board for a protolathe." +datum/design/circuit/protolathe + name = "protolathe" id = "protolathe" req_tech = list("programming" = 2, "engineering" = 2) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/protolathe -datum/design/circuit_imprinter - name = "Circuit Imprinter Board" - desc = "The circuit board for a circuit imprinter." +datum/design/circuit/circuit_imprinter + name = "circuit imprinter" id = "circuit_imprinter" req_tech = list("programming" = 2, "engineering" = 2) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/circuit_imprinter -datum/design/autolathe - name = "Autolathe Board" - desc = "The circuit board for a autolathe." +datum/design/circuit/autolathe + name = "autolathe board" id = "autolathe" req_tech = list("programming" = 2, "engineering" = 2) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/autolathe -datum/design/rdservercontrol - name = "R&D Server Control Console Board" - desc = "The circuit board for a R&D Server Control Console" +datum/design/circuit/rdservercontrol + name = "R&D server control console" id = "rdservercontrol" req_tech = list("programming" = 3) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/rdservercontrol -datum/design/rdserver - name = "R&D Server Board" - desc = "The circuit board for an R&D Server" +datum/design/circuit/rdserver + name = "R&D server" id = "rdserver" req_tech = list("programming" = 3) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/rdserver -datum/design/mechfab - name = "Exosuit Fabricator Board" - desc = "The circuit board for an Exosuit Fabricator" +datum/design/circuit/mechfab + name = "exosuit fabricator" id = "mechfab" req_tech = list("programming" = 3, "engineering" = 3) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mechfab -datum/design/gas_heater - name = "Gas Heating System Board" - desc = "The circuit board for a gas heating system" +datum/design/circuit/gas_heater + name = "gas heating system" id = "gasheater" req_tech = list("powerstorage" = 2, "engineering" = 1) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/unary_atmos/heater -datum/design/gas_cooler - name = "Gas Cooling System Board" - desc = "The circuit board for a gas cooling system" +datum/design/circuit/gas_cooler + name = "gas cooling system" id = "gascooler" req_tech = list("magnets" = 2, "engineering" = 2) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/unary_atmos/cooler -datum/design/secure_airlock - name = "Secure Airlock Electronics" - desc = "Tamper-resistant airlock electronics" +datum/design/circuit/secure_airlock + name = "secure airlock electronics" + desc = "Allows for the construction of a tamper-resistant airlock electronics." id = "securedoor" req_tech = list("programming" = 3) - build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/airlock_electronics/secure ///////////////////////////////////////// ////////////Power Stuff////////////////// ///////////////////////////////////////// -datum/design/pacman - name = "PACMAN-type Generator Board" - desc = "The circuit board that for a PACMAN-type portable generator." +datum/design/circuit/pacman + name = "PACMAN-type generator" id = "pacman" req_tech = list("programming" = 3, "phorontech" = 3, "powerstorage" = 3, "engineering" = 3) - build_type = IMPRINTER reliability_base = 79 materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/pacman -datum/design/superpacman - name = "SUPERPACMAN-type Generator Board" - desc = "The circuit board that for a SUPERPACMAN-type portable generator." +datum/design/circuit/superpacman + name = "SUPERPACMAN-type generator" id = "superpacman" req_tech = list("programming" = 3, "powerstorage" = 4, "engineering" = 4) - build_type = IMPRINTER reliability_base = 76 materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/pacman/super -datum/design/mrspacman - name = "MRSPACMAN-type Generator Board" - desc = "The circuit board that for a MRSPACMAN-type portable generator." +datum/design/circuit/mrspacman + name = "MRSPACMAN-type generator" id = "mrspacman" req_tech = list("programming" = 3, "powerstorage" = 5, "engineering" = 5) - build_type = IMPRINTER reliability_base = 74 materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/pacman/mrs -datum/design/batteryrack - name = "Cell rack PSU Board" - desc = "The circuit board for a power cell rack PSU." +datum/design/circuit/batteryrack + name = "cell rack PSU" id = "batteryrack" req_tech = list("powerstorage" = 3, "engineering" = 2) - build_type = IMPRINTER materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/batteryrack -datum/design/smes_cell - name = "Circuit Design (Superconductive Magnetic Energy Storage)" +datum/design/circuit/smes_cell + name = "'SMES' superconductive magnetic energy storage" desc = "Allows for the construction of circuit boards used to build a SMES." id = "smes_cell" req_tech = list("powerstorage" = 7, "engineering" = 5) - build_type = IMPRINTER + //A uniquely-priced board; probably not the best idea materials = list("$glass" = 2000, "sacid" = 20, "$gold" = 1000, "$silver" = 1000, "$diamond" = 500) build_path = /obj/item/weapon/circuitboard/smes ///////////////////////////////////////// ////////////Medical Tools//////////////// ///////////////////////////////////////// +datum/design/item/medical + materials = list("$metal" = 30, "$glass" = 20) -datum/design/robot_scanner - name = "Cyborg Analyzer" - desc = "A hand-held scanner able to diagnose robotic injuries. " +datum/design/item/medical/AssembleDesignName() + ..() + name = "Biotech device prototype ([item_name])" + +datum/design/item/medical/robot_scanner + desc = "A hand-held scanner able to diagnose robotic injuries." id = "robot_scanner" req_tech = list("magnets" = 3, "biotech" = 2, "engineering" = 3) - build_type = PROTOLATHE materials = list("$metal" = 500, "$glass" = 200) - build_path = "/obj/item/device/robotanalyzer" + build_path = /obj/item/device/robotanalyzer -datum/design/mass_spectrometer - name = "Mass-Spectrometer" - desc = "A device for analyzing chemicals in the blood." +datum/design/item/medical/mass_spectrometer + desc = "A device for analyzing chemicals in blood." id = "mass_spectrometer" req_tech = list("biotech" = 2, "magnets" = 2) - build_type = PROTOLATHE - materials = list("$metal" = 30, "$glass" = 20) reliability_base = 76 build_path = /obj/item/device/mass_spectrometer -datum/design/adv_mass_spectrometer - name = "Advanced Mass-Spectrometer" - desc = "A device for analyzing chemicals in the blood and their quantities." +datum/design/item/medical/adv_mass_spectrometer + desc = "A device for analyzing chemicals in blood and their quantities." id = "adv_mass_spectrometer" req_tech = list("biotech" = 2, "magnets" = 4) - build_type = PROTOLATHE - materials = list("$metal" = 30, "$glass" = 20) reliability_base = 74 build_path = /obj/item/device/mass_spectrometer/adv -datum/design/reagent_scanner - name = "Reagent Scanner" +datum/design/item/medical/reagent_scanner desc = "A device for identifying chemicals." id = "reagent_scanner" req_tech = list("biotech" = 2, "magnets" = 2) - build_type = PROTOLATHE - materials = list("$metal" = 30, "$glass" = 20) reliability_base = 76 build_path = /obj/item/device/reagent_scanner -datum/design/adv_reagent_scanner - name = "Advanced Reagent Scanner" +datum/design/item/medical/adv_reagent_scanner desc = "A device for identifying chemicals and their proportions." id = "adv_reagent_scanner" req_tech = list("biotech" = 2, "magnets" = 4) - build_type = PROTOLATHE - materials = list("$metal" = 30, "$glass" = 20) reliability_base = 74 build_path = /obj/item/device/reagent_scanner/adv -datum/design/mmi - name = "Man-Machine Interface" - desc = "The Warrior's bland acronym, MMI, obscures the true horror of this monstrosity." +datum/design/item/medical/mmi id = "mmi" req_tech = list("programming" = 2, "biotech" = 3) build_type = PROTOLATHE | MECHFAB @@ -1324,9 +1127,7 @@ datum/design/mmi build_path = /obj/item/device/mmi category = "Misc" -datum/design/mmi_radio - name = "Radio-enabled Man-Machine Interface" - desc = "The Warrior's bland acronym, MMI, obscures the true horror of this monstrosity. This one comes with a built-in radio." +datum/design/item/medical/mmi_radio id = "mmi_radio" req_tech = list("programming" = 2, "biotech" = 4) build_type = PROTOLATHE | MECHFAB @@ -1335,9 +1136,7 @@ datum/design/mmi_radio build_path = /obj/item/device/mmi/radio_enabled category = "Misc" -datum/design/synthetic_flash - name = "Synthetic Flash" - desc = "When a problem arises, SCIENCE is the solution." +datum/design/item/medical/synthetic_flash id = "sflash" req_tech = list("magnets" = 3, "combat" = 2) build_type = MECHFAB @@ -1346,81 +1145,26 @@ datum/design/synthetic_flash build_path = /obj/item/device/flash/synthetic category = "Misc" -datum/design/nanopaste - name = "nanopaste" +datum/design/item/medical/nanopaste desc = "A tube of paste containing swarms of repair nanites. Very effective in repairing robotic machinery." id = "nanopaste" req_tech = list("materials" = 4, "engineering" = 3) - build_type = PROTOLATHE materials = list("$metal" = 7000, "$glass" = 7000) build_path = /obj/item/stack/nanopaste -/* // Removal of loyalty implants. Can't think of a way to add this to the config option. -datum/design/implant_loyal - name = "loyalty implant" - desc = "Makes you loyal or such." - id = "implant_loyal" - req_tech = list("materials" = 2, "biotech" = 3) - build_type = PROTOLATHE - materials = list("$metal" = 7000, "$glass" = 7000) - build_path = /obj/item/weapon/implantcase/loyalty" -*/ - -datum/design/implant_chem - name = "chemical implant" - desc = "Injects things." - id = "implant_chem" - req_tech = list("materials" = 2, "biotech" = 3) - build_type = PROTOLATHE - materials = list("$metal" = 50, "$glass" = 50) - build_path = /obj/item/weapon/implantcase/chem - -datum/design/implant_free - name = "freedom implant" - desc = "Use this to escape from those evil Red Shirts." - id = "implant_free" - req_tech = list("syndicate" = 2, "biotech" = 3) - build_type = PROTOLATHE - materials = list("$metal" = 50, "$glass" = 50) - build_path = /obj/item/weapon/implantcase/freedom - -datum/design/chameleon - name = "Chameleon Kit" - desc = "It's a set of clothes with dials on them." +datum/design/item/chameleon + name = "Holographic equipment kit" + desc = "A kit of dangerous, high-tech equipment with changeable looks." id = "chameleon" req_tech = list("syndicate" = 2) - build_type = PROTOLATHE materials = list("$metal" = 500) build_path = /obj/item/weapon/storage/box/syndie_kit/chameleon - -datum/design/bluespacebeaker - name = "bluespace beaker" - desc = "A bluespace beaker, powered by experimental bluespace technology and Element Cuban combined with the Compound Pete. Can hold up to 300 units." - id = "bluespacebeaker" - req_tech = list("bluespace" = 2, "materials" = 6) - build_type = PROTOLATHE - materials = list("$metal" = 3000, "$phoron" = 3000, "$diamond" = 500) - reliability_base = 76 - build_path = /obj/item/weapon/reagent_containers/glass/beaker/bluespace - -datum/design/noreactbeaker - name = "cryostasis beaker" - desc = "A cryostasis beaker that allows for chemical storage without reactions. Can hold up to 50 units." - id = "splitbeaker" - req_tech = list("materials" = 2) - build_type = PROTOLATHE - materials = list("$metal" = 3000) - reliability_base = 76 - build_path = /obj/item/weapon/reagent_containers/glass/beaker/noreact - category = "Misc" - datum/design/scalpel_laser1 name = "Basic Laser Scalpel" desc = "A scalpel augmented with a directed laser, for more precise cutting without blood entering the field. This one looks basic and could be improved." id = "scalpel_laser1" req_tech = list("biotech" = 2, "materials" = 2, "magnets" = 2) - build_type = PROTOLATHE materials = list("$metal" = 12500, "$glass" = 7500) build_path = /obj/item/weapon/scalpel/laser1 @@ -1429,7 +1173,6 @@ datum/design/scalpel_laser2 desc = "A scalpel augmented with a directed laser, for more precise cutting without blood entering the field. This one looks somewhat advanced." id = "scalpel_laser2" req_tech = list("biotech" = 3, "materials" = 4, "magnets" = 4) - build_type = PROTOLATHE materials = list("$metal" = 12500, "$glass" = 7500, "$silver" = 2500) build_path = /obj/item/weapon/scalpel/laser2 @@ -1438,7 +1181,6 @@ datum/design/scalpel_laser3 desc = "A scalpel augmented with a directed laser, for more precise cutting without blood entering the field. This one looks to be the pinnacle of precision energy cutlery!" id = "scalpel_laser3" req_tech = list("biotech" = 4, "materials" = 6, "magnets" = 5) - build_type = PROTOLATHE materials = list("$metal" = 12500, "$glass" = 7500, "$silver" = 2000, "$gold" = 1500) build_path = /obj/item/weapon/scalpel/laser3 @@ -1447,17 +1189,76 @@ datum/design/scalpel_manager desc = "A true extension of the surgeon's body, this marvel instantly and completely prepares an incision allowing for the immediate commencement of therapeutic steps." id = "scalpel_manager" req_tech = list("biotech" = 4, "materials" = 7, "magnets" = 5, "programming" = 4) - build_type = PROTOLATHE materials = list ("$metal" = 12500, "$glass" = 7500, "$silver" = 1500, "$gold" = 1500, "$diamond" = 750) build_path = /obj/item/weapon/scalpel/manager +// *** Beakers (not really a subtype of design/item/medical) +datum/design/item/beaker/AssembleDesignName() + name = "Beaker prototype ([item_name])" + +datum/design/item/beaker/bluespace + name = "bluespace" + desc = "A bluespace beaker, powered by experimental bluespace technology and Element Cuban combined with the Compound Pete. Can hold up to 300 units." + id = "bluespacebeaker" + req_tech = list("bluespace" = 2, "materials" = 6) + materials = list("$metal" = 3000, "$phoron" = 3000, "$diamond" = 500) + reliability_base = 76 + build_path = /obj/item/weapon/reagent_containers/glass/beaker/bluespace + +datum/design/item/beaker/noreact + name = "cryostasis" + desc = "A cryostasis beaker that allows for chemical storage without reactions. Can hold up to 50 units." + id = "splitbeaker" + req_tech = list("materials" = 2) + materials = list("$metal" = 3000) + reliability_base = 76 + build_path = /obj/item/weapon/reagent_containers/glass/beaker/noreact + category = "Misc" + +// *** Implants (not really a subtype of design/item/medical) +datum/design/item/implant + materials = list("$metal" = 50, "$glass" = 50) + +datum/design/item/implant/AssembleDesignName() + ..() + name = "Implantable biocircuit design ([item_name])" + +/* // Removal of loyalty implants. Can't think of a way to add this to the config option. +datum/design/item/implant/loyalty + name = "loyalty" + id = "implant_loyal" + req_tech = list("materials" = 2, "biotech" = 3) + materials = list("$metal" = 7000, "$glass" = 7000) + build_path = /obj/item/weapon/implantcase/loyalty" +*/ + +datum/design/item/implant/chemical + name = "chemical" + id = "implant_chem" + req_tech = list("materials" = 2, "biotech" = 3) + build_path = /obj/item/weapon/implantcase/chem + +datum/design/item/implant/freedom + name = "freedom" + id = "implant_free" + req_tech = list("syndicate" = 2, "biotech" = 3) + build_path = /obj/item/weapon/implantcase/freedom + ///////////////////////////////////////// /////////////////Weapons///////////////// ///////////////////////////////////////// +datum/design/item/weapon/AssembleDesignName() + ..() + name = "Weapon prototype ([item_name])" -datum/design/nuclear_gun - name = "Advanced Energy Gun" - desc = "An energy gun with an experimental miniaturized reactor." +datum/design/item/weapon/AssembleDesignDesc() + if(!desc) + if(build_path) + var/obj/item/I = build_path + desc = I.desc + ..() + +datum/design/item/weapon/nuclear_gun id = "nuclear_gun" req_tech = list("combat" = 3, "materials" = 5, "powerstorage" = 3) build_type = PROTOLATHE @@ -1466,9 +1267,7 @@ datum/design/nuclear_gun build_path = /obj/item/weapon/gun/energy/gun/nuclear locked = 1 -datum/design/stunrevolver - name = "Stun Revolver" - desc = "The prize of the Head of Security." +datum/design/item/weapon/stunrevolver id = "stunrevolver" req_tech = list("combat" = 3, "materials" = 3, "powerstorage" = 2) build_type = PROTOLATHE @@ -1476,9 +1275,8 @@ datum/design/stunrevolver build_path = /obj/item/weapon/gun/energy/stunrevolver locked = 1 -datum/design/lasercannon - name = "Laser Cannon" - desc = "A heavy duty laser cannon." +datum/design/item/weapon/lasercannon + desc = "The lasing medium of this prototype is enclosed in a tube lined with uranium-235 and subjected to high neutron flux in a nuclear reactor core." id = "lasercannon" req_tech = list("combat" = 4, "materials" = 3, "powerstorage" = 3) build_type = PROTOLATHE @@ -1486,9 +1284,7 @@ datum/design/lasercannon build_path = /obj/item/weapon/gun/energy/lasercannon locked = 1 -datum/design/decloner - name = "Decloner" - desc = "Your opponent will bubble into a messy pile of goop." +datum/design/item/weapon/decloner id = "decloner" req_tech = list("combat" = 8, "materials" = 7, "biotech" = 5, "powerstorage" = 6) build_type = PROTOLATHE @@ -1496,8 +1292,7 @@ datum/design/decloner build_path = /obj/item/weapon/gun/energy/decloner locked = 1 -datum/design/chemsprayer - name = "Chem Sprayer" +datum/design/item/weapon/chemsprayer desc = "An advanced chem spraying device." id = "chemsprayer" req_tech = list("materials" = 3, "engineering" = 3, "biotech" = 2) @@ -1506,16 +1301,14 @@ datum/design/chemsprayer reliability_base = 100 build_path = /obj/item/weapon/reagent_containers/spray/chemsprayer -datum/design/rapidsyringe - name = "Rapid Syringe Gun" - desc = "A gun that fires many syringes." +datum/design/item/weapon/rapidsyringe id = "rapidsyringe" req_tech = list("combat" = 3, "materials" = 3, "engineering" = 3, "biotech" = 2) build_type = PROTOLATHE materials = list("$metal" = 5000, "$glass" = 1000) build_path = /obj/item/weapon/gun/syringe/rapidsyringe /* -datum/design/largecrossbow +datum/design/item/weapon/largecrossbow name = "Energy Crossbow" desc = "A weapon favoured by syndicate infiltration teams." id = "largecrossbow" @@ -1524,9 +1317,8 @@ datum/design/largecrossbow materials = list("$metal" = 5000, "$glass" = 1000, "$uranium" = 1000, "$silver" = 1000) build_path = /obj/item/weapon/gun/energy/crossbow/largecrossbow" */ -datum/design/temp_gun - name = "Temperature Gun" - desc = "A gun that shoots temperature bullet energythings to change temperature."//Change it if you want +datum/design/item/weapon/temp_gun + desc = "A gun that shoots high-powered glass-encased energy temperature bullets." id = "temp_gun" req_tech = list("combat" = 3, "materials" = 4, "powerstorage" = 3, "magnets" = 2) build_type = PROTOLATHE @@ -1534,18 +1326,14 @@ datum/design/temp_gun build_path = /obj/item/weapon/gun/energy/temperature locked = 1 -datum/design/flora_gun - name = "Floral Somatoray" - desc = "A tool that discharges controlled radiation which induces mutation in plant cells. Harmless to other organic life." +datum/design/item/weapon/flora_gun id = "flora_gun" req_tech = list("materials" = 2, "biotech" = 3, "powerstorage" = 3) build_type = PROTOLATHE materials = list("$metal" = 2000, "$glass" = 500, "$uranium" = 500) build_path = /obj/item/weapon/gun/energy/floragun -datum/design/large_grenade - name = "Large Grenade" - desc = "A grenade that affects a larger area and use larger containers." +datum/design/item/weapon/large_grenade id = "large_Grenade" req_tech = list("combat" = 3, "materials" = 2) build_type = PROTOLATHE @@ -1553,9 +1341,7 @@ datum/design/large_grenade reliability_base = 79 build_path = /obj/item/weapon/grenade/chem_grenade/large -datum/design/smg - name = "Submachine Gun" - desc = "A lightweight, fast firing gun." +datum/design/item/weapon/smg id = "smg" req_tech = list("combat" = 4, "materials" = 3) build_type = PROTOLATHE @@ -1563,17 +1349,14 @@ datum/design/smg build_path = /obj/item/weapon/gun/projectile/automatic locked = 1 -datum/design/ammo_9mm - name = "Ammunition Box (9mm)" - desc = "A box of prototype 9mm ammunition." +datum/design/item/weapon/ammo_9mm id = "ammo_9mm" req_tech = list("combat" = 4, "materials" = 3) build_type = PROTOLATHE materials = list("$metal" = 3750, "$silver" = 100) build_path = /obj/item/ammo_magazine/c9mm -datum/design/stunshell - name = "Stun Shell" +datum/design/item/weapon/stunshell desc = "A stunning shell for a shotgun." id = "stunshell" req_tech = list("combat" = 3, "materials" = 3) @@ -1581,18 +1364,16 @@ datum/design/stunshell materials = list("$metal" = 4000) build_path = /obj/item/ammo_casing/shotgun/stunshell -datum/design/phoronpistol - name = "phoron pistol" - desc = "A specialized firearm designed to fire lethal bolts of phoron." +datum/design/item/weapon/phoronpistol id = "ppistol" req_tech = list("combat" = 5, "phorontech" = 4) build_type = PROTOLATHE materials = list("$metal" = 5000, "$glass" = 1000, "$phoron" = 3000) build_path = /obj/item/weapon/gun/energy/toxgun + ///////////////////////////////////////// /////////////////Mining////////////////// ///////////////////////////////////////// - datum/design/jackhammer name = "Sonic Jackhammer" desc = "Cracks rocks with sonic blasts, perfect for killing cave lizards." From 619143186e908c4461d2fa203accb42a568d3044 Mon Sep 17 00:00:00 2001 From: Amunak Date: Thu, 18 Dec 2014 04:00:51 +0100 Subject: [PATCH 30/35] Moved design disk to research.dm; fixed disks' names --- code/modules/research/designs.dm | 32 ------------------------------- code/modules/research/research.dm | 18 +++++++++++++++-- 2 files changed, 16 insertions(+), 34 deletions(-) diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index da27da12d58..102aca404ce 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -1488,38 +1488,6 @@ datum/design/security_hud build_path = /obj/item/clothing/glasses/hud/security locked = 1 -///////////////////////////////////////// -//////////////////Test/////////////////// -///////////////////////////////////////// - - /* test - name = "Test Design" - desc = "A design to test the new protolathe." - id = "protolathe_test" - build_type = PROTOLATHE - req_tech = list("materials" = 1) - materials = list("$gold" = 3000, "iron" = 15, "copper" = 10, "$silver" = 2500) - build_path = /obj/item/weapon/banhammer" */ - -//////////////////////////////////////// -//Disks for transporting design datums// -//////////////////////////////////////// - -/obj/item/weapon/disk/design_disk - name = "Component Design Disk" - desc = "A disk for storing device design data for construction in lathes." - icon = 'icons/obj/cloning.dmi' - icon_state = "datadisk2" - item_state = "card-id" - w_class = 2.0 - matter = list("metal" = 30,"glass" = 10) - var/datum/design/blueprint - -/obj/item/weapon/disk/design_disk/New() - src.pixel_x = rand(-5.0, 5) - src.pixel_y = rand(-5.0, 5) - - ///////////////////////////////////////// //////////////Borg Upgrades////////////// ///////////////////////////////////////// diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm index 536d712f2e1..3dcd21e9bb8 100644 --- a/code/modules/research/research.dm +++ b/code/modules/research/research.dm @@ -257,7 +257,7 @@ datum/tech/robotics /obj/item/weapon/disk/tech_disk - name = "Technology Disk" + name = "technology disk" desc = "A disk for storing technology data for further research." icon = 'icons/obj/cloning.dmi' icon_state = "datadisk2" @@ -268,4 +268,18 @@ datum/tech/robotics /obj/item/weapon/disk/tech_disk/New() src.pixel_x = rand(-5.0, 5) - src.pixel_y = rand(-5.0, 5) \ No newline at end of file + src.pixel_y = rand(-5.0, 5) + +/obj/item/weapon/disk/design_disk + name = "component design disk" + desc = "A disk for storing device design data for construction in lathes." + icon = 'icons/obj/cloning.dmi' + icon_state = "datadisk2" + item_state = "card-id" + w_class = 2.0 + matter = list("metal" = 30,"glass" = 10) + var/datum/design/blueprint + +/obj/item/weapon/disk/design_disk/New() + src.pixel_x = rand(-5.0, 5) + src.pixel_y = rand(-5.0, 5) From 417fe41248a47d822df4a1e96455cc16fe1de3ef Mon Sep 17 00:00:00 2001 From: Amunak Date: Thu, 18 Dec 2014 04:58:40 +0100 Subject: [PATCH 31/35] Mining items path formatting --- code/modules/mining/mine_items.dm | 132 +++++++++++++++--------------- 1 file changed, 66 insertions(+), 66 deletions(-) diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 19d3a2e32d9..ff159ff122c 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -68,80 +68,80 @@ var/excavation_amount = 100 - hammer - name = "sledgehammer" - //icon_state = "sledgehammer" Waiting on sprite - desc = "A mining hammer made of reinforced metal. You feel like smashing your boss in the face with this." +/obj/item/weapon/pickaxe/hammer + name = "sledgehammer" + //icon_state = "sledgehammer" Waiting on sprite + desc = "A mining hammer made of reinforced metal. You feel like smashing your boss in the face with this." - silver - name = "silver pickaxe" - icon_state = "spickaxe" - item_state = "spickaxe" - digspeed = 30 - origin_tech = "materials=3" - desc = "This makes no metallurgic sense." +/obj/item/weapon/pickaxe/silver + name = "silver pickaxe" + icon_state = "spickaxe" + item_state = "spickaxe" + digspeed = 30 + origin_tech = "materials=3" + desc = "This makes no metallurgic sense." - drill - name = "mining drill" // Can dig sand as well! - icon_state = "handdrill" - item_state = "jackhammer" - digspeed = 30 - origin_tech = "materials=2;powerstorage=3;engineering=2" - desc = "Yours is the drill that will pierce through the rock walls." - drill_verb = "drilling" +/obj/item/weapon/pickaxe/drill + name = "mining drill" // Can dig sand as well! + icon_state = "handdrill" + item_state = "jackhammer" + digspeed = 30 + origin_tech = "materials=2;powerstorage=3;engineering=2" + desc = "Yours is the drill that will pierce through the rock walls." + drill_verb = "drilling" - jackhammer - name = "sonic jackhammer" - icon_state = "jackhammer" - item_state = "jackhammer" - digspeed = 20 //faster than drill, but cannot dig - origin_tech = "materials=3;powerstorage=2;engineering=2" - desc = "Cracks rocks with sonic blasts, perfect for killing cave lizards." - drill_verb = "hammering" +/obj/item/weapon/pickaxe/jackhammer + name = "sonic jackhammer" + icon_state = "jackhammer" + item_state = "jackhammer" + digspeed = 20 //faster than drill, but cannot dig + origin_tech = "materials=3;powerstorage=2;engineering=2" + desc = "Cracks rocks with sonic blasts, perfect for killing cave lizards." + drill_verb = "hammering" - gold - name = "golden pickaxe" - icon_state = "gpickaxe" - item_state = "gpickaxe" - digspeed = 20 - origin_tech = "materials=4" - desc = "This makes no metallurgic sense." +/obj/item/weapon/pickaxe/gold + name = "golden pickaxe" + icon_state = "gpickaxe" + item_state = "gpickaxe" + digspeed = 20 + origin_tech = "materials=4" + desc = "This makes no metallurgic sense." - plasmacutter - name = "plasma cutter" - icon_state = "plasmacutter" - item_state = "gun" - w_class = 3.0 //it is smaller than the pickaxe - damtype = "fire" - digspeed = 20 //Can slice though normal walls, all girders, or be used in reinforced wall deconstruction/ light thermite on fire - origin_tech = "materials=4;phorontech=3;engineering=3" - desc = "A rock cutter that uses bursts of hot plasma. You could use it to cut limbs off of xenos! Or, you know, mine stuff." - drill_verb = "cutting" +/obj/item/weapon/pickaxe/plasmacutter + name = "plasma cutter" + icon_state = "plasmacutter" + item_state = "gun" + w_class = 3.0 //it is smaller than the pickaxe + damtype = "fire" + digspeed = 20 //Can slice though normal walls, all girders, or be used in reinforced wall deconstruction/ light thermite on fire + origin_tech = "materials=4;phorontech=3;engineering=3" + desc = "A rock cutter that uses bursts of hot plasma. You could use it to cut limbs off of xenos! Or, you know, mine stuff." + drill_verb = "cutting" - diamond - name = "diamond pickaxe" - icon_state = "dpickaxe" - item_state = "dpickaxe" - digspeed = 10 - origin_tech = "materials=6;engineering=4" - desc = "A pickaxe with a diamond pick head, this is just like minecraft." +/obj/item/weapon/pickaxe/diamond + name = "diamond pickaxe" + icon_state = "dpickaxe" + item_state = "dpickaxe" + digspeed = 10 + origin_tech = "materials=6;engineering=4" + desc = "A pickaxe with a diamond pick head, this is just like minecraft." - diamonddrill //When people ask about the badass leader of the mining tools, they are talking about ME! - name = "diamond mining drill" - icon_state = "diamonddrill" - item_state = "jackhammer" - digspeed = 5 //Digs through walls, girders, and can dig up sand - origin_tech = "materials=6;powerstorage=4;engineering=5" - desc = "Yours is the drill that will pierce the heavens!" - drill_verb = "drilling" +/obj/item/weapon/pickaxe/diamonddrill //When people ask about the badass leader of the mining tools, they are talking about ME! + name = "diamond mining drill" + icon_state = "diamonddrill" + item_state = "jackhammer" + digspeed = 5 //Digs through walls, girders, and can dig up sand + origin_tech = "materials=6;powerstorage=4;engineering=5" + desc = "Yours is the drill that will pierce the heavens!" + drill_verb = "drilling" - borgdrill - name = "cyborg mining drill" - icon_state = "diamonddrill" - item_state = "jackhammer" - digspeed = 15 - desc = "" - drill_verb = "drilling" +/obj/item/weapon/pickaxe/borgdrill + name = "cyborg mining drill" + icon_state = "diamonddrill" + item_state = "jackhammer" + digspeed = 15 + desc = "" + drill_verb = "drilling" /*****************************Shovel********************************/ From a86f77d7adb2a54fb5618c84aac285d9c58f58a1 Mon Sep 17 00:00:00 2001 From: Amunak Date: Thu, 18 Dec 2014 04:59:33 +0100 Subject: [PATCH 32/35] Final research refactoring and formatting --- code/modules/research/designs.dm | 505 ++++++++++++------------------- 1 file changed, 200 insertions(+), 305 deletions(-) diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index 102aca404ce..ea44763bb91 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -905,65 +905,6 @@ datum/design/item/stock_part/subspace_transmitter materials = list("$glass" = 100, "$silver" = 10, "$uranium" = 15) build_path = /obj/item/weapon/stock_parts/subspace/transmitter -//////////////////////////////////////// -//////////////////Power///////////////// -//////////////////////////////////////// -datum/design/item/light_replacer - name = "Light Replacer" - desc = "A device to automatically replace lights. Refill with working lightbulbs." - id = "light_replacer" - req_tech = list("magnets" = 3, "materials" = 4) - materials = list("$metal" = 1500, "$silver" = 150, "$glass" = 3000) - build_path = /obj/item/device/lightreplacer - -// *** Power cells -datum/design/item/powercell - build_type = PROTOLATHE | MECHFAB - -datum/design/item/powercell/AssembleDesignName() - name = "Power cell model ([item_name])" - -datum/design/item/powercell/AssembleDesignDesc() - if(build_path) - var/obj/item/weapon/cell/C = build_path - desc = "Allows the construction of power cells that can hold [initial(C.maxcharge)] units of energy." - -datum/design/item/powercell/basic - name = "basic" - build_type = PROTOLATHE | AUTOLATHE | MECHFAB - id = "basic_cell" - req_tech = list("powerstorage" = 1) - materials = list("$metal" = 700, "$glass" = 50) - build_path = /obj/item/weapon/cell - category = "Misc" - -datum/design/item/powercell/high - name = "high-capacity" - build_type = PROTOLATHE | AUTOLATHE | MECHFAB - id = "high_cell" - req_tech = list("powerstorage" = 2) - materials = list("$metal" = 700, "$glass" = 60) - build_path = /obj/item/weapon/cell/high - category = "Misc" - -datum/design/item/powercell/super - name = "super-capacity" - id = "super_cell" - req_tech = list("powerstorage" = 3, "materials" = 2) - reliability_base = 75 - materials = list("$metal" = 700, "$glass" = 70) - build_path = /obj/item/weapon/cell/super - category = "Misc" - -datum/design/item/powercell/hyper - name = "hyper-capacity" - id = "hyper_cell" - req_tech = list("powerstorage" = 5, "materials" = 4) - reliability_base = 70 - materials = list("$metal" = 400, "$gold" = 150, "$silver" = 150, "$glass" = 70) - build_path = /obj/item/weapon/cell/hyper - category = "Misc" - //////////////////////////////////////// //////////Misc Circuit Boards/////////// //////////////////////////////////////// @@ -1030,9 +971,8 @@ datum/design/circuit/secure_airlock build_path = /obj/item/weapon/airlock_electronics/secure ///////////////////////////////////////// -////////////Power Stuff////////////////// +////////Power Stuff Circuitboards//////// ///////////////////////////////////////// - datum/design/circuit/pacman name = "PACMAN-type generator" id = "pacman" @@ -1073,6 +1013,65 @@ datum/design/circuit/smes_cell materials = list("$glass" = 2000, "sacid" = 20, "$gold" = 1000, "$silver" = 1000, "$diamond" = 500) build_path = /obj/item/weapon/circuitboard/smes +//////////////////////////////////////// +///////////////Power Items////////////// +//////////////////////////////////////// +datum/design/item/light_replacer + name = "Light Replacer" + desc = "A device to automatically replace lights. Refill with working lightbulbs." + id = "light_replacer" + req_tech = list("magnets" = 3, "materials" = 4) + materials = list("$metal" = 1500, "$silver" = 150, "$glass" = 3000) + build_path = /obj/item/device/lightreplacer + +// *** Power cells +datum/design/item/powercell + build_type = PROTOLATHE | MECHFAB + +datum/design/item/powercell/AssembleDesignName() + name = "Power cell model ([item_name])" + +datum/design/item/powercell/AssembleDesignDesc() + if(build_path) + var/obj/item/weapon/cell/C = build_path + desc = "Allows the construction of power cells that can hold [initial(C.maxcharge)] units of energy." + +datum/design/item/powercell/basic + name = "basic" + build_type = PROTOLATHE | AUTOLATHE | MECHFAB + id = "basic_cell" + req_tech = list("powerstorage" = 1) + materials = list("$metal" = 700, "$glass" = 50) + build_path = /obj/item/weapon/cell + category = "Misc" + +datum/design/item/powercell/high + name = "high-capacity" + build_type = PROTOLATHE | AUTOLATHE | MECHFAB + id = "high_cell" + req_tech = list("powerstorage" = 2) + materials = list("$metal" = 700, "$glass" = 60) + build_path = /obj/item/weapon/cell/high + category = "Misc" + +datum/design/item/powercell/super + name = "super-capacity" + id = "super_cell" + req_tech = list("powerstorage" = 3, "materials" = 2) + reliability_base = 75 + materials = list("$metal" = 700, "$glass" = 70) + build_path = /obj/item/weapon/cell/super + category = "Misc" + +datum/design/item/powercell/hyper + name = "hyper-capacity" + id = "hyper_cell" + req_tech = list("powerstorage" = 5, "materials" = 4) + reliability_base = 70 + materials = list("$metal" = 400, "$gold" = 150, "$silver" = 150, "$glass" = 70) + build_path = /obj/item/weapon/cell/hyper + category = "Misc" + ///////////////////////////////////////// ////////////Medical Tools//////////////// ///////////////////////////////////////// @@ -1152,39 +1151,31 @@ datum/design/item/medical/nanopaste materials = list("$metal" = 7000, "$glass" = 7000) build_path = /obj/item/stack/nanopaste -datum/design/item/chameleon - name = "Holographic equipment kit" - desc = "A kit of dangerous, high-tech equipment with changeable looks." - id = "chameleon" - req_tech = list("syndicate" = 2) - materials = list("$metal" = 500) - build_path = /obj/item/weapon/storage/box/syndie_kit/chameleon - -datum/design/scalpel_laser1 +datum/design/item/scalpel_laser1 name = "Basic Laser Scalpel" - desc = "A scalpel augmented with a directed laser, for more precise cutting without blood entering the field. This one looks basic and could be improved." + desc = "A scalpel augmented with a directed laser, for more precise cutting without blood entering the field. This one looks basic and could be improved." id = "scalpel_laser1" req_tech = list("biotech" = 2, "materials" = 2, "magnets" = 2) materials = list("$metal" = 12500, "$glass" = 7500) build_path = /obj/item/weapon/scalpel/laser1 -datum/design/scalpel_laser2 +datum/design/item/scalpel_laser2 name = "Improved Laser Scalpel" - desc = "A scalpel augmented with a directed laser, for more precise cutting without blood entering the field. This one looks somewhat advanced." + desc = "A scalpel augmented with a directed laser, for more precise cutting without blood entering the field. This one looks somewhat advanced." id = "scalpel_laser2" req_tech = list("biotech" = 3, "materials" = 4, "magnets" = 4) materials = list("$metal" = 12500, "$glass" = 7500, "$silver" = 2500) build_path = /obj/item/weapon/scalpel/laser2 -datum/design/scalpel_laser3 +datum/design/item/scalpel_laser3 name = "Advanced Laser Scalpel" - desc = "A scalpel augmented with a directed laser, for more precise cutting without blood entering the field. This one looks to be the pinnacle of precision energy cutlery!" + desc = "A scalpel augmented with a directed laser, for more precise cutting without blood entering the field. This one looks to be the pinnacle of precision energy cutlery!" id = "scalpel_laser3" req_tech = list("biotech" = 4, "materials" = 6, "magnets" = 5) materials = list("$metal" = 12500, "$glass" = 7500, "$silver" = 2000, "$gold" = 1500) build_path = /obj/item/weapon/scalpel/laser3 -datum/design/scalpel_manager +datum/design/item/scalpel_manager name = "Incision Management System" desc = "A true extension of the surgeon's body, this marvel instantly and completely prepares an incision allowing for the immediate commencement of therapeutic steps." id = "scalpel_manager" @@ -1261,7 +1252,6 @@ datum/design/item/weapon/AssembleDesignDesc() datum/design/item/weapon/nuclear_gun id = "nuclear_gun" req_tech = list("combat" = 3, "materials" = 5, "powerstorage" = 3) - build_type = PROTOLATHE materials = list("$metal" = 5000, "$glass" = 1000, "$uranium" = 500) reliability_base = 76 build_path = /obj/item/weapon/gun/energy/gun/nuclear @@ -1270,7 +1260,6 @@ datum/design/item/weapon/nuclear_gun datum/design/item/weapon/stunrevolver id = "stunrevolver" req_tech = list("combat" = 3, "materials" = 3, "powerstorage" = 2) - build_type = PROTOLATHE materials = list("$metal" = 4000) build_path = /obj/item/weapon/gun/energy/stunrevolver locked = 1 @@ -1279,7 +1268,6 @@ datum/design/item/weapon/lasercannon desc = "The lasing medium of this prototype is enclosed in a tube lined with uranium-235 and subjected to high neutron flux in a nuclear reactor core." id = "lasercannon" req_tech = list("combat" = 4, "materials" = 3, "powerstorage" = 3) - build_type = PROTOLATHE materials = list("$metal" = 10000, "$glass" = 1000, "$diamond" = 2000) build_path = /obj/item/weapon/gun/energy/lasercannon locked = 1 @@ -1287,7 +1275,6 @@ datum/design/item/weapon/lasercannon datum/design/item/weapon/decloner id = "decloner" req_tech = list("combat" = 8, "materials" = 7, "biotech" = 5, "powerstorage" = 6) - build_type = PROTOLATHE materials = list("$gold" = 5000,"$uranium" = 10000, "mutagen" = 40) build_path = /obj/item/weapon/gun/energy/decloner locked = 1 @@ -1296,7 +1283,6 @@ datum/design/item/weapon/chemsprayer desc = "An advanced chem spraying device." id = "chemsprayer" req_tech = list("materials" = 3, "engineering" = 3, "biotech" = 2) - build_type = PROTOLATHE materials = list("$metal" = 5000, "$glass" = 1000) reliability_base = 100 build_path = /obj/item/weapon/reagent_containers/spray/chemsprayer @@ -1304,7 +1290,6 @@ datum/design/item/weapon/chemsprayer datum/design/item/weapon/rapidsyringe id = "rapidsyringe" req_tech = list("combat" = 3, "materials" = 3, "engineering" = 3, "biotech" = 2) - build_type = PROTOLATHE materials = list("$metal" = 5000, "$glass" = 1000) build_path = /obj/item/weapon/gun/syringe/rapidsyringe /* @@ -1313,7 +1298,6 @@ datum/design/item/weapon/largecrossbow desc = "A weapon favoured by syndicate infiltration teams." id = "largecrossbow" req_tech = list("combat" = 4, "materials" = 5, "engineering" = 3, "biotech" = 4, "syndicate" = 3) - build_type = PROTOLATHE materials = list("$metal" = 5000, "$glass" = 1000, "$uranium" = 1000, "$silver" = 1000) build_path = /obj/item/weapon/gun/energy/crossbow/largecrossbow" */ @@ -1321,7 +1305,6 @@ datum/design/item/weapon/temp_gun desc = "A gun that shoots high-powered glass-encased energy temperature bullets." id = "temp_gun" req_tech = list("combat" = 3, "materials" = 4, "powerstorage" = 3, "magnets" = 2) - build_type = PROTOLATHE materials = list("$metal" = 5000, "$glass" = 500, "$silver" = 3000) build_path = /obj/item/weapon/gun/energy/temperature locked = 1 @@ -1329,14 +1312,12 @@ datum/design/item/weapon/temp_gun datum/design/item/weapon/flora_gun id = "flora_gun" req_tech = list("materials" = 2, "biotech" = 3, "powerstorage" = 3) - build_type = PROTOLATHE materials = list("$metal" = 2000, "$glass" = 500, "$uranium" = 500) build_path = /obj/item/weapon/gun/energy/floragun datum/design/item/weapon/large_grenade id = "large_Grenade" req_tech = list("combat" = 3, "materials" = 2) - build_type = PROTOLATHE materials = list("$metal" = 3000) reliability_base = 79 build_path = /obj/item/weapon/grenade/chem_grenade/large @@ -1344,7 +1325,6 @@ datum/design/item/weapon/large_grenade datum/design/item/weapon/smg id = "smg" req_tech = list("combat" = 4, "materials" = 3) - build_type = PROTOLATHE materials = list("$metal" = 8000, "$silver" = 2000, "$diamond" = 1000) build_path = /obj/item/weapon/gun/projectile/automatic locked = 1 @@ -1352,7 +1332,6 @@ datum/design/item/weapon/smg datum/design/item/weapon/ammo_9mm id = "ammo_9mm" req_tech = list("combat" = 4, "materials" = 3) - build_type = PROTOLATHE materials = list("$metal" = 3750, "$silver" = 100) build_path = /obj/item/ammo_magazine/c9mm @@ -1360,102 +1339,77 @@ datum/design/item/weapon/stunshell desc = "A stunning shell for a shotgun." id = "stunshell" req_tech = list("combat" = 3, "materials" = 3) - build_type = PROTOLATHE materials = list("$metal" = 4000) build_path = /obj/item/ammo_casing/shotgun/stunshell datum/design/item/weapon/phoronpistol id = "ppistol" req_tech = list("combat" = 5, "phorontech" = 4) - build_type = PROTOLATHE materials = list("$metal" = 5000, "$glass" = 1000, "$phoron" = 3000) build_path = /obj/item/weapon/gun/energy/toxgun ///////////////////////////////////////// /////////////////Mining////////////////// ///////////////////////////////////////// -datum/design/jackhammer - name = "Sonic Jackhammer" - desc = "Cracks rocks with sonic blasts, perfect for killing cave lizards." +//Subtype of item/weapon/, because we get the nice desc update +datum/design/item/weapon/mining/AssembleDesignName() + ..() + name = "Mining equipment design ([item_name])" + +datum/design/item/weapon/mining/jackhammer id = "jackhammer" req_tech = list("materials" = 3, "powerstorage" = 2, "engineering" = 2) - build_type = PROTOLATHE materials = list("$metal" = 2000, "$glass" = 500, "$silver" = 500) build_path = /obj/item/weapon/pickaxe/jackhammer -datum/design/drill - name = "Mining Drill" - desc = "Yours is the drill that will pierce through the rock walls." +datum/design/item/weapon/mining/drill id = "drill" req_tech = list("materials" = 2, "powerstorage" = 3, "engineering" = 2) - build_type = PROTOLATHE materials = list("$metal" = 6000, "$glass" = 1000) //expensive, but no need for miners. build_path = /obj/item/weapon/pickaxe/drill -datum/design/plasmacutter - name = "Plasma Cutter" - desc = "You could use it to cut limbs off of xenos! Or, you know, mine stuff." +datum/design/item/weapon/mining/plasmacutter id = "plasmacutter" req_tech = list("materials" = 4, "phorontech" = 3, "engineering" = 3) - build_type = PROTOLATHE materials = list("$metal" = 1500, "$glass" = 500, "$gold" = 500, "$phoron" = 500) reliability_base = 79 build_path = /obj/item/weapon/pickaxe/plasmacutter -datum/design/pick_diamond - name = "Diamond Pickaxe" - desc = "A pickaxe with a diamond pick head, this is just like minecraft." +datum/design/item/weapon/mining/pick_diamond id = "pick_diamond" req_tech = list("materials" = 6) - build_type = PROTOLATHE materials = list("$diamond" = 3000) build_path = /obj/item/weapon/pickaxe/diamond -datum/design/drill_diamond - name = "Diamond Mining Drill" - desc = "Yours is the drill that will pierce the heavens!" +datum/design/item/weapon/mining/drill_diamond id = "drill_diamond" req_tech = list("materials" = 6, "powerstorage" = 4, "engineering" = 4) - build_type = PROTOLATHE materials = list("$metal" = 3000, "$glass" = 1000, "$diamond" = 3750) //Yes, a whole diamond is needed. reliability_base = 79 build_path = /obj/item/weapon/pickaxe/diamonddrill -datum/design/mesons - name = "Optical Meson Scanners" - desc = "Used for seeing walls, floors, and stuff through anything." - id = "mesons" - req_tech = list("magnets" = 2, "engineering" = 2) - build_type = PROTOLATHE - materials = list("$metal" = 50, "$glass" = 50) - build_path = /obj/item/clothing/glasses/meson - ///////////////////////////////////////// //////////////Blue Space///////////////// ///////////////////////////////////////// - -datum/design/beacon - name = "Tracking Beacon" - desc = "A blue space tracking beacon." +datum/design/item/beacon + name = "Bluespace tracking beacon design" id = "beacon" req_tech = list("bluespace" = 1) - build_type = PROTOLATHE materials = list ("$metal" = 20, "$glass" = 10) build_path = /obj/item/device/radio/beacon -datum/design/bag_holding - name = "Bag of Holding" - desc = "A backpack that opens into a localized pocket of Blue Space." +datum/design/item/bag_holding + name = "'Bag of Holding', an infinite capacity bag prototype" + desc = "Using localized pockets of bluespace this bag prototype offers incredible storage capacity with the contents weighting nothing. It's a shame the bag itself is pretty heavy." id = "bag_holding" req_tech = list("bluespace" = 4, "materials" = 6) - build_type = PROTOLATHE materials = list("$gold" = 3000, "$diamond" = 1500, "$uranium" = 250) reliability_base = 80 build_path = /obj/item/weapon/storage/backpack/holding /* datum/design/bluespace_crystal - name = "Artificial Bluespace Crystal" + name = "Artificial bluespace crystal" desc = "A small blue crystal with mystical properties." id = "bluespace_crystal" req_tech = list("bluespace" = 5, "materials" = 7) @@ -1468,202 +1422,143 @@ datum/design/bluespace_crystal ///////////////////////////////////////// /////////////////HUDs//////////////////// ///////////////////////////////////////// +datum/design/item/hud + materials = list("$metal" = 50, "$glass" = 50) -datum/design/health_hud - name = "Health Scanner HUD" - desc = "A heads-up display that scans the humans in view and provides accurate data about their health status." +datum/design/item/hud/AssembleDesignName() + ..() + name = "HUD glasses prototype ([item_name])" + +datum/design/item/hud/AssembleDesignDesc() + desc = "Allows for the construction of \a [item_name] HUD glasses." + +datum/design/item/hud/health + name = "health scanner" id = "health_hud" req_tech = list("biotech" = 2, "magnets" = 3) - build_type = PROTOLATHE - materials = list("$metal" = 50, "$glass" = 50) build_path = /obj/item/clothing/glasses/hud/health -datum/design/security_hud - name = "Security HUD" - desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status." +datum/design/item/hud/security + name = "security records" id = "security_hud" req_tech = list("magnets" = 3, "combat" = 2) - build_type = PROTOLATHE - materials = list("$metal" = 50, "$glass" = 50) build_path = /obj/item/clothing/glasses/hud/security locked = 1 ///////////////////////////////////////// -//////////////Borg Upgrades////////////// +////////////////PDA Stuff//////////////// ///////////////////////////////////////// -datum/design/borg_syndicate_module - name = "Borg Illegal Weapons Upgrade" - desc = "Allows for the construction of illegal upgrades for cyborgs" +datum/design/item/pda + name = "PDA design" + desc = "Cheaper than whiny non-digital assistants." + id = "pda" + req_tech = list("engineering" = 2, "powerstorage" = 3) + materials = list("$metal" = 50, "$glass" = 50) + build_path = /obj/item/device/pda + +// *** Cartridges +datum/design/item/pda_cartridge + req_tech = list("engineering" = 2, "powerstorage" = 3) + materials = list("$metal" = 50, "$glass" = 50) + +datum/design/item/pda_cartridge/AssembleDesignName() + ..() + name = "PDA accessory ([item_name])" + +datum/design/item/pda_cartridge/cart_basic + id = "cart_basic" + build_path = /obj/item/weapon/cartridge +datum/design/item/pda_cartridge/engineering + id = "cart_engineering" + build_path = /obj/item/weapon/cartridge/engineering +datum/design/item/pda_cartridge/atmos + id = "cart_atmos" + build_path = /obj/item/weapon/cartridge/atmos +datum/design/item/pda_cartridge/medical + id = "cart_medical" + build_path = /obj/item/weapon/cartridge/medical +datum/design/item/pda_cartridge/chemistry + id = "cart_chemistry" + build_path = /obj/item/weapon/cartridge/chemistry +datum/design/item/pda_cartridge/security + id = "cart_security" + build_path = /obj/item/weapon/cartridge/security + locked = 1 +datum/design/item/pda_cartridge/janitor + id = "cart_janitor" + build_path = /obj/item/weapon/cartridge/janitor +/* +datum/design/item/pda_cartridge/clown + id = "cart_clown" + build_path = /obj/item/weapon/cartridge/clown" +datum/design/item/pda_cartridge/mime + id = "cart_mime" + build_path = /obj/item/weapon/cartridge/mime" +*/ +datum/design/item/pda_cartridge/science + id = "cart_science" + build_path = /obj/item/weapon/cartridge/signal/science +datum/design/item/pda_cartridge/quartermaster + id = "cart_quartermaster" + build_path = /obj/item/weapon/cartridge/quartermaster + locked = 1 +datum/design/item/pda_cartridge/hop + id = "cart_hop" + build_path = /obj/item/weapon/cartridge/hop + locked = 1 +datum/design/item/pda_cartridge/hos + id = "cart_hos" + build_path = /obj/item/weapon/cartridge/hos + locked = 1 +datum/design/item/pda_cartridge/ce + id = "cart_ce" + build_path = /obj/item/weapon/cartridge/ce + locked = 1 +datum/design/item/pda_cartridge/cmo + id = "cart_cmo" + build_path = /obj/item/weapon/cartridge/cmo + locked = 1 +datum/design/item/pda_cartridge/rd + id = "cart_rd" + build_path = /obj/item/weapon/cartridge/rd + locked = 1 +datum/design/item/pda_cartridge/captain + id = "cart_captain" + build_path = /obj/item/weapon/cartridge/captain + locked = 1 + +///////////////////////////////////////// +///////////////Misc Stuff//////////////// +///////////////////////////////////////// +datum/design/item/borg_syndicate_module + name = "Cyborg lethal weapons upgrade" + desc = "Allows for the construction of lethal upgrades for cyborgs." id = "borg_syndicate_module" build_type = MECHFAB req_tech = list("combat" = 4, "syndicate" = 3) build_path = /obj/item/borg/upgrade/syndicate category = "Cyborg Upgrade Modules" -///////////////////////////////////////// -/////////////PDA and Radio stuff///////// -///////////////////////////////////////// -datum/design/binaryencrypt - name = "binary encryption key" - desc = "An encyption key for a radio headset. Contains cypherkeys." +datum/design/item/mesons + name = "Optical meson scanners design" + desc = "Using the meson-scanning technology those glasses allow you to see through walls, floor or anything else." + id = "mesons" + req_tech = list("magnets" = 2, "engineering" = 2) + materials = list("$metal" = 50, "$glass" = 50) + build_path = /obj/item/clothing/glasses/meson + +datum/design/item/binaryencrypt + name = "Binary encryption key" + desc = "Allows for deciphering the binary channel on-the-fly." id = "binaryencrypt" req_tech = list("syndicate" = 2) - build_type = PROTOLATHE materials = list("$metal" = 300, "$glass" = 300) build_path = /obj/item/device/encryptionkey/binary -datum/design/pda - name = "PDA" - desc = "A portable microcomputer by Thinktronic Systems, LTD. Functionality determined by a preprogrammed ROM cartridge." - id = "pda" - req_tech = list("engineering" = 2, "powerstorage" = 3) - build_type = PROTOLATHE - materials = list("$metal" = 50, "$glass" = 50) - build_path = /obj/item/device/pda -datum/design/cart_basic - name = "Generic Cartridge" - desc = "A data cartridge for portable microcomputers." - id = "cart_basic" - req_tech = list("engineering" = 2, "powerstorage" = 3) - build_type = PROTOLATHE - materials = list("$metal" = 50, "$glass" = 50) - build_path = /obj/item/weapon/cartridge -datum/design/cart_engineering - name = "Power-ON Cartridge" - desc = "A data cartridge for portable microcomputers." - id = "cart_engineering" - req_tech = list("engineering" = 2, "powerstorage" = 3) - build_type = PROTOLATHE - materials = list("$metal" = 50, "$glass" = 50) - build_path = /obj/item/weapon/cartridge/engineering -datum/design/cart_atmos - name = "BreatheDeep Cartridge" - desc = "A data cartridge for portable microcomputers." - id = "cart_atmos" - req_tech = list("engineering" = 2, "powerstorage" = 3) - build_type = PROTOLATHE - materials = list("$metal" = 50, "$glass" = 50) - build_path = /obj/item/weapon/cartridge/atmos -datum/design/cart_medical - name = "Med-U Cartridge" - desc = "A data cartridge for portable microcomputers." - id = "cart_medical" - req_tech = list("engineering" = 2, "powerstorage" = 3) - build_type = PROTOLATHE - materials = list("$metal" = 50, "$glass" = 50) - build_path = /obj/item/weapon/cartridge/medical -datum/design/cart_chemistry - name = "ChemWhiz Cartridge" - desc = "A data cartridge for portable microcomputers." - id = "cart_chemistry" - req_tech = list("engineering" = 2, "powerstorage" = 3) - build_type = PROTOLATHE - materials = list("$metal" = 50, "$glass" = 50) - build_path = /obj/item/weapon/cartridge/chemistry -datum/design/cart_security - name = "R.O.B.U.S.T. Cartridge" - desc = "A data cartridge for portable microcomputers." - id = "cart_security" - req_tech = list("engineering" = 2, "powerstorage" = 3) - build_type = PROTOLATHE - materials = list("$metal" = 50, "$glass" = 50) - build_path = /obj/item/weapon/cartridge/security - locked = 1 -datum/design/cart_janitor - name = "CustodiPRO Cartridge" - desc = "A data cartridge for portable microcomputers." - id = "cart_janitor" - req_tech = list("engineering" = 2, "powerstorage" = 3) - build_type = PROTOLATHE - materials = list("$metal" = 50, "$glass" = 50) - build_path = /obj/item/weapon/cartridge/janitor -/* -datum/design/cart_clown - name = "Honkworks 5.0 Cartridge" - desc = "A data cartridge for portable microcomputers." - id = "cart_clown" - req_tech = list("engineering" = 2, "powerstorage" = 3) - build_type = PROTOLATHE - materials = list("$metal" = 50, "$glass" = 50) - build_path = /obj/item/weapon/cartridge/clown" -datum/design/cart_mime - name = "Gestur-O 1000 Cartridge" - desc = "A data cartridge for portable microcomputers." - id = "cart_mime" - req_tech = list("engineering" = 2, "powerstorage" = 3) - build_type = PROTOLATHE - materials = list("$metal" = 50, "$glass" = 50) - build_path = /obj/item/weapon/cartridge/mime" -*/ - -datum/design/cart_science - name = "Signal Ace 2 Cartridge" - desc = "A data cartridge for portable microcomputers." - id = "cart_science" - req_tech = list("engineering" = 2, "powerstorage" = 3) - build_type = PROTOLATHE - materials = list("$metal" = 50, "$glass" = 50) - build_path = /obj/item/weapon/cartridge/signal/science -datum/design/cart_quartermaster - name = "Space Parts & Space Vendors Cartridge" - desc = "A data cartridge for portable microcomputers." - id = "cart_quartermaster" - req_tech = list("engineering" = 2, "powerstorage" = 3) - build_type = PROTOLATHE - materials = list("$metal" = 50, "$glass" = 50) - build_path = /obj/item/weapon/cartridge/quartermaster - locked = 1 -datum/design/cart_hop - name = "Human Resources 9001 Cartridge" - desc = "A data cartridge for portable microcomputers." - id = "cart_hop" - req_tech = list("engineering" = 2, "powerstorage" = 3) - build_type = PROTOLATHE - materials = list("$metal" = 50, "$glass" = 50) - build_path = /obj/item/weapon/cartridge/hop - locked = 1 -datum/design/cart_hos - name = "R.O.B.U.S.T. DELUXE Cartridge" - desc = "A data cartridge for portable microcomputers." - id = "cart_hos" - req_tech = list("engineering" = 2, "powerstorage" = 3) - build_type = PROTOLATHE - materials = list("$metal" = 50, "$glass" = 50) - build_path = /obj/item/weapon/cartridge/hos - locked = 1 -datum/design/cart_ce - name = "Power-On DELUXE Cartridge" - desc = "A data cartridge for portable microcomputers." - id = "cart_ce" - req_tech = list("engineering" = 2, "powerstorage" = 3) - build_type = PROTOLATHE - materials = list("$metal" = 50, "$glass" = 50) - build_path = /obj/item/weapon/cartridge/ce - locked = 1 -datum/design/cart_cmo - name = "Med-U DELUXE Cartridge" - desc = "A data cartridge for portable microcomputers." - id = "cart_cmo" - req_tech = list("engineering" = 2, "powerstorage" = 3) - build_type = PROTOLATHE - materials = list("$metal" = 50, "$glass" = 50) - build_path = /obj/item/weapon/cartridge/cmo - locked = 1 -datum/design/cart_rd - name = "Signal Ace DELUXE Cartridge" - desc = "A data cartridge for portable microcomputers." - id = "cart_rd" - req_tech = list("engineering" = 2, "powerstorage" = 3) - build_type = PROTOLATHE - materials = list("$metal" = 50, "$glass" = 50) - build_path = /obj/item/weapon/cartridge/rd - locked = 1 -datum/design/cart_captain - name = "Value-PAK Cartridge" - desc = "A data cartridge for portable microcomputers." - id = "cart_captain" - req_tech = list("engineering" = 2, "powerstorage" = 3) - build_type = PROTOLATHE - materials = list("$metal" = 50, "$glass" = 50) - build_path = /obj/item/weapon/cartridge/captain - locked = 1 +datum/design/item/chameleon + name = "Holographic equipment kit" + desc = "A kit of dangerous, high-tech equipment with changeable looks." + id = "chameleon" + req_tech = list("syndicate" = 2) + materials = list("$metal" = 500) + build_path = /obj/item/weapon/storage/box/syndie_kit/chameleon From 16c548b03f1b15029ccb1635d9e4a3971dfe84f8 Mon Sep 17 00:00:00 2001 From: Amunak Date: Thu, 18 Dec 2014 05:27:37 +0100 Subject: [PATCH 33/35] Fixes explosives-on-webbing-prevention not working --- code/game/objects/items/weapons/explosives.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index cb3fb36374d..f5f42080731 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -38,7 +38,7 @@ /obj/item/weapon/plastique/afterattack(atom/movable/target, mob/user, flag) if (!flag) return - if (ismob(target) || istype(target, /turf/unsimulated) || istype(target, /turf/simulated/shuttle) || istype(target, /obj/item/weapon/storage/) || istype(target, /obj/item/clothing/tie/storage/)) + if (ismob(target) || istype(target, /turf/unsimulated) || istype(target, /turf/simulated/shuttle) || istype(target, /obj/item/weapon/storage/) || istype(target, /obj/item/clothing/tie/storage/) || istype(target, /obj/item/clothing/under)) return user << "Planting explosives..." From c53d14d80cfc64458f35c1396fae7c35e3ca993a Mon Sep 17 00:00:00 2001 From: Amunak Date: Thu, 18 Dec 2014 05:28:41 +0100 Subject: [PATCH 34/35] Weapon type design datums will now get proper description. Also fixes two names I forgot to fix before. --- code/game/mecha/equipment/weapons/weapons.dm | 2 +- code/modules/research/designs.dm | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index fa4bc3858ce..bcb907a0409 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -71,7 +71,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/energy/riggedlaser equip_cooldown = 30 - name = "jury-rigged welder-Laser" + name = "jury-rigged welder-laser" desc = "While not regulation, this inefficient weapon can be attached to working exo-suits in desperate, or malicious, times." icon_state = "mecha_laser" energy_drain = 80 diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index ea44763bb91..0210b9b79b1 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -753,6 +753,7 @@ datum/design/item/stock_part build_type = PROTOLATHE datum/design/item/stock_part/AssembleDesignName() + ..() name = "Component design ([item_name])" datum/design/item/stock_part/AssembleDesignDesc() @@ -1017,7 +1018,7 @@ datum/design/circuit/smes_cell ///////////////Power Items////////////// //////////////////////////////////////// datum/design/item/light_replacer - name = "Light Replacer" + name = "Light replacer" desc = "A device to automatically replace lights. Refill with working lightbulbs." id = "light_replacer" req_tech = list("magnets" = 3, "materials" = 4) @@ -1246,7 +1247,7 @@ datum/design/item/weapon/AssembleDesignDesc() if(!desc) if(build_path) var/obj/item/I = build_path - desc = I.desc + desc = initial(I.desc) ..() datum/design/item/weapon/nuclear_gun From 94b8784b76d6b3c4a6e35ef60854aec07901220e Mon Sep 17 00:00:00 2001 From: Amunak Date: Thu, 18 Dec 2014 23:15:22 +0100 Subject: [PATCH 35/35] Fixed capitalization of 'engine control console'. --- .../Chinsky/overmap/ships/computers/engine_control.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/WorkInProgress/Chinsky/overmap/ships/computers/engine_control.dm b/code/WorkInProgress/Chinsky/overmap/ships/computers/engine_control.dm index 2a27a63019c..87873775b08 100644 --- a/code/WorkInProgress/Chinsky/overmap/ships/computers/engine_control.dm +++ b/code/WorkInProgress/Chinsky/overmap/ships/computers/engine_control.dm @@ -1,7 +1,7 @@ //Engine control and monitoring console /obj/machinery/computer/engines - name = "Engine Control Console" + name = "engine control console" icon_state = "id" var/state = "status" var/list/engines = list()