diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index 29a654fbc65..a062f7bdb2c 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" + origin_tech = "materials=5;biotech=4;powerstorage=5;abductor=3" 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 @@ -136,7 +136,7 @@ icon = 'icons/obj/abductor.dmi' icon_state = "gizmo_scan" item_state = "silencer" - origin_tech = "materials=5;magnets=5;bluespace=6" + origin_tech = "materials=5;magnets=5;bluespace=6;abductor=4" var/mode = GIZMO_SCAN var/mob/living/marked = null var/obj/machinery/abductor/console/console @@ -217,7 +217,7 @@ icon = 'icons/obj/abductor.dmi' icon_state = "silencer" item_state = "gizmo" - origin_tech = "materials=5;magnets=5" + origin_tech = "materials=5;magnets=5;abductor=3" /obj/item/device/abductor/silencer/attack(mob/living/M, mob/user) if(!AbductorCheck(user)) @@ -261,7 +261,7 @@ icon = 'icons/obj/abductor.dmi' icon_state = "implant" activated = 1 - origin_tech = "materials=2;biotech=3;magnets=4;bluespace=5" + origin_tech = "materials=2;biotech=3;magnets=4;bluespace=5;abductor=5" var/obj/machinery/abductor/pad/home var/cooldown = 30 @@ -323,7 +323,7 @@ pin = /obj/item/device/firing_pin/alien icon_state = "alienpistol" item_state = "alienpistol" - origin_tech = "combat=5;materials=4;powerstorage=3" + origin_tech = "combat=5;materials=4;powerstorage=3;abductor=3" /obj/item/weapon/paper/abductor name = "Dissection Guide" @@ -362,7 +362,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" + origin_tech = "materials=6;combat=5;biotech=7;abductor=4" force = 7 w_class = 3 actions_types = list(/datum/action/item_action/toggle_mode) @@ -518,6 +518,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" /obj/item/weapon/restraints/handcuffs/energy/used desc = "energy discharge" @@ -546,26 +547,32 @@ Congratulations! You are now trained for xenobiology research!"} /obj/item/weapon/scalpel/alien name = "alien scalpel" icon = 'icons/obj/abductor.dmi' + origin_tech = "materials=2;biotech=2;abductor=2" /obj/item/weapon/hemostat/alien name = "alien hemostat" icon = 'icons/obj/abductor.dmi' + origin_tech = "materials=2;biotech=2;abductor=2" /obj/item/weapon/retractor/alien name = "alien retractor" icon = 'icons/obj/abductor.dmi' + origin_tech = "materials=2;biotech=2;abductor=2" /obj/item/weapon/circular_saw/alien name = "alien saw" icon = 'icons/obj/abductor.dmi' + origin_tech = "materials=2;biotech=2;abductor=2" /obj/item/weapon/surgicaldrill/alien name = "alien drill" icon = 'icons/obj/abductor.dmi' + origin_tech = "materials=2;biotech=2;abductor=2" /obj/item/weapon/cautery/alien name = "alien cautery" icon = 'icons/obj/abductor.dmi' + origin_tech = "materials=2;biotech=2;abductor=2" /obj/item/clothing/head/helmet/abductor name = "agent headgear" @@ -573,7 +580,7 @@ Congratulations! You are now trained for xenobiology research!"} icon_state = "alienhelmet" item_state = "alienhelmet" blockTracking = 1 - origin_tech = "materials=6;magnets=5" + origin_tech = "materials=6;magnets=5;abductor=3" flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR // Operating Table / Beds / Lockers diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 31f90f277cc..10f91bb920a 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -642,6 +642,8 @@ proc/CallMaterialName(ID) dat += "

Current Research Levels:


" for(var/v in files.known_tech) var/datum/tech/T = files.known_tech[v] + if(T.level <= 0) + continue dat += "[T.name]
" dat += "* Level: [T.level]
" dat += "* Summary: [T.desc]
" @@ -670,6 +672,8 @@ proc/CallMaterialName(ID) dat += "

Load Technology to Disk:


" for(var/v in files.known_tech) var/datum/tech/T = files.known_tech[v] + if(T.level <= 0) + continue dat += "[T.name] " dat += "Copy to Disk
" dat += "
" diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm index 552765519cb..6470b5453c5 100644 --- a/code/modules/research/research.dm +++ b/code/modules/research/research.dm @@ -112,7 +112,7 @@ research holder datum. for(var/v in known_tech) var/datum/tech/T = known_tech[v] - T.level = Clamp(T.level, 1, 20) + T.level = Clamp(T.level, 0, 20) for(var/v in known_designs) var/datum/design/D = known_designs[v] @@ -226,6 +226,12 @@ research holder datum. id = "syndicate" rare = 4 +/datum/tech/abductor + name = "Alien Technologies Research" + desc = "The study of technologies used by advanced alien race known as Abductors." + id = "abductor" + rare = 5 + level = 0 /* /datum/tech/arcane @@ -264,8 +270,7 @@ research holder datum. return 0 var/cost = 0 - var/i - for(i=current_level+1, i<=level, i++) + for(var/i=current_level+1, i<=level, i++) if(i == initial(level)) continue cost += i*5*rare diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index 629035dee92..286f65ae899 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -301,6 +301,8 @@ dat += "Known Technologies
" for(var/v in temp_server.files.known_tech) var/datum/tech/T = temp_server.files.known_tech[v] + if(T.level <= 0) + continue dat += "* [T.name] " dat += "(Reset)
" //FYI, these are all strings. dat += "Known Designs
"