Just deleted about 400 bot accounts and a bunch of spam. To mitigate this in the future, we've enabled reCaptcha on signup. Let me know if someone got caught in the crossfire.

Commit b2b5c816 authored by ComicIronic's avatar ComicIronic Committed by clusterfack
Browse files

Moved research names over to defines. (#11424)

* Moved research names over to defines.

Also fixed 4 (four) instances of the incorrect research name being used.

* Changed research names to avoid collisions.
parent b8bdfe21
......@@ -4,7 +4,7 @@
/obj/item/weapon/circuitboard/rust_core_control
name = "Circuit board (R-UST Mk. 7 core controller)"
build_path = "/obj/machinery/computer/rust_core_control"
origin_tech = "programming=4;engineering=4"
origin_tech = Tc_PROGRAMMING + "=4;" + Tc_ENGINEERING + "=4"
//////////////////////////////////////
// RUST Core Monitor computer
......@@ -12,7 +12,7 @@
/obj/item/weapon/circuitboard/rust_core_monitor
name = "Circuit board (R-UST Mk. 7 core monitor)"
build_path = "/obj/machinery/computer/rust_core_monitor"
origin_tech = "programming=4;engineering=4"
origin_tech = Tc_PROGRAMMING + "=4;" + Tc_ENGINEERING + "=4"
//////////////////////////////////////
// RUST Fuel Control computer
......@@ -20,7 +20,7 @@
/obj/item/weapon/circuitboard/rust_fuel_control
name = "Circuit board (R-UST Mk. 7 fuel controller)"
build_path = "/obj/machinery/computer/rust_fuel_control"
origin_tech = "programming=4;engineering=4"
origin_tech = Tc_PROGRAMMING + "=4;" + Tc_ENGINEERING + "=4"
//////////////////////////////////////
// RUST Fuel Port board
......@@ -28,7 +28,7 @@
/obj/item/weapon/module/rust_fuel_port
name = "Internal circuitry (R-UST Mk. 7 fuel port)"
icon_state = "card_mod"
origin_tech = "engineering=4;materials=5"
origin_tech = Tc_ENGINEERING + "=4;" + Tc_MATERIALS + "=5"
//////////////////////////////////////
// RUST Fuel Compressor board
......@@ -36,7 +36,7 @@
/obj/item/weapon/module/rust_fuel_compressor
name = "Internal circuitry (R-UST Mk. 7 fuel compressor)"
icon_state = "card_mod"
origin_tech = "materials=6;plasmatech=4"
origin_tech = Tc_MATERIALS + "=6;" + Tc_PLASMATECH + "=4"
//////////////////////////////////////
// RUST Tokamak Core board
......@@ -45,7 +45,7 @@
name = "Internal circuitry (R-UST Mk. 7 tokamak core)"
build_path = "/obj/machinery/power/rust_core"
board_type = MACHINE
origin_tech = "bluespace=3;plasmatech=4;magnets=5;powerstorage=6"
origin_tech = Tc_BLUESPACE + "=3;" + Tc_PLASMATECH + "=4;" + Tc_MAGNETS + "=5;" + Tc_POWERSTORAGE + "=6"
frame_desc = "Requires 2 Pico Manipulators, 1 Ultra Micro-Laser, 5 Pieces of Cable, 1 Subspace Crystal and 1 Console Screen."
req_components = list(
"/obj/item/weapon/stock_parts/manipulator/nano/pico" = 2,
......@@ -61,7 +61,7 @@
name = "Internal circuitry (R-UST Mk. 7 fuel injector)"
build_path = "/obj/machinery/power/rust_fuel_injector"
board_type = MACHINE
origin_tech = "powerstorage=3;engineering=4;plasmatech=4;materials=6"
origin_tech = Tc_POWERSTORAGE + "=3;" + Tc_ENGINEERING + "=4;" + Tc_PLASMATECH + "=4;" + Tc_MATERIALS + "=6"
frame_desc = "Requires 2 Pico Manipulators, 1 Phasic Scanning Module, 1 Super Matter Bin, 1 Console Screen and 5 Pieces of Cable."
req_components = list(
"/obj/item/weapon/stock_parts/manipulator/nano/pico" = 2,
......@@ -74,4 +74,4 @@
/obj/item/weapon/circuitboard/rust_gyrotron_control
name = "Circuit board (R-UST Mk. 7 gyrotron controller)"
build_path = "/obj/machinery/computer/rust_gyrotron_controller"
origin_tech = "programming=4;engineering=4"
origin_tech = Tc_PROGRAMMING + "=4;" + Tc_ENGINEERING + "=4"
......@@ -6,7 +6,7 @@
name = "Circuit board (Experimental hull shield generator)"
board_type = MACHINE
build_path = "/obj/machinery/shield_gen/external"
origin_tech = "bluespace=4;plasmatech=3"
origin_tech = Tc_BLUESPACE + "=4;" + Tc_PLASMATECH + "=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(
"/obj/item/weapon/stock_parts/manipulator/nano/pico" = 2,
......@@ -23,7 +23,7 @@
name = "Circuit board (Experimental shield generator)"
board_type = MACHINE
build_path = "/obj/machinery/shield_gen/external"
origin_tech = "bluespace=4;plasmatech=3"
origin_tech = Tc_BLUESPACE + "=4;" + Tc_PLASMATECH + "=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(
"/obj/item/weapon/stock_parts/manipulator/nano/pico" = 2,
......@@ -40,7 +40,7 @@
name = "Circuit board (Experimental shield capacitor)"
board_type = MACHINE
build_path = "/obj/machinery/shield_capacitor"
origin_tech = "magnets=3;powerstorage=4"
origin_tech = Tc_MAGNETS + "=3;" + Tc_POWERSTORAGE + "=4"
frame_desc = "Requires 2 Pico Manipulators, 1 Subspace Filter, 5 Pieces of cable, 1 Subspace Treatment disk, 1 Subspace Analyzer and 1 Console Screen."
req_components = list(
"/obj/item/weapon/stock_parts/manipulator/nano/pico" = 2,
......
......@@ -7,7 +7,7 @@ var/global/list/atmos_controllers = list()
name = "Circuit Design (Central Atmosherics Computer)"
desc = "Allows for the construction of circuit boards used to build an Atmos Control Console."
id = "atmoscontrol"
req_tech = list("programming" = 4)
req_tech = list(Tc_PROGRAMMING = 4)
build_type = IMPRINTER
materials = list(MAT_GLASS = 2000, SACID = 20)
category = "Console Boards"
......
......@@ -10,7 +10,7 @@
flags = FPRINT
siemens_coefficient = 1
w_class = W_CLASS_TINY
origin_tech = "materials=1;biotech=1"
origin_tech = Tc_MATERIALS + "=1;" + Tc_BIOTECH + "=1"
var/list/datum/autopsy_data_scanner/wdata = list()
var/list/datum/autopsy_data_scanner/chemtraces = list()
var/target_name = null
......
......@@ -7,7 +7,7 @@
icon_state = "core"
flags = FPRINT
siemens_coefficient = 1
origin_tech = "materials=4;plasmatech=3;bluespace=2;engineering=3"
origin_tech = Tc_MATERIALS + "=4;" + Tc_PLASMATECH + "=3;" + Tc_BLUESPACE + "=2;" + Tc_ENGINEERING + "=3"
/obj/item/pod_parts/pod_frame
name = "Space Pod Frame"
......
#define Tc_PROGRAMMING "programming"
#define Tc_ENGINEERING "engineering"
#define Tc_MATERIALS "materials"
#define Tc_PLASMATECH "plasmatech"
#define Tc_MAGNETS "magnets"
#define Tc_SYNDICATE "syndicate"
#define Tc_BLUESPACE "bluespace"
#define Tc_COMBAT "combat"
#define Tc_BIOTECH "biotech"
#define Tc_POWERSTORAGE "powerstorage"
......@@ -439,7 +439,7 @@ The access requirements on the Asteroid Shuttles' consoles have now been revoked
message = "Contact has been lost with a combat drone wing operating out of the NMV Icarus. If any are sighted in the area, approach with caution."
else
message = "Unidentified hackers have targeted a combat drone wing deployed from the NMV Icarus. If any are sighted in the area, approach with caution."
..()
/datum/command_alert/drones_recovered
......
......@@ -34,7 +34,7 @@
throw_speed = 4
throw_range = 20
m_amt = 100
origin_tech = "magnets=2;syndicate=3"*/
origin_tech = Tc_MAGNETS + "=2;" + Tc_SYNDICATE + "=3"*/
/obj/item/weapon/rsp
name = "\improper Rapid-Seed-Producer (RSP)"
......@@ -112,7 +112,7 @@
name = "cane"
desc = "A cane used by a true gentlemen. Or a clown."
icon = 'icons/obj/weapons.dmi'
origin_tech = "materials=1"
origin_tech = Tc_MATERIALS + "=1"
icon_state = "cane"
item_state = "stick"
flags = FPRINT
......@@ -166,7 +166,7 @@
siemens_coefficient = 1
throwforce = 0
w_class = W_CLASS_MEDIUM
origin_tech = "materials=1"
origin_tech = Tc_MATERIALS + "=1"
var/breakouttime = 300 //Deciseconds = 30s = 0.5 minute
/obj/item/weapon/legcuffs/bolas
......@@ -181,7 +181,7 @@
throwforce = 2
w_class = W_CLASS_SMALL
w_type = RECYK_METAL
origin_tech = "materials=1"
origin_tech = Tc_MATERIALS + "=1"
attack_verb = list("lashes", "bludgeons", "whips")
force = 4
breakouttime = 50 //10 seconds
......@@ -499,7 +499,7 @@
throwforce = 15
w_class = W_CLASS_MEDIUM
w_type = RECYK_METAL
origin_tech = "combat=5"
origin_tech = Tc_COMBAT + "=5"
attack_verb = list("rams", "bludgeons")
force = 15
throw_speed = 1
......@@ -626,7 +626,7 @@
starting_materials = list(MAT_IRON = 100)
w_type = RECYK_ELECTRONIC
melt_temperature=MELTPOINT_SILICON
origin_tech = "magnets=1"
origin_tech = Tc_MAGNETS + "=1"
/obj/item/weapon/staff
name = "wizards staff"
......@@ -819,7 +819,7 @@
flags = FPRINT
siemens_coefficient = 1
w_class = W_CLASS_TINY
origin_tech = "biotech=2"
origin_tech = Tc_BIOTECH + "=2"
/*
/obj/item/weapon/cigarpacket
......@@ -847,7 +847,7 @@
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"
origin_tech = Tc_MATERIALS + "=8;" + Tc_PROGRAMMING + "=8;" + Tc_MAGNETS + "=8;" + Tc_POWERSTORAGE + "=8;" + Tc_BLUESPACE + "=8;" + Tc_COMBAT + "=8;" + Tc_BIOTECH + "=8;" + Tc_SYNDICATE + "=8"
*/
/obj/item/weapon/ectoplasm
......
......@@ -8,7 +8,7 @@
w_class = W_CLASS_TINY
flags = FPRINT
slot_flags = SLOT_BELT
origin_tech = "bluespace=4;materials=4"
origin_tech = Tc_BLUESPACE + "=4;" + Tc_MATERIALS + "=4"
/obj/item/device/soulstone/Destroy()
eject_shade()
......
......@@ -23,7 +23,7 @@
icon = 'icons/obj/module.dmi'
icon_state = "id_mod"
item_state = "circuitboard"
origin_tech = "programming=2"
origin_tech = Tc_PROGRAMMING + "=2"
starting_materials = list(MAT_GLASS = 2000) // Recycle glass only
w_type = RECYK_ELECTRONIC
......@@ -40,7 +40,7 @@
/obj/item/weapon/circuitboard/message_monitor
name = "Circuit board (Message Monitor)"
build_path = "/obj/machinery/computer/message_monitor"
origin_tech = "programming=3"
origin_tech = Tc_PROGRAMMING + "=3"
/obj/item/weapon/circuitboard/security
name = "Circuit board (Security)"
build_path = "/obj/machinery/computer/security"
......@@ -49,31 +49,31 @@
build_path = "/obj/machinery/computer/security/engineering"
/obj/item/weapon/circuitboard/aicore
name = "Circuit board (AI core)"
origin_tech = "programming=4;biotech=2"
origin_tech = Tc_PROGRAMMING + "=4;" + Tc_BIOTECH + "=2"
board_type = OTHER
/obj/item/weapon/circuitboard/aiupload
name = "Circuit board (AI Upload)"
build_path = "/obj/machinery/computer/aiupload"
origin_tech = "programming=4"
origin_tech = Tc_PROGRAMMING + "=4"
/obj/item/weapon/circuitboard/borgupload
name = "Circuit board (Cyborg Upload)"
build_path = "/obj/machinery/computer/borgupload"
origin_tech = "programming=4"
origin_tech = Tc_PROGRAMMING + "=4"
/obj/item/weapon/circuitboard/med_data
name = "Circuit board (Medical Records)"
build_path = "/obj/machinery/computer/med_data"
/obj/item/weapon/circuitboard/pandemic
name = "Circuit board (PanD.E.M.I.C. 2200)"
build_path = "/obj/machinery/computer/pandemic"
origin_tech = "programming=2;biotech=2"
origin_tech = Tc_PROGRAMMING + "=2;" + Tc_BIOTECH + "=2"
/obj/item/weapon/circuitboard/scan_consolenew
name = "Circuit board (DNA Machine)"
build_path = "/obj/machinery/computer/scan_consolenew"
origin_tech = "programming=2;biotech=2"
origin_tech = Tc_PROGRAMMING + "=2;" + Tc_BIOTECH + "=2"
/obj/item/weapon/circuitboard/communications
name = "Circuit board (Communications)"
build_path = "/obj/machinery/computer/communications"
origin_tech = "programming=2;magnets=2"
origin_tech = Tc_PROGRAMMING + "=2;" + Tc_MAGNETS + "=2"
/obj/item/weapon/circuitboard/card
name = "Circuit board (ID Computer)"
build_path = "/obj/machinery/computer/card"
......@@ -86,7 +86,7 @@
/obj/item/weapon/circuitboard/teleporter
name = "Circuit board (Teleporter)"
build_path = "/obj/machinery/computer/teleporter"
origin_tech = "programming=2;bluespace=2"
origin_tech = Tc_PROGRAMMING + "=2;" + Tc_BLUESPACE + "=2"
/obj/item/weapon/circuitboard/secure_data
name = "Circuit board (Security Records)"
build_path = "/obj/machinery/computer/secure_data"
......@@ -120,15 +120,15 @@
/obj/item/weapon/circuitboard/robotics
name = "Circuit board (Robotics Control)"
build_path = "/obj/machinery/computer/robotics"
origin_tech = "programming=3"
origin_tech = Tc_PROGRAMMING + "=3"
/obj/item/weapon/circuitboard/cloning
name = "Circuit board (Cloning Console)"
build_path = "/obj/machinery/computer/cloning"
origin_tech = "programming=3;biotech=3"
origin_tech = Tc_PROGRAMMING + "=3;" + Tc_BIOTECH + "=3"
/obj/item/weapon/circuitboard/arcade
name = "Circuit board (Arcade)"
build_path = "/obj/machinery/computer/arcade"
origin_tech = "programming=1"
origin_tech = Tc_PROGRAMMING + "=1"
var/list/game_data = list()
/obj/item/weapon/circuitboard/turbine_control
name = "Circuit board (Turbine control)"
......@@ -136,7 +136,7 @@
/obj/item/weapon/circuitboard/solar_control
name = "Circuit board (Solar Control)" //name fixed 250810
build_path = "/obj/machinery/power/solar/control"
origin_tech = "programming=2;powerstorage=2"
origin_tech = Tc_PROGRAMMING + "=2;" + Tc_POWERSTORAGE + "=2"
/obj/item/weapon/circuitboard/powermonitor
name = "Circuit board (Power Monitor)" //name fixed 250810
build_path = "/obj/machinery/power/monitor"
......@@ -178,40 +178,40 @@
/obj/item/weapon/circuitboard/crew
name = "Circuit board (Crew monitoring computer)"
build_path = "/obj/machinery/computer/crew"
origin_tech = "programming=3;biotech=2;magnets=2"
origin_tech = Tc_PROGRAMMING + "=3;" + Tc_BIOTECH + "=2;" + Tc_MAGNETS + "=2"
/obj/item/weapon/circuitboard/mech_bay_power_console
name = "Circuit board (Mech Bay Power Control Console)"
build_path = "/obj/machinery/computer/mech_bay_power_console"
origin_tech = "programming=2;powerstorage=3"
origin_tech = Tc_PROGRAMMING + "=2;" + Tc_POWERSTORAGE + "=3"
/obj/item/weapon/circuitboard/ordercomp
name = "Circuit board (Supply ordering console)"
build_path = "/obj/machinery/computer/ordercomp"
origin_tech = "programming=2"
origin_tech = Tc_PROGRAMMING + "=2"
/obj/item/weapon/circuitboard/supplycomp
name = "Circuit board (Supply shuttle console)"
build_path = "/obj/machinery/computer/supplycomp"
origin_tech = "programming=3"
origin_tech = Tc_PROGRAMMING + "=3"
var/contraband_enabled = 0
/obj/item/weapon/circuitboard/operating
name = "Circuit board (Operating Computer)"
build_path = "/obj/machinery/computer/operating"
origin_tech = "programming=2;biotech=2"
origin_tech = Tc_PROGRAMMING + "=2;" + Tc_BIOTECH + "=2"
/obj/item/weapon/circuitboard/mining
name = "Circuit board (Outpost Status Display)"
build_path = "/obj/machinery/computer/security/mining"
origin_tech = "programming=2"
origin_tech = Tc_PROGRAMMING + "=2"
/obj/item/weapon/circuitboard/comm_monitor
name = "Circuit board (Telecommunications Monitor)"
build_path = "/obj/machinery/computer/telecomms/monitor"
origin_tech = "programming=3"
origin_tech = Tc_PROGRAMMING + "=3"
/obj/item/weapon/circuitboard/comm_server
name = "Circuit board (Telecommunications Server Monitor)"
build_path = "/obj/machinery/computer/telecomms/server"
origin_tech = "programming=3"
origin_tech = Tc_PROGRAMMING + "=3"
/obj/item/weapon/circuitboard/comm_traffic
name = "Circuitboard (Telecommunications Traffic Control)"
build_path = "/obj/machinery/computer/telecomms/traffic"
origin_tech = "programming=3"
origin_tech = Tc_PROGRAMMING + "=3"
/obj/item/weapon/circuitboard/curefab
name = "Circuit board (Cure fab)"
......@@ -219,55 +219,55 @@
/obj/item/weapon/circuitboard/splicer
name = "Circuit board (Disease Splicer)"
build_path = "/obj/machinery/computer/diseasesplicer"
origin_tech = "programming=3;biotech=4"
origin_tech = Tc_PROGRAMMING + "=3;" + Tc_BIOTECH + "=4"
/obj/item/weapon/circuitboard/shuttle_control
name = "Circuit board (Shuttle Control)"
build_path = "/obj/machinery/computer/shuttle_control"
origin_tech = "programming=3;engineering=2"
origin_tech = Tc_PROGRAMMING + "=3;" + Tc_ENGINEERING + "=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)"
build_path = "/obj/machinery/computer/HolodeckControl"
origin_tech = "programming=4"
origin_tech = Tc_PROGRAMMING + "=4"
/obj/item/weapon/circuitboard/aifixer
name = "Circuit board (AI Integrity Restorer)"
build_path = "/obj/machinery/computer/aifixer"
origin_tech = "programming=3;biotech=2"
origin_tech = Tc_PROGRAMMING + "=3;" + Tc_BIOTECH + "=2"
/obj/item/weapon/circuitboard/area_atmos
name = "Circuit board (Area Air Control)"
build_path = "/obj/machinery/computer/area_atmos"
origin_tech = "programming=2"
origin_tech = Tc_PROGRAMMING + "=2"
/obj/item/weapon/circuitboard/prison_shuttle
name = "Circuit board (Prison Shuttle)"
build_path = "/obj/machinery/computer/prison_shuttle"
origin_tech = "programming=2"
origin_tech = Tc_PROGRAMMING + "=2"
/obj/item/weapon/circuitboard/bhangmeter
name = "Circuit board (Bhangmeter)"
build_path = "/obj/machinery/computer/bhangmeter"
origin_tech = "programming=2"
origin_tech = Tc_PROGRAMMING + "=2"
/obj/item/weapon/circuitboard/telesci_computer
name = "Circuit board (Telepad Control Console)"
build_path = "/obj/machinery/computer/telescience"
origin_tech = "programming=3;bluespace=2"
origin_tech = Tc_PROGRAMMING + "=3;" + Tc_BLUESPACE + "=2"
/obj/item/weapon/circuitboard/forensic_computer
name = "Circuit board (Forensics Console)"
build_path = "/obj/machinery/computer/forensic_scanning"
origin_tech = "programming=2"
origin_tech = Tc_PROGRAMMING + "=2"
/obj/item/weapon/circuitboard/pda_terminal
name = "Circuit board (PDA Terminal)"
build_path = "/obj/machinery/computer/pda_terminal"
origin_tech = "programming=2"
origin_tech = Tc_PROGRAMMING + "=2"
/obj/item/weapon/circuitboard/smeltcomp
name = "Circuit board (Ore Processing Console)"
build_path = "/obj/machinery/computer/smelting"
origin_tech = "programming=2;materials=2"
origin_tech = Tc_PROGRAMMING + "=2;" + Tc_MATERIALS + "=2"
/obj/item/weapon/circuitboard/stacking_machine_console
name = "Circuit board (Stacking Machine Console)"
build_path = "/obj/machinery/computer/stacking_unit"
origin_tech = "programming=2;materials=2"
origin_tech = Tc_PROGRAMMING + "=2;" + Tc_MATERIALS + "=2"
/obj/item/weapon/circuitboard/attackby(obj/item/I as obj, mob/user as mob)
if(issolder(I))
......
This diff is collapsed.
......@@ -7,7 +7,7 @@
icon = 'icons/mecha/mecha_equipment.dmi'
icon_state = "mecha_equip"
force = 5
origin_tech = "materials=2"
origin_tech = Tc_MATERIALS + "=2"
var/equip_cooldown = 0
var/equip_ready = 1
var/energy_drain = 0
......
......@@ -3,7 +3,7 @@
desc = "Mounted Sleeper. (Can be attached to: Medical Exosuits)"
icon = 'icons/obj/Cryogenic2.dmi'
icon_state = "sleeper_0"
origin_tech = "programming=2;biotech=3"
origin_tech = Tc_PROGRAMMING + "=2;" + Tc_BIOTECH + "=3"
energy_drain = 20
range = MELEE
reliability = 1000
......@@ -401,7 +401,7 @@
var/datum/global_iterator/mech_synth/synth
range = MELEE|RANGED
equip_cooldown = 10
origin_tech = "materials=3;biotech=4;magnets=4;programming=3"
origin_tech = Tc_MATERIALS + "=3;" + Tc_BIOTECH + "=4;" + Tc_MAGNETS + "=4;" + Tc_PROGRAMMING + "=3"
/obj/item/mecha_parts/mecha_equipment/tool/syringe_gun/New()
..()
......
......@@ -4,7 +4,7 @@
name = "Mounted Jail Cell"
desc = "Mounted Jail Cell, capable of holding up to two prisoners for a limited time. (Can be attached to Gygax)"
icon_state = "mecha_jail"
origin_tech = "biotech=2;combat=4"
origin_tech = Tc_BIOTECH + "=2;" + Tc_COMBAT + "=4"
energy_drain = 20
range = MELEE
reliability = 1000
......
......@@ -225,7 +225,7 @@
name = "\improper Exosuit-Mounted 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"
origin_tech = Tc_MATERIALS + "=4;" + Tc_ENGINEERING + "=3"
equip_cooldown = 15
force = 15
dig_walls = 1
......@@ -302,7 +302,7 @@
name = "\improper Exosuit-Mounted Foam Extinguisher"
desc = "A fire extinguisher module for an exosuit. (Can be attached to: Firefighting exosuits)"
icon_state = "mecha_exting"
origin_tech = "materials=1;engineering=2"
origin_tech = Tc_MATERIALS + "=1;" + Tc_ENGINEERING + "=2"
equip_cooldown = 15
energy_drain = 0
range = MELEE|RANGED
......@@ -392,7 +392,7 @@
name = "\improper Exosuit-Mounted Jetpack"
desc = "Using directed ion bursts and cunning solar wind reflection technique, this device enables controlled space flight."
icon_state = "mecha_jetpack"
origin_tech = "materials=5;engineering=5;magnets=4"
origin_tech = Tc_MATERIALS + "=5;" + Tc_ENGINEERING + "=5;" + Tc_MAGNETS + "=4"
equip_cooldown = 5
energy_drain = 75
var/wait = 0
......@@ -491,7 +491,7 @@
name = "\improper Exosuit-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"
origin_tech = Tc_MATERIALS + "=4;" + Tc_BLUESPACE + "=3;" + Tc_MAGNETS + "=4;" + Tc_POWERSTORAGE + "=4"
equip_cooldown = 10
energy_drain = 250
range = MELEE|RANGED
......@@ -594,7 +594,7 @@
name = "\improper Exosuit-Mounted Teleporter"
desc = "An exosuit module that allows exosuits to teleport to any position in view."
icon_state = "mecha_teleport"
origin_tech = "bluespace=10"
origin_tech = Tc_BLUESPACE + "=10"
equip_cooldown = 150
energy_drain = 1000
range = RANGED
......@@ -613,7 +613,7 @@
name = "\improper Wormhole Generator"
desc = "An exosuit module that allows generating of small quasi-stable wormholes."
icon_state = "mecha_wholegen"
origin_tech = "bluespace=3"
origin_tech = Tc_BLUESPACE + "=3"
equip_cooldown = 50
energy_drain = 300
range = RANGED
......@@ -660,7 +660,7 @@
name = "\improper Gravitational Catapult"
desc = "An exosuit mounted Gravitational Catapult."
icon_state = "mecha_teleport"
origin_tech = "bluespace=2;magnets=3"
origin_tech = Tc_BLUESPACE + "=2;" + Tc_MAGNETS + "=3"
equip_cooldown = 10
energy_drain = 100
range = MELEE|RANGED
......@@ -736,7 +736,7 @@
name = "\improper Armor Booster Module (Close Combat Weaponry)"
desc = "Boosts exosuit armor against armed melee attacks. Requires energy to operate."
icon_state = "mecha_abooster_ccw"
origin_tech = "materials=3"
origin_tech = Tc_MATERIALS + "=3"
equip_cooldown = 10
energy_drain = 50
range = 0
......@@ -786,7 +786,7 @@
name = "\improper Armor Booster Module (Ranged Weaponry)"
desc = "Boosts exosuit armor against ranged attacks. Completely blocks taser shots. Requires energy to operate."
icon_state = "mecha_abooster_proj"
origin_tech = "materials=4"
origin_tech = Tc_MATERIALS + "=4"
equip_cooldown = 10
energy_drain = 50
range = 0
......@@ -857,7 +857,7 @@
name = "\improper Repair Droid Module"
desc = "Automated repair droid. Scans exosuit for damage and repairs it. Can fix almost all types of external or internal damage."
icon_state = "repair_droid"
origin_tech = "magnets=3;programming=3"
origin_tech = Tc_MAGNETS + "=3;" + Tc_PROGRAMMING + "=3"
equip_cooldown = 20
energy_drain = 100
range = 0
......@@ -942,7 +942,7 @@
name = "\improper Energy Relay Module"
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"
origin_tech = Tc_MAGNETS + "=4;" + Tc_SYNDICATE + "=2"
equip_cooldown = 10
energy_drain = 0
range = 0
......@@ -1050,7 +1050,7 @@
name = "\improper Plasma Converter Module"
desc = "Generates power using solid plasma as fuel. Pollutes the environment."
icon_state = "tesla"
origin_tech = "plasmatech=2;powerstorage=2;engineering=1"
origin_tech = Tc_PLASMATECH + "=2;" + Tc_POWERSTORAGE + "=2;" + Tc_ENGINEERING + "=1"
equip_cooldown = 10
energy_drain = 0
range = MELEE
......@@ -1187,7 +1187,7 @@
name = "\improper ExoNuclear Reactor"
desc = "Generates power using uranium. Pollutes the environment."
icon_state = "tesla"
origin_tech = "powerstorage=3;engineering=3"
origin_tech = Tc_POWERSTORAGE + "=3;" + Tc_ENGINEERING + "=3"
max_fuel = 50000
fuel_per_cycle_idle = 10
fuel_per_cycle_active = 30
......
/obj/item/mecha_parts/mecha_equipment/weapon
name = "mecha weapon"
range = RANGED
origin_tech = "materials=3;combat=3"
origin_tech = Tc_MATERIALS + "=3;" + Tc_COMBAT + "=3"
var/projectile
var/fire_sound
......@@ -73,7 +73,7 @@
name = "eZ-13 MK2 heavy pulse rifle"
icon_state = "mecha_pulse"
energy_drain = 120
origin_tech = "materials=3;combat=6;powerstorage=4"
origin_tech = Tc_MATERIALS + "=3;" + Tc_COMBAT + "=6;" + Tc_POWERSTORAGE + "=4"
projectile = /obj/item/projectile/beam/pulse/heavy
fire_sound = 'sound/weapons/marauder.ogg'
......
......@@ -95,7 +95,7 @@
desc = "Device used to transmit exosuit data."
icon = 'icons/obj/device.dmi'
icon_state = "motion2"
origin_tech = "programming=2;magnets=2"
origin_tech = Tc_PROGRAMMING + "=2;" + Tc_MAGNETS + "=2"
var/lockdown = 0
/obj/item/mecha_parts/mecha_tracking/proc/get_mecha_info()
......
......@@ -9,7 +9,7 @@
w_class = W_CLASS_GIANT
flags = FPRINT
siemens_coefficient = 1
origin_tech = "programming=2;materials=2"
origin_tech = Tc_PROGRAMMING + "=2;" + Tc_MATERIALS + "=2"
/obj/item/mecha_parts/chassis
......@@ -40,31 +40,31 @@
name="Ripley Torso"
desc="A torso part of Ripley APLU. Contains power unit, processing core and life support systems."
icon_state = "ripley_harness"
origin_tech = "programming=2;materials=2;biotech=2;engineering=2"
origin_tech = Tc_PROGRAMMING + "=2;" + Tc_MATERIALS + "=2;" + Tc_BIOTECH + "=2;" + Tc_ENGINEERING + "=2"
/obj/item/mecha_parts/part/ripley_left_arm
name="Ripley Left Arm"
desc="A Ripley APLU left arm. Data and power sockets are compatible with most exosuit tools."
icon_state = "ripley_l_arm"
origin_tech = "programming=2;materials=2;engineering=2"
origin_tech = Tc_PROGRAMMING + "=2;" + Tc_MATERIALS + "=2;" + Tc_ENGINEERING + "=2"
/obj/item/mecha_parts/part/ripley_right_arm
name="Ripley Right Arm"
desc="A Ripley APLU right arm. Data and power sockets are compatible with most exosuit tools."
icon_state = "ripley_r_arm"
origin_tech = "programming=2;materials=2;engineering=2"
origin_tech = Tc_PROGRAMMING + "=2;" + Tc_MATERIALS + "=2;" + Tc_ENGINEERING + "=2"
/obj/item/mecha_parts/part/ripley_left_leg