diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index d000754f93d..600f2f29f46 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -754,7 +754,7 @@ name = "subspace ansible" icon_state = "subspace_ansible" desc = "A compact module capable of sensing extradimensional activity." - origin_tech = "programming=3;magnets=5;materials=4;bluespace=2" + origin_tech = "programming=2;magnets=3;materials=2;bluespace=1" m_amt = 30 g_amt = 10 @@ -762,7 +762,7 @@ name = "hyperwave filter" icon_state = "hyperwave_filter" desc = "A tiny device capable of filtering and converting super-intense radiowaves." - origin_tech = "programming=4;magnets=2" + origin_tech = "programming=2;magnets=1" m_amt = 30 g_amt = 10 @@ -770,7 +770,7 @@ name = "subspace amplifier" icon_state = "subspace_amplifier" desc = "A compact micro-machine capable of amplifying weak subspace transmissions." - origin_tech = "programming=3;magnets=4;materials=4;bluespace=2" + origin_tech = "programming=2;magnets=2;materials=1;bluespace=1" m_amt = 30 g_amt = 10 @@ -778,7 +778,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=3;magnets=2;materials=5;bluespace=2" + origin_tech = "programming=2;magnets=1;materials=3;bluespace=1" m_amt = 30 g_amt = 10 @@ -786,7 +786,7 @@ name = "subspace wavelength analyzer" icon_state = "wavelength_analyzer" desc = "A sophisticated analyzer capable of analyzing cryptic subspace wavelengths." - origin_tech = "programming=3;magnets=4;materials=4;bluespace=2" + origin_tech = "programming=2;magnets=2;materials=2;bluespace=1" m_amt = 30 g_amt = 10 @@ -794,14 +794,14 @@ name = "ansible crystal" icon_state = "ansible_crystal" desc = "A crystal made from pure glass used to transmit laser databursts to subspace." - origin_tech = "magnets=4;materials=4;bluespace=2" + origin_tech = "magnets=2;materials=2;bluespace=1" g_amt = 50 /obj/item/weapon/stock_parts/subspace/transmitter name = "subspace transmitter" icon_state = "subspace_transmitter" desc = "A large piece of equipment used to open a window into the subspace dimension." - origin_tech = "magnets=5;materials=5;bluespace=3" + origin_tech = "magnets=3;materials=3;bluespace=2" m_amt = 50 /obj/item/weapon/ectoplasm diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 42470e03c58..1d6d00a32a3 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -12,7 +12,7 @@ var/list/req_components = null var/list/req_component_names = null // user-friendly names of components var/state = 1 - + // For pods var/list/connected_parts = list() var/pattern_idx=0 @@ -70,7 +70,7 @@ pattern_idx=i return 1 return 0 - + // update description of required components remaining /obj/machinery/constructable_frame/proc/update_req_desc() if(!req_components || !req_component_names) @@ -244,7 +244,7 @@ if(!success) user << "You cannot add that to the machine!" return 0 - + //Machine Frame Circuit Boards /*Common Parts: Parts List: Ignitor, Timer, Infra-red laser, Infra-red sensor, t_scanner, Capacitor, Valve, sensor unit, micro-manipulator, console screen, beaker, Microlaser, matter bin, power cells. @@ -276,7 +276,7 @@ to destroy them and players will be able to make replacements. build_path = typepath name = "circuit board ([names_paths[build_path]] Vendor)" user << "You set the board to [names_paths[build_path]]." - req_components = list(text2path("/obj/item/weapon/vending_refill/[copytext("[build_path]", 24)]") = 3) + req_components = list(text2path("/obj/item/weapon/vending_refill/[copytext("[build_path]", 24)]") = 3) /obj/item/weapon/circuitboard/smes name = "circuit board (SMES)" @@ -289,7 +289,7 @@ to destroy them and players will be able to make replacements. /obj/item/weapon/cell = 5, /obj/item/weapon/stock_parts/capacitor = 1) - + /obj/item/weapon/circuitboard/thermomachine name = "circuit board (Freezer)" desc = "Use screwdriver to switch between heating and cooling modes." @@ -482,8 +482,8 @@ obj/item/weapon/circuitboard/rdserver frame_desc = "Requires 1 piece of cable and 5 Capacitors." req_components = list( /obj/item/stack/cable_coil = 1, - /obj/item/weapon/stock_parts/capacitor = 5) - + /obj/item/weapon/stock_parts/capacitor = 5) + /obj/item/weapon/circuitboard/teleporter_hub name = "circuit board (Teleporter Hub)" build_path = /obj/machinery/teleport/hub @@ -503,8 +503,8 @@ obj/item/weapon/circuitboard/rdserver req_components = list( /obj/item/bluespace_crystal = 2, /obj/item/weapon/stock_parts/capacitor = 2, - /obj/item/weapon/stock_parts/console_screen = 1) - + /obj/item/weapon/stock_parts/console_screen = 1) + /obj/item/weapon/circuitboard/telesci_pad name = "Circuit board (Telepad)" build_path = /obj/machinery/telepad @@ -529,7 +529,7 @@ obj/item/weapon/circuitboard/rdserver /obj/item/weapon/stock_parts/manipulator = 1, /obj/item/stack/cable_coil = 1, /obj/item/weapon/stock_parts/console_screen = 2) - + /obj/item/weapon/circuitboard/sleep_console name = "circuit board (Sleeper Console)" build_path = /obj/machinery/sleep_console @@ -539,7 +539,7 @@ obj/item/weapon/circuitboard/rdserver req_components = list( /obj/item/stack/cable_coil = 2, /obj/item/weapon/stock_parts/console_screen = 2) - + /obj/item/weapon/circuitboard/bodyscanner name = "circuit board (Body Scanner)" build_path = /obj/machinery/bodyscanner @@ -550,7 +550,7 @@ obj/item/weapon/circuitboard/rdserver /obj/item/weapon/stock_parts/scanning_module = 1, /obj/item/stack/cable_coil = 2, /obj/item/weapon/stock_parts/console_screen = 2) - + /obj/item/weapon/circuitboard/bodyscanner_console name = "circuit board (Body Scanner Console)" build_path = /obj/machinery/body_scanconsole @@ -582,13 +582,13 @@ obj/item/weapon/circuitboard/rdserver /obj/item/weapon/stock_parts/capacitor = 2, /obj/item/weapon/cell = 1, /obj/item/weapon/stock_parts/manipulator = 1) - + // Telecomms circuit boards: /obj/item/weapon/circuitboard/telecomms/receiver name = "Circuit Board (Subspace Receiver)" build_path = /obj/machinery/telecomms/receiver board_type = "machine" - origin_tech = "programming=4;engineering=3;bluespace=2" + origin_tech = "programming=2;engineering=2;bluespace=1" frame_desc = "Requires 1 Subspace Ansible, 1 Hyperwave Filter, 2 Manipulators, and 1 Micro-Laser." req_components = list( /obj/item/weapon/stock_parts/subspace/ansible = 1, @@ -600,7 +600,7 @@ obj/item/weapon/circuitboard/rdserver name = "Circuit Board (Hub Mainframe)" build_path = /obj/machinery/telecomms/hub board_type = "machine" - origin_tech = "programming=4;engineering=4" + origin_tech = "programming=2;engineering=2" frame_desc = "Requires 2 Manipulators, 2 Cable Coil and 2 Hyperwave Filter." req_components = list( /obj/item/weapon/stock_parts/manipulator = 2, @@ -611,7 +611,7 @@ obj/item/weapon/circuitboard/rdserver name = "Circuit Board (Relay Mainframe)" build_path = /obj/machinery/telecomms/relay board_type = "machine" - origin_tech = "programming=3;engineering=4;bluespace=3" + origin_tech = "programming=2;engineering=2;bluespace=2" frame_desc = "Requires 2 Manipulators, 2 Cable Coil and 2 Hyperwave Filters." req_components = list( /obj/item/weapon/stock_parts/manipulator = 2, @@ -622,7 +622,7 @@ obj/item/weapon/circuitboard/rdserver name = "Circuit Board (Bus Mainframe)" build_path = /obj/machinery/telecomms/bus board_type = "machine" - origin_tech = "programming=4;engineering=4" + origin_tech = "programming=2;engineering=2" frame_desc = "Requires 2 Manipulators, 1 Cable Coil and 1 Hyperwave Filter." req_components = list( /obj/item/weapon/stock_parts/manipulator = 2, @@ -633,7 +633,7 @@ obj/item/weapon/circuitboard/rdserver name = "Circuit Board (Processor Unit)" build_path = /obj/machinery/telecomms/processor board_type = "machine" - origin_tech = "programming=4;engineering=4" + origin_tech = "programming=2;engineering=2" frame_desc = "Requires 3 Manipulators, 1 Hyperwave Filter, 2 Treatment Disks, 1 Wavelength Analyzer, 2 Cable Coils and 1 Subspace Amplifier." req_components = list( /obj/item/weapon/stock_parts/manipulator = 3, @@ -647,7 +647,7 @@ obj/item/weapon/circuitboard/rdserver name = "Circuit Board (Telecommunication Server)" build_path = /obj/machinery/telecomms/server board_type = "machine" - origin_tech = "programming=4;engineering=4" + origin_tech = "programming=2;engineering=2" frame_desc = "Requires 2 Manipulators, 1 Cable Coil and 1 Hyperwave Filter." req_components = list( /obj/item/weapon/stock_parts/manipulator = 2, @@ -658,7 +658,7 @@ obj/item/weapon/circuitboard/rdserver name = "Circuit Board (Subspace Broadcaster)" build_path = /obj/machinery/telecomms/broadcaster board_type = "machine" - origin_tech = "programming=4;engineering=4;bluespace=2" + origin_tech = "programming=2;engineering=2;bluespace=1" frame_desc = "Requires 2 Manipulators, 1 Cable Coil, 1 Hyperwave Filter, 1 Ansible Crystal and 2 High-Powered Micro-Lasers. " req_components = list( /obj/item/weapon/stock_parts/manipulator = 2, diff --git a/code/game/machinery/robot_fabricator.dm b/code/game/machinery/robot_fabricator.dm index 3d185e47d7c..65f31c94c0d 100644 --- a/code/game/machinery/robot_fabricator.dm +++ b/code/game/machinery/robot_fabricator.dm @@ -90,37 +90,37 @@ Please wait until completion...
if (1) build_type = "/obj/item/robot_parts/l_arm" build_time = 200 - build_cost = 25000 + build_cost = 10000 if (2) build_type = "/obj/item/robot_parts/r_arm" build_time = 200 - build_cost = 25000 + build_cost = 10000 if (3) build_type = "/obj/item/robot_parts/l_leg" build_time = 200 - build_cost = 25000 + build_cost = 10000 if (4) build_type = "/obj/item/robot_parts/r_leg" build_time = 200 - build_cost = 25000 + build_cost = 10000 if (5) build_type = "/obj/item/robot_parts/chest" build_time = 350 - build_cost = 50000 + build_cost = 40000 if (6) build_type = "/obj/item/robot_parts/head" build_time = 350 - build_cost = 50000 + build_cost = 5000 if (7) build_type = "/obj/item/robot_parts/robot_suit" build_time = 600 - build_cost = 75000 + build_cost = 15000 var/building = text2path(build_type) if (!isnull(building)) diff --git a/code/game/mecha/combat/phazon.dm b/code/game/mecha/combat/phazon.dm index b98f4697e5b..a4edcb4a89a 100644 --- a/code/game/mecha/combat/phazon.dm +++ b/code/game/mecha/combat/phazon.dm @@ -3,8 +3,8 @@ name = "Phazon" icon_state = "phazon" initial_icon = "phazon" - step_in = 1 - dir_in = 1 //Facing North. + step_in = 2 + dir_in = 2 //Facing south. step_energy_drain = 3 health = 200 deflect_chance = 30 @@ -18,7 +18,7 @@ force = 15 var/phasing = 0 var/phasing_energy_drain = 200 - max_equip = 4 + max_equip = 3 /obj/mecha/combat/phazon/New() @@ -52,20 +52,23 @@ /obj/mecha/combat/phazon/verb/switch_damtype() set category = "Exosuit Interface" - set name = "Change melee damage type" + set name = "Reconfigure arm microtool arrays" set src = usr.loc set popup_menu = 0 if(usr!=src.occupant) return - var/new_damtype = alert(src.occupant,"Melee Damage Type",null,"Brute","Fire","Toxic") + var/new_damtype = alert(src.occupant,"Arm Tool Selection",null,"Fists","Torch","Toxic Injector") switch(new_damtype) - if("Brute") + if("Fists") damtype = "brute" - if("Fire") + src.occupant_message("Your exosuit's hands form into fists.") + if("Torch") damtype = "fire" - if("Toxic") + src.occupant_message("A torch tip extends from your exosuit's hand, glowing red.") + if("Toxic injector") damtype = "tox" - src.occupant_message("Melee damage type switched to [new_damtype ]") + src.occupant_message("A bone-chillingly thick plasteel needle protracts from the exosuit's palm.") + playsound(src, 'sound/mecha/mechmove01.ogg', 50, 1) return /obj/mecha/combat/phazon/get_commands() diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm index bce443fc860..b3bccaeac06 100644 --- a/code/game/mecha/equipment/tools/medical_tools.dm +++ b/code/game/mecha/equipment/tools/medical_tools.dm @@ -227,9 +227,6 @@ M.AdjustStunned(-4) M.AdjustWeakened(-4) M.AdjustStunned(-4) - M.Paralyse(2) - M.Weaken(2) - M.Stun(2) if(M.reagents.get_reagent_amount("inaprovaline") < 5) M.reagents.add_reagent("inaprovaline", 5) S.chassis.use_power(S.energy_drain) diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index 42406003a5e..32c150e23eb 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -208,9 +208,9 @@ range = MELEE|RANGED New() - reagents = new/datum/reagents(200) + reagents = new/datum/reagents(1000) reagents.my_atom = src - reagents.add_reagent("water", 200) + reagents.add_reagent("water", 1000) ..() return @@ -221,7 +221,7 @@ if(do_after_cooldown(target)) if(istype(target, /obj/structure/reagent_dispensers/watertank) && get_dist(chassis,target) <= 1) var/obj/o = target - o.reagents.trans_to(src, 200) + o.reagents.trans_to(src, 1000) occupant_message("\blue Extinguisher refilled") playsound(chassis, 'sound/effects/refill.ogg', 50, 1, -6) else @@ -853,8 +853,8 @@ var/coeff = 100 var/obj/item/stack/sheet/fuel var/max_fuel = 150000 - var/fuel_per_cycle_idle = 100 - var/fuel_per_cycle_active = 500 + var/fuel_per_cycle_idle = 25 + var/fuel_per_cycle_active = 200 var/power_per_cycle = 20 reliability = 1000 diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index 0f9267ae74b..f63b3fd114b 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -394,10 +394,15 @@ return /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang/clusterbang//Because I am a heartless bastard -Sieve - name = "SOP-6 Grenade Launcher" + name = "SOB-3 Grenade Launcher" + desc = "A weapon for combat exosuits. Launches primed clusterbangs. You monster." + projectiles = 3 projectile = /obj/item/weapon/grenade/flashbang/clusterbang - construction_cost = list("metal"=20000,"gold"=6000,"uranium"=6000) + projectile_energy_cost = 1600 //getting off cheap seeing as this is 3 times the flashbangs held in the grenade launcher. + equip_cooldown = 90 + construction_cost = list("metal"=20000,"gold"=10000,"uranium"=10000) //now as expensive as a Honkblast. size=1 + /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang/clusterbang/limited/get_equip_info()//Limited version of the clusterbang launcher that can't reload return "* [chassis.selected==src?"":""][src.name][chassis.selected==src?"":""]\[[src.projectiles]\]" diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index 48662874413..3b1eb42b34d 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -852,21 +852,21 @@ //6 list("key"=/obj/item/stack/sheet/metal, "backkey"=/obj/item/weapon/screwdriver, - "desc"="Advanced capacitor is secured"), + "desc"="super capacitor is secured"), //7 list("key"=/obj/item/weapon/screwdriver, "backkey"=/obj/item/weapon/crowbar, - "desc"="Advanced capacitor is installed"), + "desc"="super capacitor is installed"), //8 - list("key"=/obj/item/weapon/stock_parts/capacitor/adv, + list("key"=/obj/item/weapon/stock_parts/capacitor/super, "backkey"=/obj/item/weapon/screwdriver, - "desc"="Advanced scanner module is secured"), + "desc"="phasic scanner module is secured"), //9 list("key"=/obj/item/weapon/screwdriver, "backkey"=/obj/item/weapon/crowbar, - "desc"="Advanced scanner module is installed"), + "desc"="phasic scanner module is installed"), //10 - list("key"=/obj/item/weapon/stock_parts/scanning_module/adv, + list("key"=/obj/item/weapon/stock_parts/scanning_module/phasic, "backkey"=/obj/item/weapon/screwdriver, "desc"="Targeting module is secured"), //11 @@ -996,7 +996,7 @@ holder.icon_state = "durand8" if(10) if(diff==FORWARD) - user.visible_message("[user] installs advanced scanner module to [holder].", "You install advanced scanner module to [holder].") + user.visible_message("[user] installs phasic scanner module to [holder].", "You install phasic scanner module to [holder].") del used_atom holder.icon_state = "durand11" else @@ -1004,27 +1004,27 @@ holder.icon_state = "durand9" if(9) if(diff==FORWARD) - user.visible_message("[user] secures the advanced scanner module.", "You secure the advanced scanner module.") + user.visible_message("[user] secures the phasic scanner module.", "You secure the phasic scanner module.") holder.icon_state = "durand12" else - user.visible_message("[user] removes the advanced scanner module from [holder].", "You remove the advanced scanner module from [holder].") - new /obj/item/weapon/stock_parts/scanning_module/adv(get_turf(holder)) + user.visible_message("[user] removes the phasic scanner module from [holder].", "You remove the phasic scanner module from [holder].") + new /obj/item/weapon/stock_parts/scanning_module/phasic(get_turf(holder)) holder.icon_state = "durand10" if(8) if(diff==FORWARD) - user.visible_message("[user] installs advanced capacitor to [holder].", "You install advanced capacitor to [holder].") + user.visible_message("[user] installs super capacitor to [holder].", "You install super capacitor to [holder].") del used_atom holder.icon_state = "durand13" else - user.visible_message("[user] unfastens the advanced scanner module.", "You unfasten the advanced scanner module.") + user.visible_message("[user] unfastens the phasic scanner module.", "You unfasten the phasic scanner module.") holder.icon_state = "durand11" if(7) if(diff==FORWARD) - user.visible_message("[user] secures the advanced capacitor.", "You secure the advanced capacitor.") + user.visible_message("[user] secures the super capacitor.", "You secure the super capacitor.") holder.icon_state = "durand14" else - user.visible_message("[user] removes the advanced capacitor from [holder].", "You remove the advanced capacitor from [holder].") - new /obj/item/weapon/stock_parts/capacitor/adv(get_turf(holder)) + user.visible_message("[user] removes the super capacitor from [holder].", "You remove the super capacitor from [holder].") + new /obj/item/weapon/stock_parts/capacitor/super(get_turf(holder)) holder.icon_state = "durand12" if(6) if(diff==FORWARD) diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm index 8880de21928..58b2d2215ce 100644 --- a/code/game/mecha/mecha_parts.dm +++ b/code/game/mecha/mecha_parts.dm @@ -6,7 +6,7 @@ name = "mecha part" icon = 'icons/mecha/mech_construct.dmi' icon_state = "blank" - w_class = 20 + w_class = 6 flags = FPRINT | TABLEPASS | CONDUCT origin_tech = "programming=2;materials=2" var/construction_time = 100 @@ -43,7 +43,7 @@ icon_state = "ripley_harness" origin_tech = "programming=2;materials=2;biotech=2;engineering=2" construction_time = 200 - construction_cost = list("metal"=40000,"glass"=15000) + construction_cost = list("metal"=20000,"glass"=7500) /obj/item/mecha_parts/part/ripley_left_arm name="Ripley Left Arm" @@ -51,7 +51,7 @@ icon_state = "ripley_l_arm" origin_tech = "programming=2;materials=2;engineering=2" construction_time = 150 - construction_cost = list("metal"=25000) + construction_cost = list("metal"=15000) /obj/item/mecha_parts/part/ripley_right_arm name="Ripley Right Arm" @@ -59,7 +59,7 @@ icon_state = "ripley_r_arm" origin_tech = "programming=2;materials=2;engineering=2" construction_time = 150 - construction_cost = list("metal"=25000) + construction_cost = list("metal"=15000) /obj/item/mecha_parts/part/ripley_left_leg name="Ripley Left Leg" @@ -67,7 +67,7 @@ icon_state = "ripley_l_leg" origin_tech = "programming=2;materials=2;engineering=2" construction_time = 150 - construction_cost = list("metal"=30000) + construction_cost = list("metal"=15000) /obj/item/mecha_parts/part/ripley_right_leg name="Ripley Right Leg" @@ -75,13 +75,13 @@ icon_state = "ripley_r_leg" origin_tech = "programming=2;materials=2;engineering=2" construction_time = 150 - construction_cost = list("metal"=30000) + construction_cost = list("metal"=15000) ///////// Gygax /obj/item/mecha_parts/chassis/gygax name = "Gygax Chassis" - construction_cost = list("metal"=25000) + construction_cost = list("metal"=20000) New() ..() @@ -93,7 +93,7 @@ icon_state = "gygax_harness" origin_tech = "programming=2;materials=2;biotech=3;engineering=3" construction_time = 300 - construction_cost = list("metal"=50000,"glass"=20000) + construction_cost = list("metal"=20000,"glass"=10000,"diamond"=2000) /obj/item/mecha_parts/part/gygax_head name="Gygax Head" @@ -101,7 +101,7 @@ icon_state = "gygax_head" origin_tech = "programming=2;materials=2;magnets=3;engineering=3" construction_time = 200 - construction_cost = list("metal"=20000,"glass"=10000) + construction_cost = list("metal"=10000,"glass"=5000, "diamond"=2000) /obj/item/mecha_parts/part/gygax_left_arm name="Gygax Left Arm" @@ -109,7 +109,7 @@ icon_state = "gygax_l_arm" origin_tech = "programming=2;materials=2;engineering=3" construction_time = 200 - construction_cost = list("metal"=30000) + construction_cost = list("metal"=15000, "diamond"=1000) /obj/item/mecha_parts/part/gygax_right_arm name="Gygax Right Arm" @@ -117,28 +117,28 @@ icon_state = "gygax_r_arm" origin_tech = "programming=2;materials=2;engineering=3" construction_time = 200 - construction_cost = list("metal"=30000) + construction_cost = list("metal"=15000, "diamond"=1000) /obj/item/mecha_parts/part/gygax_left_leg name="Gygax Left Leg" icon_state = "gygax_l_leg" origin_tech = "programming=2;materials=2;engineering=3" construction_time = 200 - construction_cost = list("metal"=35000) + construction_cost = list("metal"=15000, "diamond"=2000) /obj/item/mecha_parts/part/gygax_right_leg name="Gygax Right Leg" icon_state = "gygax_r_leg" origin_tech = "programming=2;materials=2;engineering=3" construction_time = 200 - construction_cost = list("metal"=35000) + construction_cost = list("metal"=15000, "diamond"=2000) /obj/item/mecha_parts/part/gygax_armour name="Gygax Armour Plates" icon_state = "gygax_armour" origin_tech = "materials=6;combat=4;engineering=5" construction_time = 600 - construction_cost = list("metal"=50000,"diamond"=10000) + construction_cost = list("metal"=25000,"diamond"=10000) //////////// Durand @@ -156,49 +156,49 @@ icon_state = "durand_harness" origin_tech = "programming=2;materials=3;biotech=3;engineering=3" construction_time = 300 - construction_cost = list("metal"=55000,"glass"=20000,"silver"=10000) + construction_cost = list("metal"=25000,"glass"=10000,"silver"=10000) /obj/item/mecha_parts/part/durand_head name="Durand Head" icon_state = "durand_head" origin_tech = "programming=2;materials=3;magnets=3;engineering=3" construction_time = 200 - construction_cost = list("metal"=25000,"glass"=10000,"silver"=3000) + construction_cost = list("metal"=10000,"glass"=15000,"silver"=2000) /obj/item/mecha_parts/part/durand_left_arm name="Durand Left Arm" icon_state = "durand_l_arm" origin_tech = "programming=2;materials=3;engineering=3" construction_time = 200 - construction_cost = list("metal"=35000,"silver"=3000) + construction_cost = list("metal"=10000,"silver"=4000) /obj/item/mecha_parts/part/durand_right_arm name="Durand Right Arm" icon_state = "durand_r_arm" origin_tech = "programming=2;materials=3;engineering=3" construction_time = 200 - construction_cost = list("metal"=35000,"silver"=3000) + construction_cost = list("metal"=10000,"silver"=4000) /obj/item/mecha_parts/part/durand_left_leg name="Durand Left Leg" icon_state = "durand_l_leg" origin_tech = "programming=2;materials=3;engineering=3" construction_time = 200 - construction_cost = list("metal"=40000,"silver"=3000) + construction_cost = list("metal"=15000,"silver"=4000) /obj/item/mecha_parts/part/durand_right_leg name="Durand Right Leg" icon_state = "durand_r_leg" origin_tech = "programming=2;materials=3;engineering=3" construction_time = 200 - construction_cost = list("metal"=40000,"silver"=3000) + construction_cost = list("metal"=15000,"silver"=4000) /obj/item/mecha_parts/part/durand_armor name="Durand Armour Plates" icon_state = "durand_armor" origin_tech = "materials=5;combat=4;engineering=5" construction_time = 600 - construction_cost = list("metal"=50000,"uranium"=10000) + construction_cost = list("metal"=50000,"uranium"=30000) @@ -245,25 +245,25 @@ name="H.O.N.K Torso" icon_state = "honker_harness" construction_time = 300 - construction_cost = list("metal"=35000,"glass"=10000,"bananium"=10000) + construction_cost = list("metal"=20000,"glass"=10000,"bananium"=10000) /obj/item/mecha_parts/part/honker_head name="H.O.N.K Head" icon_state = "honker_head" construction_time = 200 - construction_cost = list("metal"=15000,"glass"=5000,"bananium"=5000) + construction_cost = list("metal"=10000,"glass"=5000,"bananium"=5000) /obj/item/mecha_parts/part/honker_left_arm name="H.O.N.K Left Arm" icon_state = "honker_l_arm" construction_time = 200 - construction_cost = list("metal"=20000,"bananium"=5000) + construction_cost = list("metal"=15000,"bananium"=5000) /obj/item/mecha_parts/part/honker_right_arm name="H.O.N.K Right Arm" icon_state = "honker_r_arm" construction_time = 200 - construction_cost = list("metal"=20000,"bananium"=5000) + construction_cost = list("metal"=15000,"bananium"=5000) /obj/item/mecha_parts/part/honker_left_leg name="H.O.N.K Left Leg" @@ -282,7 +282,7 @@ /obj/item/mecha_parts/chassis/phazon name = "Phazon Chassis" - origin_tech = "materials=7" + origin_tech = "materials=6" New() ..() @@ -336,8 +336,8 @@ icon_state = "phazon_armor" construction_time = 300 construction_cost = list("metal"=45000,"plasma"=30000) - origin_tech = "materials=6;bluespace=5;magnets=5" - + origin_tech = "materials=6;bluespace=5;magnets=5" + ///////// Odysseus /obj/item/mecha_parts/chassis/odysseus name = "Odysseus Chassis" @@ -350,7 +350,7 @@ name="Odysseus Head" icon_state = "odysseus_head" construction_time = 100 - construction_cost = list("metal"=2000,"glass"=10000) + construction_cost = list("metal"=6000,"glass"=10000) origin_tech = "programming=3;materials=2" /obj/item/mecha_parts/part/odysseus_torso @@ -359,7 +359,7 @@ icon_state = "odysseus_torso" origin_tech = "programming=2;materials=2;biotech=2;engineering=2" construction_time = 180 - construction_cost = list("metal"=25000) + construction_cost = list("metal"=12000) /obj/item/mecha_parts/part/odysseus_left_arm name="Odysseus Left Arm" @@ -367,7 +367,7 @@ icon_state = "odysseus_l_arm" origin_tech = "programming=2;materials=2;engineering=2" construction_time = 120 - construction_cost = list("metal"=10000) + construction_cost = list("metal"=6000) /obj/item/mecha_parts/part/odysseus_right_arm name="Odysseus Right Arm" @@ -375,7 +375,7 @@ icon_state = "odysseus_r_arm" origin_tech = "programming=2;materials=2;engineering=2" construction_time = 120 - construction_cost = list("metal"=10000) + construction_cost = list("metal"=6000) /obj/item/mecha_parts/part/odysseus_left_leg name="Odysseus Left Leg" @@ -383,7 +383,7 @@ icon_state = "odysseus_l_leg" origin_tech = "programming=2;materials=2;engineering=2" construction_time = 130 - construction_cost = list("metal"=15000) + construction_cost = list("metal"=7000) /obj/item/mecha_parts/part/odysseus_right_leg name="Odysseus Right Leg" @@ -391,7 +391,7 @@ icon_state = "odysseus_r_leg" origin_tech = "programming=2;materials=2;engineering=2" construction_time = 130 - construction_cost = list("metal"=15000) + construction_cost = list("metal"=7000) /*/obj/item/mecha_parts/part/odysseus_armour name="Odysseus Carapace" @@ -458,7 +458,7 @@ durand/main name = "Circuit board (Durand Central Control module)" icon_state = "mainboard" - + phazon origin_tech = "programming=4" diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm index 486153ab1b6..7a21d472b82 100644 --- a/code/game/mecha/working/ripley.dm +++ b/code/game/mecha/working/ripley.dm @@ -1,11 +1,14 @@ /obj/mecha/working/ripley - desc = "Autonomous Power Loader Unit. The workhorse of the exosuit world." + desc = "Autonomous Power Loader Unit. This newer model is refitted with powerful armour against the dangers of the EVA mining process." name = "APLU \"Ripley\"" icon_state = "ripley" initial_icon = "ripley" - step_in = 6 + step_in = 5 max_temperature = 20000 health = 200 + lights_power = 7 + deflect_chance = 15 + damage_absorption = list("brute"=0.6,"bomb"=0.2) wreckage = /obj/effect/decal/mecha_wreckage/ripley var/list/cargo = new var/cargo_capacity = 15 @@ -23,7 +26,7 @@ initial_icon = "firefighter" max_temperature = 65000 health = 250 - lights_power = 8 + lights_power = 7 damage_absorption = list("fire"=0.5,"bullet"=0.8,"bomb"=0.5) wreckage = /obj/effect/decal/mecha_wreckage/ripley/firefighter @@ -33,7 +36,7 @@ icon_state = "deathripley" step_in = 2 opacity=0 - lights_power = 60 + lights_power = 7 wreckage = /obj/effect/decal/mecha_wreckage/ripley/deathripley step_energy_drain = 0 diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 43edfb5cf0b..3a5c2de0257 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -15,7 +15,7 @@ desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case." icon_state = "l_arm" construction_time = 200 - construction_cost = list("metal"=18000) + construction_cost = list("metal"=10000) part = list("l_arm","l_hand") /obj/item/robot_parts/r_arm @@ -23,7 +23,7 @@ desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case." icon_state = "r_arm" construction_time = 200 - construction_cost = list("metal"=18000) + construction_cost = list("metal"=10000) part = list("r_arm","r_hand") /obj/item/robot_parts/l_leg @@ -31,7 +31,7 @@ desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case." icon_state = "l_leg" construction_time = 200 - construction_cost = list("metal"=15000) + construction_cost = list("metal"=10000) part = list("l_leg","l_foot") /obj/item/robot_parts/r_leg @@ -39,7 +39,7 @@ desc = "A skeletal limb wrapped in pseudomuscles, with a low-conductivity case." icon_state = "r_leg" construction_time = 200 - construction_cost = list("metal"=15000) + construction_cost = list("metal"=10000) part = list("r_leg","r_foot") /obj/item/robot_parts/chest @@ -56,7 +56,7 @@ desc = "A standard reinforced braincase, with spine-plugged neural socket and sensor gimbals." icon_state = "head" construction_time = 350 - construction_cost = list("metal"=25000) + construction_cost = list("metal"=5000) var/obj/item/device/flash/flash1 = null var/obj/item/device/flash/flash2 = null @@ -65,7 +65,7 @@ desc = "A complex metal backbone with standard limb sockets and pseudomuscle anchors." icon_state = "robo_suit" construction_time = 500 - construction_cost = list("metal"=50000) + construction_cost = list("metal"=15000) var/obj/item/robot_parts/l_arm/l_arm = null var/obj/item/robot_parts/r_arm/r_arm = null var/obj/item/robot_parts/l_leg/l_leg = null diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index 85e6fa1a622..5d6fa774370 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -147,8 +147,8 @@ result = /obj/item/weapon/reagent_containers/food/snacks/brainburger /datum/recipe/roburger - reagents = list("flour" = 5) items = list( + /obj/item/weapon/reagent_containers/food/snacks/bun, /obj/item/robot_parts/head ) result = /obj/item/weapon/reagent_containers/food/snacks/roburger @@ -1240,17 +1240,10 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/benedict -/datum/recipe/hotdog - reagents = list("ketchup" = 5) - items = list( - /obj/item/weapon/reagent_containers/food/snacks/breadslice, - /obj/item/weapon/reagent_containers/food/snacks/sausage, - ) - result = /obj/item/weapon/reagent_containers/food/snacks/hotdog - /datum/recipe/meatbun - reagents = list("soysauce" = 5, "flour" = 5) + reagents = list("soysauce" = 5) items = list( + /obj/item/weapon/reagent_containers/food/snacks/dough, /obj/item/weapon/reagent_containers/food/snacks/meatball, /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage, ) @@ -1272,18 +1265,20 @@ result = /obj/item/weapon/reagent_containers/food/snacks/notasandwich /datum/recipe/sugarcookie - reagents = list("flour" = 5, "sugar" = 5) + reagents = list("sugar" = 5) items = list( + /obj/item/weapon/reagent_containers/food/snacks/dough, /obj/item/weapon/reagent_containers/food/snacks/egg, ) result = /obj/item/weapon/reagent_containers/food/snacks/sugarcookie /datum/recipe/friedbanana items = list( + /obj/item/weapon/reagent_containers/food/snacks/dough, /obj/item/weapon/reagent_containers/food/snacks/grown/banana ) /obj/item/weapon/ - reagents = list("flour" = 10, "sugar" = 10, "cornoil" = 5) + reagents = list("sugar" = 10, "cornoil" = 5) result = /obj/item/weapon/reagent_containers/food/snacks/friedbanana /datum/recipe/stuffing diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 5f03f064ab7..a59a0c8d636 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -635,7 +635,7 @@ // Needed for M_TOXIC_FART if("fart") if(world.time-lastFart >= 600) -// playsound(src.loc, 'sound/effects/fart.ogg', 50, 1, -3) //Admins voted no to fun + playsound(src.loc, 'sound/effects/fart.ogg', 50, 1, -3) //Admins voted no to fun message = "[src] [pick("passes wind","farts")]." m_type = 2 diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 1fd1cd8b87f..868410ea747 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -60,7 +60,7 @@ flags = FPRINT | TABLEPASS | CONDUCT slot_flags = SLOT_BELT item_state = "syringe_kit" - m_amt = 50000 + m_amt = 30000 throwforce = 2 w_class = 1.0 throw_speed = 4 @@ -127,4 +127,4 @@ //Behavior for magazines /obj/item/ammo_box/magazine/proc/ammo_count() - return stored_ammo.len + return stored_ammo.len diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index 8890be8e64f..85ad55e083c 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -75,7 +75,7 @@ datum/design/seccamera id = "seccamera" req_tech = list("programming" = 2) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/camera" datum/design/aicore @@ -84,7 +84,7 @@ datum/design/aicore id = "aicore" req_tech = list("programming" = 4, "biotech" = 3) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/aicore" datum/design/aiupload @@ -93,7 +93,7 @@ datum/design/aiupload id = "aiupload" req_tech = list("programming" = 4) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/aiupload" datum/design/borgupload @@ -102,7 +102,7 @@ datum/design/borgupload id = "borgupload" req_tech = list("programming" = 4) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/borgupload" datum/design/med_data @@ -111,7 +111,7 @@ datum/design/med_data id = "med_data" req_tech = list("programming" = 2) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/med_data" datum/design/operating @@ -120,7 +120,7 @@ datum/design/operating id = "operating" req_tech = list("programming" = 2, "biotech" = 2) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/operating" datum/design/pandemic @@ -129,7 +129,7 @@ datum/design/pandemic id = "pandemic" req_tech = list("programming" = 2, "biotech" = 2) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/pandemic" datum/design/scan_console @@ -138,7 +138,7 @@ datum/design/scan_console id = "scan_console" req_tech = list("programming" = 2, "biotech" = 3) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/scan_consolenew" datum/design/comconsole @@ -147,7 +147,7 @@ datum/design/comconsole id = "comconsole" req_tech = list("programming" = 2, "magnets" = 2) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/communications" datum/design/idcardconsole @@ -156,7 +156,7 @@ datum/design/idcardconsole id = "idcardconsole" req_tech = list("programming" = 2) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/card" datum/design/crewconsole @@ -165,7 +165,7 @@ datum/design/crewconsole id = "crewconsole" req_tech = list("programming" = 3, "magnets" = 2, "biotech" = 2) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/crew" datum/design/teleconsole @@ -174,7 +174,7 @@ datum/design/teleconsole id = "teleconsole" req_tech = list("programming" = 3, "bluespace" = 2) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/teleporter" datum/design/secdata @@ -183,7 +183,7 @@ datum/design/secdata id = "secdata" req_tech = list("programming" = 2) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/secure_data" datum/design/atmosalerts @@ -192,7 +192,7 @@ datum/design/atmosalerts id = "atmosalerts" req_tech = list("programming" = 2) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/atmos_alert" datum/design/air_management @@ -201,7 +201,7 @@ datum/design/air_management id = "air_management" req_tech = list("programming" = 2) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/air_management" /* Uncomment if someone makes these buildable @@ -221,7 +221,7 @@ datum/design/robocontrol id = "robocontrol" req_tech = list("programming" = 4) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/robotics" datum/design/dronecontrol @@ -230,7 +230,7 @@ datum/design/dronecontrol id = "dronecontrol" req_tech = list("programming" = 4) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/drone_control" datum/design/clonecontrol @@ -239,7 +239,7 @@ datum/design/clonecontrol id = "clonecontrol" req_tech = list("programming" = 3, "biotech" = 3) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/cloning" datum/design/clonepod @@ -248,7 +248,7 @@ datum/design/clonepod id = "clonepod" req_tech = list("programming" = 3, "biotech" = 3) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/clonepod" datum/design/clonescanner @@ -257,7 +257,7 @@ datum/design/clonescanner id = "clonescanner" req_tech = list("programming" = 3, "biotech" = 3) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/clonescanner" datum/design/teleport_station @@ -338,7 +338,7 @@ datum/design/arcadebattle id = "arcademachinebattle" req_tech = list("programming" = 1) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/arcade/battle" datum/design/orion_trail @@ -347,7 +347,7 @@ datum/design/orion_trail id = "arcademachineonion" req_tech = list("programming" = 2) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/arcade/orion_trail" datum/design/powermonitor @@ -356,7 +356,7 @@ datum/design/powermonitor id = "powermonitor" req_tech = list("programming" = 2) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/powermonitor" datum/design/solarcontrol @@ -365,7 +365,7 @@ datum/design/solarcontrol id = "solarcontrol" req_tech = list("programming" = 2, "powerstorage" = 2) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/solar_control" datum/design/prisonmanage @@ -374,7 +374,7 @@ datum/design/prisonmanage id = "prisonmanage" req_tech = list("programming" = 2) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/prisoner" datum/design/mechacontrol @@ -383,7 +383,7 @@ datum/design/mechacontrol id = "mechacontrol" req_tech = list("programming" = 3) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/mecha_control" datum/design/mechapower @@ -392,7 +392,7 @@ datum/design/mechapower id = "mechapower" req_tech = list("programming" = 2, "powerstorage" = 3) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/mech_bay_power_console" datum/design/rdconsole @@ -401,7 +401,7 @@ datum/design/rdconsole id = "rdconsole" req_tech = list("programming" = 4) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/rdconsole" datum/design/ordercomp @@ -410,7 +410,7 @@ datum/design/ordercomp id = "ordercomp" req_tech = list("programming" = 2) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/ordercomp" datum/design/supplycomp @@ -419,7 +419,7 @@ datum/design/supplycomp id = "supplycomp" req_tech = list("programming" = 3) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/supplycomp" datum/design/comm_monitor @@ -428,7 +428,7 @@ datum/design/comm_monitor id = "comm_monitor" req_tech = list("programming" = 3) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/comm_monitor" datum/design/comm_server @@ -437,7 +437,7 @@ datum/design/comm_server id = "comm_server" req_tech = list("programming" = 3) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/comm_server" datum/design/message_monitor @@ -446,7 +446,7 @@ datum/design/message_monitor id = "message_monitor" req_tech = list("programming" = 5) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/message_monitor" datum/design/comm_traffic @@ -473,7 +473,7 @@ datum/design/aifixer id = "aifixer" req_tech = list("programming" = 3, "biotech" = 2) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/aifixer" /////////////////////////////////// @@ -485,7 +485,7 @@ datum/design/safeguard_module id = "safeguard_module" req_tech = list("programming" = 3, "materials" = 4) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20, "$gold" = 100) + materials = list("$glass" = 1000, "sacid" = 20, "$gold" = 100) build_path = /obj/item/weapon/aiModule/supplied/safeguard datum/design/onehuman_module @@ -494,7 +494,7 @@ datum/design/onehuman_module id = "onehuman_module" req_tech = list("programming" = 4, "materials" = 6) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20, "$diamond" = 100) + materials = list("$glass" = 1000, "sacid" = 20, "$diamond" = 100) build_path = /obj/item/weapon/aiModule/zeroth/oneHuman datum/design/protectstation_module @@ -503,7 +503,7 @@ datum/design/protectstation_module id = "protectstation_module" req_tech = list("programming" = 3, "materials" = 6) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20, "$gold" = 100) + materials = list("$glass" = 1000, "sacid" = 20, "$gold" = 100) build_path = /obj/item/weapon/aiModule/supplied/protectStation datum/design/quarantine_module @@ -512,7 +512,7 @@ datum/design/quarantine_module id = "quarantine_module" req_tech = list("programming" = 3, "biotech" = 2, "materials" = 4) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20, "$gold" = 100) + materials = list("$glass" = 1000, "sacid" = 20, "$gold" = 100) build_path = /obj/item/weapon/aiModule/supplied/quarantine datum/design/oxygen_module @@ -521,7 +521,7 @@ datum/design/oxygen_module id = "oxygen_module" req_tech = list("programming" = 3, "biotech" = 2, "materials" = 4) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20, "$gold" = 100) + materials = list("$glass" = 1000, "sacid" = 20, "$gold" = 100) build_path = /obj/item/weapon/aiModule/supplied/oxygen datum/design/freeform_module @@ -530,7 +530,7 @@ datum/design/freeform_module id = "freeform_module" req_tech = list("programming" = 4, "materials" = 4) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20, "$gold" = 100) + materials = list("$glass" = 1000, "sacid" = 20, "$gold" = 100) build_path = /obj/item/weapon/aiModule/supplied/freeform datum/design/reset_module @@ -539,7 +539,7 @@ datum/design/reset_module id = "reset_module" req_tech = list("programming" = 3, "materials" = 6) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20, "$gold" = 100) + materials = list("$glass" = 1000, "sacid" = 20, "$gold" = 100) build_path = /obj/item/weapon/aiModule/reset datum/design/purge_module @@ -557,7 +557,7 @@ datum/design/freeformcore_module id = "freeformcore_module" req_tech = list("programming" = 4, "materials" = 6) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20, "$diamond" = 100) + materials = list("$glass" = 1000, "sacid" = 20, "$diamond" = 100) build_path = /obj/item/weapon/aiModule/core/freeformcore datum/design/asimov @@ -566,7 +566,7 @@ datum/design/asimov id = "asimov_module" req_tech = list("programming" = 3, "materials" = 6) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20, "$diamond" = 100) + materials = list("$glass" = 1000, "sacid" = 20, "$diamond" = 100) build_path = /obj/item/weapon/aiModule/core/full/asimov datum/design/paladin_module @@ -575,7 +575,7 @@ datum/design/paladin_module id = "paladin_module" req_tech = list("programming" = 4, "materials" = 6) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20, "$diamond" = 100) + materials = list("$glass" = 1000, "sacid" = 20, "$diamond" = 100) build_path = /obj/item/weapon/aiModule/core/full/paladin datum/design/tyrant_module @@ -584,7 +584,7 @@ datum/design/tyrant_module id = "tyrant_module" req_tech = list("programming" = 4, "syndicate" = 2, "materials" = 6) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20, "$diamond" = 100) + materials = list("$glass" = 1000, "sacid" = 20, "$diamond" = 100) build_path = /obj/item/weapon/aiModule/core/full/tyrant datum/design/corporate_module @@ -593,7 +593,7 @@ datum/design/corporate_module id = "corporate_module" req_tech = list("programming" = 4, "materials" = 6) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20, "$diamond" = 100) + materials = list("$glass" = 1000, "sacid" = 20, "$diamond" = 100) build_path = /obj/item/weapon/aiModule/core/full/corp datum/design/custom_module @@ -602,7 +602,7 @@ datum/design/custom_module id = "custom_module" req_tech = list("programming" = 4, "materials" = 6) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20, "$diamond" = 100) + materials = list("$glass" = 1000, "sacid" = 20, "$diamond" = 100) build_path = /obj/item/weapon/aiModule/core/full/custom datum/design/antimov_module @@ -611,7 +611,7 @@ datum/design/antimov_module id = "antimov_module" req_tech = list("programming" = 4, "materials" = 6, "syndicate" = 2) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20, "$diamond" = 100) + materials = list("$glass" = 1000, "sacid" = 20, "$diamond" = 100) build_path = /obj/item/weapon/aiModule/core/full/antimov /////////////////////////////////// @@ -621,63 +621,63 @@ datum/design/subspace_receiver name = "Circuit Design (Subspace Receiver)" desc = "Allows for the construction of Subspace Receiver equipment." id = "s-receiver" - req_tech = list("programming" = 4, "engineering" = 3, "bluespace" = 2) + req_tech = list("programming" = 2, "engineering" = 1, "bluespace" = 1) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/telecomms/receiver" datum/design/telecomms_bus name = "Circuit Design (Bus Mainframe)" desc = "Allows for the construction of Telecommunications Bus Mainframes." id = "s-bus" - req_tech = list("programming" = 4, "engineering" = 4) + req_tech = list("programming" = 2, "engineering" = 2) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/telecomms/bus" datum/design/telecomms_hub name = "Circuit Design (Hub Mainframe)" desc = "Allows for the construction of Telecommunications Hub Mainframes." id = "s-hub" - req_tech = list("programming" = 4, "engineering" = 4) + req_tech = list("programming" = 2, "engineering" = 2) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/telecomms/hub" datum/design/telecomms_relay name = "Circuit Design (Relay Mainframe)" desc = "Allows for the construction of Telecommunications Relay Mainframes." id = "s-relay" - req_tech = list("programming" = 3, "engineering" = 4, "bluespace" = 3) + req_tech = list("programming" = 1, "engineering" = 2, "bluespace" = 2) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/telecomms/relay" datum/design/telecomms_processor name = "Circuit Design (Processor Unit)" desc = "Allows for the construction of Telecommunications Processor equipment." id = "s-processor" - req_tech = list("programming" = 4, "engineering" = 4) + req_tech = list("programming" = 2, "engineering" = 2) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/telecomms/processor" datum/design/telecomms_server name = "Circuit Design (Server Mainframe)" desc = "Allows for the construction of Telecommunications Servers." id = "s-server" - req_tech = list("programming" = 4, "engineering" = 4) + req_tech = list("programming" = 2, "engineering" = 2) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/telecomms/server" datum/design/subspace_broadcaster name = "Circuit Design (Subspace Broadcaster)" desc = "Allows for the construction of Subspace Broadcasting equipment." id = "s-broadcaster" - req_tech = list("programming" = 4, "engineering" = 4, "bluespace" = 2) + req_tech = list("programming" = 2, "engineering" = 2, "bluespace" = 1) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/telecomms/broadcaster" /////////////////////////////////// @@ -723,7 +723,7 @@ datum/design/ripley_main id = "ripley_main" req_tech = list("programming" = 3) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/mecha/ripley/main" datum/design/ripley_peri @@ -732,7 +732,7 @@ datum/design/ripley_peri id = "ripley_peri" req_tech = list("programming" = 3) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/mecha/ripley/peripherals" // Odysseus @@ -742,7 +742,7 @@ datum/design/odysseus_main id = "odysseus_main" req_tech = list("programming" = 3,"biotech" = 2) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/mecha/odysseus/main" datum/design/odysseus_peri @@ -751,7 +751,7 @@ datum/design/odysseus_peri id = "odysseus_peri" req_tech = list("programming" = 3,"biotech" = 2) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/mecha/odysseus/peripherals" // Gygax @@ -761,7 +761,7 @@ datum/design/gygax_main id = "gygax_main" req_tech = list("programming" = 4) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/mecha/gygax/main" datum/design/gygax_peri @@ -770,7 +770,7 @@ datum/design/gygax_peri id = "gygax_peri" req_tech = list("programming" = 4) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/mecha/gygax/peripherals" datum/design/gygax_targ @@ -779,7 +779,7 @@ datum/design/gygax_targ id = "gygax_targ" req_tech = list("programming" = 4, "combat" = 2) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/mecha/gygax/targeting" // Durand @@ -789,7 +789,7 @@ datum/design/durand_main id = "durand_main" req_tech = list("programming" = 4) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/mecha/durand/main" datum/design/durand_peri @@ -798,7 +798,7 @@ datum/design/durand_peri id = "durand_peri" req_tech = list("programming" = 4) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/mecha/durand/peripherals" datum/design/durand_targ @@ -807,7 +807,7 @@ datum/design/durand_targ id = "durand_targ" req_tech = list("programming" = 4, "combat" = 2) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/mecha/durand/targeting" // Phazon @@ -845,7 +845,7 @@ datum/design/honker_main id = "honker_main" req_tech = list("programming" = 3) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/mecha/honker/main" datum/design/honker_peri @@ -854,7 +854,7 @@ datum/design/honker_peri id = "honker_peri" req_tech = list("programming" = 3) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/mecha/honker/peripherals" datum/design/honker_targ @@ -863,7 +863,7 @@ datum/design/honker_targ id = "honker_targ" req_tech = list("programming" = 3) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/mecha/honker/targeting" // Space pod @@ -873,7 +873,7 @@ datum/design/honker_targ id = "spacepod_main" req_tech = list("programming" = 4) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/mecha/pod //////////////////////////////////////// @@ -944,12 +944,12 @@ datum/design/mech_missile_rack category = "Exosuit Equipment" datum/design/clusterbang_launcher - name = "Exosuit Module Design (SOP-6 Clusterbang Launcher)" - desc = "A weapon that violates the Geneva Convention at 6 rounds per minute" + name = "Exosuit Module Design (SOB-3 Clusterbang Launcher)" + desc = "A weapon that violates the Geneva Convention at 3 rounds per minute" id = "clusterbang_launcher" build_type = MECHFAB req_tech = list("combat"= 5, "materials" = 5, "syndicate" = 3) - build_path = "/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang/clusterbang/limited" + build_path = "/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang/clusterbang" category = "Exosuit Equipment" datum/design/mech_wormhole_gen @@ -1236,13 +1236,11 @@ datum/design/super_matter_bin reliability_base = 75 build_path = "/obj/item/weapon/stock_parts/matter_bin/super" - - datum/design/subspace_ansible name = "Subspace Ansible" desc = "A compact module capable of sensing extradimensional activity." id = "s-ansible" - req_tech = list("programming" = 3, "magnets" = 4, "materials" = 4, "bluespace" = 2) + req_tech = list("programming" = 2, "magnets" = 2, "materials" = 2, "bluespace" = 1) build_type = PROTOLATHE materials = list("$metal" = 80, "$silver" = 20) build_path = "/obj/item/weapon/stock_parts/subspace/ansible" @@ -1251,7 +1249,7 @@ datum/design/hyperwave_filter name = "Hyperwave Filter" desc = "A tiny device capable of filtering and converting super-intense radiowaves." id = "s-filter" - req_tech = list("programming" = 3, "magnets" = 3) + req_tech = list("programming" = 2, "magnets" = 2) build_type = PROTOLATHE materials = list("$metal" = 40, "$silver" = 10) build_path = "/obj/item/weapon/stock_parts/subspace/filter" @@ -1260,7 +1258,7 @@ datum/design/subspace_amplifier name = "Subspace Amplifier" desc = "A compact micro-machine capable of amplifying weak subspace transmissions." id = "s-amplifier" - req_tech = list("programming" = 3, "magnets" = 4, "materials" = 4, "bluespace" = 2) + req_tech = list("programming" = 2, "magnets" = 2, "materials" = 2, "bluespace" = 1) build_type = PROTOLATHE materials = list("$metal" = 10, "$gold" = 30, "$uranium" = 15) build_path = "/obj/item/weapon/stock_parts/subspace/amplifier" @@ -1269,7 +1267,7 @@ datum/design/subspace_treatment name = "Subspace Treatment Disk" desc = "A compact micro-machine capable of stretching out hyper-compressed radio waves." id = "s-treatment" - req_tech = list("programming" = 3, "magnets" = 2, "materials" = 4, "bluespace" = 2) + req_tech = list("programming" = 2, "magnets" = 1, "materials" = 2, "bluespace" = 1) build_type = PROTOLATHE materials = list("$metal" = 10, "$silver" = 20) build_path = "/obj/item/weapon/stock_parts/subspace/treatment" @@ -1278,7 +1276,7 @@ datum/design/subspace_analyzer name = "Subspace Analyzer" desc = "A sophisticated analyzer capable of analyzing cryptic subspace wavelengths." id = "s-analyzer" - req_tech = list("programming" = 3, "magnets" = 4, "materials" = 4, "bluespace" = 2) + req_tech = list("programming" = 2, "magnets" = 2, "materials" = 2, "bluespace" = 1) build_type = PROTOLATHE materials = list("$metal" = 10, "$gold" = 15) build_path = "/obj/item/weapon/stock_parts/subspace/analyzer" @@ -1287,7 +1285,7 @@ datum/design/subspace_crystal name = "Ansible Crystal" desc = "A sophisticated analyzer capable of analyzing cryptic subspace wavelengths." id = "s-crystal" - req_tech = list("magnets" = 4, "materials" = 4, "bluespace" = 2) + req_tech = list("magnets" = 2, "materials" = 2, "bluespace" = 1) build_type = PROTOLATHE materials = list("$glass" = 1000, "$silver" = 20, "$gold" = 20) build_path = "/obj/item/weapon/stock_parts/subspace/crystal" @@ -1296,7 +1294,7 @@ datum/design/subspace_transmitter name = "Subspace Transmitter" desc = "A large piece of equipment used to open a window into the subspace dimension." id = "s-transmitter" - req_tech = list("magnets" = 5, "materials" = 5, "bluespace" = 3) + req_tech = list("magnets" = 3, "materials" = 3, "bluespace" = 2) build_type = PROTOLATHE materials = list("$glass" = 100, "$silver" = 10, "$uranium" = 15) build_path = "/obj/item/weapon/stock_parts/subspace/transmitter" @@ -1419,7 +1417,7 @@ datum/design/destructive_analyzer id = "destructive_analyzer" req_tech = list("programming" = 2, "magnets" = 2, "engineering" = 2) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/destructive_analyzer" datum/design/protolathe @@ -1428,7 +1426,7 @@ datum/design/protolathe id = "protolathe" req_tech = list("programming" = 2, "engineering" = 2) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/protolathe" datum/design/circuit_imprinter @@ -1437,7 +1435,7 @@ datum/design/circuit_imprinter id = "circuit_imprinter" req_tech = list("programming" = 2, "engineering" = 2) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/circuit_imprinter" datum/design/autolathe @@ -1446,7 +1444,7 @@ datum/design/autolathe id = "autolathe" req_tech = list("programming" = 2, "engineering" = 2) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/autolathe" datum/design/rdservercontrol @@ -1455,7 +1453,7 @@ datum/design/rdservercontrol id = "rdservercontrol" req_tech = list("programming" = 3) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/rdservercontrol" datum/design/rdserver @@ -1464,7 +1462,7 @@ datum/design/rdserver id = "rdserver" req_tech = list("programming" = 3) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/rdserver" datum/design/mechfab @@ -1473,7 +1471,7 @@ datum/design/mechfab id = "mechfab" req_tech = list("programming" = 3, "engineering" = 3) build_type = IMPRINTER - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/mechfab" datum/design/cyborgrecharger @@ -1514,7 +1512,7 @@ datum/design/pacman req_tech = list("programming" = 3, "plasmatech" = 3, "powerstorage" = 3, "engineering" = 3) build_type = IMPRINTER reliability_base = 79 - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/pacman" datum/design/superpacman @@ -1524,7 +1522,7 @@ datum/design/superpacman req_tech = list("programming" = 3, "powerstorage" = 4, "engineering" = 4) build_type = IMPRINTER reliability_base = 76 - materials = list("$glass" = 2000, "sacid" = 20) + materials = list("$glass" = 1000, "sacid" = 20) build_path = "/obj/item/weapon/circuitboard/pacman/super" datum/design/mrspacman @@ -1695,7 +1693,7 @@ datum/design/nuclear_gun id = "nuclear_gun" req_tech = list("combat" = 3, "materials" = 5, "powerstorage" = 3) build_type = PROTOLATHE - materials = list("$metal" = 5000, "$glass" = 1000, "$uranium" = 500) + materials = list("$metal" = 5000, "$glass" = 1000, "$uranium" = 2000) reliability_base = 76 build_path = "/obj/item/weapon/gun/energy/gun/nuclear" locked = 1 @@ -1716,7 +1714,7 @@ datum/design/lasercannon id = "lasercannon" req_tech = list("combat" = 4, "materials" = 3, "powerstorage" = 3) build_type = PROTOLATHE - materials = list("$metal" = 10000, "$glass" = 1000, "$diamond" = 2000) + materials = list("$metal" = 10000, "$glass" = 2000, "$diamond" = 2000) build_path = "/obj/item/weapon/gun/energy/lasercannon" locked = 1 @@ -1752,11 +1750,11 @@ datum/design/rapidsyringe datum/design/largecrossbow name = "Energy Crossbow" - desc = "A weapon favoured by syndicate infiltration teams." + desc = "A reverse-engineered energy crossbow favored by syndicate infiltration teams and carp hunters." id = "largecrossbow" - req_tech = list("combat" = 4, "materials" = 5, "engineering" = 3, "biotech" = 4, "syndicate" = 3) + req_tech = list("combat" = 5, "materials" = 5, "engineering" = 3, "biotech" = 4, "syndicate" = 3) build_type = PROTOLATHE - materials = list("$metal" = 5000, "$glass" = 1000, "$uranium" = 1000, "$silver" = 1000) + materials = list("$metal" = 5000, "$glass" = 1500, "$uranium" = 1500, "$silver" = 1500) build_path = "/obj/item/weapon/gun/energy/crossbow/largecrossbow" datum/design/temp_gun @@ -1775,7 +1773,7 @@ datum/design/flora_gun id = "flora_gun" req_tech = list("materials" = 2, "biotech" = 3, "powerstorage" = 3) build_type = PROTOLATHE - materials = list("$metal" = 2000, "$glass" = 500, "mutagen" = 50) + materials = list("$metal" = 2000, "$glass" = 500, "radium" = 20) build_path = "/obj/item/weapon/gun/energy/floragun" datum/design/large_grenade @@ -1814,7 +1812,7 @@ datum/design/ammo_9mm id = "ammo_9mm" req_tech = list("combat" = 4, "materials" = 3) build_type = PROTOLATHE - materials = list("$metal" = 3750, "$silver" = 100) + materials = list("$metal" = 2000) build_path = "/obj/item/ammo_box/c9mm" datum/design/mag_smg @@ -1823,7 +1821,7 @@ datum/design/mag_smg id = "mag_smg" req_tech = list("combat" = 4, "materials" = 3) build_type = PROTOLATHE - materials = list("$metal" = 3750, "$silver" = 100) + materials = list("$metal" = 2000) build_path = "/obj/item/ammo_box/magazine/msmg9mm" datum/design/stunshell @@ -1832,7 +1830,7 @@ datum/design/stunshell id = "stunshell" req_tech = list("combat" = 3, "materials" = 3) build_type = PROTOLATHE - materials = list("$metal" = 4000) + materials = list("$metal" = 200) build_path = "/obj/item/ammo_casing/shotgun/stunshell" datum/design/techshell @@ -2023,9 +2021,9 @@ datum/design/mesons name = "Optical Meson Scanners" desc = "Used for seeing walls, floors, and stuff through anything." id = "mesons" - req_tech = list("magnets" = 2, "engineering" = 2) + req_tech = list("materials" = 3, "magnets" = 3, "engineering" = 3) build_type = PROTOLATHE - materials = list("$metal" = 50, "$glass" = 50) + materials = list("$metal" = 200, "$glass" = 300, "$plasma" = 100) build_path = "/obj/item/clothing/glasses/meson" datum/design/night_vision_goggles @@ -2111,7 +2109,7 @@ datum/design/bluespace_crystal id = "bluespace_crystal" req_tech = list("bluespace" = 4, "materials" = 6) build_type = PROTOLATHE - materials = list("$gold" = 1500, "$diamond" = 3000, "$plasma" = 1500) + materials = list("$diamond" = 1500, "$plasma" = 1500) reliability_base = 100 build_path = "/obj/item/bluespace_crystal/artificial"