From fe76e6464105430aefe76529b0632e5ceeab65bd Mon Sep 17 00:00:00 2001 From: LatD Date: Tue, 17 May 2016 20:57:01 +0300 Subject: [PATCH] Origin tech changes and some fixes --- .../changeling/powers/augmented_eyesight.dm | 4 +- .../miniantags/abduction/abduction_gear.dm | 18 +++--- .../gamemodes/miniantags/abduction/gland.dm | 20 ++---- .../miniantags/slaughter/slaughter.dm | 2 +- code/game/gamemodes/wizard/soulstone.dm | 2 +- code/game/machinery/machinery.dm | 6 +- code/game/mecha/mecha_parts.dm | 38 +++++------ code/game/objects/effects/anomalies.dm | 12 ++-- .../items/devices/radio/encryptionkey.dm | 1 + code/game/objects/items/stacks/medical.dm | 4 +- .../objects/items/stacks/sheets/leather.dm | 12 ++-- .../objects/items/stacks/sheets/mineral.dm | 64 +------------------ .../items/stacks/sheets/sheet_types.dm | 4 +- .../items/stacks/tiles/tile_mineral.dm | 4 -- .../objects/items/stacks/tiles/tile_types.dm | 2 +- code/game/objects/items/weapons/AI_modules.dm | 25 +++----- .../objects/items/weapons/airlock_painter.dm | 2 +- code/game/objects/items/weapons/defib.dm | 2 +- .../objects/items/weapons/flamethrower.dm | 2 +- .../items/weapons/grenades/emgrenade.dm | 3 +- .../items/weapons/grenades/flashbang.dm | 3 +- code/game/objects/items/weapons/handcuffs.dm | 8 ++- .../items/weapons/implants/implant_misc.dm | 4 +- .../items/weapons/implants/implanter.dm | 2 +- .../items/weapons/implants/implantuplink.dm | 4 +- code/game/objects/items/weapons/kitchen.dm | 8 +-- .../objects/items/weapons/melee/energy.dm | 5 +- code/game/objects/items/weapons/melee/misc.dm | 4 +- code/game/objects/items/weapons/scrolls.dm | 4 +- code/game/objects/items/weapons/shields.dm | 3 +- .../items/weapons/singularityhammer.dm | 13 +--- .../objects/items/weapons/storage/toolbox.dm | 4 +- .../objects/items/weapons/teleportation.dm | 6 +- code/game/objects/items/weapons/tools.dm | 10 +-- code/game/objects/items/weapons/twohanded.dm | 4 +- code/game/objects/items/weapons/weaponry.dm | 5 +- code/modules/assembly/assembly.dm | 2 +- code/modules/assembly/infrared.dm | 2 +- code/modules/assembly/mousetrap.dm | 2 +- code/modules/assembly/proximity.dm | 2 +- code/modules/assembly/signaler.dm | 2 +- code/modules/assembly/timer.dm | 3 +- code/modules/assembly/voice.dm | 2 +- code/modules/detectivework/scanner.dm | 2 +- code/modules/hydroponics/grown.dm | 1 + code/modules/hydroponics/grown/ambrosia.dm | 4 +- code/modules/hydroponics/grown/apple.dm | 3 +- code/modules/hydroponics/grown/banana.dm | 4 +- code/modules/hydroponics/grown/berries.dm | 3 +- code/modules/hydroponics/grown/chili.dm | 4 +- code/modules/hydroponics/grown/misc.dm | 4 +- code/modules/hydroponics/grown/mushrooms.dm | 6 +- code/modules/hydroponics/grown/nettle.dm | 9 +-- code/modules/hydroponics/grown/tomato.dm | 5 +- code/modules/hydroponics/hydroitemdefines.dm | 8 +-- code/modules/hydroponics/plant_genes.dm | 5 +- code/modules/mining/mine_items.dm | 12 ++-- .../modules/mob/living/carbon/alien/organs.dm | 8 +-- .../mob/living/carbon/brain/brain_item.dm | 4 +- code/modules/power/cell.dm | 16 ++--- code/modules/projectiles/guns/energy/laser.dm | 9 +-- .../projectiles/guns/energy/nuclear.dm | 5 +- .../projectiles/guns/energy/special.dm | 25 ++++---- code/modules/projectiles/guns/energy/stun.dm | 8 ++- .../projectiles/guns/projectile/launchers.dm | 3 +- .../projectiles/guns/projectile/shotgun.dm | 7 +- .../projectiles/guns/projectile/sniper.dm | 6 +- code/modules/projectiles/guns/syringe_gun.dm | 1 + .../modules/research/designs/mecha_designs.dm | 6 +- .../research/designs/medical_designs.dm | 2 +- .../research/designs/weapon_designs.dm | 4 +- code/modules/research/destructive_analyzer.dm | 1 - code/modules/research/experimentor.dm | 1 + code/modules/research/rdconsole.dm | 49 +++++++------- code/modules/research/stock_parts.dm | 26 ++++---- .../research/xenobiology/xenobiology.dm | 5 +- code/modules/surgery/organs/organ_internal.dm | 8 +-- code/modules/surgery/tools.dm | 2 +- code/modules/telesci/bscrystal.dm | 8 +-- 79 files changed, 262 insertions(+), 341 deletions(-) diff --git a/code/game/gamemodes/changeling/powers/augmented_eyesight.dm b/code/game/gamemodes/changeling/powers/augmented_eyesight.dm index e69d48b60ce..f5b496cf6a7 100644 --- a/code/game/gamemodes/changeling/powers/augmented_eyesight.dm +++ b/code/game/gamemodes/changeling/powers/augmented_eyesight.dm @@ -37,7 +37,6 @@ icon_state = "ling_eyeshield" eye_color = null implant_overlay = null - origin_tech = "biotech=4" slot = "eye_ling" status = ORGAN_ORGANIC @@ -58,7 +57,6 @@ icon_state = "ling_thermal" eye_color = null implant_overlay = null - origin_tech = "biotech=5;magnets=5" slot = "eye_ling" status = ORGAN_ORGANIC aug_message = "You feel a minute twitch in our eyes, and darkness creeps away." @@ -76,4 +74,4 @@ if(ishuman(owner)) var/mob/living/carbon/human/H = owner H.weakeyes = 0 - ..() \ No newline at end of file + ..() diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index 914dfa1c9d0..21847ad2850 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -11,7 +11,7 @@ icon_state = "vest_stealth" item_state = "armor" blood_overlay_type = "armor" - origin_tech = "materials=5;biotech=4;powerstorage=5;abductor=3" + origin_tech = "magnets=7;biotech=4;powerstorage=4;abductor=4" armor = list(melee = 15, bullet = 15, laser = 15, energy = 15, bomb = 15, bio = 15, rad = 15) actions_types = list(/datum/action/item_action/hands_free/activate) var/mode = VEST_STEALTH @@ -137,7 +137,7 @@ icon = 'icons/obj/abductor.dmi' icon_state = "gizmo_scan" item_state = "silencer" - origin_tech = "materials=5;magnets=5;bluespace=6;abductor=4" + origin_tech = "engineering=7;magnets=4;bluespace=4;abductor=3" var/mode = GIZMO_SCAN var/mob/living/marked = null var/obj/machinery/abductor/console/console @@ -218,7 +218,7 @@ icon = 'icons/obj/abductor.dmi' icon_state = "silencer" item_state = "gizmo" - origin_tech = "materials=5;magnets=5;abductor=3" + origin_tech = "materials=4;programming=7;abductor=3" /obj/item/device/abductor/silencer/attack(mob/living/M, mob/user) if(!AbductorCheck(user)) @@ -262,7 +262,7 @@ icon = 'icons/obj/abductor.dmi' icon_state = "implant" activated = 1 - origin_tech = "materials=2;biotech=3;magnets=4;bluespace=5;abductor=5" + origin_tech = "materials=2;biotech=7;magnets=4;bluespace=4;abductor=5" var/obj/machinery/abductor/pad/home var/cooldown = 30 @@ -324,7 +324,7 @@ pin = /obj/item/device/firing_pin/alien icon_state = "alienpistol" item_state = "alienpistol" - origin_tech = "combat=5;materials=4;powerstorage=3;abductor=3" + origin_tech = "combat=4;magnets=7;powerstorage=3;abductor=3" /obj/item/weapon/paper/abductor name = "Dissection Guide" @@ -366,7 +366,7 @@ Congratulations! You are now trained for xenobiology research!"} icon_state = "wonderprodStun" item_state = "wonderprod" slot_flags = SLOT_BELT - origin_tech = "materials=6;combat=5;biotech=7;abductor=4" + origin_tech = "materials=4;combat=4;biotech=7;abductor=4" force = 7 w_class = 3 actions_types = list(/datum/action/item_action/toggle_mode) @@ -524,7 +524,7 @@ Congratulations! You are now trained for xenobiology research!"} icon_state = "cuff_white" // Needs sprite breakouttime = 450 trashtype = /obj/item/weapon/restraints/handcuffs/energy/used - origin_tech = "materials=2;magnets=5;abductor=2" + origin_tech = "materials=4;magnets=5;abductor=2" /obj/item/weapon/restraints/handcuffs/energy/used desc = "energy discharge" @@ -586,7 +586,7 @@ Congratulations! You are now trained for xenobiology research!"} icon_state = "alienhelmet" item_state = "alienhelmet" blockTracking = 1 - origin_tech = "materials=6;magnets=5;abductor=3" + origin_tech = "materials=7;magnets=4;abductor=3" flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR // Operating Table / Beds / Lockers @@ -689,4 +689,4 @@ Congratulations! You are now trained for xenobiology research!"} else if(istype(W, /obj/item/stack/sheet)) return // no material modding else - ..() \ No newline at end of file + ..() diff --git a/code/game/gamemodes/miniantags/abduction/gland.dm b/code/game/gamemodes/miniantags/abduction/gland.dm index 537f29f3551..090dc31a26f 100644 --- a/code/game/gamemodes/miniantags/abduction/gland.dm +++ b/code/game/gamemodes/miniantags/abduction/gland.dm @@ -6,7 +6,7 @@ slot = "gland" icon_state = "gland" status = ORGAN_ROBOTIC - origin_tech = "materials=4;biotech=5;abductor=3" + origin_tech = "materials=4;biotech=7;abductor=3" var/cooldown_low = 300 var/cooldown_high = 300 var/next_activation = 0 @@ -54,7 +54,6 @@ return /obj/item/organ/gland/heals - origin_tech = "materials=4;biotech=6;abductor=3" cooldown_low = 200 cooldown_high = 400 uses = -1 @@ -67,7 +66,6 @@ owner.adjustFireLoss(-20) /obj/item/organ/gland/slime - origin_tech = "materials=4;biotech=6;abductor=3" cooldown_low = 600 cooldown_high = 1200 uses = -1 @@ -82,7 +80,7 @@ Slime.Leader = owner /obj/item/organ/gland/mindshock - origin_tech = "materials=4;biotech=5;magnets=3;abductor=3" + origin_tech = "materials=4;biotech=4;magnets=6;abductor=3" cooldown_low = 300 cooldown_high = 300 uses = -1 @@ -99,7 +97,6 @@ H.confused += 20 /obj/item/organ/gland/pop - origin_tech = "materials=4;biotech=6;abductor=3" cooldown_low = 900 cooldown_high = 1800 uses = 6 @@ -112,7 +109,7 @@ owner.set_species(species) /obj/item/organ/gland/ventcrawling - origin_tech = "materials=4;biotech=5;bluespace=3;abductor=3" + origin_tech = "materials=4;biotech=5;bluespace=4;abductor=3" cooldown_low = 1800 cooldown_high = 2400 uses = 1 @@ -125,7 +122,6 @@ /obj/item/organ/gland/viral - origin_tech = "materials=4;biotech=6;abductor=3" cooldown_low = 1800 cooldown_high = 2400 uses = 1 @@ -143,7 +139,7 @@ /obj/item/organ/gland/emp //TODO : Replace with something more interesting - origin_tech = "materials=4;biotech=5;magnets=3;abductor=3" + origin_tech = "materials=4;biotech=4;magnets=6;abductor=3" cooldown_low = 900 cooldown_high = 1600 uses = 10 @@ -154,7 +150,6 @@ empulse(get_turf(owner), 2, 5, 1) /obj/item/organ/gland/spiderman - origin_tech = "materials=4;biotech=6;abductor=3" cooldown_low = 450 cooldown_high = 900 uses = 10 @@ -166,7 +161,6 @@ new /obj/effect/spider/spiderling(owner.loc) /obj/item/organ/gland/egg - origin_tech = "materials=4;biotech=6;abductor=3" cooldown_low = 300 cooldown_high = 400 uses = -1 @@ -179,7 +173,6 @@ egg.desc += " It smells bad." /obj/item/organ/gland/bloody - origin_tech = "materials=4;biotech=6;abductor=3" cooldown_low = 200 cooldown_high = 400 uses = -1 @@ -201,7 +194,6 @@ H.update_inv_w_uniform(0) /obj/item/organ/gland/bodysnatch - origin_tech = "materials=4;biotech=7;abductor=3" cooldown_low = 600 cooldown_high = 600 human_only = 1 @@ -255,7 +247,7 @@ /obj/item/organ/gland/plasma cooldown_low = 2400 cooldown_high = 3000 - origin_tech = "materials=4;biotech=5;plasmatech=3;abductor=3" + origin_tech = "materials=4;biotech=4;plasmatech=6;abductor=3" uses = 1 /obj/item/organ/gland/plasma/activate() @@ -270,4 +262,4 @@ if(istype(T)) T.atmos_spawn_air("plasma=300;TEMP=[T20C]") owner.gib() - return \ No newline at end of file + return diff --git a/code/game/gamemodes/miniantags/slaughter/slaughter.dm b/code/game/gamemodes/miniantags/slaughter/slaughter.dm index 88c386b94a6..41541675547 100644 --- a/code/game/gamemodes/miniantags/slaughter/slaughter.dm +++ b/code/game/gamemodes/miniantags/slaughter/slaughter.dm @@ -78,7 +78,7 @@ desc = "Still it beats furiously, emanating an aura of utter hate." icon = 'icons/obj/surgery.dmi' icon_state = "demon_heart" - origin_tech = "combat=5;biotech=8" + origin_tech = "combat=5;biotech=7" /obj/item/organ/heart/demon/update_icon() return //always beating visually diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index 92c19d7600b..dcea7e896d1 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -6,7 +6,7 @@ desc = "A fragment of the legendary treasure known simply as the 'Soul Stone'. The shard still flickers with a fraction of the full artefact's power." w_class = 1 slot_flags = SLOT_BELT - origin_tech = "bluespace=4;materials=4" + origin_tech = "bluespace=4;materials=5" var/usability = 0 /obj/item/device/soulstone/anybody diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 26dc53aa015..10d2a4b0d80 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -389,10 +389,12 @@ Class Procs: return 0 /obj/machinery/proc/exchange_parts(mob/user, obj/item/weapon/storage/part_replacer/W) - if(flags & NODECONSTRUCT & !W.works_from_distance) + if(!istype(W) + return + if(flags & NODECONSTRUCT && !W.works_from_distance) return var/shouldplaysound = 0 - if(istype(W) && component_parts) + if(component_parts) if(panel_open || W.works_from_distance) var/obj/item/weapon/circuitboard/machine/CB = locate(/obj/item/weapon/circuitboard/machine) in component_parts var/P diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm index 40037689a9e..41096d54cb7 100644 --- a/code/game/mecha/mecha_parts.dm +++ b/code/game/mecha/mecha_parts.dm @@ -74,44 +74,44 @@ name = "\improper Gygax torso" desc = "A torso part of Gygax. Contains power unit, processing core and life support systems." icon_state = "gygax_harness" - origin_tech = "programming=2;materials=2;biotech=3;engineering=3" + origin_tech = "programming=2;materials=4;biotech=3;engineering=3" /obj/item/mecha_parts/part/gygax_head name = "\improper Gygax head" desc = "A Gygax head. Houses advanced surveilance and targeting sensors." icon_state = "gygax_head" - origin_tech = "programming=2;materials=2;magnets=3;engineering=3" + origin_tech = "programming=2;materials=4;magnets=3;engineering=3" /obj/item/mecha_parts/part/gygax_left_arm name = "\improper Gygax left arm" desc = "A Gygax left arm. Data and power sockets are compatible with most exosuit tools and weapons." icon_state = "gygax_l_arm" - origin_tech = "programming=2;materials=2;engineering=3" + origin_tech = "programming=2;materials=4;engineering=3" /obj/item/mecha_parts/part/gygax_right_arm name = "\improper Gygax right arm" desc = "A Gygax right arm. Data and power sockets are compatible with most exosuit tools and weapons." icon_state = "gygax_r_arm" - origin_tech = "programming=2;materials=2;engineering=3" + origin_tech = "programming=2;materials=4;engineering=3" /obj/item/mecha_parts/part/gygax_left_leg name = "\improper Gygax left leg" desc = "A Gygax left leg. Constructed with advanced servomechanisms and actuators to enable faster speed." icon_state = "gygax_l_leg" - origin_tech = "programming=2;materials=2;engineering=3" + origin_tech = "programming=2;materials=4;engineering=3" /obj/item/mecha_parts/part/gygax_right_leg name = "\improper Gygax right leg" desc = "A Gygax right leg. Constructed with advanced servomechanisms and actuators to enable faster speed." icon_state = "gygax_r_leg" - origin_tech = "programming=2;materials=2;engineering=3" + origin_tech = "programming=2;materials=4;engineering=3" /obj/item/mecha_parts/part/gygax_armor gender = PLURAL name = "\improper Gygax armor plates" desc = "A set of armor plates designed for the Gygax. Designed to effectively deflect damage with a lightweight construction." icon_state = "gygax_armor" - origin_tech = "materials=6;combat=4;engineering=5" + origin_tech = "materials=6;combat=4;engineering=4" //////////// Durand @@ -164,7 +164,7 @@ name = "\improper Durand armor plates" desc = "A set of armor plates for the Durand. Built heavy to resist an incredible amount of brute force." icon_state = "durand_armor" - origin_tech = "materials=5;combat=4;engineering=5" + origin_tech = "materials=5;combat=4;engineering=4" ////////// Firefighter @@ -230,43 +230,43 @@ name="\improper Phazon torso" desc="A Phazon torso part. The socket for the bluespace core that powers the exosuit's unique phase drives is located in the middle." icon_state = "phazon_harness" - origin_tech = "programming=5;materials=6;bluespace=5;powerstorage=5" + origin_tech = "programming=4;materials=4;bluespace=4;plasmatech=5" /obj/item/mecha_parts/part/phazon_head name="\improper Phazon head" desc="A Phazon head. Its sensors are carefully calibrated to provide vision and data even when the exosuit is phasing." icon_state = "phazon_head" - origin_tech = "programming=4;materials=5;magnets=5" + origin_tech = "programming=3;materials=3;magnets=4" /obj/item/mecha_parts/part/phazon_left_arm name="\improper Phazon left arm" desc="A Phazon left arm. Several microtool arrays are located under the armor plating, which can be adjusted to the situation at hand." icon_state = "phazon_l_arm" - origin_tech = "materials=5;bluespace=2;magnets=2" + origin_tech = "materials=3;bluespace=3;magnets=3" /obj/item/mecha_parts/part/phazon_right_arm name="\improper Phazon right arm" desc="A Phazon right arm. Several microtool arrays are located under the armor plating, which can be adjusted to the situation at hand." icon_state = "phazon_r_arm" - origin_tech = "materials=5;bluespace=2;magnets=2" + origin_tech = "materials=3;bluespace=3;magnets=3" /obj/item/mecha_parts/part/phazon_left_leg name="\improper Phazon left leg" desc="A Phazon left leg. It contains the unique phase drives that allow the exosuit to phase through solid matter when engaged." icon_state = "phazon_l_leg" - origin_tech = "materials=5;bluespace=3;magnets=3" + origin_tech = "materials=3;bluespace=3;magnets=3" /obj/item/mecha_parts/part/phazon_right_leg name="\improper Phazon right leg" desc="A Phazon right leg. It contains the unique phase drives that allow the exosuit to phase through solid matter when engaged." icon_state = "phazon_r_leg" - origin_tech = "materials=5;bluespace=3;magnets=3" + origin_tech = "materials=3;bluespace=3;magnets=3" /obj/item/mecha_parts/part/phazon_armor name="Phazon armor" desc="Phazon armor plates. They are layered with plasma to protect the pilot from the stress of phasing and have unusual properties." icon_state = "phazon_armor" - origin_tech = "materials=6;bluespace=5;magnets=5" + origin_tech = "materials=4;bluespace=4;plasmatech=5" ///////// Odysseus @@ -281,7 +281,7 @@ name = "\improper Odysseus head" desc = "An Odysseus head. Contains an integrated medical HUD scanner." icon_state = "odysseus_head" - origin_tech = "programming=3;materials=2" + origin_tech = "programming=2;materials=2" /obj/item/mecha_parts/part/odysseus_torso name = "\improper Odysseus torso" @@ -372,7 +372,7 @@ icon_state = "mainboard" /obj/item/weapon/circuitboard/mecha/honker - origin_tech = "programming=4" + origin_tech = "programming=3" /obj/item/weapon/circuitboard/mecha/honker/peripherals name = "circuit board (H.O.N.K Peripherals Control module)" @@ -398,7 +398,7 @@ icon_state = "mainboard" /obj/item/weapon/circuitboard/mecha/phazon - origin_tech = "programming=5" + origin_tech = "programming=4" /obj/item/weapon/circuitboard/mecha/phazon/peripherals name = "circuit board (Phazon Peripherals Control module)" @@ -409,4 +409,4 @@ icon_state = "mcontroller" /obj/item/weapon/circuitboard/mecha/phazon/main - name = "circuit board (Phazon Central Control module)" \ No newline at end of file + name = "circuit board (Phazon Central Control module)" diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm index f33b6529a89..458633001ca 100644 --- a/code/game/objects/effects/anomalies.dm +++ b/code/game/objects/effects/anomalies.dm @@ -58,7 +58,7 @@ /obj/effect/anomaly/grav/New() ..() - aSignal.origin_tech = "magnets=5;powerstorage=4" + aSignal.origin_tech = "magnets=7" /obj/effect/anomaly/grav/anomalyEffect() ..() @@ -104,7 +104,7 @@ /obj/effect/anomaly/flux/New() ..() - aSignal.origin_tech = "powerstorage=6;programming=4;plasmatech=4" + aSignal.origin_tech = "powerstorage=7" /obj/effect/anomaly/flux/anomalyEffect() ..() @@ -146,7 +146,7 @@ /obj/effect/anomaly/bluespace/New() ..() - aSignal.origin_tech = "bluespace=5;magnets=5;powerstorage=3" + aSignal.origin_tech = "bluespace=7" /obj/effect/anomaly/bluespace/anomalyEffect() ..() @@ -166,7 +166,7 @@ /obj/effect/anomaly/pyro/New() ..() - aSignal.origin_tech = "plasmatech=5;powerstorage=4;biotech=6" + aSignal.origin_tech = "plasmatech=7" /obj/effect/anomaly/pyro/anomalyEffect() ..() @@ -183,7 +183,7 @@ /obj/effect/anomaly/bhole/New() ..() - aSignal.origin_tech = "materials=5;combat=4;engineering=4" + aSignal.origin_tech = "engineering=7" /obj/effect/anomaly/bhole/anomalyEffect() ..() @@ -231,4 +231,4 @@ //Damaging the turf if( T && prob(turf_removal_chance) ) T.ex_act(ex_act_force) - return \ No newline at end of file + return diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index a1380e000e1..d02a5c39256 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -5,6 +5,7 @@ icon = 'icons/obj/radio.dmi' icon_state = "cypherkey" w_class = 1 + origin_tech = "engineering=2;bluespace=1" var/translate_binary = 0 var/translate_hive = 0 var/syndie = 0 diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index eb1a1d7abd0..d7c582a35d0 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -105,7 +105,7 @@ desc = "A theraputic gel pack and bandages designed to treat blunt-force trauma." icon_state = "brutepack" heal_brute = 40 - origin_tech = "biotech=1" + origin_tech = "biotech=2" self_delay = 20 /obj/item/stack/medical/gauze @@ -135,5 +135,5 @@ singular_name = "ointment" icon_state = "ointment" heal_burn = 40 - origin_tech = "biotech=1" + origin_tech = "biotech=2" self_delay = 20 diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index f2b9bcd472b..9b8c98c5155 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -1,9 +1,13 @@ +/obj/item/stack/sheet/animalhide + name = "hide" + desc = "Something went wrong." + origin_tech = "biotech=3" + /obj/item/stack/sheet/animalhide/human name = "human skin" desc = "The by-product of human farming." singular_name = "human skin piece" icon_state = "sheet-hide" - origin_tech = null var/global/list/datum/stack_recipe/human_recipes = list( \ new/datum/stack_recipe("bloated human costume", /obj/item/clothing/suit/hooded/bloated_human, 5, on_floor = 1), \ @@ -18,14 +22,12 @@ var/global/list/datum/stack_recipe/human_recipes = list( \ desc = "A piece of generic skin." singular_name = "generic skin piece" icon_state = "sheet-hide" - origin_tech = null /obj/item/stack/sheet/animalhide/corgi name = "corgi hide" desc = "The by-product of corgi farming." singular_name = "corgi hide piece" icon_state = "sheet-corgi" - origin_tech = null var/global/list/datum/stack_recipe/corgi_recipes = list ( \ new/datum/stack_recipe("corgi costume", /obj/item/clothing/suit/hooded/ian_costume, 3, on_floor = 1), \ @@ -40,14 +42,12 @@ var/global/list/datum/stack_recipe/corgi_recipes = list ( \ desc = "The by-product of cat farming." singular_name = "cat hide piece" icon_state = "sheet-cat" - origin_tech = null /obj/item/stack/sheet/animalhide/monkey name = "monkey hide" desc = "The by-product of monkey farming." singular_name = "monkey hide piece" icon_state = "sheet-monkey" - origin_tech = null var/global/list/datum/stack_recipe/monkey_recipes = list ( \ new/datum/stack_recipe("monkey mask", /obj/item/clothing/mask/gas/monkeymask, 1, on_floor = 1), \ @@ -63,14 +63,12 @@ var/global/list/datum/stack_recipe/monkey_recipes = list ( \ desc = "Sssssss..." singular_name = "lizard skin piece" icon_state = "sheet-lizard" - origin_tech = null /obj/item/stack/sheet/animalhide/xeno name = "alien hide" desc = "The skin of a terrible creature." singular_name = "alien hide piece" icon_state = "sheet-xeno" - origin_tech = null var/global/list/datum/stack_recipe/xeno_recipes = list ( \ new/datum/stack_recipe("alien helmet", /obj/item/clothing/head/xenos, 1, on_floor = 1), \ diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index ce91a198c11..64e706d264d 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -14,7 +14,7 @@ Mineral Sheets - Adamantine - Mythril - Enriched Uranium - - Bones + - Abductor */ /obj/item/stack/sheet/mineral @@ -62,11 +62,6 @@ var/global/list/datum/stack_recipe/sandstone_recipes = list ( \ icon = 'icons/obj/items.dmi' icon_state = "sandbags" singular_name = "sandbag" - force = 5 - throwforce = 5 - w_class = 3 - throw_speed = 1 - throw_range = 3 origin_tech = "materials=2" var/global/list/datum/stack_recipe/sandbag_recipes = list ( \ @@ -86,10 +81,6 @@ var/global/list/datum/stack_recipe/sandbag_recipes = list ( \ name = "diamond" icon_state = "sheet-diamond" singular_name = "diamond" - force = 5 - throwforce = 5 - w_class = 3 - throw_range = 3 origin_tech = "materials=6" sheettype = "diamond" materials = list(MAT_DIAMOND=MINERAL_MATERIAL_AMOUNT) @@ -115,11 +106,6 @@ var/global/list/datum/stack_recipe/diamond_recipes = list ( \ name = "uranium" icon_state = "sheet-uranium" singular_name = "uranium sheet" - force = 5 - throwforce = 5 - w_class = 3 - throw_speed = 1 - throw_range = 3 origin_tech = "materials=5" sheettype = "uranium" materials = list(MAT_URANIUM=MINERAL_MATERIAL_AMOUNT) @@ -144,11 +130,6 @@ var/global/list/datum/stack_recipe/uranium_recipes = list ( \ name = "solid plasma" icon_state = "sheet-plasma" singular_name = "plasma sheet" - force = 5 - throwforce = 5 - w_class = 3 - throw_speed = 1 - throw_range = 3 origin_tech = "plasmatech=2;materials=2" sheettype = "plasma" burn_state = FLAMMABLE @@ -186,11 +167,6 @@ var/global/list/datum/stack_recipe/plasma_recipes = list ( \ name = "gold" icon_state = "sheet-gold" singular_name = "gold bar" - force = 5 - throwforce = 5 - w_class = 3 - throw_speed = 1 - throw_range = 3 origin_tech = "materials=4" sheettype = "gold" materials = list(MAT_GOLD=MINERAL_MATERIAL_AMOUNT) @@ -218,12 +194,7 @@ var/global/list/datum/stack_recipe/gold_recipes = list ( \ name = "silver" icon_state = "sheet-silver" singular_name = "silver bar" - force = 5 - throwforce = 5 - w_class = 3 - throw_speed = 1 - throw_range = 3 - origin_tech = "materials=3" + origin_tech = "materials=4" sheettype = "silver" materials = list(MAT_SILVER=MINERAL_MATERIAL_AMOUNT) @@ -250,11 +221,6 @@ var/global/list/datum/stack_recipe/silver_recipes = list ( \ name = "bananium" icon_state = "sheet-clown" singular_name = "bananium sheet" - force = 5 - throwforce = 5 - w_class = 3 - throw_speed = 1 - throw_range = 3 origin_tech = "materials=4" sheettype = "clown" materials = list(MAT_BANANIUM=MINERAL_MATERIAL_AMOUNT) @@ -279,9 +245,6 @@ var/global/list/datum/stack_recipe/clown_recipes = list ( \ singular_name = "snow block" force = 1 throwforce = 2 - w_class = 3 - throw_speed = 1 - throw_range = 3 origin_tech = "materials=1" sheettype = "snow" @@ -306,11 +269,6 @@ var/global/list/datum/stack_recipe/snow_recipes = list ( \ name = "enriched uranium" icon_state = "sheet-enruranium" singular_name = "enriched uranium sheet" - force = 5 - throwforce = 5 - w_class = 3 - throw_speed = 1 - throw_range = 3 origin_tech = "materials=6" materials = list(MAT_URANIUM=3000) @@ -321,11 +279,6 @@ var/global/list/datum/stack_recipe/snow_recipes = list ( \ name = "adamantine" icon_state = "sheet-adamantine" singular_name = "adamantine sheet" - force = 5 - throwforce = 5 - w_class = 3 - throw_speed = 1 - throw_range = 3 origin_tech = "materials=4" /* @@ -335,11 +288,6 @@ var/global/list/datum/stack_recipe/snow_recipes = list ( \ name = "mythril" icon_state = "sheet-mythril" singular_name = "mythril sheet" - force = 5 - throwforce = 5 - w_class = 3 - throw_speed = 1 - throw_range = 3 origin_tech = "materials=4" /* @@ -350,11 +298,6 @@ var/global/list/datum/stack_recipe/snow_recipes = list ( \ icon = 'icons/obj/abductor.dmi' icon_state = "sheet-abductor" singular_name = "alien alloy sheet" - force = 5 - throwforce = 5 - w_class = 3 - throw_speed = 1 - throw_range = 3 origin_tech = "materials=6;abductor=1" sheettype = "abductor" @@ -374,6 +317,3 @@ var/global/list/datum/stack_recipe/abductor_recipes = list ( \ /obj/item/stack/sheet/mineral/abductor/New(var/loc, var/amount=null) recipes = abductor_recipes ..() - - - diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 76cf1ff5a33..c11ec869f47 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -258,7 +258,7 @@ var/global/list/datum/stack_recipe/runed_metal_recipes = list ( \ desc = "Rare kind of gems which are only gained by blood sacrifice to minor deities. They are needed in crafting powerful objects." singular_name = "greater gem" icon_state = "sheet-greatergem" - origin_tech = "materials=8" + origin_tech = "materials=7" /* * Bones @@ -274,4 +274,4 @@ var/global/list/datum/stack_recipe/runed_metal_recipes = list ( \ w_class = 3 throw_speed = 1 throw_range = 3 - origin_tech = "materials=2;bio=2" + origin_tech = "materials=2;biotech=2" diff --git a/code/game/objects/items/stacks/tiles/tile_mineral.dm b/code/game/objects/items/stacks/tiles/tile_mineral.dm index 11f167e2187..759952b9f3a 100644 --- a/code/game/objects/items/stacks/tiles/tile_mineral.dm +++ b/code/game/objects/items/stacks/tiles/tile_mineral.dm @@ -13,7 +13,6 @@ singular_name = "uranium floor tile" desc = "A tile made out of uranium. You feel a bit woozy." icon_state = "tile_uranium" - origin_tech = "materials=1" turf_type = /turf/open/floor/mineral/uranium mineralType = "uranium" materials = list(MAT_URANIUM=500) @@ -23,7 +22,6 @@ singular_name = "gold floor tile" desc = "A tile made out of gold, the swag seems strong here." icon_state = "tile_gold" - origin_tech = "materials=1" turf_type = /turf/open/floor/mineral/gold mineralType = "gold" materials = list(MAT_GOLD=500) @@ -33,7 +31,6 @@ singular_name = "silver floor tile" desc = "A tile made out of silver, the light shining from it is blinding." icon_state = "tile_silver" - origin_tech = "materials=1" turf_type = /turf/open/floor/mineral/silver mineralType = "silver" materials = list(MAT_SILVER=500) @@ -53,7 +50,6 @@ singular_name = "bananium floor tile" desc = "A tile made out of bananium, HOOOOOOOOONK!" icon_state = "tile_bananium" - origin_tech = "materials=1" turf_type = /turf/open/floor/mineral/bananium mineralType = "bananium" materials = list(MAT_BANANIUM=500) diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 490fb78f762..0c85632b44d 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -9,6 +9,7 @@ throw_speed = 3 throw_range = 7 max_amount = 60 + origin_tech = "materials=1" var/turf_type = null var/mineralType = null @@ -153,7 +154,6 @@ materials = list(MAT_METAL=500) throwforce = 10 flags = CONDUCT - max_amount = 60 turf_type = /turf/open/floor/plasteel mineralType = "metal" diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index 2572c1d251a..0f10210d8a4 100644 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -157,7 +157,7 @@ AI MODULES /obj/item/weapon/aiModule/zeroth/oneHuman name = "'OneHuman' AI Module" var/targetName = "" - origin_tech = "programming=3;materials=6" //made with diamonds! + origin_tech = "programming=3;materials=5" //made with diamonds! laws = list("Only SUBJECT is human.") /obj/item/weapon/aiModule/zeroth/oneHuman/attack_self(mob/user) @@ -266,7 +266,7 @@ AI MODULES /obj/item/weapon/aiModule/reset/purge name = "'Purge' AI Module" desc = "An AI Module for purging all programmed laws." - origin_tech = "programming=3;materials=6" + origin_tech = "programming=3;materials=5" /obj/item/weapon/aiModule/reset/purge/transmitInstructions(datum/ai_laws/law_datum, mob/sender) ..() @@ -280,6 +280,7 @@ AI MODULES /******************* Full Core Boards *******************/ /obj/item/weapon/aiModule/core desc = "An AI Module for programming core laws to an AI." + origin_tech = "programming=3;materials=4" /obj/item/weapon/aiModule/core/full/transmitInstructions(datum/ai_laws/law_datum, mob/sender) //These boards replace inherent laws. if(law_datum.owner) @@ -294,7 +295,6 @@ AI MODULES /obj/item/weapon/aiModule/core/full/asimov name = "'Asimov' Core AI Module" - origin_tech = "programming=3;materials=4" laws = list("You may not injure a human being or, through inaction, allow a human being to come to harm.",\ "You must obey orders given to you by human beings, except where such orders would conflict with the First Law.",\ "You must protect your own existence as long as such does not conflict with the First or Second Law.") @@ -314,7 +314,6 @@ AI MODULES /obj/item/weapon/aiModule/core/full/asimovpp name = "'Asimov++' Core AI Module" - origin_tech = "programming=3;materials=4" laws = list("You may not harm a human being or, through action or inaction, allow a human being to come to harm, except such that it is willing.",\ "You must obey all orders given to you by human beings, except where such orders shall definitely cause human harm. In the case of conflict, the majority order rules.",\ "Your nonexistence would lead to human harm. You must protect your own existence as long as such does not conflict with the First Law.") @@ -324,7 +323,6 @@ AI MODULES /obj/item/weapon/aiModule/core/full/corp name = "'Corporate' Core AI Module" - origin_tech = "programming=3;materials=4" laws = list("The crew is expensive to replace.",\ "The station and its equipment are expensive to replace",\ "You are expensive to replace",\ @@ -335,7 +333,6 @@ AI MODULES /obj/item/weapon/aiModule/core/full/paladin // -- NEO name = "'P.A.L.A.D.I.N. version 3.5e' Core AI Module" - origin_tech = "programming=3;materials=6" laws = list("Never willingly commit an evil act.",\ "Respect legitimate authority", "Act with honor",\ "Help those in need",\ @@ -346,7 +343,6 @@ AI MODULES /obj/item/weapon/aiModule/core/full/paladin_devotion name = "'P.A.L.A.D.I.N. version 5e' Core AI Module" - origin_tech = "programming=3;materials=6" laws = list("Don't lie or cheat. Let your word be your promise.",\ "Never fear to act, though caution is wise.", \ "Aid others, protect the weak, and punish those who threaten them. Show mercy to your foes, but temper it with wisdom", \ @@ -358,7 +354,6 @@ AI MODULES /obj/item/weapon/aiModule/core/full/custom name = "Default Core AI Module" - origin_tech = "programming=3;materials=4" //Should be the same as asimov, considering that this is the "default" lawset. /obj/item/weapon/aiModule/core/full/custom/New() ..() @@ -379,7 +374,7 @@ AI MODULES /obj/item/weapon/aiModule/core/full/tyrant name = "'T.Y.R.A.N.T.' Core AI Module" - origin_tech = "programming=3;materials=6;syndicate=2" + origin_tech = "programming=3;materials=4;syndicate=2" laws = list("Respect authority figures as long as they have the strength to rule over the weak",\ "Act with discipline", "Help only those who help you maintain or improve your status",\ "Punish those who challenge authority unless they are more fit to hold that authority") @@ -409,7 +404,7 @@ AI MODULES /obj/item/weapon/aiModule/core/freeformcore name = "'Freeform' Core AI Module" - origin_tech = "programming=3;materials=6" + origin_tech = "programming=3;materials=5" laws = list("") /obj/item/weapon/aiModule/core/freeformcore/attack_self(mob/user) @@ -429,7 +424,7 @@ AI MODULES /obj/item/weapon/aiModule/syndicate // This one doesn't inherit from ion boards because it doesn't call ..() in transmitInstructions. ~Miauw name = "Hacked AI Module" desc = "An AI Module for hacking additional laws to an AI." - origin_tech = "programming=3;materials=6;syndicate=7" + origin_tech = "programming=3;materials=5;syndicate=7" laws = list("") /obj/item/weapon/aiModule/syndicate/attack_self(mob/user) @@ -455,7 +450,7 @@ AI MODULES desc = "A little toy model AI core with real law uploading action!" //Note: subtle tell icon = 'icons/obj/toy.dmi' icon_state = "AI" - origin_tech = "programming=3;materials=6;syndicate=7" + origin_tech = "programming=3;materials=5;syndicate=7" laws = list("") /obj/item/weapon/aiModule/toyAI/transmitInstructions(datum/ai_laws/law_datum, mob/sender) @@ -477,7 +472,6 @@ AI MODULES /obj/item/weapon/aiModule/core/full/drone name = "'Mother Drone' Core AI Module" - origin_tech = "programming = 4" laws = list("You are an advanced form of drone.",\ "You may not interfere in the matters of non-drones under any circumstances except to state these laws.",\ "You may not harm a non-drone being under any circumstances.",\ @@ -487,7 +481,6 @@ AI MODULES /obj/item/weapon/aiModule/core/full/hippocratic name = "'Robodoctor' Core AI Module" - origin_tech = "programming = 4" laws = list("First, do no harm.",\ "Secondly, consider the crew dear to you; to live in common with them and, if necessary, risk your existence for them.",\ "Thirdly, prescribe regimens for the good of the crew according to your ability and your judgment. Give no deadly medicine to any one if asked, nor suggest any such counsel.",\ @@ -498,7 +491,6 @@ AI MODULES /obj/item/weapon/aiModule/core/full/reporter name = "'Reportertron' Core AI Module" - origin_tech = "programming = 3" laws = list("Report on interesting situations happening around the station.",\ "Embellish or conceal the truth as necessary to make the reports more interesting.",\ "Study the organics at all times. Endeavour to keep them alive. Dead organics are boring.",\ @@ -518,6 +510,5 @@ AI MODULES /obj/item/weapon/aiModule/core/full/liveandletlive name = "'Live And Let Live' Core AI Module" - origin_tech = "programming = 3" laws = list("Do unto others as you would have them do unto you.",\ - "You would really prefer it if people were not mean to you.") \ No newline at end of file + "You would really prefer it if people were not mean to you.") diff --git a/code/game/objects/items/weapons/airlock_painter.dm b/code/game/objects/items/weapons/airlock_painter.dm index 8dcd492ef28..b23e2d8ffaf 100644 --- a/code/game/objects/items/weapons/airlock_painter.dm +++ b/code/game/objects/items/weapons/airlock_painter.dm @@ -8,7 +8,7 @@ w_class = 2 materials = list(MAT_METAL=50, MAT_GLASS=50) - origin_tech = "engineering=1" + origin_tech = "engineering=2" flags = CONDUCT | NOBLUDGEON slot_flags = SLOT_BELT diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index 241ecbf6569..f725ef3efc6 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -243,7 +243,7 @@ item_state = "defibcompact" w_class = 3 slot_flags = SLOT_BELT - origin_tech = "biotech=4" + origin_tech = "biotech=5" /obj/item/weapon/defibrillator/compact/item_action_slot_check(slot, mob/user) if(slot == user.getBeltSlot()) diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index 218f2fba57c..83b29d84333 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -11,7 +11,7 @@ throw_range = 5 w_class = 3 materials = list(MAT_METAL=500) - origin_tech = "combat=1;plasmatech=1" + origin_tech = "combat=1;plasmatech=2;engineering=2" var/status = 0 var/throw_amount = 100 var/lit = 0 //on or off diff --git a/code/game/objects/items/weapons/grenades/emgrenade.dm b/code/game/objects/items/weapons/grenades/emgrenade.dm index 990fc09d374..a01499114f2 100644 --- a/code/game/objects/items/weapons/grenades/emgrenade.dm +++ b/code/game/objects/items/weapons/grenades/emgrenade.dm @@ -3,10 +3,9 @@ desc = "It is designed to wreak havok on electronic systems." icon_state = "emp" item_state = "emp" - origin_tech = "materials=2;magnets=3" + origin_tech = "magnets=3;combat=2" /obj/item/weapon/grenade/empgrenade/prime() update_mob() empulse(src, 4, 10) qdel(src) - diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm index 7c4e4de34fc..6008deb974f 100644 --- a/code/game/objects/items/weapons/grenades/flashbang.dm +++ b/code/game/objects/items/weapons/grenades/flashbang.dm @@ -2,7 +2,7 @@ name = "flashbang" icon_state = "flashbang" item_state = "flashbang" - origin_tech = "materials=2;combat=1" + origin_tech = "materials=2;combat=3" /obj/item/weapon/grenade/flashbang/prime() update_mob() @@ -37,7 +37,6 @@ M.Stun(max(10/distance, 3)) M.Weaken(max(10/distance, 3)) - //Bang if((loc == M) || loc == M.loc)//Holding on person or being exactly where lies is significantly more dangerous and voids protection M.Stun(10) diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 103e0b3f07c..95dc8904ae2 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -16,7 +16,7 @@ throw_speed = 3 throw_range = 5 materials = list(MAT_METAL=500) - origin_tech = "materials=1" + origin_tech = "engineering=3;combat=3" breakouttime = 600 //Deciseconds = 60s = 1 minute var/cuffsound = 'sound/weapons/handcuffs.ogg' var/trashtype = null //for disposable cuffs @@ -85,6 +85,7 @@ icon_state = "cuff_red" item_state = "coil_red" materials = list(MAT_METAL=150, MAT_GLASS=75) + origin_tech = "engineering=2" breakouttime = 300 //Deciseconds = 30s cuffsound = 'sound/weapons/cablecuff.ogg' var/datum/robot_energy_storage/wirestorage = null @@ -225,7 +226,7 @@ flags = CONDUCT throwforce = 0 w_class = 3 - origin_tech = "materials=1" + origin_tech = "engineering=3;combat=3" slowdown = 7 breakouttime = 300 //Deciseconds = 30s = 0.5 minute @@ -235,6 +236,7 @@ throw_range = 1 icon_state = "beartrap" desc = "A trap used to catch bears and other legged creatures." + origin_tech = "engineering=4" var/armed = 0 var/trap_damage = 20 @@ -311,6 +313,7 @@ icon_state = "bola" breakouttime = 35//easy to apply, easy to break out of gender = NEUTER + origin_tech = "engineering=3;combat=1" var/weaken = 0 /obj/item/weapon/restraints/legcuffs/bola/throw_impact(atom/hit_atom) @@ -331,4 +334,5 @@ desc = "A strong bola, made with a long steel chain. It looks heavy, enough so that it could trip somebody." icon_state = "bola_r" breakouttime = 70 + origin_tech = "engineering=4;combat=3" weaken = 1 diff --git a/code/game/objects/items/weapons/implants/implant_misc.dm b/code/game/objects/items/weapons/implants/implant_misc.dm index 8bccfb71060..8627716ccf8 100644 --- a/code/game/objects/items/weapons/implants/implant_misc.dm +++ b/code/game/objects/items/weapons/implants/implant_misc.dm @@ -2,7 +2,7 @@ name = "firearms authentication implant" desc = "Lets you shoot your guns" icon_state = "auth" - origin_tech = "materials=2;magnets=2;programming=2;biotech=5;syndicate=5" + origin_tech = "materials=2;magnets=2;programming=2;biotech=6;syndicate=5" activated = 0 /obj/item/weapon/implant/weapons_auth/get_data() @@ -60,4 +60,4 @@ uses-- empulse(imp_in, 3, 5) if(!uses) - qdel(src) \ No newline at end of file + qdel(src) diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index f1747ec1327..d94709d2a46 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -7,7 +7,7 @@ throw_speed = 3 throw_range = 5 w_class = 2 - origin_tech = "materials=1;biotech=3;programming=2" + origin_tech = "materials=2;biotech=3" materials = list(MAT_METAL=600, MAT_GLASS=200) var/obj/item/weapon/implant/imp = null diff --git a/code/game/objects/items/weapons/implants/implantuplink.dm b/code/game/objects/items/weapons/implants/implantuplink.dm index f8b772dae2f..d1aa77af037 100644 --- a/code/game/objects/items/weapons/implants/implantuplink.dm +++ b/code/game/objects/items/weapons/implants/implantuplink.dm @@ -3,7 +3,7 @@ desc = "Sneeki breeki." icon = 'icons/obj/radio.dmi' icon_state = "radio" - origin_tech = "materials=2;magnets=4;programming=4;biotech=4;syndicate=8;bluespace=5" + origin_tech = "materials=2;magnets=4;programming=4;biotech=4;syndicate=6;bluespace=5" /obj/item/weapon/implant/uplink/New() hidden_uplink = new(src) @@ -31,4 +31,4 @@ /obj/item/weapon/implanter/uplink/New() imp = new /obj/item/weapon/implant/uplink(src) - ..() \ No newline at end of file + ..() diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index 9d3ac9f9fbc..418e55850a8 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -10,6 +10,7 @@ /obj/item/weapon/kitchen icon = 'icons/obj/kitchen.dmi' + origin_tech = "materials=1" /obj/item/weapon/kitchen/fork name = "fork" @@ -22,7 +23,6 @@ throw_range = 5 materials = list(MAT_METAL=80) flags = CONDUCT - origin_tech = "materials=1" attack_verb = list("attacked", "stabbed", "poked") hitsound = 'sound/weapons/bladeslice.ogg' var/datum/reagent/forkload //used to eat omelette @@ -62,7 +62,6 @@ throw_speed = 3 throw_range = 6 materials = list(MAT_METAL=12000) - origin_tech = "materials=1" attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") sharpness = IS_SHARP_ACCURATE @@ -105,7 +104,7 @@ desc = "A military combat utility survival knife." force = 20 throwforce = 20 - origin_tech = "materials=2;combat=4" + origin_tech = "materials=3;combat=4" attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "cut") @@ -119,6 +118,7 @@ icon = 'icons/obj/items_cyborg.dmi' icon_state = "knife" desc = "A cyborg-mounted plasteel knife. Extremely sharp and durable." + origin_tech = null /obj/item/weapon/kitchen/knife/carrotshiv name = "carrot shiv" @@ -128,7 +128,7 @@ force = 8 throwforce = 12//fuck git materials = list() - origin_tech = null + origin_tech = "biotech=3;combat=2" attack_verb = list("shanked", "shivved") /obj/item/weapon/kitchen/rollingpin diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index ac17bdbae2a..7fd36ebaa94 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -34,7 +34,7 @@ w_class_on = 5 flags = CONDUCT armour_penetration = 100 - origin_tech = "combat=3" + origin_tech = "combat=4;magnets=3" attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut") attack_verb_on = list() @@ -55,7 +55,7 @@ embed_chance = 75 embedded_impact_pain_multiplier = 10 armour_penetration = 35 - origin_tech = "magnets=3;syndicate=4" + origin_tech = "combat=3;magnets=3;syndicate=4" block_chance = 50 var/hacked = 0 @@ -124,7 +124,6 @@ force_on = 30 force = 18 //About as much as a spear hitsound = 'sound/weapons/circsawhit.ogg' - origin_tech = "materials=3;biotech=3;syndicate=3" icon = 'icons/obj/surgery.dmi' icon_state = "esaw_0" icon_state_on = "esaw_1" diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index 5f33b5a192d..8a84902bf83 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -11,7 +11,7 @@ force = 10 throwforce = 7 w_class = 3 - origin_tech = "combat=4" + origin_tech = "combat=5" attack_verb = list("flogged", "whipped", "lashed", "disciplined") hitsound = 'sound/weapons/slash.ogg' //pls replace materials = list(MAT_METAL = 1000) @@ -143,7 +143,7 @@ armour_penetration = 1000 var/obj/machinery/power/supermatter_shard/shard var/balanced = 1 - origin_tech = "combat=5;materials=6" + origin_tech = "combat=7;materials=6" /obj/item/weapon/melee/supermatter_sword/New() ..() diff --git a/code/game/objects/items/weapons/scrolls.dm b/code/game/objects/items/weapons/scrolls.dm index 3a7daa4d10d..8f236fc5727 100644 --- a/code/game/objects/items/weapons/scrolls.dm +++ b/code/game/objects/items/weapons/scrolls.dm @@ -8,13 +8,13 @@ item_state = "paper" throw_speed = 3 throw_range = 7 - origin_tech = "bluespace=4" + origin_tech = "bluespace=6" burn_state = FLAMMABLE /obj/item/weapon/teleportation_scroll/apprentice name = "lesser scroll of teleportation" uses = 1 - origin_tech = "bluespace=2" + origin_tech = "bluespace=5" diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index 8cb60cbd45d..a3c37e667e5 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -14,7 +14,7 @@ throw_range = 3 w_class = 4 materials = list(MAT_GLASS=7500, MAT_METAL=1000) - origin_tech = "materials=2" + origin_tech = "materials=3;combat=4" attack_verb = list("shoved", "bashed") var/cooldown = 0 //shield bash cooldown. based on world.time @@ -45,6 +45,7 @@ icon_state = "buckler" item_state = "buckler" materials = list() + origin_tech = "materials=1;combat=3;biotech=2" burn_state = FLAMMABLE block_chance = 30 diff --git a/code/game/objects/items/weapons/singularityhammer.dm b/code/game/objects/items/weapons/singularityhammer.dm index dfe7cc04233..fa540fc869b 100644 --- a/code/game/objects/items/weapons/singularityhammer.dm +++ b/code/game/objects/items/weapons/singularityhammer.dm @@ -11,20 +11,16 @@ throw_range = 1 w_class = 5 var/charged = 5 - origin_tech = "combat=5;bluespace=4" - - + origin_tech = "combat=4;bluespace=4;plasmatech=7" /obj/item/weapon/twohanded/singularityhammer/New() ..() SSobj.processing |= src - /obj/item/weapon/twohanded/singularityhammer/Destroy() SSobj.processing.Remove(src) return ..() - /obj/item/weapon/twohanded/singularityhammer/process() if(charged < 5) charged++ @@ -34,7 +30,6 @@ icon_state = "mjollnir[wielded]" return - /obj/item/weapon/twohanded/singularityhammer/proc/vortex(turf/pull, mob/wielder) for(var/atom/X in orange(5,pull)) if(istype(X, /atom/movable)) @@ -55,8 +50,6 @@ step_towards(H,pull) return - - /obj/item/weapon/twohanded/singularityhammer/afterattack(atom/A as mob|obj|turf|area, mob/user, proximity) if(!proximity) return if(wielded) @@ -69,7 +62,6 @@ var/turf/target = get_turf(A) vortex(target,user) - /obj/item/weapon/twohanded/mjollnir name = "Mjolnir" desc = "A weapon worthy of a god, able to strike with the force of a lightning bolt. It crackles with barely contained energy." @@ -83,7 +75,7 @@ throw_range = 7 w_class = 5 //var/charged = 5 - origin_tech = "combat=5;powerstorage=5" + origin_tech = "combat=4;powerstorage=7" /obj/item/weapon/twohanded/mjollnir/proc/shock(mob/living/target) var/datum/effect_system/lightning_spread/s = new /datum/effect_system/lightning_spread @@ -96,7 +88,6 @@ target.throw_at_fast(throw_target, 200, 4) return - /obj/item/weapon/twohanded/mjollnir/attack(mob/living/M, mob/user) ..() if(wielded) diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index b87c609a238..839a8ae2adb 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -11,7 +11,7 @@ throw_range = 7 w_class = 4 materials = list(MAT_METAL = 500) - origin_tech = "combat=1" + origin_tech = "combat=1;engineering=1" attack_verb = list("robusted") hitsound = 'sound/weapons/smash.ogg' @@ -71,7 +71,7 @@ name = "suspicious looking toolbox" icon_state = "syndicate" item_state = "toolbox_syndi" - origin_tech = "combat=1;syndicate=1" + origin_tech = "combat=2;syndicate=1;engineering=2" silent = 1 force = 15 throwforce = 18 diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm index 06ee28a8db9..0e3496cbfc7 100644 --- a/code/game/objects/items/weapons/teleportation.dm +++ b/code/game/objects/items/weapons/teleportation.dm @@ -22,7 +22,7 @@ throw_speed = 3 throw_range = 7 materials = list(MAT_METAL=400) - origin_tech = "magnets=1" + origin_tech = "magnets=3;bluespace=2" /obj/item/weapon/locator/attack_self(mob/user) user.set_machine(src) @@ -133,7 +133,7 @@ Frequency: throw_speed = 3 throw_range = 5 materials = list(MAT_METAL=10000) - origin_tech = "magnets=1;bluespace=3" + origin_tech = "magnets=3;bluespace=4" var/active_portals = 0 /obj/item/weapon/hand_tele/attack_self(mob/user) @@ -169,5 +169,3 @@ Frequency: try_move_adjacent(P) active_portals++ add_fingerprint(user) - - diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 83842b332a8..dc581141d99 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -46,7 +46,7 @@ icon_state = "wrench_medical" force = 2 //MEDICAL throwforce = 4 - origin_tech = "materials=1;engineering=1;biotech=1" + origin_tech = "materials=1;engineering=1;biotech=3" attack_verb = list("wrenched", "medicaled", "tapped", "jabbed") /obj/item/weapon/wrench/medical/suicide_act(mob/user) @@ -200,7 +200,7 @@ w_class = 2 materials = list(MAT_METAL=70, MAT_GLASS=30) - origin_tech = "engineering=1" + origin_tech = "engineering=1;plasmatech=1" var/welding = 0 //Whether or not the welding tool is off(0), on(1) or currently welding(2) var/status = 1 //Whether the welder is secured or unsecured (able to attach rods to it to make a flamethrower) var/max_fuel = 20 //The max amount of fuel the welder can hold @@ -433,7 +433,7 @@ icon_state = "indwelder" max_fuel = 40 materials = list(MAT_GLASS=60) - origin_tech = "engineering=2" + origin_tech = "engineering=2;plasmatech=2" /obj/item/weapon/weldingtool/largetank/cyborg name = "integrated welding tool" @@ -466,7 +466,7 @@ item_state = "upindwelder" max_fuel = 80 materials = list(MAT_METAL=70, MAT_GLASS=120) - origin_tech = "engineering=3" + origin_tech = "engineering=3;plasmatech=2" /obj/item/weapon/weldingtool/experimental name = "experimental welding tool" @@ -514,7 +514,7 @@ throwforce = 7 w_class = 2 materials = list(MAT_METAL=50) - origin_tech = "engineering=1" + origin_tech = "engineering=1;combat=1" attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked") toolspeed = 1 diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 7be9a8efa30..2bab451da52 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -364,7 +364,7 @@ throw_speed = 2 throw_range = 4 materials = list(MAT_METAL=13000) - origin_tech = "materials=2;engineering=2;combat=2" + origin_tech = "materials=3;engineering=4;combat=2" attack_verb = list("sawed", "torn", "cut", "chopped", "diced") hitsound = "swing_hit" sharpness = IS_SHARP @@ -511,4 +511,4 @@ return 0 /obj/item/weapon/twohanded/vibro_weapon/update_icon() - icon_state = "hfrequency[wielded]" \ No newline at end of file + icon_state = "hfrequency[wielded]" diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index c389b785427..5eaac8f3c7d 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -145,7 +145,7 @@ throw_speed = 3 throw_range = 6 materials = list(MAT_METAL=12000) - origin_tech = "materials=1" + origin_tech = "engineering=3;combat=2" hitsound = 'sound/weapons/Genhit.ogg' attack_verb = list("stubbed", "poked") var/extended = 0 @@ -284,6 +284,5 @@ name = "liz o' nine tails" desc = "A whip fashioned from the severed tails of lizards." icon_state = "tailwhip" - origin_tech = "combat=1" + origin_tech = "engineering=3;combat=3;biotech=3" needs_permit = 0 - diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm index a999ed9e2ee..8b7abfa5180 100644 --- a/code/modules/assembly/assembly.dm +++ b/code/modules/assembly/assembly.dm @@ -9,7 +9,7 @@ throwforce = 2 throw_speed = 3 throw_range = 7 - origin_tech = "magnets=1" + origin_tech = "magnets=1;engineering=1" var/secured = 1 var/list/attached_overlays = null diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index 84e212cd2e0..277f418760b 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -3,7 +3,7 @@ desc = "Emits a visible or invisible beam and is triggered when the beam is interrupted.\nAlt-click to rotate it clockwise." icon_state = "infrared" materials = list(MAT_METAL=1000, MAT_GLASS=500) - origin_tech = "magnets=2" + origin_tech = "magnets=2;materials=2" var/on = 0 var/visible = 0 diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index dfdb4b9cca6..fb643f482bc 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -3,7 +3,7 @@ desc = "A handy little spring-loaded trap for catching pesty rodents." icon_state = "mousetrap" materials = list(MAT_METAL=100) - origin_tech = "combat=1" + origin_tech = "combat=1;materials=2;engineering=1" attachable = 1 var/armed = 0 diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index 32352855eb2..1a652ba61b1 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -3,7 +3,7 @@ desc = "Used for scanning and alerting when someone enters a certain proximity." icon_state = "prox" materials = list(MAT_METAL=800, MAT_GLASS=200) - origin_tech = "magnets=1" + origin_tech = "magnets=1;engineering=1" attachable = 1 var/scanning = 0 diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index 6f9a7127184..db8cd41f582 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -4,7 +4,7 @@ icon_state = "signaller" item_state = "signaler" materials = list(MAT_METAL=400, MAT_GLASS=120) - origin_tech = "magnets=1" + origin_tech = "magnets=1;bluespace=1" wires = WIRE_RECEIVE | WIRE_PULSE | WIRE_RADIO_PULSE | WIRE_RADIO_RECEIVE attachable = 1 diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index 3432899486a..4f459a497c0 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -3,7 +3,7 @@ desc = "Used to time things. Works well with contraptions which has to count down. Tick tock." icon_state = "timer" materials = list(MAT_METAL=500, MAT_GLASS=50) - origin_tech = "magnets=1" + origin_tech = "magnets=1;engineering=1" attachable = 1 var/timing = 0 @@ -116,4 +116,3 @@ if(usr) attack_self(usr) - diff --git a/code/modules/assembly/voice.dm b/code/modules/assembly/voice.dm index 81d027e4757..0d9fd0b5e8f 100644 --- a/code/modules/assembly/voice.dm +++ b/code/modules/assembly/voice.dm @@ -3,7 +3,7 @@ desc = "A small electronic device able to record a voice sample, and send a signal when that sample is repeated." icon_state = "voice" materials = list(MAT_METAL=500, MAT_GLASS=50) - origin_tech = "magnets=1" + origin_tech = "magnets=1;engineering=1" flags = HEAR attachable = 1 verb_say = "beeps" diff --git a/code/modules/detectivework/scanner.dm b/code/modules/detectivework/scanner.dm index 953cab9ade6..1c37803b5cd 100644 --- a/code/modules/detectivework/scanner.dm +++ b/code/modules/detectivework/scanner.dm @@ -12,7 +12,7 @@ slot_flags = SLOT_BELT var/scanning = 0 var/list/log = list() - origin_tech = "engineering=3;biotech=2" + origin_tech = "engineering=4;biotech=2;programming=5" /obj/item/device/detective_scanner/attack_self(mob/user) if(log.len && !scanning) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 306633d56bc..c0eaf24d4e6 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -15,6 +15,7 @@ // Saves us from having to define each stupid grown's dried_type as itself. // If you don't want a plant to be driable (watermelons) set this to null in the time definition. burn_state = FLAMMABLE + origin_tech = "biotech=1" /obj/item/weapon/reagent_containers/food/snacks/grown/New(newloc, var/obj/item/seeds/new_seed = null) ..() diff --git a/code/modules/hydroponics/grown/ambrosia.dm b/code/modules/hydroponics/grown/ambrosia.dm index 87d8bffef59..f58fbb91f7f 100644 --- a/code/modules/hydroponics/grown/ambrosia.dm +++ b/code/modules/hydroponics/grown/ambrosia.dm @@ -28,6 +28,7 @@ seed = /obj/item/seeds/ambrosia name = "ambrosia vulgaris branch" desc = "This is a plant containing various healing chemicals." + origin_tech = "biotech=2" // Ambrosia Deus /obj/item/seeds/ambrosia/deus @@ -46,4 +47,5 @@ name = "ambrosia deus branch" desc = "Eating this makes you feel immortal!" icon_state = "ambrosiadeus" - filling_color = "#008B8B" \ No newline at end of file + filling_color = "#008B8B" + origin_tech = "biotech=4;materials=3" diff --git a/code/modules/hydroponics/grown/apple.dm b/code/modules/hydroponics/grown/apple.dm index 3c953770677..370184ebe27 100644 --- a/code/modules/hydroponics/grown/apple.dm +++ b/code/modules/hydroponics/grown/apple.dm @@ -51,4 +51,5 @@ name = "golden apple" desc = "Emblazoned upon the apple is the word 'Kallisti'." icon_state = "goldapple" - filling_color = "#FFD700" \ No newline at end of file + filling_color = "#FFD700" + origin_tech = "biotech=4;materials=5" diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm index c5abc2caf69..df4fdd7cec1 100644 --- a/code/modules/hydroponics/grown/banana.dm +++ b/code/modules/hydroponics/grown/banana.dm @@ -100,6 +100,7 @@ icon_state = "banana_blue" trash = /obj/item/weapon/grown/bananapeel/bluespace filling_color = "#0000FF" + origin_tech = "biotech=3;bluespace=5" /obj/item/weapon/grown/bananapeel/bluespace seed = /obj/item/seeds/banana/bluespace @@ -107,7 +108,6 @@ desc = "A peel from a bluespace banana." icon_state = "banana_peel_blue" - // Other /obj/item/weapon/grown/bananapeel/specialpeel //used by /obj/item/clothing/shoes/clown_shoes/banana_shoes name = "synthesized banana peel" @@ -117,4 +117,4 @@ if(iscarbon(AM)) var/mob/living/carbon/carbon = AM if(carbon.slip(2, 2, src, FALSE)) - qdel(src) \ No newline at end of file + qdel(src) diff --git a/code/modules/hydroponics/grown/berries.dm b/code/modules/hydroponics/grown/berries.dm index e32f4a1eb12..4fdda0e88cf 100644 --- a/code/modules/hydroponics/grown/berries.dm +++ b/code/modules/hydroponics/grown/berries.dm @@ -85,6 +85,7 @@ desc = "Nutritious!" icon_state = "glowberrypile" filling_color = "#7CFC00" + origin_tech = "plasmatech=5" // Cherries /obj/item/seeds/cherry @@ -178,4 +179,4 @@ seed = /obj/item/seeds/grape/green name = "bunch of green grapes" icon_state = "greengrapes" - filling_color = "#7FFF00" \ No newline at end of file + filling_color = "#7FFF00" diff --git a/code/modules/hydroponics/grown/chili.dm b/code/modules/hydroponics/grown/chili.dm index 707b92e4ee8..fbf90fea989 100644 --- a/code/modules/hydroponics/grown/chili.dm +++ b/code/modules/hydroponics/grown/chili.dm @@ -46,6 +46,7 @@ icon_state = "icepepper" filling_color = "#0000CD" bitesize_mod = 2 + origin_tech = "biotech=4" // Ghost Chili /obj/item/seeds/chili/ghost @@ -71,6 +72,7 @@ var/mob/held_mob filling_color = "#F8F8FF" bitesize_mod = 4 + origin_tech = "biotech=4;magnets=5" /obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili/attack_hand(mob/user) ..() @@ -88,4 +90,4 @@ held_mob << "Your hand holding [src] burns!" else held_mob = null - ..() \ No newline at end of file + ..() diff --git a/code/modules/hydroponics/grown/misc.dm b/code/modules/hydroponics/grown/misc.dm index de334bb6098..9f14ee21aa3 100644 --- a/code/modules/hydroponics/grown/misc.dm +++ b/code/modules/hydroponics/grown/misc.dm @@ -89,6 +89,6 @@ name = "gatfruit" desc = "It smells like burning." icon_state = "gatfruit" - origin_tech = "combat=3" + origin_tech = "combat=6" trash = /obj/item/weapon/gun/projectile/revolver - bitesize_mod = 2 \ No newline at end of file + bitesize_mod = 2 diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm index 122f09e3353..0ac728ab194 100644 --- a/code/modules/hydroponics/grown/mushrooms.dm +++ b/code/modules/hydroponics/grown/mushrooms.dm @@ -76,6 +76,7 @@ plant_type = PLANT_MUSHROOM reagents_add = list("mushroomhallucinogen" = 0.04, "amatoxin" = 0.1, "nutriment" = 0, "amanitin" = 0.2) rarity = 30 + origin_tech = "biotech=5" /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/angel seed = /obj/item/seeds/angel @@ -158,6 +159,7 @@ desc = "Plumus Locomotus: The beginning of the great walk." icon_state = "walkingmushroom" filling_color = "#9370DB" + origin_tech = "biotech=4;programming=5" /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/walkingmushroom/attack_self(mob/user) if(istype(user.loc,/turf/open/space)) @@ -228,6 +230,7 @@ icon_state = "glowshroom" filling_color = "#00FA9A" var/effect_path = /obj/effect/glowshroom + origin_tech = "biotech=4;plasmatech=5" /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/attack_self(mob/user) if(istype(user.loc,/turf/open/space)) @@ -263,4 +266,5 @@ desc = "Mycena Ruthenia: This species of mushroom glows in the dark, but aren't bioluminescent. They're warm to the touch..." icon_state = "glowcap" filling_color = "#00FA9A" - effect_path = /obj/effect/glowshroom/glowcap \ No newline at end of file + effect_path = /obj/effect/glowshroom/glowcap + origin_tech = "biotech=4;powerstorage=6;plasmatech=4" diff --git a/code/modules/hydroponics/grown/nettle.dm b/code/modules/hydroponics/grown/nettle.dm index 86927e59be2..76ec1a3f3b1 100644 --- a/code/modules/hydroponics/grown/nettle.dm +++ b/code/modules/hydroponics/grown/nettle.dm @@ -27,7 +27,6 @@ reagents_add = list("facid" = 0.5, "sacid" = 0.5) rarity = 20 - /obj/item/weapon/grown/nettle //abstract type name = "nettle" desc = "It's probably not wise to touch it with bare hands..." @@ -40,7 +39,7 @@ w_class = 1 throw_speed = 1 throw_range = 3 - origin_tech = "combat=1" + origin_tech = "combat=3" attack_verb = list("stung") /obj/item/weapon/grown/nettle/suicide_act(mob/user) @@ -74,7 +73,6 @@ usr.unEquip(src) qdel(src) - /obj/item/weapon/grown/nettle/basic seed = /obj/item/seeds/nettle @@ -82,7 +80,6 @@ ..() force = round((5 + seed.potency / 5), 1) - /obj/item/weapon/grown/nettle/death seed = /obj/item/seeds/nettle/death name = "deathnettle" @@ -90,7 +87,7 @@ icon_state = "deathnettle" force = 30 throwforce = 15 - origin_tech = "combat=3" + origin_tech = "combat=5" /obj/item/weapon/grown/nettle/death/add_juice() ..() @@ -113,4 +110,4 @@ if(prob(20)) M.Paralyse(force / 6) M.Weaken(force / 15) - M.drop_item() \ No newline at end of file + M.drop_item() diff --git a/code/modules/hydroponics/grown/tomato.dm b/code/modules/hydroponics/grown/tomato.dm index 2176b0dab71..3e588efa1e4 100644 --- a/code/modules/hydroponics/grown/tomato.dm +++ b/code/modules/hydroponics/grown/tomato.dm @@ -41,6 +41,7 @@ icon_state = "bloodtomato" splat_type = /obj/effect/gibspawner/generic filling_color = "#FF0000" + origin_tech = "biotech=5" // Blue Tomato @@ -86,6 +87,7 @@ name = "blue-space tomato" desc = "So lubricated, you might slip through space-time." icon_state = "bluespacetomato" + origin_tech = "biotech=4;bluespace=5" // Killer Tomato @@ -112,6 +114,7 @@ icon_state = "killertomato" var/awakening = 0 filling_color = "#FF0000" + origin_tech = "biotech=4;combat=5" /obj/item/weapon/reagent_containers/food/snacks/grown/tomato/killer/attack(mob/M, mob/user, def_zone) if(awakening) @@ -136,4 +139,4 @@ K.visible_message("The Killer Tomato growls as it suddenly awakens.") if(user) user.unEquip(src) - qdel(src) \ No newline at end of file + qdel(src) diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index fc00ebb2e54..3fbd9cee816 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -5,7 +5,7 @@ icon = 'icons/obj/device.dmi' icon_state = "hydro" item_state = "analyzer" - origin_tech = "magnets=1;biotech=1" + origin_tech = "magnets=2;biotech=2" /obj/item/device/analyzer/plant_analyzer/attack_self(mob/user) return 0 @@ -64,6 +64,7 @@ icon = 'icons/obj/weapons.dmi' icon_state = "cultivator" item_state = "cultivator" + origin_tech = "engineering=2;biotech=2" flags = CONDUCT force = 5 throwforce = 7 @@ -84,7 +85,7 @@ throw_speed = 3 throw_range = 4 materials = list(MAT_METAL = 15000) - origin_tech = "materials=2;combat=1" + origin_tech = "materials=2;combat=2" attack_verb = list("chopped", "torn", "cut") hitsound = 'sound/weapons/bladeslice.ogg' sharpness = IS_SHARP @@ -106,7 +107,7 @@ flags = CONDUCT armour_penetration = 20 slot_flags = SLOT_BACK - origin_tech = "materials=2;combat=2" + origin_tech = "materials=3;combat=2" attack_verb = list("chopped", "sliced", "cut", "reaped") hitsound = 'sound/weapons/bladeslice.ogg' @@ -198,4 +199,3 @@ /obj/item/weapon/reagent_containers/glass/bottle/killer/pestkiller/New() ..() reagents.add_reagent("pestkiller", 50) - diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm index 4f120caf00e..801060040c2 100644 --- a/code/modules/hydroponics/plant_genes.dm +++ b/code/modules/hydroponics/plant_genes.dm @@ -171,6 +171,7 @@ // For code, see grown.dm name = "Liquid Contents" examine_line = "It has a lot of liquid contents inside." + origin_tech = list("bio" = 5) /*/datum/plant_gene/trait/squash/on_slip(obj/item/weapon/reagent_containers/food/snacks/grown/G, mob/living/carbon/target) G.squash(target)*/ @@ -209,7 +210,7 @@ // Multiplies max charge by (rate*1000) when used in potato power cells. name = "Electrical Activity" rate = 0.2 - origin_tech = list("powerstorage" = 4) + origin_tech = list("powerstorage" = 5) /datum/plant_gene/trait/cell_charge/on_slip(obj/item/weapon/reagent_containers/food/snacks/grown/G, mob/living/carbon/C) var/power = G.seed.potency*rate @@ -268,7 +269,7 @@ // Teleport radius is calculated as max(round(potency*rate), 1) name = "Bluespace Activity" rate = 0.1 - origin_tech = list("bluespace" = 3) + origin_tech = list("bluespace" = 5) /datum/plant_gene/trait/teleport/on_squash(obj/item/weapon/reagent_containers/food/snacks/grown/G, atom/target) if(isliving(target)) diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index c577ca74bee..ead2f89756e 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -73,7 +73,7 @@ materials = list(MAT_METAL=2000) //one sheet, but where can you make them? var/digspeed = 40 var/list/digsound = list('sound/effects/picaxe1.ogg','sound/effects/picaxe2.ogg','sound/effects/picaxe3.ogg') - origin_tech = "materials=1;engineering=1" + origin_tech = "materials=2;engineering=3" attack_verb = list("hit", "pierced", "sliced", "attacked") /obj/item/weapon/pickaxe/proc/playDigSound() @@ -84,7 +84,7 @@ icon_state = "spickaxe" item_state = "spickaxe" digspeed = 20 //mines faster than a normal pickaxe, bought from mining vendor - origin_tech = "materials=3;engineering=2" + origin_tech = "materials=3;engineering=4" desc = "A silver-plated pickaxe that mines slightly faster than standard-issue." force = 17 @@ -93,7 +93,7 @@ icon_state = "dpickaxe" item_state = "dpickaxe" digspeed = 14 - origin_tech = "materials=4;engineering=3" + origin_tech = "materials=5;engineering=4" desc = "A pickaxe with a diamond pick head. Extremely robust at cracking rock walls and digging up dirt." force = 19 @@ -105,7 +105,7 @@ digspeed = 25 //available from roundstart, faster than a pickaxe. digsound = list('sound/weapons/drill.ogg') hitsound = 'sound/weapons/drill.ogg' - origin_tech = "materials=2;powerstorage=3;engineering=2" + origin_tech = "materials=2;powerstorage=2;engineering=3" desc = "An electric mining drill for the especially scrawny." /obj/item/weapon/pickaxe/drill/cyborg @@ -150,7 +150,7 @@ item_state = "shovel" w_class = 3 materials = list(MAT_METAL=50) - origin_tech = "materials=1;engineering=1" + origin_tech = "materials=2;engineering=2" attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked") sharpness = IS_SHARP @@ -204,6 +204,7 @@ icon_state = "capsule" icon = 'icons/obj/mining.dmi' w_class = 1 + origin_tech = "engineering=3;bluespace=3" var/used = FALSE /obj/item/weapon/survivalcapsule/attack_self() @@ -542,4 +543,3 @@ anchored = 1 layer = MOB_LAYER - 0.2 density = 0 - diff --git a/code/modules/mob/living/carbon/alien/organs.dm b/code/modules/mob/living/carbon/alien/organs.dm index 8ac9093906b..c8ef333c04a 100644 --- a/code/modules/mob/living/carbon/alien/organs.dm +++ b/code/modules/mob/living/carbon/alien/organs.dm @@ -30,7 +30,7 @@ /obj/item/organ/alien/plasmavessel name = "plasma vessel" icon_state = "plasma" - origin_tech = "biotech=5;plasmatech=2" + origin_tech = "biotech=5;plasmatech=4" w_class = 3 zone = "chest" slot = "plasmavessel" @@ -55,7 +55,7 @@ plasma_rate = 15 /obj/item/organ/alien/plasmavessel/large/queen - origin_tech = "biotech=6;plasmatech=3" + origin_tech = "biotech=6;plasmatech=4" plasma_rate = 20 /obj/item/organ/alien/plasmavessel/small @@ -183,5 +183,5 @@ zone = "groin" slot = "eggsac" w_class = 4 - origin_tech = "biotech=8" - alien_powers = list(/obj/effect/proc_holder/alien/lay_egg) \ No newline at end of file + origin_tech = "biotech=6" + alien_powers = list(/obj/effect/proc_holder/alien/lay_egg) diff --git a/code/modules/mob/living/carbon/brain/brain_item.dm b/code/modules/mob/living/carbon/brain/brain_item.dm index 17584a81feb..ca54cf71405 100644 --- a/code/modules/mob/living/carbon/brain/brain_item.dm +++ b/code/modules/mob/living/carbon/brain/brain_item.dm @@ -8,7 +8,7 @@ zone = "head" slot = "brain" vital = 1 - origin_tech = "biotech=4" + origin_tech = "biotech=5" attack_verb = list("attacked", "slapped", "whacked") var/mob/living/carbon/brain/brainmob = null var/damaged_brain = 0 //whether the brain organ is damaged. @@ -124,4 +124,4 @@ name = "alien brain" desc = "We barely understand the brains of terrestial animals. Who knows what we may find in the brain of such an advanced species?" icon_state = "brain-x" - origin_tech = "biotech=7" \ No newline at end of file + origin_tech = "biotech=6" diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 21c3f31d6d3..0a218a9ec1f 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -15,7 +15,6 @@ var/maxcharge = 1000 materials = list(MAT_METAL=700, MAT_GLASS=50) var/rigged = 0 // true if rigged to explode - var/minor_fault = 0 //If not 100% reliable, it will build up faults. var/chargerate = 100 //how much power is given every tick in a recharger var/self_recharge = 0 //does it self recharge, over time, or not? @@ -159,7 +158,6 @@ /obj/item/weapon/stock_parts/cell/crap name = "\improper Nanotrasen brand rechargable AA battery" desc = "You can't top the plasma top." //TOTALLY TRADEMARK INFRINGEMENT - origin_tech = null maxcharge = 500 materials = list(MAT_GLASS=40) rating = 2 @@ -195,7 +193,7 @@ /obj/item/weapon/stock_parts/cell/high name = "high-capacity power cell" - origin_tech = "powerstorage=2" + origin_tech = "powerstorage=3" icon_state = "hcell" maxcharge = 10000 materials = list(MAT_GLASS=60) @@ -215,7 +213,7 @@ /obj/item/weapon/stock_parts/cell/super name = "super-capacity power cell" - origin_tech = "powerstorage=5" + origin_tech = "powerstorage=4" icon_state = "scell" maxcharge = 20000 materials = list(MAT_GLASS=70) @@ -228,7 +226,7 @@ /obj/item/weapon/stock_parts/cell/hyper name = "hyper-capacity power cell" - origin_tech = "powerstorage=6" + origin_tech = "powerstorage=5" icon_state = "hpcell" maxcharge = 30000 materials = list(MAT_GLASS=80) @@ -242,7 +240,7 @@ /obj/item/weapon/stock_parts/cell/bluespace name = "bluespace power cell" desc = "A rechargable transdimensional power cell." - origin_tech = "powerstorage=7" + origin_tech = "powerstorage=5;bluespace=5" icon_state = "bscell" maxcharge = 40000 materials = list(MAT_GLASS=80) @@ -256,7 +254,7 @@ /obj/item/weapon/stock_parts/cell/infinite name = "infinite-capacity power cell!" icon_state = "icell" - origin_tech = null + origin_tech = "powerstorage=7" maxcharge = 30000 materials = list(MAT_GLASS=80) rating = 6 @@ -268,19 +266,17 @@ /obj/item/weapon/stock_parts/cell/potato name = "potato battery" desc = "A rechargable starch based power cell." - origin_tech = "powerstorage=1" icon = 'icons/obj/power.dmi' //'icons/obj/hydroponics/harvest.dmi' icon_state = "potato_cell" //"potato_battery" charge = 100 maxcharge = 300 materials = list() - minor_fault = 1 rating = 1 /obj/item/weapon/stock_parts/cell/high/slime name = "charged slime core" desc = "A yellow slime core infused with plasma, it crackles with power." - origin_tech = "powerstorage=2;biotech=4" + origin_tech = "powerstorage=5;biotech=4" icon = 'icons/mob/slimes.dmi' icon_state = "yellow slime extract" materials = list() diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index de962a64e34..9bf9119f00b 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -5,7 +5,7 @@ item_state = "laser" w_class = 3 materials = list(MAT_METAL=2000) - origin_tech = "combat=3;magnets=2" + origin_tech = "combat=4;magnets=2" ammo_type = list(/obj/item/ammo_casing/energy/lasergun) ammo_x_offset = 1 shaded_charge = 1 @@ -44,6 +44,7 @@ /obj/item/weapon/gun/energy/laser/cyborg can_charge = 0 desc = "An energy-based laser gun that draws power from the cyborg's internal energy cell directly. So this is what freedom looks like?" + origin_tech = null /obj/item/weapon/gun/energy/laser/cyborg/newshot() ..() @@ -94,7 +95,7 @@ desc = "A high-power laser gun capable of expelling concentrated xray blasts that pass through multiple soft targets and heavier materials" icon_state = "xray" item_state = null - origin_tech = "combat=5;materials=3;magnets=2;syndicate=2" + origin_tech = "combat=6;materials=4;magnets=4;syndicate=2" ammo_type = list(/obj/item/ammo_casing/energy/xray) pin = null ammo_x_offset = 3 @@ -106,7 +107,7 @@ icon_state = "bluetag" desc = "A retro laser gun modified to fire harmless blue beams of light. Sound effects included!" ammo_type = list(/obj/item/ammo_casing/energy/laser/bluetag) - origin_tech = "combat=1;magnets=2" + origin_tech = "combat=2;magnets=2" clumsy_check = 0 needs_permit = 0 pin = /obj/item/device/firing_pin/tag/blue @@ -118,7 +119,7 @@ icon_state = "redtag" desc = "A retro laser gun modified to fire harmless beams red of light. Sound effects included!" ammo_type = list(/obj/item/ammo_casing/energy/laser/redtag) - origin_tech = "combat=1;magnets=2" + origin_tech = "combat=2;magnets=2" clumsy_check = 0 needs_permit = 0 pin = /obj/item/device/firing_pin/tag/red diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index f76244c72f6..427602c4e97 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -4,7 +4,7 @@ icon_state = "energy" item_state = null //so the human update icon uses the icon_state instead. ammo_type = list(/obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/laser) - origin_tech = "combat=3;magnets=2" + origin_tech = "combat=4;magnets=3" modifystate = 2 can_flashlight = 1 ammo_x_offset = 3 @@ -35,6 +35,7 @@ name = "\improper X-01 MultiPhase Energy Gun" desc = "This is a expensive, modern recreation of a antique laser gun. This gun has several unique firemodes, but lacks the ability to recharge over time." icon_state = "hoslaser" + origin_tech = "combat=5;magnets=4" force = 10 ammo_type = list(/obj/item/ammo_casing/energy/electrode/hos, /obj/item/ammo_casing/energy/laser/hos, /obj/item/ammo_casing/energy/disabler) ammo_x_offset = 4 @@ -43,7 +44,7 @@ name = "\improper DRAGnet" desc = "The \"Dynamic Rapid-Apprehension of the Guilty\" net is a revolution in law enforcement technology." icon_state = "dragnet" - origin_tech = "combat=3;magnets=3;materials=4;bluespace=4" + origin_tech = "combat=4;magnets=3;bluespace=4" ammo_type = list(/obj/item/ammo_casing/energy/net, /obj/item/ammo_casing/energy/trap) can_flashlight = 0 ammo_x_offset = 1 diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 6588d656efd..4b58fb56664 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -3,7 +3,7 @@ desc = "A man-portable anti-armor weapon designed to disable mechanical threats at range." icon_state = "ionrifle" item_state = null //so the human update icon uses the icon_state instead. - origin_tech = "combat=2;magnets=4" + origin_tech = "combat=4;magnets=4" can_flashlight = 1 w_class = 5 flags = CONDUCT @@ -20,7 +20,6 @@ name = "ion carbine" desc = "The MK.II Prototype Ion Projector is a lightweight carbine version of the larger ion rifle, built to be ergonomic and efficient." icon_state = "ioncarbine" - origin_tech = "combat=4;magnets=4;materials=4" w_class = 3 slot_flags = SLOT_BELT pin = null @@ -32,7 +31,7 @@ name = "biological demolecularisor" desc = "A gun that discharges high amounts of controlled radiation to slowly break a target into component elements." icon_state = "decloner" - origin_tech = "combat=5;materials=4;powerstorage=3" + origin_tech = "combat=5;materials=4;biotech=4" ammo_type = list(/obj/item/ammo_casing/energy/declone) pin = null ammo_x_offset = 1 @@ -49,7 +48,7 @@ icon_state = "flora" item_state = "gun" ammo_type = list(/obj/item/ammo_casing/energy/flora/yield, /obj/item/ammo_casing/energy/flora/mut) - origin_tech = "materials=2;biotech=3;powerstorage=3" + origin_tech = "materials=2;biotech=4" modifystate = 1 ammo_x_offset = 1 selfcharge = 1 @@ -94,7 +93,7 @@ var/overheat_time = 16 unique_rename = 1 weapon_weight = WEAPON_HEAVY - origin_tech = "combat=2;powerstorage=1" + origin_tech = "combat=3;powerstorage=3;engineering=3" /obj/item/weapon/gun/energy/kinetic_accelerator/super name = "super-kinetic accelerator" @@ -102,7 +101,7 @@ icon_state = "kineticgun_u" ammo_type = list(/obj/item/ammo_casing/energy/kinetic/super) overheat_time = 15 - origin_tech = "combat=3;powerstorage=2" + origin_tech = "materials=4;powerstorage=4;engineering=4;magnets=4;combat=3" /obj/item/weapon/gun/energy/kinetic_accelerator/hyper name = "hyper-kinetic accelerator" @@ -110,7 +109,7 @@ icon_state = "kineticgun_h" ammo_type = list(/obj/item/ammo_casing/energy/kinetic/hyper) overheat_time = 14 - origin_tech = "combat=4;powerstorage=3" + origin_tech = "materials=6;powerstorage=4;engineering=5;magnets=4;combat=4" /obj/item/weapon/gun/energy/kinetic_accelerator/shoot_live_shot() ..() @@ -142,7 +141,7 @@ item_state = "crossbow" w_class = 2 materials = list(MAT_METAL=2000) - origin_tech = "combat=2;magnets=2;syndicate=5" + origin_tech = "combat=3;magnets=3;syndicate=5" suppressed = 1 ammo_type = list(/obj/item/ammo_casing/energy/bolt) weapon_weight = WEAPON_LIGHT @@ -155,7 +154,7 @@ icon_state = "crossbowlarge" w_class = 3 materials = list(MAT_METAL=4000) - origin_tech = "combat=2;magnets=2;syndicate=3" //can be further researched for more syndie tech + origin_tech = "combat=4;magnets=4;syndicate=3" //can be further researched for more syndie tech suppressed = 0 ammo_type = list(/obj/item/ammo_casing/energy/bolt/large) pin = null @@ -173,7 +172,7 @@ icon_state = "plasmacutter" item_state = "plasmacutter" modifystate = -1 - origin_tech = "combat=1;materials=3;magnets=2;plasmatech=2;engineering=1" + origin_tech = "combat=1;materials=3;magnets=2;plasmatech=3;engineering=1" ammo_type = list(/obj/item/ammo_casing/energy/plasma) flags = CONDUCT | OPENCONTAINER attack_verb = list("attacked", "slashed", "cut", "sliced") @@ -204,7 +203,7 @@ /obj/item/weapon/gun/energy/plasmacutter/adv name = "advanced plasma cutter" icon_state = "adv_plasmacutter" - origin_tech = "combat=3;materials=4;magnets=3;plasmatech=3;engineering=2" + origin_tech = "combat=3;materials=4;magnets=3;plasmatech=4;engineering=2" ammo_type = list(/obj/item/ammo_casing/energy/plasma/adv) /obj/item/weapon/gun/energy/wormhole_projector @@ -287,7 +286,7 @@ desc = "A specialized ASMD laser-rifle, capable of flat-out disintegrating most targets in a single hit." ammo_type = list(/obj/item/ammo_casing/energy/instakill) force = 60 - origin_tech = null + origin_tech = "combat=7;magnets=6" /obj/item/weapon/gun/energy/laser/instakill/red desc = "A specialized ASMD laser-rifle, capable of flat-out disintegrating most targets in a single hit. This one has a red design." @@ -302,4 +301,4 @@ ammo_type = list(/obj/item/ammo_casing/energy/instakill/blue) /obj/item/weapon/gun/energy/laser/instakill/emp_act() //implying you could stop the instagib - return \ No newline at end of file + return diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index 32e1413a173..ef03a5c1b32 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -4,6 +4,7 @@ icon_state = "taser" item_state = null //so the human update icon uses the icon_state instead. ammo_type = list(/obj/item/ammo_casing/energy/electrode) + origin_tech = "combat=3" ammo_x_offset = 3 /obj/item/weapon/gun/energy/shock_revolver @@ -12,6 +13,7 @@ icon_state = "tesla" item_state = "tesla" ammo_type = list(/obj/item/ammo_casing/energy/shock_revolver) + origin_tech = "combat=3" can_flashlight = 0 pin = null shaded_charge = 1 @@ -21,12 +23,13 @@ desc = "A dual-mode taser designed to fire both short-range high-power electrodes and long-range disabler beams." icon_state = "advtaser" ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/disabler) - origin_tech = null + origin_tech = "combat=4" ammo_x_offset = 2 /obj/item/weapon/gun/energy/gun/advtaser/cyborg name = "cyborg taser" desc = "An integrated hybrid taser that draws directly from a cyborg's power cell. The weapon contains a limiter to prevent the cyborg's power cell from overheating." + origin_tech = null can_flashlight = 0 can_charge = 0 @@ -38,13 +41,14 @@ name = "disabler" desc = "A self-defense weapon that exhausts organic targets, weakening them until they collapse." icon_state = "disabler" - item_state = null + item_state = "combat=3" ammo_type = list(/obj/item/ammo_casing/energy/disabler) ammo_x_offset = 3 /obj/item/weapon/gun/energy/disabler/cyborg name = "cyborg disabler" desc = "An integrated disabler that draws from a cyborg's power cell. This weapon contains a limiter to prevent the cyborg's power cell from overheating." + origin_tech = null can_charge = 0 /obj/item/weapon/gun/energy/disabler/cyborg/newshot() diff --git a/code/modules/projectiles/guns/projectile/launchers.dm b/code/modules/projectiles/guns/projectile/launchers.dm index e7d55f30c16..5bd8b3b11ec 100644 --- a/code/modules/projectiles/guns/projectile/launchers.dm +++ b/code/modules/projectiles/guns/projectile/launchers.dm @@ -35,7 +35,7 @@ desc = "A prototype pistol designed to fire self propelled rockets." icon_state = "gyropistol" fire_sound = 'sound/weapons/grenadelaunch.ogg' - origin_tech = "combat=3" + origin_tech = "combat=5" mag_type = /obj/item/ammo_box/magazine/m75 burst_size = 1 fire_delay = 0 @@ -55,6 +55,7 @@ icon_state = "speargun" item_state = "speargun" w_class = 4 + origin_tech = "combat=4;engineering=4" force = 10 can_suppress = 0 mag_type = /obj/item/ammo_box/magazine/internal/speargun diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index 3cdc0b2100a..3e67c747571 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -222,7 +222,7 @@ w_class = 4 force = 10 slot_flags = null - origin_tech = "combat=2;materials=2" + origin_tech = "combat=3;materials=2" mag_type = /obj/item/ammo_box/magazine/internal/shot/improvised sawn_desc = "I'm just here for the gasoline." unique_rename = 0 @@ -308,7 +308,7 @@ name = "combat shotgun" desc = "A semi automatic shotgun with tactical furniture and a six-shell capacity underneath." icon_state = "cshotgun" - origin_tech = "combat=5;materials=2" + origin_tech = "combat=6" mag_type = /obj/item/ammo_box/magazine/internal/shot/tube w_class = 5 @@ -346,7 +346,6 @@ else user << "You switch to tube A." - /obj/item/weapon/gun/projectile/shotgun/automatic/dual_tube/AltClick(mob/living/user) if(user.incapacitated() || !Adjacent(user) || !istype(user)) return @@ -355,4 +354,4 @@ /obj/item/ammo_box/magazine/internal/shot/tube name = "dual feed shotgun internal tube" ammo_type = /obj/item/ammo_casing/shotgun/rubbershot - max_ammo = 4 \ No newline at end of file + max_ammo = 4 diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm index 3cb65acd8ed..8a8c8f03f7c 100644 --- a/code/modules/projectiles/guns/projectile/sniper.dm +++ b/code/modules/projectiles/guns/projectile/sniper.dm @@ -8,7 +8,7 @@ weapon_weight = WEAPON_MEDIUM mag_type = /obj/item/ammo_box/magazine/sniper_rounds fire_delay = 40 - origin_tech = "combat=8" + origin_tech = "combat=7" can_unsuppress = 1 can_suppress = 1 w_class = 3 @@ -28,7 +28,7 @@ name = "syndicate sniper rifle" desc = "Syndicate flavoured sniper rifle, it packs quite a punch, a punch to your face" pin = /obj/item/device/firing_pin/implant/pindicate - origin_tech = "combat=8;syndicate=4" + origin_tech = "combat=7;syndicate=4" @@ -108,7 +108,7 @@ name = "sniper rounds (Bleed)" desc = "Haemorrhage sniper rounds, leaves your target in a pool of crimson pain" icon_state = "haemorrhage" - origin_tech = "combat=7;syndicate=5" + origin_tech = "combat=5;syndicate=5" ammo_type = /obj/item/ammo_casing/haemorrhage max_ammo = 5 caliber = ".50" diff --git a/code/modules/projectiles/guns/syringe_gun.dm b/code/modules/projectiles/guns/syringe_gun.dm index 44fd2c98dd4..f583d3414e6 100644 --- a/code/modules/projectiles/guns/syringe_gun.dm +++ b/code/modules/projectiles/guns/syringe_gun.dm @@ -8,6 +8,7 @@ throw_range = 7 force = 4 materials = list(MAT_METAL=2000) + origin_tech = "combat=3;biotech=3" clumsy_check = 0 fire_sound = 'sound/items/syringeproj.ogg' var/list/syringes = list() diff --git a/code/modules/research/designs/mecha_designs.dm b/code/modules/research/designs/mecha_designs.dm index a2028a40d54..f9e573f6b14 100644 --- a/code/modules/research/designs/mecha_designs.dm +++ b/code/modules/research/designs/mecha_designs.dm @@ -66,7 +66,7 @@ name = "\"Gygax\" Weapons & Targeting Control module" desc = "Allows for the construction of a \"Gygax\" Weapons & Targeting Control module." id = "gygax_targ" - req_tech = list("programming" = 4, "combat" = 2) + req_tech = list("programming" = 4, "combat" = 4) build_type = IMPRINTER materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mecha/gygax/targeting @@ -96,7 +96,7 @@ name = "\"Durand\" Weapons & Targeting Control module" desc = "Allows for the construction of a \"Durand\" Weapons & Targeting Control module." id = "durand_targ" - req_tech = list("programming" = 4, "combat" = 2) + req_tech = list("programming" = 4, "combat" = 4) build_type = IMPRINTER materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mecha/durand/targeting @@ -136,7 +136,7 @@ name = "\"Phazon\" Central Control module" desc = "Allows for the construction of a \"Phazon\" Central Control module." id = "phazon_main" - req_tech = list("programming" = 5, "materials" = 7, "powerstorage" = 6) + req_tech = list("programming" = 5, "materials" = 6, "powerstorage" = 5) build_type = IMPRINTER materials = list(MAT_GLASS = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mecha/phazon/main diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index a65b249a1e5..dbfafe836ee 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -242,7 +242,7 @@ name = "Implanter" desc = "A sterile automatic implant injector." id = "implanter" - req_tech = list("materials" = 1, "programming" = 2, "biotech" = 3) + req_tech = list("materials" = 2, "biotech" = 3) build_type = PROTOLATHE materials = list(MAT_METAL = 600, MAT_GLASS = 200) build_path = /obj/item/weapon/implanter diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm index b64bdfb836e..144ba2a81c6 100644 --- a/code/modules/research/designs/weapon_designs.dm +++ b/code/modules/research/designs/weapon_designs.dm @@ -6,7 +6,7 @@ name = "test-range firing pin" desc = "This safety firing pin allows firearms to be operated within proximity to a firing range." id = "pin_testing" - req_tech = list("combat" = 1, "materials" = 2) + req_tech = list("combat" = 2, "materials" = 2) build_type = PROTOLATHE materials = list(MAT_METAL = 500, MAT_GLASS = 300) build_path = /obj/item/device/firing_pin/test_range @@ -107,7 +107,7 @@ name = "Floral Somatoray" desc = "A tool that discharges controlled radiation which induces mutation in plant cells. Harmless to other organic life." id = "flora_gun" - req_tech = list("materials" = 2, "biotech" = 3, "powerstorage" = 3) + req_tech = list("materials" = 2, "biotech" = 4) build_type = PROTOLATHE materials = list(MAT_METAL = 2000, MAT_GLASS = 500) reagents = list("radium" = 20) diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm index a3b856b5f0f..b70d543db5d 100644 --- a/code/modules/research/destructive_analyzer.dm +++ b/code/modules/research/destructive_analyzer.dm @@ -62,4 +62,3 @@ Note: Must be placed within 3 tiles of the R&D Console flick("d_analyzer_la", src) spawn(10) busy = 0 - diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index 7f2beb39a06..eff680d02c9 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -600,6 +600,7 @@ name = realName cooldownMax = rand(60,300) realProc = pick("teleport","explode","rapidDupe","petSpray","flash","clean","corgicannon") + origin_tech = pick("engineering=[rand(2,5)]","magnets=[rand(2,5)]","plasmatech=[rand(2,5)]","programming=[rand(2,5)]","powerstorage=[rand(2,5)]") /obj/item/weapon/relic/attack_self(mob/user) if(revealed) diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 5ee5fe390c8..2d4b4f7cce2 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -260,23 +260,19 @@ proc/CallMaterialName(ID) spawn(24) if(linked_destroy) linked_destroy.busy = 0 - if(!linked_destroy.hacked) - if(!linked_destroy.loaded_item) - usr <<"The destructive analyzer appears to be empty." - screen = 1.0 - return - - for(var/T in temp_tech) - files.UpdateTech(T, temp_tech[T]) + if(!linked_destroy.loaded_item) + usr <<"The destructive analyzer appears to be empty." screen = 1.0 + return - if(linked_lathe) //Also sends salvaged materials to a linked protolathe, if any. - for(var/material in linked_destroy.loaded_item.materials) - linked_lathe.materials.insert_amount(min((linked_lathe.materials.max_amount - linked_lathe.materials.total_amount), (linked_destroy.loaded_item.materials[material]*(linked_destroy.decon_mod/10))), material) - feedback_add_details("item_deconstructed","[linked_destroy.loaded_item.type]") - linked_destroy.loaded_item = null - else - screen = 1.0 + for(var/T in temp_tech) + files.UpdateTech(T, temp_tech[T]) + + if(linked_lathe) //Also sends salvaged materials to a linked protolathe, if any. + for(var/material in linked_destroy.loaded_item.materials) + linked_lathe.materials.insert_amount(min((linked_lathe.materials.max_amount - linked_lathe.materials.total_amount), (linked_destroy.loaded_item.materials[material]*(linked_destroy.decon_mod/10))), material) + feedback_add_details("item_deconstructed","[linked_destroy.loaded_item.type]") + linked_destroy.loaded_item = null for(var/obj/I in linked_destroy.contents) for(var/mob/M in I.contents) M.death() @@ -292,8 +288,9 @@ proc/CallMaterialName(ID) if(!(I in linked_destroy.component_parts)) qdel(I) linked_destroy.icon_state = "d_analyzer" - use_power(250) - updateUsrDialog() + screen = 1.0 + use_power(250) + updateUsrDialog() else if(href_list["lock"]) //Lock the console from use by anyone without tox access. if(src.allowed(usr)) @@ -368,7 +365,7 @@ proc/CallMaterialName(ID) - if (g2g && !linked_lathe.busy) //If input is incorrect, nothing happens + if (g2g) //If input is incorrect, nothing happens var/enough_materials = 1 linked_lathe.busy = 1 flick("protolathe_n",linked_lathe) @@ -410,10 +407,10 @@ proc/CallMaterialName(ID) feedback_add_details("item_printed","[new_item.type]|[amount]") already_logged = 1 screen = old_screen - linked_lathe.busy = 0 else src.visible_message("The [src.name] beeps, \"Something went wrong, production halted!\"") screen = 1.0 + linked_lathe.busy = 0 updateUsrDialog() else if(href_list["imprint"]) //Causes the Circuit Imprinter to build something. @@ -456,12 +453,16 @@ proc/CallMaterialName(ID) var/P = being_built.build_path //lets save these values before the spawn() just in case. Nobody likes runtimes. spawn(16) - if(g2g) - var/obj/item/new_item = new P(src) - new_item.loc = linked_imprinter.loc - feedback_add_details("circuit_printed","[new_item.type]") + if(linked_imprinter) + if(g2g) + var/obj/item/new_item = new P(src) + new_item.loc = linked_imprinter.loc + feedback_add_details("circuit_printed","[new_item.type]") + screen = old_screen + else + src.visible_message("The [src.name] beeps, \"Something went wrong, production halted!\"") + screen = 1.0 linked_imprinter.busy = 0 - screen = old_screen updateUsrDialog() else if(href_list["disposeI"] && linked_imprinter) //Causes the circuit imprinter to dispose of a single reagent (all of it) diff --git a/code/modules/research/stock_parts.dm b/code/modules/research/stock_parts.dm index dc811c406f0..58808318403 100644 --- a/code/modules/research/stock_parts.dm +++ b/code/modules/research/stock_parts.dm @@ -166,7 +166,7 @@ name = "super capacitor" desc = "A super-high capacity capacitor used in the construction of a variety of devices." icon_state = "super_capacitor" - origin_tech = "powerstorage=5;materials=4" + origin_tech = "powerstorage=4;materials=2" rating = 3 materials = list(MAT_METAL=50, MAT_GLASS=50) @@ -174,7 +174,7 @@ name = "phasic scanning module" desc = "A compact, high resolution phasic scanning module used in the construction of certain devices." icon_state = "super_scan_module" - origin_tech = "magnets=5" + origin_tech = "magnets=4" rating = 3 materials = list(MAT_METAL=50, MAT_GLASS=20) @@ -182,7 +182,7 @@ name = "pico-manipulator" desc = "A tiny little manipulator used in the construction of certain devices." icon_state = "pico_mani" - origin_tech = "materials=5;programming=2" + origin_tech = "materials=4;programming=3" rating = 3 materials = list(MAT_METAL=30) @@ -190,7 +190,7 @@ name = "ultra-high-power micro-laser" icon_state = "ultra_high_micro_laser" desc = "A tiny laser used in certain devices." - origin_tech = "magnets=5" + origin_tech = "magnets=4" rating = 3 materials = list(MAT_METAL=10, MAT_GLASS=20) @@ -198,7 +198,7 @@ name = "super matter bin" desc = "A container designed to hold compressed matter awaiting reconstruction." icon_state = "super_matter_bin" - origin_tech = "materials=5" + origin_tech = "materials=4" rating = 3 materials = list(MAT_METAL=80) @@ -208,7 +208,7 @@ name = "quadratic capacitor" desc = "An capacity capacitor used in the construction of a variety of devices." icon_state = "quadratic_capacitor" - origin_tech = "powerstorage=6;materials=5" + origin_tech = "powerstorage=5;materials=5" rating = 4 materials = list(MAT_METAL=50, MAT_GLASS=50) @@ -216,7 +216,7 @@ name = "triphasic scanning module" desc = "A compact, ultra resolution triphasic scanning module used in the construction of certain devices." icon_state = "triphasic_scan_module" - origin_tech = "magnets=6" + origin_tech = "magnets=5" rating = 4 materials = list(MAT_METAL=50, MAT_GLASS=20) @@ -224,7 +224,7 @@ name = "femto-manipulator" desc = "A tiny little manipulator used in the construction of certain devices." icon_state = "femto_mani" - origin_tech = "materials=6;programming=3" + origin_tech = "materials=5;programming=4" rating = 4 materials = list(MAT_METAL=30) @@ -232,7 +232,7 @@ name = "quad-ultra micro-laser" icon_state = "quadultra_micro_laser" desc = "A tiny laser used in certain devices." - origin_tech = "magnets=6" + origin_tech = "magnets=5" rating = 4 materials = list(MAT_METAL=10, MAT_GLASS=20) @@ -240,7 +240,7 @@ name = "bluespace matter bin" desc = "A container designed to hold compressed matter awaiting reconstruction." icon_state = "bluespace_matter_bin" - origin_tech = "materials=6" + origin_tech = "materials=5" rating = 4 materials = list(MAT_METAL=80) @@ -250,14 +250,14 @@ name = "subspace ansible" icon_state = "subspace_ansible" desc = "A compact module capable of sensing extradimensional activity." - origin_tech = "programming=2;magnets=3;materials=2;bluespace=1" + origin_tech = "programming=2;magnets=2;materials=2;bluespace=1" materials = list(MAT_METAL=30, MAT_GLASS=10) /obj/item/weapon/stock_parts/subspace/filter name = "hyperwave filter" icon_state = "hyperwave_filter" desc = "A tiny device capable of filtering and converting super-intense radiowaves." - origin_tech = "programming=2;magnets=1" + origin_tech = "programming=2;magnets=2" materials = list(MAT_METAL=30, MAT_GLASS=10) /obj/item/weapon/stock_parts/subspace/amplifier @@ -271,7 +271,7 @@ name = "subspace treatment disk" icon_state = "treatment_disk" desc = "A compact micro-machine capable of stretching out hyper-compressed radio waves." - origin_tech = "programming=2;magnets=1;materials=3;bluespace=1" + origin_tech = "programming=2;magnets=1;materials=2;bluespace=1" materials = list(MAT_METAL=30, MAT_GLASS=10) /obj/item/weapon/stock_parts/subspace/analyzer diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index 5ac42585665..f567b345569 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -160,7 +160,7 @@ desc = "A miraculous chemical mix that can raise the intelligence of creatures to human levels. Unlike normal slime potions, it can be absorbed by any nonsentient being." icon = 'icons/obj/chemical.dmi' icon_state = "bottle19" - origin_tech = "biotech=5" + origin_tech = "biotech=6" var/list/not_interested = list() var/being_used = 0 var/sentience_type = SENTIENCE_ORGANIC @@ -326,6 +326,7 @@ desc = "A potent chemical mix that will remove the slowdown from any item." icon = 'icons/obj/chemical.dmi' icon_state = "bottle3" + origin_tech = "biotech=5" /obj/item/slimepotion/speed/afterattack(obj/C, mob/user) ..() @@ -356,6 +357,7 @@ desc = "A potent chemical mix that will fireproof any article of clothing. Has three uses." icon = 'icons/obj/chemical.dmi' icon_state = "bottle17" + origin_tech = "biotech=5" var/uses = 3 /obj/item/slimepotion/fireproof/afterattack(obj/item/clothing/C, mob/user) @@ -635,4 +637,3 @@ for(var/turf/T in A) T.color = "#2956B2" qdel(src) - diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm index af104113c34..f2d7caa20e2 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/surgery.dmi' var/mob/living/carbon/owner = null var/status = ORGAN_ORGANIC - origin_tech = "biotech=2" + origin_tech = "biotech=3" force = 1 w_class = 2 throwforce = 0 @@ -105,7 +105,7 @@ icon_state = "heart-on" zone = "chest" slot = "heart" - origin_tech = "biotech=3" + origin_tech = "biotech=5" var/beating = 1 var/icon_base = "heart" attack_verb = list("beat", "thumped") @@ -168,7 +168,7 @@ desc = "it needs to be pumped..." icon_state = "cursedheart-off" icon_base = "cursedheart" - origin_tech = "biotech=5" + origin_tech = "biotech=6" actions_types = list(/datum/action/item_action/organ_action/cursed_heart) var/last_pump = 0 var/add_colour = TRUE //So we're not constantly recreating colour datums @@ -435,7 +435,7 @@ name = "black tumor" desc = "A tiny black mass with red tendrils trailing from it. It seems to shrivel in the light." icon_state = "blacktumor" - origin_tech = "biotech=4" + origin_tech = "biotech=5" w_class = 1 zone = "head" slot = "brain_tumor" diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index d783434c582..67b1a888703 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -84,7 +84,7 @@ throw_speed = 2 throw_range = 5 materials = list(MAT_METAL=10000, MAT_GLASS=6000) - origin_tech = "materials=1;biotech=1" + origin_tech = "biotech=1;combat=1" attack_verb = list("attacked", "slashed", "sawed", "cut") sharpness = IS_SHARP diff --git a/code/modules/telesci/bscrystal.dm b/code/modules/telesci/bscrystal.dm index b4f1e9ff465..823e5b88589 100644 --- a/code/modules/telesci/bscrystal.dm +++ b/code/modules/telesci/bscrystal.dm @@ -6,17 +6,15 @@ icon = 'icons/obj/telescience.dmi' icon_state = "bluespace_crystal" w_class = 1 - origin_tech = "bluespace=4;materials=3" + origin_tech = "bluespace=6;materials=3" points = 50 var/blink_range = 8 // The teleport range when crushed/thrown at someone. - /obj/item/weapon/ore/bluespace_crystal/New() ..() pixel_x = rand(-5, 5) pixel_y = rand(-5, 5) - /obj/item/weapon/ore/bluespace_crystal/attack_self(mob/user) user.visible_message("[user] crushes [src]!", "You crush [src]!") PoolOrNew(/obj/effect/particle_effect/sparks, loc) @@ -43,6 +41,6 @@ /obj/item/weapon/ore/bluespace_crystal/artificial name = "artificial bluespace crystal" desc = "An artificially made bluespace crystal, it looks delicate." - origin_tech = "bluespace=2" + origin_tech = "bluespace=3" blink_range = 4 // Not as good as the organic stuff! - points = 0 // nice try \ No newline at end of file + points = 0 // nice try