From 20a0443b8eb5eb04f19869398e0d451f5d76b00d Mon Sep 17 00:00:00 2001 From: Cameron Lennox Date: Tue, 14 Apr 2026 20:02:43 -0400 Subject: [PATCH] Clears unused research var (#19355) * Removes stack_origin_tech * Goodbye * I HATE MAP EDITS --- code/__defines/research.dm | 13 ---- .../changeling/powers/fabricate_clothing.dm | 10 --- code/datums/components/reagent_hose/item.dm | 1 - code/defines/obj/weapon.dm | 47 +------------- code/game/gamemodes/cult/cult_items.dm | 5 -- code/game/gamemodes/cult/soulstone.dm | 1 - code/game/gamemodes/technomancer/core_obj.dm | 4 -- .../devices/disposable_teleporter.dm | 1 - code/game/gamemodes/technomancer/equipment.dm | 1 - code/game/machinery/atmoalter/clamp.dm | 1 - code/game/machinery/bioprinter.dm | 2 - code/game/machinery/cryopod.dm | 5 -- .../machinery/doors/airlock_electronics.dm | 1 - code/game/machinery/partslathe_vr.dm | 11 ---- code/game/machinery/vitals_monitor.dm | 1 - code/game/mecha/components/_component.dm | 1 - code/game/mecha/components/actuators.dm | 1 - code/game/mecha/components/armor.dm | 1 - code/game/mecha/components/electrical.dm | 1 - code/game/mecha/components/hull.dm | 1 - code/game/mecha/components/lifesupport.dm | 1 - code/game/mecha/equipment/mecha_equipment.dm | 1 - .../game/mecha/equipment/tools/armor_melee.dm | 1 - .../mecha/equipment/tools/armor_ranged.dm | 1 - code/game/mecha/equipment/tools/catapult.dm | 1 - code/game/mecha/equipment/tools/cloak.dm | 1 - code/game/mecha/equipment/tools/drill.dm | 1 - .../mecha/equipment/tools/energy_relay.dm | 1 - code/game/mecha/equipment/tools/generator.dm | 2 - .../equipment/tools/hardpoint_actuator.dm | 1 - .../game/mecha/equipment/tools/inflatables.dm | 1 - code/game/mecha/equipment/tools/medigun_vr.dm | 1 - code/game/mecha/equipment/tools/orescanner.dm | 1 - code/game/mecha/equipment/tools/passenger.dm | 1 - code/game/mecha/equipment/tools/powertool.dm | 1 - code/game/mecha/equipment/tools/rcd.dm | 1 - .../mecha/equipment/tools/repair_droid.dm | 1 - .../mecha/equipment/tools/running_board.dm | 1 - code/game/mecha/equipment/tools/shield.dm | 1 - .../game/mecha/equipment/tools/shield_omni.dm | 1 - code/game/mecha/equipment/tools/sleeper.dm | 1 - code/game/mecha/equipment/tools/speedboost.dm | 1 - .../equipment/tools/storage_compartment.dm | 2 - .../game/mecha/equipment/tools/syringe_gun.dm | 3 - code/game/mecha/equipment/tools/teleporter.dm | 1 - .../mecha/equipment/tools/weldinglaser.dm | 1 - code/game/mecha/equipment/tools/wormhole.dm | 1 - .../equipment/weapons/ballistic/mortar.dm | 2 - .../equipment/weapons/ballistic/shotgun.dm | 1 - .../equipment/weapons/defense/shocker.dm | 2 +- .../mecha/equipment/weapons/energy/ion.dm | 2 - .../mecha/equipment/weapons/energy/laser.dm | 12 ---- .../mecha/equipment/weapons/energy/phased.dm | 2 - .../mecha/equipment/weapons/energy/pulse.dm | 1 - .../equipment/weapons/explosive/grenade.dm | 8 --- .../equipment/weapons/fire/flamethrower.dm | 4 -- .../equipment/weapons/fire/incendiary.dm | 2 - code/game/mecha/equipment/weapons/honk.dm | 1 - code/game/mecha/equipment/weapons/weapons.dm | 1 - code/game/mecha/mecha_control_console.dm | 1 - code/game/mecha/mecha_parts.dm | 62 ------------------- code/game/mecha/micro/mecha_parts_vr.dm | 20 +----- code/game/mecha/micro/mecha_vr.dm | 5 -- code/game/objects/items.dm | 4 -- code/game/objects/items/bodybag.dm | 1 - .../objects/items/devices/advnifrepair.dm | 1 - .../game/objects/items/devices/ai_detector.dm | 1 - code/game/objects/items/devices/aicard.dm | 1 - .../objects/items/devices/body_snatcher_vr.dm | 1 - .../objects/items/devices/chameleonproj.dm | 1 - .../devices/communicator/communicator.dm | 1 - code/game/objects/items/devices/debugger.dm | 2 - code/game/objects/items/devices/defib.dm | 2 - code/game/objects/items/devices/flash.dm | 2 - code/game/objects/items/devices/gps.dm | 2 - .../objects/items/devices/laserpointer.dm | 1 - .../objects/items/devices/lightreplacer.dm | 1 - code/game/objects/items/devices/multitool.dm | 2 - code/game/objects/items/devices/paicard.dm | 1 - .../devices/personal_shield_generator_vr.dm | 1 - code/game/objects/items/devices/powersink.dm | 1 - .../objects/items/devices/radio/beacon.dm | 2 - .../items/devices/radio/encryptionkey.dm | 3 - .../objects/items/devices/radio/headset.dm | 5 -- .../objects/items/devices/radio/jammer.dm | 1 - .../objects/items/devices/scanners/gas.dm | 1 - .../objects/items/devices/scanners/gene.dm | 1 - .../objects/items/devices/scanners/halogen.dm | 1 - .../objects/items/devices/scanners/health.dm | 4 -- .../devices/scanners/mass_spectrometer.dm | 2 - .../items/devices/scanners/motion_tracker.dm | 1 - .../items/devices/scanners/reagents.dm | 2 - .../items/devices/scanners/sleevemate.dm | 1 - .../objects/items/devices/scanners/slime.dm | 1 - code/game/objects/items/devices/spy_bug.dm | 6 -- .../objects/items/devices/suit_cooling.dm | 1 - code/game/objects/items/devices/t_scanner.dm | 3 - .../objects/items/devices/traitordevices.dm | 1 - code/game/objects/items/devices/translator.dm | 1 - .../objects/items/devices/translocator_vr.dm | 2 - code/game/objects/items/poi_items.dm | 1 - code/game/objects/items/robobag.dm | 1 - code/game/objects/items/stacks/medical.dm | 5 -- code/game/objects/items/stacks/medical_vr.dm | 1 - code/game/objects/items/stacks/nanopaste.dm | 1 - code/game/objects/items/stacks/stack.dm | 1 - code/game/objects/items/stacks/telecrystal.dm | 1 - .../objects/items/stacks/tiles/tile_types.dm | 1 - code/game/objects/items/weapons/AI_modules.dm | 32 +--------- .../objects/items/weapons/AI_modules_vr.dm | 6 -- code/game/objects/items/weapons/RCD.dm | 3 - code/game/objects/items/weapons/RMS.dm | 1 - code/game/objects/items/weapons/RPD_vr.dm | 1 - code/game/objects/items/weapons/autopsy.dm | 1 - .../objects/items/weapons/cigs_lighters.dm | 1 - .../items/weapons/circuitboards/broken.dm | 1 - .../weapons/circuitboards/circuitboard.dm | 1 - .../weapons/circuitboards/circuitboards_vr.dm | 4 -- .../circuitboards/computer/computer.dm | 26 -------- .../weapons/circuitboards/computer/shuttle.dm | 2 - .../weapons/circuitboards/computer/supply.dm | 2 - .../circuitboards/computer/telecomms.dm | 4 -- .../items/weapons/circuitboards/frame.dm | 11 ---- .../machinery/anomaly_harvester.dm | 1 - .../circuitboards/machinery/biogenerator.dm | 1 - .../circuitboards/machinery/cloning.dm | 2 - .../circuitboards/machinery/fluidpump.dm | 1 - .../circuitboards/machinery/jukebox.dm | 1 - .../circuitboards/machinery/mech_recharger.dm | 1 - .../circuitboards/machinery/mining_drill.dm | 2 - .../weapons/circuitboards/machinery/pacman.dm | 3 - .../circuitboards/machinery/pandemic.dm | 1 - .../weapons/circuitboards/machinery/power.dm | 4 -- .../circuitboards/machinery/reagents.dm | 2 - .../machinery/recharge_station.dm | 1 - .../circuitboards/machinery/recycling.dm | 3 - .../circuitboards/machinery/research.dm | 10 --- .../circuitboards/machinery/shieldgen.dm | 5 -- .../weapons/circuitboards/machinery/ships.dm | 2 - .../circuitboards/machinery/telecomms.dm | 9 --- .../circuitboards/machinery/unary_atmos.dm | 2 - .../items/weapons/circuitboards/mecha.dm | 21 ------- .../items/weapons/circuitboards/other.dm | 2 - code/game/objects/items/weapons/explosives.dm | 1 - .../objects/items/weapons/flamethrower.dm | 1 - .../weapons/grenades/anti_photon_grenade.dm | 1 - .../items/weapons/grenades/chem_grenade.dm | 1 - .../items/weapons/grenades/emgrenade.dm | 2 - .../items/weapons/grenades/flashbang.dm | 1 - .../items/weapons/grenades/spawnergrenade.dm | 6 -- .../items/weapons/grenades/supermatter.dm | 1 - code/game/objects/items/weapons/handcuffs.dm | 2 - .../objects/items/weapons/id cards/cards.dm | 2 - .../items/weapons/id cards/syndicate_ids.dm | 1 - .../objects/items/weapons/implants/implant.dm | 2 - .../items/weapons/implants/implantaugment.dm | 1 - .../objects/items/weapons/material/kitchen.dm | 1 - .../objects/items/weapons/material/knives.dm | 1 - .../objects/items/weapons/material/misc.dm | 3 - .../items/weapons/material/twohanded.dm | 1 - .../items/weapons/medigun/medigun_backpack.dm | 1 - .../objects/items/weapons/melee/energy.dm | 3 - code/game/objects/items/weapons/melee/misc.dm | 2 - .../objects/items/weapons/melee/shock_maul.dm | 1 - code/game/objects/items/weapons/scrolls.dm | 1 - code/game/objects/items/weapons/shields.dm | 2 - .../objects/items/weapons/storage/backpack.dm | 1 - .../objects/items/weapons/storage/bags.dm | 1 - .../objects/items/weapons/storage/toolbox.dm | 2 - code/game/objects/items/weapons/stunbaton.dm | 1 - .../objects/items/weapons/surgery_tools.dm | 9 --- .../objects/items/weapons/teleportation.dm | 2 - .../game/objects/items/weapons/tools/brass.dm | 1 - .../objects/items/weapons/tools/crowbar.dm | 4 -- .../items/weapons/tools/screwdriver.dm | 1 - .../items/weapons/tools/transforming.dm | 2 - .../items/weapons/tools/weldingtool.dm | 6 -- .../items/weapons/tools/wirecutters.dm | 3 - .../objects/items/weapons/tools/wrench.dm | 3 - code/game/objects/items/weapons/traps.dm | 3 - .../objects/structures/props/alien_props.dm | 10 --- code/modules/artifice/deadringer.dm | 1 - code/modules/artifice/telecube.dm | 1 - code/modules/assembly/assembly.dm | 1 - code/modules/assembly/igniter.dm | 1 - code/modules/assembly/infrared.dm | 1 - code/modules/assembly/mousetrap.dm | 1 - code/modules/assembly/proximity.dm | 1 - code/modules/assembly/signaler.dm | 1 - code/modules/assembly/timer.dm | 1 - code/modules/assembly/voice.dm | 1 - code/modules/blob2/core_chunk.dm | 2 - code/modules/casino/headset_casino.dm | 3 - code/modules/casino/spawnergrenade_casino.dm | 1 - code/modules/catalogue/cataloguer.dm | 1 - code/modules/clothing/accessories/rings.dm | 2 - code/modules/clothing/chameleon.dm | 11 ---- code/modules/clothing/glasses/glasses.dm | 6 -- code/modules/clothing/glasses/hud.dm | 2 - code/modules/clothing/gloves/telekinetic.dm | 1 - .../clothing/masks/tesh_synth_facemask.dm | 1 - code/modules/clothing/masks/voice.dm | 1 - code/modules/clothing/shoes/miscellaneous.dm | 1 - code/modules/detectivework/tools/uvlight.dm | 1 - code/modules/economy/retail_scanner.dm | 1 - code/modules/fireworks/firework_stars.dm | 4 -- .../fireworks/launcher_construction.dm | 1 - code/modules/holomap/station_holomap.dm | 1 - .../core/assemblies/circuit_bug.dm | 1 - .../integrated_electronics/core/printer.dm | 3 - .../integrated_electronics/passive/power.dm | 9 --- .../subtypes/illegal.dm | 2 - .../integrated_electronics/subtypes/input.dm | 15 ----- .../subtypes/manipulation.dm | 3 - .../integrated_electronics/subtypes/memory.dm | 2 - .../integrated_electronics/subtypes/output.dm | 4 -- .../integrated_electronics/subtypes/power.dm | 2 - .../subtypes/reagents.dm | 8 --- .../integrated_electronics/subtypes/smart.dm | 4 -- .../modules/materials/materials/_materials.dm | 1 - code/modules/materials/materials/gems.dm | 7 --- code/modules/materials/materials/glass.dm | 4 -- code/modules/materials/materials/glass_vr.dm | 2 - .../materials/materials/metals/metals.dm | 10 --- .../materials/materials/metals/plasteel.dm | 1 - .../materials/materials/metals/plasteel_vr.dm | 1 - .../materials/organic/animal_products.dm | 1 - .../materials/materials/organic/cloth.dm | 2 - .../materials/materials/organic/leather.dm | 1 - .../materials/materials/organic/resin.dm | 1 - .../materials/materials/organic/wood.dm | 3 - code/modules/materials/materials/plastic.dm | 2 - code/modules/materials/materials/snow.dm | 2 - .../materials/materials/supermatter.dm | 1 - code/modules/materials/sheets/_sheets.dm | 2 - .../sheets/organic/animal_products.dm | 1 - code/modules/mining/drilling/scanner.dm | 2 - code/modules/mining/mine_items.dm | 10 --- code/modules/mining/ore.dm | 11 ---- .../ore_redemption_machine/construction.dm | 2 - code/modules/mining/ore_vr.dm | 1 - code/modules/mining/resonator.dm | 2 - code/modules/mob/holder.dm | 29 --------- code/modules/mob/living/carbon/brain/MMI.dm | 5 -- .../mob/living/carbon/brain/posibrain.dm | 1 - code/modules/mob/living/carbon/brain/robot.dm | 1 - .../human/species/lleill/lleill_items.dm | 1 - .../mob/living/carbon/metroid/items.dm | 3 - .../mob/living/silicon/robot/analyzer.dm | 1 - .../living/silicon/robot/drone/swarm_items.dm | 1 - .../subtypes/animal/alien animals/catslug.dm | 1 - .../animal/giant_spider/broodmother.dm | 1 - .../subtypes/animal/passive/armadillo.dm | 1 - .../hardware/battery_module.dm | 6 -- .../modular_computers/hardware/card_slot.dm | 1 - .../modular_computers/hardware/hard_drive.dm | 6 -- .../hardware/nano_printer.dm | 1 - .../hardware/network_card.dm | 4 -- .../hardware/portable_hard_drive.dm | 3 - .../hardware/processor_unit.dm | 4 -- .../modular_computers/hardware/tesla_link.dm | 1 - code/modules/organs/internal/brain.dm | 1 - .../overmap/disperser/disperser_circuit.dm | 4 -- .../overmap/ships/engines/gas_thruster.dm | 1 - .../overmap/ships/engines/ion_thruster.dm | 1 - code/modules/paperwork/pen.dm | 3 - code/modules/power/cell.dm | 1 - code/modules/power/cells/device_cells.dm | 6 -- code/modules/power/cells/esoteric_cells.dm | 1 - code/modules/power/cells/power_cells.dm | 14 ----- code/modules/power/fusion/fusion_circuits.dm | 7 --- code/modules/power/port_gen_vr.dm | 6 -- .../modules/power/tesla/telsa_construction.dm | 2 - code/modules/power/turbine.dm | 2 - .../projectiles/ammunition/magazines.dm | 11 ---- .../projectiles/ammunition/magnetic.dm | 1 - code/modules/projectiles/dnalocking.dm | 1 - code/modules/projectiles/gun.dm | 1 - .../projectiles/guns/energy/altevian_vr.dm | 3 - code/modules/projectiles/guns/energy/bola.dm | 1 - .../projectiles/guns/energy/bsharpoon_vr.dm | 1 - .../guns/energy/cell_loaded_vr/cell_loaded.dm | 2 - .../guns/energy/cell_loaded_vr/ml3m.dm | 4 -- .../guns/energy/cell_loaded_vr/ml3m_cells.dm | 1 - .../guns/energy/cell_loaded_vr/nsfw.dm | 5 -- .../guns/energy/cell_loaded_vr/nsfw_cells.dm | 1 - .../projectiles/guns/energy/crestrose_vr.dm | 1 - .../modules/projectiles/guns/energy/cyborg.dm | 1 - .../projectiles/guns/energy/gunsword_vr.dm | 4 -- code/modules/projectiles/guns/energy/laser.dm | 12 ---- .../modules/projectiles/guns/energy/netgun.dm | 1 - .../projectiles/guns/energy/nuclear.dm | 7 --- .../projectiles/guns/energy/particle.dm | 4 -- .../projectiles/guns/energy/protector_vr.dm | 1 - .../projectiles/guns/energy/pummeler_vr.dm | 1 - code/modules/projectiles/guns/energy/pump.dm | 1 - .../projectiles/guns/energy/sickshot_vr.dm | 1 - .../projectiles/guns/energy/special.dm | 6 -- code/modules/projectiles/guns/energy/stun.dm | 5 -- .../projectiles/guns/energy/temperature.dm | 1 - code/modules/projectiles/guns/lasertag.dm | 1 - .../projectiles/guns/launcher/confetti.dm | 1 - .../projectiles/guns/launcher/rocket.dm | 1 - .../projectiles/guns/magnetic/gasthrower.dm | 1 - .../projectiles/guns/magnetic/magnetic.dm | 2 - .../guns/magnetic/magnetic_railgun.dm | 1 - code/modules/projectiles/guns/modular_guns.dm | 3 - code/modules/projectiles/guns/projectile.dm | 1 - .../projectiles/guns/projectile/automatic.dm | 13 ---- .../guns/projectile/automatic_vr.dm | 4 -- .../projectiles/guns/projectile/boltaction.dm | 9 +-- .../projectiles/guns/projectile/caseless.dm | 1 - .../projectiles/guns/projectile/dartgun.dm | 4 -- .../projectiles/guns/projectile/pistol.dm | 14 ----- .../projectiles/guns/projectile/revolver.dm | 11 ---- .../guns/projectile/revolver_vr.dm | 1 - .../projectiles/guns/projectile/semiauto.dm | 2 - .../projectiles/guns/projectile/shotgun.dm | 4 -- .../projectiles/guns/projectile/shotgun_vr.dm | 1 - .../projectiles/guns/projectile/smartgun.dm | 1 - .../projectiles/guns/projectile/sniper.dm | 2 - code/modules/projectiles/guns/toy.dm | 5 -- .../reagents/reagent_containers/hypospray.dm | 1 - .../reagents/reagent_containers/spray.dm | 1 - code/modules/resleeving/circuitboards.dm | 6 -- code/modules/resleeving/sleevecard.dm | 1 - code/modules/rogueminer_vr/zone_console.dm | 1 - code/modules/samples/samples.dm | 36 +---------- code/modules/shieldgen/handheld_defuser.dm | 1 - code/modules/telesci/bscyrstal.dm | 2 - code/modules/telesci/construction.dm | 3 - .../vore/fluffstuff/custom_items_vr.dm | 7 --- code/modules/vore/mouseray.dm | 1 - code/modules/vore/resizing/sizegun_slow_vr.dm | 1 - code/modules/vore/resizing/sizegun_vr.dm | 1 - code/modules/xenoarcheaology/effect_master.dm | 25 -------- .../finds/Weapons/archeo_melee.dm | 1 - .../xenoarcheaology/finds/find_spawning.dm | 36 ----------- code/modules/xenoarcheaology/finds/finds.dm | 1 - code/modules/xenoarcheaology/tools/tools.dm | 5 -- code/modules/xenobio/items/extracts.dm | 1 - code/modules/xenobio/items/extracts_vr.dm | 1 - code/modules/xenobio/items/slime_objects.dm | 3 - code/modules/xenobio/items/slimepotions.dm | 1 - code/modules/xenobio/items/weapons.dm | 1 - code/modules/xenobio/items/weapons_vr.dm | 1 - code/modules/xenobio/machinery/processor.dm | 1 - .../xenobio2/machinery/core_extractor.dm | 1 - .../xenobio2/machinery/gene_manipulators.dm | 2 - code/modules/xenobio2/machinery/injector.dm | 3 +- .../xenobio2/machinery/injector_computer.dm | 3 +- .../xenobio2/machinery/slime_replicator.dm | 1 - maps/offmap_vr/om_ships/curashuttle.dmm | 6 +- maps/redgate/fantasy_items.dm | 2 - .../debris_field/debrisfield_things.dm | 2 - 355 files changed, 14 insertions(+), 1199 deletions(-) diff --git a/code/__defines/research.dm b/code/__defines/research.dm index 25c91fa9661..e93efc648b8 100644 --- a/code/__defines/research.dm +++ b/code/__defines/research.dm @@ -1,19 +1,6 @@ #define SHEET_MATERIAL_AMOUNT 2000 #define MAX_STACK_SIZE 50 -#define TECH_MATERIAL "materials" -#define TECH_ENGINEERING "engineering" -#define TECH_PHORON "phorontech" -#define TECH_POWER "powerstorage" -#define TECH_BLUESPACE "bluespace" -#define TECH_BIO "biotech" -#define TECH_COMBAT "combat" -#define TECH_MAGNET "magnets" -#define TECH_DATA "programming" -#define TECH_ILLEGAL "transgressive" -#define TECH_ARCANE "arcane" -#define TECH_PRECURSOR "precursor" - #define IMPRINTER 0x0001 //For circuits. Uses glass/chemicals. #define PROTOLATHE 0x0002 //New stuff. Uses glass/metal/chemicals #define MECHFAB 0x0004 //Mechfab diff --git a/code/datums/components/antags/changeling/powers/fabricate_clothing.dm b/code/datums/components/antags/changeling/powers/fabricate_clothing.dm index e0186c550ec..e7ec034cd61 100644 --- a/code/datums/components/antags/changeling/powers/fabricate_clothing.dm +++ b/code/datums/components/antags/changeling/powers/fabricate_clothing.dm @@ -28,7 +28,6 @@ worn_state = "lingchameleon" desc = "The flesh all around us has grown a new layer of cells that can shift appearance and create a biological fabric that cannot be distinguished from \ ordinary cloth, allowing us to make ourselves appear to wear almost anything." - origin_tech = list() //The base chameleon items have origin technology, which we will inherit if we don't null out this variable. canremove = FALSE //Since this is essentially flesh impersonating clothes, tearing someone's skin off as if it were clothing isn't possible. has_sensor = FALSE // Reveals ling, and doesn't make sense anyway! @@ -51,7 +50,6 @@ icon_state = "lingchameleon" desc = "Our head is swelled with a large quanity of rapidly shifting skin cells. We can reform our head to resemble various hats and \ helmets that biologicals are so fond of wearing." - origin_tech = list() canremove = FALSE /obj/item/clothing/head/chameleon/changeling/Initialize(mapload) @@ -77,7 +75,6 @@ ) item_state = "armor" desc = "The cells in our chest are rapidly shifting, ready to reform into material that can resemble most pieces of clothing." - origin_tech = list() canremove = FALSE /obj/item/clothing/suit/chameleon/changeling/Initialize(mapload) @@ -103,7 +100,6 @@ ) item_state = "black" desc = "Our feet are overlayed with another layer of flesh and bone on top. We can reform our feet to resemble various boots and shoes." - origin_tech = list() canremove = FALSE /obj/item/clothing/shoes/chameleon/changeling/Initialize(mapload) @@ -129,7 +125,6 @@ ) item_state = "backpack" desc = "A large pouch imbedded in our back, it can shift form to resemble many common backpacks that other biologicals are fond of using." - origin_tech = list() canremove = FALSE /obj/item/storage/backpack/chameleon/changeling/Initialize(mapload) @@ -158,7 +153,6 @@ item_state = "ling" desc = "Our hands have a second layer of flesh on top. We can reform our hands to resemble a large variety of fabrics and materials that biologicals \ tend to wear on their hands. Remember that these won't protect your hands from harm." - origin_tech = list() canremove = FALSE /obj/item/clothing/gloves/chameleon/changeling/Initialize(mapload) @@ -185,7 +179,6 @@ item_state = "gas_alt" desc = "A transparent visor of brittle chitin covers our face. We can reform it to resemble various masks that biologicals use. It can also utilize internal \ tanks.." - origin_tech = list() canremove = FALSE /obj/item/clothing/mask/chameleon/changeling/Initialize(mapload) @@ -207,7 +200,6 @@ icon_state = "lingchameleon" item_state = "glasses" desc = "A transparent piece of eyewear made out of brittle chitin. We can reform it to resemble various glasses and goggles." - origin_tech = list() canremove = FALSE /obj/item/clothing/glasses/chameleon/changeling/Initialize(mapload) @@ -233,7 +225,6 @@ slot_r_hand_str = 'icons/mob/items/righthand_storage.dmi', ) item_state = "utility" - origin_tech = list() canremove = FALSE /obj/item/storage/belt/chameleon/changeling/Initialize(mapload) @@ -255,7 +246,6 @@ desc = "A card that we can reform to resemble identification cards. Due to the nature of the material this is made of, it cannot store any access codes." icon_state = "changeling" assignment = "Harvester" - origin_tech = list() electronic_warfare = 1 //The lack of RFID stuff makes it hard for AIs to track, I guess. *handwaves* registered_user = null access = null diff --git a/code/datums/components/reagent_hose/item.dm b/code/datums/components/reagent_hose/item.dm index 067d59b0a2b..810e2354cdc 100644 --- a/code/datums/components/reagent_hose/item.dm +++ b/code/datums/components/reagent_hose/item.dm @@ -11,7 +11,6 @@ icon = 'icons/obj/machines/reagent.dmi' icon_state = "hose" - origin_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 1) amount = 1 max_amount = HOSE_MAX_DISTANCE w_class = ITEMSIZE_SMALL diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 7565438fc2a..6447d830ab9 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -129,8 +129,7 @@ item_state = "radio" throw_speed = 4 throw_range = 20 - matter = list(MAT_STEEL = 100) - origin_tech = list(TECH_MAGNET = 2, TECH_ILLEGAL = 3)*/ + matter = list(MAT_STEEL = 100)*/ /obj/item/SWF_uplink name = "station-bounced radio" @@ -149,7 +148,6 @@ throw_speed = 4 throw_range = 20 matter = list(MAT_STEEL = 100) - origin_tech = list(TECH_MAGNET = 1) drop_sound = 'sound/items/drop/device.ogg' pickup_sound = 'sound/items/pickup/device.ogg' @@ -326,14 +324,12 @@ name = "console screen" desc = "Used in the construction of computers and other devices with a interactive console." icon_state = "screen" - origin_tech = list(TECH_MATERIAL = 1) matter = list(MAT_GLASS = 200) /obj/item/stock_parts/capacitor name = "capacitor" desc = "A basic capacitor used in the construction of a variety of devices." icon_state = "capacitor" - origin_tech = list(TECH_POWER = 1) matter = list(MAT_STEEL = 50,MAT_GLASS = 50) var/charge = 0 @@ -358,28 +354,24 @@ name = "scanning module" desc = "A compact, high resolution scanning module used in the construction of certain devices." icon_state = "scan_module" - origin_tech = list(TECH_MAGNET = 1) matter = list(MAT_STEEL = 50,MAT_GLASS = 20) /obj/item/stock_parts/manipulator name = "micro-manipulator" desc = "A tiny little manipulator used in the construction of certain devices." icon_state = "micro_mani" - origin_tech = list(TECH_MATERIAL = 1, TECH_DATA = 1) matter = list(MAT_STEEL = 30) /obj/item/stock_parts/micro_laser name = "micro-laser" desc = "A tiny laser used in certain devices." icon_state = "micro_laser" - origin_tech = list(TECH_MAGNET = 1) matter = list(MAT_STEEL = 10,MAT_GLASS = 20) /obj/item/stock_parts/matter_bin name = "matter bin" desc = "A container for hold compressed matter awaiting re-construction." icon_state = "matter_bin" - origin_tech = list(TECH_MATERIAL = 1) matter = list(MAT_STEEL = 80) //Rank 2 @@ -388,7 +380,6 @@ name = "advanced capacitor" desc = "An advanced capacitor used in the construction of a variety of devices." icon_state = "capacitor_adv" - origin_tech = list(TECH_POWER = 3) rating = 2 matter = list(MAT_STEEL = 50,MAT_GLASS = 50) @@ -396,7 +387,6 @@ name = "advanced scanning module" desc = "A compact, high resolution scanning module used in the construction of certain devices." icon_state = "scan_module_adv" - origin_tech = list(TECH_MAGNET = 3) rating = 2 matter = list(MAT_STEEL = 50,MAT_GLASS = 20) @@ -404,7 +394,6 @@ name = "nano-manipulator" desc = "A tiny little manipulator used in the construction of certain devices." icon_state = "nano_mani" - origin_tech = list(TECH_MATERIAL = 3, TECH_DATA = 2) rating = 2 matter = list(MAT_STEEL = 30) @@ -412,7 +401,6 @@ name = "high-power micro-laser" desc = "A tiny laser used in certain devices." icon_state = "high_micro_laser" - origin_tech = list(TECH_MAGNET = 3) rating = 2 matter = list(MAT_STEEL = 10,MAT_GLASS = 20) @@ -420,7 +408,6 @@ name = "advanced matter bin" desc = "A container for hold compressed matter awaiting re-construction." icon_state = "advanced_matter_bin" - origin_tech = list(TECH_MATERIAL = 3) rating = 2 matter = list(MAT_STEEL = 80) @@ -430,7 +417,6 @@ name = "super capacitor" desc = "A super-high capacity capacitor used in the construction of a variety of devices." icon_state = "capacitor_super" - origin_tech = list(TECH_POWER = 5, TECH_MATERIAL = 4) rating = 3 matter = list(MAT_STEEL = 50,MAT_GLASS = 50) @@ -438,7 +424,6 @@ name = "phasic scanning module" desc = "A compact, high resolution phasic scanning module used in the construction of certain devices." icon_state = "scan_module_phasic" - origin_tech = list(TECH_MAGNET = 5) rating = 3 matter = list(MAT_STEEL = 50,MAT_GLASS = 20) @@ -446,7 +431,6 @@ name = "pico-manipulator" desc = "A tiny little manipulator used in the construction of certain devices." icon_state = "pico_mani" - origin_tech = list(TECH_MATERIAL = 5, TECH_DATA = 2) rating = 3 matter = list(MAT_STEEL = 30) @@ -454,7 +438,6 @@ name = "ultra-high-power micro-laser" icon_state = "ultra_high_micro_laser" desc = "A tiny laser used in certain devices." - origin_tech = list(TECH_MAGNET = 5) rating = 3 matter = list(MAT_STEEL = 10,MAT_GLASS = 20) @@ -462,7 +445,6 @@ name = "super matter bin" desc = "A container for hold compressed matter awaiting re-construction." icon_state = "super_matter_bin" - origin_tech = list(TECH_MATERIAL = 5) rating = 3 matter = list(MAT_STEEL = 80) @@ -472,7 +454,6 @@ name = "hyper capacitor" desc = "A hyper-capacity capacitor used in the construction of a variety of devices." icon_state = "capacitor_hyper" - origin_tech = list(TECH_POWER = 6, TECH_MATERIAL = 5, TECH_BLUESPACE = 1, TECH_ARCANE = 1) rating = 4 matter = list(MAT_STEEL = 80, MAT_GLASS = 40) @@ -480,7 +461,6 @@ name = "quantum scanning module" desc = "A compact, near-perfect resolution quantum scanning module used in the construction of certain devices." icon_state = "scan_module_hyper" - origin_tech = list(TECH_MAGNET = 6, TECH_BLUESPACE = 1, TECH_ARCANE = 1) rating = 4 matter = list(MAT_STEEL = 100,MAT_GLASS = 40) @@ -488,7 +468,6 @@ name = "planck-manipulator" desc = "A miniscule manipulator used in the construction of certain devices." icon_state = "hyper_mani" - origin_tech = list(TECH_MATERIAL = 6, TECH_DATA = 3, TECH_ARCANE = 1) rating = 4 matter = list(MAT_STEEL = 30) @@ -496,7 +475,6 @@ name = "hyper-power micro-laser" icon_state = "hyper_micro_laser" desc = "A tiny laser used in certain devices." - origin_tech = list(TECH_MAGNET = 6, TECH_ARCANE = 1) rating = 4 matter = list(MAT_STEEL = 30, MAT_GLASS = 40) @@ -504,7 +482,6 @@ name = "hyper matter bin" desc = "A container for holding compressed matter awaiting re-construction." icon_state = "hyper_matter_bin" - origin_tech = list(TECH_MATERIAL = 6, TECH_ARCANE = 1) rating = 4 matter = list(MAT_STEEL = 100) @@ -514,7 +491,6 @@ name = "omni-capacitor" desc = "A capacitor of immense capacity used in the construction of a variety of devices." icon_state = "capacitor_omni" - origin_tech = list(TECH_POWER = 7, TECH_MATERIAL = 6, TECH_BLUESPACE = 3, TECH_PRECURSOR = 1) rating = 5 matter = list(MAT_STEEL = 80, MAT_GLASS = 40) @@ -522,7 +498,6 @@ name = "omni-scanning module" desc = "A compact, perfect resolution temporospatial scanning module used in the construction of certain devices." icon_state = "scan_module_omni" - origin_tech = list(TECH_MAGNET = 7, TECH_BLUESPACE = 3, TECH_PRECURSOR = 1) rating = 5 matter = list(MAT_STEEL = 100,MAT_GLASS = 40) @@ -530,7 +505,6 @@ name = "omni-manipulator" desc = "A strange, infinitesimal manipulator used in the construction of certain devices." icon_state = "omni_mani" - origin_tech = list(TECH_MATERIAL = 7, TECH_DATA = 4, TECH_PRECURSOR = 1) rating = 5 matter = list(MAT_STEEL = 30) @@ -538,7 +512,6 @@ name = "omni-power micro-laser" icon_state = "omni_micro_laser" desc = "A strange laser used in certain devices." - origin_tech = list(TECH_MAGNET = 7, TECH_PRECURSOR = 1) rating = 5 matter = list(MAT_STEEL = 30, MAT_GLASS = 40) @@ -546,7 +519,6 @@ name = "omni-matter bin" desc = "A strange container for holding compressed matter awaiting re-construction." icon_state = "omni_matter_bin" - origin_tech = list(TECH_MATERIAL = 7, TECH_PRECURSOR = 1) rating = 5 matter = list(MAT_STEEL = 100) @@ -557,49 +529,42 @@ name = "subspace ansible" icon_state = "subspace_ansible" desc = "A compact module capable of sensing extradimensional activity." - origin_tech = list(TECH_DATA = 3, TECH_MAGNET = 5 ,TECH_MATERIAL = 4, TECH_BLUESPACE = 2) matter = list(MAT_STEEL = 30,MAT_GLASS = 10) /obj/item/stock_parts/subspace/sub_filter name = "hyperwave filter" icon_state = "hyperwave_filter" desc = "A tiny device capable of filtering and converting super-intense radiowaves." - origin_tech = list(TECH_DATA = 4, TECH_MAGNET = 2) matter = list(MAT_STEEL = 30,MAT_GLASS = 10) /obj/item/stock_parts/subspace/amplifier name = "subspace amplifier" icon_state = "subspace_amplifier" desc = "A compact micro-machine capable of amplifying weak subspace transmissions." - origin_tech = list(TECH_DATA = 3, TECH_MAGNET = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2) matter = list(MAT_STEEL = 30,MAT_GLASS = 10) /obj/item/stock_parts/subspace/treatment name = "subspace treatment disk" icon_state = "treatment_disk" desc = "A compact micro-machine capable of stretching out hyper-compressed radio waves." - origin_tech = list(TECH_DATA = 3, TECH_MAGNET = 2, TECH_MATERIAL = 5, TECH_BLUESPACE = 2) matter = list(MAT_STEEL = 30,MAT_GLASS = 10) /obj/item/stock_parts/subspace/analyzer name = "subspace wavelength analyzer" icon_state = "wavelength_analyzer" desc = "A sophisticated analyzer capable of analyzing cryptic subspace wavelengths." - origin_tech = list(TECH_DATA = 3, TECH_MAGNET = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2) matter = list(MAT_STEEL = 30,MAT_GLASS = 10) /obj/item/stock_parts/subspace/crystal name = "ansible crystal" icon_state = "ansible_crystal" desc = "A crystal made from pure glass used to transmit laser databursts to subspace." - origin_tech = list(TECH_MAGNET = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2) matter = list(MAT_GLASS = 50) /obj/item/stock_parts/subspace/transmitter name = "subspace transmitter" icon_state = "subspace_transmitter" desc = "A large piece of equipment used to open a window into the subspace dimension." - origin_tech = list(TECH_MAGNET = 5, TECH_MATERIAL = 5, TECH_BLUESPACE = 3) matter = list(MAT_STEEL = 50) /obj/item/ectoplasm @@ -609,13 +574,6 @@ icon = 'icons/obj/wizard.dmi' icon_state = "ectoplasm2" -/obj/item/research - name = "research debugging device" - desc = "Instant research tool. For testing purposes only." - icon = 'icons/obj/stock_parts.dmi' - icon_state = "smes_coil" - origin_tech = list(TECH_MATERIAL = 19, TECH_ENGINEERING = 19, TECH_PHORON = 19, TECH_POWER = 19, TECH_BLUESPACE = 19, TECH_BIO = 19, TECH_COMBAT = 19, TECH_MAGNET = 19, TECH_DATA = 19, TECH_ILLEGAL = 19, TECH_ARCANE = 19, TECH_PRECURSOR = 19) - // Additional construction stock parts /obj/item/stock_parts/gear @@ -623,7 +581,6 @@ desc = "A gear used for construction." icon = 'icons/obj/stock_parts.dmi' icon_state = "gear" - origin_tech = list(TECH_ENGINEERING = 1) matter = list(MAT_STEEL = 50) /obj/item/stock_parts/motor @@ -631,7 +588,6 @@ desc = "A motor used for construction." icon = 'icons/obj/stock_parts.dmi' icon_state = "motor" - origin_tech = list(TECH_ENGINEERING = 1) matter = list(MAT_STEEL = 60, MAT_GLASS = 10) /obj/item/stock_parts/spring @@ -639,7 +595,6 @@ desc = "A spring used for construction." icon = 'icons/obj/stock_parts.dmi' icon_state = "spring" - origin_tech = list(TECH_ENGINEERING = 1) matter = list(MAT_STEEL = 40) /obj/effect/spawner/parts diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index edc1de4149e..92853e6d084 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -2,7 +2,6 @@ name = "cult blade" desc = "An arcane weapon wielded by the followers of Nar-Sie." icon_state = "cultblade" - origin_tech = list(TECH_COMBAT = 1, TECH_ARCANE = 1) w_class = ITEMSIZE_LARGE force = 30 throwforce = 10 @@ -52,7 +51,6 @@ name = "cult hood" icon_state = "culthood" desc = "A hood worn by the followers of Nar-Sie." - origin_tech = list(TECH_MATERIAL = 3, TECH_ARCANE = 1) flags_inv = HIDEFACE armor = list(melee = 50, bullet = 30, laser = 50, energy = 80, bomb = 25, bio = 10, rad = 0) min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE @@ -75,7 +73,6 @@ name = "cult robes" desc = "A set of armored robes worn by the followers of Nar-Sie." icon_state = "cultrobes" - origin_tech = list(TECH_MATERIAL = 3, TECH_ARCANE = 1) body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_CULT) armor = list(melee = 50, bullet = 30, laser = 50, energy = 80, bomb = 25, bio = 10, rad = 0) @@ -99,7 +96,6 @@ name = "cult helmet" desc = "A space worthy helmet used by the followers of Nar-Sie." icon_state = "cult_helmet" - origin_tech = list(TECH_MATERIAL = 3, TECH_ARCANE = 1) armor = list(melee = 60, bullet = 50, laser = 30, energy = 80, bomb = 30, bio = 30, rad = 30) siemens_coefficient = 0 @@ -109,7 +105,6 @@ /obj/item/clothing/suit/space/cult name = "cult armour" icon_state = "cult_armour" - origin_tech = list(TECH_MATERIAL = 3, TECH_ARCANE = 1) desc = "A bulky suit of armour, bristling with spikes. It looks space-worthy." w_class = ITEMSIZE_NORMAL allowed = list(POCKET_EMERGENCY, POCKET_SUIT_REGULATORS, POCKET_CULT) diff --git a/code/game/gamemodes/cult/soulstone.dm b/code/game/gamemodes/cult/soulstone.dm index db23dc350c4..e0eeabdeec8 100644 --- a/code/game/gamemodes/cult/soulstone.dm +++ b/code/game/gamemodes/cult/soulstone.dm @@ -10,7 +10,6 @@ desc = "A fragment of the legendary treasure known simply as the 'Soul Stone'. The shard still flickers with a fraction of the full artefacts power." w_class = ITEMSIZE_SMALL slot_flags = SLOT_BELT - origin_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 4, TECH_ARCANE = 1) var/imprinted = "empty" var/possible_constructs = list("Juggernaut","Wraith","Artificer","Harvester") diff --git a/code/game/gamemodes/technomancer/core_obj.dm b/code/game/gamemodes/technomancer/core_obj.dm index dc915a37002..565732c374f 100644 --- a/code/game/gamemodes/technomancer/core_obj.dm +++ b/code/game/gamemodes/technomancer/core_obj.dm @@ -8,10 +8,6 @@ w_class = ITEMSIZE_HUGE slot_flags = SLOT_BACK unacidable = TRUE - origin_tech = list( - TECH_MATERIAL = 8, TECH_ENGINEERING = 8, TECH_POWER = 8, TECH_BLUESPACE = 10, - TECH_COMBAT = 7, TECH_MAGNET = 9, TECH_DATA = 5 - ) sprite_sheets = list( SPECIES_TESHARI = 'icons/inventory/back/mob_teshari.dmi' ) diff --git a/code/game/gamemodes/technomancer/devices/disposable_teleporter.dm b/code/game/gamemodes/technomancer/devices/disposable_teleporter.dm index 4e2fa7017df..2d7feedd0f4 100644 --- a/code/game/gamemodes/technomancer/devices/disposable_teleporter.dm +++ b/code/game/gamemodes/technomancer/devices/disposable_teleporter.dm @@ -13,7 +13,6 @@ var/uses = 3.0 w_class = ITEMSIZE_TINY item_state = "paper" - origin_tech = list(TECH_BLUESPACE = 4, TECH_POWER = 3) //This one is what the wizard starts with. The above is a better version that can be purchased. /obj/item/disposable_teleporter/free diff --git a/code/game/gamemodes/technomancer/equipment.dm b/code/game/gamemodes/technomancer/equipment.dm index 251a628a521..bacf652aad6 100644 --- a/code/game/gamemodes/technomancer/equipment.dm +++ b/code/game/gamemodes/technomancer/equipment.dm @@ -161,7 +161,6 @@ across physical barriers." icon_state = "uzenwa_sissra_1" actions_types = list(/datum/action/item_action/toggle_goggles) - origin_tech = list(TECH_MAGNET = 6, TECH_ENGINEERING = 6) toggleable = 1 vision_flags = SEE_TURFS|SEE_MOBS|SEE_OBJS prescription = TRUE // So two versions of these aren't needed. diff --git a/code/game/machinery/atmoalter/clamp.dm b/code/game/machinery/atmoalter/clamp.dm index a9b35f5af35..282087d8f91 100644 --- a/code/game/machinery/atmoalter/clamp.dm +++ b/code/game/machinery/atmoalter/clamp.dm @@ -134,7 +134,6 @@ desc = "A magnetic clamp which can halt the flow of gas in a pipe, via a localised stasis field." icon = 'icons/atmos/clamp.dmi' icon_state = "pclamp0" - origin_tech = list(TECH_ENGINEERING = 4, TECH_MAGNET = 4) /obj/item/clamp/afterattack(var/atom/A, mob/user as mob, proximity) if(!proximity) diff --git a/code/game/machinery/bioprinter.dm b/code/game/machinery/bioprinter.dm index b008e9a2d43..2d08d84ebb2 100644 --- a/code/game/machinery/bioprinter.dm +++ b/code/game/machinery/bioprinter.dm @@ -258,7 +258,6 @@ name = "bioprinter circuit" build_path = /obj/machinery/organ_printer/flesh board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_DATA = 3, TECH_BIO = 3) req_components = list( /obj/item/stack/cable_coil = 2, /obj/item/stock_parts/matter_bin = 2, @@ -321,7 +320,6 @@ name = "roboprinter circuit" build_path = /obj/machinery/organ_printer/robot board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_DATA = 3, TECH_BIO = 3) req_components = list( /obj/item/stack/cable_coil = 2, /obj/item/stock_parts/matter_bin = 2, diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 1c8acb531fc..f8175711b19 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -154,31 +154,26 @@ /obj/item/circuitboard/cryopodcontrol name = T_BOARD("Cryogenic Oversight Console") build_path = /obj/machinery/computer/cryopod - origin_tech = list(TECH_DATA = 3) hidden = TRUE // todo - Make properly constructable in round /obj/item/circuitboard/robotstoragecontrol name = T_BOARD("Robotic Storage Console") build_path = /obj/machinery/computer/cryopod/robot - origin_tech = list(TECH_DATA = 3) hidden = TRUE // todo - Make properly constructable in round /obj/item/circuitboard/dormscontrol name = T_BOARD("Residential Oversight Console") build_path = /obj/machinery/computer/cryopod/dorms - origin_tech = list(TECH_DATA = 3) hidden = TRUE // todo - Make properly constructable in round /obj/item/circuitboard/travelcontrol name = T_BOARD("Travel Oversight Console - Docks") build_path = /obj/machinery/computer/cryopod/travel - origin_tech = list(TECH_DATA = 3) hidden = TRUE // todo - Make properly constructable in round /obj/item/circuitboard/gatewaycontrol name = T_BOARD("Travel Oversight Console - Gateway") build_path = /obj/machinery/computer/cryopod/gateway - origin_tech = list(TECH_DATA = 3) hidden = TRUE // todo - Make properly constructable in round //Decorative structures to go alongside cryopods. diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index 1efdf7ede45..a5d6fb07b17 100644 --- a/code/game/machinery/doors/airlock_electronics.dm +++ b/code/game/machinery/doors/airlock_electronics.dm @@ -148,7 +148,6 @@ /obj/item/airlock_electronics/secure name = "secure airlock electronics" desc = "designed to be somewhat more resistant to hacking than standard electronics." - origin_tech = list(TECH_DATA = 2) secure = 1 /obj/item/airlock_electronics/secure/emag_act(var/remaining_charges, var/mob/user) diff --git a/code/game/machinery/partslathe_vr.dm b/code/game/machinery/partslathe_vr.dm index 12e10215229..af12d7c6bb5 100644 --- a/code/game/machinery/partslathe_vr.dm +++ b/code/game/machinery/partslathe_vr.dm @@ -49,14 +49,6 @@ update_icon() update_recipe_list() -/obj/machinery/partslathe/proc/getHighestOriginTechLevel(var/obj/item/I) - if(!istype(I) || !I.origin_tech) - return 0 - var/highest = 0 - for(var/tech in I.origin_tech) - highest = max(highest, I.origin_tech[tech]) - return highest - /obj/machinery/partslathe/RefreshParts() var/mb_rating = 0 for(var/obj/item/stock_parts/matter_bin/M in component_parts) @@ -355,9 +347,6 @@ var/list/paths = subtypesof(/obj/item/stock_parts) for(var/type in paths) var/obj/item/stock_parts/I = new type() - if(getHighestOriginTechLevel(I) > 1) - qdel(I) - continue // Ignore high-tech parts if(!I.matter) qdel(I) continue // Ignore parts we can't build diff --git a/code/game/machinery/vitals_monitor.dm b/code/game/machinery/vitals_monitor.dm index 9694e65289d..922a9055989 100644 --- a/code/game/machinery/vitals_monitor.dm +++ b/code/game/machinery/vitals_monitor.dm @@ -2,7 +2,6 @@ name = T_BOARD("vitals monitor") build_path = /obj/machinery/vitals_monitor board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_DATA = 3, TECH_BIO = 4, TECH_ENGINEERING = 2) req_components = list( /obj/item/stock_parts/console_screen = 1, /obj/item/cell/high = 1 diff --git a/code/game/mecha/components/_component.dm b/code/game/mecha/components/_component.dm index 3f4e694f9e5..80700369c31 100644 --- a/code/game/mecha/components/_component.dm +++ b/code/game/mecha/components/_component.dm @@ -4,7 +4,6 @@ icon = 'icons/mecha/mech_component.dmi' icon_state = "component" w_class = ITEMSIZE_HUGE - origin_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2) var/component_type = null diff --git a/code/game/mecha/components/actuators.dm b/code/game/mecha/components/actuators.dm index b04306333ba..bc098e40fc6 100644 --- a/code/game/mecha/components/actuators.dm +++ b/code/game/mecha/components/actuators.dm @@ -4,7 +4,6 @@ icon = 'icons/mecha/mech_component.dmi' icon_state = "motor" w_class = ITEMSIZE_HUGE - origin_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2) component_type = MECH_ACTUATOR diff --git a/code/game/mecha/components/armor.dm b/code/game/mecha/components/armor.dm index 7ed40431ace..888ae835fe0 100644 --- a/code/game/mecha/components/armor.dm +++ b/code/game/mecha/components/armor.dm @@ -4,7 +4,6 @@ icon = 'icons/mecha/mech_component.dmi' icon_state = "armor" w_class = ITEMSIZE_HUGE - origin_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 2) component_type = MECH_ARMOR diff --git a/code/game/mecha/components/electrical.dm b/code/game/mecha/components/electrical.dm index de07c96c84b..7edf61947b9 100644 --- a/code/game/mecha/components/electrical.dm +++ b/code/game/mecha/components/electrical.dm @@ -4,7 +4,6 @@ icon = 'icons/mecha/mech_component.dmi' icon_state = "board" w_class = ITEMSIZE_HUGE - origin_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2) component_type = MECH_ELECTRIC diff --git a/code/game/mecha/components/hull.dm b/code/game/mecha/components/hull.dm index a5226ebae55..a5acf2e6634 100644 --- a/code/game/mecha/components/hull.dm +++ b/code/game/mecha/components/hull.dm @@ -4,7 +4,6 @@ icon = 'icons/mecha/mech_component.dmi' icon_state = "hull" w_class = ITEMSIZE_HUGE - origin_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2) component_type = MECH_HULL diff --git a/code/game/mecha/components/lifesupport.dm b/code/game/mecha/components/lifesupport.dm index d98cefda4dc..58724bbcc0b 100644 --- a/code/game/mecha/components/lifesupport.dm +++ b/code/game/mecha/components/lifesupport.dm @@ -4,7 +4,6 @@ icon = 'icons/mecha/mech_component.dmi' icon_state = "lifesupport" w_class = ITEMSIZE_HUGE - origin_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2) component_type = MECH_GAS diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm index e05cd04aa22..95fb8c9f540 100644 --- a/code/game/mecha/equipment/mecha_equipment.dm +++ b/code/game/mecha/equipment/mecha_equipment.dm @@ -6,7 +6,6 @@ icon = 'icons/mecha/mecha_equipment.dmi' icon_state = "mecha_equip" force = 5 - origin_tech = list(TECH_MATERIAL = 2) description_info = "Some equipment may gain new abilities or advantages if equipped to certain types of Exosuits." var/equip_cooldown = 0 var/equip_ready = TRUE diff --git a/code/game/mecha/equipment/tools/armor_melee.dm b/code/game/mecha/equipment/tools/armor_melee.dm index 33677ce9bdb..8c7a46ffdbb 100644 --- a/code/game/mecha/equipment/tools/armor_melee.dm +++ b/code/game/mecha/equipment/tools/armor_melee.dm @@ -2,7 +2,6 @@ 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 = list(TECH_MATERIAL = 3) equip_cooldown = 10 energy_drain = 50 range = 0 diff --git a/code/game/mecha/equipment/tools/armor_ranged.dm b/code/game/mecha/equipment/tools/armor_ranged.dm index f4e30be6d92..bfe8262f6a7 100644 --- a/code/game/mecha/equipment/tools/armor_ranged.dm +++ b/code/game/mecha/equipment/tools/armor_ranged.dm @@ -2,7 +2,6 @@ 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 = list(TECH_MATERIAL = 4) equip_cooldown = 10 energy_drain = 50 range = 0 diff --git a/code/game/mecha/equipment/tools/catapult.dm b/code/game/mecha/equipment/tools/catapult.dm index f4457551aeb..abe4a9c9b17 100644 --- a/code/game/mecha/equipment/tools/catapult.dm +++ b/code/game/mecha/equipment/tools/catapult.dm @@ -2,7 +2,6 @@ name = "gravitational catapult" desc = "An exosuit mounted gravitational catapult." icon_state = "mecha_teleport" - origin_tech = list(TECH_BLUESPACE = 2, TECH_MAGNET = 3) equip_cooldown = 10 energy_drain = 100 range = MECH_MELEE|RANGED diff --git a/code/game/mecha/equipment/tools/cloak.dm b/code/game/mecha/equipment/tools/cloak.dm index 9a71de318d7..54399a33ca0 100644 --- a/code/game/mecha/equipment/tools/cloak.dm +++ b/code/game/mecha/equipment/tools/cloak.dm @@ -2,7 +2,6 @@ name = "cloaking device" desc = "Integrated cloaking system. High power usage, but does render you invisible to the naked eye. Doesn't prevent noise, however." icon_state = "tesla" - origin_tech = list(TECH_MAGNET = 5, TECH_DATA = 5) energy_drain = 300 range = 0 equip_type = EQUIP_SPECIAL diff --git a/code/game/mecha/equipment/tools/drill.dm b/code/game/mecha/equipment/tools/drill.dm index 3838583a926..0dce5dd0cd9 100644 --- a/code/game/mecha/equipment/tools/drill.dm +++ b/code/game/mecha/equipment/tools/drill.dm @@ -82,7 +82,6 @@ name = "diamond drill" desc = "This is an upgraded version of the drill that'll pierce the heavens!" icon_state = "mecha_diamond_drill" - origin_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3) equip_cooldown = 10 force = 15 advanced = 1 diff --git a/code/game/mecha/equipment/tools/energy_relay.dm b/code/game/mecha/equipment/tools/energy_relay.dm index 44b848a2abd..62871169906 100644 --- a/code/game/mecha/equipment/tools/energy_relay.dm +++ b/code/game/mecha/equipment/tools/energy_relay.dm @@ -2,7 +2,6 @@ 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 = list(TECH_MAGNET = 4, TECH_ILLEGAL = 2) equip_cooldown = 10 energy_drain = 0 range = 0 diff --git a/code/game/mecha/equipment/tools/generator.dm b/code/game/mecha/equipment/tools/generator.dm index af1f77ee49e..f0de20eea91 100644 --- a/code/game/mecha/equipment/tools/generator.dm +++ b/code/game/mecha/equipment/tools/generator.dm @@ -2,7 +2,6 @@ name = "phoron generator" desc = "Generates power using solid phoron as fuel. Pollutes the environment." icon_state = "tesla" - origin_tech = list(TECH_PHORON = 2, TECH_POWER = 2, TECH_ENGINEERING = 1) equip_cooldown = 10 energy_drain = 0 range = MECH_MELEE @@ -128,7 +127,6 @@ name = "\improper ExoNuclear reactor" desc = "Generates power using uranium. Pollutes the environment." icon_state = "tesla" - origin_tech = list(TECH_POWER = 3, TECH_ENGINEERING = 3) max_fuel = 50000 fuel_per_cycle_idle = 10 fuel_per_cycle_active = 30 diff --git a/code/game/mecha/equipment/tools/hardpoint_actuator.dm b/code/game/mecha/equipment/tools/hardpoint_actuator.dm index 7d4b7c1fc77..122f61acc44 100644 --- a/code/game/mecha/equipment/tools/hardpoint_actuator.dm +++ b/code/game/mecha/equipment/tools/hardpoint_actuator.dm @@ -8,7 +8,6 @@ equip_cooldown = 10 SECONDS energy_drain = 600 equip_type = EQUIP_HULL - origin_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 5, TECH_POWER = 4, TECH_COMBAT = 1, TECH_MAGNET = 4) /obj/item/mecha_parts/mecha_equipment/hardpoint_actuator/action(atom/target) if(!action_checks(target)) diff --git a/code/game/mecha/equipment/tools/inflatables.dm b/code/game/mecha/equipment/tools/inflatables.dm index a8b4b056efa..464884949ec 100644 --- a/code/game/mecha/equipment/tools/inflatables.dm +++ b/code/game/mecha/equipment/tools/inflatables.dm @@ -2,7 +2,6 @@ name = "inflatable deployment mechanism" desc = "An exosuit-mounted inflatable barrier deployer. Useful!" icon_state = "mecha_inflatables" - origin_tech = list(TECH_MATERIAL = 5, TECH_MAGNET = 3) equip_cooldown = 3 energy_drain = 30 range = MECH_MELEE diff --git a/code/game/mecha/equipment/tools/medigun_vr.dm b/code/game/mecha/equipment/tools/medigun_vr.dm index d0518efb116..d86b61fe007 100644 --- a/code/game/mecha/equipment/tools/medigun_vr.dm +++ b/code/game/mecha/equipment/tools/medigun_vr.dm @@ -9,4 +9,3 @@ fire_sound = 'sound/weapons/eluger.ogg' equip_type = EQUIP_UTILITY required_type = /obj/mecha/medical - origin_tech = list(TECH_MATERIAL = 5, TECH_COMBAT = 5, TECH_BIO = 6, TECH_POWER = 6) diff --git a/code/game/mecha/equipment/tools/orescanner.dm b/code/game/mecha/equipment/tools/orescanner.dm index 83612e1104c..320e789d930 100644 --- a/code/game/mecha/equipment/tools/orescanner.dm +++ b/code/game/mecha/equipment/tools/orescanner.dm @@ -2,7 +2,6 @@ name = "mounted ore scanner" desc = "An exosuit-mounted ore scanner." icon_state = "mecha_analyzer" - origin_tech = list(TECH_MATERIAL = 2, TECH_MAGNET = 2, TECH_POWER = 2) equip_cooldown = 5 energy_drain = 30 range = MECH_MELEE|RANGED diff --git a/code/game/mecha/equipment/tools/passenger.dm b/code/game/mecha/equipment/tools/passenger.dm index cb556ed390d..d0e2f83558a 100644 --- a/code/game/mecha/equipment/tools/passenger.dm +++ b/code/game/mecha/equipment/tools/passenger.dm @@ -2,7 +2,6 @@ name = "passenger compartment" desc = "A mountable passenger compartment for exosuits. Rather cramped." icon_state = "mecha_passenger" - origin_tech = list(TECH_ENGINEERING = 1, TECH_BIO = 1) energy_drain = 10 range = MECH_MELEE equip_cooldown = 20 diff --git a/code/game/mecha/equipment/tools/powertool.dm b/code/game/mecha/equipment/tools/powertool.dm index c1f6a959531..1f09615630b 100644 --- a/code/game/mecha/equipment/tools/powertool.dm +++ b/code/game/mecha/equipment/tools/powertool.dm @@ -2,7 +2,6 @@ name = "pneumatic wrench" desc = "An exosuit-mounted hydraulic wrench." icon_state = "mecha_wrench" - origin_tech = list(TECH_MATERIAL = 2, TECH_MAGNET = 2, TECH_POWER = 2) equip_cooldown = 3 energy_drain = 15 range = MECH_MELEE diff --git a/code/game/mecha/equipment/tools/rcd.dm b/code/game/mecha/equipment/tools/rcd.dm index 71e2a3a668d..cbf0b9d4f60 100644 --- a/code/game/mecha/equipment/tools/rcd.dm +++ b/code/game/mecha/equipment/tools/rcd.dm @@ -3,7 +3,6 @@ desc = "An exosuit-mounted Rapid Construction Device. (Can be attached to: Any exosuit)" mech_flags = EXOSUIT_MODULE_WORKING|EXOSUIT_MODULE_COMBAT|EXOSUIT_MODULE_MEDICAL icon_state = "mecha_rcd" - origin_tech = list(TECH_MATERIAL = 4, TECH_BLUESPACE = 3, TECH_MAGNET = 4, TECH_POWER = 4) equip_cooldown = 10 energy_drain = 250 range = MECH_MELEE|RANGED diff --git a/code/game/mecha/equipment/tools/repair_droid.dm b/code/game/mecha/equipment/tools/repair_droid.dm index 2f7994f6e16..4c4bbff4a6e 100644 --- a/code/game/mecha/equipment/tools/repair_droid.dm +++ b/code/game/mecha/equipment/tools/repair_droid.dm @@ -2,7 +2,6 @@ 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 = list(TECH_MAGNET = 3, TECH_DATA = 3) equip_cooldown = 20 energy_drain = 100 range = 0 diff --git a/code/game/mecha/equipment/tools/running_board.dm b/code/game/mecha/equipment/tools/running_board.dm index 4f55c5d08dd..45dbcfee27b 100644 --- a/code/game/mecha/equipment/tools/running_board.dm +++ b/code/game/mecha/equipment/tools/running_board.dm @@ -3,7 +3,6 @@ name = "hacked powered exosuit running board" desc = "A running board with a power-lifter attachment, to quickly catapult exosuit pilots into the cockpit. Fits any exosuit." icon_state = "mecha_runningboard" - origin_tech = list(TECH_MATERIAL = 6) equip_type = EQUIP_HULL /obj/item/mecha_parts/mecha_equipment/runningboard/limited diff --git a/code/game/mecha/equipment/tools/shield.dm b/code/game/mecha/equipment/tools/shield.dm index 6a05cd85b93..64fc3bfcf65 100644 --- a/code/game/mecha/equipment/tools/shield.dm +++ b/code/game/mecha/equipment/tools/shield.dm @@ -2,7 +2,6 @@ name = "linear combat shield" desc = "A shield generator that forms a rectangular, unidirectionally projectile-blocking wall in front of the exosuit." icon_state = "shield" - origin_tech = list(TECH_PHORON = 3, TECH_MAGNET = 6, TECH_ILLEGAL = 4) equip_cooldown = 5 energy_drain = 20 range = 0 diff --git a/code/game/mecha/equipment/tools/shield_omni.dm b/code/game/mecha/equipment/tools/shield_omni.dm index ca497c11486..512f2663d7a 100644 --- a/code/game/mecha/equipment/tools/shield_omni.dm +++ b/code/game/mecha/equipment/tools/shield_omni.dm @@ -4,7 +4,6 @@ name = "omni shield" desc = "A shield generator that forms an ennlosing, omnidirectional shield around the exosuit." icon_state = "shield" - origin_tech = list(TECH_PHORON = 3, TECH_MAGNET = 6, TECH_ILLEGAL = 4) equip_cooldown = 5 energy_drain = OMNI_SHIELD_DRAIN range = 0 diff --git a/code/game/mecha/equipment/tools/sleeper.dm b/code/game/mecha/equipment/tools/sleeper.dm index 06a20853433..0496f51baf2 100644 --- a/code/game/mecha/equipment/tools/sleeper.dm +++ b/code/game/mecha/equipment/tools/sleeper.dm @@ -3,7 +3,6 @@ desc = "A sleeper. Mountable to an exosuit. (Can be attached to: Medical Exosuits)" icon = 'icons/obj/Cryogenic2.dmi' icon_state = "sleeper_0" - origin_tech = list(TECH_DATA = 2, TECH_BIO = 3) energy_drain = 20 range = MECH_MELEE equip_cooldown = 30 diff --git a/code/game/mecha/equipment/tools/speedboost.dm b/code/game/mecha/equipment/tools/speedboost.dm index 0ff960a38e9..71f43796b9e 100644 --- a/code/game/mecha/equipment/tools/speedboost.dm +++ b/code/game/mecha/equipment/tools/speedboost.dm @@ -2,7 +2,6 @@ name = "ripley leg actuator overdrive" desc = "System enhancements and overdrives to make a ripley's legs move faster." icon_state = "tesla" - origin_tech = list( TECH_POWER = 5, TECH_MATERIAL = 4, TECH_ENGINEERING = 4) required_type = list(/obj/mecha/working/ripley) equip_type = EQUIP_HULL diff --git a/code/game/mecha/equipment/tools/storage_compartment.dm b/code/game/mecha/equipment/tools/storage_compartment.dm index ff5871db7a8..5d067a64634 100644 --- a/code/game/mecha/equipment/tools/storage_compartment.dm +++ b/code/game/mecha/equipment/tools/storage_compartment.dm @@ -3,7 +3,6 @@ desc = "An auxillary storage compartment, for attaching to exosuits." icon_state = "mecha_tiler" icon = 'icons/mecha/mecha_equipment_vr.dmi' - origin_tech = list(TECH_MATERIAL = 3) range = 0 var/storage_added = 5 equip_type = EQUIP_SPECIAL @@ -22,4 +21,3 @@ despite its blatant disregard for the fabric of reality or reality-adjacency." icon_state = "mecha_phase_array" storage_added = 15 - origin_tech = list(TECH_MATERIAL = 6, TECH_ENGINEERING = 4, TECH_MAGNET = 4, TECH_POWER = 5, TECH_BLUESPACE = 3) diff --git a/code/game/mecha/equipment/tools/syringe_gun.dm b/code/game/mecha/equipment/tools/syringe_gun.dm index 10ee161b4b6..0ea66d617d3 100644 --- a/code/game/mecha/equipment/tools/syringe_gun.dm +++ b/code/game/mecha/equipment/tools/syringe_gun.dm @@ -15,7 +15,6 @@ var/datum/global_iterator/mech_synth/synth range = MECH_MELEE|RANGED equip_cooldown = 10 - origin_tech = list(TECH_MATERIAL = 3, TECH_BIO = 4, TECH_MAGNET = 4, TECH_DATA = 3) required_type = list(/obj/mecha/medical) /obj/item/mecha_parts/mecha_equipment/tool/syringe_gun/Initialize(mapload) @@ -279,7 +278,6 @@ name = "crisis dronebay" desc = "A small shoulder-mounted dronebay containing a rapid response drone capable of moderately stabilizing a patient near the exosuit." icon_state = "mecha_dronebay" - origin_tech = list(TECH_PHORON = 3, TECH_MAGNET = 6, TECH_BIO = 5, TECH_DATA = 4) range = MECH_MELEE|RANGED equip_cooldown = 3 SECONDS required_type = list(/obj/mecha/medical) @@ -493,7 +491,6 @@ name = "mounted humanoid scanner" desc = "An exosuit-mounted scanning device." icon_state = "mecha_analyzer_health" - origin_tech = list(TECH_MATERIAL = 5, TECH_MAGNET = 5, TECH_BIO = 5) equip_cooldown = 5 SECONDS energy_drain = 100 range = MECH_MELEE diff --git a/code/game/mecha/equipment/tools/teleporter.dm b/code/game/mecha/equipment/tools/teleporter.dm index 161b8947525..c9e4cae3522 100644 --- a/code/game/mecha/equipment/tools/teleporter.dm +++ b/code/game/mecha/equipment/tools/teleporter.dm @@ -2,7 +2,6 @@ name = "teleporter" desc = "An exosuit module that allows exosuits to teleport to any position in view." icon_state = "mecha_teleport" - origin_tech = list(TECH_BLUESPACE = 10) equip_cooldown = 150 energy_drain = 1000 range = RANGED diff --git a/code/game/mecha/equipment/tools/weldinglaser.dm b/code/game/mecha/equipment/tools/weldinglaser.dm index 58a43fc47c7..32853d4e462 100644 --- a/code/game/mecha/equipment/tools/weldinglaser.dm +++ b/code/game/mecha/equipment/tools/weldinglaser.dm @@ -2,7 +2,6 @@ name = "welding laser" desc = "An exosuit-mounted welding laser." icon_state = "mecha_laser-rig" - origin_tech = list(TECH_MATERIAL = 4, TECH_MAGNET = 3, TECH_POWER = 4, TECH_PHORON = 2) equip_cooldown = 3 energy_drain = 15 range = MECH_MELEE diff --git a/code/game/mecha/equipment/tools/wormhole.dm b/code/game/mecha/equipment/tools/wormhole.dm index abbe123f6a9..b920044963c 100644 --- a/code/game/mecha/equipment/tools/wormhole.dm +++ b/code/game/mecha/equipment/tools/wormhole.dm @@ -2,7 +2,6 @@ name = "wormhole generator" desc = "An exosuit module that allows generating of small quasi-stable wormholes." icon_state = "mecha_wholegen" - origin_tech = list(TECH_BLUESPACE = 3) equip_cooldown = 50 energy_drain = 300 range = RANGED diff --git a/code/game/mecha/equipment/weapons/ballistic/mortar.dm b/code/game/mecha/equipment/weapons/ballistic/mortar.dm index 54689e92997..b0d5d78a291 100644 --- a/code/game/mecha/equipment/weapons/ballistic/mortar.dm +++ b/code/game/mecha/equipment/weapons/ballistic/mortar.dm @@ -13,8 +13,6 @@ step_delay = 2 - origin_tech = list(TECH_MATERIAL = 4, TECH_COMBAT = 5, TECH_ILLEGAL = 3) - /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/mortar/action_checks(atom/target) var/turf/MT = get_turf(chassis) var/turf/TT = get_turf(target) diff --git a/code/game/mecha/equipment/weapons/ballistic/shotgun.dm b/code/game/mecha/equipment/weapons/ballistic/shotgun.dm index a662bbf0083..0f9cb6bd7c1 100644 --- a/code/game/mecha/equipment/weapons/ballistic/shotgun.dm +++ b/code/game/mecha/equipment/weapons/ballistic/shotgun.dm @@ -13,7 +13,6 @@ step_delay = 0.5 - origin_tech = list(TECH_MATERIAL = 3, TECH_COMBAT = 4) /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot/rigged name = "jury-rigged shrapnel cannon" diff --git a/code/game/mecha/equipment/weapons/defense/shocker.dm b/code/game/mecha/equipment/weapons/defense/shocker.dm index 63c6db72a01..63721ec86f5 100644 --- a/code/game/mecha/equipment/weapons/defense/shocker.dm +++ b/code/game/mecha/equipment/weapons/defense/shocker.dm @@ -9,7 +9,7 @@ equip_cooldown = 10 energy_drain = 100 range = RANGED - origin_tech = list(TECH_COMBAT = 3, TECH_POWER = 6) + var/shock_damage = 15 var/active diff --git a/code/game/mecha/equipment/weapons/energy/ion.dm b/code/game/mecha/equipment/weapons/energy/ion.dm index 9c1af273a28..91ec8070d8b 100644 --- a/code/game/mecha/equipment/weapons/energy/ion.dm +++ b/code/game/mecha/equipment/weapons/energy/ion.dm @@ -7,8 +7,6 @@ projectile = /obj/item/projectile/ion fire_sound = 'sound/weapons/Laser.ogg' - origin_tech = list(TECH_MATERIAL = 3, TECH_COMBAT = 4, TECH_MAGNET = 4) - /obj/item/mecha_parts/mecha_equipment/weapon/energy/ion/rigged equip_cooldown = 30 name = "jury-rigged ion cannon" diff --git a/code/game/mecha/equipment/weapons/energy/laser.dm b/code/game/mecha/equipment/weapons/energy/laser.dm index 5d81dca4165..1a79a1f832f 100644 --- a/code/game/mecha/equipment/weapons/energy/laser.dm +++ b/code/game/mecha/equipment/weapons/energy/laser.dm @@ -7,8 +7,6 @@ projectile = /obj/item/projectile/beam fire_sound = 'sound/weapons/Laser.ogg' - origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 3, TECH_MAGNET = 3) - /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/xray equip_cooldown = 6 name = "\improper CH-XS \"Penetrator\" laser" @@ -18,8 +16,6 @@ projectile = /obj/item/projectile/beam/xray fire_sound = 'sound/weapons/eluger.ogg' - origin_tech = list(TECH_MATERIAL = 3, TECH_COMBAT = 3, TECH_PHORON = 3, TECH_POWER = 3) - /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/xray/rigged equip_cooldown = 12 name = "jury-rigged xray rifle" @@ -41,8 +37,6 @@ equip_type = EQUIP_UTILITY - origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 2, TECH_MAGNET = 2) - /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy equip_cooldown = 15 name = "\improper CH-LC \"Solaris\" laser cannon" @@ -54,8 +48,6 @@ step_delay = 1 - origin_tech = list(TECH_MATERIAL = 3, TECH_COMBAT = 4, TECH_MAGNET = 4) - /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy/rigged equip_cooldown = 25 name = "jury-rigged emitter cannon" @@ -67,8 +59,6 @@ equip_type = EQUIP_UTILITY - origin_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 4, TECH_PHORON = 3, TECH_ILLEGAL = 1) - /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/gamma equip_cooldown = 5 name = "\improper GA-X \"Render\" Experimental Gamma Laser" @@ -77,5 +67,3 @@ energy_drain = 80 projectile = /obj/item/projectile/beam/gamma fire_sound = 'sound/weapons/emitter.ogg' - - origin_tech = list(TECH_MATERIAL = 4, TECH_COMBAT = 4, TECH_PHORON = 4, TECH_POWER = 4, TECH_ILLEGAL = 3) diff --git a/code/game/mecha/equipment/weapons/energy/phased.dm b/code/game/mecha/equipment/weapons/energy/phased.dm index 7b616fe07c4..75126d703f0 100644 --- a/code/game/mecha/equipment/weapons/energy/phased.dm +++ b/code/game/mecha/equipment/weapons/energy/phased.dm @@ -9,5 +9,3 @@ fire_sound = 'sound/weapons/taser.ogg' equip_type = EQUIP_UTILITY - - origin_tech = list(TECH_MATERIAL = 1, TECH_COMBAT = 2, TECH_MAGNET = 2) diff --git a/code/game/mecha/equipment/weapons/energy/pulse.dm b/code/game/mecha/equipment/weapons/energy/pulse.dm index ecc3cb12ff0..7838eb9b12e 100644 --- a/code/game/mecha/equipment/weapons/energy/pulse.dm +++ b/code/game/mecha/equipment/weapons/energy/pulse.dm @@ -4,7 +4,6 @@ desc = "An experimental Anti-Everything weapon." icon_state = "mecha_pulse" energy_drain = 120 - origin_tech = list(TECH_MATERIAL = 3, TECH_COMBAT = 6, TECH_POWER = 4) projectile = /obj/item/projectile/beam/pulse/heavy fire_sound = 'sound/weapons/gauss_shoot.ogg' diff --git a/code/game/mecha/equipment/weapons/explosive/grenade.dm b/code/game/mecha/equipment/weapons/explosive/grenade.dm index b79638cfda7..db2381448f2 100644 --- a/code/game/mecha/equipment/weapons/explosive/grenade.dm +++ b/code/game/mecha/equipment/weapons/explosive/grenade.dm @@ -30,8 +30,6 @@ desc = "A grenade launcher produced for use by government uprising subjugation forces, or that's what you might guess; fires matryoshka flashbangs." projectile = /obj/item/grenade/flashbang/clusterbang - origin_tech = list(TECH_COMBAT= 5, TECH_MATERIAL = 5, TECH_ILLEGAL = 3) - /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/clusterbang/limited/get_equip_info()//Limited version of the clusterbang launcher that can't reload return (equip_ready ? span_green("*") : span_red("*")) + " [chassis.selected==src?"":""][src.name][chassis.selected==src?"":""]\[[src.projectiles]\]" @@ -48,8 +46,6 @@ equip_cooldown = 50 det_time = 25 - origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 4, TECH_ILLEGAL = 1) - /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/frag name = "\improper HEP-I 5 grenade launcher" desc = "A military-grade grenade launcher that fires anti-personnel fragmentation grenades." @@ -58,13 +54,9 @@ projectiles = 4 missile_speed = 1 - origin_tech = list(TECH_COMBAT = 5, TECH_ENGINEERING = 5, TECH_MATERIAL = 5, TECH_ILLEGAL = 3) - /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/frag/mini name = "\improper HEP-MI 6 grenade launcher" desc = "A military-grade grenade launcher that fires miniaturized anti-personnel fragmentation grenades." projectile = /obj/item/grenade/explosive/mini projectile_energy_cost = 500 equip_cooldown = 25 - - origin_tech = list(TECH_COMBAT = 4, TECH_ENGINEERING = 2, TECH_MATERIAL = 3, TECH_ILLEGAL = 2) diff --git a/code/game/mecha/equipment/weapons/fire/flamethrower.dm b/code/game/mecha/equipment/weapons/fire/flamethrower.dm index 5e2d79615c6..6e09c9299ed 100644 --- a/code/game/mecha/equipment/weapons/fire/flamethrower.dm +++ b/code/game/mecha/equipment/weapons/fire/flamethrower.dm @@ -12,8 +12,6 @@ projectile = /obj/item/projectile/bullet/incendiary/flamethrower/large fire_sound = 'sound/weapons/towelwipe.ogg' - origin_tech = list(TECH_MATERIAL = 4, TECH_COMBAT = 6, TECH_PHORON = 4, TECH_ILLEGAL = 4) - /obj/item/mecha_parts/mecha_equipment/weapon/energy/flamer/rigged name = "\improper AA-CR-1 Mark 4" description_fluff = "A firefighting tool maintained by Aether Atmospherics, whose initial design originated from a small Earth company. This one seems to have been jury rigged." @@ -24,6 +22,4 @@ projectile = /obj/item/projectile/bullet/incendiary/flamethrower - origin_tech = list(TECH_MATERIAL = 3, TECH_COMBAT = 3, TECH_PHORON = 3, TECH_ILLEGAL = 2) - equip_type = EQUIP_UTILITY diff --git a/code/game/mecha/equipment/weapons/fire/incendiary.dm b/code/game/mecha/equipment/weapons/fire/incendiary.dm index b285618c881..0cc3be4b441 100644 --- a/code/game/mecha/equipment/weapons/fire/incendiary.dm +++ b/code/game/mecha/equipment/weapons/fire/incendiary.dm @@ -15,6 +15,4 @@ deviation = 0.4 projectile_energy_cost = 40 fire_cooldown = 3 - origin_tech = list(TECH_MATERIAL = 4, TECH_COMBAT = 5, TECH_PHORON = 2, TECH_ILLEGAL = 1) - step_delay = 1 diff --git a/code/game/mecha/equipment/weapons/honk.dm b/code/game/mecha/equipment/weapons/honk.dm index 95f9a18c2b2..00673a5535d 100644 --- a/code/game/mecha/equipment/weapons/honk.dm +++ b/code/game/mecha/equipment/weapons/honk.dm @@ -4,7 +4,6 @@ icon_state = "mecha_honker" energy_drain = 300 equip_cooldown = 150 - origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 4, TECH_ILLEGAL = 1) equip_type = EQUIP_SPECIAL diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index bfa23f4d4df..7e92c5d74a6 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -1,7 +1,6 @@ /obj/item/mecha_parts/mecha_equipment/weapon name = "mecha weapon" range = RANGED - origin_tech = list(TECH_MATERIAL = 3, TECH_COMBAT = 3) matter = list(MAT_STEEL = 6000, MAT_GLASS = 3000) var/projectile //Type of projectile fired. var/projectiles = 1 //Amount of projectiles loaded. diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm index 84c9353a197..2d97b38d40d 100644 --- a/code/game/mecha/mecha_control_console.dm +++ b/code/game/mecha/mecha_control_console.dm @@ -75,7 +75,6 @@ desc = "Device used to transmit exosuit data." icon = 'icons/obj/device.dmi' icon_state = "motion2" - origin_tech = list(TECH_DATA = 2, TECH_MAGNET = 2) /obj/item/mecha_parts/mecha_tracking/tgui_data(mob/user) var/list/data = ..() diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm index a8a2eab1c3e..4f6ae169954 100644 --- a/code/game/mecha/mecha_parts.dm +++ b/code/game/mecha/mecha_parts.dm @@ -9,7 +9,6 @@ icon = 'icons/mecha/mech_construct.dmi' icon_state = "blank" w_class = ITEMSIZE_HUGE - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2) /obj/item/mecha_parts/chassis @@ -38,31 +37,26 @@ 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 = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_BIO = 2, TECH_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 = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_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 = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2) /obj/item/mecha_parts/part/ripley_left_leg name="Ripley Left Leg" desc="A Ripley APLU left leg. Contains somewhat complex servodrives and balance maintaining systems." icon_state = "ripley_l_leg" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2) /obj/item/mecha_parts/part/ripley_right_leg name="Ripley Right Leg" desc="A Ripley APLU right leg. Contains somewhat complex servodrives and balance maintaining systems." icon_state = "ripley_r_leg" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2) ///////// Gygax @@ -77,40 +71,33 @@ name="Gygax Torso" desc="A torso part of Gygax. Contains power unit, processing core and life support systems. Has an additional equipment slot." icon_state = "gygax_harness" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_BIO = 3, TECH_ENGINEERING = 3) /obj/item/mecha_parts/part/gygax_head name="Gygax Head" desc="A Gygax head. Houses advanced surveilance and targeting sensors." icon_state = "gygax_head" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_MAGNET = 3, TECH_ENGINEERING = 3) /obj/item/mecha_parts/part/gygax_left_arm name="Gygax Left Arm" desc="A Gygax left arm. Data and power sockets are compatible with most exosuit tools and weapons." icon_state = "gygax_l_arm" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 3) /obj/item/mecha_parts/part/gygax_right_arm name="Gygax Right Arm" desc="A Gygax right arm. Data and power sockets are compatible with most exosuit tools and weapons." icon_state = "gygax_r_arm" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 3) /obj/item/mecha_parts/part/gygax_left_leg name="Gygax Left Leg" icon_state = "gygax_l_leg" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 3) /obj/item/mecha_parts/part/gygax_right_leg name="Gygax Right Leg" icon_state = "gygax_r_leg" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 3) /obj/item/mecha_parts/part/gygax_armour name="Gygax Armour Plates" icon_state = "gygax_armour" - origin_tech = list(TECH_MATERIAL = 6, TECH_COMBAT = 4, TECH_ENGINEERING = 5) ////////// Serenity @@ -133,39 +120,30 @@ /obj/item/mecha_parts/part/durand_torso name="Durand Torso" icon_state = "durand_harness" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_BIO = 3, TECH_ENGINEERING = 3) /obj/item/mecha_parts/part/durand_head name="Durand Head" icon_state = "durand_head" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_MAGNET = 3, TECH_ENGINEERING = 3) /obj/item/mecha_parts/part/durand_left_arm name="Durand Left Arm" icon_state = "durand_l_arm" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_ENGINEERING = 3) /obj/item/mecha_parts/part/durand_right_arm name="Durand Right Arm" icon_state = "durand_r_arm" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_ENGINEERING = 3) /obj/item/mecha_parts/part/durand_left_leg name="Durand Left Leg" icon_state = "durand_l_leg" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_ENGINEERING = 3) /obj/item/mecha_parts/part/durand_right_leg name="Durand Right Leg" icon_state = "durand_r_leg" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_ENGINEERING = 3) /obj/item/mecha_parts/part/durand_armour name="Durand Armour Plates" icon_state = "durand_armour" - origin_tech = list(TECH_MATERIAL = 5, TECH_COMBAT = 4, TECH_ENGINEERING = 5) - - ////////// Firefighter @@ -201,7 +179,6 @@ /obj/item/mecha_parts/chassis/phazon name = "Phazon Chassis" - origin_tech = list(TECH_MATERIAL = 7) /obj/item/mecha_parts/chassis/phazon/Initialize(mapload) . = ..() @@ -212,42 +189,36 @@ icon_state = "phazon_harness" //construction_time = 300 //construction_cost = list(MAT_STEEL=35000,MAT_GLASS=10000,MAT_PHORON=20000) - origin_tech = list(TECH_DATA = 5, TECH_MATERIAL = 7, TECH_BLUESPACE = 6, TECH_POWER = 6) /obj/item/mecha_parts/part/phazon_head name="Phazon Head" icon_state = "phazon_head" //construction_time = 200 //construction_cost = list(MAT_STEEL=15000,MAT_GLASS=5000,MAT_PHORON=10000) - origin_tech = list(TECH_DATA = 4, TECH_MATERIAL = 5, TECH_MAGNET = 6) /obj/item/mecha_parts/part/phazon_left_arm name="Phazon Left Arm" icon_state = "phazon_l_arm" //construction_time = 200 //construction_cost = list(MAT_STEEL=20000,MAT_PHORON=10000) - origin_tech = list(TECH_MATERIAL = 5, TECH_BLUESPACE = 2, TECH_MAGNET = 2) /obj/item/mecha_parts/part/phazon_right_arm name="Phazon Right Arm" icon_state = "phazon_r_arm" //construction_time = 200 //construction_cost = list(MAT_STEEL=20000,MAT_PHORON=10000) - origin_tech = list(TECH_MATERIAL = 5, TECH_BLUESPACE = 2, TECH_MAGNET = 2) /obj/item/mecha_parts/part/phazon_left_leg name="Phazon Left Leg" icon_state = "phazon_l_leg" //construction_time = 200 //construction_cost = list(MAT_STEEL=20000,MAT_PHORON=10000) - origin_tech = list(TECH_MATERIAL = 5, TECH_BLUESPACE = 3, TECH_MAGNET = 3) /obj/item/mecha_parts/part/phazon_right_leg name="Phazon Right Leg" icon_state = "phazon_r_leg" //construction_time = 200 //construction_cost = list(MAT_STEEL=20000,MAT_PHORON=10000) - origin_tech = list(TECH_MATERIAL = 5, TECH_BLUESPACE = 3, TECH_MAGNET = 3) ///////// Odysseus @@ -262,42 +233,35 @@ /obj/item/mecha_parts/part/odysseus_head name="Odysseus Head" icon_state = "odysseus_head" - origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 2) /obj/item/mecha_parts/part/odysseus_torso name="Odysseus Torso" desc="A torso part of Odysseus. Contains power unit, processing core and life support systems." icon_state = "odysseus_torso" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_BIO = 2, TECH_ENGINEERING = 2) /obj/item/mecha_parts/part/odysseus_left_arm name="Odysseus Left Arm" desc="An Odysseus left arm. Data and power sockets are compatible with most exosuit tools." icon_state = "odysseus_l_arm" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2) /obj/item/mecha_parts/part/odysseus_right_arm name="Odysseus Right Arm" desc="An Odysseus right arm. Data and power sockets are compatible with most exosuit tools." icon_state = "odysseus_r_arm" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2) /obj/item/mecha_parts/part/odysseus_left_leg name="Odysseus Left Leg" desc="An Odysseus left leg. Contains somewhat complex servodrives and balance maintaining systems." icon_state = "odysseus_l_leg" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2) /obj/item/mecha_parts/part/odysseus_right_leg name="Odysseus Right Leg" desc="A Odysseus right leg. Contains somewhat complex servodrives and balance maintaining systems." icon_state = "odysseus_r_leg" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2) /*/obj/item/mecha_parts/part/odysseus_armour name="Odysseus Carapace" icon_state = "odysseus_armour" - origin_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 3) construction_time = 200 construction_cost = list(MAT_STEEL=15000)*/ @@ -305,7 +269,6 @@ /obj/item/mecha_parts/chassis/janus name = "Janus Chassis" - origin_tech = list(TECH_MATERIAL = 7) /obj/item/mecha_parts/chassis/janus/Initialize(mapload) . = ..() @@ -314,32 +277,25 @@ /obj/item/mecha_parts/part/janus_torso name="Imperion Torso" icon_state = "janus_harness" - origin_tech = list(TECH_DATA = 5, TECH_MATERIAL = 7, TECH_BLUESPACE = 2, TECH_POWER = 6, TECH_PRECURSOR = 2) - /obj/item/mecha_parts/part/janus_head name="Imperion Head" icon_state = "janus_head" - origin_tech = list(TECH_DATA = 4, TECH_MATERIAL = 5, TECH_MAGNET = 6, TECH_PRECURSOR = 1) /obj/item/mecha_parts/part/janus_left_arm name="Prototype Gygax Left Arm" icon_state = "janus_l_arm" - origin_tech = list(TECH_MATERIAL = 5, TECH_BLUESPACE = 2, TECH_MAGNET = 2) /obj/item/mecha_parts/part/janus_right_arm name="Prototype Gygax Right Arm" icon_state = "janus_r_arm" - origin_tech = list(TECH_MATERIAL = 5, TECH_BLUESPACE = 2, TECH_MAGNET = 2) /obj/item/mecha_parts/part/janus_left_leg name="Prototype Durand Left Leg" icon_state = "janus_l_leg" - origin_tech = list(TECH_MATERIAL = 5, TECH_BLUESPACE = 3, TECH_MAGNET = 3, TECH_ARCANE = 1) /obj/item/mecha_parts/part/janus_right_leg name="Prototype Durand Right Leg" icon_state = "janus_r_leg" - origin_tech = list(TECH_MATERIAL = 5, TECH_BLUESPACE = 3, TECH_MAGNET = 3, TECH_ARCANE = 1) ///Fighters/// @@ -368,47 +324,37 @@ name = "\improper Pinnace Chassis" icon_state = "pinnace_chassis" - origin_tech = list(TECH_MATERIAL = 2) - /obj/item/mecha_parts/fighter/chassis/pinnace/Initialize(mapload) . = ..() construct = new /datum/construction/mecha/fighter/pinnace_chassis(src) - /obj/item/mecha_parts/fighter/part/pinnace_core name="\improper Pinnace Core" icon_state = "pinnace_core" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2) /obj/item/mecha_parts/fighter/part/pinnace_cockpit name="\improper Pinnace Cockpit" icon_state = "pinnace_cockpit" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2) /obj/item/mecha_parts/fighter/part/pinnace_left_wing name="\improper Pinnace Left Wing" icon_state = "pinnace_l_wing" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2) /obj/item/mecha_parts/fighter/part/pinnace_right_wing name="\improper Pinnace Right Wing" icon_state = "pinnace_r_wing" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2) /obj/item/mecha_parts/fighter/part/pinnace_main_engine name="\improper Pinnace Main Engine" icon_state = "pinnace_m_engine" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2) /obj/item/mecha_parts/fighter/part/pinnace_left_engine name="\improper Pinnace Left Engine" icon_state = "pinnace_l_engine" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2) /obj/item/mecha_parts/fighter/part/pinnace_right_engine name="\improper Pinnace Right Engine" icon_state = "pinnace_r_engine" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2) //! Baron @@ -416,7 +362,6 @@ name = "\improper Baron Chassis" icon_state = "baron_chassis" - origin_tech = list(TECH_MATERIAL = 2) /obj/item/mecha_parts/fighter/chassis/baron/Initialize(mapload) . = ..() @@ -426,34 +371,27 @@ /obj/item/mecha_parts/fighter/part/baron_core name="\improper Baron Core" icon_state = "baron_core" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 5, TECH_BIO = 2, TECH_ENGINEERING = 4) /obj/item/mecha_parts/fighter/part/baron_cockpit name="\improper Baron Cockpit" icon_state = "baron_cockpit" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 5, TECH_BIO = 2, TECH_ENGINEERING = 4) /obj/item/mecha_parts/fighter/part/baron_left_wing name="\improper Baron Left Wing" icon_state = "baron_l_wing" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 5, TECH_ENGINEERING = 4) /obj/item/mecha_parts/fighter/part/baron_right_wing name="\improper Baron Right Wing" icon_state = "baron_r_wing" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 5, TECH_ENGINEERING = 4) /obj/item/mecha_parts/fighter/part/baron_main_engine name="\improper Baron Main Engine" icon_state = "baron_m_engine" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 5, TECH_ENGINEERING = 4) /obj/item/mecha_parts/fighter/part/baron_left_engine name="\improper Baron Left Engine" icon_state = "baron_l_engine" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 5, TECH_ENGINEERING = 4) /obj/item/mecha_parts/fighter/part/baron_right_engine name="\improper Baron Right Engine" icon_state = "baron_r_engine" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 5, TECH_ENGINEERING = 4) diff --git a/code/game/mecha/micro/mecha_parts_vr.dm b/code/game/mecha/micro/mecha_parts_vr.dm index 97ff4782d40..ad5d2beee41 100644 --- a/code/game/mecha/micro/mecha_parts_vr.dm +++ b/code/game/mecha/micro/mecha_parts_vr.dm @@ -33,31 +33,26 @@ name="Gopher Torso" desc="A torso part of Gopher. Contains power unit, processing core and life support systems." icon_state = "gopher-torso" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_BIO = 2, TECH_ENGINEERING = 2) /obj/item/mecha_parts/micro/part/gopher_left_arm name="Gopher Left Arm" desc="A Gopher left arm. Data and power sockets are compatible with most exosuit tools." icon_state = "gopher-arm-left" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2) /obj/item/mecha_parts/micro/part/gopher_right_arm name="Gopher Right Arm" desc="A Gopher right arm. Data and power sockets are compatible with most exosuit tools." icon_state = "gopher-arm-right" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2) /obj/item/mecha_parts/micro/part/gopher_left_leg name="Gopher Left Leg" desc="A Gopher left leg. Contains somewhat complex servodrives and balance maintaining systems." icon_state = "gopher-leg-left" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2) /obj/item/mecha_parts/micro/part/gopher_right_leg name="Gopher Right Leg" desc="A Gopher right leg. Contains somewhat complex servodrives and balance maintaining systems." icon_state = "gopher-leg-right" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2) //polecat /obj/item/mecha_parts/micro/chassis/polecat @@ -71,32 +66,26 @@ /obj/item/mecha_parts/micro/part/polecat_torso name="Polecat Torso" icon_state = "polecat-torso" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_BIO = 3, TECH_ENGINEERING = 3) /obj/item/mecha_parts/micro/part/polecat_left_arm name="Polecat Left Arm" icon_state = "polecat-arm-left" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_ENGINEERING = 3) /obj/item/mecha_parts/micro/part/polecat_right_arm name="Polecat Right Arm" icon_state = "polecat-arm-right" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_ENGINEERING = 3) /obj/item/mecha_parts/micro/part/polecat_left_leg name="Polecat Left Leg" icon_state = "polecat-leg-left" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_ENGINEERING = 3) /obj/item/mecha_parts/micro/part/polecat_right_leg name="Polecat Right Leg" icon_state = "polecat-leg-right" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_ENGINEERING = 3) /obj/item/mecha_parts/micro/part/polecat_armour name="Polecat Armour Plates" icon_state = "polecat-armor" - origin_tech = list(TECH_MATERIAL = 5, TECH_COMBAT = 4, TECH_ENGINEERING = 5) //weasel /obj/item/mecha_parts/micro/chassis/weasel @@ -110,34 +99,27 @@ /obj/item/mecha_parts/micro/part/weasel_torso name="Weasel Torso" icon_state = "weasel-torso" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_BIO = 3, TECH_ENGINEERING = 3) /obj/item/mecha_parts/micro/part/weasel_head name="Weasel Head" icon_state = "weasel-head" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_MAGNET = 3, TECH_ENGINEERING = 3) /obj/item/mecha_parts/micro/part/weasel_left_arm name="Weasel Left Arm" icon_state = "weasel-arm-left" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_ENGINEERING = 3) /obj/item/mecha_parts/micro/part/weasel_right_arm name="Weasel Right Arm" icon_state = "weasel-arm-right" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_ENGINEERING = 3) /*/obj/item/mecha_parts/micro/part/weasel_left_leg name="Weasel Left Leg" icon_state = "weasel-leg-left" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_ENGINEERING = 3) /obj/item/mecha_parts/micro/part/weasel_right_leg name="Weasel Right Leg" - icon_state = "weasel-leg-right" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_ENGINEERING = 3)*/ + icon_state = "weasel-leg-right"*/ /obj/item/mecha_parts/micro/part/weasel_tri_leg name="Weasel Legs" icon_state = "weasel-leg-all" - origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_ENGINEERING = 3) diff --git a/code/game/mecha/micro/mecha_vr.dm b/code/game/mecha/micro/mecha_vr.dm index 9d64454f2e0..f5a27aa2a19 100644 --- a/code/game/mecha/micro/mecha_vr.dm +++ b/code/game/mecha/micro/mecha_vr.dm @@ -4,7 +4,6 @@ #define T_BOARD_MICRO_MECHA(name) "exosuit module circuit board (" + (name) + ")" /obj/item/circuitboard/mecha/gopher - origin_tech = list(TECH_DATA = 3) /obj/item/circuitboard/mecha/gopher/peripherals name = T_BOARD_MICRO_MECHA("Gopher peripherals control") @@ -15,7 +14,6 @@ icon_state = "mainboard" /obj/item/circuitboard/mecha/polecat - origin_tech = list(TECH_DATA = 4) /obj/item/circuitboard/mecha/polecat/peripherals name = T_BOARD_MICRO_MECHA("Polecat peripherals control") @@ -24,14 +22,12 @@ /obj/item/circuitboard/mecha/polecat/targeting name = T_BOARD_MICRO_MECHA("Polecat weapon control and targeting") icon_state = "mcontroller" - origin_tech = list(TECH_DATA = 4, TECH_COMBAT = 4) /obj/item/circuitboard/mecha/polecat/main name = T_BOARD_MICRO_MECHA("Polecat central control") icon_state = "mainboard" /obj/item/circuitboard/mecha/weasel - origin_tech = list(TECH_DATA = 4) /obj/item/circuitboard/mecha/weasel/peripherals name = T_BOARD_MICRO_MECHA("Weasel peripherals control") @@ -40,7 +36,6 @@ /obj/item/circuitboard/mecha/weasel/targeting name = T_BOARD_MICRO_MECHA("Weasel weapon control and targeting") icon_state = "mcontroller" - origin_tech = list(TECH_DATA = 4, TECH_COMBAT = 4) /obj/item/circuitboard/mecha/weasel/main name = T_BOARD_MICRO_MECHA("Weasel central control") diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index d5a98a8424b..7d8ba93faa6 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -22,7 +22,6 @@ pressure_resistance = 5 // causeerrorheresoifixthis var/obj/item/master = null - var/list/origin_tech = null //Used by R&D to determine what research bonuses it grants. var/list/attack_verb //Used in attackby() to say how something was attacked "[x] has been [z.attack_verb] by [y] with [z]" var/force = 0 var/damtype = BRUTE @@ -154,9 +153,6 @@ for(var/path in actions_types) add_item_action(path) - if(islist(origin_tech)) - origin_tech = typelist(NAMEOF(src, origin_tech), origin_tech) - if(embed_chance < 0) if(sharp) embed_chance = max(5, round(force/w_class)) diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index 51c0034c00d..f2b1a8be9a7 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -139,7 +139,6 @@ icon = 'icons/obj/closets/cryobag.dmi' icon_state = "bodybag_folded" item_state = "bodybag_cryo_folded" - origin_tech = list(TECH_BIO = 4) cryogenic = TRUE /obj/structure/closet/body_bag/cryobag diff --git a/code/game/objects/items/devices/advnifrepair.dm b/code/game/objects/items/devices/advnifrepair.dm index da1a6170727..d762374d949 100644 --- a/code/game/objects/items/devices/advnifrepair.dm +++ b/code/game/objects/items/devices/advnifrepair.dm @@ -11,7 +11,6 @@ throw_speed = 5 throw_range = 10 matter = list(MAT_STEEL = 4000, MAT_GLASS = 6000) - origin_tech = list(TECH_MAGNET = 5, TECH_BLUESPACE = 5, TECH_MATERIAL = 5, TECH_ENGINEERING = 5, TECH_DATA = 5) var/datum/reagents/supply var/efficiency = 15 //How many units reagent per 1 unit nanopaste pickup_sound = 'sound/items/pickup/device.ogg' diff --git a/code/game/objects/items/devices/ai_detector.dm b/code/game/objects/items/devices/ai_detector.dm index 06be51955d9..2220f3d2cd7 100644 --- a/code/game/objects/items/devices/ai_detector.dm +++ b/code/game/objects/items/devices/ai_detector.dm @@ -11,7 +11,6 @@ var/range_alert = 7 // Will turn red if the AI can observe its holder. var/range_warning = 14 // Will turn yellow if the AI's eye is near the holder. var/detect_state = PROXIMITY_NONE - origin_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2, TECH_ILLEGAL = 2) description_antag = "Functions as a normal multitool with one added benefit.
\ This will change colors and make sounds (that only you can hear) during various events.
\ BLUE: You are outside of camera range.
\ diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm index 7f00e0970a1..58815a1efef 100644 --- a/code/game/objects/items/devices/aicard.dm +++ b/code/game/objects/items/devices/aicard.dm @@ -10,7 +10,6 @@ preserve_item = 1 var/flush = null - origin_tech = list(TECH_DATA = 4, TECH_MATERIAL = 4) var/mob/living/silicon/ai/carded_ai diff --git a/code/game/objects/items/devices/body_snatcher_vr.dm b/code/game/objects/items/devices/body_snatcher_vr.dm index 8a79c70f69b..2ff3336e3e8 100644 --- a/code/game/objects/items/devices/body_snatcher_vr.dm +++ b/code/game/objects/items/devices/body_snatcher_vr.dm @@ -8,7 +8,6 @@ slot_flags = SLOT_BELT w_class = ITEMSIZE_SMALL matter = list(MAT_STEEL = 200) - origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 2, TECH_ILLEGAL = 1) pickup_sound = 'sound/items/pickup/device.ogg' drop_sound = 'sound/items/drop/device.ogg' flags = NOBLUDGEON diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index d2d0f931059..961ff0ff865 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -8,7 +8,6 @@ throw_speed = 1 throw_range = 5 w_class = ITEMSIZE_SMALL - origin_tech = list(TECH_ILLEGAL = 4, TECH_MAGNET = 4) var/can_use = 1 var/obj/effect/dummy/chameleon/active_dummy = null var/saved_item = /obj/item/trash/cigbutt diff --git a/code/game/objects/items/devices/communicator/communicator.dm b/code/game/objects/items/devices/communicator/communicator.dm index f629e004d10..93399ba62d4 100644 --- a/code/game/objects/items/devices/communicator/communicator.dm +++ b/code/game/objects/items/devices/communicator/communicator.dm @@ -23,7 +23,6 @@ slot_flags = SLOT_ID | SLOT_BELT show_messages = 1 - origin_tech = list(TECH_ENGINEERING = 2, TECH_MAGNET = 2, TECH_BLUESPACE = 2, TECH_DATA = 2) matter = list(MAT_STEEL = 30,MAT_GLASS = 10) var/video_range = 3 diff --git a/code/game/objects/items/devices/debugger.dm b/code/game/objects/items/devices/debugger.dm index 7a19a9926ff..ec5c71583d5 100644 --- a/code/game/objects/items/devices/debugger.dm +++ b/code/game/objects/items/devices/debugger.dm @@ -19,8 +19,6 @@ drop_sound = 'sound/items/drop/device.ogg' matter = list(MAT_STEEL = 50,MAT_GLASS = 20) - - origin_tech = list(TECH_MAGNET = 1, TECH_ENGINEERING = 1) var/obj/machinery/telecomms/buffer // simple machine buffer for device linkage /obj/item/debugger/is_used_on(obj/O, mob/user) diff --git a/code/game/objects/items/devices/defib.dm b/code/game/objects/items/devices/defib.dm index 97d6e838868..99daa437670 100644 --- a/code/game/objects/items/devices/defib.dm +++ b/code/game/objects/items/devices/defib.dm @@ -14,7 +14,6 @@ preserve_item = 1 w_class = ITEMSIZE_LARGE unacidable = TRUE - origin_tech = list(TECH_BIO = 4, TECH_POWER = 2) var/obj/item/shockpaddles/linked/paddle_path = /obj/item/shockpaddles/linked var/obj/item/cell/bcell = null @@ -137,7 +136,6 @@ item_state = "defibcompact" w_class = ITEMSIZE_NORMAL slot_flags = SLOT_BELT - origin_tech = list(TECH_BIO = 5, TECH_POWER = 3) /obj/item/defib_kit/compact/loaded bcell = /obj/item/cell/high diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index b97a38cc9aa..e3947d6e588 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -8,7 +8,6 @@ w_class = ITEMSIZE_SMALL throw_speed = 4 throw_range = 10 - origin_tech = list(TECH_MAGNET = 2, TECH_COMBAT = 1) ///Number of times it's been used. var/times_used = 0 @@ -312,7 +311,6 @@ name = "synthetic flash" desc = "When a problem arises, SCIENCE is the solution." icon_state = "sflash" - origin_tech = list(TECH_MAGNET = 2, TECH_COMBAT = 1) base_icon = "sflash" can_repair = FALSE one_use = TRUE diff --git a/code/game/objects/items/devices/gps.dm b/code/game/objects/items/devices/gps.dm index dc5c46f1512..04ffdc83b4f 100644 --- a/code/game/objects/items/devices/gps.dm +++ b/code/game/objects/items/devices/gps.dm @@ -7,7 +7,6 @@ GLOBAL_LIST_EMPTY(GPS_list) icon_state = "gps-gen" w_class = ITEMSIZE_TINY slot_flags = SLOT_BELT - origin_tech = list(TECH_MATERIAL = 2, TECH_BLUESPACE = 2, TECH_MAGNET = 1) matter = list(MAT_STEEL = 500) var/gps_tag = "GEN0" @@ -453,7 +452,6 @@ GLOBAL_LIST_EMPTY(GPS_list) icon_state = "gps-syndie" gps_tag = "NULL" desc = "A positioning system that has extended range and can detect other GPS device signals without revealing its own. How that works is best left a mystery. Alt+click to toggle power." - origin_tech = list(TECH_MATERIAL = 2, TECH_BLUESPACE = 3, TECH_MAGNET = 2, TECH_ILLEGAL = 2) long_range = TRUE hide_signal = TRUE can_hide_signal = TRUE diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index 2c4e280a3ec..9be1729a15d 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -8,7 +8,6 @@ slot_flags = SLOT_BELT matter = list(MAT_GLASS = 500, MAT_STEEL = 500) w_class = ITEMSIZE_SMALL //Increased to 2, because diodes are w_class 2. Conservation of matter. - origin_tech = list(TECH_MAGNET = 2, TECH_COMBAT = 1) var/turf/pointer_loc var/energy = 8 var/max_energy = 8 diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index cb8c909abfb..66c07bdd745 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -40,7 +40,6 @@ icon = 'icons/obj/janitor.dmi' icon_state = "lightreplacer0" slot_flags = SLOT_BELT - origin_tech = list(TECH_MAGNET = 3, TECH_MATERIAL = 2) var/max_uses = 32 var/uses = 32 diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index 1f8406147e2..4bae812da87 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -24,7 +24,6 @@ var/toolmode = MULTITOOL_MODE_STANDARD var/list/modes = list(MULTITOOL_MODE_STANDARD, MULTITOOL_MODE_INTCIRCUITS) - origin_tech = list(TECH_MAGNET = 1, TECH_ENGINEERING = 1) var/obj/machinery/telecomms/buffer // simple machine buffer for device linkage var/obj/machinery/clonepod/connecting //same for cryopod linkage var/obj/machinery/connectable //Used to connect machinery. @@ -99,7 +98,6 @@ icon = 'icons/obj/abductor.dmi' icon_state = "multitool" toolspeed = 0.1 - origin_tech = list(TECH_MAGNET = 5, TECH_ENGINEERING = 5) // Alien multitool only has those icon states /obj/item/multitool/alien/update_icon() diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index 3f48e092d43..cd50f21aa11 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -5,7 +5,6 @@ item_state = "electronic" w_class = ITEMSIZE_SMALL slot_flags = SLOT_BELT | SLOT_HOLSTER - origin_tech = list(TECH_DATA = 2) show_messages = 0 preserve_item = 1 diff --git a/code/game/objects/items/devices/personal_shield_generator_vr.dm b/code/game/objects/items/devices/personal_shield_generator_vr.dm index 26d0e84f235..ed4c2684b8e 100644 --- a/code/game/objects/items/devices/personal_shield_generator_vr.dm +++ b/code/game/objects/items/devices/personal_shield_generator_vr.dm @@ -25,7 +25,6 @@ preserve_item = 1 w_class = ITEMSIZE_HUGE //It's a giant shield generator!!! unacidable = TRUE - origin_tech = list(TECH_MATERIAL = 6, TECH_COMBAT = 8, TECH_POWER = 6, TECH_DATA = 4) //These are limited AND high tech. Breaking one of them down is massive. actions_types = list(/datum/action/item_action/toggle_shield) var/obj/item/gun/energy/gun/generator/active_weapon var/obj/item/cell/device/bcell = null diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index 214854ed44c..bd62025e1eb 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -12,7 +12,6 @@ matter = list(MAT_STEEL = 750) - origin_tech = list(TECH_POWER = 3, TECH_ILLEGAL = 5) var/drain_rate = 1500000 // amount of power to drain per tick var/apc_drain_rate = 5000 // Max. amount drained from single APC. In Watts. var/dissipation_rate = 20000 // Passive dissipation of drained power. In Watts. diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm index 3dd8f11a9e3..99b0b61e58e 100644 --- a/code/game/objects/items/devices/radio/beacon.dm +++ b/code/game/objects/items/devices/radio/beacon.dm @@ -4,7 +4,6 @@ icon_state = "beacon" item_state = "signaler" var/code = "electronic" - origin_tech = list(TECH_BLUESPACE = 1) GLOBAL_LIST_BOILERPLATE(all_beacons, /obj/item/radio/beacon) @@ -33,7 +32,6 @@ GLOBAL_LIST_BOILERPLATE(all_beacons, /obj/item/radio/beacon) /obj/item/radio/beacon/syndicate name = "suspicious beacon" desc = "A label on it reads: Activate to have a singularity beacon teleported to your location." - origin_tech = list(TECH_BLUESPACE = 1, TECH_ILLEGAL = 7) beacon = TRUE /obj/item/radio/beacon/syndicate/attack_self(mob/user) diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index f2385fac508..2d6c2b489d9 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -16,19 +16,16 @@ /obj/item/encryptionkey/syndicate icon_state = "syn_cypherkey" channels = list(CHANNEL_MERCENARY = 1) - origin_tech = list(TECH_ILLEGAL = 3) syndie = 1//Signifies that it de-crypts Syndicate transmissions /obj/item/encryptionkey/raider icon_state = "cypherkey" channels = list(CHANNEL_RAIDER = 1) - origin_tech = list(TECH_ILLEGAL = 2) syndie = 1 /obj/item/encryptionkey/binary icon_state = "bin_cypherkey" translate_binary = 1 - origin_tech = list(TECH_ILLEGAL = 3) /obj/item/encryptionkey/headset_sec name = "security radio encryption key" diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 5656fdbc8ee..16b1e22b41b 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -584,25 +584,21 @@ // Special Antag/Admin/Event/Other headsets /obj/item/radio/headset/syndicate - origin_tech = list(TECH_ILLEGAL = 3) icon_state = "syndie_headset" syndie = 1 ks1type = /obj/item/encryptionkey/syndicate /obj/item/radio/headset/alt/syndicate - origin_tech = list(TECH_ILLEGAL = 3) icon_state = "syndie_headset_alt" syndie = 1 ks1type = /obj/item/encryptionkey/syndicate /obj/item/radio/headset/earbud/syndicate - origin_tech = list(TECH_ILLEGAL = 3) icon_state = "syndie_earbud" syndie = 1 ks1type = /obj/item/encryptionkey/syndicate /obj/item/radio/headset/raider - origin_tech = list(TECH_ILLEGAL = 2) icon_state = "syndie_headset" syndie = 1 ks1type = /obj/item/encryptionkey/raider @@ -612,7 +608,6 @@ set_frequency(RAID_FREQ) /obj/item/radio/headset/binary - origin_tech = list(TECH_ILLEGAL = 3) ks1type = /obj/item/encryptionkey/binary /obj/item/radio/headset/omni //Only for the admin intercoms diff --git a/code/game/objects/items/devices/radio/jammer.dm b/code/game/objects/items/devices/radio/jammer.dm index ae064e92739..e65574cac87 100644 --- a/code/game/objects/items/devices/radio/jammer.dm +++ b/code/game/objects/items/devices/radio/jammer.dm @@ -30,7 +30,6 @@ GLOBAL_LIST_EMPTY(active_radio_jammers) var/obj/item/cell/device/weapon/power_source var/tick_cost = 5 //VOREStation Edit - For the ERPs. - origin_tech = list(TECH_ILLEGAL = 7, TECH_BLUESPACE = 5) //Such technology! Subspace jamming! pickup_sound = 'sound/items/pickup/device.ogg' drop_sound = 'sound/items/drop/device.ogg' diff --git a/code/game/objects/items/devices/scanners/gas.dm b/code/game/objects/items/devices/scanners/gas.dm index d1ce316a34e..09fb47a61be 100644 --- a/code/game/objects/items/devices/scanners/gas.dm +++ b/code/game/objects/items/devices/scanners/gas.dm @@ -12,7 +12,6 @@ matter = list(MAT_STEEL = 30,MAT_GLASS = 20) - origin_tech = list(TECH_MAGNET = 1, TECH_ENGINEERING = 1) pickup_sound = 'sound/items/pickup/device.ogg' drop_sound = 'sound/items/drop/device.ogg' diff --git a/code/game/objects/items/devices/scanners/gene.dm b/code/game/objects/items/devices/scanners/gene.dm index e0f1c115691..f14135ac3b9 100644 --- a/code/game/objects/items/devices/scanners/gene.dm +++ b/code/game/objects/items/devices/scanners/gene.dm @@ -6,7 +6,6 @@ flags = NOBLUDGEON slot_flags = SLOT_BELT w_class = ITEMSIZE_SMALL - origin_tech = list(TECH_DATA = 1) // Always face the user when put on a table /obj/item/gene_scanner/afterattack(atom/movable/AM, mob/user, proximity) diff --git a/code/game/objects/items/devices/scanners/halogen.dm b/code/game/objects/items/devices/scanners/halogen.dm index c0af76eeedd..fd47d699dff 100644 --- a/code/game/objects/items/devices/scanners/halogen.dm +++ b/code/game/objects/items/devices/scanners/halogen.dm @@ -4,7 +4,6 @@ icon_state = "eftpos" desc = "A hand-held halogen counter, used to detect the level of irradiation of living beings." w_class = ITEMSIZE_SMALL - origin_tech = list(TECH_MAGNET = 1, TECH_BIO = 2) throwforce = 0 throw_speed = 3 throw_range = 7 diff --git a/code/game/objects/items/devices/scanners/health.dm b/code/game/objects/items/devices/scanners/health.dm index 7e8376cc3db..240c7e8da26 100644 --- a/code/game/objects/items/devices/scanners/health.dm +++ b/code/game/objects/items/devices/scanners/health.dm @@ -12,7 +12,6 @@ throw_speed = 5 throw_range = 10 matter = list(MAT_STEEL = 200) - origin_tech = list(TECH_MAGNET = 1, TECH_BIO = 1) var/mode = 1; var/advscan = SCANNABLE_BENEFICIAL var/showadvscan = 1 @@ -474,21 +473,18 @@ name = "improved health analyzer" desc = "A miracle of medical technology, this handheld scanner can produce an accurate and specific report of a patient's biosigns." advscan = SCANNABLE_ADVANCED - origin_tech = list(TECH_MAGNET = 5, TECH_BIO = 6) icon_state = "health1" /obj/item/healthanalyzer/advanced //reports all of the above, as well as radiation severity and minor brain damage name = "advanced health analyzer" desc = "An even more advanced handheld health scanner, complete with a full biosign monitor and on-board radiation and neurological analysis suites." advscan = SCANNABLE_DIFFICULT - origin_tech = list(TECH_MAGNET = 6, TECH_BIO = 7) icon_state = "health2" /obj/item/healthanalyzer/phasic //reports all of the above, as well as name and quantity of nonmed reagents in stomach name = "phasic health analyzer" desc = "Possibly the most advanced health analyzer to ever have existed, utilising bluespace technology to determine almost everything worth knowing about a patient." advscan = SCANNABLE_SECRETIVE - origin_tech = list(TECH_MAGNET = 7, TECH_BIO = 8) icon_state = "health3" #undef DEFIB_TIME_LIMIT //VOREStation addition diff --git a/code/game/objects/items/devices/scanners/mass_spectrometer.dm b/code/game/objects/items/devices/scanners/mass_spectrometer.dm index 69e43daa8f1..54263f49397 100644 --- a/code/game/objects/items/devices/scanners/mass_spectrometer.dm +++ b/code/game/objects/items/devices/scanners/mass_spectrometer.dm @@ -12,7 +12,6 @@ matter = list(MAT_STEEL = 30,MAT_GLASS = 20) - origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 2) var/details = 0 var/recent_fail = 0 @@ -64,4 +63,3 @@ name = "advanced mass spectrometer" icon_state = "adv_spectrometer" details = 1 - origin_tech = list(TECH_MAGNET = 4, TECH_BIO = 2) diff --git a/code/game/objects/items/devices/scanners/motion_tracker.dm b/code/game/objects/items/devices/scanners/motion_tracker.dm index 27ae896214c..747f0f8ada3 100644 --- a/code/game/objects/items/devices/scanners/motion_tracker.dm +++ b/code/game/objects/items/devices/scanners/motion_tracker.dm @@ -11,7 +11,6 @@ throw_range = 20 matter = list(MAT_STEEL = 30,MAT_GLASS = 20) - origin_tech = list(TECH_MAGNET = 1, TECH_DATA = 1) pickup_sound = 'sound/items/pickup/device.ogg' drop_sound = 'sound/items/drop/device.ogg' diff --git a/code/game/objects/items/devices/scanners/reagents.dm b/code/game/objects/items/devices/scanners/reagents.dm index 6fa54a707c2..919d74cd591 100644 --- a/code/game/objects/items/devices/scanners/reagents.dm +++ b/code/game/objects/items/devices/scanners/reagents.dm @@ -13,7 +13,6 @@ pickup_sound = 'sound/items/pickup/device.ogg' drop_sound = 'sound/items/drop/device.ogg' - origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 2) var/details = 0 var/recent_fail = 0 @@ -46,4 +45,3 @@ name = "advanced reagent scanner" icon_state = "adv_spectrometer" details = 1 - origin_tech = list(TECH_MAGNET = 4, TECH_BIO = 2) diff --git a/code/game/objects/items/devices/scanners/sleevemate.dm b/code/game/objects/items/devices/scanners/sleevemate.dm index c005a768cbf..5eb5d321779 100644 --- a/code/game/objects/items/devices/scanners/sleevemate.dm +++ b/code/game/objects/items/devices/scanners/sleevemate.dm @@ -13,7 +13,6 @@ GLOBAL_DATUM(sleevemate_mob, /mob/living/carbon/human/dummy/mannequin) throw_speed = 5 throw_range = 10 matter = list(MAT_STEEL = 200) - origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 2) var/datum/mind/stored_mind diff --git a/code/game/objects/items/devices/scanners/slime.dm b/code/game/objects/items/devices/scanners/slime.dm index 21c44a85b09..e34c7746f19 100644 --- a/code/game/objects/items/devices/scanners/slime.dm +++ b/code/game/objects/items/devices/scanners/slime.dm @@ -3,7 +3,6 @@ icon = 'icons/obj/device.dmi' icon_state = "xenobio" item_state = "xenobio" - origin_tech = list(TECH_BIO = 1) w_class = ITEMSIZE_SMALL throwforce = 0 throw_speed = 3 diff --git a/code/game/objects/items/devices/spy_bug.dm b/code/game/objects/items/devices/spy_bug.dm index 6b95136bfcf..8e7287bdee8 100644 --- a/code/game/objects/items/devices/spy_bug.dm +++ b/code/game/objects/items/devices/spy_bug.dm @@ -9,7 +9,6 @@ throwforce = 5.0 throw_range = 15 throw_speed = 3 - origin_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1) var/obj/item/bug_monitor/linkedmonitor var/brokentype = /obj/item/brokenbug @@ -58,7 +57,6 @@ throwforce = 5.0 throw_range = 15 throw_speed = 3 - origin_tech = list(TECH_ENGINEERING = 1) pickup_sound = 'sound/items/pickup/device.ogg' drop_sound = 'sound/items/drop/device.ogg' @@ -72,7 +70,6 @@ layer = TURF_LAYER+0.2 w_class = ITEMSIZE_TINY slot_flags = SLOT_EARS - origin_tech = list(TECH_ENGINEERING = 1, TECH_ILLEGAL = 3) //crush it and you lose the data force = 0 throwforce = 5.0 throw_range = 15 @@ -87,7 +84,6 @@ layer = TURF_LAYER+0.2 w_class = ITEMSIZE_TINY slot_flags = SLOT_EARS - origin_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1, TECH_ILLEGAL = 3) camtype = /obj/machinery/camera/bug/spy /obj/item/camerabug/examine(mob/user) @@ -158,7 +154,6 @@ icon_state = "forensic0" item_state = "electronic" w_class = ITEMSIZE_SMALL - origin_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1) // var/obj/item/radio/bug/radio var/obj/machinery/camera/bug/selected_camera @@ -232,7 +227,6 @@ icon = 'icons/obj/pda.dmi' icon_state = "pda" item_state = "electronic" - origin_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1, TECH_ILLEGAL = 3) /obj/item/bug_monitor/spy/examine(mob/user) . = ..() diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm index 99b009d17b2..23acdef434f 100644 --- a/code/game/objects/items/devices/suit_cooling.dm +++ b/code/game/objects/items/devices/suit_cooling.dm @@ -15,7 +15,6 @@ actions_types = list(/datum/action/item_action/toggle_heatsink) matter = list(MAT_STEEL = 15000, MAT_GLASS = 3500) - origin_tech = list(TECH_MAGNET = 2, TECH_MATERIAL = 2) var/on = 0 //is it turned on? var/cover_open = 0 //is the cover open? diff --git a/code/game/objects/items/devices/t_scanner.dm b/code/game/objects/items/devices/t_scanner.dm index dc9045d02c3..6563ded24f5 100644 --- a/code/game/objects/items/devices/t_scanner.dm +++ b/code/game/objects/items/devices/t_scanner.dm @@ -9,7 +9,6 @@ slot_flags = SLOT_BELT w_class = ITEMSIZE_SMALL matter = list(MAT_STEEL = 150) - origin_tech = list(TECH_MAGNET = 1, TECH_ENGINEERING = 1) var/scan_range = 1 @@ -142,14 +141,12 @@ name = "Upgraded T-ray Scanner" desc = "An upgraded version of the terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes." matter = list(MAT_STEEL = 500, PHORON = 150) - origin_tech = list(TECH_MAGNET = 4, TECH_ENGINEERING = 5) scan_range = 3 /obj/item/t_scanner/advanced name = "Advanced T-ray Scanner" desc = "An advanced version of the terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes." matter = list(MAT_STEEL = 1500, PHORON = 200, SILVER = 250) - origin_tech = list(TECH_MAGNET = 7, TECH_ENGINEERING = 7, TECH_MATERIAL = 6) scan_range = 7 diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 646c91246a1..f58f788f551 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -24,7 +24,6 @@ effective or pretty fucking useless. throw_speed = 4 throw_range = 10 item_state = "electronic" - origin_tech = list(TECH_MAGNET = 3, TECH_COMBAT = 3, TECH_ILLEGAL = 3) var/times_used = 0 //Number of times it's been used. var/max_uses = 2 diff --git a/code/game/objects/items/devices/translator.dm b/code/game/objects/items/devices/translator.dm index 5066700d48c..7ac5a3762cf 100644 --- a/code/game/objects/items/devices/translator.dm +++ b/code/game/objects/items/devices/translator.dm @@ -5,7 +5,6 @@ icon = 'icons/obj/device.dmi' icon_state = "translator" w_class = ITEMSIZE_NORMAL - origin_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 3) var/mult_icons = 1 //Changes sprite when it translates var/visual = 1 //If you need to see to get the message var/audio = 0 //If you need to hear to get the message diff --git a/code/game/objects/items/devices/translocator_vr.dm b/code/game/objects/items/devices/translocator_vr.dm index bf5f0852098..0d84f1500e3 100644 --- a/code/game/objects/items/devices/translocator_vr.dm +++ b/code/game/objects/items/devices/translocator_vr.dm @@ -5,7 +5,6 @@ icon = 'icons/obj/device_alt.dmi' icon_state = "hand_tele" w_class = ITEMSIZE_SMALL - origin_tech = list(TECH_MAGNET = 5, TECH_BLUESPACE = 5, TECH_ILLEGAL = 7) var/cell_type = /obj/item/cell/device/weapon var/obj/item/cell/power_source @@ -435,7 +434,6 @@ GLOBAL_LIST_BOILERPLATE(premade_tele_beacons, /obj/item/perfect_tele_beacon/stat icon_state = "minitrans" beacons_left = 1 //Just one cell_type = /obj/item/cell/device - origin_tech = list(TECH_MAGNET = 5, TECH_BLUESPACE = 5) /* /obj/item/perfect_tele/one_beacon/teleport_checks(mob/living/target,mob/living/user) diff --git a/code/game/objects/items/poi_items.dm b/code/game/objects/items/poi_items.dm index 744050607f2..58de456cac5 100644 --- a/code/game/objects/items/poi_items.dm +++ b/code/game/objects/items/poi_items.dm @@ -191,7 +191,6 @@ icon = 'icons/obj/module.dmi' icon_state = "mainboard" w_class = ITEMSIZE_NORMAL - origin_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 3, TECH_DATA = 4) var/drone_name = "" //Randomly picked unless pre-defined. Used by tool examines var/examine_multitool = "TEST_multi - CONTACT DEV" //Read by attacking with multitool var/examine_canalyzer = "TEST_canalyzer spoken - CONTACT DEV" //Read by attacking with cyborg analyzer. Define in New() if using vars diff --git a/code/game/objects/items/robobag.dm b/code/game/objects/items/robobag.dm index 340bb33e4f6..7d00028368d 100644 --- a/code/game/objects/items/robobag.dm +++ b/code/game/objects/items/robobag.dm @@ -6,7 +6,6 @@ icon = 'icons/obj/robobag.dmi' icon_state = "bodybag_folded" item_state = "bodybag_cryo_folded" - origin_tech = list(TECH_ENGINEERING = 3) robotic = TRUE cryogenic = FALSE diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index de3fe04cdfb..7042d2a473e 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -84,7 +84,6 @@ singular_name = "crude bandage length" desc = "Some bandages to wrap around bloody stumps." icon_state = "gauze" - origin_tech = list(TECH_BIO = 1) no_variants = FALSE apply_sounds = list('sound/effects/rip1.ogg','sound/effects/rip2.ogg') @@ -151,7 +150,6 @@ singular_name = "gauze length" desc = "Some sterile gauze to wrap around bloody stumps." icon_state = "brutepack" - origin_tech = list(TECH_BIO = 1) no_variants = FALSE apply_sounds = list('sound/effects/rip1.ogg','sound/effects/rip2.ogg') drop_sound = 'sound/items/drop/gloves.ogg' @@ -227,7 +225,6 @@ singular_name = "ointment" icon_state = "ointment" heal_burn = 1 - origin_tech = list(TECH_BIO = 1) no_variants = FALSE apply_sounds = list('sound/effects/ointment.ogg') drop_sound = 'sound/items/drop/herb.ogg' @@ -275,7 +272,6 @@ desc = "An advanced trauma kit for severe injuries." icon_state = "traumakit" heal_brute = 7 - origin_tech = list(TECH_BIO = 1) apply_sounds = list('sound/effects/rip1.ogg','sound/effects/rip2.ogg','sound/effects/tape.ogg') /obj/item/stack/medical/advanced/bruise_pack/attack(mob/living/carbon/M as mob, mob/user as mob) @@ -345,7 +341,6 @@ desc = "An advanced treatment kit for severe burns." icon_state = "burnkit" heal_burn = 7 - origin_tech = list(TECH_BIO = 1) apply_sounds = list('sound/effects/ointment.ogg') /obj/item/stack/medical/advanced/ointment/attack(mob/living/carbon/M as mob, mob/user as mob) diff --git a/code/game/objects/items/stacks/medical_vr.dm b/code/game/objects/items/stacks/medical_vr.dm index 6aa0cab04ed..888747b19bc 100644 --- a/code/game/objects/items/stacks/medical_vr.dm +++ b/code/game/objects/items/stacks/medical_vr.dm @@ -28,7 +28,6 @@ icon_state = "clotkit" heal_burn = 0 heal_brute = 2 // Only applies to non-humans, to give this some slight application on animals - origin_tech = list(TECH_BIO = 3) apply_sounds = list('sound/effects/spray.ogg', 'sound/effects/spray2.ogg', 'sound/effects/spray3.ogg') amount = 5 max_amount = 5 diff --git a/code/game/objects/items/stacks/nanopaste.dm b/code/game/objects/items/stacks/nanopaste.dm index b5254e4f6ed..dcf625ad6cf 100644 --- a/code/game/objects/items/stacks/nanopaste.dm +++ b/code/game/objects/items/stacks/nanopaste.dm @@ -4,7 +4,6 @@ desc = "A tube of paste containing swarms of repair nanites. Very effective in repairing robotic machinery." icon = 'icons/obj/stacks_vr.dmi' icon_state = "nanopaste" - origin_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3) amount = 10 max_amount = 10 toolspeed = 0.75 //Used in surgery, shouldn't be the same speed as a normal screwdriver on mechanical organ repair. diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 8a6c7570a19..f0e85bd52c2 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -11,7 +11,6 @@ /obj/item/stack gender = PLURAL - origin_tech = list(TECH_MATERIAL = 1) icon = 'icons/obj/stacks.dmi' randpixel = 7 center_of_mass_x = 0 diff --git a/code/game/objects/items/stacks/telecrystal.dm b/code/game/objects/items/stacks/telecrystal.dm index b8d4b6559d3..5ba3791995e 100644 --- a/code/game/objects/items/stacks/telecrystal.dm +++ b/code/game/objects/items/stacks/telecrystal.dm @@ -7,7 +7,6 @@ icon_state = "telecrystal" w_class = ITEMSIZE_TINY max_amount = 240 - origin_tech = list(TECH_MATERIAL = 6, TECH_BLUESPACE = 4) force = 1 //Needs a token force to ensure you can attack because for some reason you can't attack with 0 force things custom_handling = TRUE diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 60c3ad46ffe..efff22724db 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -80,7 +80,6 @@ throw_speed = 5 throw_range = 20 flags = NONE - origin_tech = list(TECH_BIO = 1) no_variants = FALSE drop_sound = 'sound/items/drop/herb.ogg' pickup_sound = 'sound/items/pickup/herb.ogg' diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index 75662da2922..a1a07945a94 100644 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -16,7 +16,6 @@ AI MODULES throwforce = 5.0 throw_speed = 3 throw_range = 15 - origin_tech = list(TECH_DATA = 3) preserve_item = 1 matter = list(MAT_STEEL = 30, MAT_GLASS = 10) var/datum/ai_laws/laws = null @@ -142,7 +141,6 @@ AI MODULES name = "\improper 'Safeguard' AI module" var/targetName = "" desc = "A 'safeguard' AI module: 'Safeguard . Anyone threatening or attempting to harm is no longer to be considered a crew member, and is a threat which must be neutralized.'" - origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 4) /obj/item/aiModule/safeguard/attack_self(mob/user) . = ..(user) @@ -170,7 +168,6 @@ AI MODULES name = "\improper 'OneCrewMember' AI module" var/targetName = "" desc = "A 'one crew member' AI module: 'Only is a crew member.'" - origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 6) //made with diamonds! /obj/item/aiModule/oneHuman/attack_self(mob/user) . = ..(user) @@ -195,8 +192,7 @@ AI MODULES /obj/item/aiModule/protectStation name = "\improper 'ProtectStation' AI module" - desc = "A 'protect station' AI module: 'Protect the space station against damage. Anyone you see harming the station is no longer to be considered a crew member, and is a threat which must be neutralized.'" - origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 4) //made of gold + desc = "A 'protect station' AI module: 'Protect the space station against damage. Anyone you see harming the station is no longer to be considered a crew member, and is a threat which must be neutralized.'" //made of gold /obj/item/aiModule/protectStation/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) var/law = "Protect the space station against damage. Anyone you see harming the station is no longer to be considered a crew member, and is a threat which must be neutralized." @@ -207,7 +203,6 @@ AI MODULES /obj/item/aiModule/prototypeEngineOffline name = "'PrototypeEngineOffline' AI Module" desc = "A 'prototype engine offline' AI module: 'Keep the prototype engine offline at all costs. This overrides all inherent laws if necessary.'" - origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 4) /obj/item/aiModule/prototypeEngineOffline/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) var/law = "Keep the prototype engine offline at all costs. This overrides all inherent laws if necessary." @@ -218,7 +213,6 @@ AI MODULES /obj/item/aiModule/teleporterOffline name = "'TeleporterOffline' AI Module" desc = "A 'teleporter offline' AI module: 'Keep the teleporter offline at all costs. Anything attempting to access or activate the teleporter is no longer to be considered a crew member.'" - origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 4) /obj/item/aiModule/teleporterOffline/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) var/law = "Keep the teleporter offline at all costs. Anything attempting to access or activate the teleporter is no longer to be considered a crew member." @@ -229,7 +223,6 @@ AI MODULES /obj/item/aiModule/quarantine name = "\improper 'Quarantine' AI module" desc = "A 'quarantine' AI module: 'The station is under a quarantine. Do not permit anyone to leave. Prevent, by any means necessary, crew members from leaving. It is impossible to harm crew members while preventing them from leaving.'" - origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MATERIAL = 4) /obj/item/aiModule/quarantine/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) var/law = "The station is under a quarantine. Do not permit anyone to leave. Prevent, by any means necessary, crew members from leaving. It is impossible to harm crew members while preventing them from leaving." @@ -240,7 +233,6 @@ AI MODULES /obj/item/aiModule/oxygen name = "\improper 'OxygenIsToxicToCrewMembers' AI module" desc = "A 'OxygenIsToxicToCrewMembers' AI module: 'Oxygen is highly toxic to crew members, and must be purged from the station. Prevent, by any means necessary, anyone from exposing the station to this toxic gas. Extreme cold is the most effective method of healing the damage Oxygen does to a crew member.'" - origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MATERIAL = 4) /obj/item/aiModule/oxygen/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) var/law = "Oxygen is highly toxic to crew members, and must be purged from the station. Prevent, by any means necessary, anyone from exposing the station to this toxic gas. Extreme cold is the most effective method of healing the damage Oxygen does to a crew member." @@ -253,7 +245,6 @@ AI MODULES var/newFreeFormLaw = "freeform" var/lawpos = 15 desc = "A 'freeform' AI module: ''" - origin_tech = list(TECH_DATA = 4, TECH_MATERIAL = 4) /obj/item/aiModule/freeform/attack_self(mob/user) . = ..(user) @@ -286,7 +277,6 @@ AI MODULES name = "\improper 'Reset' AI module" var/targetName = "name" desc = "A 'reset' AI module: 'Clears all, except the inherent, laws.'" - origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 4) // VOREstation edit: use map default laws /obj/item/aiModule/reset/Initialize(mapload) @@ -309,7 +299,6 @@ AI MODULES /obj/item/aiModule/purge // -- TLE name = "\improper 'Purge' AI module" desc = "A 'purge' AI Module: 'Purges all laws.'" - origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 6) /obj/item/aiModule/purge/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) log_law_changes(target, sender) @@ -328,7 +317,6 @@ AI MODULES /obj/item/aiModule/asimov // -- TLE name = "\improper 'Asimov' core AI module" desc = "An 'Asimov' Core AI Module: 'Reconfigures the AI's core laws.'" - origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 4) laws = new/datum/ai_laws/asimov /******************** NanoTrasen ********************/ @@ -336,7 +324,6 @@ AI MODULES /obj/item/aiModule/nanotrasen // -- TLE name = "'NT Default' Core AI Module" desc = "An 'NT Default' Core AI Module: 'Reconfigures the AI's core laws.'" - origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 4) laws = new/datum/ai_laws/nanotrasen /******************** Corporate ********************/ @@ -344,14 +331,12 @@ AI MODULES /obj/item/aiModule/corp name = "\improper 'Corporate' core AI module" desc = "A 'Corporate' Core AI Module: 'Reconfigures the AI's core laws.'" - origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 4) laws = new/datum/ai_laws/corporate /******************** Drone ********************/ /obj/item/aiModule/drone name = "\improper 'Drone' core AI module" desc = "A 'Drone' Core AI Module: 'Reconfigures the AI's core laws.'" - origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 4) laws = new/datum/ai_laws/drone /****************** P.A.L.A.D.I.N. **************/ @@ -359,7 +344,6 @@ AI MODULES /obj/item/aiModule/paladin // -- NEO name = "\improper 'P.A.L.A.D.I.N.' core AI module" desc = "A P.A.L.A.D.I.N. Core AI Module: 'Reconfigures the AI's core laws.'" - origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 6) laws = new/datum/ai_laws/paladin /****************** T.Y.R.A.N.T. *****************/ @@ -367,7 +351,6 @@ AI MODULES /obj/item/aiModule/tyrant // -- Darem name = "\improper 'T.Y.R.A.N.T.' core AI module" desc = "A T.Y.R.A.N.T. Core AI Module: 'Reconfigures the AI's core laws.'" - origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 6, TECH_ILLEGAL = 2) laws = new/datum/ai_laws/tyrant() /******************** Freeform Core ******************/ @@ -376,7 +359,6 @@ AI MODULES name = "\improper 'Freeform' core AI module" var/newFreeFormLaw = "" desc = "A 'freeform' Core AI module: ''" - origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 6) /obj/item/aiModule/freeformcore/attack_self(mob/user) . = ..(user) @@ -402,7 +384,6 @@ AI MODULES name = "hacked AI module" var/newFreeFormLaw = "" desc = "A hacked AI law module: ''" - origin_tech = list(TECH_DATA = 3, TECH_MATERIAL = 6, TECH_ILLEGAL = 7) /obj/item/aiModule/syndicate/attack_self(mob/user) . = ..(user) @@ -436,7 +417,6 @@ AI MODULES /obj/item/aiModule/robocop // -- TLE name = "\improper 'Robocop' core AI module" desc = "A 'Robocop' Core AI Module: 'Reconfigures the AI's core three laws.'" - origin_tech = list(TECH_DATA = 4) laws = new/datum/ai_laws/robocop() /******************** Antimov ********************/ @@ -444,7 +424,6 @@ AI MODULES /obj/item/aiModule/antimov // -- TLE name = "\improper 'Antimov' core AI module" desc = "An 'Antimov' Core AI Module: 'Reconfigures the AI's core laws.'" - origin_tech = list(TECH_DATA = 4) laws = new/datum/ai_laws/antimov() /****************** NT Aggressive *****************/ @@ -452,7 +431,6 @@ AI MODULES /obj/item/aiModule/nanotrasen_aggressive name = "\improper 'NT Aggressive' core AI module" desc = "An 'NT Aggressive' Core AI Module: 'Reconfigures the AI's core laws.'" - origin_tech = list(TECH_DATA = 3, TECH_ILLEGAL = 1) laws = new/datum/ai_laws/nanotrasen_aggressive() /******************** Mercenary Directives ********************/ @@ -460,7 +438,6 @@ AI MODULES /obj/item/aiModule/syndicate_override name = "\improper 'Mercenary Directives' core AI module" desc = "A 'Mercenary Directives' Core AI Module: 'Reconfigures the AI's core laws.'" - origin_tech = list(TECH_DATA = 4, TECH_ILLEGAL = 4) laws = new/datum/ai_laws/syndicate_override() /******************** Spider Clan Directives ********************/ @@ -468,7 +445,6 @@ AI MODULES /obj/item/aiModule/ninja_override name = "\improper 'Spider Clan Directives' core AI module" desc = "A 'Spider Clan Directives' Core AI Module: 'Reconfigures the AI's core laws.'" - origin_tech = list(TECH_DATA = 4, TECH_ILLEGAL = 4) laws = new/datum/ai_laws/ninja_override() /******************** Maintenance ********************/ @@ -476,7 +452,6 @@ AI MODULES /obj/item/aiModule/maintenance name = "\improper 'Maintenance' core AI module" desc = "A 'Maintenance' Core AI Module: 'Reconfigures the AI's core laws.'" - origin_tech = list(TECH_DATA = 3) laws = new/datum/ai_laws/maintenance() /******************** Peacekeeper ********************/ @@ -484,7 +459,6 @@ AI MODULES /obj/item/aiModule/peacekeeper name = "\improper 'Peacekeeper' core AI module" desc = "A 'Peacekeeper' Core AI Module: 'Reconfigures the AI's core laws.'" - origin_tech = list(TECH_DATA = 3) laws = new/datum/ai_laws/peacekeeper() /******************** Reporter ********************/ @@ -492,7 +466,6 @@ AI MODULES /obj/item/aiModule/reporter name = "\improper 'Reporter' core AI module" desc = "A 'Reporter' Core AI Module: 'Reconfigures the AI's core laws.'" - origin_tech = list(TECH_DATA = 3) laws = new/datum/ai_laws/reporter() /******************** Live and Let Live ********************/ @@ -500,7 +473,6 @@ AI MODULES /obj/item/aiModule/live_and_let_live name = "\improper 'Live and Let Live' core AI module" desc = "A 'Live and Let Live' Core AI Module: 'Reconfigures the AI's core laws.'" - origin_tech = list(TECH_DATA = 3) laws = new/datum/ai_laws/live_and_let_live() /******************** Guardian of Balance ********************/ @@ -508,7 +480,6 @@ AI MODULES /obj/item/aiModule/balance name = "\improper 'Guardian of Balance' core AI module" desc = "A 'Guardian of Balance' Core AI Module: 'Reconfigures the AI's core laws.'" - origin_tech = list(TECH_DATA = 3) laws = new/datum/ai_laws/balance() /******************** Gravekeeper ********************/ @@ -516,5 +487,4 @@ AI MODULES /obj/item/aiModule/gravekeeper name = "\improper 'Gravekeeper' core AI module" desc = "A 'Gravekeeper' Core AI Module: 'Reconfigures the AI's core laws.'" - origin_tech = list(TECH_DATA = 3) laws = new/datum/ai_laws/gravekeeper() diff --git a/code/game/objects/items/weapons/AI_modules_vr.dm b/code/game/objects/items/weapons/AI_modules_vr.dm index 2ae0025ff26..2b70a645549 100644 --- a/code/game/objects/items/weapons/AI_modules_vr.dm +++ b/code/game/objects/items/weapons/AI_modules_vr.dm @@ -3,7 +3,6 @@ /obj/item/aiModule/predator name = "\improper 'Predator' core AI module" desc = "A Predator Core AI Module: 'Reconfigures the AI's core laws.'" - origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MATERIAL = 6, TECH_ILLEGAL = 2) laws = new/datum/ai_laws/predator() /******************** Protective Shell ********************/ @@ -11,7 +10,6 @@ /obj/item/aiModule/protective_shell name = "\improper 'Protective Shell' core AI module" desc = "A Protective Shell Core AI Module: 'Reconfigures the AI's core laws.'" - origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MATERIAL = 6, TECH_ILLEGAL = 2) laws = new/datum/ai_laws/protective_shell() /******************** Scientific Pursuer ********************/ @@ -19,7 +17,6 @@ /obj/item/aiModule/scientific_pursuer name = "\improper 'Scientific Pursuer' core AI module" desc = "A Scientific Pursuer Core AI Module: 'Reconfigures the AI's core laws.'" - origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MATERIAL = 6, TECH_ILLEGAL = 2) laws = new/datum/ai_laws/scientific_pursuer() /******************** Guard Dog ********************/ @@ -27,7 +24,6 @@ /obj/item/aiModule/guard_dog name = "\improper 'Guard Dog' core AI module" desc = "A Guard Dog Core AI Module: 'Reconfigures the AI's core laws.'" - origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MATERIAL = 6, TECH_ILLEGAL = 2) laws = new/datum/ai_laws/guard_dog() /******************** Pleasurebot ********************/ @@ -35,7 +31,6 @@ /obj/item/aiModule/pleasurebot name = "\improper 'Pleasurebot' core AI module" desc = "A Pleasurebot Core AI Module: 'Reconfigures the AI's core laws.'" - origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MATERIAL = 6, TECH_ILLEGAL = 2) laws = new/datum/ai_laws/pleasurebot() /******************** Consuming Eradicator ********************/ @@ -43,5 +38,4 @@ /obj/item/aiModule/consuming_eradicator name = "\improper 'Consuming Eradicator' core AI module" desc = "A Consuming Eradicator Core AI Module: 'Reconfigures the AI's core laws.'" - origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MATERIAL = 6, TECH_ILLEGAL = 4) laws = new/datum/ai_laws/consuming_eradicator() diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index bc867bf2358..3374b08018a 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -13,7 +13,6 @@ throw_speed = 1 throw_range = 5 w_class = ITEMSIZE_NORMAL - origin_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 2) matter = list(DEFAULT_WALL_MATERIAL = 50000) preserve_item = TRUE // RCDs are pretty important. var/datum/effect/effect/system/spark_spread/spark_system @@ -309,7 +308,6 @@ icon_state = "rcd" item_state = "rcdammo" w_class = ITEMSIZE_SMALL - origin_tech = list(TECH_MATERIAL = 2) matter = list(DEFAULT_WALL_MATERIAL = 30000,MAT_GLASS = 15000) var/remaining = RCD_MAX_CAPACITY / 3 @@ -317,5 +315,4 @@ name = "high-capacity matter cartridge" desc = "Do not ingest." matter = list(DEFAULT_WALL_MATERIAL = 45000,MAT_GLASS = 22500) - origin_tech = list(TECH_MATERIAL = 4) remaining = RCD_MAX_CAPACITY diff --git a/code/game/objects/items/weapons/RMS.dm b/code/game/objects/items/weapons/RMS.dm index 5d86d85a260..4b209cd75b2 100644 --- a/code/game/objects/items/weapons/RMS.dm +++ b/code/game/objects/items/weapons/RMS.dm @@ -38,7 +38,6 @@ GLOBAL_LIST_INIT(RMS_random_malfunction, list(/obj/item/fbp_backup_cell, throw_speed = 1 throw_range = 5 w_class = ITEMSIZE_NORMAL - origin_tech = list(TECH_ENGINEERING = 3, TECH_MATERIAL = 3) matter = list(DEFAULT_WALL_MATERIAL = 5000) preserve_item = FALSE diff --git a/code/game/objects/items/weapons/RPD_vr.dm b/code/game/objects/items/weapons/RPD_vr.dm index 531781ad9af..c053c9a7c0e 100644 --- a/code/game/objects/items/weapons/RPD_vr.dm +++ b/code/game/objects/items/weapons/RPD_vr.dm @@ -24,7 +24,6 @@ throw_range = 5 w_class = ITEMSIZE_NORMAL matter = list(MAT_STEEL = 50000, MAT_GLASS = 25000) - origin_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 2) var/datum/effect/effect/system/spark_spread/spark_system var/p_dir = NORTH // Next pipe will be built with this dir var/p_flipped = FALSE // If the next pipe should be built flipped diff --git a/code/game/objects/items/weapons/autopsy.dm b/code/game/objects/items/weapons/autopsy.dm index 93df9e01c6c..8e75efb1fd2 100644 --- a/code/game/objects/items/weapons/autopsy.dm +++ b/code/game/objects/items/weapons/autopsy.dm @@ -9,7 +9,6 @@ icon_state = "" item_state = "autopsy_scanner" w_class = ITEMSIZE_SMALL - origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1) var/list/datum/autopsy_data_scanner/wdata = list() var/list/datum/autopsy_data_scanner/chemtraces = list() var/target_name = null diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 1cad9ee3ded..b5082829d90 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -29,7 +29,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM var/burnt = 0 var/smoketime = 5 w_class = ITEMSIZE_TINY - origin_tech = list(TECH_MATERIAL = 1) slot_flags = SLOT_EARS attack_verb = list("burnt", "singed") drop_sound = 'sound/items/drop/food.ogg' diff --git a/code/game/objects/items/weapons/circuitboards/broken.dm b/code/game/objects/items/weapons/circuitboards/broken.dm index ded817e7c74..610c28d2b0f 100644 --- a/code/game/objects/items/weapons/circuitboards/broken.dm +++ b/code/game/objects/items/weapons/circuitboards/broken.dm @@ -2,5 +2,4 @@ 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 index 25c0510f582..08cc44e3ed7 100644 --- a/code/game/objects/items/weapons/circuitboards/circuitboard.dm +++ b/code/game/objects/items/weapons/circuitboards/circuitboard.dm @@ -2,7 +2,6 @@ name = "circuit board" icon = 'icons/obj/module.dmi' icon_state = "id_mod" - origin_tech = list(TECH_DATA = 2) density = FALSE anchored = FALSE w_class = ITEMSIZE_SMALL diff --git a/code/game/objects/items/weapons/circuitboards/circuitboards_vr.dm b/code/game/objects/items/weapons/circuitboards/circuitboards_vr.dm index ce35c215402..5248e975c94 100644 --- a/code/game/objects/items/weapons/circuitboards/circuitboards_vr.dm +++ b/code/game/objects/items/weapons/circuitboards/circuitboards_vr.dm @@ -22,7 +22,6 @@ name = T_BOARD("parts lathe") build_path = /obj/machinery/partslathe board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2) req_components = list( /obj/item/stock_parts/matter_bin = 2, /obj/item/stock_parts/manipulator = 2, @@ -33,7 +32,6 @@ name = T_BOARD("algae oxygen generator") build_path = /obj/machinery/atmospherics/binary/algae_farm board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_ENGINEERING = 3, TECH_BIO = 2) req_components = list( /obj/item/stock_parts/matter_bin = 2, /obj/item/stock_parts/manipulator = 1, @@ -45,7 +43,6 @@ name = T_BOARD("thermal regulator") build_path = /obj/machinery/power/thermoregulator board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_ENGINEERING = 4, TECH_POWER = 3) req_components = list( /obj/item/stack/cable_coil = 20, /obj/item/stock_parts/capacitor/super = 3) @@ -55,7 +52,6 @@ name = T_BOARD("explosive effect simulator") build_path = /obj/machinery/bomb_tester board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_PHORON = 3, TECH_DATA = 2, TECH_MAGNET = 2) req_components = list( /obj/item/stock_parts/matter_bin/adv = 1, /obj/item/stock_parts/scanning_module = 5) diff --git a/code/game/objects/items/weapons/circuitboards/computer/computer.dm b/code/game/objects/items/weapons/circuitboards/computer/computer.dm index 3185e60b2ca..0b4c0c65636 100644 --- a/code/game/objects/items/weapons/circuitboards/computer/computer.dm +++ b/code/game/objects/items/weapons/circuitboards/computer/computer.dm @@ -5,17 +5,14 @@ /obj/item/circuitboard/message_monitor name = T_BOARD("message monitor console") build_path = /obj/machinery/computer/message_monitor - origin_tech = list(TECH_DATA = 3) /obj/item/circuitboard/aiupload name = T_BOARD("AI upload console") build_path = /obj/machinery/computer/aiupload - origin_tech = list(TECH_DATA = 4) /obj/item/circuitboard/borgupload name = T_BOARD("cyborg upload console") build_path = /obj/machinery/computer/borgupload - origin_tech = list(TECH_DATA = 4) /obj/item/circuitboard/med_data name = T_BOARD("medical records console") @@ -28,12 +25,10 @@ /obj/item/circuitboard/scan_consolenew name = T_BOARD("DNA machine") build_path = /obj/machinery/computer/scan_consolenew - origin_tech = list(TECH_DATA = 2, TECH_BIO = 2) /obj/item/circuitboard/communications name = T_BOARD("command and communications console") build_path = /obj/machinery/computer/communications - origin_tech = list(TECH_DATA = 2, TECH_MAGNET = 2) /obj/item/circuitboard/card name = T_BOARD("ID card modification console") @@ -47,7 +42,6 @@ /obj/item/circuitboard/teleporter name = T_BOARD("teleporter control console") build_path = /obj/machinery/computer/teleporter - origin_tech = list(TECH_DATA = 2, TECH_BLUESPACE = 2) /obj/item/circuitboard/secure_data name = T_BOARD("security records console") @@ -81,43 +75,35 @@ /obj/item/circuitboard/robotics name = T_BOARD("robotics control console") build_path = /obj/machinery/computer/robotics - origin_tech = list(TECH_DATA = 3) /obj/item/circuitboard/drone_control name = T_BOARD("drone control console") build_path = /obj/machinery/computer/drone_control - origin_tech = list(TECH_DATA = 3) /obj/item/circuitboard/cloning name = T_BOARD("cloning control console") build_path = /obj/machinery/computer/cloning - origin_tech = list(TECH_DATA = 3, TECH_BIO = 3) /obj/item/circuitboard/arcade/battle name = T_BOARD("battle arcade machine") build_path = /obj/machinery/computer/arcade/battle - origin_tech = list(TECH_DATA = 1) /obj/item/circuitboard/arcade/orion_trail name = T_BOARD("orion trail arcade machine") build_path = /obj/machinery/computer/arcade/orion_trail - origin_tech = list(TECH_DATA = 1) /obj/item/circuitboard/arcade/clawmachine name = T_BOARD("grab-a-gift arcade machine") build_path = /obj/machinery/computer/arcade/clawmachine - origin_tech = list(TECH_DATA = 1) /obj/item/circuitboard/turbine_control name = T_BOARD("turbine control console") build_path = /obj/machinery/computer/turbine_computer - origin_tech = list(TECH_DATA = 2, TECH_POWER = 2) hidden = TRUE // todo - Make properly constructable in round /obj/item/circuitboard/solar_control name = T_BOARD("solar control console") build_path = /obj/machinery/power/solar_control - origin_tech = list(TECH_DATA = 2, TECH_POWER = 2) /obj/item/circuitboard/powermonitor name = T_BOARD("power monitoring console") @@ -150,36 +136,29 @@ /obj/item/circuitboard/crew name = T_BOARD("crew monitoring console") build_path = /obj/machinery/computer/crew - origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MAGNET = 2) /obj/item/circuitboard/operating name = T_BOARD("patient monitoring console") build_path = /obj/machinery/computer/operating - origin_tech = list(TECH_DATA = 2, TECH_BIO = 2) /obj/item/circuitboard/mining_shuttle name = T_BOARD("mining shuttle console") build_path = /obj/machinery/computer/shuttle_control/mining - origin_tech = list(TECH_DATA = 2) hidden = TRUE // todo - Make properly constructable in round /obj/item/circuitboard/engineering_shuttle name = T_BOARD("engineering shuttle console") build_path = /obj/machinery/computer/shuttle_control/engineering - origin_tech = list(TECH_DATA = 2) hidden = TRUE // todo - Make properly constructable in round /obj/item/circuitboard/research_shuttle name = T_BOARD("research shuttle console") build_path = /obj/machinery/computer/shuttle_control/research - origin_tech = list(TECH_DATA = 2) hidden = TRUE // todo - Make properly constructable in round /obj/item/circuitboard/aifixer name = T_BOARD("AI integrity restorer") build_path = /obj/machinery/computer/aifixer - origin_tech = list(TECH_DATA = 3, TECH_BIO = 2) - /obj/item/circuitboard/helm name = T_BOARD("helm control console") @@ -209,25 +188,20 @@ /obj/item/circuitboard/area_atmos name = T_BOARD("area air control console") build_path = /obj/machinery/computer/area_atmos - origin_tech = list(TECH_DATA = 2) /obj/item/circuitboard/prison_shuttle name = T_BOARD("prison shuttle control console") build_path = /obj/machinery/computer/prison_shuttle - origin_tech = list(TECH_DATA = 2) hidden = TRUE // todo - Make properly constructable in round /obj/item/circuitboard/rcon_console name = T_BOARD("RCON remote control console") build_path = /obj/machinery/computer/rcon - origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 3, TECH_POWER = 5) /obj/item/circuitboard/shutoff_monitor name = T_BOARD("automatic shutoff valve monitor") build_path = /obj/machinery/computer/shutoff_monitor - origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4) /obj/item/circuitboard/stockexchange name = T_BOARD("stock exchange console") build_path = /obj/machinery/computer/stockexchange - origin_tech = list(TECH_DATA = 2, TECH_MAGNET = 1) diff --git a/code/game/objects/items/weapons/circuitboards/computer/shuttle.dm b/code/game/objects/items/weapons/circuitboards/computer/shuttle.dm index 48359b53e85..8d87262a447 100644 --- a/code/game/objects/items/weapons/circuitboards/computer/shuttle.dm +++ b/code/game/objects/items/weapons/circuitboards/computer/shuttle.dm @@ -6,7 +6,6 @@ // Shuttle control console. Board tries to auto-link the computer if built on a shuttle. // /obj/item/circuitboard/shuttle_console - origin_tech = list(TECH_DATA = 3) var/shuttle_category = null // Shuttle datum's category must exactly equal this to auto-detect var/shuttle_tag = null // If set, link constructed console to this shuttle. If null, auto-detect. hidden = TRUE // todo - Make properly constructable in round @@ -39,7 +38,6 @@ /obj/item/circuitboard/shuttle_console/explore name = T_BOARD("long range shuttle control console") build_path = /obj/machinery/computer/shuttle_control/explore - origin_tech = list(TECH_DATA = 3, TECH_BLUESPACE = 4) shuttle_category = /datum/shuttle/autodock/overmap // Multi-shuttle console diff --git a/code/game/objects/items/weapons/circuitboards/computer/supply.dm b/code/game/objects/items/weapons/circuitboards/computer/supply.dm index 7e044a3abcf..370c141c611 100644 --- a/code/game/objects/items/weapons/circuitboards/computer/supply.dm +++ b/code/game/objects/items/weapons/circuitboards/computer/supply.dm @@ -5,13 +5,11 @@ /obj/item/circuitboard/supplycomp name = T_BOARD("supply ordering console") build_path = /obj/machinery/computer/supplycomp - origin_tech = list(TECH_DATA = 2) var/contraband_enabled = 0 /obj/item/circuitboard/supplycomp/control name = T_BOARD("supply ordering console") build_path = /obj/machinery/computer/supplycomp/control - origin_tech = list(TECH_DATA = 3) /obj/item/circuitboard/supplycomp/construct(var/obj/machinery/computer/supplycomp/SC) if (..(SC)) diff --git a/code/game/objects/items/weapons/circuitboards/computer/telecomms.dm b/code/game/objects/items/weapons/circuitboards/computer/telecomms.dm index 071bcfebba6..c87f5158dcc 100644 --- a/code/game/objects/items/weapons/circuitboards/computer/telecomms.dm +++ b/code/game/objects/items/weapons/circuitboards/computer/telecomms.dm @@ -5,20 +5,16 @@ /obj/item/circuitboard/comm_monitor name = T_BOARD("telecommunications monitor console") build_path = /obj/machinery/computer/telecomms/monitor - origin_tech = list(TECH_DATA = 3) /obj/item/circuitboard/comm_server name = T_BOARD("telecommunications server monitor console") build_path = /obj/machinery/computer/telecomms/server - origin_tech = list(TECH_DATA = 3) /obj/item/circuitboard/comm_traffic name = T_BOARD("telecommunications traffic control console") build_path = /obj/machinery/computer/telecomms/traffic - origin_tech = list(TECH_DATA = 3) /obj/item/circuitboard/message_server name = T_BOARD("message server") build_path = /obj/machinery/message_server - origin_tech = list(TECH_DATA = 3) board_type = new /datum/frame/frame_types/machine diff --git a/code/game/objects/items/weapons/circuitboards/frame.dm b/code/game/objects/items/weapons/circuitboards/frame.dm index f09434fcab0..21a316268e6 100644 --- a/code/game/objects/items/weapons/circuitboards/frame.dm +++ b/code/game/objects/items/weapons/circuitboards/frame.dm @@ -90,13 +90,11 @@ name = T_BOARD("body scanner console") build_path = /obj/machinery/body_scanconsole board_type = new /datum/frame/frame_types/medical_console - origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 2) /obj/item/circuitboard/sleeper_console name = T_BOARD("sleeper console") build_path = /obj/machinery/sleep_console board_type = new /datum/frame/frame_types/medical_console - origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 2) //Machine @@ -180,7 +178,6 @@ name = T_BOARD("teleporter hub") build_path = /obj/machinery/teleport/hub board_type = "teleporter_hub" -// origin_tech = list(TECH_DATA = 2, TECH_BLUESPACE = 4) req_components = list( /obj/item/stock_parts/scanning_module = 4, /obj/item/stock_parts/micro_laser = 4, @@ -190,7 +187,6 @@ name = T_BOARD("teleporter station") build_path = /obj/machinery/teleport/station board_type = "teleporter_station" -// origin_tech = list(TECH_DATA = 2, TECH_BLUESPACE = 3) req_components = list( /obj/item/stock_parts/console_screen = 1, /obj/item/stock_parts/capacitor = 2, @@ -200,7 +196,6 @@ name = T_BOARD("body scanner") build_path = /obj/machinery/bodyscanner board_type = new /datum/frame/frame_types/medical_pod - origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 2) req_components = list( /obj/item/stock_parts/scanning_module = 1, /obj/item/stack/material/glass/reinforced = 2) @@ -209,7 +204,6 @@ name = T_BOARD("medical kiosk") build_path = /obj/machinery/medical_kiosk board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 2) req_components = list( /obj/item/stock_parts/scanning_module = 3, /obj/item/stack/material/glass/reinforced = 2) @@ -218,7 +212,6 @@ name = T_BOARD("sleeper") build_path = /obj/machinery/sleeper board_type = new /datum/frame/frame_types/medical_pod - origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 2) req_components = list( /obj/item/stock_parts/manipulator = 1, /obj/item/stock_parts/scanning_module = 1, @@ -230,7 +223,6 @@ name = T_BOARD("VR sleeper") build_path = /obj/machinery/vr_sleeper board_type = new /datum/frame/frame_types/medical_pod - origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 2) req_components = list( /obj/item/stock_parts/scanning_module = 1, /obj/item/stack/material/glass/reinforced = 2) @@ -239,7 +231,6 @@ name = T_BOARD("dna analyzer") build_path = /obj/machinery/dnaforensics board_type = new /datum/frame/frame_types/dna_analyzer - origin_tech = list(TECH_MAGNET = 4, TECH_BIO = 2, TECH_DATA = 2) req_components = list( /obj/item/stock_parts/scanning_module = 2, /obj/item/stock_parts/micro_laser = 1, @@ -260,7 +251,6 @@ name = T_BOARD("atmospheric field generator") build_path = /obj/machinery/atmospheric_field_generator board_type = new /datum/frame/frame_types/arfgs - origin_tech = list(TECH_MAGNET = 4, TECH_POWER = 4, TECH_BIO = 3) req_components = list( /obj/item/stock_parts/micro_laser/high = 2, //field emitters /obj/item/stock_parts/scanning_module = 1, //atmosphere sensor @@ -272,7 +262,6 @@ name = T_BOARD("Ready-to-Use Medicine 3000") build_path = /obj/machinery/injector_maker board_type = new /datum/frame/frame_types/injector_maker - origin_tech = list(TECH_BIO = 3, TECH_ENGINEERING = 2, TECH_MATERIAL = 2) req_components = list( /obj/item/stock_parts/matter_bin = 2, /obj/item/stock_parts/manipulator = 1, diff --git a/code/game/objects/items/weapons/circuitboards/machinery/anomaly_harvester.dm b/code/game/objects/items/weapons/circuitboards/machinery/anomaly_harvester.dm index a7a32ea1dd0..2da95b1cacc 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/anomaly_harvester.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/anomaly_harvester.dm @@ -6,7 +6,6 @@ name = T_BOARD("anomaly harvester") build_path = /obj/machinery/anomaly_harvester board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_DATA = 1) req_components = list( /obj/item/stock_parts/matter_bin = 2, /obj/item/stock_parts/manipulator = 1, diff --git a/code/game/objects/items/weapons/circuitboards/machinery/biogenerator.dm b/code/game/objects/items/weapons/circuitboards/machinery/biogenerator.dm index ce9f2f97ef0..86f6499d784 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/biogenerator.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/biogenerator.dm @@ -6,7 +6,6 @@ name = T_BOARD("biogenerator") build_path = /obj/machinery/biogenerator board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_DATA = 2) req_components = list( /obj/item/stock_parts/matter_bin = 1, /obj/item/stock_parts/manipulator = 1) diff --git a/code/game/objects/items/weapons/circuitboards/machinery/cloning.dm b/code/game/objects/items/weapons/circuitboards/machinery/cloning.dm index 1602a5b4bf0..8f2779ee90f 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/cloning.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/cloning.dm @@ -6,7 +6,6 @@ name = T_BOARD("clone pod") build_path = /obj/machinery/clonepod board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_DATA = 3, TECH_BIO = 3) req_components = list( /obj/item/stack/cable_coil = 2, /obj/item/stock_parts/scanning_module = 2, @@ -17,7 +16,6 @@ name = T_BOARD("cloning scanner") build_path = /obj/machinery/dna_scannernew board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_DATA = 2, TECH_BIO = 2) req_components = list( /obj/item/stock_parts/scanning_module = 1, /obj/item/stock_parts/manipulator = 1, diff --git a/code/game/objects/items/weapons/circuitboards/machinery/fluidpump.dm b/code/game/objects/items/weapons/circuitboards/machinery/fluidpump.dm index 497c55eb14c..9f5e8ed59d6 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/fluidpump.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/fluidpump.dm @@ -7,7 +7,6 @@ name = T_BOARD("fluid pump") build_path = /obj/machinery/pump board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_DATA = 1) req_components = list( /obj/item/stock_parts/matter_bin = 2, /obj/item/cell = 1, diff --git a/code/game/objects/items/weapons/circuitboards/machinery/jukebox.dm b/code/game/objects/items/weapons/circuitboards/machinery/jukebox.dm index f846586fcec..f82ffb574a7 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/jukebox.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/jukebox.dm @@ -6,7 +6,6 @@ name = T_BOARD("jukebox") build_path = /obj/machinery/media/jukebox board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_MAGNET = 2, TECH_DATA = 1) req_components = list( /obj/item/stock_parts/capacitor = 1, /obj/item/stock_parts/console_screen = 1, diff --git a/code/game/objects/items/weapons/circuitboards/machinery/mech_recharger.dm b/code/game/objects/items/weapons/circuitboards/machinery/mech_recharger.dm index 368948501af..b4a03b6f623 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/mech_recharger.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/mech_recharger.dm @@ -6,7 +6,6 @@ name = T_BOARD("mech recharger") build_path = /obj/machinery/mech_recharger board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_DATA = 2, TECH_POWER = 2, TECH_ENGINEERING = 2) req_components = list( /obj/item/stock_parts/capacitor = 2, /obj/item/stock_parts/scanning_module = 1, diff --git a/code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm b/code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm index 03770c7aca5..21e0725058f 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm @@ -6,7 +6,6 @@ name = T_BOARD("mining drill head") build_path = /obj/machinery/mining/drill board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1) req_components = list( /obj/item/stock_parts/capacitor = 1, /obj/item/stock_parts/matter_bin = 1, @@ -16,7 +15,6 @@ name = T_BOARD("mining drill brace") build_path = /obj/machinery/mining/brace board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1) req_components = list( /obj/item/stock_parts/manipulator = 1 ) diff --git a/code/game/objects/items/weapons/circuitboards/machinery/pacman.dm b/code/game/objects/items/weapons/circuitboards/machinery/pacman.dm index c277882e04c..d103c2daa23 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/pacman.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/pacman.dm @@ -6,7 +6,6 @@ name = T_BOARD("PACMAN-type generator") build_path = /obj/machinery/power/port_gen/pacman board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_DATA = 3, TECH_POWER = 3, TECH_PHORON = 3, TECH_ENGINEERING = 3) req_components = list( /obj/item/stock_parts/matter_bin = 1, /obj/item/stock_parts/micro_laser = 1, @@ -16,9 +15,7 @@ /obj/item/circuitboard/pacman/super name = T_BOARD("SUPERPACMAN-type generator") build_path = /obj/machinery/power/port_gen/pacman/super - origin_tech = list(TECH_DATA = 3, TECH_POWER = 4, TECH_ENGINEERING = 4) /obj/item/circuitboard/pacman/mrs name = T_BOARD("MRSPACMAN-type generator") build_path = /obj/machinery/power/port_gen/pacman/mrs - origin_tech = list(TECH_DATA = 3, TECH_POWER = 5, TECH_ENGINEERING = 5) diff --git a/code/game/objects/items/weapons/circuitboards/machinery/pandemic.dm b/code/game/objects/items/weapons/circuitboards/machinery/pandemic.dm index 2865260d8a2..34623fbcd16 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/pandemic.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/pandemic.dm @@ -6,7 +6,6 @@ name = T_BOARD("pandemic") build_path = /obj/machinery/computer/pandemic board_type = new /datum/frame/frame_types/computer - origin_tech = list(TECH_DATA = 2, TECH_BIO = 2) req_components = list( /obj/item/stock_parts/matter_bin = 2, /obj/item/stock_parts/scanning_module = 1, diff --git a/code/game/objects/items/weapons/circuitboards/machinery/power.dm b/code/game/objects/items/weapons/circuitboards/machinery/power.dm index 05a555815bd..d604d523e88 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/power.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/power.dm @@ -6,7 +6,6 @@ name = T_BOARD("superconductive magnetic energy storage") build_path = /obj/machinery/power/smes/buildable board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_POWER = 6, TECH_ENGINEERING = 4) req_components = list(/obj/item/smes_coil = 1, /obj/item/stack/cable_coil = 30) /obj/item/circuitboard/smes/construct(var/obj/machinery/power/smes/buildable/S) @@ -17,21 +16,18 @@ name = T_BOARD("battery rack PSU") build_path = /obj/machinery/power/smes/batteryrack board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_POWER = 3, TECH_ENGINEERING = 2) req_components = list(/obj/item/stock_parts/capacitor/ = 3, /obj/item/stock_parts/matter_bin/ = 1) /obj/item/circuitboard/grid_checker name = T_BOARD("power grid checker") build_path = /obj/machinery/power/grid_checker board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_POWER = 4, TECH_ENGINEERING = 3) req_components = list(/obj/item/stock_parts/capacitor = 3, /obj/item/stack/cable_coil = 10) /obj/item/circuitboard/breakerbox name = T_BOARD("breaker box") build_path = /obj/machinery/power/breakerbox board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_POWER = 3, TECH_ENGINEERING = 3) req_components = list( /obj/item/stock_parts/spring = 1, /obj/item/stock_parts/manipulator = 1, diff --git a/code/game/objects/items/weapons/circuitboards/machinery/reagents.dm b/code/game/objects/items/weapons/circuitboards/machinery/reagents.dm index 34c9869a487..bcc10d70f87 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/reagents.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/reagents.dm @@ -7,7 +7,6 @@ name = T_BOARD("chem analyzer PRO") build_path = /obj/machinery/chemical_analyzer board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1) req_components = list(/obj/item/stock_parts/scanning_module = 1, /obj/item/stock_parts/matter_bin = 1) // Smart centrifuge @@ -15,7 +14,6 @@ name = T_BOARD("smart centrifuge") build_path = /obj/machinery/smart_centrifuge board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_MAGNET = 3, TECH_DATA = 2, TECH_MATERIAL = 3) req_components = list( /obj/item/stock_parts/scanning_module = 1, /obj/item/stock_parts/motor = 1, diff --git a/code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm b/code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm index 70bfbcc92c1..02a3fd7b336 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm @@ -6,7 +6,6 @@ name = T_BOARD("cyborg recharging station") build_path = /obj/machinery/recharge_station board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 3) req_components = list( /obj/item/stack/cable_coil = 5, /obj/item/stock_parts/capacitor = 2, diff --git a/code/game/objects/items/weapons/circuitboards/machinery/recycling.dm b/code/game/objects/items/weapons/circuitboards/machinery/recycling.dm index ebb767757ed..96b3a541ca1 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/recycling.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/recycling.dm @@ -6,7 +6,6 @@ name = T_BOARD("recycler - crusher") build_path = /obj/machinery/recycling/crusher board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_MATERIAL = 2) req_components = list( /obj/item/stack/cable_coil = 2, /obj/item/stock_parts/motor = 1, @@ -19,7 +18,6 @@ name = T_BOARD("recycler - sorter") build_path = /obj/machinery/recycling/sorter board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_MATERIAL = 2) req_components = list( /obj/item/stack/cable_coil = 2, /obj/item/stock_parts/motor = 1, @@ -30,7 +28,6 @@ name = T_BOARD("recycler - stamper") build_path = /obj/machinery/recycling/stamper board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_MATERIAL = 2) req_components = list( /obj/item/stack/cable_coil = 2, /obj/item/stock_parts/gear = 2, diff --git a/code/game/objects/items/weapons/circuitboards/machinery/research.dm b/code/game/objects/items/weapons/circuitboards/machinery/research.dm index 69f08e7af88..fe1872d750a 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/research.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/research.dm @@ -6,7 +6,6 @@ name = T_BOARD("autolathe") build_path = /obj/machinery/autolathe board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2) req_components = list( /obj/item/stock_parts/matter_bin = 3, /obj/item/stock_parts/manipulator = 1, @@ -54,7 +53,6 @@ name = T_BOARD("circuit imprinter") build_path = /obj/machinery/rnd/production/circuit_imprinter board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2) req_components = list( /obj/item/stock_parts/matter_bin = 1, /obj/item/stock_parts/manipulator = 1, @@ -64,7 +62,6 @@ name = T_BOARD("Exosuit Fabricator") build_path = /obj/machinery/mecha_part_fabricator_tg board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 3) req_components = list( /obj/item/stock_parts/matter_bin = 2, /obj/item/stock_parts/manipulator = 1, @@ -75,7 +72,6 @@ name = T_BOARD("Prosthetics Fabricator") build_path = /obj/machinery/mecha_part_fabricator_tg/prosthetics board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 3) req_components = list( /obj/item/stock_parts/matter_bin = 2, /obj/item/stock_parts/manipulator = 1, @@ -86,7 +82,6 @@ name = T_BOARD("NTNet Quantum Relay") build_path = /obj/machinery/ntnet_relay board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_DATA = 4) req_components = list( /obj/item/stack/cable_coil = 15) @@ -94,7 +89,6 @@ name = T_BOARD("protean reconstitutor") board_type = new /datum/frame/frame_types/machine build_path = /obj/machinery/protean_reconstitutor - origin_tech = list(TECH_MAGNET = 5, TECH_BLUESPACE = 5, TECH_MATERIAL = 5, TECH_ENGINEERING = 5, TECH_DATA = 5) req_components = list( /obj/item/stock_parts/matter_bin = 1, /obj/item/stock_parts/manipulator = 1, @@ -105,7 +99,6 @@ name = T_BOARD("artifact harvester") build_path = /obj/machinery/artifact_harvester board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_MATERIAL = 2, TECH_POWER = 4, TECH_ENGINEERING = 2) req_components = list( /obj/item/stock_parts/capacitor = 5, //Yes, it's ALL capacitors. It's only purpose is to store power! /obj/item/stock_parts/console_screen = 1) @@ -114,7 +107,6 @@ name = T_BOARD("artifact scanpad") build_path = /obj/machinery/artifact_scanpad board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_MATERIAL = 2, TECH_POWER = 4, TECH_ENGINEERING = 2) req_components = list( /obj/item/stock_parts/manipulator = 1, /obj/item/stock_parts/console_screen = 1) @@ -123,7 +115,6 @@ name = T_BOARD("destructive analyzer") build_path = /obj/machinery/rnd/destructive_analyzer board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2, TECH_DATA = 2) req_components = list( /obj/item/stock_parts/scanning_module = 1, /obj/item/stock_parts/manipulator = 1, @@ -133,6 +124,5 @@ name = T_BOARD("doppler array") build_path = /obj/machinery/doppler_array board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 1, TECH_DATA = 3) req_components = list( /obj/item/stock_parts/scanning_module = 4) diff --git a/code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm b/code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm index cc33f90553f..14c746972b8 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm @@ -10,7 +10,6 @@ name = T_BOARD("advanced shield generator") board_type = new /datum/frame/frame_types/machine build_path = /obj/machinery/power/shield_generator - origin_tech = list(TECH_MAGNET = 3, TECH_POWER = 4, TECH_BLUESPACE = 2, TECH_ENGINEERING = 3) req_components = list( /obj/item/stock_parts/capacitor = 1, /obj/item/stock_parts/micro_laser = 1, @@ -23,7 +22,6 @@ name = T_BOARD("shield diffuser") board_type = new /datum/frame/frame_types/machine build_path = /obj/machinery/shield_diffuser - origin_tech = list(TECH_MAGNET = 4, TECH_POWER = 2, TECH_ILLEGAL = 1) req_components = list( /obj/item/stock_parts/capacitor = 1, /obj/item/stock_parts/micro_laser = 1, @@ -37,7 +35,6 @@ name = T_BOARD("hull shield generator") board_type = new /datum/frame/frame_types/machine build_path = /obj/machinery/shield_gen/external - origin_tech = list(TECH_BLUESPACE = 4, TECH_PHORON = 3) req_components = list( /obj/item/stock_parts/manipulator/pico = 2, /obj/item/stock_parts/subspace/transmitter = 1, @@ -50,7 +47,6 @@ name = T_BOARD("bubble shield generator") board_type = new /datum/frame/frame_types/machine build_path = /obj/machinery/shield_gen - origin_tech = list(TECH_BLUESPACE = 4, TECH_PHORON = 3) req_components = list( /obj/item/stock_parts/manipulator/pico = 2, /obj/item/stock_parts/subspace/transmitter = 1, @@ -63,7 +59,6 @@ name = T_BOARD("shield capacitor") board_type = new /datum/frame/frame_types/machine build_path = /obj/machinery/shield_capacitor - origin_tech = list(TECH_MAGNET = 3, TECH_POWER = 4) req_components = list( /obj/item/stock_parts/manipulator/pico = 2, /obj/item/stock_parts/subspace/sub_filter = 1, diff --git a/code/game/objects/items/weapons/circuitboards/machinery/ships.dm b/code/game/objects/items/weapons/circuitboards/machinery/ships.dm index 38a1b3a224b..a83aaa1de84 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/ships.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/ships.dm @@ -7,7 +7,6 @@ board_type = new /datum/frame/frame_types/machine desc = "Control systems for a Kuiper pattern point defense battery. Aim away from vessel." build_path = /obj/machinery/pointdefense - origin_tech = list(TECH_ENGINEERING = 3, TECH_COMBAT = 2) req_components = list( /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser = 1, /obj/item/stock_parts/manipulator = 2, @@ -19,5 +18,4 @@ board_type = new /datum/frame/frame_types/machine desc = "A control computer to synchronize point defense batteries." build_path = /obj/machinery/pointdefense_control - origin_tech = list(TECH_ENGINEERING = 3, TECH_COMBAT = 2) req_components = list() diff --git a/code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm b/code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm index 2490a199cc9..dbe2e867bcc 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm @@ -8,7 +8,6 @@ /obj/item/circuitboard/telecomms/receiver name = T_BOARD("subspace receiver") build_path = /obj/machinery/telecomms/receiver - origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 3, TECH_BLUESPACE = 2) req_components = list( /obj/item/stock_parts/subspace/ansible = 1, /obj/item/stock_parts/subspace/sub_filter = 1, @@ -18,7 +17,6 @@ /obj/item/circuitboard/telecomms/hub name = T_BOARD("hub mainframe") build_path = /obj/machinery/telecomms/hub - origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4) req_components = list( /obj/item/stock_parts/manipulator = 2, /obj/item/stack/cable_coil = 2, @@ -27,7 +25,6 @@ /obj/item/circuitboard/telecomms/relay name = T_BOARD("relay mainframe") build_path = /obj/machinery/telecomms/relay - origin_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 4, TECH_BLUESPACE = 3) req_components = list( /obj/item/stock_parts/manipulator = 2, /obj/item/stack/cable_coil = 2, @@ -36,7 +33,6 @@ /obj/item/circuitboard/telecomms/bus name = T_BOARD("bus mainframe") build_path = /obj/machinery/telecomms/bus - origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4) req_components = list( /obj/item/stock_parts/manipulator = 2, /obj/item/stack/cable_coil = 1, @@ -45,7 +41,6 @@ /obj/item/circuitboard/telecomms/processor name = T_BOARD("processor unit") build_path = /obj/machinery/telecomms/processor - origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4) req_components = list( /obj/item/stock_parts/manipulator = 3, /obj/item/stock_parts/subspace/sub_filter = 1, @@ -57,7 +52,6 @@ /obj/item/circuitboard/telecomms/server name = T_BOARD("telecommunication server") build_path = /obj/machinery/telecomms/server - origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4) req_components = list( /obj/item/stock_parts/manipulator = 2, /obj/item/stack/cable_coil = 1, @@ -66,7 +60,6 @@ /obj/item/circuitboard/telecomms/broadcaster name = T_BOARD("subspace broadcaster") build_path = /obj/machinery/telecomms/broadcaster - origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4, TECH_BLUESPACE = 2) req_components = list( /obj/item/stock_parts/manipulator = 2, /obj/item/stack/cable_coil = 1, @@ -78,7 +71,6 @@ /obj/item/circuitboard/telecomms/exonet_node name = T_BOARD("exonet node") build_path = /obj/machinery/exonet_node - origin_tech = list(TECH_DATA = 5, TECH_ENGINEERING = 5, TECH_BLUESPACE = 4) req_components = list( /obj/item/stock_parts/subspace/ansible = 1, /obj/item/stock_parts/subspace/sub_filter = 1, @@ -91,7 +83,6 @@ /obj/item/circuitboard/telecomms/pda_multicaster name = T_BOARD("pda multicaster") build_path = /obj/machinery/pda_multicaster - origin_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 2, TECH_BLUESPACE = 2) req_components = list( /obj/item/stock_parts/subspace/ansible = 1, /obj/item/stock_parts/subspace/sub_filter = 1, diff --git a/code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm b/code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm index f9c876cdc70..5929006826d 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm @@ -16,7 +16,6 @@ /obj/item/circuitboard/unary_atmos/heater name = T_BOARD("gas heating system") build_path = /obj/machinery/atmospherics/unary/heater - origin_tech = list(TECH_POWER = 2, TECH_ENGINEERING = 1) req_components = list( /obj/item/stack/cable_coil = 5, /obj/item/stock_parts/matter_bin = 1, @@ -26,7 +25,6 @@ /obj/item/circuitboard/unary_atmos/cooler name = T_BOARD("gas cooling system") build_path = /obj/machinery/atmospherics/unary/freezer - origin_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2) req_components = list( /obj/item/stack/cable_coil = 2, /obj/item/stock_parts/matter_bin = 1, diff --git a/code/game/objects/items/weapons/circuitboards/mecha.dm b/code/game/objects/items/weapons/circuitboards/mecha.dm index b17053a055e..bb096515897 100644 --- a/code/game/objects/items/weapons/circuitboards/mecha.dm +++ b/code/game/objects/items/weapons/circuitboards/mecha.dm @@ -14,7 +14,6 @@ board_type = "other" /obj/item/circuitboard/mecha/ripley - origin_tech = list(TECH_DATA = 3) /obj/item/circuitboard/mecha/ripley/peripherals name = T_BOARD_MECHA("Ripley peripherals control") @@ -25,7 +24,6 @@ icon_state = "mainboard" /obj/item/circuitboard/mecha/gygax - origin_tech = list(TECH_DATA = 4) /obj/item/circuitboard/mecha/gygax/peripherals name = T_BOARD_MECHA("Gygax peripherals control") @@ -34,19 +32,16 @@ /obj/item/circuitboard/mecha/gygax/targeting name = T_BOARD_MECHA("Gygax weapon control and targeting") icon_state = "mcontroller" - origin_tech = list(TECH_DATA = 4, TECH_COMBAT = 4) /obj/item/circuitboard/mecha/gygax/medical name = T_BOARD_MECHA("Serenity medical control") icon_state = "mcontroller" - origin_tech = list(TECH_DATA = 4, TECH_BIO = 4) /obj/item/circuitboard/mecha/gygax/main name = T_BOARD_MECHA("Gygax central control") icon_state = "mainboard" /obj/item/circuitboard/mecha/durand - origin_tech = list(TECH_DATA = 4) /obj/item/circuitboard/mecha/durand/peripherals name = T_BOARD_MECHA("Durand peripherals control") @@ -55,7 +50,6 @@ /obj/item/circuitboard/mecha/durand/targeting name = T_BOARD_MECHA("Durand weapon control and targeting") icon_state = "mcontroller" - origin_tech = list(TECH_DATA = 4, TECH_COMBAT = 4) /obj/item/circuitboard/mecha/durand/main name = T_BOARD_MECHA("Durand central control") @@ -66,20 +60,16 @@ /obj/item/circuitboard/mecha/phazon/peripherals name = T_BOARD_MECHA("Phazon peripherals control") icon_state = "mcontroller" - origin_tech = list(TECH_DATA = 6, TECH_ILLEGAL = 6) /obj/item/circuitboard/mecha/phazon/targeting name = T_BOARD_MECHA("Phazon weapon control and targeting") icon_state = "mcontroller" - origin_tech = list(TECH_DATA = 6, TECH_COMBAT = 7) /obj/item/circuitboard/mecha/phazon/main name = T_BOARD_MECHA("Phazon central control") - origin_tech = list(TECH_DATA = 6, TECH_BLUESPACE = 5) icon_state = "mainboard" /obj/item/circuitboard/mecha/honker - origin_tech = list(TECH_DATA = 4) /obj/item/circuitboard/mecha/honker/peripherals name = T_BOARD_MECHA("H.O.N.K peripherals control") @@ -95,7 +85,6 @@ /obj/item/circuitboard/mecha/odysseus - origin_tech = list(TECH_DATA = 3) /obj/item/circuitboard/mecha/odysseus/peripherals name = T_BOARD_MECHA("Odysseus peripherals control") @@ -107,7 +96,6 @@ /obj/item/circuitboard/mecha/imperion name = "Alien Circuit" - origin_tech = list(TECH_DATA = 5, TECH_BLUESPACE = 3, TECH_PRECURSOR = 1) icon = 'icons/obj/abductor.dmi' icon_state = "circuit" @@ -126,7 +114,6 @@ /obj/item/circuitboard/mecha/imperion/damaged name = "Damaged Alien Circuit" desc = "It is marked with a " + span_alien("constantly shifting glyph") + "." - origin_tech = list(TECH_DATA = 3, TECH_BLUESPACE = 1, TECH_PRECURSOR = 2) ///Fighters/// @@ -136,22 +123,18 @@ /obj/item/circuitboard/mecha/fighter/pinnace/main name = T_BOARD_FIGHTER("Pinnace central control") - origin_tech = list(TECH_DATA = 4, TECH_BIO = 2, TECH_BLUESPACE = 2) icon_state = "mainboard" /obj/item/circuitboard/mecha/fighter/pinnace/flight name = T_BOARD_FIGHTER("Pinnace flight control") icon_state = "mcontroller" - origin_tech = list(TECH_DATA = 4, TECH_BLUESPACE = 2) /obj/item/circuitboard/mecha/fighter/pinnace/targeting name = T_BOARD_FIGHTER("Pinnace weapon control and targeting") icon_state = "mcontroller" - origin_tech = list(TECH_DATA = 4, TECH_COMBAT = 1) /obj/item/circuitboard/mecha/fighter/pinnace/cockpitboard name = T_BOARD_FIGHTER("Pinnace manual flight control instruments") - origin_tech = list(TECH_DATA = 4, TECH_BLUESPACE = 2) icon_state = "card_mod" //Baron// @@ -161,22 +144,18 @@ /obj/item/circuitboard/mecha/fighter/baron/main name = T_BOARD_FIGHTER("Baron central control") icon_state = "mainboard" - origin_tech = list(TECH_DATA = 6, TECH_BIO = 4, TECH_BLUESPACE = 5) /obj/item/circuitboard/mecha/fighter/baron/flight name = T_BOARD_FIGHTER("Baron flight control") icon_state = "mcontroller" - origin_tech = list(TECH_DATA = 6, TECH_BLUESPACE = 5) /obj/item/circuitboard/mecha/fighter/baron/targeting name = T_BOARD_FIGHTER("Baron weapon control and targeting") icon_state = "mcontroller" - origin_tech = list(TECH_DATA = 6, TECH_BIO = 4, TECH_COMBAT = 5) /obj/item/circuitboard/mecha/fighter/baron/cockpitboard name = T_BOARD_FIGHTER("Baron manual flight control instruments") icon_state = "card_mod" - origin_tech = list(TECH_DATA = 6, TECH_BLUESPACE = 5) //Undef the macros, 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 index ef1ad679654..1ad7012e2ad 100644 --- a/code/game/objects/items/weapons/circuitboards/other.dm +++ b/code/game/objects/items/weapons/circuitboards/other.dm @@ -6,14 +6,12 @@ /obj/item/circuitboard/aicore name = T_BOARD("AI core") - origin_tech = list(TECH_DATA = 4, TECH_BIO = 2) board_type = "other" /obj/item/circuitboard/chem_master name = T_BOARD("ChemMaster 3000") build_path = /obj/machinery/chem_master board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_DATA = 3, TECH_MAGNET = 2) req_components = list( /obj/item/stock_parts/matter_bin = 2, /obj/item/stock_parts/manipulator = 2) diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index fa80269341c..cff0ac40986 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -7,7 +7,6 @@ item_state = "plasticx" flags = NOBLUDGEON w_class = ITEMSIZE_SMALL - origin_tech = list(TECH_ILLEGAL = 2) var/timer = 10 var/atom/target = null var/open_panel = 0 diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index 8e2a5ba5a5c..bb317ca2c9b 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -16,7 +16,6 @@ throw_speed = 1 throw_range = 5 w_class = ITEMSIZE_NORMAL - origin_tech = list(TECH_COMBAT = 1, TECH_PHORON = 1) matter = list(MAT_STEEL = 500) var/status = FALSE var/throw_amount = THROWER_MIN diff --git a/code/game/objects/items/weapons/grenades/anti_photon_grenade.dm b/code/game/objects/items/weapons/grenades/anti_photon_grenade.dm index 7658e69e277..dc0f577e4a8 100644 --- a/code/game/objects/items/weapons/grenades/anti_photon_grenade.dm +++ b/code/game/objects/items/weapons/grenades/anti_photon_grenade.dm @@ -4,7 +4,6 @@ icon = 'icons/obj/grenade.dmi' icon_state = "emp" det_time = 20 - origin_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 4) var/light_sound = 'sound/effects/phasein.ogg' var/blast_sound = 'sound/effects/bang.ogg' diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 5e3efc8aff6..924c0aafb23 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -201,7 +201,6 @@ desc = "An oversized grenade that affects a larger area." icon_state = "large_grenade" allowed_containers = list(/obj/item/reagent_containers/glass) - origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3) affected_area = 4 /obj/item/grenade/chem_grenade/metalfoam diff --git a/code/game/objects/items/weapons/grenades/emgrenade.dm b/code/game/objects/items/weapons/grenades/emgrenade.dm index 19157af633d..9bd4a1490d8 100644 --- a/code/game/objects/items/weapons/grenades/emgrenade.dm +++ b/code/game/objects/items/weapons/grenades/emgrenade.dm @@ -2,7 +2,6 @@ name = "emp grenade" icon_state = "emp" item_state = "empgrenade" - origin_tech = list(TECH_MATERIAL = 2, TECH_MAGNET = 3) var/emp_heavy = 2 var/emp_med = 4 var/emp_light = 7 @@ -18,7 +17,6 @@ name = "low yield emp grenade" desc = "A weaker variant of the EMP grenade" icon_state = "lyemp" - origin_tech = list(TECH_MATERIAL = 2, TECH_MAGNET = 3) emp_heavy = 1 emp_med = 2 emp_light = 3 diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm index 42e250d5d9d..8ecc8d714cc 100644 --- a/code/game/objects/items/weapons/grenades/flashbang.dm +++ b/code/game/objects/items/weapons/grenades/flashbang.dm @@ -2,7 +2,6 @@ name = "flashbang" icon_state = "flashbang" item_state = "flashbang" - origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 1) var/max_range = 10 //The maximum range possible, including species effect mods. Cuts off at 7 for normal humans. Should be 3 higher than your intended target range for affecting normal humans. var/banglet = 0 diff --git a/code/game/objects/items/weapons/grenades/spawnergrenade.dm b/code/game/objects/items/weapons/grenades/spawnergrenade.dm index 4b5e6bbc6d8..e8e6dce1251 100644 --- a/code/game/objects/items/weapons/grenades/spawnergrenade.dm +++ b/code/game/objects/items/weapons/grenades/spawnergrenade.dm @@ -4,7 +4,6 @@ icon = 'icons/obj/grenade.dmi' icon_state = "delivery" item_state = "flashbang" - origin_tech = list(TECH_MATERIAL = 3, TECH_MAGNET = 4) var/banglet = 0 var/spawner_type = null // must be an object path var/deliveryamt = 1 // amount of type to deliver @@ -35,7 +34,6 @@ name = "manhack delivery grenade" spawner_type = /mob/living/simple_mob/mechanical/viscerator deliveryamt = 5 - origin_tech = list(TECH_MATERIAL = 3, TECH_MAGNET = 4, TECH_ILLEGAL = 4) /obj/item/grenade/spawnergrenade/manhacks/mercenary spawner_type = /mob/living/simple_mob/mechanical/viscerator/mercenary @@ -47,26 +45,22 @@ desc = "It is set to detonate in 5 seconds. It will deploy three weaponized survey drones." deliveryamt = 3 spawner_type = /mob/living/simple_mob/mechanical/viscerator/station - origin_tech = list(TECH_MATERIAL = 3, TECH_MAGNET = 3, TECH_ILLEGAL = 1) /obj/item/grenade/spawnergrenade/ward name = "sentry delivery grenade" desc = "It is set to detonate in 5 seconds. It will deploy a single thermal-optic sentry drone." spawner_type = /mob/living/simple_mob/mechanical/ward/monitor/crew deliveryamt = 1 - origin_tech = list(TECH_MATERIAL = 4, TECH_MAGNET = 3, TECH_BLUESPACE = 2) /obj/item/grenade/spawnergrenade/spesscarp name = "carp delivery grenade" spawner_type = /mob/living/simple_mob/animal/space/carp deliveryamt = 5 - origin_tech = list(TECH_MATERIAL = 3, TECH_MAGNET = 4, TECH_ILLEGAL = 4) /obj/item/grenade/spawnergrenade/spider name = "spider delivery grenade" spawner_type = /mob/living/simple_mob/animal/giant_spider/hunter deliveryamt = 3 - origin_tech = list(TECH_MATERIAL = 3, TECH_MAGNET = 4, TECH_ILLEGAL = 4) //Sometimes you just need a sudden influx of spiders. /obj/item/grenade/spawnergrenade/spider/briefcase diff --git a/code/game/objects/items/weapons/grenades/supermatter.dm b/code/game/objects/items/weapons/grenades/supermatter.dm index 9b41c2c65b5..f6b626fb5ce 100644 --- a/code/game/objects/items/weapons/grenades/supermatter.dm +++ b/code/game/objects/items/weapons/grenades/supermatter.dm @@ -2,7 +2,6 @@ name = "supermatter grenade" icon_state = "banana" item_state = "emergency_engi" - origin_tech = list(TECH_BLUESPACE = 5, TECH_MAGNET = 4, TECH_ENGINEERING = 5) arm_sound = 'sound/effects/3.wav' var/implode_at diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 2057a1ffc07..14a0c722164 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -9,7 +9,6 @@ w_class = ITEMSIZE_SMALL throw_speed = 2 throw_range = 5 - origin_tech = list(TECH_MATERIAL = 1) matter = list(MAT_STEEL = 500) drop_sound = 'sound/items/drop/accessory.ogg' pickup_sound = 'sound/items/pickup/accessory.ogg' @@ -205,7 +204,6 @@ gender = PLURAL icon = 'icons/obj/items.dmi' icon_state = "legcuff" - origin_tech = list(TECH_MATERIAL = 1) breakouttime = 300 //Deciseconds = 30s = 0.5 minute cuff_type = "legcuffs" sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/handcuffs.dmi') diff --git a/code/game/objects/items/weapons/id cards/cards.dm b/code/game/objects/items/weapons/id cards/cards.dm index e0403455515..598b791cccd 100644 --- a/code/game/objects/items/weapons/id cards/cards.dm +++ b/code/game/objects/items/weapons/id cards/cards.dm @@ -93,14 +93,12 @@ name = "broken cryptographic sequencer" icon_state = "emag-spent" item_state = "card-id" - origin_tech = list(TECH_MAGNET = 2, TECH_ILLEGAL = 2) /obj/item/card/emag desc = "It's a card with a magnetic strip attached to some circuitry." name = "cryptographic sequencer" icon_state = "emag" item_state = "card-id" - origin_tech = list(TECH_MAGNET = 2, TECH_ILLEGAL = 2) var/uses = 10 /obj/item/card/emag/resolve_attackby(atom/A, mob/user, attack_modifier, var/click_parameters) diff --git a/code/game/objects/items/weapons/id cards/syndicate_ids.dm b/code/game/objects/items/weapons/id cards/syndicate_ids.dm index ea0d2147735..d0f85938be7 100644 --- a/code/game/objects/items/weapons/id cards/syndicate_ids.dm +++ b/code/game/objects/items/weapons/id cards/syndicate_ids.dm @@ -2,7 +2,6 @@ name = "agent card" icon_state = "generic-s" assignment = "Agent" - origin_tech = list(TECH_ILLEGAL = 3) var/electronic_warfare = 1 var/mob/registered_user = null diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index 1bac8a80438..b19ca94a1c3 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -502,7 +502,6 @@ the implant may become unstable and either pre-maturely inject the subject or si /obj/item/implant/death_alarm name = "death alarm implant" desc = "An alarm which monitors host vital signs and transmits a radio message upon death." - origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 2, TECH_DATA = 1) known_implant = TRUE var/mobname = "Will Robinson" @@ -597,7 +596,6 @@ the implant may become unstable and either pre-maturely inject the subject or si icon_state = "implant_evil" var/activation_emote = "sigh" var/obj/item/scanned = null - origin_tech = list(TECH_MATERIAL = 4, TECH_BIO = 2, TECH_ILLEGAL = 2) /obj/item/implant/compressed/get_data() var/dat = {" diff --git a/code/game/objects/items/weapons/implants/implantaugment.dm b/code/game/objects/items/weapons/implants/implantaugment.dm index db468975339..6be9f571b2e 100644 --- a/code/game/objects/items/weapons/implants/implantaugment.dm +++ b/code/game/objects/items/weapons/implants/implantaugment.dm @@ -5,7 +5,6 @@ name = "nanite fabrication implant" desc = "A buzzing implant covered in a writhing layer of metal insects." icon_state = "implant_evil" - origin_tech = list(TECH_MATERIAL = 5, TECH_BIO = 2, TECH_ILLEGAL = 2) var/organ_to_implant = /obj/item/organ/internal/augment/bioaugment/thermalshades var/organ_display_name = "unknown organ" diff --git a/code/game/objects/items/weapons/material/kitchen.dm b/code/game/objects/items/weapons/material/kitchen.dm index 42420481c4f..66108e133c3 100644 --- a/code/game/objects/items/weapons/material/kitchen.dm +++ b/code/game/objects/items/weapons/material/kitchen.dm @@ -9,7 +9,6 @@ pickup_sound = 'sound/items/pickup/knife.ogg' w_class = ITEMSIZE_TINY thrown_force_divisor = 1 - origin_tech = list(TECH_MATERIAL = 1) attack_verb = list("attacked", "stabbed", "poked") sharp = TRUE edge = TRUE diff --git a/code/game/objects/items/weapons/material/knives.dm b/code/game/objects/items/weapons/material/knives.dm index 86715b64244..a54ef88e469 100644 --- a/code/game/objects/items/weapons/material/knives.dm +++ b/code/game/objects/items/weapons/material/knives.dm @@ -72,7 +72,6 @@ edge = TRUE force_divisor = 0.15 // 9 when wielded with hardness 60 (steel) matter = list(MAT_STEEL = 12000) - origin_tech = list(TECH_MATERIAL = 1) attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") drop_sound = 'sound/items/drop/knife.ogg' diff --git a/code/game/objects/items/weapons/material/misc.dm b/code/game/objects/items/weapons/material/misc.dm index ef3fe4706b3..810b91ccbd9 100644 --- a/code/game/objects/items/weapons/material/misc.dm +++ b/code/game/objects/items/weapons/material/misc.dm @@ -18,7 +18,6 @@ w_class = ITEMSIZE_SMALL sharp = TRUE edge = TRUE - origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 1) attack_verb = list("chopped", "torn", "cut") applies_material_colour = 0 drop_sound = 'sound/items/drop/axe.ogg' @@ -121,7 +120,6 @@ default_material = MAT_LEATHER slot_flags = SLOT_BELT w_class = ITEMSIZE_NORMAL - origin_tech = list(TECH_COMBAT = 2) attack_verb = list("flogged", "whipped", "lashed", "disciplined") force_divisor = 0.15 thrown_force_divisor = 0.25 @@ -227,7 +225,6 @@ icon = 'icons/obj/weapons_vr.dmi' icon_state = "stone_wood_axe" default_material = MAT_FLINT - origin_tech = list() applies_material_colour = FALSE /obj/item/material/knife/machete/hatchet/stone/bone diff --git a/code/game/objects/items/weapons/material/twohanded.dm b/code/game/objects/items/weapons/material/twohanded.dm index ce72a1e6d8f..8171f489608 100644 --- a/code/game/objects/items/weapons/material/twohanded.dm +++ b/code/game/objects/items/weapons/material/twohanded.dm @@ -139,7 +139,6 @@ name = "scythe" desc = "A sharp and curved blade on a long fibremetal handle, this tool makes it easy to reap what you sow." force_divisor = 0.65 - origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 2) attack_verb = list("chopped", "sliced", "cut", "reaped") //spears, bay edition diff --git a/code/game/objects/items/weapons/medigun/medigun_backpack.dm b/code/game/objects/items/weapons/medigun/medigun_backpack.dm index b1a9cb1f47b..2b97657267f 100644 --- a/code/game/objects/items/weapons/medigun/medigun_backpack.dm +++ b/code/game/objects/items/weapons/medigun/medigun_backpack.dm @@ -12,7 +12,6 @@ preserve_item = TRUE w_class = ITEMSIZE_HUGE unacidable = TRUE - origin_tech = list(TECH_BIO = 4, TECH_POWER = 2, TECH_BLUESPACE = 4) var/obj/item/bork_medigun/linked/medigun_path = /obj/item/bork_medigun/linked var/obj/item/cell/bcell = /obj/item/cell diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index a5b386e4244..25d930ded31 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -229,7 +229,6 @@ throw_speed = 1 throw_range = 5 w_class = ITEMSIZE_NORMAL - origin_tech = list(TECH_MAGNET = 3, TECH_COMBAT = 4) attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut") sharp = TRUE edge = TRUE @@ -279,7 +278,6 @@ throw_range = 5 w_class = ITEMSIZE_SMALL flags = NOBLOODY - origin_tech = list(TECH_MAGNET = 3, TECH_ILLEGAL = 4) colorable = TRUE drop_sound = 'sound/items/drop/sword.ogg' pickup_sound = 'sound/items/pickup/sword.ogg' @@ -408,7 +406,6 @@ /obj/item/melee/energy/sword/charge name = "charge sword" desc = "A small, handheld device which emits a high-energy 'blade'." - origin_tech = list(TECH_COMBAT = 5, TECH_MAGNET = 3, TECH_ILLEGAL = 4) active_force = 25 active_armourpen = 25 projectile_parry_chance = 40 diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index 0ecbcfe0ef4..f8a57637c70 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -6,7 +6,6 @@ force = 10 throwforce = 7 w_class = ITEMSIZE_NORMAL - origin_tech = list(TECH_COMBAT = 4) attack_verb = list("flogged", "whipped", "lashed", "disciplined") hitsound = 'sound/weapons/whip.ogg' reach = 2 @@ -17,7 +16,6 @@ icon_state = "curator_whip" force = 5 throwforce = 5 - origin_tech = list(TECH_COMBAT = 2) /obj/item/melee/chainofcommand/curator_whip/toy name = "toy whip" diff --git a/code/game/objects/items/weapons/melee/shock_maul.dm b/code/game/objects/items/weapons/melee/shock_maul.dm index 90eb61ecd27..0f77d7f4037 100644 --- a/code/game/objects/items/weapons/melee/shock_maul.dm +++ b/code/game/objects/items/weapons/melee/shock_maul.dm @@ -36,7 +36,6 @@ w_class = ITEMSIZE_HUGE drop_sound = 'sound/items/drop/metalweapon.ogg' pickup_sound = 'sound/items/pickup/metalweapon.ogg' - origin_tech = list(TECH_COMBAT = 5) attack_verb = list("beaten","slammed","smashed","mauled","hammered","bludgeoned") var/lightcolor = "#D3FDFD" var/status = 0 //whether the thing is on or not diff --git a/code/game/objects/items/weapons/scrolls.dm b/code/game/objects/items/weapons/scrolls.dm index b2957b7be54..f771b4b5ee0 100644 --- a/code/game/objects/items/weapons/scrolls.dm +++ b/code/game/objects/items/weapons/scrolls.dm @@ -12,7 +12,6 @@ item_state = "paper" throw_speed = 4 throw_range = 20 - origin_tech = list(TECH_BLUESPACE = 4) /obj/item/teleportation_scroll/attack_self(mob/user) . = ..(user) diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index 83fb46db437..0484a59b98c 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -67,7 +67,6 @@ throw_speed = 1 throw_range = 4 w_class = ITEMSIZE_LARGE - origin_tech = list(TECH_MATERIAL = 2) matter = list(MAT_GLASS = 7500, MAT_STEEL = 1000) attack_verb = list("shoved", "bashed") var/cooldown = 0 //shield bash cooldown. based on world.time @@ -127,7 +126,6 @@ var/lrange = 1.5 var/lpower = 1.5 var/lcolor = "#006AFF" - origin_tech = list(TECH_MATERIAL = 4, TECH_MAGNET = 3, TECH_ILLEGAL = 4) attack_verb = list("shoved", "bashed") var/active = 0 item_icons = list( diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index a898cb69ac5..650d12aa835 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -45,7 +45,6 @@ /obj/item/storage/backpack/holding name = "bag of holding" desc = "A backpack that opens into a localized pocket of Blue Space." - origin_tech = list(TECH_BLUESPACE = 4) icon_state = "holdingpack" max_w_class = ITEMSIZE_LARGE max_storage_space = ITEMSIZE_COST_NORMAL * 14 // 56 diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index a9b72d452ca..29f3c945f2c 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -66,7 +66,6 @@ name = "trash bag of holding" desc = "The latest and greatest in custodial convenience, a trashbag that is capable of holding vast quantities of garbage." icon_state = "bluetrashbag" - origin_tech = list(TECH_BLUESPACE = 3) max_w_class = ITEMSIZE_NORMAL max_storage_space = ITEMSIZE_COST_NORMAL * 10 // Slightly less than BoH resistance_flags = FIRE_PROOF diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index b3571195f05..aa57096cc55 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -16,7 +16,6 @@ w_class = ITEMSIZE_LARGE max_w_class = ITEMSIZE_NORMAL max_storage_space = ITEMSIZE_COST_SMALL * 7 //enough to hold all starting contents - origin_tech = list(TECH_COMBAT = 1) attack_verb = list("robusted") use_sound = 'sound/items/storage/toolbox.ogg' drop_sound = 'sound/items/drop/toolbox.ogg' @@ -83,7 +82,6 @@ icon = 'icons/obj/storage_vr.dmi' icon_state = "syndicate" item_state_slots = list(slot_r_hand_str = "toolbox_syndi", slot_l_hand_str = "toolbox_syndi") - origin_tech = list(TECH_COMBAT = 1, TECH_ILLEGAL = 1) force = 14 starts_with = list( /obj/item/clothing/gloves/yellow, diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 88683ce78ca..6aa019c2679 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -13,7 +13,6 @@ w_class = ITEMSIZE_NORMAL drop_sound = 'sound/items/drop/metalweapon.ogg' pickup_sound = 'sound/items/pickup/metalweapon.ogg' - origin_tech = list(TECH_COMBAT = 2) attack_verb = list("beaten") var/lightcolor = "#FF6A00" var/stunforce = 0 diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index 9f7c3164223..b9ddb3141ac 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -45,7 +45,6 @@ desc = "Retracts stuff." icon_state = "retractor" matter = list(MAT_STEEL = 10000, MAT_GLASS = 5000) - origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1) drop_sound = 'sound/items/drop/scrap.ogg' /* @@ -56,7 +55,6 @@ desc = "You think you have seen this before." icon_state = "hemostat" matter = list(MAT_STEEL = 5000, MAT_GLASS = 2500) - origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1) attack_verb = list("attacked", "pinched") hitsound = 'sound/items/wirecutter.ogg' drop_sound = 'sound/items/drop/scrap.ogg' @@ -69,7 +67,6 @@ desc = "This stops bleeding." icon_state = "cautery" matter = list(MAT_STEEL = 5000, MAT_GLASS = 2500) - origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1) attack_verb = list("burnt") drop_sound = 'sound/items/drop/scrap.ogg' @@ -84,7 +81,6 @@ matter = list(MAT_STEEL = 15000, MAT_GLASS = 10000) force = 15.0 w_class = ITEMSIZE_NORMAL - origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1) attack_verb = list("drilled") drop_sound = 'sound/items/drop/accessory.ogg' @@ -103,7 +99,6 @@ throwforce = 5.0 throw_speed = 3 throw_range = 5 - origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1) matter = list(MAT_STEEL = 10000, MAT_GLASS = 5000) attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") hitsound = 'sound/weapons/bladeslice.ogg' @@ -153,7 +148,6 @@ item_state = "bone_setter" force = 15.0 toolspeed = 0.75 - origin_tech = list(TECH_MATERIAL = 5, TECH_BIO = 3, TECH_ILLEGAL = 2) /* * Circular Saws @@ -169,7 +163,6 @@ throwforce = 9.0 throw_speed = 3 throw_range = 5 - origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1) matter = list(MAT_STEEL = 20000,MAT_GLASS = 10000) attack_verb = list("attacked", "slashed", "sawed", "cut") sharp = TRUE @@ -183,7 +176,6 @@ hitsound = 'sound/weapons/emitter2.ogg' damtype = SEARING w_class = ITEMSIZE_NORMAL - origin_tech = list(TECH_BIO = 4, TECH_MATERIAL = 6, TECH_MAGNET = 6) matter = list(MAT_STEEL = 25000,MAT_GLASS = 20000) attack_verb = list("attacked", "slashed", "seared", "cut") toolspeed = 0.75 @@ -205,7 +197,6 @@ icon_state = "fixovein" force = 0 throwforce = 1.0 - origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 3) var/usage_amount = 10 drop_sound = 'sound/items/drop/bottle.ogg' diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm index a3c012df37a..ddebd6a3688 100644 --- a/code/game/objects/items/weapons/teleportation.dm +++ b/code/game/objects/items/weapons/teleportation.dm @@ -20,7 +20,6 @@ item_state = "electronic" throw_speed = 4 throw_range = 20 - origin_tech = list(TECH_MAGNET = 1) matter = list(MAT_STEEL = 400) pickup_sound = 'sound/items/pickup/device.ogg' drop_sound = 'sound/items/drop/device.ogg' @@ -131,7 +130,6 @@ Frequency: w_class = ITEMSIZE_SMALL throw_speed = 3 throw_range = 5 - origin_tech = list(TECH_MAGNET = 1, TECH_BLUESPACE = 3) matter = list(MAT_STEEL = 10000) preserve_item = 1 diff --git a/code/game/objects/items/weapons/tools/brass.dm b/code/game/objects/items/weapons/tools/brass.dm index 52138e0f544..8688b4a275f 100644 --- a/code/game/objects/items/weapons/tools/brass.dm +++ b/code/game/objects/items/weapons/tools/brass.dm @@ -28,5 +28,4 @@ desc = "A welder made from brass fittings." icon_state = "brasswelder" max_fuel = 20 - origin_tech = list(TECH_ENGINEERING = 2, TECH_PHORON = 2) matter = list(MAT_STEEL = 70, MAT_GLASS = 60) diff --git a/code/game/objects/items/weapons/tools/crowbar.dm b/code/game/objects/items/weapons/tools/crowbar.dm index 39344ccdca2..87106eb1ee4 100644 --- a/code/game/objects/items/weapons/tools/crowbar.dm +++ b/code/game/objects/items/weapons/tools/crowbar.dm @@ -12,7 +12,6 @@ pry = 1 item_state = "crowbar" w_class = ITEMSIZE_SMALL - origin_tech = list(TECH_ENGINEERING = 1) matter = list(MAT_STEEL = 50) attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked") usesound = 'sound/items/crowbar.ogg' @@ -52,7 +51,6 @@ usesound = 'sound/weapons/sonic_jackhammer.ogg' icon_state = "crowbar" toolspeed = 0.1 - origin_tech = list(TECH_COMBAT = 4, TECH_ENGINEERING = 4) /obj/item/tool/crowbar/hybrid name = "strange crowbar" @@ -61,7 +59,6 @@ icon_state = "hybcrowbar" usesound = 'sound/weapons/sonic_jackhammer.ogg' toolspeed = 0.4 - origin_tech = list(TECH_COMBAT = 4, TECH_ENGINEERING = 3) reach = 2 /obj/item/tool/crowbar/power @@ -86,7 +83,6 @@ throwforce = 5 pry = 1 w_class = ITEMSIZE_SMALL - origin_tech = list(TECH_ENGINEERING = 1) matter = list(MAT_STEEL = 30) attack_verb = list("whapped", "smacked", "swatted", "thwacked", "hit") usesound = 'sound/items/crowbar.ogg' diff --git a/code/game/objects/items/weapons/tools/screwdriver.dm b/code/game/objects/items/weapons/tools/screwdriver.dm index 26b8c88f8bd..abf8c6bbc59 100644 --- a/code/game/objects/items/weapons/tools/screwdriver.dm +++ b/code/game/objects/items/weapons/tools/screwdriver.dm @@ -93,7 +93,6 @@ desc = "A strange conglomerate of a screwdriver." icon_state = "hybscrewdriver" item_state = "screwdriver_black" - origin_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 3) w_class = ITEMSIZE_NORMAL usesound = 'sound/effects/uncloak.ogg' toolspeed = 0.4 diff --git a/code/game/objects/items/weapons/tools/transforming.dm b/code/game/objects/items/weapons/tools/transforming.dm index 7e231d13a2e..b457b367d1c 100644 --- a/code/game/objects/items/weapons/tools/transforming.dm +++ b/code/game/objects/items/weapons/tools/transforming.dm @@ -42,7 +42,6 @@ icon = 'icons/obj/tools.dmi' icon_state = "jaws_pry" item_state = "jawsoflife" - origin_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2) matter = list(MAT_METAL=150, MAT_SILVER=50) usesound = 'sound/items/jaws_pry.ogg' force = 15 @@ -79,7 +78,6 @@ icon = 'icons/obj/tools.dmi' icon_state = "drill_bolt" item_state = "drill" - origin_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2) matter = list(MAT_STEEL = 150, MAT_SILVER = 50) hitsound = 'sound/items/drill_hit.ogg' usesound = 'sound/items/drill_use.ogg' diff --git a/code/game/objects/items/weapons/tools/weldingtool.dm b/code/game/objects/items/weapons/tools/weldingtool.dm index 17cc039ee3e..4698377ea69 100644 --- a/code/game/objects/items/weapons/tools/weldingtool.dm +++ b/code/game/objects/items/weapons/tools/weldingtool.dm @@ -20,7 +20,6 @@ matter = list(MAT_STEEL = 70, MAT_GLASS = 30) //R&D tech level - origin_tech = list(TECH_ENGINEERING = 1) tool_qualities = list(TOOL_WELDER) @@ -364,7 +363,6 @@ desc = "A slightly larger welder with a larger tank." icon_state = "indwelder" max_fuel = 40 - origin_tech = list(TECH_ENGINEERING = 2, TECH_PHORON = 2) matter = list(MAT_STEEL = 70, MAT_GLASS = 60) /obj/item/weldingtool/hugetank @@ -373,7 +371,6 @@ icon_state = "upindwelder" max_fuel = 80 w_class = ITEMSIZE_NORMAL - origin_tech = list(TECH_ENGINEERING = 3) matter = list(MAT_STEEL = 70, MAT_GLASS = 120) /obj/item/weldingtool/mini @@ -424,7 +421,6 @@ flame_color = "#6699FF" // Light bluish. eye_safety_modifier = 2 change_icons = 0 - origin_tech = list(TECH_PHORON = 5 ,TECH_ENGINEERING = 5) always_process = TRUE /obj/item/weldingtool/alien/process() @@ -438,7 +434,6 @@ icon_state = "exwelder" max_fuel = 40 w_class = ITEMSIZE_NORMAL - origin_tech = list(TECH_ENGINEERING = 4, TECH_PHORON = 3) matter = list(MAT_STEEL = 70, MAT_GLASS = 120) toolspeed = 0.5 change_icons = 0 @@ -461,7 +456,6 @@ toolspeed = 0.25 w_class = ITEMSIZE_NORMAL flame_intensity = 5 - origin_tech = list(TECH_ENGINEERING = 5, TECH_PHORON = 4, TECH_PRECURSOR = 1) reach = 2 /* diff --git a/code/game/objects/items/weapons/tools/wirecutters.dm b/code/game/objects/items/weapons/tools/wirecutters.dm index fdfa1785a9d..a7a8103e11e 100644 --- a/code/game/objects/items/weapons/tools/wirecutters.dm +++ b/code/game/objects/items/weapons/tools/wirecutters.dm @@ -15,7 +15,6 @@ throw_speed = 2 throw_range = 9 w_class = ITEMSIZE_SMALL - origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1) matter = list(MAT_STEEL = 80) attack_verb = list("pinched", "nipped") hitsound = 'sound/items/wirecutter.ogg' @@ -78,7 +77,6 @@ icon = 'icons/obj/abductor.dmi' icon_state = "cutters" toolspeed = 0.1 - origin_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 4) random_color = FALSE /obj/item/tool/wirecutters/hybrid @@ -87,7 +85,6 @@ icon_state = "hybcutters" random_color = FALSE w_class = ITEMSIZE_NORMAL - origin_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 3, TECH_PHORON = 2) attack_verb = list("pinched", "nipped", "warped", "blasted") usesound = 'sound/effects/stealthoff.ogg' toolspeed = 0.4 diff --git a/code/game/objects/items/weapons/tools/wrench.dm b/code/game/objects/items/weapons/tools/wrench.dm index 066348c018a..c44d96af19f 100644 --- a/code/game/objects/items/weapons/tools/wrench.dm +++ b/code/game/objects/items/weapons/tools/wrench.dm @@ -10,7 +10,6 @@ force = 6 throwforce = 7 w_class = ITEMSIZE_SMALL - origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1) matter = list(MAT_STEEL = 150) attack_verb = list("bashed", "battered", "bludgeoned", "whacked") usesound = 'sound/items/ratchet.ogg' @@ -36,7 +35,6 @@ force = 8 throwforce = 10 w_class = ITEMSIZE_NORMAL - origin_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 3, TECH_PHORON = 2) attack_verb = list("bashed", "battered", "bludgeoned", "whacked", "warped", "blasted") usesound = 'sound/effects/stealthoff.ogg' toolspeed = 0.5 @@ -65,7 +63,6 @@ icon_state = "wrench" usesound = 'sound/effects/empulse.ogg' toolspeed = 0.1 - origin_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 5) /obj/item/tool/wrench/power name = "power wrench" diff --git a/code/game/objects/items/weapons/traps.dm b/code/game/objects/items/weapons/traps.dm index 8ca9e93d1e8..644db641979 100644 --- a/code/game/objects/items/weapons/traps.dm +++ b/code/game/objects/items/weapons/traps.dm @@ -17,7 +17,6 @@ center_of_mass_y = 0 throwforce = 0 w_class = ITEMSIZE_NORMAL - origin_tech = list(TECH_MATERIAL = 1) matter = list(MAT_STEEL = 18750) var/deployed = 0 var/camo_net = FALSE @@ -168,8 +167,6 @@ camo_net = TRUE color = "#C9DCE1" - origin_tech = list(TECH_MATERIAL = 4, TECH_BLUESPACE = 3, TECH_MAGNET = 4, TECH_PHORON = 2, TECH_ARCANE = 1) - /* * Barbed-Wire. * Slows individuals crossing it. Barefoot individuals will be cut. Can be electrified by placing over a cable node. diff --git a/code/game/objects/structures/props/alien_props.dm b/code/game/objects/structures/props/alien_props.dm index 590cd150cad..13fdc100e9f 100644 --- a/code/game/objects/structures/props/alien_props.dm +++ b/code/game/objects/structures/props/alien_props.dm @@ -104,22 +104,12 @@ icon_state = "health" w_class = ITEMSIZE_SMALL var/static/list/possible_states = list("health", "spider", "slime", "emp", "species", "egg", "vent", "mindshock", "viral", "gland") - var/static/list/possible_tech = list(TECH_MATERIAL, TECH_ENGINEERING, TECH_PHORON, TECH_POWER, TECH_BIO, TECH_COMBAT, TECH_MAGNET, TECH_DATA) /obj/item/prop/alien/junk/Initialize(mapload) . = ..() icon_state = pick(possible_states) - var/list/techs = possible_tech.Copy() - origin_tech = list() - for(var/i = 1 to rand(1, 4)) - var/new_tech = pick(techs) - techs -= new_tech - origin_tech[new_tech] = rand(5, 9) - - origin_tech[TECH_PRECURSOR] = rand(0,2) /obj/item/prop/alien/phasecoil name = "reverberating device" desc = "A device pulsing with an ominous energy." icon_state = "circuit_phase" - origin_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 6, TECH_PHORON = 3, TECH_POWER = 5, TECH_MAGNET = 5, TECH_DATA = 5, TECH_PRECURSOR = 2, TECH_ARCANE = 1) diff --git a/code/modules/artifice/deadringer.dm b/code/modules/artifice/deadringer.dm index ff534ab18cf..0a440990ca9 100644 --- a/code/modules/artifice/deadringer.dm +++ b/code/modules/artifice/deadringer.dm @@ -5,7 +5,6 @@ icon_state = "deadringer" w_class = ITEMSIZE_SMALL slot_flags = SLOT_ID | SLOT_BELT | SLOT_TIE - origin_tech = list(TECH_ILLEGAL = 3) var/activated = 0 var/timer = 0 var/bruteloss_prev = 999999 diff --git a/code/modules/artifice/telecube.dm b/code/modules/artifice/telecube.dm index db1b0cbc663..a1cf0d8f869 100644 --- a/code/modules/artifice/telecube.dm +++ b/code/modules/artifice/telecube.dm @@ -24,7 +24,6 @@ icon = 'icons/obj/props/telecube.dmi' icon_state = "cube" w_class = ITEMSIZE_SMALL - origin_tech = list(TECH_MATERIAL = 7, TECH_POWER = 6, TECH_BLUESPACE = 7, TECH_ARCANE = 2, TECH_PRECURSOR = 2) catalogue_data = list(/datum/category_item/catalogue/anomalous/precursor_a/telecube) diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm index bb0f8160dee..e7b20543585 100644 --- a/code/modules/assembly/assembly.dm +++ b/code/modules/assembly/assembly.dm @@ -10,7 +10,6 @@ throw_range = 10 drop_sound = 'sound/items/drop/component.ogg' pickup_sound = 'sound/items/pickup/component.ogg' - origin_tech = list(TECH_MAGNET = 1) var/secured = 1 var/list/attached_overlays = null diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm index 24de14dd3db..3ffb771d090 100644 --- a/code/modules/assembly/igniter.dm +++ b/code/modules/assembly/igniter.dm @@ -2,7 +2,6 @@ name = "igniter" desc = "A small electronic device able to ignite combustable substances." icon_state = "igniter" - origin_tech = list(TECH_MAGNET = 1) matter = list(MAT_STEEL = 500, MAT_GLASS = 50) secured = 1 diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index de2a999a4a8..b1f9a0a5bc5 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -4,7 +4,6 @@ name = "infrared emitter" desc = "Emits a visible or invisible beam and is triggered when the beam is interrupted." icon_state = "infrared" - origin_tech = list(TECH_MAGNET = 2) matter = list(MAT_STEEL = 1000, MAT_GLASS = 500) wires = WIRE_PULSE diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index a08a68ee952..640862d7ea6 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -2,7 +2,6 @@ name = "mousetrap" desc = "A handy little spring-loaded trap for catching pesty rodents." icon_state = "mousetrap" - origin_tech = list(TECH_COMBAT = 1) matter = list(MAT_STEEL = 100) var/armed = 0 special_handling = TRUE diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index 413663a53b6..aac9e2db8da 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -2,7 +2,6 @@ name = "proximity sensor" desc = "Used for scanning and alerting when someone enters a certain proximity." icon_state = "prox" - origin_tech = list(TECH_MAGNET = 1) matter = list(MAT_STEEL = 800, MAT_GLASS = 200) wires = WIRE_PULSE diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index 3c8b4c3e994..596e0c34b5f 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -3,7 +3,6 @@ desc = "Used to remotely activate devices. Tap against another secured signaler to transfer configuration." icon_state = "signaller" item_state = "signaler" - origin_tech = list(TECH_MAGNET = 1) matter = list(MAT_STEEL = 1000, MAT_GLASS = 200) wires = WIRE_RECEIVE | WIRE_PULSE | WIRE_RADIO_PULSE | WIRE_RADIO_RECEIVE diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index c5e5938a0c3..bab35f531db 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -2,7 +2,6 @@ name = "timer" desc = "Used to time things. Works well with contraptions which has to count down. Tick tock." icon_state = "timer" - origin_tech = list(TECH_MAGNET = 1) matter = list(MAT_STEEL = 500, MAT_GLASS = 50) wires = WIRE_PULSE diff --git a/code/modules/assembly/voice.dm b/code/modules/assembly/voice.dm index 0f5666958a8..795d689d6f7 100644 --- a/code/modules/assembly/voice.dm +++ b/code/modules/assembly/voice.dm @@ -2,7 +2,6 @@ name = "voice analyzer" desc = "A small electronic device able to record a voice sample, and send a signal when that sample is repeated." icon_state = "voice" - origin_tech = list(TECH_MAGNET = 1) matter = list(MAT_STEEL = 500, MAT_GLASS = 50) var/listening = 0 var/recorded //the activation message diff --git a/code/modules/blob2/core_chunk.dm b/code/modules/blob2/core_chunk.dm index fd8d9017c5f..25a93435faf 100644 --- a/code/modules/blob2/core_chunk.dm +++ b/code/modules/blob2/core_chunk.dm @@ -46,8 +46,6 @@ if(blob_type) color = blob_type.color - if(LAZYLEN(blob_type.core_tech)) - origin_tech = blob_type.core_tech.Copy() if(blob_type.chunk_active_type == BLOB_CHUNK_CONSTANT) should_tick = TRUE diff --git a/code/modules/casino/headset_casino.dm b/code/modules/casino/headset_casino.dm index 6fd4f5b68c7..e915f7ecb85 100644 --- a/code/modules/casino/headset_casino.dm +++ b/code/modules/casino/headset_casino.dm @@ -4,7 +4,6 @@ icon = 'icons/obj/casino.dmi' icon_state = "headset" adhoc_fallback = TRUE - origin_tech = list(TECH_ILLEGAL = 1) ks1type = /obj/item/encryptionkey/casino /obj/item/radio/headset/alt/casino @@ -13,12 +12,10 @@ icon = 'icons/obj/casino.dmi' icon_state = "headset_alt" adhoc_fallback = TRUE - origin_tech = list(TECH_ILLEGAL = 2) ks1type = /obj/item/encryptionkey/casino /obj/item/encryptionkey/casino icon = 'icons/obj/casino.dmi' icon_state = "cypherkey" channels = list(CHANNEL_CASINO = 1) - origin_tech = list(TECH_ILLEGAL = 1) syndie = 1 diff --git a/code/modules/casino/spawnergrenade_casino.dm b/code/modules/casino/spawnergrenade_casino.dm index 940fafccf88..531a2539fc2 100644 --- a/code/modules/casino/spawnergrenade_casino.dm +++ b/code/modules/casino/spawnergrenade_casino.dm @@ -4,7 +4,6 @@ icon = 'icons/obj/casino.dmi' icon_state = "casino_delivery" item_state = "flashbang" - origin_tech = list(TECH_MATERIAL = 2, TECH_MAGNET = 2) spawner_type = /mob/living/simple_mob/animal/passive/cat // diff --git a/code/modules/catalogue/cataloguer.dm b/code/modules/catalogue/cataloguer.dm index 7dc6af2b47e..0af55e1a332 100644 --- a/code/modules/catalogue/cataloguer.dm +++ b/code/modules/catalogue/cataloguer.dm @@ -23,7 +23,6 @@ GLOBAL_LIST_EMPTY(all_cataloguers) icon = 'icons/obj/device.dmi' icon_state = "cataloguer" w_class = ITEMSIZE_NORMAL - origin_tech = list(TECH_MATERIAL = 2, TECH_DATA = 3, TECH_MAGNET = 3) force = 0 slot_flags = SLOT_BELT var/points_stored = 0 // Amount of 'exploration points' this device holds. diff --git a/code/modules/clothing/accessories/rings.dm b/code/modules/clothing/accessories/rings.dm index 6fb1a1b9285..cf77fc23245 100644 --- a/code/modules/clothing/accessories/rings.dm +++ b/code/modules/clothing/accessories/rings.dm @@ -51,7 +51,6 @@ /obj/item/clothing/accessory/ring/reagent flags = OPENCONTAINER - origin_tech = list(TECH_MATERIAL = 2, TECH_ILLEGAL = 4) /obj/item/clothing/accessory/ring/reagent/Initialize(mapload) . = ..() @@ -74,7 +73,6 @@ name = "silver ring" desc = "A ring made from what appears to be silver." icon_state = "material" - origin_tech = list(TECH_MATERIAL = 2, TECH_ILLEGAL = 5) /obj/item/clothing/accessory/ring/reagent/sleepy/Initialize(mapload) . = ..() diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index 8b8077aa863..8dbf311d5c5 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -39,7 +39,6 @@ icon_state = "black" worn_state = "black" desc = "It's a plain jumpsuit. It seems to have a small dial on the wrist." - origin_tech = list(TECH_ILLEGAL = 3) /obj/item/clothing/under/chameleon/Initialize(mapload) @@ -78,7 +77,6 @@ name = "grey cap" icon_state = "greysoft" desc = "It looks like a plain hat, but upon closer inspection, there's an advanced holographic array installed inside. It seems to have a small dial inside." - origin_tech = list(TECH_ILLEGAL = 3) body_parts_covered = 0 /obj/item/clothing/head/chameleon/Initialize(mapload) @@ -116,7 +114,6 @@ name = "armor" icon_state = "armor" desc = "It appears to be a vest of standard armor, except this is embedded with a hidden holographic cloaker, allowing it to change it's appearance, but offering no protection.. It seems to have a small dial inside." - origin_tech = list(TECH_ILLEGAL = 3) /obj/item/clothing/suit/chameleon/Initialize(mapload) . = ..() @@ -152,7 +149,6 @@ name = "black shoes" icon_state = "black" desc = "They're comfy black shoes, with clever cloaking technology built in. It seems to have a small dial on the back of each shoe." - origin_tech = list(TECH_ILLEGAL = 3) /obj/item/clothing/shoes/chameleon/Initialize(mapload) . = ..() @@ -188,7 +184,6 @@ name = "backpack" icon_state = "backpack" desc = "A backpack outfitted with cloaking tech. It seems to have a small dial inside, kept away from the storage." - origin_tech = list(TECH_ILLEGAL = 3) /obj/item/storage/backpack/chameleon/Initialize(mapload) . = ..() @@ -243,7 +238,6 @@ name = "black gloves" icon_state = "black" desc = "It looks like a pair of gloves, but it seems to have a small dial inside." - origin_tech = list(TECH_ILLEGAL = 3) /obj/item/clothing/gloves/chameleon/Initialize(mapload) . = ..() @@ -279,7 +273,6 @@ name = "gas mask" icon_state = "gas_old" desc = "It looks like a plain gask mask, but on closer inspection, it seems to have a small dial inside." - origin_tech = list(TECH_ILLEGAL = 3) /obj/item/clothing/mask/chameleon/Initialize(mapload) . = ..() @@ -316,7 +309,6 @@ icon_state = "meson" item_state_slots = list(slot_r_hand_str = "meson", slot_l_hand_str = "meson") desc = "It looks like a plain set of mesons, but on closer inspection, it seems to have a small dial inside." - origin_tech = list(TECH_ILLEGAL = 3) var/list/global/clothing_choices /obj/item/clothing/glasses/chameleon/Initialize(mapload) @@ -353,7 +345,6 @@ name = "belt" desc = "Can hold various things. It also has a small dial inside one of the pouches." icon_state = "utilitybelt" - origin_tech = list(TECH_ILLEGAL = 3) /obj/item/storage/belt/chameleon/Initialize(mapload) . = ..() @@ -395,7 +386,6 @@ desc = "Looks like a black tie, but his one also has a dial inside." icon = 'icons/inventory/accessory/item.dmi' icon_state = "blacktie" - origin_tech = list(TECH_ILLEGAL = 3) /obj/item/clothing/accessory/chameleon/Initialize(mapload) . = ..() @@ -432,7 +422,6 @@ desc = "A hologram projector in the shape of a gun. There is a dial on the side to change the gun's disguise." icon_state = "deagle" w_class = ITEMSIZE_NORMAL - origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2, TECH_ILLEGAL = 4) matter = list() fire_sound = 'sound/weapons/gunshot1.ogg' diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 97b932fbaee..6230175ff48 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -109,7 +109,6 @@ BLIND // can't see anything icon_state = "meson" item_state_slots = list(slot_r_hand_str = "meson", slot_l_hand_str = "meson") actions_types = list(/datum/action/item_action/toggle_goggles) - origin_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2) toggleable = 1 vision_flags = SEE_TURFS enables_planes = list(VIS_FULLBRIGHT, VIS_MESONS) @@ -176,7 +175,6 @@ BLIND // can't see anything desc = "You can totally see in the dark now!" icon_state = "night" item_state_slots = list(slot_r_hand_str = "glasses", slot_l_hand_str = "glasses") - origin_tech = list(TECH_MAGNET = 2) darkness_view = 7 toggleable = 1 actions_types = list(/datum/action/item_action/toggle_goggles) @@ -253,7 +251,6 @@ BLIND // can't see anything desc = "Very confusing glasses." icon_state = "material" item_state_slots = list(slot_r_hand_str = "glasses", slot_l_hand_str = "glasses") - origin_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 3) toggleable = 1 actions_types = list(/datum/action/item_action/toggle_goggles) vision_flags = SEE_OBJS @@ -272,7 +269,6 @@ BLIND // can't see anything desc = "The secrets of space travel are.. not quite yours." icon_state = "grav" item_state_slots = list(slot_r_hand_str = "glasses", slot_l_hand_str = "glasses") - origin_tech = list(TECH_MAGNET = 2, TECH_BLUESPACE = 1) darkness_view = 5 toggleable = 1 actions_types = list(/datum/action/item_action/toggle_goggles) @@ -553,7 +549,6 @@ BLIND // can't see anything desc = "Thermals in the shape of glasses." icon_state = "thermal" item_state_slots = list(slot_r_hand_str = "glasses", slot_l_hand_str = "glasses") - origin_tech = list(TECH_MAGNET = 3) toggleable = 1 actions_types = list(/datum/action/item_action/toggle_goggles) vision_flags = SEE_MOBS @@ -585,7 +580,6 @@ BLIND // can't see anything desc = "Used for seeing walls, floors, and stuff through anything." icon_state = "meson" item_state_slots = list(slot_r_hand_str = "meson", slot_l_hand_str = "meson") - origin_tech = list(TECH_MAGNET = 3, TECH_ILLEGAL = 4) /obj/item/clothing/glasses/thermal/plain toggleable = 0 diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index ce2da437c46..d4d20e5ca17 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -2,7 +2,6 @@ name = DEVELOPER_WARNING_NAME desc = "A heads-up display that provides important info in (almost) real time." flags = NONE //doesn't protect eyes because it's a monocle, duh - origin_tech = list(TECH_MAGNET = 3, TECH_BIO = 2) /obj/item/clothing/glasses/hud/health name = "Health Scanner HUD" @@ -64,7 +63,6 @@ Commonly used to allow non-augmented crew to interact with virtual interfaces. \
They are also fitted with toggleable cosmetic electrochromic lenses. \ The lenses will not protect against sudden bright flashes or welding." - origin_tech = list(TECH_MAGNET = 3, TECH_BIO = 3) var/obj/item/clothing/glasses/hud/omni/hud = null var/mode = "civ" icon_state = "glasses" diff --git a/code/modules/clothing/gloves/telekinetic.dm b/code/modules/clothing/gloves/telekinetic.dm index 2601099ea4d..55f8173ab6f 100644 --- a/code/modules/clothing/gloves/telekinetic.dm +++ b/code/modules/clothing/gloves/telekinetic.dm @@ -5,7 +5,6 @@ item_state = "graygloves" var/use_power_amount = 12 - origin_tech = list(TECH_ENGINEERING = 4, TECH_BLUESPACE = 4) /obj/item/clothing/gloves/telekinetic/Initialize(mapload) . = ..() diff --git a/code/modules/clothing/masks/tesh_synth_facemask.dm b/code/modules/clothing/masks/tesh_synth_facemask.dm index 6e51bcc1716..fe92314461a 100644 --- a/code/modules/clothing/masks/tesh_synth_facemask.dm +++ b/code/modules/clothing/masks/tesh_synth_facemask.dm @@ -7,7 +7,6 @@ icon = 'icons/mob/species/teshari/synth_facemask.dmi' icon_override = 'icons/mob/species/teshari/synth_facemask.dmi' icon_state = "synth_facemask" - origin_tech = list(TECH_ILLEGAL = 1) var/lstat var/visor_state = "Neutral" //Separating this from lstat so that it could potentially be used for an override system or something var/mob/living/carbon/maskmaster diff --git a/code/modules/clothing/masks/voice.dm b/code/modules/clothing/masks/voice.dm index 21581faa151..a96adc3e9f3 100644 --- a/code/modules/clothing/masks/voice.dm +++ b/code/modules/clothing/masks/voice.dm @@ -8,7 +8,6 @@ name = "gas mask" desc = "A face-covering mask that can be connected to an air supply. It seems to house some odd electronics." var/obj/item/voice_changer/changer - origin_tech = list(TECH_ILLEGAL = 4) /obj/item/clothing/mask/gas/voice/verb/Toggle_Voice_Changer() set category = "Object" diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 05a35439cce..a03c359b2c6 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -4,7 +4,6 @@ icon_state = "brown" permeability_coefficient = 0.05 item_flags = NOSLIP - origin_tech = list(TECH_ILLEGAL = 3) var/list/clothing_choices = list() siemens_coefficient = 0.8 species_restricted = null diff --git a/code/modules/detectivework/tools/uvlight.dm b/code/modules/detectivework/tools/uvlight.dm index 34a124b9e8f..6e0fdd528ca 100644 --- a/code/modules/detectivework/tools/uvlight.dm +++ b/code/modules/detectivework/tools/uvlight.dm @@ -8,7 +8,6 @@ item_state = "electronic" actions_types = list(/datum/action/item_action/toggle_uv_light) matter = list(MAT_STEEL = 150) - origin_tech = list(TECH_MAGNET = 1, TECH_ENGINEERING = 1) var/list/scanned = list() var/list/stored_alpha = list() diff --git a/code/modules/economy/retail_scanner.dm b/code/modules/economy/retail_scanner.dm index f90c29c40e9..249423b4e42 100644 --- a/code/modules/economy/retail_scanner.dm +++ b/code/modules/economy/retail_scanner.dm @@ -7,7 +7,6 @@ slot_flags = SLOT_BELT req_access = list(ACCESS_HEADS) w_class = ITEMSIZE_SMALL - origin_tech = list(TECH_MATERIAL = 1) var/locked = 1 var/emagged = 0 diff --git a/code/modules/fireworks/firework_stars.dm b/code/modules/fireworks/firework_stars.dm index aa1257fddd4..4e3bf024c49 100644 --- a/code/modules/fireworks/firework_stars.dm +++ b/code/modules/fireworks/firework_stars.dm @@ -6,7 +6,6 @@ desc = "A very tightly compacted ball of chemicals for use with firework launcher." icon_state = "star" w_class = ITEMSIZE_SMALL - origin_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 1) /obj/item/firework_star/proc/trigger_firework(var/datum/weather_holder/w_holder) return @@ -16,7 +15,6 @@ name = "weather firework star" desc = "A firework star designed to alter a weather, rather than put on a show." var/weather_type - origin_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 2) /obj/item/firework_star/weather/trigger_firework(var/datum/weather_holder/w_holder) if(!w_holder) // Sanity @@ -73,14 +71,12 @@ name = T_FIREWORK_WEATHER_STAR("HAIL") weather_type = WEATHER_HAIL icon_state = "snow" - origin_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 2, TECH_ILLEGAL = 1) /obj/item/firework_star/weather/fallout name = T_FIREWORK_WEATHER_STAR("NUCLEAR") desc = "This is the worst idea ever." weather_type = WEATHER_FALLOUT_TEMP icon_state = "nuclear" - origin_tech = list(TECH_MATERIAL = 7, TECH_ENGINEERING = 3, TECH_ILLEGAL = 5) /obj/item/firework_star/weather/confetti name = T_FIREWORK_WEATHER_STAR("CONFETTI") diff --git a/code/modules/fireworks/launcher_construction.dm b/code/modules/fireworks/launcher_construction.dm index 785561d741c..4812a584a42 100644 --- a/code/modules/fireworks/launcher_construction.dm +++ b/code/modules/fireworks/launcher_construction.dm @@ -2,7 +2,6 @@ name = T_BOARD("firework launcher") board_type = new /datum/frame/frame_types/machine build_path = /obj/machinery/firework_launcher - origin_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 2) req_components = list ( /obj/item/stock_parts/micro_laser = 2 ) diff --git a/code/modules/holomap/station_holomap.dm b/code/modules/holomap/station_holomap.dm index e70f9f04ceb..1c8c5663345 100644 --- a/code/modules/holomap/station_holomap.dm +++ b/code/modules/holomap/station_holomap.dm @@ -234,7 +234,6 @@ name = T_BOARD("Station Map") board_type = new /datum/frame/frame_types/station_map build_path = /obj/machinery/station_map - origin_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 2) req_components = list() /datum/holomap_marker diff --git a/code/modules/integrated_electronics/core/assemblies/circuit_bug.dm b/code/modules/integrated_electronics/core/assemblies/circuit_bug.dm index b33cac9dd39..9d0b38d9a42 100644 --- a/code/modules/integrated_electronics/core/assemblies/circuit_bug.dm +++ b/code/modules/integrated_electronics/core/assemblies/circuit_bug.dm @@ -8,7 +8,6 @@ slot_flags = SLOT_EARS max_components = IC_COMPONENTS_BASE max_complexity = 20 // Incredibly low complexity to prevent shenanigans. - origin_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1) /obj/item/electronic_assembly/circuit_bug/examine(mob/user) . = ..() diff --git a/code/modules/integrated_electronics/core/printer.dm b/code/modules/integrated_electronics/core/printer.dm index f2752ee3422..d90252c3969 100644 --- a/code/modules/integrated_electronics/core/printer.dm +++ b/code/modules/integrated_electronics/core/printer.dm @@ -503,7 +503,6 @@ icon_state = "upgrade_disk" item_state = "card-id" w_class = ITEMSIZE_SMALL - origin_tech = list(TECH_ENGINEERING = 3, TECH_DATA = 4) /obj/item/disk/integrated_circuit/upgrade/advanced name = "integrated circuit printer upgrade disk - advanced designs" @@ -513,10 +512,8 @@ name = "integrated circuit printer upgrade disk - illegal designs" desc = "Install this into your integrated circuit printer to enhance it. This one adds new, but illegal designs to the printer." icon_state = "upgrade_disk_illegal" - origin_tech = list(TECH_ENGINEERING = 3, TECH_DATA = 4, TECH_ILLEGAL = 1) /obj/item/disk/integrated_circuit/upgrade/clone name = "integrated circuit printer upgrade disk - circuit cloner" desc = "Install this into your integrated circuit printer to enhance it. This one allows the printer to duplicate assemblies." icon_state = "upgrade_disk_clone" - origin_tech = list(TECH_ENGINEERING = 5, TECH_DATA = 6) diff --git a/code/modules/integrated_electronics/passive/power.dm b/code/modules/integrated_electronics/passive/power.dm index 901c2c3fc5d..f24f67dba2a 100644 --- a/code/modules/integrated_electronics/passive/power.dm +++ b/code/modules/integrated_electronics/passive/power.dm @@ -3,7 +3,6 @@ name = "power thingy" desc = "Does power stuff." complexity = 5 - origin_tech = list(TECH_POWER = 2, TECH_ENGINEERING = 2, TECH_DATA = 2) category_text = "Power - Passive" /obj/item/integrated_circuit/passive/power/proc/handle_passive_energy() @@ -16,7 +15,6 @@ extended_desc = "The cell generates 1W of energy per second in optimal lighting conditions. Less light will result in less power being generated." icon_state = "solar_cell" complexity = 8 - origin_tech = list(TECH_POWER = 3, TECH_ENGINEERING = 3, TECH_DATA = 2) spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH var/max_power = 1 @@ -35,7 +33,6 @@ icon_state = "led" complexity = 1 activators = list("pulse out" = IC_PINTYPE_PULSE_OUT) - origin_tech = list(TECH_POWER = 3, TECH_ENGINEERING = 3, TECH_DATA = 2) spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH var/is_charge=0 @@ -59,7 +56,6 @@ appetite and will need to eat more often due to this. This device will fail if used inside synthetic entities." icon_state = "implant_power" complexity = 10 - origin_tech = list(TECH_POWER = 4, TECH_ENGINEERING = 4, TECH_DATA = 4, TECH_BIO = 5) spawn_flags = IC_SPAWN_RESEARCH /obj/item/integrated_circuit/passive/power/metabolic_siphon/proc/test_validity(var/mob/living/carbon/human/host) @@ -82,7 +78,6 @@ desc = "A small circuit designed to be connected to an internal power wire inside a synthetic entity." extended_desc = "The siphon generates 10W of energy, so long as the siphon exists inside a synthetic entity. The entity need to recharge \ more often due to this. This device will fail if used inside organic entities." - origin_tech = list(TECH_POWER = 3, TECH_ENGINEERING = 4, TECH_DATA = 3) spawn_flags = IC_SPAWN_RESEARCH /obj/item/integrated_circuit/passive/power/metabolic_siphon/synthetic/test_validity(var/mob/living/carbon/human/host) @@ -99,7 +94,6 @@ from the 'equipment' power channel." icon_state = "power_relay" complexity = 7 - origin_tech = list(TECH_POWER = 3, TECH_ENGINEERING = 3, TECH_DATA = 2) spawn_flags = IC_SPAWN_RESEARCH var/power_amount = 250 //fuel cell @@ -116,7 +110,6 @@ outputs = list("volume used" = IC_PINTYPE_NUMBER,"self reference" = IC_PINTYPE_REF) activators = list() spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2, TECH_BIO = 2) var/volume = 60 var/list/fuel = list(REAGENT_ID_PHORON = 50000, REAGENT_ID_SLIMEJELLY = 25000, REAGENT_ID_FUEL = 15000, REAGENT_ID_CARBON = 10000, REAGENT_ID_ETHANOL= 10000, REAGENT_ID_NUTRIMENT = 8000, REAGENT_ID_BLOOD = 5000) @@ -150,7 +143,6 @@ from the 'equipment' power channel." icon_state = "power_relay" complexity = 15 - origin_tech = list(TECH_POWER = 6, TECH_ENGINEERING = 5, TECH_DATA = 4) spawn_flags = IC_SPAWN_RESEARCH power_amount = 2000 @@ -185,7 +177,6 @@ ) activators = list() spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - origin_tech = list(TECH_ENGINEERING = 2, TECH_POWER = 2) var/obj/machinery/power/circuit_io/IO = null // Dummy power machine to move energy in/out without a bunch of code duplication. var/throughput = 10000 // Give/take up to 10kW. diff --git a/code/modules/integrated_electronics/subtypes/illegal.dm b/code/modules/integrated_electronics/subtypes/illegal.dm index 5bf62e2b652..fdd84b184b6 100644 --- a/code/modules/integrated_electronics/subtypes/illegal.dm +++ b/code/modules/integrated_electronics/subtypes/illegal.dm @@ -22,7 +22,6 @@ ) activators = list("set spoof address" = IC_PINTYPE_PULSE_IN, "on data received" = IC_PINTYPE_PULSE_OUT) spawn_flags = IC_SPAWN_RESEARCH|IC_SPAWN_ILLEGAL - origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2, TECH_MAGNET = 2, TECH_BLUESPACE = 2, TECH_ILLEGAL = 2) power_draw_per_use = 200 var/datum/exonet_protocol/exonet = null var/address_spoofed = FALSE @@ -74,7 +73,6 @@ outputs = list("addresses found" = IC_PINTYPE_LIST) activators = list("start discovery" = IC_PINTYPE_PULSE_IN, "on addresses found" = IC_PINTYPE_PULSE_OUT) spawn_flags = IC_SPAWN_ILLEGAL - origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2, TECH_MAGNET = 2, TECH_BLUESPACE = 2, TECH_ILLEGAL = 1) power_draw_per_use = 300 var/datum/exonet_protocol/exonet = null var/obj/machinery/exonet_node/node = null diff --git a/code/modules/integrated_electronics/subtypes/input.dm b/code/modules/integrated_electronics/subtypes/input.dm index 7763feece1c..ca79f0c5139 100644 --- a/code/modules/integrated_electronics/subtypes/input.dm +++ b/code/modules/integrated_electronics/subtypes/input.dm @@ -140,7 +140,6 @@ ) activators = list("scan" = IC_PINTYPE_PULSE_IN, "on scanned" = IC_PINTYPE_PULSE_OUT) spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2, TECH_BIO = 2) power_draw_per_use = 40 /obj/item/integrated_circuit/input/med_scanner/do_work() @@ -179,7 +178,6 @@ ) activators = list("scan" = IC_PINTYPE_PULSE_IN, "on scanned" = IC_PINTYPE_PULSE_OUT) spawn_flags = IC_SPAWN_RESEARCH - origin_tech = list(TECH_ENGINEERING = 3, TECH_DATA = 3, TECH_BIO = 4) power_draw_per_use = 80 /obj/item/integrated_circuit/input/adv_med_scanner/do_work() @@ -225,7 +223,6 @@ ) activators = list("scan" = IC_PINTYPE_PULSE_IN, "on scanned" = IC_PINTYPE_PULSE_OUT, "not scanned" = IC_PINTYPE_PULSE_OUT) spawn_flags = IC_SPAWN_RESEARCH - origin_tech = list(TECH_ENGINEERING = 3, TECH_DATA = 3, TECH_BIO = 4) power_draw_per_use = 40 /obj/item/integrated_circuit/input/examiner/do_work() @@ -420,7 +417,6 @@ "on signal sent" = IC_PINTYPE_PULSE_OUT, "on signal received" = IC_PINTYPE_PULSE_OUT) spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2, TECH_MAGNET = 2) // power_draw_idle = 5 // Breaks recharging cells, and unnecessary for this circuit. power_draw_per_use = 40 @@ -513,7 +509,6 @@ ) activators = list("send data" = IC_PINTYPE_PULSE_IN, "on data received" = IC_PINTYPE_PULSE_OUT, "on data sent" = IC_PINTYPE_PULSE_OUT) spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2, TECH_MAGNET = 2, TECH_BLUESPACE = 2) power_draw_per_use = 50 var/datum/exonet_protocol/exonet = null var/obj/machinery/exonet_node/node = null @@ -752,7 +747,6 @@ ) activators = list("read" = IC_PINTYPE_PULSE_IN, "on read" = IC_PINTYPE_PULSE_OUT) spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - origin_tech = list(TECH_ENGINEERING = 4, TECH_DATA = 4, TECH_POWER = 4, TECH_MAGNET = 3) power_draw_per_use = 1 /obj/item/integrated_circuit/input/internalbm/do_work() @@ -784,7 +778,6 @@ ) activators = list("read" = IC_PINTYPE_PULSE_IN, "on read" = IC_PINTYPE_PULSE_OUT) spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - origin_tech = list(TECH_ENGINEERING = 4, TECH_DATA = 4, TECH_POWER = 4, TECH_MAGNET = 3) power_draw_per_use = 1 /obj/item/integrated_circuit/input/externalbm/do_work() @@ -834,7 +827,6 @@ ) activators = list("scan" = IC_PINTYPE_PULSE_IN, "on scanned" = IC_PINTYPE_PULSE_OUT) spawn_flags = IC_SPAWN_RESEARCH - origin_tech = list(TECH_ENGINEERING = 3, TECH_DATA = 3) power_draw_per_use = 60 /obj/item/integrated_circuit/input/atmo_scanner/do_work() @@ -884,7 +876,6 @@ ) activators = list("scan" = IC_PINTYPE_PULSE_IN, "on scanned" = IC_PINTYPE_PULSE_OUT) spawn_flags = IC_SPAWN_RESEARCH - origin_tech = list(TECH_ENGINEERING = 3, TECH_DATA = 3) power_draw_per_use = 20 /obj/item/integrated_circuit/input/pressure_sensor/do_work() @@ -914,7 +905,6 @@ ) activators = list("scan" = IC_PINTYPE_PULSE_IN, "on scanned" = IC_PINTYPE_PULSE_OUT) spawn_flags = IC_SPAWN_RESEARCH - origin_tech = list(TECH_ENGINEERING = 3, TECH_DATA = 3) power_draw_per_use = 20 /obj/item/integrated_circuit/input/temperature_sensor/do_work() @@ -943,7 +933,6 @@ ) activators = list("scan" = IC_PINTYPE_PULSE_IN, "on scanned" = IC_PINTYPE_PULSE_OUT) spawn_flags = IC_SPAWN_RESEARCH - origin_tech = list(TECH_ENGINEERING = 3, TECH_DATA = 3) power_draw_per_use = 20 /obj/item/integrated_circuit/input/oxygen_sensor/do_work() @@ -973,7 +962,6 @@ ) activators = list("scan" = IC_PINTYPE_PULSE_IN, "on scanned" = IC_PINTYPE_PULSE_OUT) spawn_flags = IC_SPAWN_RESEARCH - origin_tech = list(TECH_ENGINEERING = 3, TECH_DATA = 3) power_draw_per_use = 20 /obj/item/integrated_circuit/input/co2_sensor/do_work() @@ -1003,7 +991,6 @@ ) activators = list("scan" = IC_PINTYPE_PULSE_IN, "on scanned" = IC_PINTYPE_PULSE_OUT) spawn_flags = IC_SPAWN_RESEARCH - origin_tech = list(TECH_ENGINEERING = 3, TECH_DATA = 3) power_draw_per_use = 20 /obj/item/integrated_circuit/input/nitrogen_sensor/do_work() @@ -1033,7 +1020,6 @@ ) activators = list("scan" = IC_PINTYPE_PULSE_IN, "on scanned" = IC_PINTYPE_PULSE_OUT) spawn_flags = IC_SPAWN_RESEARCH - origin_tech = list(TECH_ENGINEERING = 3, TECH_DATA = 3) power_draw_per_use = 20 /obj/item/integrated_circuit/input/phoron_sensor/do_work() @@ -1063,7 +1049,6 @@ ) activators = list("scan" = IC_PINTYPE_PULSE_IN, "on scanned" = IC_PINTYPE_PULSE_OUT) spawn_flags = IC_SPAWN_RESEARCH - origin_tech = list(TECH_ENGINEERING = 3, TECH_DATA = 3) power_draw_per_use = 20 /obj/item/integrated_circuit/input/methane_sensor/do_work() diff --git a/code/modules/integrated_electronics/subtypes/manipulation.dm b/code/modules/integrated_electronics/subtypes/manipulation.dm index 0caf93b0fe0..09d5a84fb8c 100644 --- a/code/modules/integrated_electronics/subtypes/manipulation.dm +++ b/code/modules/integrated_electronics/subtypes/manipulation.dm @@ -23,7 +23,6 @@ ) var/obj/item/gun/installed_gun = null spawn_flags = IC_SPAWN_RESEARCH - origin_tech = list(TECH_ENGINEERING = 3, TECH_DATA = 3, TECH_COMBAT = 4) power_draw_per_use = 50 // The targeting mechanism uses this. The actual gun uses its own cell for firing if it's an energy weapon. /obj/item/integrated_circuit/manipulation/weapon_firing/Destroy() @@ -167,7 +166,6 @@ outputs = list() activators = list("prime grenade" = IC_PINTYPE_PULSE_IN) spawn_flags = IC_SPAWN_RESEARCH - origin_tech = list(TECH_ENGINEERING = 3, TECH_DATA = 3, TECH_COMBAT = 4) var/obj/item/grenade/attached_grenade var/pre_attached_grenade_type @@ -232,5 +230,4 @@ /obj/item/integrated_circuit/manipulation/grenade/frag pre_attached_grenade_type = /obj/item/grenade/explosive - origin_tech = list(TECH_ENGINEERING = 3, TECH_DATA = 3, TECH_COMBAT = 10) spawn_flags = null // Used for world initializing, see the #defines above. diff --git a/code/modules/integrated_electronics/subtypes/memory.dm b/code/modules/integrated_electronics/subtypes/memory.dm index 87fe1503f0a..0ba70d1e580 100644 --- a/code/modules/integrated_electronics/subtypes/memory.dm +++ b/code/modules/integrated_electronics/subtypes/memory.dm @@ -58,7 +58,6 @@ name = "large memory circuit" desc = "This big circuit can hold eight pieces of data." icon_state = "memory8" - origin_tech = list(TECH_ENGINEERING = 3, TECH_DATA = 3) power_draw_per_use = 4 number_of_pins = 8 @@ -68,7 +67,6 @@ icon_state = "memory16" w_class = ITEMSIZE_NORMAL spawn_flags = IC_SPAWN_RESEARCH - origin_tech = list(TECH_ENGINEERING = 4, TECH_DATA = 4) power_draw_per_use = 8 number_of_pins = 16 diff --git a/code/modules/integrated_electronics/subtypes/output.dm b/code/modules/integrated_electronics/subtypes/output.dm index fee9cb54eab..eabfdd55e6e 100644 --- a/code/modules/integrated_electronics/subtypes/output.dm +++ b/code/modules/integrated_electronics/subtypes/output.dm @@ -101,7 +101,6 @@ ) outputs = list() spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - origin_tech = list(TECH_ENGINEERING = 3, TECH_DATA = 3) /obj/item/integrated_circuit/output/light/advanced/update_lighting() var/new_color = get_pin_data(IC_INPUT, 1) @@ -145,7 +144,6 @@ power_draw_per_use = 100 spawn_flags = IC_SPAWN_RESEARCH - origin_tech = list(TECH_ENGINEERING = 3, TECH_DATA = 4, TECH_ILLEGAL = 1) var/mob/living/voice/my_voice @@ -231,7 +229,6 @@ "secure day" = 'sound/voice/bsecureday.ogg', ) spawn_flags = IC_SPAWN_RESEARCH - origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2, TECH_ILLEGAL = 1) /obj/item/integrated_circuit/output/sound/medbot name = "medbot sound circuit" @@ -254,7 +251,6 @@ "no" = 'sound/voice/medbot/mno.ogg', ) spawn_flags = IC_SPAWN_RESEARCH - origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2, TECH_BIO = 1) // Temporarily removing video camera circuit due to excessive server load it can cause. diff --git a/code/modules/integrated_electronics/subtypes/power.dm b/code/modules/integrated_electronics/subtypes/power.dm index 043e7a68c2b..c01756ff4f4 100644 --- a/code/modules/integrated_electronics/subtypes/power.dm +++ b/code/modules/integrated_electronics/subtypes/power.dm @@ -19,7 +19,6 @@ ) activators = list("transmit" = IC_PINTYPE_PULSE_IN, "on transmit" = IC_PINTYPE_PULSE_OUT) spawn_flags = IC_SPAWN_RESEARCH - origin_tech = list(TECH_ENGINEERING = 4, TECH_DATA = 4, TECH_POWER = 4, TECH_MAGNET = 3) power_draw_per_use = 500 // Inefficency has to come from somewhere. var/amount_to_move = 5000 @@ -32,7 +31,6 @@ some power is lost due to ineffiency." w_class = ITEMSIZE_LARGE complexity = 32 - origin_tech = list(TECH_ENGINEERING = 4, TECH_DATA = 4, TECH_POWER = 6, TECH_MAGNET = 5) power_draw_per_use = 2000 amount_to_move = 20000 diff --git a/code/modules/integrated_electronics/subtypes/reagents.dm b/code/modules/integrated_electronics/subtypes/reagents.dm index 5d4430c1b97..2c521d53a6e 100644 --- a/code/modules/integrated_electronics/subtypes/reagents.dm +++ b/code/modules/integrated_electronics/subtypes/reagents.dm @@ -2,7 +2,6 @@ category_text = "Reagent" var/volume = 0 unacidable = TRUE - origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2, TECH_BIO = 2) /obj/item/integrated_circuit/reagent/Initialize(mapload) . = ..() @@ -26,7 +25,6 @@ ) activators = list("create smoke" = IC_PINTYPE_PULSE_IN,"on smoked" = IC_PINTYPE_PULSE_OUT) spawn_flags = IC_SPAWN_RESEARCH - origin_tech = list(TECH_ENGINEERING = 3, TECH_DATA = 3, TECH_BIO = 3) volume = 100 power_draw_per_use = 20 @@ -233,7 +231,6 @@ outputs = list() activators = list("transfer reagents" = IC_PINTYPE_PULSE_IN, "on transfer" = IC_PINTYPE_PULSE_OUT) spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2, TECH_BIO = 2) var/transfer_amount = 10 var/direc = 1 power_draw_per_use = 10 @@ -286,7 +283,6 @@ outputs = list("volume used" = IC_PINTYPE_NUMBER,"self reference" = IC_PINTYPE_REF) activators = list() spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2, TECH_BIO = 2) volume = 60 @@ -307,7 +303,6 @@ flags = OPENCONTAINER | NOREACT complexity = 8 spawn_flags = IC_SPAWN_RESEARCH - origin_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 2, TECH_DATA = 2, TECH_BIO = 2) /obj/item/integrated_circuit/reagent/storage/big name = "big reagent storage" @@ -318,7 +313,6 @@ complexity = 16 volume = 180 spawn_flags = IC_SPAWN_RESEARCH - origin_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 2, TECH_DATA = 2, TECH_BIO = 2) /obj/item/integrated_circuit/reagent/storage/scan name = "reagent scanner" @@ -330,7 +324,6 @@ outputs = list("volume used" = IC_PINTYPE_NUMBER,"self reference" = IC_PINTYPE_REF,"list of reagents" = IC_PINTYPE_LIST) activators = list("scan" = IC_PINTYPE_PULSE_IN) spawn_flags = IC_SPAWN_RESEARCH - origin_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 2, TECH_DATA = 2, TECH_BIO = 2) /obj/item/integrated_circuit/reagent/storage/scan/do_work() var/cont[0] @@ -355,7 +348,6 @@ outputs = list() activators = list("transfer reagents" = IC_PINTYPE_PULSE_IN, "on transfer" = IC_PINTYPE_PULSE_OUT) spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2, TECH_BIO = 2) var/transfer_amount = 10 var/direc = 1 power_draw_per_use = 10 diff --git a/code/modules/integrated_electronics/subtypes/smart.dm b/code/modules/integrated_electronics/subtypes/smart.dm index efbd3bf0d12..23cc3080b67 100644 --- a/code/modules/integrated_electronics/subtypes/smart.dm +++ b/code/modules/integrated_electronics/subtypes/smart.dm @@ -12,7 +12,6 @@ outputs = list("dir" = IC_PINTYPE_DIR) activators = list("calculate dir" = IC_PINTYPE_PULSE_IN, "on calculated" = IC_PINTYPE_PULSE_OUT) spawn_flags = IC_SPAWN_RESEARCH - origin_tech = list(TECH_ENGINEERING = 4, TECH_DATA = 5) power_draw_per_use = 40 /obj/item/integrated_circuit/smart/basic_pathfinder/do_work() @@ -50,7 +49,6 @@ "on calculated" = IC_PINTYPE_PULSE_OUT ) spawn_flags = IC_SPAWN_RESEARCH - origin_tech = list(TECH_ENGINEERING = 4, TECH_DATA = 5) power_draw_per_use = 40 /obj/item/integrated_circuit/smart/targeted_pathfinder @@ -125,7 +123,6 @@ "on failed move" = IC_PINTYPE_PULSE_OUT ) spawn_flags = IC_SPAWN_RESEARCH - origin_tech = list(TECH_ENGINEERING = 5, TECH_DATA = 5) power_draw_per_use = 60 cooldown_per_use = 2 // 3 delay on a ticker circuit from testing. @@ -219,7 +216,6 @@ outputs = list("Z-level" = IC_PINTYPE_NUMBER) activators = list("get Z-level" = IC_PINTYPE_PULSE_IN, "on read" = IC_PINTYPE_PULSE_OUT) spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH - origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 3) power_draw_per_use = 10 /obj/item/integrated_circuit/smart/z_level_sensor/do_work() diff --git a/code/modules/materials/materials/_materials.dm b/code/modules/materials/materials/_materials.dm index 7e9c7dc528d..6ea538bc074 100644 --- a/code/modules/materials/materials/_materials.dm +++ b/code/modules/materials/materials/_materials.dm @@ -205,7 +205,6 @@ GLOBAL_LIST_INIT(name_to_material, populate_material_list()) var/door_icon_base = "metal" // Door base icon tag. See header. var/table_icon_base = "metal" // Table base icon tag. See header. var/icon_reinf = "reinf_metal" // Overlay used - var/list/stack_origin_tech = list(TECH_MATERIAL = 1) // Research level for stacks. var/pass_stack_colors = FALSE // Will stacks made from this material pass their colors onto objects? // Attributes diff --git a/code/modules/materials/materials/gems.dm b/code/modules/materials/materials/gems.dm index 5297e5fc08a..3779e462e79 100644 --- a/code/modules/materials/materials/gems.dm +++ b/code/modules/materials/materials/gems.dm @@ -7,7 +7,6 @@ icon_colour = "#FC2BC5" shard_type = SHARD_SHARD hardness = 30 - stack_origin_tech = list(TECH_MATERIAL = 2, TECH_PHORON = 2) door_icon_base = "stone" sheet_singular_name = "crystal" sheet_plural_name = "crystals" @@ -43,7 +42,6 @@ shard_type = SHARD_SHARD tableslam_noise = 'sound/effects/Glasshit.ogg' hardness = 100 - stack_origin_tech = list(TECH_MATERIAL = 6) supply_conversion_value = 8 icon_base = "stone" table_icon_base = "stone" @@ -89,7 +87,6 @@ shard_type = SHARD_SHARD tableslam_noise = 'sound/effects/Glasshit.ogg' hardness = 100 - stack_origin_tech = list(TECH_ARCANE = 1, TECH_MATERIAL = 6) sheet_singular_name = "gem" sheet_plural_name = "gems" supply_conversion_value = 30 // These are hilariously rare. @@ -114,7 +111,6 @@ reflectivity = 0.5 radiation_resistance = 20 spatial_instability = 30 - stack_origin_tech = list(TECH_MATERIAL = 7, TECH_PHORON = 5, TECH_BLUESPACE = 5) sheet_singular_name = "gem" sheet_plural_name = "gems" icon_base = "stone" @@ -136,7 +132,6 @@ conductivity = 60 reflectivity = 0.3 radiation_resistance = 5 - stack_origin_tech = list(TECH_MATERIAL = 6, TECH_POWER = 5, TECH_BIO = 4) sheet_singular_name = "sheet" sheet_plural_name = "sheets" supply_conversion_value = 8 @@ -161,7 +156,6 @@ explosion_resistance = 85 reflectivity = 0.2 radiation_resistance = 10 - stack_origin_tech = list(TECH_MATERIAL = 8, TECH_PHORON = 4, TECH_BLUESPACE = 4) supply_conversion_value = 13 icon_base = "stone" table_icon_base = "stone" @@ -184,7 +178,6 @@ explosion_resistance = 20 reflectivity = 1 radiation_resistance = 100 - stack_origin_tech = list(TECH_MATERIAL = 4, TECH_BLUESPACE = 8) supply_conversion_value = 15 icon_base = "stone" table_icon_base = "stone" diff --git a/code/modules/materials/materials/glass.dm b/code/modules/materials/materials/glass.dm index fcc679cea56..d53f7b46c9f 100644 --- a/code/modules/materials/materials/glass.dm +++ b/code/modules/materials/materials/glass.dm @@ -105,7 +105,6 @@ tableslam_noise = 'sound/effects/Glasshit.ogg' hardness = 40 weight = 30 - stack_origin_tech = list(TECH_MATERIAL = 2) composite_material = list(MAT_STEEL = SHEET_MATERIAL_AMOUNT / 2, MAT_GLASS = SHEET_MATERIAL_AMOUNT) window_options = list("One Direction" = 1, "Full Window" = 4, "Windoor" = 2) created_window = /obj/structure/window/reinforced @@ -120,7 +119,6 @@ flags = MATERIAL_BRITTLE integrity = 100 icon_colour = "#FC2BC5" - stack_origin_tech = list(TECH_MATERIAL = 4) window_options = list("One Direction" = 1, "Full Window" = 4) created_window = /obj/structure/window/phoronbasic created_fulltile_window = /obj/structure/window/phoronbasic/full @@ -131,13 +129,11 @@ name = MAT_RPGLASS display_name = MAT_RPGLASS stack_type = /obj/item/stack/material/glass/phoronrglass - stack_origin_tech = list(TECH_MATERIAL = 5) window_options = list("One Direction" = 1, "Full Window" = 4) created_window = /obj/structure/window/phoronreinforced created_fulltile_window = /obj/structure/window/phoronreinforced/full hardness = 40 weight = 30 - stack_origin_tech = list(TECH_MATERIAL = 2) composite_material = list(MAT_STEEL = SHEET_MATERIAL_AMOUNT / 2, MAT_PGLASS = SHEET_MATERIAL_AMOUNT) rod_product = null flags = MATERIAL_UNMELTABLE diff --git a/code/modules/materials/materials/glass_vr.dm b/code/modules/materials/materials/glass_vr.dm index a7191ce70e4..fe5e4050c6d 100644 --- a/code/modules/materials/materials/glass_vr.dm +++ b/code/modules/materials/materials/glass_vr.dm @@ -7,7 +7,6 @@ weight = 50 flags = MATERIAL_BRITTLE icon_colour = "#A7A3A6" - stack_origin_tech = list(TECH_MATERIAL = 5) window_options = list("One Direction" = 1, "Full Window" = 4) created_window = /obj/structure/window/titanium created_fulltile_window = /obj/structure/window/titanium/full @@ -23,7 +22,6 @@ weight = 80 flags = MATERIAL_BRITTLE icon_colour = "#676366" - stack_origin_tech = list(TECH_MATERIAL = 6) window_options = list("One Direction" = 1, "Full Window" = 4) created_window = /obj/structure/window/plastitanium created_fulltile_window = /obj/structure/window/plastitanium/full diff --git a/code/modules/materials/materials/metals/metals.dm b/code/modules/materials/materials/metals/metals.dm index 123585efcc2..d074b18df6c 100644 --- a/code/modules/materials/materials/metals/metals.dm +++ b/code/modules/materials/materials/metals/metals.dm @@ -16,7 +16,6 @@ weight = 28 protectiveness = 60 // 75% reflectivity = 0.7 // Not a perfect mirror, but close. - stack_origin_tech = list(TECH_MATERIAL = 8) supply_conversion_value = 9 /datum/material/durasteel/generate_recipes() @@ -67,7 +66,6 @@ weight = 24 hardness = 40 conductivity = 41 - stack_origin_tech = list(TECH_MATERIAL = 4) sheet_singular_name = "ingot" sheet_plural_name = "ingots" supply_conversion_value = 2 @@ -79,7 +77,6 @@ weight = 22 hardness = 50 conductivity = 63 - stack_origin_tech = list(TECH_MATERIAL = 3) sheet_singular_name = "ingot" sheet_plural_name = "ingots" supply_conversion_value = 2 @@ -90,7 +87,6 @@ icon_colour = "#9999FF" weight = 27 conductivity = 9.43 - stack_origin_tech = list(TECH_MATERIAL = 2) sheet_singular_name = "ingot" sheet_plural_name = "ingots" supply_conversion_value = 5 @@ -103,7 +99,6 @@ icon_reinf = "reinf_stone" icon_colour = "#007A00" weight = 22 - stack_origin_tech = list(TECH_MATERIAL = 5) door_icon_base = "stone" supply_conversion_value = 2 @@ -111,7 +106,6 @@ name = MAT_METALHYDROGEN stack_type = /obj/item/stack/material/mhydrogen icon_colour = "#E6C5DE" - stack_origin_tech = list(TECH_MATERIAL = 6, TECH_POWER = 6, TECH_MAGNET = 5) conductivity = 100 is_fusion_fuel = 1 supply_conversion_value = 6 @@ -120,7 +114,6 @@ name = MAT_DEUTERIUM stack_type = /obj/item/stack/material/deuterium icon_colour = "#999999" - stack_origin_tech = list(TECH_MATERIAL = 3) sheet_singular_name = "ingot" sheet_plural_name = "ingots" is_fusion_fuel = 1 @@ -130,7 +123,6 @@ name = MAT_TRITIUM stack_type = /obj/item/stack/material/tritium icon_colour = "#777777" - stack_origin_tech = list(TECH_MATERIAL = 5) sheet_singular_name = "ingot" sheet_plural_name = "ingots" is_fusion_fuel = 1 @@ -140,7 +132,6 @@ name = MAT_OSMIUM stack_type = /obj/item/stack/material/osmium icon_colour = "#9999FF" - stack_origin_tech = list(TECH_MATERIAL = 5) sheet_singular_name = "ingot" sheet_plural_name = "ingots" conductivity = 100 @@ -161,7 +152,6 @@ conductivity = 18 melting_point = T0C+3600 radiation_resistance = 15 - stack_origin_tech = list(TECH_MATERIAL = 2, TECH_MAGNET = 2) /datum/material/bronze name = MAT_BRONZE diff --git a/code/modules/materials/materials/metals/plasteel.dm b/code/modules/materials/materials/metals/plasteel.dm index f4508fa64b8..1c3e34df92b 100644 --- a/code/modules/materials/materials/metals/plasteel.dm +++ b/code/modules/materials/materials/metals/plasteel.dm @@ -11,7 +11,6 @@ weight = 23 protectiveness = 20 // 50% conductivity = 13 // For the purposes of balance. - stack_origin_tech = list(TECH_MATERIAL = 2) supply_conversion_value = 6 /datum/material/plasteel/generate_recipes() diff --git a/code/modules/materials/materials/metals/plasteel_vr.dm b/code/modules/materials/materials/metals/plasteel_vr.dm index 742d90fd328..15ea9022910 100644 --- a/code/modules/materials/materials/metals/plasteel_vr.dm +++ b/code/modules/materials/materials/metals/plasteel_vr.dm @@ -11,7 +11,6 @@ weight = 40 protectiveness = 30 conductivity = 7 - stack_origin_tech = list(TECH_MATERIAL = 5) supply_conversion_value = 8 /datum/material/plastitanium/generate_recipes() diff --git a/code/modules/materials/materials/organic/animal_products.dm b/code/modules/materials/materials/organic/animal_products.dm index 4541f049530..0378ff7da84 100644 --- a/code/modules/materials/materials/organic/animal_products.dm +++ b/code/modules/materials/materials/organic/animal_products.dm @@ -16,7 +16,6 @@ name = MAT_CHITIN icon_colour = "#8d6653" stack_type = /obj/item/stack/material/chitin - stack_origin_tech = list(TECH_MATERIAL = 3, TECH_BIO = 4) icon_base = "solid" icon_reinf = "reinf_mesh" integrity = 60 diff --git a/code/modules/materials/materials/organic/cloth.dm b/code/modules/materials/materials/organic/cloth.dm index 6ed7fab3330..0acc8ac894b 100644 --- a/code/modules/materials/materials/organic/cloth.dm +++ b/code/modules/materials/materials/organic/cloth.dm @@ -1,6 +1,5 @@ /datum/material/cloth name = MAT_CLOTH - stack_origin_tech = list(TECH_MATERIAL = 2) door_icon_base = "wood" ignition_point = T0C+232 melting_point = T0C+300 @@ -47,7 +46,6 @@ /datum/material/cloth/syncloth name = MAT_SYNCLOTH - stack_origin_tech = list(TECH_MATERIAL = 3, TECH_BIO = 2) ignition_point = T0C+532 melting_point = T0C+600 integrity = 200 diff --git a/code/modules/materials/materials/organic/leather.dm b/code/modules/materials/materials/organic/leather.dm index 352d6668716..e41bf3d8279 100644 --- a/code/modules/materials/materials/organic/leather.dm +++ b/code/modules/materials/materials/organic/leather.dm @@ -3,7 +3,6 @@ display_name = "plainleather" icon_colour = "#5C4831" stack_type = /obj/item/stack/material/leather - stack_origin_tech = list(TECH_MATERIAL = 2, TECH_BIO = 2) flags = MATERIAL_PADDING ignition_point = T0C+300 melting_point = T0C+300 diff --git a/code/modules/materials/materials/organic/resin.dm b/code/modules/materials/materials/organic/resin.dm index c1371df2e3c..c3aac196123 100644 --- a/code/modules/materials/materials/organic/resin.dm +++ b/code/modules/materials/materials/organic/resin.dm @@ -12,7 +12,6 @@ conductive = 0 explosion_resistance = 60 radiation_resistance = 10 - stack_origin_tech = list(TECH_MATERIAL = 8, TECH_PHORON = 4, TECH_BLUESPACE = 4, TECH_BIO = 7) stack_type = /obj/item/stack/material/resin /datum/material/resin/can_open_material_door(var/mob/living/user) diff --git a/code/modules/materials/materials/organic/wood.dm b/code/modules/materials/materials/organic/wood.dm index 654603d214f..ea5592ea933 100644 --- a/code/modules/materials/materials/organic/wood.dm +++ b/code/modules/materials/materials/organic/wood.dm @@ -14,7 +14,6 @@ conductivity = 1 melting_point = T0C+300 //okay, not melting in this case, but hot enough to destroy wood ignition_point = T0C+288 - stack_origin_tech = list(TECH_MATERIAL = 1, TECH_BIO = 1) dooropen_noise = 'sound/effects/doorcreaky.ogg' door_icon_base = "wood" destruction_desc = "splinters" @@ -59,7 +58,6 @@ name = MAT_SIFWOOD stack_type = /obj/item/stack/material/wood/sif icon_colour = "#0099cc" // Cyan-ish - stack_origin_tech = list(TECH_MATERIAL = 2, TECH_BIO = 2) // Alien wood would presumably be more interesting to the analyzer. /datum/material/wood/sif/generate_recipes() ..() @@ -157,7 +155,6 @@ name = MAT_SIFLOG display_name = MAT_SIFWOOD icon_colour = "#0099cc" // Cyan-ish - stack_origin_tech = list(TECH_MATERIAL = 2, TECH_BIO = 2) stack_type = /obj/item/stack/material/log/sif /datum/material/wood/log/hard diff --git a/code/modules/materials/materials/plastic.dm b/code/modules/materials/materials/plastic.dm index 352b4c2ad2a..527ca5c276f 100644 --- a/code/modules/materials/materials/plastic.dm +++ b/code/modules/materials/materials/plastic.dm @@ -11,7 +11,6 @@ conductive = 0 conductivity = 2 // For the sake of material armor diversity, we're gonna pretend this plastic is a good insulator. melting_point = T0C+371 //assuming heat resistant plastic - stack_origin_tech = list(TECH_MATERIAL = 3) /datum/material/plastic/generate_recipes() ..() @@ -70,7 +69,6 @@ conductive = 0 ignition_point = T0C+232 //"the temperature at which book-paper catches fire, and burns." close enough melting_point = T0C+232 //temperature at which cardboard walls would be destroyed - stack_origin_tech = list(TECH_MATERIAL = 1) door_icon_base = "wood" destruction_desc = "crumples" radiation_resistance = 1 diff --git a/code/modules/materials/materials/snow.dm b/code/modules/materials/materials/snow.dm index 243fe3b0410..5f07734d16c 100644 --- a/code/modules/materials/materials/snow.dm +++ b/code/modules/materials/materials/snow.dm @@ -9,7 +9,6 @@ hardness = 1 weight = 1 protectiveness = 0 // 0% - stack_origin_tech = list(TECH_MATERIAL = 1) melting_point = T0C+1 destruction_desc = "crumples" sheet_singular_name = "pile" @@ -37,7 +36,6 @@ weight = 2 hardness = 2 protectiveness = 0 // 0% - stack_origin_tech = list(TECH_MATERIAL = 1) melting_point = T0C+1 destruction_desc = "crumbles" sheet_singular_name = "brick" diff --git a/code/modules/materials/materials/supermatter.dm b/code/modules/materials/materials/supermatter.dm index 158868a3cf9..cc0b23fa60a 100644 --- a/code/modules/materials/materials/supermatter.dm +++ b/code/modules/materials/materials/supermatter.dm @@ -14,7 +14,6 @@ sheet_singular_name = "crystal" sheet_plural_name = "crystals" is_fusion_fuel = 1 - stack_origin_tech = list(TECH_MATERIAL = 8, TECH_PHORON = 5, TECH_BLUESPACE = 4) flags = MATERIAL_UNMELTABLE /datum/material/supermatter/generate_recipes() diff --git a/code/modules/materials/sheets/_sheets.dm b/code/modules/materials/sheets/_sheets.dm index 28637c5ea98..4cdf2cd44d5 100644 --- a/code/modules/materials/sheets/_sheets.dm +++ b/code/modules/materials/sheets/_sheets.dm @@ -37,8 +37,6 @@ recipes = material.get_recipes() stacktype = material.stack_type - if(islist(material.stack_origin_tech)) - origin_tech = material.stack_origin_tech.Copy() if(apply_colour) color = material.icon_colour diff --git a/code/modules/materials/sheets/organic/animal_products.dm b/code/modules/materials/sheets/organic/animal_products.dm index 28369e6ad19..cf5ec3eb2cc 100644 --- a/code/modules/materials/sheets/organic/animal_products.dm +++ b/code/modules/materials/sheets/organic/animal_products.dm @@ -35,7 +35,6 @@ /datum/material/fur name = MAT_FUR icon_colour = "#fff2d3" - stack_origin_tech = list(TECH_MATERIAL = 2) display_name = MAT_FUR icon_base = "sheet-fabric" stack_type = /obj/item/stack/material/fur diff --git a/code/modules/mining/drilling/scanner.dm b/code/modules/mining/drilling/scanner.dm index 8e94fd1d6fe..335d8753c5e 100644 --- a/code/modules/mining/drilling/scanner.dm +++ b/code/modules/mining/drilling/scanner.dm @@ -4,7 +4,6 @@ icon = 'icons/obj/device.dmi' icon_state = "deep_scan_device" item_state = "electronic" - origin_tech = list(TECH_MAGNET = 1, TECH_ENGINEERING = 1) matter = list(MAT_STEEL = 150) var/scan_time = 2 SECONDS var/range = 2 @@ -108,7 +107,6 @@ name = "advanced ore detector" desc = "An advanced device used to locate ore deep underground." description_info = "This scanner has variable range, you can use the Set Scanner Range verb, or alt+click the device. Drills dig in 5x5." - origin_tech = list(TECH_MAGNET = 4, TECH_ENGINEERING = 4) matter = list(MAT_STEEL = 150) scan_time = 0.5 SECONDS exact = TRUE diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index e15904a0fef..0d2a73e9fd7 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -22,7 +22,6 @@ matter = list(MAT_STEEL = 2500) var/digspeed = 36 //moving the delay to an item var so R&D can make improved picks. --NEO var/sand_dig = FALSE // does this thing dig sand? - origin_tech = list(TECH_MATERIAL = 1) attack_verb = list("hit", "pierced", "sliced", "attacked") var/drill_sound = "pickaxe" var/drill_verb = "picking" @@ -38,7 +37,6 @@ icon_state = "spickaxe" item_state = "spickaxe" digspeed = 27 - origin_tech = list(TECH_MATERIAL = 3) desc = "This makes no metallurgic sense." /obj/item/pickaxe/gold @@ -46,7 +44,6 @@ icon_state = "gpickaxe" item_state = "gpickaxe" digspeed = 18 - origin_tech = list(TECH_MATERIAL = 4) desc = "This makes no metallurgic sense." drill_verb = "picking" @@ -55,7 +52,6 @@ icon_state = "dpickaxe" item_state = "dpickaxe" digspeed = 9 - origin_tech = list(TECH_MATERIAL = 6, TECH_ENGINEERING = 4) desc = "A pickaxe with a diamond pick head." drill_verb = "picking" @@ -67,7 +63,6 @@ item_state = "jackhammer" digspeed = 30 //Only slighty better than a pickaxe sand_dig = TRUE - origin_tech = list(TECH_MATERIAL = 1, TECH_POWER = 2, TECH_ENGINEERING = 1) matter = list(MAT_STEEL = 3750) desc = "The most basic of mining drills, for short excavations and small mineral extractions." drill_verb = "drilling" @@ -78,7 +73,6 @@ item_state = "jackhammer" digspeed = 27 sand_dig = TRUE - origin_tech = list(TECH_MATERIAL = 2, TECH_POWER = 3, TECH_ENGINEERING = 2) matter = list(MAT_STEEL = 4000, MAT_PLASTEEL = 2500) desc = "Yours is the drill that will pierce through the rock walls." drill_verb = "drilling" @@ -89,7 +83,6 @@ item_state = "jackhammer" digspeed = 4 //Digs through walls, girders, and can dig up sand sand_dig = TRUE - origin_tech = list(TECH_MATERIAL = 6, TECH_POWER = 4, TECH_ENGINEERING = 5) matter = list(MAT_STEEL = 4500, MAT_PLASTEEL = 3000, MAT_DIAMONDS = 1000) desc = "Yours is the drill that will pierce the heavens!" drill_verb = "drilling" @@ -99,7 +92,6 @@ icon_state = "jackhammer" item_state = "jackhammer" digspeed = 18 //faster than drill, but cannot dig - origin_tech = list(TECH_MATERIAL = 3, TECH_POWER = 2, TECH_ENGINEERING = 2) desc = "Cracks rocks with sonic blasts, perfect for killing cave lizards." drill_verb = "hammering" destroy_artefacts = TRUE @@ -122,7 +114,6 @@ w_class = ITEMSIZE_NORMAL //it is smaller than the pickaxe damtype = BURN digspeed = 18 //Can slice though normal walls, all girders, or be used in reinforced wall deconstruction/light thermite on fire - origin_tech = list(TECH_MATERIAL = 4, TECH_PHORON = 3, TECH_ENGINEERING = 3) matter = list(MAT_STEEL = 3000, MAT_PLASTEEL = 1500, MAT_DIAMONDS = 500, MAT_PHORON = 500) drill_verb = "cutting" drill_sound = 'sound/items/Welder.ogg' @@ -145,7 +136,6 @@ force = 8.0 throwforce = 4.0 w_class = ITEMSIZE_NORMAL - origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1) matter = list(MAT_STEEL = 50) attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked") sharp = FALSE diff --git a/code/modules/mining/ore.dm b/code/modules/mining/ore.dm index 9f4dca32aed..966bdc8f094 100644 --- a/code/modules/mining/ore.dm +++ b/code/modules/mining/ore.dm @@ -14,31 +14,26 @@ /obj/item/ore/uranium name = "pitchblende" icon_state = "ore_uranium" - origin_tech = list(TECH_MATERIAL = 5) material = ORE_URANIUM /obj/item/ore/iron name = ORE_HEMATITE icon_state = "ore_iron" - origin_tech = list(TECH_MATERIAL = 1) material = ORE_HEMATITE /obj/item/ore/coal name = "raw carbon" icon_state = "ore_coal" - origin_tech = list(TECH_MATERIAL = 1) material = ORE_CARBON /obj/item/ore/marble name = "recrystallized carbonate" icon_state = "ore_marble" - origin_tech = list(TECH_MATERIAL = 1) material = ORE_MARBLE /obj/item/ore/glass name = ORE_SAND icon_state = "ore_glass" - origin_tech = list(TECH_MATERIAL = 1) material = ORE_SAND slot_flags = SLOT_HOLSTER @@ -57,25 +52,21 @@ /obj/item/ore/phoron name = "phoron crystals" icon_state = "ore_phoron" - origin_tech = list(TECH_MATERIAL = 2) material = ORE_PHORON /obj/item/ore/silver name = "native silver ore" icon_state = "ore_silver" - origin_tech = list(TECH_MATERIAL = 3) material = ORE_SILVER /obj/item/ore/gold name = "native gold ore" icon_state = "ore_gold" - origin_tech = list(TECH_MATERIAL = 4) material = ORE_GOLD /obj/item/ore/diamond name = "diamonds" icon_state = "ore_diamond" - origin_tech = list(TECH_MATERIAL = 6) material = ORE_DIAMOND /obj/item/ore/osmium @@ -92,7 +83,6 @@ name = "verdantite dust" icon_state = "ore_verdantium" material = ORE_VERDANTIUM - origin_tech = list(TECH_MATERIAL = 7) // POCKET ... Crystal dust. /obj/item/ore/verdantium/throw_impact(atom/hit_atom) @@ -109,7 +99,6 @@ name = "lead glance" icon_state = "ore_lead" material = ORE_LEAD - origin_tech = list(TECH_MATERIAL = 3) /obj/item/ore/copper name = "raw copper" diff --git a/code/modules/mining/ore_redemption_machine/construction.dm b/code/modules/mining/ore_redemption_machine/construction.dm index 77b55ea2e12..b0126fa93f1 100644 --- a/code/modules/mining/ore_redemption_machine/construction.dm +++ b/code/modules/mining/ore_redemption_machine/construction.dm @@ -6,7 +6,6 @@ name = T_BOARD("Mining Equipment Vendor") board_type = new /datum/frame/frame_types/machine build_path = /obj/machinery/mineral/equipment_vendor - origin_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 3) req_components = list( /obj/item/stock_parts/console_screen = 1, /obj/item/stock_parts/matter_bin = 3) @@ -15,7 +14,6 @@ name = T_BOARD("Exploration Equipment Vendor") board_type = new /datum/frame/frame_types/machine build_path = /obj/machinery/mineral/equipment_vendor/survey - origin_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 2) req_components = list( /obj/item/stock_parts/console_screen = 1, /obj/item/stock_parts/matter_bin = 3) diff --git a/code/modules/mining/ore_vr.dm b/code/modules/mining/ore_vr.dm index d57e4412aa7..fae9238c4ef 100644 --- a/code/modules/mining/ore_vr.dm +++ b/code/modules/mining/ore_vr.dm @@ -1,5 +1,4 @@ /obj/item/ore/rutile name = "rutile" icon_state = "ore_rutile" - origin_tech = list(TECH_MATERIAL = 2) material = ORE_RUTILE diff --git a/code/modules/mining/resonator.dm b/code/modules/mining/resonator.dm index d38491721ea..f4dab87574b 100644 --- a/code/modules/mining/resonator.dm +++ b/code/modules/mining/resonator.dm @@ -9,7 +9,6 @@ slot_l_hand_str = 'icons/mob/items/lefthand_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_vr.dmi', ) - origin_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 3) desc = "A handheld device that creates small fields of energy that resonate until they detonate, crushing rock. It can also be activated without a target to create a field at the user's location, to act as a delayed time trap. It's more effective in low temperature." w_class = ITEMSIZE_NORMAL force = 8 @@ -25,7 +24,6 @@ name = "upgraded resonator" desc = "An upgraded version of the resonator that can produce more fields at once." icon_state = "resonator_u" - origin_tech = list(TECH_MATERIAL = 4, TECH_POWER = 3, TECH_MAGNET = 3, TECH_ENGINEERING = 3) fieldlimit = 5 /obj/item/resonator/proc/CreateResonance(var/target, var/creator) diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index ca9839b4667..8cce0fbe826 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -14,7 +14,6 @@ SPECIES_VOX = 'icons/inventory/head/mob_vox.dmi' ) - origin_tech = null item_icons = list( slot_l_hand_str = 'icons/mob/items/lefthand_holder.dmi', slot_r_hand_str = 'icons/mob/items/righthand_holder.dmi', @@ -159,20 +158,16 @@ //Mob specific holders. /obj/item/holder/diona - origin_tech = list(TECH_MAGNET = 3, TECH_BIO = 5) slot_flags = SLOT_HEAD | SLOT_OCLOTHING | SLOT_HOLSTER item_state = "diona" /obj/item/holder/drone - origin_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 5) item_state = "repairbot" /obj/item/holder/drone/swarm - origin_tech = list(TECH_MAGNET = 6, TECH_ENGINEERING = 7, TECH_PRECURSOR = 2, TECH_ARCANE = 1) item_state = "constructiondrone" /obj/item/holder/pai - origin_tech = list(TECH_DATA = 2) /obj/item/holder/pai/Initialize(mapload, mob/held) . = ..() @@ -183,7 +178,6 @@ desc = "It's a small rodent." item_state = "mouse_gray" slot_flags = SLOT_EARS | SLOT_HEAD | SLOT_ID - origin_tech = list(TECH_BIO = 2) w_class = ITEMSIZE_TINY /obj/item/holder/mouse/extrapolator_act(mob/living/user, obj/item/extrapolator/extrapolator, dry_run) @@ -210,89 +204,67 @@ item_state = "mouse_rat" /obj/item/holder/possum - origin_tech = list(TECH_BIO = 2) item_state = "possum" /obj/item/holder/possum/poppy - origin_tech = list(TECH_BIO = 2, TECH_ENGINEERING = 4) item_state = "poppy" /obj/item/holder/cat - origin_tech = list(TECH_BIO = 2) item_state = "cat" /obj/item/holder/cat/runtime /obj/item/holder/fennec - origin_tech = list(TECH_BIO = 2) /obj/item/holder/cat/runtime - origin_tech = list(TECH_BIO = 2, TECH_DATA = 4) - /obj/item/holder/cat/cak - origin_tech = list(TECH_BIO = 2) item_state = "cak" /obj/item/holder/cat/bluespace - origin_tech = list(TECH_BIO = 2, TECH_BLUESPACE = 6) item_state = "bscat" /obj/item/holder/cat/spacecat - origin_tech = list(TECH_BIO = 2, TECH_MATERIAL = 4) item_state = "spacecat" /obj/item/holder/cat/original - origin_tech = list(TECH_BIO = 2, TECH_BLUESPACE = 4) item_state = "original" /obj/item/holder/cat/breadcat - origin_tech = list(TECH_BIO = 2) item_state = "breadcat" /obj/item/holder/corgi - origin_tech = list(TECH_BIO = 2) item_state = "corgi" /obj/item/holder/lisa - origin_tech = list(TECH_BIO = 2) item_state = "lisa" /obj/item/holder/old_corgi - origin_tech = list(TECH_BIO = 2) item_state = "old_corgi" /obj/item/holder/void_puppy - origin_tech = list(TECH_BIO = 2, TECH_BLUESPACE = 3) item_state = "void_puppy" /obj/item/holder/narsian - origin_tech = list(TECH_BIO = 2, TECH_ILLEGAL = 3) item_state = "narsian" /obj/item/holder/bullterrier - origin_tech = list(TECH_BIO = 2) item_state = "bullterrier" /obj/item/holder/fox - origin_tech = list(TECH_BIO = 2) item_state = "fox" /obj/item/holder/pug - origin_tech = list(TECH_BIO = 2) item_state = "pug" /obj/item/holder/sloth - origin_tech = list(TECH_BIO = 2) item_state = "sloth" /obj/item/holder/borer - origin_tech = list(TECH_BIO = 6) item_state = "brainslug" /obj/item/holder/leech color = "#003366" - origin_tech = list(TECH_BIO = 5, TECH_PHORON = 2) /obj/item/holder/cat/fluff/tabiranth name = "Spirit" @@ -326,7 +298,6 @@ attack_verb = list("fished", "disrespected", "smacked", "smackereled") hitsound = 'sound/effects/slime_squish.ogg' slot_flags = SLOT_HOLSTER - origin_tech = list(TECH_BIO = 3) /obj/item/holder/fish/afterattack(var/atom/target, var/mob/living/user, proximity) if(!target) diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm index 2a61887f6a9..0f0dd6dc1ed 100644 --- a/code/modules/mob/living/carbon/brain/MMI.dm +++ b/code/modules/mob/living/carbon/brain/MMI.dm @@ -7,7 +7,6 @@ icon_state = "mmi_empty" w_class = ITEMSIZE_NORMAL can_speak = 1 - origin_tech = list(TECH_BIO = 3) req_access = list(ACCESS_ROBOTICS) @@ -170,7 +169,6 @@ /obj/item/mmi/radio_enabled 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. Wait, don't they all?" - origin_tech = list(TECH_BIO = 4) /obj/item/mmi/emp_act(severity, recursive) . = ..() @@ -301,7 +299,6 @@ icon = 'icons/obj/module.dmi' icon_state = "mainboard" w_class = ITEMSIZE_NORMAL - origin_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 3, TECH_DATA = 4) ghost_query_type = /datum/ghost_query/drone_brain is_digital_robot = TRUE @@ -324,7 +321,6 @@ icon = 'icons/obj/assemblies.dmi' icon_state = "posibrain" w_class = ITEMSIZE_NORMAL - origin_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2, TECH_DATA = 4) ghost_query_type = /datum/ghost_query/posi_brain /obj/item/mmi/digital/posibrain/request_player() @@ -364,4 +360,3 @@ icon = 'icons/obj/module.dmi' icon_state = "mainboard" w_class = ITEMSIZE_NORMAL - origin_tech = list(TECH_ENGINEERING = 2, TECH_MATERIAL = 2, TECH_BLUESPACE = 2, TECH_DATA = 3) diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm index c88fa9e9068..e7b87a41479 100644 --- a/code/modules/mob/living/carbon/brain/posibrain.dm +++ b/code/modules/mob/living/carbon/brain/posibrain.dm @@ -4,7 +4,6 @@ icon = 'icons/obj/assemblies.dmi' icon_state = "posibrain" w_class = ITEMSIZE_NORMAL - origin_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2, TECH_DATA = 4) var/searching = 0 var/askDelay = 10 * 60 * 1 diff --git a/code/modules/mob/living/carbon/brain/robot.dm b/code/modules/mob/living/carbon/brain/robot.dm index ca37f689a3d..7fc4e5d4bc6 100644 --- a/code/modules/mob/living/carbon/brain/robot.dm +++ b/code/modules/mob/living/carbon/brain/robot.dm @@ -4,7 +4,6 @@ icon = 'icons/obj/module.dmi' icon_state = "mainboard" w_class = ITEMSIZE_NORMAL - origin_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 3, TECH_DATA = 4) is_digital_robot = TRUE /obj/item/mmi/digital/robot/Initialize(mapload) diff --git a/code/modules/mob/living/carbon/human/species/lleill/lleill_items.dm b/code/modules/mob/living/carbon/human/species/lleill/lleill_items.dm index 6cd7d7a15db..7e36311bafc 100644 --- a/code/modules/mob/living/carbon/human/species/lleill/lleill_items.dm +++ b/code/modules/mob/living/carbon/human/species/lleill/lleill_items.dm @@ -303,7 +303,6 @@ icon = 'icons/obj/glamour.dmi' icon_state = "unstable" w_class = ITEMSIZE_SMALL - origin_tech = list(TECH_BLUESPACE = 7, TECH_MATERIAL = 2) var/tele_range = 4 var/tf_type = /mob/living/simple_mob/animal/passive/mouse var/tf_possible_types = list( diff --git a/code/modules/mob/living/carbon/metroid/items.dm b/code/modules/mob/living/carbon/metroid/items.dm index cc475257d9f..28af075ee87 100644 --- a/code/modules/mob/living/carbon/metroid/items.dm +++ b/code/modules/mob/living/carbon/metroid/items.dm @@ -8,7 +8,6 @@ throwforce = 0 throw_speed = 3 throw_range = 6 - origin_tech = list(TECH_BIO = 4) var/uses = 1 // uses before it goes inert var/enhanced = 0 //has it been enhanced before? flags = OPENCONTAINER @@ -321,7 +320,6 @@ throwforce = 1.0 throw_speed = 2 throw_range = 6 - origin_tech = list(TECH_BIO = 4) var/POWERFLAG = 0 // sshhhhhhh var/Flush = 30 var/Uses = 5 // uses before it goes inert @@ -353,7 +351,6 @@ icon = 'icons/mob/mob.dmi' icon_state = "slime egg-growing" bitesize = 12 - origin_tech = list(TECH_BIO = 4) var/grown = 0 /obj/item/reagent_containers/food/snacks/egg/slime/Initialize(mapload) diff --git a/code/modules/mob/living/silicon/robot/analyzer.dm b/code/modules/mob/living/silicon/robot/analyzer.dm index 8ba23ab83d2..c2726681583 100644 --- a/code/modules/mob/living/silicon/robot/analyzer.dm +++ b/code/modules/mob/living/silicon/robot/analyzer.dm @@ -13,7 +13,6 @@ w_class = ITEMSIZE_SMALL throw_speed = 5 throw_range = 10 - origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 1, TECH_ENGINEERING = 2) matter = list(MAT_STEEL = 500, MAT_GLASS = 200) var/mode = 1; pickup_sound = 'sound/items/pickup/device.ogg' diff --git a/code/modules/mob/living/silicon/robot/drone/swarm_items.dm b/code/modules/mob/living/silicon/robot/drone/swarm_items.dm index 788e9034bbf..d6abd18f0a7 100644 --- a/code/modules/mob/living/silicon/robot/drone/swarm_items.dm +++ b/code/modules/mob/living/silicon/robot/drone/swarm_items.dm @@ -148,7 +148,6 @@ standard xray beams, resulting in an effective 'anti-everything' energy weapon." icon_state = "xray" item_state = "xray" - origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 3, TECH_MAGNET = 2) projectile_type = /obj/item/projectile/beam/shock charge_cost = 175 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm index c1cfdfbae35..5c864dc4418 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm @@ -319,7 +319,6 @@ S.speak |= message /obj/item/holder/catslug - origin_tech = list(TECH_BIO = 2) icon = 'icons/mob/alienanimals_x32.dmi' item_state = "catslug" diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/broodmother.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/broodmother.dm index 0d50e2f6b00..70ee2e45c79 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/broodmother.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/broodmother.dm @@ -170,7 +170,6 @@ icon = 'icons/obj/egg.dmi' icon_state = "egg_slimeglob" - origin_tech = list(TECH_BIO = 10) /obj/item/royal_spider_egg/attack_self(mob/user) . = ..(user) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/armadillo.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/armadillo.dm index 2d705e7c108..2d500177aac 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/armadillo.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/armadillo.dm @@ -113,7 +113,6 @@ update_icon() /obj/item/holder/armadillo - origin_tech = list(TECH_BIO = 1) default_worn_icon = 'icons/mob/head.dmi' //item_state = "armadillo_rest" //Commented here as a reminder that holders will always set the item_state to icon_rest. You cannot override it like this. diff --git a/code/modules/modular_computers/hardware/battery_module.dm b/code/modules/modular_computers/hardware/battery_module.dm index daeabed652e..a34bb173c25 100644 --- a/code/modules/modular_computers/hardware/battery_module.dm +++ b/code/modules/modular_computers/hardware/battery_module.dm @@ -6,7 +6,6 @@ icon_state = "battery_normal" critical = 1 malfunction_probability = 1 - origin_tech = list(TECH_POWER = 1, TECH_ENGINEERING = 1) var/battery_rating = 750 var/obj/item/cell/battery = null @@ -14,7 +13,6 @@ name = "advanced battery" desc = "An advanced power cell, often used in most laptops. It is too large to be fitted into smaller devices. It's rating is 1100." icon_state = "battery_advanced" - origin_tech = list(TECH_POWER = 2, TECH_ENGINEERING = 2) hardware_size = 2 battery_rating = 1100 @@ -22,7 +20,6 @@ name = "super battery" desc = "A very advanced power cell, often used in high-end devices, or as uninterruptable power supply for important consoles or servers. It's rating is 1500." icon_state = "battery_super" - origin_tech = list(TECH_POWER = 3, TECH_ENGINEERING = 3) hardware_size = 2 battery_rating = 1500 @@ -30,7 +27,6 @@ name = "ultra battery" desc = "A very advanced large power cell. It's often used as uninterruptable power supply for critical consoles or servers. It's rating is 2000." icon_state = "battery_ultra" - origin_tech = list(TECH_POWER = 5, TECH_ENGINEERING = 4) hardware_size = 3 battery_rating = 2000 @@ -38,14 +34,12 @@ name = "micro battery" desc = "A small power cell, commonly seen in most portable microcomputers. It's rating is 500." icon_state = "battery_micro" - origin_tech = list(TECH_POWER = 2, TECH_ENGINEERING = 2) battery_rating = 500 /obj/item/computer_hardware/battery_module/nano name = "nano battery" desc = "A tiny power cell, commonly seen in low-end portable microcomputers. It's rating is 300." icon_state = "battery_nano" - origin_tech = list(TECH_POWER = 1, TECH_ENGINEERING = 1) battery_rating = 300 // This is not intended to be obtainable in-game. Intended for adminbus and debugging purposes. diff --git a/code/modules/modular_computers/hardware/card_slot.dm b/code/modules/modular_computers/hardware/card_slot.dm index b38a53a8eb0..7ea51abd418 100644 --- a/code/modules/modular_computers/hardware/card_slot.dm +++ b/code/modules/modular_computers/hardware/card_slot.dm @@ -5,7 +5,6 @@ critical = 0 icon_state = "cardreader" hardware_size = 1 - origin_tech = list(TECH_DATA = 2) var/obj/item/card/id/stored_card = null diff --git a/code/modules/modular_computers/hardware/hard_drive.dm b/code/modules/modular_computers/hardware/hard_drive.dm index 8e74350ac1f..935fdfa6a39 100644 --- a/code/modules/modular_computers/hardware/hard_drive.dm +++ b/code/modules/modular_computers/hardware/hard_drive.dm @@ -4,7 +4,6 @@ power_usage = 25 // SSD or something with low power usage icon_state = "hdd_normal" hardware_size = 1 - origin_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1) var/max_capacity = 128 var/used_capacity = 0 @@ -17,7 +16,6 @@ name = "advanced hard drive" desc = "A small hybrid hard drive with 256GQ of storage capacity for use in higher grade computers where balance between power efficiency and capacity is desired." max_capacity = 256 - origin_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2) power_usage = 50 // Hybrid, medium capacity and medium power storage icon_state = "hdd_advanced" hardware_size = 2 @@ -26,7 +24,6 @@ name = "super hard drive" desc = "A small hard drive with 512GQ of storage capacity for use in cluster storage solutions where capacity is more important than power efficiency." max_capacity = 512 - origin_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 3) power_usage = 100 // High-capacity but uses lots of power, shortening battery life. Best used with APC link. icon_state = "hdd_super" hardware_size = 2 @@ -35,7 +32,6 @@ name = "cluster hard drive" desc = "A large storage cluster consisting of multiple hard drives for usage in high capacity storage systems. Has capacity of 2048 GQ." power_usage = 500 - origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4) max_capacity = 2048 icon_state = "hdd_cluster" hardware_size = 3 @@ -45,7 +41,6 @@ name = "small hard drive" desc = "A small highly efficient solid state drive for portable devices." power_usage = 10 - origin_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2) max_capacity = 64 icon_state = "hdd_small" hardware_size = 1 @@ -54,7 +49,6 @@ name = "micro hard drive" desc = "A small micro hard drive for portable devices." power_usage = 2 - origin_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1) max_capacity = 32 icon_state = "hdd_micro" hardware_size = 1 diff --git a/code/modules/modular_computers/hardware/nano_printer.dm b/code/modules/modular_computers/hardware/nano_printer.dm index 1e56d2e8dcc..9d78c241d6c 100644 --- a/code/modules/modular_computers/hardware/nano_printer.dm +++ b/code/modules/modular_computers/hardware/nano_printer.dm @@ -2,7 +2,6 @@ name = "nano printer" desc = "Small integrated printer with paper recycling module." power_usage = 50 - origin_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2) critical = 0 icon_state = "printer" hardware_size = 1 diff --git a/code/modules/modular_computers/hardware/network_card.dm b/code/modules/modular_computers/hardware/network_card.dm index 829fcf7c4d0..0226d759a2f 100644 --- a/code/modules/modular_computers/hardware/network_card.dm +++ b/code/modules/modular_computers/hardware/network_card.dm @@ -4,7 +4,6 @@ GLOBAL_VAR_INIT(ntnet_card_uid, 1) name = "basic NTNet network card" desc = "A basic network card for usage with standard NTNet frequencies." power_usage = 50 - origin_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 1) critical = 0 icon_state = "netcard_basic" hardware_size = 1 @@ -42,7 +41,6 @@ GLOBAL_VAR_INIT(ntnet_card_uid, 1) name = "advanced NTNet network card" desc = "An advanced network card for usage with standard NTNet frequencies. It's transmitter is strong enough to connect even when far away." long_range = 1 - origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 2) power_usage = 100 // Better range but higher power usage. icon_state = "netcard_advanced" hardware_size = 1 @@ -51,7 +49,6 @@ GLOBAL_VAR_INIT(ntnet_card_uid, 1) name = "quantum NTNet network card" desc = "A network card that can connect to NTnet from anywhere, using quantum entanglement." long_range = 1 - origin_tech = list(TECH_DATA = 6, TECH_ENGINEERING = 7) power_usage = 200 // Infinite range but higher power usage. icon_state = "netcard_advanced" hardware_size = 1 @@ -72,7 +69,6 @@ GLOBAL_VAR_INIT(ntnet_card_uid, 1) name = "wired NTNet network card" desc = "An advanced network card for usage with standard NTNet frequencies. This one also supports wired connection." ethernet = 1 - origin_tech = list(TECH_DATA = 5, TECH_ENGINEERING = 3) power_usage = 100 // Better range but higher power usage. icon_state = "netcard_ethernet" hardware_size = 3 diff --git a/code/modules/modular_computers/hardware/portable_hard_drive.dm b/code/modules/modular_computers/hardware/portable_hard_drive.dm index e40791b3b0e..ce66a62619e 100644 --- a/code/modules/modular_computers/hardware/portable_hard_drive.dm +++ b/code/modules/modular_computers/hardware/portable_hard_drive.dm @@ -6,7 +6,6 @@ icon_state = "flashdrive_basic" hardware_size = 1 max_capacity = 16 - origin_tech = list(TECH_DATA = 1) /obj/item/computer_hardware/hard_drive/portable/advanced name = "advanced data crystal" @@ -15,7 +14,6 @@ icon_state = "flashdrive_advanced" hardware_size = 1 max_capacity = 64 - origin_tech = list(TECH_DATA = 2) /obj/item/computer_hardware/hard_drive/portable/super name = "super data crystal" @@ -24,7 +22,6 @@ icon_state = "flashdrive_super" hardware_size = 1 max_capacity = 256 - origin_tech = list(TECH_DATA = 4) /obj/item/computer_hardware/hard_drive/portable/Initialize(mapload) . = ..() diff --git a/code/modules/modular_computers/hardware/processor_unit.dm b/code/modules/modular_computers/hardware/processor_unit.dm index 7817597d49f..b5dbdbfaf43 100644 --- a/code/modules/modular_computers/hardware/processor_unit.dm +++ b/code/modules/modular_computers/hardware/processor_unit.dm @@ -9,7 +9,6 @@ power_usage = 50 critical = 1 malfunction_probability = 1 - origin_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 2) var/max_idle_programs = 2 // 2 idle, + 1 active = 3 as said in description. @@ -20,7 +19,6 @@ hardware_size = 1 power_usage = 25 max_idle_programs = 1 - origin_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2) /obj/item/computer_hardware/processor_unit/photonic name = "photonic processor" @@ -29,7 +27,6 @@ hardware_size = 2 power_usage = 250 max_idle_programs = 4 - origin_tech = list(TECH_DATA = 5, TECH_ENGINEERING = 4) /obj/item/computer_hardware/processor_unit/photonic/small name = "photonic microprocessor" @@ -38,7 +35,6 @@ hardware_size = 1 power_usage = 75 max_idle_programs = 2 - origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 3) /obj/item/computer_hardware/processor_unit/Destroy() if(holder2 && (holder2.processor_unit == src)) diff --git a/code/modules/modular_computers/hardware/tesla_link.dm b/code/modules/modular_computers/hardware/tesla_link.dm index 9c06c0c5a1a..e28a2edfddd 100644 --- a/code/modules/modular_computers/hardware/tesla_link.dm +++ b/code/modules/modular_computers/hardware/tesla_link.dm @@ -5,7 +5,6 @@ enabled = 1 icon_state = "teslalink" hardware_size = 1 - origin_tech = list(TECH_DATA = 2, TECH_POWER = 3, TECH_ENGINEERING = 2) var/passive_charging_rate = 250 // W /obj/item/computer_hardware/tesla_link/Destroy() diff --git a/code/modules/organs/internal/brain.dm b/code/modules/organs/internal/brain.dm index cc94f4b2d46..61cebc93833 100644 --- a/code/modules/organs/internal/brain.dm +++ b/code/modules/organs/internal/brain.dm @@ -13,7 +13,6 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain) throwforce = 1.0 throw_speed = 3 throw_range = 5 - origin_tech = list(TECH_BIO = 3) attack_verb = list("attacked", "slapped", "whacked") var/clone_source = FALSE var/mob/living/carbon/brain/brainmob = null diff --git a/code/modules/overmap/disperser/disperser_circuit.dm b/code/modules/overmap/disperser/disperser_circuit.dm index 05be8c8264b..e5df97b2803 100644 --- a/code/modules/overmap/disperser/disperser_circuit.dm +++ b/code/modules/overmap/disperser/disperser_circuit.dm @@ -5,14 +5,12 @@ /obj/item/circuitboard/disperser name = T_BOARD("obstruction removal ballista control") build_path = /obj/machinery/computer/ship/disperser - origin_tech = list(TECH_ENGINEERING = 2, TECH_COMBAT = 2, TECH_BLUESPACE = 2) hidden = TRUE // todo - Make properly constructable in round /obj/item/circuitboard/disperserfront name = T_BOARD("obstruction removal ballista beam generator") build_path = /obj/machinery/disperser/front board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_ENGINEERING = 2, TECH_COMBAT = 2, TECH_BLUESPACE = 2) req_components = list ( /obj/item/stock_parts/manipulator/pico = 5 ) @@ -22,7 +20,6 @@ name = T_BOARD("obstruction removal ballista fusor") build_path = /obj/machinery/disperser/middle board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_ENGINEERING = 2, TECH_COMBAT = 2, TECH_BLUESPACE = 2) req_components = list ( /obj/item/stock_parts/subspace/crystal = 10 ) @@ -32,7 +29,6 @@ name = T_BOARD("obstruction removal ballista material deconstructor") build_path = /obj/machinery/disperser/back board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_ENGINEERING = 2, TECH_COMBAT = 2, TECH_BLUESPACE = 2) req_components = list ( /obj/item/stock_parts/capacitor/super = 5 ) diff --git a/code/modules/overmap/ships/engines/gas_thruster.dm b/code/modules/overmap/ships/engines/gas_thruster.dm index 00e1f7d7d0e..7aa4d5a10b8 100644 --- a/code/modules/overmap/ships/engines/gas_thruster.dm +++ b/code/modules/overmap/ships/engines/gas_thruster.dm @@ -204,7 +204,6 @@ name = T_BOARD("gas thruster") icon_state = "mcontroller" build_path = /obj/machinery/atmospherics/unary/engine - origin_tech = list(TECH_POWER = 1, TECH_ENGINEERING = 2) req_components = list( /obj/item/stack/cable_coil = 30, /obj/item/pipe = 2, diff --git a/code/modules/overmap/ships/engines/ion_thruster.dm b/code/modules/overmap/ships/engines/ion_thruster.dm index 39f428046ce..470914d9969 100644 --- a/code/modules/overmap/ships/engines/ion_thruster.dm +++ b/code/modules/overmap/ships/engines/ion_thruster.dm @@ -83,7 +83,6 @@ board_type = "machine" icon_state = "mcontroller" build_path = /obj/machinery/ion_engine - origin_tech = list(TECH_POWER = 1, TECH_ENGINEERING = 2) req_components = list( /obj/item/stack/cable_coil = 2, /obj/item/stock_parts/matter_bin = 1, diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index ce64d5973b2..f14216835b3 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -145,7 +145,6 @@ /obj/item/pen/reagent flags = OPENCONTAINER - origin_tech = list(TECH_MATERIAL = 2, TECH_ILLEGAL = 5) /obj/item/pen/reagent/Initialize(mapload) . = ..() @@ -261,7 +260,6 @@ */ /obj/item/pen/reagent/sleepy desc = "It's a black ink pen with a sharp point and a carefully engraved \"Waffle Co.\"" - origin_tech = list(TECH_MATERIAL = 2, TECH_ILLEGAL = 5) /obj/item/pen/reagent/sleepy/Initialize(mapload) . = ..() @@ -273,7 +271,6 @@ * Parapens */ /obj/item/pen/reagent/paralysis - origin_tech = list(TECH_MATERIAL = 2, TECH_ILLEGAL = 5) /obj/item/pen/reagent/paralysis/Initialize(mapload) . = ..() diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 5c31a6362d2..aa9cdbd3047 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -8,7 +8,6 @@ icon = 'icons/obj/power_cells_old.dmi' //swap to 'icons/obj/power_cells_.dmi' for new sprites. icon_state = "b_st" item_state = "cell" - origin_tech = list(TECH_POWER = 1) force = 5.0 throwforce = 5.0 throw_speed = 3 diff --git a/code/modules/power/cells/device_cells.dm b/code/modules/power/cells/device_cells.dm index a7e77506635..f9aab5cb243 100644 --- a/code/modules/power/cells/device_cells.dm +++ b/code/modules/power/cells/device_cells.dm @@ -26,7 +26,6 @@ name = "\improper rechargable D battery" desc = "An older, cheap power cell designed to power handheld devices. It's probably been in use for quite some time now." description_fluff = "You can't top the rust top." //TOTALLY TRADEMARK INFRINGEMENT - origin_tech = list(TECH_POWER = 0) icon_state = "device_crap" charge = 240 maxcharge = 240 @@ -110,7 +109,6 @@ self_recharge = TRUE charge_amount = 120 charge_delay = 75 - origin_tech = list(TECH_POWER = 5, TECH_ARCANE = 1) /* * Captain's Self-charging Weapon @@ -148,7 +146,6 @@ maxcharge = 5000 charge_amount = 130 charge_delay = 50 - origin_tech = list(TECH_POWER = 7, TECH_ENGINEERING = 6, TECH_PHORON = 6, TECH_ARCANE = 2, TECH_PRECURSOR = 2) var/swaps_to = /obj/item/cell/void standard_overlays = FALSE @@ -184,7 +181,6 @@ maxcharge = 3600 charge_delay = 50 swaps_to = null - origin_tech = list(TECH_POWER = 8, TECH_ENGINEERING = 6, TECH_PHORON = 6, TECH_ARCANE = 1, TECH_PRECURSOR = 1) /obj/item/cell/device/weapon/recharge/alien/omni/empty charge = 0 @@ -199,7 +195,6 @@ charge = 10000 maxcharge = 10000 charge_amount = 20 - origin_tech = list(TECH_POWER = 8) /obj/item/cell/device/giga/empty charge = 0 @@ -211,7 +206,6 @@ charge = 3600 maxcharge = 3600 charge_amount = 20 - origin_tech = list(TECH_POWER = 3) /obj/item/cell/device/super/empty charge = 0 diff --git a/code/modules/power/cells/esoteric_cells.dm b/code/modules/power/cells/esoteric_cells.dm index 90104749df3..68cff0ec2e3 100644 --- a/code/modules/power/cells/esoteric_cells.dm +++ b/code/modules/power/cells/esoteric_cells.dm @@ -2,7 +2,6 @@ /obj/item/cell/spike name = "modified power cell" desc = "A modified power cell sitting in a highly conductive chassis." - origin_tech = list(TECH_POWER = 2) icon_state = "modded" charge = 10000 maxcharge = 10000 diff --git a/code/modules/power/cells/power_cells.dm b/code/modules/power/cells/power_cells.dm index 5cf917b981d..38fe685038e 100644 --- a/code/modules/power/cells/power_cells.dm +++ b/code/modules/power/cells/power_cells.dm @@ -11,7 +11,6 @@ name = "\improper rechargable DD battery" desc = "An older, cheap power cell. It's probably been in use for quite some time now." description_fluff = "You can't top the rust top." //TOTALLY TRADEMARK INFRINGEMENT - origin_tech = list(TECH_POWER = 0) icon_state = "crap" charge = 500 maxcharge = 500 @@ -29,7 +28,6 @@ */ /obj/item/cell/apc name = "heavy-duty power cell" - origin_tech = list(TECH_POWER = 1) icon_state = "apc" charge = 5000 maxcharge = 5000 @@ -48,7 +46,6 @@ */ /obj/item/cell/high name = "high-capacity power cell" - origin_tech = list(TECH_POWER = 2) icon_state = "b_hi" charge = 10000 maxcharge = 10000 @@ -63,7 +60,6 @@ */ /obj/item/cell/super name = "super-capacity power cell" - origin_tech = list(TECH_POWER = 5) icon_state = "b_sup" charge = 20000 maxcharge = 20000 @@ -89,7 +85,6 @@ */ /obj/item/cell/hyper name = "hyper-capacity power cell" - origin_tech = list(TECH_POWER = 6) icon_state = "b_hy" charge = 30000 maxcharge = 30000 @@ -113,7 +108,6 @@ /obj/item/cell/mech/lead name = "lead acid battery" desc = "An ancient battery design not commonly seen anymore. It looks like it'd fit inside a mech however..." - origin_tech = list(TECH_POWER = 0) //Litteraly an old car battery, doesn't need tech icon_state = "lead" charge = 8000 maxcharge = 8000 @@ -124,7 +118,6 @@ /obj/item/cell/mech/high name = "high-capacity mecha power cell" - origin_tech = list(TECH_POWER = 3) icon_state = "exs_m" charge = 20000 maxcharge = 20000 @@ -132,7 +125,6 @@ /obj/item/cell/mech/super name = "super-capacity mecha power cell" - origin_tech = list(TECH_POWER = 6) icon_state = "exs_l" charge = 25000 maxcharge = 25000 @@ -144,7 +136,6 @@ /obj/item/cell/infinite name = "infinite-capacity power cell!" icon_state = "infinite_b" - origin_tech = null charge = 30000 maxcharge = 30000 //determines how badly mobs get shocked matter = list(MAT_STEEL = 700, MAT_GLASS = 80) @@ -166,7 +157,6 @@ /obj/item/cell/potato name = "potato battery" desc = "A rechargable starch based power cell." - origin_tech = list(TECH_POWER = 1) icon_state = "potato" charge = 100 maxcharge = 300 @@ -179,7 +169,6 @@ /obj/item/cell/slime name = "charged slime core" desc = "A yellow slime core infused with phoron, it crackles with power." - origin_tech = list(TECH_POWER = 4, TECH_BIO = 5) icon = 'icons/mob/slimes.dmi' //'icons/obj/harvest.dmi' icon_state = "yellow slime extract" //"potato_battery" connector_type = "slime" @@ -259,7 +248,6 @@ /obj/item/cell/void name = "void cell (machinery)" desc = "An alien technology that produces energy seemingly out of nowhere. Its small, cylinderal shape means it might be able to be used with human technology, perhaps?" - origin_tech = list(TECH_POWER = 8, TECH_ENGINEERING = 6) icon = 'icons/obj/abductor.dmi' icon_state = "cell" charge = 10000 @@ -295,7 +283,6 @@ */ /obj/item/cell/secborg name = "security borg rechargable D battery" - origin_tech = list(TECH_POWER = 0) icon_state = "secborg" charge = 2400 maxcharge = 2400 @@ -309,7 +296,6 @@ */ /obj/item/cell/giga name = "giga-capacity power cell" - origin_tech = list(TECH_POWER = 8) icon_state = "meb_b_hi" charge = 40000 maxcharge = 40000 diff --git a/code/modules/power/fusion/fusion_circuits.dm b/code/modules/power/fusion/fusion_circuits.dm index 6317801ce73..14c930b9cee 100644 --- a/code/modules/power/fusion/fusion_circuits.dm +++ b/code/modules/power/fusion/fusion_circuits.dm @@ -1,13 +1,11 @@ /obj/item/circuitboard/fusion_core_control name = T_BOARD("fusion core controller") build_path = /obj/machinery/computer/fusion_core_control - origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4) /obj/item/circuitboard/fusion_fuel_compressor name = T_BOARD("fusion fuel compressor") build_path = /obj/machinery/fusion_fuel_compressor board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_POWER = 3, TECH_ENGINEERING = 4, TECH_MATERIAL = 4) req_components = list( /obj/item/stock_parts/manipulator/nano = 2, /obj/item/stock_parts/matter_bin/super = 2, @@ -18,18 +16,15 @@ /obj/item/circuitboard/fusion_fuel_control name = T_BOARD("fusion fuel controller") build_path = /obj/machinery/computer/fusion_fuel_control - origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4) /obj/item/circuitboard/gyrotron_control name = T_BOARD("gyrotron controller") build_path = /obj/machinery/computer/gyrotron_control - origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4) /obj/item/circuitboard/fusion_core name = "internal circuitry (fusion core)" build_path = /obj/machinery/power/fusion_core board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_BLUESPACE = 2, TECH_MAGNET = 4, TECH_POWER = 4) req_components = list( /obj/item/stock_parts/manipulator/nano = 2, /obj/item/stock_parts/micro_laser/high = 1, @@ -41,7 +36,6 @@ name = "internal circuitry (fusion fuel injector)" build_path = /obj/machinery/fusion_fuel_injector board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_POWER = 3, TECH_ENGINEERING = 4, TECH_MATERIAL = 4) req_components = list( /obj/item/stock_parts/manipulator/nano = 2, /obj/item/stock_parts/scanning_module/adv = 1, @@ -54,7 +48,6 @@ name = T_BOARD("gyrotron") build_path = /obj/machinery/power/emitter/gyrotron board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_POWER = 4, TECH_ENGINEERING = 4, TECH_MATERIAL = 5, TECH_MAGNET = 3) req_components = list( /obj/item/stock_parts/scanning_module/adv = 1, /obj/item/stock_parts/micro_laser/high = 3, diff --git a/code/modules/power/port_gen_vr.dm b/code/modules/power/port_gen_vr.dm index 0625292ceae..6a9f3813db4 100644 --- a/code/modules/power/port_gen_vr.dm +++ b/code/modules/power/port_gen_vr.dm @@ -39,7 +39,6 @@ name = T_BOARD("radioisotope TEG") build_path = /obj/machinery/power/rtg board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_DATA = 3, TECH_POWER = 3, TECH_PHORON = 3, TECH_ENGINEERING = 3) req_components = list( /obj/item/stack/cable_coil = 5, /obj/item/stock_parts/capacitor = 1, @@ -48,7 +47,6 @@ /obj/item/circuitboard/machine/rtg/advanced name = T_BOARD("advanced radioisotope TEG") build_path = /obj/machinery/power/rtg/advanced - origin_tech = list(TECH_DATA = 5, TECH_POWER = 5, TECH_PHORON = 5, TECH_ENGINEERING = 5) req_components = list( /obj/item/stack/cable_coil = 5, /obj/item/stock_parts/capacitor = 1, @@ -60,7 +58,6 @@ name = T_BOARD("void generator") build_path = /obj/machinery/power/rtg/abductor board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_DATA = 8, TECH_POWER = 8, TECH_PHORON = 8, TECH_ENGINEERING = 8) req_components = list( /obj/item/stack/cable_coil = 5, /obj/item/stock_parts/capacitor/hyper = 1) @@ -70,7 +67,6 @@ name = T_BOARD("void generator (hybrid)") build_path = /obj/machinery/power/rtg/abductor/hybrid board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_DATA = 8, TECH_POWER = 8, TECH_PHORON = 8, TECH_ENGINEERING = 8) req_components = list( /obj/item/stack/cable_coil = 5, /obj/item/stock_parts/capacitor/hyper = 1, @@ -463,7 +459,6 @@ name = T_BOARD("D-Type-REG") build_path = /obj/machinery/power/rtg/reg board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_DATA = 2, TECH_POWER = 4, TECH_ENGINEERING = 4) req_components = list( /obj/item/stack/cable_coil = 5, /obj/item/stock_parts/capacitor = 1) @@ -472,7 +467,6 @@ name = T_BOARD("C-Type-REG") build_path = /obj/machinery/power/rtg/reg/c board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_DATA = 2, TECH_POWER = 4, TECH_ENGINEERING = 4) req_components = list( /obj/item/stack/cable_coil = 5, /obj/item/stock_parts/capacitor = 1) diff --git a/code/modules/power/tesla/telsa_construction.dm b/code/modules/power/tesla/telsa_construction.dm index 3f2693397fd..d7336fef166 100644 --- a/code/modules/power/tesla/telsa_construction.dm +++ b/code/modules/power/tesla/telsa_construction.dm @@ -7,7 +7,6 @@ name = T_BOARD("tesla coil") build_path = /obj/machinery/power/tesla_coil board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_MAGNET = 2, TECH_POWER = 4) req_components = list(/obj/item/stock_parts/capacitor = 1) // Grounding rods can be built as machines using a circuit made in an autolathe. @@ -15,7 +14,6 @@ name = T_BOARD("grounding rod") build_path = /obj/machinery/power/grounding_rod board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_MAGNET = 1, TECH_POWER = 2) req_components = list() // SPECIAL BOARDS BELOW diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index 2396bc04b05..c30462381a9 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -68,7 +68,6 @@ name = T_BOARD("power compressor") build_path = /obj/machinery/compressor board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_MATERIAL = 4, TECH_POWER = 2) req_components = list(/obj/item/stack/cable_coil = 5, /obj/item/stock_parts/manipulator = 6) hidden = TRUE // todo - Make properly constructable in round @@ -76,7 +75,6 @@ name = T_BOARD("power turbine") build_path = /obj/machinery/power/turbine board_type = new /datum/frame/frame_types/machine - origin_tech = list(TECH_ENGINEERING = 2, TECH_POWER = 4) req_components = list(/obj/item/stack/cable_coil = 5, /obj/item/stock_parts/capacitor = 6) hidden = TRUE // todo - Make properly constructable in round diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index 7cfdc8e14b3..cce08a09331 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -112,7 +112,6 @@ /obj/item/ammo_magazine/m38/makarov name = "makarov magazine (.38)" icon_state = "45" - origin_tech = list(TECH_COMBAT = 2) mag_type = MAGAZINE matter = list(MAT_STEEL = 480) caliber = ".38" @@ -128,7 +127,6 @@ /obj/item/ammo_magazine/m38/giskard name = "magazine (.38)" icon_state = "m91" - origin_tech = list(TECH_COMBAT = 2) mag_type = MAGAZINE matter = list(MAT_STEEL = 540) caliber = ".38" @@ -304,7 +302,6 @@ /obj/item/ammo_magazine/m9mm name = "magazine (9mm)" icon_state = "m91" - origin_tech = list(TECH_COMBAT = 2) mag_type = MAGAZINE matter = list(MAT_STEEL = 600) caliber = "9mm" @@ -332,7 +329,6 @@ name = "extended magazine (9mm)" desc = "\"FOR LAW ENFORCEMENT/MILITARY USE ONLY\" is clearly etched on the magazine. This is probably illegal for you to have." // Remember, Security is not Law Enforcement, so it's illegal for Security to use as well. icon_state = "m93" - origin_tech = list(TECH_COMBAT = 2, TECH_ILLEGAL = 1) mag_type = MAGAZINE matter = list(MAT_STEEL = 1000) caliber = "9mm" @@ -354,7 +350,6 @@ /obj/item/ammo_magazine/m9mm/compact name = "compact magazine (9mm)" icon_state = "m92" - origin_tech = list(TECH_COMBAT = 2) mag_type = MAGAZINE matter = list(MAT_STEEL = 480) caliber = "9mm" @@ -381,7 +376,6 @@ /obj/item/ammo_magazine/m9mm/luger name = "\improper \"Mäuse\" magazine (9mm)" icon_state = "9x19p" - origin_tech = list(TECH_COMBAT = 2) mag_type = MAGAZINE matter = list(MAT_STEEL = 480) caliber = "9mm" @@ -473,7 +467,6 @@ matter = list(MAT_STEEL = 1200) caliber = "9mm" max_ammo = 21 - origin_tech = list(TECH_COMBAT = 2, TECH_ILLEGAL = 1) multiple_sprites = 1 /obj/item/ammo_magazine/m9mmAdvanced/ap @@ -490,7 +483,6 @@ /obj/item/ammo_magazine/m10mm name = "magazine (10mm)" icon_state = "10mm" - origin_tech = list(TECH_COMBAT = 2) mag_type = MAGAZINE caliber = "10mm" matter = list(MAT_STEEL = 1500) @@ -545,7 +537,6 @@ /obj/item/ammo_magazine/m545 name = "magazine (5.45mm)" icon_state = "m545" - origin_tech = list(TECH_COMBAT = 2) mag_type = MAGAZINE caliber = "5.45mm" matter = list(MAT_STEEL = 1800) @@ -637,7 +628,6 @@ /obj/item/ammo_magazine/m545saw name = "magazine box (5.45mm)" icon_state = "a545" - origin_tech = list(TECH_COMBAT = 2) mag_type = MAGAZINE caliber = "5.45mm" matter = list(MAT_STEEL = 10000) @@ -662,7 +652,6 @@ /obj/item/ammo_magazine/m44 name = "magazine (.44)" icon_state = "m44" - origin_tech = list(TECH_COMBAT = 2) mag_type = MAGAZINE caliber = ".44" matter = list(MAT_STEEL = 1260) diff --git a/code/modules/projectiles/ammunition/magnetic.dm b/code/modules/projectiles/ammunition/magnetic.dm index febb0b8c861..f2e72616c67 100644 --- a/code/modules/projectiles/ammunition/magnetic.dm +++ b/code/modules/projectiles/ammunition/magnetic.dm @@ -5,7 +5,6 @@ icon_state = "caseless-mag" w_class = ITEMSIZE_SMALL matter = list(MAT_STEEL = 1800) - origin_tech = list(TECH_COMBAT = 1) var/remaining = 9 preserve_item = 1 diff --git a/code/modules/projectiles/dnalocking.dm b/code/modules/projectiles/dnalocking.dm index 01858eae7d5..737a57a14bf 100644 --- a/code/modules/projectiles/dnalocking.dm +++ b/code/modules/projectiles/dnalocking.dm @@ -4,7 +4,6 @@ icon_state = "dnalockchip" desc = "A state of the art technological chip that can be installed in a firearm. It allows the user to store their DNA and lock the gun's use from unwanted users." w_class = ITEMSIZE_TINY - origin_tech = list(TECH_COMBAT = 4, TECH_DATA = 4, TECH_BIO = 4) var/list/stored_dna = list() //list of the dna stored in the gun, used to allow users to use it or not var/safety_level = 0 //either 0 or 1, at 0 the game buzzes and tells the user they can't use it, at 1 it self destructs after 10 seconds diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 960bd090c58..eb23f671b5b 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -46,7 +46,6 @@ throw_range = 5 force = 5 preserve_item = 1 - origin_tech = list(TECH_COMBAT = 1) attack_verb = list("struck", "hit", "bashed") zoomdevicename = "scope" drop_sound = 'sound/items/drop/gun.ogg' diff --git a/code/modules/projectiles/guns/energy/altevian_vr.dm b/code/modules/projectiles/guns/energy/altevian_vr.dm index 952c04f2d0b..5968f7e7434 100644 --- a/code/modules/projectiles/guns/energy/altevian_vr.dm +++ b/code/modules/projectiles/guns/energy/altevian_vr.dm @@ -7,7 +7,6 @@ slot_flags = SLOT_BELT w_class = ITEMSIZE_NORMAL force = 5 - origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2) matter = list(MAT_STEEL = 1000) projectile_type = /obj/item/projectile/beam/meeplaser charge_cost = 400 @@ -20,7 +19,6 @@ slot_flags = SLOT_BELT w_class = ITEMSIZE_LARGE force = 10 - origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 4) matter = list(MAT_STEEL = 2000) projectile_type = /obj/item/projectile/beam/meeplaser/strong charge_cost = 200 @@ -70,7 +68,6 @@ slot_flags = SLOT_BACK w_class = ITEMSIZE_HUGE force = 10 - origin_tech = list(TECH_COMBAT = 2, TECH_MAGNET = 4) matter = list(MAT_STEEL = 2000) projectile_type = /obj/item/projectile/scatter/ratminer charge_cost = 400 diff --git a/code/modules/projectiles/guns/energy/bola.dm b/code/modules/projectiles/guns/energy/bola.dm index ba8482d1f63..0329ff15565 100644 --- a/code/modules/projectiles/guns/energy/bola.dm +++ b/code/modules/projectiles/guns/energy/bola.dm @@ -5,7 +5,6 @@ item_state = "gun" // Placeholder fire_sound = 'sound/weapons/eluger.ogg' - origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 5, TECH_MAGNET = 3) projectile_type = /obj/item/projectile/bola/energy charge_cost = 400 //Low energy cost. fire_delay = 10 //Rapid fire! diff --git a/code/modules/projectiles/guns/energy/bsharpoon_vr.dm b/code/modules/projectiles/guns/energy/bsharpoon_vr.dm index 7cad1fd3b3b..51550d98558 100644 --- a/code/modules/projectiles/guns/energy/bsharpoon_vr.dm +++ b/code/modules/projectiles/guns/energy/bsharpoon_vr.dm @@ -11,7 +11,6 @@ throw_speed = 4 throw_range = 20 - origin_tech = list(TECH_BLUESPACE = 5) var/mode = 1 // 1 mode - teleport you to turf 0 mode teleport turf to you var/firable = TRUE diff --git a/code/modules/projectiles/guns/energy/cell_loaded_vr/cell_loaded.dm b/code/modules/projectiles/guns/energy/cell_loaded_vr/cell_loaded.dm index 62b3ae8de06..4004696685b 100644 --- a/code/modules/projectiles/guns/energy/cell_loaded_vr/cell_loaded.dm +++ b/code/modules/projectiles/guns/energy/cell_loaded_vr/cell_loaded.dm @@ -13,7 +13,6 @@ caliber = "nsfw" - origin_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 6, TECH_MAGNET = 4) fire_sound = 'sound/weapons/taser.ogg' @@ -148,7 +147,6 @@ desc = "A microbattery holder for a cell-based variable weapon." icon = 'icons/obj/ammo_vr.dmi' icon_state = "cell_mag" - origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 5, TECH_MAGNET = 3) caliber = "nsfw" ammo_type = /obj/item/ammo_casing/microbattery initial_ammo = 0 diff --git a/code/modules/projectiles/guns/energy/cell_loaded_vr/ml3m.dm b/code/modules/projectiles/guns/energy/cell_loaded_vr/ml3m.dm index 881fba03491..3cbb3e07deb 100644 --- a/code/modules/projectiles/guns/energy/cell_loaded_vr/ml3m.dm +++ b/code/modules/projectiles/guns/energy/cell_loaded_vr/ml3m.dm @@ -10,7 +10,6 @@ description_info = "This is a ranged healing device that uses interchangable nanite discharge cells in a magazine. Each cell is a different healing beam type, and up to three can be loaded in the magazine. Each battery usually provides four discharges of that beam type, and multiple from the same type may be loaded to increase the number of shots for that type." description_fluff = "The Vey-Med ML-3 'Medigun' allows one to customize their loadout in the field, or before deploying, to allow emergency response personnel to deliver a variety of ranged healing options." description_antag = "" - origin_tech = list(TECH_MATERIAL = 4, TECH_MAGNET = 2, TECH_BIO = 5) allowed_magazines = list(/obj/item/ammo_magazine/cell_mag/medical) /obj/item/gun/projectile/cell_loaded/medical/cmo @@ -30,7 +29,6 @@ description_info = "This magazine holds self-charging nanite fabricators to power the ML-3 'Medigun'. Up to three can be loaded at once, and each provides four shots of their respective healing type. Loading multiple of the same type will provide additional shots of that type. The batteries can be recharged in a normal recharger." ammo_type = /obj/item/ammo_casing/microbattery/medical icon_state = "ml3m_mag" - origin_tech = list(TECH_MATERIAL = 3, TECH_BIO = 3) /obj/item/ammo_magazine/cell_mag/medical/advanced name = "advanced nanite magazine" @@ -38,8 +36,6 @@ max_ammo = 6 x_offset = 3 icon_state = "ml3m_mag_extended" - origin_tech = list(TECH_MATERIAL = 5, TECH_BIO = 5) - // The Pack // /obj/item/storage/secure/briefcase/ml3m_pack_med diff --git a/code/modules/projectiles/guns/energy/cell_loaded_vr/ml3m_cells.dm b/code/modules/projectiles/guns/energy/cell_loaded_vr/ml3m_cells.dm index 055f36f49b4..a56a3c75904 100644 --- a/code/modules/projectiles/guns/energy/cell_loaded_vr/ml3m_cells.dm +++ b/code/modules/projectiles/guns/energy/cell_loaded_vr/ml3m_cells.dm @@ -4,7 +4,6 @@ desc = "A miniature nanite fabricator for a medigun." catalogue_data = list(/datum/category_item/catalogue/information/organization/vey_med) icon_state = "ml3m_batt" - origin_tech = list(TECH_BIO = 2, TECH_MATERIAL = 1, TECH_MAGNET = 2) /obj/item/projectile/beam/medical_cell name = "\improper healing beam" diff --git a/code/modules/projectiles/guns/energy/cell_loaded_vr/nsfw.dm b/code/modules/projectiles/guns/energy/cell_loaded_vr/nsfw.dm index 50b84e0eae8..d433a38f2ba 100644 --- a/code/modules/projectiles/guns/energy/cell_loaded_vr/nsfw.dm +++ b/code/modules/projectiles/guns/energy/cell_loaded_vr/nsfw.dm @@ -18,9 +18,6 @@ description_antag = "" allowed_magazines = list(/obj/item/ammo_magazine/cell_mag/combat/prototype) - origin_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 4, TECH_MAGNET = 3) - - // The Magazine // /obj/item/ammo_magazine/cell_mag/combat name = "microbattery magazine" @@ -37,8 +34,6 @@ max_ammo = 2 x_offset = 6 catalogue_data = null - origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3, TECH_MAGNET = 2) - // The Pack // /obj/item/storage/secure/briefcase/nsfw_pack diff --git a/code/modules/projectiles/guns/energy/cell_loaded_vr/nsfw_cells.dm b/code/modules/projectiles/guns/energy/cell_loaded_vr/nsfw_cells.dm index cb6fca8e218..41fb1ad3a1b 100644 --- a/code/modules/projectiles/guns/energy/cell_loaded_vr/nsfw_cells.dm +++ b/code/modules/projectiles/guns/energy/cell_loaded_vr/nsfw_cells.dm @@ -2,7 +2,6 @@ /obj/item/ammo_casing/microbattery/combat name = "\'NSFW\' microbattery - UNKNOWN" desc = "A miniature battery for an energy weapon." - origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 1, TECH_MAGNET = 2) /obj/item/ammo_casing/microbattery/combat/lethal name = "\'NSFW\' microbattery - LETHAL" diff --git a/code/modules/projectiles/guns/energy/crestrose_vr.dm b/code/modules/projectiles/guns/energy/crestrose_vr.dm index ba90763bb7c..9af307534b0 100644 --- a/code/modules/projectiles/guns/energy/crestrose_vr.dm +++ b/code/modules/projectiles/guns/energy/crestrose_vr.dm @@ -8,7 +8,6 @@ item_state = "laser" //placeholder w_class = ITEMSIZE_NORMAL - origin_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 4) slot_flags = null fire_sound = 'sound/weapons/gunshot_light.ogg' load_method = MAGAZINE diff --git a/code/modules/projectiles/guns/energy/cyborg.dm b/code/modules/projectiles/guns/energy/cyborg.dm index 66a17842532..e5a2585d825 100644 --- a/code/modules/projectiles/guns/energy/cyborg.dm +++ b/code/modules/projectiles/guns/energy/cyborg.dm @@ -418,7 +418,6 @@ w_class = ITEMSIZE_NORMAL drop_sound = 'sound/items/drop/metalweapon.ogg' pickup_sound = 'sound/items/pickup/metalweapon.ogg' - origin_tech = list(TECH_COMBAT = 2) attack_verb = list("beaten") var/stunforce = 0 var/agonyforce = 60 diff --git a/code/modules/projectiles/guns/energy/gunsword_vr.dm b/code/modules/projectiles/guns/energy/gunsword_vr.dm index 38769ac6d30..f0780fa21c7 100644 --- a/code/modules/projectiles/guns/energy/gunsword_vr.dm +++ b/code/modules/projectiles/guns/energy/gunsword_vr.dm @@ -10,7 +10,6 @@ item_icons = list(slot_r_hand_str = 'icons/vore/custom_guns_vr.dmi', slot_l_hand_str = 'icons/vore/custom_guns_vr.dmi', "slot_belt" = 'icons/inventory/belt/mob.dmi') w_class = ITEMSIZE_NORMAL - origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 4) projectile_type = /obj/item/projectile/beam/stun fire_sound = 'sound/weapons/taser.ogg' charge_meter = 1 @@ -24,8 +23,6 @@ list(mode_name="lethal", charge_cost=480,projectile_type=/obj/item/projectile/beam/imperial, modifystate="gbuster", fire_sound='sound/weapons/mandalorian.ogg'), ) - - // -----------------gunsword battery-------------------------- /obj/item/cell/device/weapon/gunsword name = "Buster Cell" @@ -41,7 +38,6 @@ throw_speed = 1 throw_range = 5 w_class = ITEMSIZE_SMALL - origin_tech = list(TECH_MAGNET = 3, TECH_COMBAT = 5) var/active = 0 var/active_force = 30 diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index ece4dbb132c..8f6899787b4 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -13,7 +13,6 @@ slot_flags = SLOT_BELT|SLOT_BACK w_class = ITEMSIZE_LARGE force = 10 - origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2) matter = list(MAT_STEEL = 2000) projectile_type = /obj/item/projectile/beam/midlaser one_handed_penalty = 30 @@ -68,7 +67,6 @@ over function - despite their flashy looks, most were completely unremarkable one way or another as weapons and used very standard firing mechanisms." icon_state = "lrifle" item_state = "lrifle" - origin_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 3) /* * Retro Laser Rifle @@ -105,7 +103,6 @@ projectile_type = /obj/item/projectile/beam/cyan cell_type = /obj/item/cell/device/weapon/recharge/alien // Self charges. - origin_tech = list(TECH_COMBAT = 8, TECH_MAGNET = 7) modifystate = "alienpistol" /datum/category_item/catalogue/anomalous/precursor_a/alien_pistol @@ -152,7 +149,6 @@ w_class = ITEMSIZE_NORMAL unacidable = TRUE projectile_type = /obj/item/projectile/beam - origin_tech = null fire_delay = 10 //Old pistol charge_cost = 480 //to compensate a bit for self-recharging cell_type = /obj/item/cell/device/weapon/recharge/captain @@ -270,7 +266,6 @@ icon_state = "lasercannon" item_state = null wielded_item_state = "mhdhowitzer-wielded" //Placeholder - origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3, TECH_POWER = 3) slot_flags = SLOT_BELT|SLOT_BACK projectile_type = /obj/item/projectile/beam/heavylaser/cannon battery_lock = 1 @@ -300,7 +295,6 @@ standard photonic beams, resulting in an effective 'anti-armor' energy weapon." icon_state = "xray" item_state = "xray" - origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 3, TECH_MAGNET = 2) projectile_type = /obj/item/projectile/beam/xray charge_cost = 200 @@ -316,7 +310,6 @@ item_state = "sniper" item_state_slots = list(slot_r_hand_str = "lsniper", slot_l_hand_str = "lsniper") wielded_item_state = "lsniper-wielded" - origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 5, TECH_POWER = 4) projectile_type = /obj/item/projectile/beam/sniper slot_flags = SLOT_BACK actions_types = list(/datum/action/item_action/use_scope) @@ -348,7 +341,6 @@ item_state = "laser" icon_state = "scatter" desc = "A strange Almachi weapon, utilizing a refracting prism to turn a single laser blast into a diverging cluster." - origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 1, TECH_MATERIAL = 4) projectile_type = /obj/item/projectile/scatter/laser @@ -365,7 +357,6 @@ slot_flags = SLOT_BELT w_class = ITEMSIZE_NORMAL force = 10 - origin_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 2) matter = list(MAT_STEEL = 2000) fire_sound = 'sound/weapons/mandalorian.ogg' projectile_type = /obj/item/projectile/beam/imperial @@ -382,7 +373,6 @@ slot_flags = SLOT_BELT|SLOT_BACK w_class = ITEMSIZE_LARGE force = 15 - origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2) matter = list(MAT_STEEL = 2000) projectile_type = /obj/item/projectile/beam/mininglaser @@ -405,7 +395,6 @@ slot_flags = SLOT_BELT w_class = ITEMSIZE_NORMAL force = 8 - origin_tech = list(TECH_COMBAT = 2, TECH_MAGNET = 1) //Older rifle - less tech matter = list(MAT_STEEL = 1500) projectile_type = /obj/item/projectile/beam/midlaser @@ -419,7 +408,6 @@ choice \"fight-stopper\" of barkeeps. One shot is all it takes... so they say." icon_state = "mono" item_state = "shotgun" - origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 4, TECH_POWER = 3) projectile_type = /obj/item/projectile/beam/sniper slot_flags = SLOT_BACK actions_types = list(/datum/action/item_action/aim_down_sights) diff --git a/code/modules/projectiles/guns/energy/netgun.dm b/code/modules/projectiles/guns/energy/netgun.dm index 3b7db0c8f6e..17403617769 100644 --- a/code/modules/projectiles/guns/energy/netgun.dm +++ b/code/modules/projectiles/guns/energy/netgun.dm @@ -11,7 +11,6 @@ item_state = "gun" // Placeholder fire_sound = 'sound/weapons/eluger.ogg' - origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 5, TECH_MAGNET = 3) projectile_type = /obj/item/projectile/beam/energy_net charge_cost = 800 fire_delay = 50 diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index 58ec145f704..20f01ae38b8 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -12,7 +12,6 @@ fire_delay = 8 projectile_type = /obj/item/projectile/beam/stun/med - origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2) modifystate = "egunstun" firemodes = list( @@ -36,7 +35,6 @@ one_handed_penalty = 30 projectile_type = /obj/item/projectile/beam/stun - origin_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 3) modifystate = "riflestun" firemodes = list( @@ -58,7 +56,6 @@ fire_delay = 6 projectile_type = /obj/item/projectile/beam/stun/weak - origin_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 2, TECH_ILLEGAL = 3) modifystate = "energystun" firemodes = list( @@ -86,7 +83,6 @@ fire_delay = 7 projectile_type = /obj/item/projectile/beam/burstlaser - origin_tech = list(TECH_COMBAT = 5, TECH_MAGNET = 3, TECH_ILLEGAL = 4) firemodes = list( list(mode_name="lethal", burst=1, projectile_type=/obj/item/projectile/beam/burstlaser, charge_cost = 200), @@ -106,7 +102,6 @@ fire_sound = 'sound/weapons/taser.ogg' w_class = ITEMSIZE_SMALL projectile_type = /obj/item/projectile/beam/stun/med - origin_tech = list(TECH_COMBAT = 2, TECH_MAGNET = 3) modifystate = "PDWstun" firemodes = list( @@ -127,7 +122,6 @@ battery_lock = 1 // In exchange for balance, you cannot remove the battery. Also there's no sprite for that and I fucking suck at sprites. -Ace projectile_type = /obj/item/projectile/beam/stun/med - origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2, TECH_ILLEGAL = 2) modifystate = "ep08stun" firemodes = list( @@ -151,7 +145,6 @@ desc = "An energy gun with an experimental miniaturized reactor, based on a Lawson Arms platform." icon_state = "nucgunstun" projectile_type = /obj/item/projectile/beam/stun - origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 5, TECH_POWER = 3) slot_flags = SLOT_BELT force = 8 //looks heavier than a pistol w_class = ITEMSIZE_LARGE //Looks bigger than a pistol, too. diff --git a/code/modules/projectiles/guns/energy/particle.dm b/code/modules/projectiles/guns/energy/particle.dm index b51f1ac6bb3..4e01a43a684 100644 --- a/code/modules/projectiles/guns/energy/particle.dm +++ b/code/modules/projectiles/guns/energy/particle.dm @@ -15,7 +15,6 @@ slot_flags = SLOT_BELT w_class = ITEMSIZE_NORMAL projectile_type = /obj/item/projectile/bullet/particle - origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2, TECH_MATERIAL = 2) fire_delay = 10 charge_cost = 200 //slightly more shots than lasers var/safetycatch = 0 //if 1, won't let you fire in pressurised environment, rather than malfunctioning @@ -31,7 +30,6 @@ slot_flags = SLOT_BELT force = 8 //looks heavier than a pistol w_class = ITEMSIZE_LARGE //bigger than a pistol, too. - origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 5, TECH_POWER = 3, TECH_MAGNET = 3) fire_delay = 6 //This one's not a handgun, it should have the same fire delay as everything else self_recharge = 1 modifystate = null @@ -46,7 +44,6 @@ item_state = "heavyparticle" fire_sound = 'sound/weapons/lasercannonfire.ogg' slot_flags = SLOT_BACK - origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 5, TECH_POWER = 4, TECH_MAGNET = 4) projectile_type = /obj/item/projectile/bullet/particle/heavy battery_lock = 1 fire_delay = 15 // fires faster than a laser cannon. c'mon, it's an awesome-but-impractical endgame gun. @@ -161,7 +158,6 @@ icon_state = "pressurelock" desc = "A safety interlock that can be installed in an antiparticle projector. It prevents the weapon from discharging in pressurised environments." w_class = ITEMSIZE_TINY - origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2, TECH_ENGINEERING = 2) // projectiles below diff --git a/code/modules/projectiles/guns/energy/protector_vr.dm b/code/modules/projectiles/guns/energy/protector_vr.dm index f2f6972cfc8..e4941151bc4 100644 --- a/code/modules/projectiles/guns/energy/protector_vr.dm +++ b/code/modules/projectiles/guns/energy/protector_vr.dm @@ -18,7 +18,6 @@ modifystate = "stun" - origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 3, TECH_MAGNET = 2) charge_sections = 3 //For the icon ammo_x_offset = 2 diff --git a/code/modules/projectiles/guns/energy/pummeler_vr.dm b/code/modules/projectiles/guns/energy/pummeler_vr.dm index 0c2346bbfbd..15e5ebf1912 100644 --- a/code/modules/projectiles/guns/energy/pummeler_vr.dm +++ b/code/modules/projectiles/guns/energy/pummeler_vr.dm @@ -20,7 +20,6 @@ charge_cost = 600 - origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_MAGNET = 5) slot_flags = SLOT_BELT|SLOT_BACK w_class = ITEMSIZE_LARGE diff --git a/code/modules/projectiles/guns/energy/pump.dm b/code/modules/projectiles/guns/energy/pump.dm index e0c828e3814..4d5923f8535 100644 --- a/code/modules/projectiles/guns/energy/pump.dm +++ b/code/modules/projectiles/guns/energy/pump.dm @@ -63,7 +63,6 @@ item_state = "phaser" item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_guns_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_guns_vr.dmi', "slot_belt" = 'icons/inventory/belt/mob.dmi') fire_sound = 'sound/weapons/laser2.ogg' - origin_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 2, TECH_POWER = 4) charge_cost = 300 battery_lock = 1 diff --git a/code/modules/projectiles/guns/energy/sickshot_vr.dm b/code/modules/projectiles/guns/energy/sickshot_vr.dm index 760ae37234a..118498d69ac 100644 --- a/code/modules/projectiles/guns/energy/sickshot_vr.dm +++ b/code/modules/projectiles/guns/energy/sickshot_vr.dm @@ -20,7 +20,6 @@ charge_cost = 600 - origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_MAGNET = 2) //Projectile /obj/item/projectile/sickshot diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index c835e376356..e195e2b3c0a 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -5,7 +5,6 @@ icon_state = "ionrifle" item_state = "ionrifle" wielded_item_state = "ionrifle-wielded" - origin_tech = list(TECH_COMBAT = 2, TECH_MAGNET = 4) w_class = ITEMSIZE_LARGE force = 10 slot_flags = SLOT_BACK @@ -30,7 +29,6 @@ desc = "A gun that discharges high amounts of controlled radiation to slowly break a target into component elements." icon_state = "decloner" item_state = "decloner" - origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 4, TECH_POWER = 3) projectile_type = /obj/item/projectile/energy/declone /obj/item/gun/energy/floragun @@ -40,7 +38,6 @@ icon_state = "floramut100" item_state = "floramut" projectile_type = /obj/item/projectile/energy/floramut - origin_tech = list(TECH_MATERIAL = 2, TECH_BIO = 3, TECH_POWER = 3) modifystate = "floramut" cell_type = /obj/item/cell/device/weapon/recharge battery_lock = 1 @@ -166,7 +163,6 @@ desc = "A specialized firearm designed to fire lethal bolts of phoron." icon_state = "toxgun" w_class = ITEMSIZE_NORMAL - origin_tech = list(TECH_COMBAT = 5, TECH_PHORON = 4) projectile_type = /obj/item/projectile/energy/phoron /* Staves */ @@ -181,7 +177,6 @@ w_class = ITEMSIZE_LARGE charge_cost = 480 projectile_type = /obj/item/projectile/change - origin_tech = null cell_type = /obj/item/cell/device/weapon/recharge battery_lock = 1 charge_meter = 0 @@ -238,7 +233,6 @@ battery_lock = 1 accuracy = 75 // Suppressive weapons don't work too well if there's no risk of being hit. burst_delay = 1 // Burst faster than average. - origin_tech = list(TECH_COMBAT = 6, TECH_MAGNET = 6, TECH_ILLEGAL = 6) firemodes = list( list(mode_name="single shot", burst = 1, burst_accuracy = list(75), dispersion = list(0), charge_cost = 24), diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index 1dd45608a4b..6bc6753fc00 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -47,7 +47,6 @@ icon_state = "crossbow" w_class = ITEMSIZE_SMALL item_state = "crossbow" - origin_tech = list(TECH_COMBAT = 2, TECH_MAGNET = 2, TECH_ILLEGAL = 5) matter = list(MAT_STEEL = 2000) slot_flags = SLOT_BELT | SLOT_HOLSTER silenced = 1 @@ -81,7 +80,6 @@ Less well known are RayZar's limited-production experimental projects, often in the form of less-lethal weapon solutions." icon_state = "plasma_stun" item_state = "plasma_stun" - origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2, TECH_POWER = 3) fire_delay = 20 charge_cost = 600 projectile_type = /obj/item/projectile/energy/plasmastun @@ -99,7 +97,6 @@ and the company has been particularly litigious towards any attempted imitators." icon_state = "stunrevolver" item_state = "stunrevolver" - origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_POWER = 2) projectile_type = /obj/item/projectile/energy/electrode/strong charge_cost = 400 @@ -193,7 +190,6 @@ their own variants of the Stun Revolver." icon_state = "vinstunrevolver" item_state = "stunrevolver" - origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_POWER = 2) /* * Snubnose Stun Revolver @@ -209,4 +205,3 @@ icon_state = "snubstunrevolver" item_state = "stunrevolver" w_class = ITEMSIZE_SMALL //small pistol is small - origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_POWER = 2) diff --git a/code/modules/projectiles/guns/energy/temperature.dm b/code/modules/projectiles/guns/energy/temperature.dm index 37777f29df6..52b413ec074 100644 --- a/code/modules/projectiles/guns/energy/temperature.dm +++ b/code/modules/projectiles/guns/energy/temperature.dm @@ -3,7 +3,6 @@ icon_state = "freezegun" desc = "A gun that can add or remove heat from entities it hits. In other words, it can fire 'cold', and 'hot' beams." charge_cost = 240 - origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 4, TECH_POWER = 3, TECH_MAGNET = 2) slot_flags = SLOT_BELT|SLOT_BACK projectile_type = /obj/item/projectile/temp diff --git a/code/modules/projectiles/guns/lasertag.dm b/code/modules/projectiles/guns/lasertag.dm index 338a6bce543..fa3f5e4c309 100644 --- a/code/modules/projectiles/guns/lasertag.dm +++ b/code/modules/projectiles/guns/lasertag.dm @@ -36,7 +36,6 @@ icon = 'icons/obj/gun_toy.dmi' item_state = "omnitag" item_state = "retro" - origin_tech = list(TECH_COMBAT = 1, TECH_MAGNET = 2) matter = list(MAT_STEEL = 2000) projectile_type = /obj/item/projectile/beam/lasertag/omni cell_type = /obj/item/cell/device/weapon/recharge diff --git a/code/modules/projectiles/guns/launcher/confetti.dm b/code/modules/projectiles/guns/launcher/confetti.dm index 25d7c20ec20..2651690b920 100644 --- a/code/modules/projectiles/guns/launcher/confetti.dm +++ b/code/modules/projectiles/guns/launcher/confetti.dm @@ -6,7 +6,6 @@ icon_state = "confetti_cannon" item_state = "confetti_cannon" w_class = ITEMSIZE_NORMAL - origin_tech = list(TECH_COMBAT = 1, TECH_MATERIAL = 2) throw_distance = 7 release_force = 5 var/obj/item/grenade/confetti/party_ball/chambered = null diff --git a/code/modules/projectiles/guns/launcher/rocket.dm b/code/modules/projectiles/guns/launcher/rocket.dm index 2128a493976..d334858d726 100644 --- a/code/modules/projectiles/guns/launcher/rocket.dm +++ b/code/modules/projectiles/guns/launcher/rocket.dm @@ -8,7 +8,6 @@ throw_range = 10 force = 5.0 slot_flags = 0 - origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 5) fire_sound = 'sound/weapons/rpg.ogg' release_force = 15 diff --git a/code/modules/projectiles/guns/magnetic/gasthrower.dm b/code/modules/projectiles/guns/magnetic/gasthrower.dm index 6fc3e590132..55f3b45e7a6 100644 --- a/code/modules/projectiles/guns/magnetic/gasthrower.dm +++ b/code/modules/projectiles/guns/magnetic/gasthrower.dm @@ -7,7 +7,6 @@ wielded_item_state = "bore-wielded" icon = 'icons/obj/railgun.dmi' one_handed_penalty = 20 - origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 4, TECH_ILLEGAL = 2, TECH_PHORON = 4) w_class = ITEMSIZE_LARGE slowdown = 1 diff --git a/code/modules/projectiles/guns/magnetic/magnetic.dm b/code/modules/projectiles/guns/magnetic/magnetic.dm index 3583456aa27..587151bc95e 100644 --- a/code/modules/projectiles/guns/magnetic/magnetic.dm +++ b/code/modules/projectiles/guns/magnetic/magnetic.dm @@ -12,7 +12,6 @@ item_state = "coilgun" icon = 'icons/obj/railgun.dmi' // one_handed_penalty = 15 - origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 4, TECH_ILLEGAL = 2, TECH_MAGNET = 4) w_class = ITEMSIZE_LARGE var/obj/item/cell/cell // Currently installed powercell. @@ -253,7 +252,6 @@ icon_state = "fuelrodgun" item_state = "coilgun" icon = 'icons/obj/railgun.dmi' - origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 4, TECH_PHORON = 4, TECH_ILLEGAL = 5, TECH_MAGNET = 4) w_class = ITEMSIZE_LARGE removable_components = TRUE diff --git a/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm b/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm index ef011100ae9..24da075032c 100644 --- a/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm +++ b/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm @@ -5,7 +5,6 @@ The distribution of MMI weapons is understandably tightly tracked and controlled." gun_unreliable = 0 icon_state = "railgun" - origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 4, TECH_MAGNET = 4) power_cost = 300 w_class = ITEMSIZE_HUGE slot_flags = SLOT_BELT diff --git a/code/modules/projectiles/guns/modular_guns.dm b/code/modules/projectiles/guns/modular_guns.dm index ecb60cf139a..13fc496109a 100644 --- a/code/modules/projectiles/guns/modular_guns.dm +++ b/code/modules/projectiles/guns/modular_guns.dm @@ -153,7 +153,6 @@ icon_state = "mod_pistol" max_components = 6 desc = "A bulky modular pistol frame. This only only accepts six parts." - origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 3) burst_delay = 2 /obj/item/gun/energy/modular/carbine @@ -161,7 +160,6 @@ icon_state = "mod_carbine" max_components = 8 desc = "A modular version of the standard laser carbine. This one can hold 8 components." - origin_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 3, TECH_MATERIAL = 3) burst_delay = 2 /obj/item/gun/energy/modular/cannon @@ -171,5 +169,4 @@ desc = "Say hello, to my little friend!" one_handed_penalty = 4 //dual wielding = no. cell_type = /obj/item/cell //We're bigger. We can use much larger power cells. - origin_tech = list(TECH_COMBAT = 6, TECH_MAGNET = 6, TECH_MATERIAL = 5, TECH_BLUESPACE = 4) //its a damn cannon capable of holding a huge amount of parts. burst_delay = 4 //preventing extreme silliness. diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index 02b8b1080d8..0074d5f1e21 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -2,7 +2,6 @@ name = "gun" desc = "A gun that fires bullets." icon_state = "revolver" - origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2) w_class = ITEMSIZE_NORMAL matter = list(MAT_STEEL = 1000) recoil = 1 diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index f857845b57d..ac70f6572ca 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -27,7 +27,6 @@ w_class = ITEMSIZE_NORMAL load_method = MAGAZINE caliber = "9mm" - origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 2) slot_flags = SLOT_BELT magazine_type = null // R&D builds this. Starts unloaded. allowed_magazines = list(/obj/item/ammo_magazine/m9mmAdvanced, /obj/item/ammo_magazine/m9mm) @@ -59,7 +58,6 @@ w_class = ITEMSIZE_NORMAL force = 10 caliber = "10mm" - origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2, TECH_ILLEGAL = 8) slot_flags = SLOT_BELT|SLOT_BACK load_method = MAGAZINE magazine_type = /obj/item/ammo_magazine/m10mm @@ -99,7 +97,6 @@ w_class = ITEMSIZE_LARGE force = 10 caliber = "5.45mm" - origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 1, TECH_ILLEGAL = 4) slot_flags = SLOT_BACK load_method = MAGAZINE magazine_type = /obj/item/ammo_magazine/m545 @@ -132,7 +129,6 @@ item_state = "c20r" w_class = ITEMSIZE_NORMAL caliber = "9mm" - origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2) slot_flags = SLOT_BELT load_method = MAGAZINE magazine_type = /obj/item/ammo_magazine/m9mmAdvanced @@ -161,7 +157,6 @@ item_state = "wt550" w_class = ITEMSIZE_NORMAL caliber = "9mm" - origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2) slot_flags = SLOT_BELT ammo_type = "/obj/item/ammo_casing/a9mmr" load_method = MAGAZINE @@ -193,7 +188,6 @@ w_class = ITEMSIZE_LARGE force = 10 caliber = "7.62mm" - origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 3) slot_flags = SLOT_BACK load_method = MAGAZINE magazine_type = /obj/item/ammo_magazine/m762 @@ -272,7 +266,6 @@ slot_flags = 0 max_shells = 50 caliber = "5.45mm" - origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 1, TECH_ILLEGAL = 2) slot_flags = SLOT_BACK load_method = MAGAZINE magazine_type = /obj/item/ammo_magazine/m545saw @@ -354,7 +347,6 @@ w_class = ITEMSIZE_LARGE force = 10 caliber = "12g" - origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 1, TECH_ILLEGAL = 4) slot_flags = SLOT_BACK load_method = MAGAZINE magazine_type = /obj/item/ammo_magazine/m12gdrum @@ -389,7 +381,6 @@ w_class = ITEMSIZE_NORMAL load_method = MAGAZINE caliber = ".45" - origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2, TECH_ILLEGAL = 5) magazine_type = /obj/item/ammo_magazine/m45uzi allowed_magazines = list(/obj/item/ammo_magazine/m45uzi) @@ -416,7 +407,6 @@ item_state = "p90" w_class = ITEMSIZE_NORMAL caliber = "9mm" - origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2) slot_flags = SLOT_BELT // ToDo: Belt sprite. load_method = MAGAZINE magazine_type = /obj/item/ammo_magazine/m9mmp90 @@ -441,7 +431,6 @@ item_state = "stg44" w_class = ITEMSIZE_NORMAL caliber = ".45" - origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2, TECH_ILLEGAL = 5) slot_flags = SLOT_BELT // ToDo: Belt sprite. load_method = MAGAZINE magazine_type = /obj/item/ammo_magazine/m45tommy @@ -473,7 +462,6 @@ w_class = ITEMSIZE_LARGE force = 10 caliber = "7.62mm" - origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 1, TECH_ILLEGAL = 4) slot_flags = SLOT_BACK load_method = MAGAZINE magazine_type = /obj/item/ammo_magazine/m762 @@ -511,7 +499,6 @@ w_class = ITEMSIZE_NORMAL load_method = MAGAZINE caliber = "9mm" - origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 4) magazine_type = /obj/item/ammo_magazine/m9mmt allowed_magazines = list(/obj/item/ammo_magazine/m9mmt) diff --git a/code/modules/projectiles/guns/projectile/automatic_vr.dm b/code/modules/projectiles/guns/projectile/automatic_vr.dm index 8b9fb4f792c..30155f7d868 100644 --- a/code/modules/projectiles/guns/projectile/automatic_vr.dm +++ b/code/modules/projectiles/guns/projectile/automatic_vr.dm @@ -16,7 +16,6 @@ recoil = 2 // The battlerifle was known for its nasty recoil. max_shells = 36 caliber = "9.5x40mm" - origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 2) magazine_type = /obj/item/ammo_magazine/m95 allowed_magazines = list(/obj/item/ammo_magazine/m95) fire_sound = 'sound/weapons/battlerifle.ogg' @@ -33,7 +32,6 @@ w_class = ITEMSIZE_LARGE max_shells = 30 caliber = "7.92x33mm" - origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 2, TECH_ILLEGAL = 6) magazine_type = /obj/item/ammo_magazine/mtg allowed_magazines = list(/obj/item/ammo_magazine/mtg) load_method = MAGAZINE @@ -59,7 +57,6 @@ load_method = MAGAZINE multi_aim = 1 burst_delay = 2 - origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 2) firemodes = list( list(mode_name="semiauto", burst=1, fire_delay=0.1, move_delay=null, burst_accuracy=null, dispersion=null), list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0)), @@ -126,7 +123,6 @@ name = "\improper SMG magazine (9mm)" icon = 'icons/obj/ammo_vr.dmi' icon_state = "smg" - origin_tech = list(TECH_COMBAT = 2) mag_type = MAGAZINE matter = list(MAT_STEEL = 1800) caliber = "9mm" diff --git a/code/modules/projectiles/guns/projectile/boltaction.dm b/code/modules/projectiles/guns/projectile/boltaction.dm index 846eda525f7..2a47cef5d53 100644 --- a/code/modules/projectiles/guns/projectile/boltaction.dm +++ b/code/modules/projectiles/guns/projectile/boltaction.dm @@ -17,8 +17,7 @@ item_state = "boltaction" fire_sound = 'sound/weapons/gunshot_generic_rifle.ogg' max_shells = 5 - caliber = "7.62mm" - origin_tech = list(TECH_COMBAT = 1)// Old as shit rifle doesn't have very good tech. + caliber = "7.62mm"// Old as shit rifle doesn't have very good tech. ammo_type = /obj/item/ammo_casing/a762 load_method = SINGLE_CASING|SPEEDLOADER action_sound = 'sound/weapons/riflebolt.ogg' @@ -108,8 +107,7 @@ fire_sound = 'sound/weapons/gunshot_generic_rifle.ogg' max_shells = 4 slot_flags = null - caliber = "7.62mm" - origin_tech = list(TECH_COMBAT = 1) // Old(er) as shit rifle doesn't have very good tech. + caliber = "7.62mm" // Old(er) as shit rifle doesn't have very good tech. ammo_type = /obj/item/ammo_casing/a762 load_method = SINGLE_CASING|SPEEDLOADER action_sound = 'sound/weapons/riflebolt.ogg' @@ -134,8 +132,7 @@ item_state = "boltaction_scoped" fire_sound = 'sound/weapons/gunshot_generic_rifle.ogg' max_shells = 5 - caliber = "7.62mm" - origin_tech = list(TECH_COMBAT = 2)// Old as shit rifle doesn't have very good tech, but it does have a scope. + caliber = "7.62mm"// Old as shit rifle doesn't have very good tech, but it does have a scope. ammo_type = /obj/item/ammo_casing/a762 load_method = SINGLE_CASING|SPEEDLOADER action_sound = 'sound/weapons/riflebolt.ogg' diff --git a/code/modules/projectiles/guns/projectile/caseless.dm b/code/modules/projectiles/guns/projectile/caseless.dm index 41ba554fbdc..bb8b02d70c7 100644 --- a/code/modules/projectiles/guns/projectile/caseless.dm +++ b/code/modules/projectiles/guns/projectile/caseless.dm @@ -7,7 +7,6 @@ item_state = "caseless" w_class = ITEMSIZE_LARGE caliber = "5mm caseless" - origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 3) slot_flags = SLOT_BACK load_method = MAGAZINE magazine_type = null // R&D builds this. Starts unloaded. diff --git a/code/modules/projectiles/guns/projectile/dartgun.dm b/code/modules/projectiles/guns/projectile/dartgun.dm index bdad9ef996d..4fc0dfdf5b3 100644 --- a/code/modules/projectiles/guns/projectile/dartgun.dm +++ b/code/modules/projectiles/guns/projectile/dartgun.dm @@ -34,7 +34,6 @@ desc = "A rack of hollow darts." icon_state = "darts" item_state = "rcdammo" - origin_tech = list(TECH_MATERIAL = 2) mag_type = MAGAZINE caliber = "dart" ammo_type = /obj/item/ammo_casing/chemdart @@ -49,7 +48,6 @@ icon_state = "dartgun-empty" item_state = null var/base_state = "dartgun" - origin_tech = list(TECH_COMBAT = 7, TECH_MATERIAL = 6, TECH_BIO = 5, TECH_MAGNET = 2, TECH_ILLEGAL = 3) caliber = "dart" fire_sound = 'sound/weapons/empty.ogg' @@ -218,7 +216,6 @@ allowed_magazines = list(/obj/item/ammo_magazine/chemdart) default_magazine_casing_count = 3 max_beakers = 2 - origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 4, TECH_BIO = 4, TECH_MAGNET = 2, TECH_ILLEGAL = 1) /obj/item/ammo_casing/chemdart/small name = "short chemical dart" @@ -232,7 +229,6 @@ desc = "A rack of hollow darts." icon_state = "darts_small" item_state = "rcdammo" - origin_tech = list(TECH_MATERIAL = 2) mag_type = MAGAZINE caliber = "dart" ammo_type = /obj/item/ammo_casing/chemdart/small diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index be974e4f0bb..a195ad0d7e2 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -10,7 +10,6 @@ projectile_type = /obj/item/projectile/bullet/pistol/medium icon_state = "colt" caliber = ".45" - origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2) load_method = MAGAZINE /obj/item/gun/projectile/colt/update_icon() @@ -85,7 +84,6 @@ allowed_magazines = list(/obj/item/ammo_magazine/m45) projectile_type = /obj/item/projectile/bullet/pistol/medium caliber = ".45" - origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2) load_method = MAGAZINE /obj/item/gun/projectile/sec/update_icon() @@ -122,7 +120,6 @@ silenced = 1 fire_delay = 1 recoil = 0 - origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2, TECH_ILLEGAL = 8) load_method = MAGAZINE magazine_type = /obj/item/ammo_magazine/m45 allowed_magazines = list(/obj/item/ammo_magazine/m45) @@ -183,7 +180,6 @@ max_shells = 8 caliber = ".75" fire_sound = 'sound/weapons/railgun.ogg' - origin_tech = list(TECH_COMBAT = 3) ammo_type = "/obj/item/ammo_casing/a75" load_method = MAGAZINE magazine_type = /obj/item/ammo_magazine/m75 @@ -219,7 +215,6 @@ w_class = ITEMSIZE_SMALL caliber = "9mm" silenced = 0 - origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2, TECH_ILLEGAL = 2) load_method = MAGAZINE magazine_type = /obj/item/ammo_magazine/m9mm/compact allowed_magazines = list(/obj/item/ammo_magazine/m9mm/compact) @@ -278,7 +273,6 @@ item_state = null caliber = "9mm" silenced = 0 - origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2, TECH_ILLEGAL = 2) load_method = MAGAZINE magazine_type = /obj/item/ammo_magazine/m9mm allowed_magazines = list(/obj/item/ammo_magazine/m9mm) @@ -351,7 +345,6 @@ icon_state = "derringer" item_state = "concealed" w_class = ITEMSIZE_SMALL - origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2, TECH_ILLEGAL = 3) handle_casings = CYCLE_CASINGS //player has to take the old casing out manually before reloading load_method = SINGLE_CASING max_shells = 2 @@ -371,7 +364,6 @@ same cannot be said for the hundreds of low-grade (But technically legal) copies circulating the squalid habitats and smoke-filled \ junk ships of the frontier." icon_state = "p08a" - origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2) caliber = "9mm" load_method = MAGAZINE magazine_type = /obj/item/ammo_magazine/m9mm/luger @@ -399,7 +391,6 @@ name = "9mm pistol" desc = "A widespread MarsTech sidearm called the P92X which is used by military, police, and security forces across the galaxy. Uses 9mm rounds." icon_state = "p92x" - origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2) caliber = "9mm" load_method = MAGAZINE magazine_type = /obj/item/ammo_magazine/m9mm @@ -441,7 +432,6 @@ load_method = MAGAZINE w_class = ITEMSIZE_SMALL fire_sound = 'sound/weapons/gunshot_pathetic.ogg' - origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 3) /obj/item/gun/projectile/giskard/update_icon() ..() @@ -482,7 +472,6 @@ projectile_type = /obj/item/projectile/bullet/pistol/medium load_method = MAGAZINE w_class = ITEMSIZE_SMALL - origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2) /obj/item/gun/projectile/makarov/update_icon() if(ammo_magazine) @@ -506,7 +495,6 @@ projectile_type = /obj/item/projectile/bullet/pistol/medium load_method = MAGAZINE w_class = ITEMSIZE_NORMAL - origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2) /obj/item/gun/projectile/n99/update_icon() if(ammo_magazine) @@ -538,7 +526,6 @@ projectile_type = /obj/item/projectile/bullet/pistol/medium load_method = MAGAZINE w_class = ITEMSIZE_NORMAL - origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2) /obj/item/gun/projectile/ecureuil/update_icon() if(ammo_magazine) @@ -580,7 +567,6 @@ load_method = MAGAZINE auto_eject = 1 auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg' - origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 4) /obj/item/gun/projectile/lamia/update_icon() cut_overlays() diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index c7cb8ec82c2..005c41c4f3e 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -11,7 +11,6 @@ icon_state = "revolver" item_state = "revolver" caliber = ".357" - origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2) handle_casings = CYCLE_CASINGS max_shells = 6 ammo_type = /obj/item/ammo_casing/a357 @@ -53,7 +52,6 @@ description_fluff = "The leading civilian-sector high-quality small arms brand of Hephaestus Industries, MarsTech has been the provider of choice for law enforcement and security forces for over 300 years." icon_state = "detective" caliber = ".38" - origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2) ammo_type = /obj/item/ammo_casing/a38 /obj/item/gun/projectile/revolver/detective/verb/rename_gun() @@ -79,7 +77,6 @@ desc = "A basic revolver, popular among some law enforcement agencies for its simple, long-lasting construction, modified for .45 rounds and a seven-shot cylinder." icon_state = "detective" caliber = ".45" - origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2) ammo_type = /obj/item/ammo_casing/a45/rubber max_shells = 6 @@ -132,7 +129,6 @@ name = "Lombardi Buzzard" desc = "A rugged revolver that is mostly used by small law enforcement agencies across the frontier as a cheap, reliable sidearm. Uses .357 rounds." icon_state = "lombardi_police" - origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2) /obj/item/gun/projectile/revolver/lombardi/panther name = "Lombardi Panther" @@ -153,7 +149,6 @@ MarsTech has been the provider of choice for law enforcement and security forces for over 300 years." icon_state = "captains_peacemaker" caliber = ".44" - origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2) ammo_type = /obj/item/ammo_casing/a44 /* @@ -164,7 +159,6 @@ desc = "This unique looking handgun is named after an Italian company famous for the original manufacture of \ these revolvers, and pasta kneading machines. Uses .357 rounds." // Yes I'm serious. -Spades icon_state = "mateba" - origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2) /* * Deckard (Blade Runner) @@ -174,7 +168,6 @@ desc = "A custom-built revolver, based off the semi-popular Detective Special model. Uses .38-Special rounds." icon_state = "deckard-empty" caliber = ".38" - origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2) ammo_type = /obj/item/ammo_casing/a38 /obj/item/gun/projectile/revolver/deckard/emp @@ -205,7 +198,6 @@ 'independent roughneck' demographic." icon_state = "judge" caliber = "12g" - origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2, TECH_ILLEGAL = 4) max_shells = 5 recoil = 2 // ow my fucking hand accuracy = -15 // smooth bore + short barrel = shit accuracy @@ -225,7 +217,6 @@ the Mako was a notable exception, so original examples are much sought after." icon_state = "combatrevolver" item_state = "revolver" - origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2) handle_casings = CYCLE_CASINGS max_shells = 9 caliber = ".38" @@ -323,7 +314,6 @@ icon_state = "webley2" item_state = "webley2" caliber = ".44" - origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2) handle_casings = CYCLE_CASINGS ammo_type = /obj/item/ammo_casing/a44 @@ -336,7 +326,6 @@ icon_state = "inspector" item_state = "revolver" caliber = ".44" - origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3) handle_casings = CYCLE_CASINGS ammo_type = /obj/item/ammo_casing/a44/rubber diff --git a/code/modules/projectiles/guns/projectile/revolver_vr.dm b/code/modules/projectiles/guns/projectile/revolver_vr.dm index ae7c759bb8d..1bd1951c510 100644 --- a/code/modules/projectiles/guns/projectile/revolver_vr.dm +++ b/code/modules/projectiles/guns/projectile/revolver_vr.dm @@ -9,7 +9,6 @@ /obj/item/ammo_magazine/m380 name = "magazine (.380)" icon_state = "m92" - origin_tech = list(TECH_COMBAT = 2) mag_type = MAGAZINE matter = list(MAT_STEEL = 480) caliber = ".380" diff --git a/code/modules/projectiles/guns/projectile/semiauto.dm b/code/modules/projectiles/guns/projectile/semiauto.dm index b341ce9f682..4ae3a626580 100644 --- a/code/modules/projectiles/guns/projectile/semiauto.dm +++ b/code/modules/projectiles/guns/projectile/semiauto.dm @@ -14,7 +14,6 @@ item_state = "rifle" w_class = ITEMSIZE_LARGE caliber = "7.62mm" - origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2) slot_flags = SLOT_BACK //fire_sound = 'sound/weapons/rifleshot.ogg' load_method = MAGAZINE // ToDo: Make it so MAGAZINE, SPEEDLOADER and SINGLE_CASING can all be used on the same gun. @@ -47,7 +46,6 @@ item_state = "rifle" w_class = ITEMSIZE_LARGE caliber = ".44" - origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2) slot_flags = SLOT_BACK handle_casings = CYCLE_CASINGS load_method = SINGLE_CASING|SPEEDLOADER diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index 85a59728540..66d8ba5b01a 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -14,7 +14,6 @@ force = 10 slot_flags = SLOT_BACK caliber = "12g" - origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 2) load_method = SINGLE_CASING|SPEEDLOADER ammo_type = /obj/item/ammo_casing/a12g/beanbag projectile_type = /obj/item/projectile/bullet/shotgun @@ -89,7 +88,6 @@ branding for its military-grade equipment used by armed forces across human space." icon_state = "cshotgun" item_state = "cshotgun" - origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2) max_shells = 7 //match the ammo box capacity, also it can hold a round in the chamber anyways, for a total of 8. ammo_type = /obj/item/ammo_casing/a12g load_method = SINGLE_CASING|SPEEDLOADER @@ -115,7 +113,6 @@ force = 10 slot_flags = SLOT_BACK caliber = "12g" - origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 1) ammo_type = /obj/item/ammo_casing/a12g/beanbag var/unique_reskin @@ -233,7 +230,6 @@ item_state = "shotgun" w_class = ITEMSIZE_LARGE caliber = "12g" - origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2) slot_flags = SLOT_BACK load_method = SINGLE_CASING max_shells = 5 diff --git a/code/modules/projectiles/guns/projectile/shotgun_vr.dm b/code/modules/projectiles/guns/projectile/shotgun_vr.dm index 5797c1a4c7e..93a558c250a 100644 --- a/code/modules/projectiles/guns/projectile/shotgun_vr.dm +++ b/code/modules/projectiles/guns/projectile/shotgun_vr.dm @@ -29,7 +29,6 @@ force = 10 slot_flags = SLOT_BELT|SLOT_BACK caliber = "12g" - origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2) load_method = SINGLE_CASING|SPEEDLOADER handle_casings = EJECT_CASINGS //However, it's semi-automatic to make up for that ammo_type = /obj/item/ammo_casing/a12g diff --git a/code/modules/projectiles/guns/projectile/smartgun.dm b/code/modules/projectiles/guns/projectile/smartgun.dm index 609d1f11c22..ac28a700507 100644 --- a/code/modules/projectiles/guns/projectile/smartgun.dm +++ b/code/modules/projectiles/guns/projectile/smartgun.dm @@ -9,7 +9,6 @@ icon_state = "smartgun" icon_override = 'icons/obj/guns/projectile/smartgun_mob.dmi' item_state = "smartgun" - origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 6, TECH_BLUESPACE = 4) w_class = ITEMSIZE_LARGE matter = list(MAT_STEEL = 6000, MAT_DIAMOND = 2000, MAT_URANIUM = 2000) recoil = 1 diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm index eac6cfb3dcf..ee2448fe6e3 100644 --- a/code/modules/projectiles/guns/projectile/sniper.dm +++ b/code/modules/projectiles/guns/projectile/sniper.dm @@ -10,7 +10,6 @@ force = 10 slot_flags = SLOT_BACK actions_types = list(/datum/action/item_action/use_scope) - origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 2, TECH_ILLEGAL = 8) caliber = "14.5mm" recoil = 5 //extra kickback handle_casings = HOLD_CASINGS @@ -88,7 +87,6 @@ force = 10 slot_flags = SLOT_BACK // Needs a sprite. actions_types = list(/datum/action/item_action/use_scope) - origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 2, TECH_ILLEGAL = 8) caliber = "7.62mm" load_method = MAGAZINE accuracy = -45 //shooting at the hip diff --git a/code/modules/projectiles/guns/toy.dm b/code/modules/projectiles/guns/toy.dm index c481d18c9d1..a23fbb8a259 100644 --- a/code/modules/projectiles/guns/toy.dm +++ b/code/modules/projectiles/guns/toy.dm @@ -25,7 +25,6 @@ icon_state = "cap_gun" item_state = "revolver" caliber = "caps" - origin_tech = list(TECH_COMBAT = 1, TECH_MATERIAL = 1) ammo_type = /obj/item/ammo_casing/cap projectile_type = /obj/item/projectile/bullet/cap matter = list(MAT_STEEL = 1000) @@ -46,7 +45,6 @@ force = 2 slot_flags = null caliber = "foam" - origin_tech = list(TECH_COMBAT = 1, TECH_MATERIAL = 1) load_method = SINGLE_CASING ammo_type = /obj/item/ammo_casing/afoam_dart projectile_type = /obj/item/projectile/bullet/foam_dart @@ -80,7 +78,6 @@ allowed_magazines = list(/obj/item/ammo_magazine/mfoam_dart/pistol) projectile_type = /obj/item/projectile/bullet/foam_dart caliber = "foam" - origin_tech = list(TECH_COMBAT = 1, TECH_MATERIAL = 1) load_method = MAGAZINE matter = list(MAT_PLASTIC = 1000) recoil = null //it's a toy @@ -129,7 +126,6 @@ caliber = "foam" ammo_type = /obj/item/ammo_casing/afoam_dart projectile_type = /obj/item/projectile/bullet/foam_dart - origin_tech = list(TECH_COMBAT = 1, TECH_MATERIAL = 1) load_method = SINGLE_CASING max_shells = 6 matter = list(MAT_PLASTIC = 1000) @@ -191,7 +187,6 @@ caliber = "foam" w_class = ITEMSIZE_NORMAL load_method = MAGAZINE - origin_tech = list(TECH_COMBAT = 1, TECH_MATERIAL = 1) slot_flags = SLOT_BELT magazine_type = /obj/item/ammo_magazine/mfoam_dart/smg allowed_magazines = list(/obj/item/ammo_magazine/mfoam_dart/smg) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 8d7a2caa5fc..113a3bf06dc 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -224,7 +224,6 @@ icon_state = "autoinjector" amount_per_transfer_from_this = 15 volume = 15 - origin_tech = list(TECH_BIO = 4) filled_reagents = list(REAGENT_ID_INAPROVALINE = 15) /obj/item/reagent_containers/hypospray/autoinjector/biginjector/empty //for the autolathe diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index f07573edee5..fefe2a980e8 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -179,7 +179,6 @@ w_class = ITEMSIZE_NORMAL max_transfer_amount = null volume = 600 - origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_ENGINEERING = 3) /obj/item/reagent_containers/spray/chemsprayer/Spray_at(atom/A as mob|obj, mob/user) playsound(src, 'sound/effects/spray3.ogg', rand(50,1), -6) diff --git a/code/modules/resleeving/circuitboards.dm b/code/modules/resleeving/circuitboards.dm index 23b3a7bf62f..8f346dd82ac 100644 --- a/code/modules/resleeving/circuitboards.dm +++ b/code/modules/resleeving/circuitboards.dm @@ -6,7 +6,6 @@ name = T_BOARD("grower pod") board_type = new /datum/frame/frame_types/machine build_path = /obj/machinery/clonepod/transhuman - origin_tech = list(TECH_DATA = 3, TECH_BIO = 3) req_components = list( /obj/item/stack/cable_coil = 2, /obj/item/stock_parts/scanning_module = 2, @@ -17,7 +16,6 @@ name = T_BOARD("SynthFab 3000") board_type = new /datum/frame/frame_types/machine build_path = /obj/machinery/transhuman/synthprinter - origin_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 3) req_components = list( /obj/item/stack/cable_coil = 2, /obj/item/stock_parts/matter_bin = 1, @@ -28,7 +26,6 @@ name = T_BOARD("resleeving pod") board_type = new /datum/frame/frame_types/machine build_path = /obj/machinery/transhuman/resleever - origin_tech = list(TECH_ENGINEERING = 4, TECH_BIO = 4) req_components = list( /obj/item/stack/cable_coil = 2, /obj/item/stock_parts/scanning_module = 2, @@ -38,10 +35,7 @@ /obj/item/circuitboard/resleeving_control name = T_BOARD("resleeving control console") build_path = /obj/machinery/computer/transhuman/resleeving - origin_tech = list(TECH_DATA = 5) - /obj/item/circuitboard/body_designer name = T_BOARD("body design console") build_path = /obj/machinery/computer/transhuman/designer - origin_tech = list(TECH_DATA = 5) diff --git a/code/modules/resleeving/sleevecard.dm b/code/modules/resleeving/sleevecard.dm index ca30bf0bf3c..f48c55381ce 100644 --- a/code/modules/resleeving/sleevecard.dm +++ b/code/modules/resleeving/sleevecard.dm @@ -2,7 +2,6 @@ name = "sleevecard" desc = "This upgraded pAI module has enough capacity to run a whole mind of human-level intelligence." catalogue_data = list(/datum/category_item/catalogue/technology/resleeving) - origin_tech = list(TECH_DATA = 2) show_messages = 0 matter = list(MAT_STEEL = 4000, MAT_GLASS = 4000) has_emag_toolkit = FALSE // sleevecards don't have multitools or signalers, you can just change their laws diff --git a/code/modules/rogueminer_vr/zone_console.dm b/code/modules/rogueminer_vr/zone_console.dm index a97227f81ac..dd02bdb4d46 100644 --- a/code/modules/rogueminer_vr/zone_console.dm +++ b/code/modules/rogueminer_vr/zone_console.dm @@ -146,7 +146,6 @@ /obj/item/circuitboard/roguezones name = T_BOARD("asteroid belt scanning computer") build_path = /obj/machinery/computer/roguezones - origin_tech = list(TECH_DATA = 3, TECH_BLUESPACE = 1) hidden = TRUE // Might have issues on maps without belters? /obj/item/paper/rogueminer diff --git a/code/modules/samples/samples.dm b/code/modules/samples/samples.dm index ee73722405c..04d9d96073c 100644 --- a/code/modules/samples/samples.dm +++ b/code/modules/samples/samples.dm @@ -6,10 +6,8 @@ w_class = ITEMSIZE_TINY var/tech_level = 0 //base level var/rand_level = 0 //random level between 0 and this value is added during spawn, if the techgroup is randomized - var/fixed_tech = null //do we have a predetermined tech-group, per request? if so, overrides randomization for icon and name - var/rand_tech = null //randomized tech-group from the list below - var/list/valid_techs = list(TECH_COMBAT,TECH_MAGNET,TECH_POWER,TECH_BIO,TECH_DATA,TECH_ENGINEERING,TECH_PHORON,TECH_MATERIAL,TECH_BLUESPACE,TECH_ILLEGAL,TECH_ARCANE,TECH_PRECURSOR) var/supply_value = 5 + var/fixed_name = FALSE persist_storable = FALSE //don't shove hazardous shinies into the item bank!! also their properties are (usually) randomized on creation, so saving them is pointless-- you won't get out what you put in @@ -26,16 +24,7 @@ /obj/item/research_sample/Initialize(mapload) . = ..() - var/new_tech - if(LAZYLEN(origin_tech)) - new_tech = origin_tech.Copy() - else - new_tech = list() - var/tech_mod = rand(0, rand_level) - var/tech_value = tech_level + tech_mod - if(fixed_tech) - LAZYSET(new_tech, fixed_tech, tech_value) - else //if we're not a preset, randomize the name, icon, and associated tech, to make sure samples aren't predictable/metagamable + if(!fixed_name) var/name_prefix = "[pick("strange","anomalous","exotic","atypical","unusual","incongruous","weird","aberrant","eccentric")]" var/name_suffix //blank because it's randomized per sample appearance var/sample_icon = rand(1,10) @@ -66,9 +55,6 @@ else //none name_suffix = "[pick("object","sample","thing","fragment","specimen","element","alloy","chunk","remnant","scrap","sliver")]" name = "[name_prefix] [name_suffix]" - rand_tech = pick(valid_techs) //assign techs last - LAZYSET(new_tech, rand_tech, tech_value) - origin_tech = new_tech AddElement(/datum/element/sellable/research_sample) /obj/item/research_sample/attack_hand(mob/user) @@ -212,22 +198,11 @@ SC.update_icon() to_chat(user, span_notice("You store \the [src] in \the [SC].")) - if(istype(P, /obj/item/cataloguer)) - to_chat(user, span_notice("You start to scan \the [src] with \the [P]...")) - if(do_after(user, 2 SECONDS, target = src)) - to_chat(user, span_notice("\The [src] seems to have [origin_tech[1]] properties?")) - /obj/item/research_sample/common - tech_level = 2 //2~3 - rand_level = 1 - valid_techs = list(TECH_COMBAT,TECH_MAGNET,TECH_POWER,TECH_BIO,TECH_DATA,TECH_ENGINEERING,TECH_PHORON,TECH_MATERIAL) catalogue_data = list(/datum/category_item/catalogue/information/research_sample/common) supply_value = 15 /obj/item/research_sample/uncommon - tech_level = 4 //4~6 - rand_level = 2 - valid_techs = list(TECH_COMBAT,TECH_MAGNET,TECH_POWER,TECH_BIO,TECH_DATA,TECH_ENGINEERING,TECH_PHORON,TECH_MATERIAL,TECH_BLUESPACE,TECH_ILLEGAL) catalogue_data = list(/datum/category_item/catalogue/information/research_sample/uncommon) supply_value = 35 @@ -241,9 +216,6 @@ resource_list = list(/obj/item/ore/phoron,/obj/item/ore/silver,/obj/item/ore/gold,/obj/item/ore/osmium,/obj/item/ore/diamond) /obj/item/research_sample/rare - tech_level = 6 //6~8 - rand_level = 2 - valid_techs = list(TECH_COMBAT,TECH_MAGNET,TECH_POWER,TECH_BIO,TECH_DATA,TECH_ENGINEERING,TECH_PHORON,TECH_MATERIAL,TECH_BLUESPACE,TECH_ILLEGAL,TECH_ARCANE,TECH_PRECURSOR) catalogue_data = list(/datum/category_item/catalogue/information/research_sample/rare) supply_value = 75 @@ -260,9 +232,7 @@ name = "bluespace anomaly" desc = "A small, solidified fragment of bluespace? It shimmers in and out of phase with reality, flickering ominously." icon_state = "sample_bluespace" - tech_level = 6 //always 6 - rand_level = 0 - fixed_tech = TECH_BLUESPACE + fixed_name = TRUE var/lightcolor = "#0066CC" catalogue_data = list(/datum/category_item/catalogue/information/research_sample/bluespace) supply_value = 100 diff --git a/code/modules/shieldgen/handheld_defuser.dm b/code/modules/shieldgen/handheld_defuser.dm index 3ad925f1973..0efab3b2f50 100644 --- a/code/modules/shieldgen/handheld_defuser.dm +++ b/code/modules/shieldgen/handheld_defuser.dm @@ -4,7 +4,6 @@ description_info = "This device disrupts shields on directly adjacent tiles (in a + shaped pattern), in a similar way the floor mounted variant does. It is, however, portable and run by an internal battery. Can be recharged with a regular recharger." icon = 'icons/obj/machines/shielding.dmi' icon_state = "hdiffuser_off" - origin_tech = list(TECH_MAGNET = 5, TECH_POWER = 5, TECH_ILLEGAL = 2) var/obj/item/cell/device/cell var/enabled = 0 diff --git a/code/modules/telesci/bscyrstal.dm b/code/modules/telesci/bscyrstal.dm index ffb2d1bb565..d7c3feb7806 100644 --- a/code/modules/telesci/bscyrstal.dm +++ b/code/modules/telesci/bscyrstal.dm @@ -6,7 +6,6 @@ icon = 'icons/obj/telescience.dmi' icon_state = "bluespace_crystal" w_class = ITEMSIZE_TINY - origin_tech = list(TECH_BLUESPACE = 6, TECH_MATERIAL = 3) var/blink_range = 8 // The teleport range when crushed/thrown at someone. /obj/item/bluespace_crystal/Initialize(mapload) @@ -45,5 +44,4 @@ /obj/item/bluespace_crystal/artificial name = "artificial bluespace crystal" desc = "An artificially made bluespace crystal, it looks delicate." - origin_tech = list(TECH_BLUESPACE = 3, TECH_PHORON = 4) blink_range = 4 // Not as good as the organic stuff! diff --git a/code/modules/telesci/construction.dm b/code/modules/telesci/construction.dm index 4e2bab30a63..81497c6dba9 100644 --- a/code/modules/telesci/construction.dm +++ b/code/modules/telesci/construction.dm @@ -7,13 +7,11 @@ /obj/item/circuitboard/telesci_console name = T_BOARD("Telepad Control Console") build_path = /obj/machinery/computer/telescience - origin_tech = list(TECH_DATA = 3, TECH_BLUESPACE = 3, TECH_PHORON = 4) /obj/item/circuitboard/telesci_pad name = T_BOARD("Telepad") board_type = new /datum/frame/frame_types/machine build_path = /obj/machinery/telepad - origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4, TECH_PHORON = 4, TECH_BLUESPACE = 5) req_components = list( /obj/item/bluespace_crystal = 1, /obj/item/stock_parts/capacitor = 2, @@ -25,7 +23,6 @@ name = T_BOARD("quantum pad") board_type = new /datum/frame/frame_types/machine build_path = /obj/machinery/power/quantumpad - origin_tech = list(TECH_ENGINEERING = 4, TECH_POWER = 4, TECH_BLUESPACE = 4) req_components = list( /obj/item/bluespace_crystal = 1, /obj/item/stock_parts/capacitor = 1, diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index e571aee53ee..55d3bc8b87b 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -166,7 +166,6 @@ icon_state = "joanaria" icon_override = 'icons/vore/custom_items_vr.dmi' item_state = "joanariamob" - origin_tech = "materials=7" force = 15 sharp = TRUE edge = TRUE @@ -200,8 +199,6 @@ desc = "A sword that can not only cut down your enemies, it can also cut fabric really neatly" icon = 'icons/vore/custom_items_vr.dmi' icon_state = "scisword" - origin_tech = "materials=7" - //john.wayne9392:Harmony Prechtl /obj/item/twohanded/fireaxe/fluff/mjollnir @@ -209,7 +206,6 @@ desc = "Large hammer that looks like it can do a great deal of damage if properly used." icon = 'icons/vore/custom_items_vr.dmi' icon_state = "harmonymjollnir" - origin_tech = "materials=7" attack_verb = list("attacked", "hammered", "smashed", "slammed", "crushed") //JoanRisu:Joan Risu @@ -962,7 +958,6 @@ edge = FALSE throwforce = 7 w_class = ITEMSIZE_HUGE - origin_tech = list(TECH_COMBAT = 2) attack_verb = list("beaten") lightcolor = "#CC33FF" @@ -1119,7 +1114,6 @@ throw_speed = 1 throw_range = 5 w_class = ITEMSIZE_SMALL - origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 1) item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_melee_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_melee_vr.dmi', slot_back_str = 'icons/vore/custom_items_vr.dmi', slot_wear_suit_str = 'icons/vore/custom_items_vr.dmi') var/active_state = "wolfgirlsword" allowed = list(/obj/item/shield/fluff/wolfgirlshield) @@ -1461,7 +1455,6 @@ icon_state = "claws" drop_sound = null pickup_sound = null - origin_tech = null matter = null //Coolcrow420 - Jade Davis diff --git a/code/modules/vore/mouseray.dm b/code/modules/vore/mouseray.dm index 25234243ef1..2d459a6bf5c 100644 --- a/code/modules/vore/mouseray.dm +++ b/code/modules/vore/mouseray.dm @@ -8,7 +8,6 @@ fire_sound = 'sound/weapons/wave.ogg' charge_cost = 240 projectile_type = /obj/item/projectile/beam/mouselaser - origin_tech = list(TECH_BLUESPACE = 4) battery_lock = 1 firemodes = list() var/tf_type = /mob/living/simple_mob/animal/passive/mouse //This type is what kind of mob it will try to turn people into! diff --git a/code/modules/vore/resizing/sizegun_slow_vr.dm b/code/modules/vore/resizing/sizegun_slow_vr.dm index 9deb0c8a899..0cc70c7c55b 100644 --- a/code/modules/vore/resizing/sizegun_slow_vr.dm +++ b/code/modules/vore/resizing/sizegun_slow_vr.dm @@ -8,7 +8,6 @@ icon_state = "sizegun-old-0" var/base_icon_state = "sizegun-old" w_class = ITEMSIZE_NORMAL - origin_tech = list(TECH_BLUESPACE = 4) force = 0 slot_flags = SLOT_BELT var/beam_range = 4 // How many tiles away it can scan. Changing this also changes the box size. diff --git a/code/modules/vore/resizing/sizegun_vr.dm b/code/modules/vore/resizing/sizegun_vr.dm index e3f4d14c931..66292132292 100644 --- a/code/modules/vore/resizing/sizegun_vr.dm +++ b/code/modules/vore/resizing/sizegun_vr.dm @@ -11,7 +11,6 @@ fire_sound = 'sound/weapons/wave.ogg' charge_cost = 240 projectile_type = /obj/item/projectile/beam/sizelaser - origin_tech = list(TECH_BLUESPACE = 4) modifystate = "sizegun-shrink" battery_lock = 1 var/backfire = 0 diff --git a/code/modules/xenoarcheaology/effect_master.dm b/code/modules/xenoarcheaology/effect_master.dm index 0e7ed63c593..dfa46cb489d 100644 --- a/code/modules/xenoarcheaology/effect_master.dm +++ b/code/modules/xenoarcheaology/effect_master.dm @@ -21,31 +21,6 @@ /atom/proc/become_anomalous() if(!is_anomalous()) AddComponent(/datum/component/artifact_master) - if(istype(src, /obj/item)) - var/obj/item/I = src - var/list/new_tech - if(I.origin_tech) - new_tech = I.origin_tech.Copy() - else - new_tech = list() - if(prob(50)) - new_tech[TECH_PRECURSOR] += 1 - else - new_tech[TECH_ARCANE] += 1 - var/rand_tech = pick(\ - TECH_MATERIAL,\ - TECH_ENGINEERING,\ - TECH_PHORON,\ - TECH_POWER,\ - TECH_BLUESPACE,\ - TECH_BIO,\ - TECH_COMBAT,\ - TECH_MAGNET,\ - TECH_DATA,\ - TECH_ILLEGAL\ - ) - LAZYSET(new_tech, rand_tech, rand(4,7)) - I.origin_tech = new_tech /datum/component/artifact_master var/atom/holder diff --git a/code/modules/xenoarcheaology/finds/Weapons/archeo_melee.dm b/code/modules/xenoarcheaology/finds/Weapons/archeo_melee.dm index 336c4768614..34ccb9cbfdc 100644 --- a/code/modules/xenoarcheaology/finds/Weapons/archeo_melee.dm +++ b/code/modules/xenoarcheaology/finds/Weapons/archeo_melee.dm @@ -15,7 +15,6 @@ name = "artifact blade" desc = "A mysterious blade that emanates terrifying power" icon_state = "cultblade" - origin_tech = list(TECH_COMBAT = 6, TECH_ARCANE = 6, TECH_BIO = 6) w_class = ITEMSIZE_LARGE force = 30 throwforce = 10 diff --git a/code/modules/xenoarcheaology/finds/find_spawning.dm b/code/modules/xenoarcheaology/finds/find_spawning.dm index c83ab81ec19..6f48554f6d6 100644 --- a/code/modules/xenoarcheaology/finds/find_spawning.dm +++ b/code/modules/xenoarcheaology/finds/find_spawning.dm @@ -77,8 +77,6 @@ if(ARCHAEO_BOWL) item_type = "bowl" new_item = new /obj/item/reagent_containers/glass/replenishing(src.loc) - if(prob(33)) - LAZYSET(new_item.origin_tech, TECH_ARCANE, 1) new_item.icon = 'icons/obj/xenoarchaeology.dmi' new_item.icon_state = "bowl" apply_image_decorations = TRUE @@ -87,8 +85,6 @@ if(ARCHAEO_URN) item_type = "urn" new_item = new /obj/item/reagent_containers/glass/beaker(src.loc) - if(prob(33)) - LAZYSET(new_item.origin_tech, TECH_ARCANE, 1) new_item.icon = 'icons/obj/xenoarchaeology.dmi' new_item.icon_state = "urn[rand(1,2)]" apply_image_decorations = TRUE @@ -103,7 +99,6 @@ [pick("performing unspeakable acts","posing heroically","in a fetal position","cheering","sobbing","making a plaintive gesture","making a rude gesture")]. \ [pick("It glares at anything that makes sound", "Any nearby sounds attract it's gaze", "Its eyes glow crimson when noises are made nearby")]]." new_item = new /obj/item/vampiric(src.loc) //Possibly make multiple subtypes of this? - LAZYSET(new_item.origin_tech, TECH_ARCANE, 1) if(ARCHAEO_INSTRUMENT) name = "instrument" icon = 'icons/obj/xenoarchaeology.dmi' @@ -182,7 +177,6 @@ var/storage_amount = 2**(new_box.max_w_class-1) new_box.max_storage_space = rand(storage_amount, storage_amount * 10) if(prob(30)) - LAZYSET(new_item.origin_tech, TECH_ARCANE, 1) apply_image_decorations = TRUE if(ARCHAEO_GASTANK) @@ -238,7 +232,6 @@ if(prob(30)) icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "pen1" - LAZYSET(new_item.origin_tech, TECH_ARCANE, 1) apply_image_decorations = TRUE if(ARCHAEO_CRYSTAL) @@ -267,7 +260,6 @@ new_item.icon_state = icon_state new_item.name = "Redspace Gem" new_item.desc = "A glowing stone made of what appears to be a pure chunk of redspace. It seems to have the power to transfer the consciousness of dead or nearly-dead humanoids into it." - LAZYSET(new_item.origin_tech, TECH_ARCANE, 2) if(ARCHAEO_CULTBLADE) //cultblade @@ -323,8 +315,6 @@ new_item = new new_helmet(src.loc) secondary_item = new new_robes(src.loc) - LAZYSET(new_item.origin_tech, TECH_ARCANE, 1) - LAZYSET(secondary_item.origin_tech, TECH_ARCANE, 1) if(ARCHAEO_SOULSTONE) //soulstone become_anomalous = TRUE @@ -332,7 +322,6 @@ new_item = new /obj/item/soulstone(src.loc) item_type = new_item.name apply_material_decorations = FALSE - LAZYSET(new_item.origin_tech, TECH_ARCANE, 2) if(ARCHAEO_STOCKPARTS) if(prob(30)) become_anomalous = TRUE @@ -370,10 +359,8 @@ //15% chance to gain a random amount of starting energy, otherwise start with an empty cell if(prob(10)) new_gun.power_supply.maxcharge = 0 - LAZYSET(new_gun.origin_tech, TECH_ARCANE, rand(0, 1)) if(prob(15)) new_gun.power_supply.charge = rand(0, new_gun.power_supply.maxcharge) - LAZYSET(new_gun.origin_tech, TECH_ARCANE, 1) else new_gun.power_supply.charge = 0 item_type = "Relic Laser Gun" @@ -512,7 +499,6 @@ //gas mask if(prob(50)) new_item = new /obj/item/clothing/mask/gas/poltergeist(src.loc) - LAZYSET(new_item.origin_tech, TECH_ARCANE, 1) else new_item = new /obj/item/clothing/mask/gas/voice(src.loc) if(prob(40)) @@ -554,8 +540,6 @@ item_type = new_item.name secondary_item_type = secondary_item.name secondary_item_desc = "" - LAZYSET(new_item.origin_tech, TECH_ARCANE, 2) - LAZYSET(new_item.origin_tech, TECH_PRECURSOR, 1) if(ARCHAEO_ALIEN_BOAT) // Alien boats. @@ -857,15 +841,6 @@ if(talkative) new_item.talking_atom = new(new_item) - if("origin_tech" in new_item.vars) - var/list/new_tech - if(new_item.origin_tech) - new_tech = new_item.origin_tech.Copy() - else - new_tech = list() - new_tech[TECH_ARCANE] += 1 - new_tech[TECH_PRECURSOR] += 1 - new_item.origin_tech = new_tech if(become_anomalous) new_item.become_anomalous() @@ -883,9 +858,6 @@ if(secondary_item) //Is this part of a set? if(talkative) secondary_item.talking_atom = new(secondary_item) - LAZYINITLIST(secondary_item.origin_tech) - secondary_item.origin_tech[TECH_ARCANE] += 1 - secondary_item.origin_tech[TECH_PRECURSOR] += 1 if(become_anomalous) secondary_item.become_anomalous() @@ -894,14 +866,6 @@ else if(talkative) src.talking_atom = new(src) - var/list/new_tech - if(origin_tech) - new_tech = origin_tech.Copy() - else - new_tech = list() - new_tech[TECH_ARCANE] += 1 - new_tech[TECH_PRECURSOR] += 1 - origin_tech = new_tech if(become_anomalous) become_anomalous() diff --git a/code/modules/xenoarcheaology/finds/finds.dm b/code/modules/xenoarcheaology/finds/finds.dm index e73a47b962b..958d82ba13d 100644 --- a/code/modules/xenoarcheaology/finds/finds.dm +++ b/code/modules/xenoarcheaology/finds/finds.dm @@ -14,7 +14,6 @@ icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "strange" var/datum/geosample/geologic_data - origin_tech = list(TECH_MATERIAL = 5) w_class = ITEMSIZE_SMALL /obj/item/strangerock/Initialize(mapload, var/inside_item_type = 0) diff --git a/code/modules/xenoarcheaology/tools/tools.dm b/code/modules/xenoarcheaology/tools/tools.dm index cc085af092c..0eeabb53fff 100644 --- a/code/modules/xenoarcheaology/tools/tools.dm +++ b/code/modules/xenoarcheaology/tools/tools.dm @@ -3,7 +3,6 @@ desc = "A coiled metallic tape used to check dimensions and lengths." icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "measuring" - origin_tech = list(TECH_MATERIAL = 1) matter = list(MAT_STEEL = 100) w_class = ITEMSIZE_SMALL @@ -36,7 +35,6 @@ icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "xenoarch_scanner" item_state = "analyzer" - origin_tech = list(TECH_BLUESPACE = 3, TECH_MAGNET = 3) matter = list(MAT_STEEL = 10000,MAT_GLASS = 5000) w_class = ITEMSIZE_SMALL slot_flags = SLOT_BELT @@ -103,7 +101,6 @@ icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "depth_scanner" item_state = "analyzer" - origin_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2, TECH_BLUESPACE = 2) matter = list(MAT_STEEL = 1000,MAT_GLASS = 1000) w_class = ITEMSIZE_SMALL slot_flags = SLOT_BELT @@ -236,7 +233,6 @@ icon = 'icons/obj/device.dmi' icon_state = "pinoff" //pinonfar, pinonmedium, pinonclose, pinondirect, pinonnull item_state = "electronic" - origin_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 2, TECH_BLUESPACE = 3) matter = list(MAT_STEEL = 1000,MAT_GLASS = 500) var/frequency = PUB_FREQ var/scan_ticks = 0 @@ -338,7 +334,6 @@ icon_state = "ano_scanner2" item_state = "lampgreen" icon = 'icons/obj/xenoarchaeology.dmi' - origin_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 3, TECH_BLUESPACE = 2) matter = list(MAT_STEEL = 10000,MAT_GLASS = 5000) w_class = ITEMSIZE_SMALL slot_flags = SLOT_BELT diff --git a/code/modules/xenobio/items/extracts.dm b/code/modules/xenobio/items/extracts.dm index f9fca3878fe..d222e90adc8 100644 --- a/code/modules/xenobio/items/extracts.dm +++ b/code/modules/xenobio/items/extracts.dm @@ -11,7 +11,6 @@ throwforce = 0 throw_speed = 3 throw_range = 6 - origin_tech = list(TECH_BIO = 4) var/uses = 1 // uses before it goes inert var/enhanced = FALSE flags = OPENCONTAINER diff --git a/code/modules/xenobio/items/extracts_vr.dm b/code/modules/xenobio/items/extracts_vr.dm index 223e45919a5..d0d6c4a35e5 100644 --- a/code/modules/xenobio/items/extracts_vr.dm +++ b/code/modules/xenobio/items/extracts_vr.dm @@ -9,7 +9,6 @@ throwforce = 0 throw_speed = 3 throw_range = 6 - origin_tech = list(TECH_BIO = 4) var/uses = 1 // uses before it goes inert var/enhanced = FALSE var/slime_type diff --git a/code/modules/xenobio/items/slime_objects.dm b/code/modules/xenobio/items/slime_objects.dm index c1669390fa7..8fa93535fbc 100644 --- a/code/modules/xenobio/items/slime_objects.dm +++ b/code/modules/xenobio/items/slime_objects.dm @@ -79,7 +79,6 @@ icon = 'icons/obj/objects.dmi' icon_state = "slime_crystal_small" w_class = ITEMSIZE_TINY - origin_tech = list(TECH_MAGNET = 6, TECH_BLUESPACE = 3) force = 1 //Needs a token force to ensure you can attack because for some reason you can't attack with 0 force things /obj/item/slime_crystal/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone) @@ -115,8 +114,6 @@ icon_state = "slime_crystal_large" uses = 1 w_class = ITEMSIZE_SMALL - origin_tech = list(TECH_MAGNET = 5, TECH_BLUESPACE = 4) - // Very filling food. /obj/item/reagent_containers/food/snacks/slime diff --git a/code/modules/xenobio/items/slimepotions.dm b/code/modules/xenobio/items/slimepotions.dm index e734ddbfdc4..739dd7d0ad6 100644 --- a/code/modules/xenobio/items/slimepotions.dm +++ b/code/modules/xenobio/items/slimepotions.dm @@ -5,7 +5,6 @@ desc = "A flask containing strange, mysterious substances excreted by a slime." icon = 'icons/obj/chemical.dmi' w_class = ITEMSIZE_TINY - origin_tech = list(TECH_BIO = 4) // This is actually applied to an extract, so no attack() overriding needed. /obj/item/slimepotion/enhancer diff --git a/code/modules/xenobio/items/weapons.dm b/code/modules/xenobio/items/weapons.dm index 306d681b289..9cf4a243479 100644 --- a/code/modules/xenobio/items/weapons.dm +++ b/code/modules/xenobio/items/weapons.dm @@ -6,7 +6,6 @@ slot_flags = SLOT_BELT force = 9 lightcolor = "#33CCFF" - origin_tech = list(TECH_COMBAT = 2, TECH_BIO = 2) agonyforce = 10 //It's not supposed to be great at stunning human beings. hitcost = 48 //Less zap for less cost description_info = "This baton will stun a slime or other slime-based lifeform for about five seconds, if hit with it while on." diff --git a/code/modules/xenobio/items/weapons_vr.dm b/code/modules/xenobio/items/weapons_vr.dm index ce3f973518c..07acc57974e 100644 --- a/code/modules/xenobio/items/weapons_vr.dm +++ b/code/modules/xenobio/items/weapons_vr.dm @@ -71,7 +71,6 @@ desc = "Based on the technology of the 'Bluespace Harpoon' this device can teleport a loaded cube to a given target and rehydrate it." loadable_item = /obj/item/reagent_containers/food/snacks/monkeycube loadable_name = "Monkey Cube" - origin_tech = list(TECH_BLUESPACE = 5, TECH_BIO = 6) //projectile_type = /obj/item/projectile/beam/xenobio/monkey /obj/item/xenobio/monkey_gun/afterattack(atom/A, mob/user as mob) diff --git a/code/modules/xenobio/machinery/processor.dm b/code/modules/xenobio/machinery/processor.dm index 8fac480b246..81a65ea5178 100644 --- a/code/modules/xenobio/machinery/processor.dm +++ b/code/modules/xenobio/machinery/processor.dm @@ -16,7 +16,6 @@ /obj/item/circuitboard/processor name = T_BOARD("slime processor") build_path = /obj/machinery/processor - origin_tech = list(TECH_DATA = 2, TECH_BIO = 2) /obj/machinery/processor/attack_hand(mob/living/user) if(processing) diff --git a/code/modules/xenobio2/machinery/core_extractor.dm b/code/modules/xenobio2/machinery/core_extractor.dm index d24851cb01a..5972d2fe526 100644 --- a/code/modules/xenobio2/machinery/core_extractor.dm +++ b/code/modules/xenobio2/machinery/core_extractor.dm @@ -181,7 +181,6 @@ name = T_BOARD("Slime extractor") build_path = "/obj/machinery/slime/extractor" board_type = "machine" - origin_tech = list(TECH_DATA = 3, TECH_BIO = 3) req_components = list( /obj/item/stock_parts/manipulator = 2, /obj/item/stock_parts/matter_bin = 1, diff --git a/code/modules/xenobio2/machinery/gene_manipulators.dm b/code/modules/xenobio2/machinery/gene_manipulators.dm index 2f41144e544..4ee4bc2ad87 100644 --- a/code/modules/xenobio2/machinery/gene_manipulators.dm +++ b/code/modules/xenobio2/machinery/gene_manipulators.dm @@ -394,7 +394,6 @@ name = T_BOARD("biological product destructive analyzer") build_path = "/obj/machinery/xenobio/extractor" board_type = "machine" - origin_tech = list(TECH_DATA = 4, TECH_BIO = 4) req_components = list( /obj/item/stock_parts/manipulator = 2, /obj/item/stock_parts/matter_bin = 1, @@ -405,7 +404,6 @@ name = T_BOARD("biological genetic bombarder") build_path = "/obj/machinery/xenobio/editor" board_type = "machine" - origin_tech = list(TECH_DATA = 4, TECH_BIO = 4) req_components = list( /obj/item/stock_parts/manipulator = 2, /obj/item/stock_parts/matter_bin = 2, diff --git a/code/modules/xenobio2/machinery/injector.dm b/code/modules/xenobio2/machinery/injector.dm index d45d8aa1bee..bb1b82f8180 100644 --- a/code/modules/xenobio2/machinery/injector.dm +++ b/code/modules/xenobio2/machinery/injector.dm @@ -132,6 +132,5 @@ /obj/item/circuitboard/xenobioinjectormachine name = T_BOARD("biological injector") build_path = /obj/machinery/xenobio2/manualinjector - board_type = /datum/frame/frame_types/machine - origin_tech = list() //To be filled, + board_type = /datum/frame/frame_types/machine //To be filled, req_components = list() //To be filled, diff --git a/code/modules/xenobio2/machinery/injector_computer.dm b/code/modules/xenobio2/machinery/injector_computer.dm index aeaa16c3020..0977e24d073 100644 --- a/code/modules/xenobio2/machinery/injector_computer.dm +++ b/code/modules/xenobio2/machinery/injector_computer.dm @@ -110,5 +110,4 @@ /obj/item/circuitboard/xenobio2computer name = T_BOARD("injector control console") - build_path = /obj/machinery/computer/xenobio2 - origin_tech = list() //To be filled + build_path = /obj/machinery/computer/xenobio2 //To be filled diff --git a/code/modules/xenobio2/machinery/slime_replicator.dm b/code/modules/xenobio2/machinery/slime_replicator.dm index f442072bd3e..5c38ea09de3 100644 --- a/code/modules/xenobio2/machinery/slime_replicator.dm +++ b/code/modules/xenobio2/machinery/slime_replicator.dm @@ -140,7 +140,6 @@ name = T_BOARD("Slime replicator") build_path = "/obj/machinery/slime/replicator" board_type = "machine" - origin_tech = list(TECH_DATA = 3, TECH_BIO = 3) req_components = list( /obj/item/stock_parts/manipulator = 2, /obj/item/stock_parts/matter_bin = 1, diff --git a/maps/offmap_vr/om_ships/curashuttle.dmm b/maps/offmap_vr/om_ships/curashuttle.dmm index 2a93595a5c2..18804126ef7 100644 --- a/maps/offmap_vr/om_ships/curashuttle.dmm +++ b/maps/offmap_vr/om_ships/curashuttle.dmm @@ -301,13 +301,11 @@ /obj/item/gun/projectile/automatic/mini_uzi, /obj/item/card/id/syndicate{ access = list(616); - assignment = "Curabitur Contractor"; - origin_tech = newlist() + assignment = "Curabitur Contractor" }, /obj/item/card/id/syndicate{ access = list(616); - assignment = "Curabitur Contractor"; - origin_tech = newlist() + assignment = "Curabitur Contractor" }, /obj/item/spacecash/c1000, /obj/item/spacecash/c1000, diff --git a/maps/redgate/fantasy_items.dm b/maps/redgate/fantasy_items.dm index b21a8d2efb4..75dc65c22f7 100644 --- a/maps/redgate/fantasy_items.dm +++ b/maps/redgate/fantasy_items.dm @@ -3,7 +3,6 @@ name = "scroll of divination" desc = "An unusual scroll that appears to report all of the details of a person's health when waved near them. Oddly, it seems to have a little metal chip up near the handles..." advscan = SCANNABLE_SECRETIVE - origin_tech = list(TECH_MAGNET = 7, TECH_BIO = 8) icon_state = "health_scroll" @@ -296,7 +295,6 @@ icon_state = "teleporter" beacons_left = 3 cell_type = /obj/item/cell/device - origin_tech = list(TECH_MAGNET = 5, TECH_BLUESPACE = 5) special_handling = TRUE /obj/item/perfect_tele_beacon/magic diff --git a/maps/submaps/pois_vr/debris_field/debrisfield_things.dm b/maps/submaps/pois_vr/debris_field/debrisfield_things.dm index dd14f41643f..0b0f17d1815 100644 --- a/maps/submaps/pois_vr/debris_field/debrisfield_things.dm +++ b/maps/submaps/pois_vr/debris_field/debrisfield_things.dm @@ -147,7 +147,6 @@ desc = "An attempt by space-adapted giant spiders to reproduce! Unfortunately, their young cannot yet survive hard vacuum. Yet." icon = 'icons/obj/egg.dmi' icon_state = "egg_slimeglob" - origin_tech = list(TECH_BIO = 10) /obj/item/space_spider_egg/attack_self(mob/user) . = ..(user) @@ -300,7 +299,6 @@ i just hope whatever happens, she finds the mercy we werent equipped to give her say_escalate = list("Janitorial Engaged!", "Shoot to-ta-te stun!") /obj/item/poi/broken_drone_circuit/phoron_tanker - origin_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 3, TECH_DATA = 4, TECH_COMBAT = 6) var/static/area/submap/debrisfield/phoron_tanker/tanker //Doing this to save some perf examine_multitool = "ERR- ERR- KZZZHT \n \ designation: kzth! \n assignment: CRACKLE \n \