Новое дерево технологий

code/__DEFINES/research.dm

@@ -5,6 +5,7 @@
 #define RESEARCH_BLUESPACE     "bluespace"
 #define RESEARCH_ROBOTICS      "robotics"
 #define RESEARCH_ILLEGAL       "illegal"
+#define RESEARCH_SPECIAL       "special"
 
 // Is used in calculating reliability increase per prototype created.
 #define RND_RELIABILITY_EXPONENT 0.75

code/_onclick/hud/action.dm

@@ -21,6 +21,8 @@
 	var/button_icon = 'icons/hud/actions.dmi'
 	var/button_icon_state = "default"
 	var/background_icon_state = "bg_default"
+	var/icon/button_overlay_icon = null
+	var/button_overlay_state = null
 	var/transparent_when_unavailable = TRUE
 	var/mob/owner
 
@@ -196,7 +198,9 @@
 
 	cut_overlays()
 	var/image/img
-	if(owner.action_type == AB_ITEM && owner.target)
+	if(owner.button_overlay_icon && owner.button_overlay_state)
+		img = image(owner.button_overlay_icon, owner.button_overlay_state)
+	else if(owner.action_type == AB_ITEM && owner.target)
 		var/obj/item/I = owner.target
 		img = image(I.icon, src , I.icon_state)
 	else if(owner.button_icon && owner.button_icon_state)

code/game/objects/items/weapons/disks.dm

@@ -143,6 +143,16 @@
 	m_amt = 30
 	g_amt = 10
 	var/datum/tech/stored
+	var/datum/technology/stored_technology
+
+/obj/item/weapon/disk/tech_disk/hud
+	name = "HUD tech disk"
+	desc = "That disk contains design of basic HUD upgrade"
+	w_class = SIZE_TINY
+	m_amt = 30
+	g_amt = 10
+	stored_technology = new /datum/technology/tier1_hud_upgrade()
+
 
 /obj/item/weapon/disk/tech_disk/atom_init()
 	var/diskcolor = pick(0,1,2,3,4,5,6,7,8)

code/modules/item_upgrades/item_upgrade.dm

@@ -0,0 +1,180 @@
+#define HUD_UPGRADE_MEDSCAN 1
+#define HUD_UPGRADE_NIGHTVISION 2
+#define HUD_UPGRADE_THERMAL 3
+#define HUD_UPGRADE_THERMAL_ADVANCED 4
+
+#define HUD_TOGGLEABLE_MODE_NIGHTVISION "night"
+#define HUD_TOGGLEABLE_MODE_THERMAL "thermal"
+#define HUD_TOGGLEABLE_MODE_THERMAL_ADVANCED "thermal_adv"
+
+/obj/item/clothing/glasses/sunglasses/hud/advanced
+	name = "Advanced HUD"
+	desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status and health status."
+	icon = 'icons/obj/clothing/goggles.dmi'
+	icon_state = "sechud"
+	item_state = "sechud"
+	body_parts_covered = 0
+	hud_types = list(DATA_HUD_SECURITY)
+	item_action_types = list()
+	var/upgrade_tier = 0
+	var/current_mode = null
+
+/obj/item/clothing/glasses/sunglasses/hud/advanced/proc/apply_effects(var/mode_type, var/enable)
+	if(!ishuman(usr))
+		return
+	var/mob/living/carbon/human/human = usr
+	switch(mode_type)
+		if(HUD_TOGGLEABLE_MODE_NIGHTVISION)
+			if(enable)
+				lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
+				sightglassesmod = "nightsight"
+				darkness_view = 7
+			else
+				lighting_alpha = null
+				sightglassesmod = null
+				darkness_view = 0
+		if(HUD_TOGGLEABLE_MODE_THERMAL)
+			if(enable)
+				lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
+				sightglassesmod = "sepia"
+				vision_flags = SEE_MOBS
+
+			else
+				lighting_alpha = null
+				sightglassesmod = null
+				vision_flags = 0
+
+		if(HUD_TOGGLEABLE_MODE_THERMAL_ADVANCED)
+			if(enable)
+				lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
+				darkness_view = 7
+				vision_flags = SEE_MOBS
+			else
+				lighting_alpha = null
+				darkness_view = 0
+				vision_flags = 0
+
+	playsound(src, activation_sound, VOL_EFFECTS_MASTER, 10, FALSE)
+	human.update_sight()
+	update_item_actions()
+
+
+/obj/item/clothing/glasses/sunglasses/hud/advanced/proc/switch_mode(var/mode_type)
+	if(current_mode)
+		apply_effects(current_mode, FALSE)
+	if(current_mode == mode_type)
+		current_mode = null
+		return
+
+	apply_effects(mode_type, TRUE)
+	current_mode = mode_type
+
+/obj/item/clothing/glasses/sunglasses/hud/advanced/proc/upgrade_hud(var/obj/item/hud_upgrade/hud_upgrade)
+	switch(hud_upgrade.tier)
+		if(HUD_UPGRADE_MEDSCAN)
+			icon_state = "mixhud"
+			item_state = "mixhud"
+			hud_types.Add(DATA_HUD_MEDICAL_ADV)
+			def_hud_types.Add(DATA_HUD_MEDICAL_ADV)
+		if(HUD_UPGRADE_NIGHTVISION)
+			icon_state = "nvghud"
+			item_state = "nvghud"
+			item_actions.Add(new /datum/action/item_action/hands_free/switch_hud_modes/night(src))
+		if(HUD_UPGRADE_THERMAL)
+			icon_state = "thermalhud"
+			item_state = "thermalhud"
+			item_actions.Add(new /datum/action/item_action/hands_free/switch_hud_modes/thermal(src))
+		if(HUD_UPGRADE_THERMAL_ADVANCED)
+			icon_state = "4thtier"
+			item_state = "4thtier"
+			for(var/datum/action/item_action/hands_free/switch_hud_modes/night/night_action in item_actions)
+				night_action.Remove(usr)
+				item_actions.Remove(night_action)
+			for(var/datum/action/item_action/hands_free/switch_hud_modes/thermal/thermal_action in item_actions)
+				thermal_action.Remove(usr)
+				item_actions.Remove(thermal_action)
+			item_actions.Add(new /datum/action/item_action/hands_free/switch_hud_modes/thermal_advanced(src))
+
+	upgrade_tier = hud_upgrade.tier
+	add_item_actions(usr)
+
+/obj/item/clothing/glasses/sunglasses/hud/advanced/attackby(obj/item/W, mob/living/user)
+	if(istype(W, /obj/item/hud_upgrade))
+		var/obj/item/hud_upgrade/hud_upgrade = W
+		if(upgrade_tier >= hud_upgrade.tier)
+			to_chat(usr, "<span class='notice'>You've already installed that upgrade")
+			return
+		if(upgrade_tier < hud_upgrade.tier - 1)
+			to_chat(usr, "<span class='alert'>You have to install previous upgrades")
+			return
+		if(user.is_in_hands(src))
+			upgrade_hud(hud_upgrade)
+			add_item_actions(user)
+		else
+			to_chat(usr, "<span class='alert'>You have to hold huds in hands to upgrade it")
+			return
+		qdel(hud_upgrade)
+	if(istype(W, /obj/item/device/hud_calibrator))
+		var/obj/item/device/hud_calibrator = W
+		to_chat(usr, "<span class='alert'>You try to recalibrate huds, but nothing happens")
+		qdel(hud_calibrator)
+	. = ..()
+
+/obj/item/hud_upgrade
+	icon = 'icons/obj/item_upgrades.dmi'
+	var/tier = 0
+/obj/item/hud_upgrade/medscan
+	name = "Damage Scan Upgrade"
+	desc = "Allows HUD to show damage on person."
+	icon_state = "medscan"
+	tier = 1
+/obj/item/hud_upgrade/night
+	name = "Basic Nightvision HUD upgrade"
+	desc = "Allows HUD to turn a basic nightvision mode. Can be installed only after damage scan upgrade"
+	icon_state = "nightvision"
+	tier = 2
+/obj/item/hud_upgrade/thermal
+	name = "Thermal HUD upgrade"
+	desc = "Allows HUD to turn a basic thermal mode, makes nightvision mode more comfortable for use. Can be installed only after basic nightvision upgrade"
+	icon_state = "thermal1"
+	tier = 3
+/obj/item/hud_upgrade/thermal_advanced
+	name = "Advanced Thermal HUD upgrade"
+	desc = "Makes thermal mode comfortable and combines it with nightvision mode. Can be installed only after thermal upgrade"
+	icon_state = "thermal2"
+	tier = 4
+
+/datum/action/item_action/hands_free/switch_hud_modes/
+	name = "Switch Mode"
+	button_overlay_icon = 'icons/obj/clothing/goggles.dmi'
+	var/hud_mode
+
+/datum/action/item_action/hands_free/switch_hud_modes/Activate()
+	var/obj/item/clothing/glasses/sunglasses/hud/advanced/hud = target
+	if(!hud_mode || !istype(hud))
+		return
+
+	hud.switch_mode(hud_mode)
+
+/datum/action/item_action/hands_free/switch_hud_modes/night
+	name = "Toggle Nightvision"
+	button_overlay_state = "nvghud"
+	hud_mode = HUD_TOGGLEABLE_MODE_NIGHTVISION
+
+/datum/action/item_action/hands_free/switch_hud_modes/thermal //only thermal
+	name = "Toggle thermal"
+	button_overlay_state = "thermalhud"
+	hud_mode = HUD_TOGGLEABLE_MODE_THERMAL
+
+/datum/action/item_action/hands_free/switch_hud_modes/thermal_advanced //mixed thermal and nightvision
+	name = "Toggle Advanced Thermal"
+	button_overlay_state = "4thtier"
+	hud_mode = HUD_TOGGLEABLE_MODE_THERMAL_ADVANCED
+
+#undef HUD_UPGRADE_MEDSCAN
+#undef HUD_UPGRADE_NIGHTVISION
+#undef HUD_UPGRADE_THERMAL
+#undef HUD_UPGRADE_THERMAL_ADVANCED
+#undef HUD_TOGGLEABLE_MODE_NIGHTVISION
+#undef HUD_TOGGLEABLE_MODE_THERMAL
+#undef HUD_TOGGLEABLE_MODE_THERMAL_ADVANCED

code/modules/research/designs.dm

@@ -2316,6 +2316,15 @@ other types of metals and chemistry for reagents).
 	build_path = /obj/item/device/hud_calibrator
 	category = list("Support")
 
+/datum/design/hud_advanced
+	name = "Advanced HUD"
+	desc = "An advanced HUD that can be flexibly modified"
+	id = "advanced_hud"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 150, MAT_GLASS = 150)
+	build_path = /obj/item/clothing/glasses/sunglasses/hud/advanced
+	category = list("Support")
+
 /////////////////////////////////////////
 //////////////////Test///////////////////
 /////////////////////////////////////////
@@ -2879,3 +2888,43 @@ other types of metals and chemistry for reagents).
 	materials = list(MAT_METAL = 2000, MAT_GLASS = 1000)
 	build_path = /obj/item/rig_module/emp_shield
 	category = list("Rig Modules")
+
+/////////////////////////////////////////
+////////////////Upgrades/////////////////
+/////////////////////////////////////////
+
+/datum/design/tier1_hud_upgrade
+	name = "Damage Scan Upgrade"
+	desc = "Allows HUD to show damage on person."
+	id = "tier1_hud_upgrade"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 2000, MAT_GLASS = 1000)
+	build_path = /obj/item/hud_upgrade/medscan
+	category = list("Special upgrades")
+
+/datum/design/tier2_hud_upgrade
+	name = "Basic Nightvision HUD upgrade"
+	desc = "Allows HUD to turn a basic nightvision mode. Can be installed only after damage scan upgrade"
+	id = "tier2_hud_upgrade"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 4000, MAT_GLASS = 2000, MAT_URANIUM = 2000)
+	build_path = /obj/item/hud_upgrade/night
+	category = list("Special upgrades")
+
+/datum/design/tier3_hud_upgrade
+	name = "Thermal HUD upgrade"
+	desc = "Allows HUD to turn a basic thermal mode, makes nightvision mode more comfortable for use. Can be installed only after basic nightvision upgrade"
+	id = "tier3_hud_upgrade"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 4000, MAT_GLASS = 2000, MAT_PHORON = 2500)
+	build_path = /obj/item/hud_upgrade/thermal
+	category = list("Special upgrades")
+
+/datum/design/tier4_hud_upgrade
+	name = "Advanced Thermal HUD upgrade"
+	desc = "Makes thermal mode comfortable and combines it with nightvision mode. Can be installed only after thermal upgrade"
+	id = "tier4_hud_upgrade"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 4000, MAT_GLASS = 2000, MAT_GOLD = 1500, MAT_URANIUM = 3000, MAT_PHORON = 3500)
+	build_path = /obj/item/hud_upgrade/thermal_advanced
+	category = list("Special upgrades")

code/modules/research/rdconsole.dm

@@ -146,6 +146,16 @@ ADD_TO_GLOBAL_LIST(/obj/machinery/computer/rdconsole, RDcomputer_list)
 			files.research_points += research_points
 		else
 			to_chat(user, "<span class='notice'>There was no usefull data inside [D.name]'s buffer.</span>")
+	else if(istype(D, /obj/item/weapon/disk/tech_disk))
+		var/obj/item/weapon/disk/tech_disk/disk = D
+		if(disk.stored_technology)
+			to_chat(user, "<span class='notice'>You succesfully uploaded '[disk.stored_technology.name]' in the console</span>")
+			files.tech_trees[disk.stored_technology.tech_type].shown = TRUE
+			files.UnlockTechology(disk.stored_technology, TRUE)
+			user.remove_from_mob(disk)
+			qdel(disk)
+		else
+			to_chat(user, "<span class ='alert'>You can't upload empty disk")
 	else
 		//The construction/deconstruction of the console code.
 		..()

code/modules/research/research.dm

@@ -348,6 +348,15 @@ The tech datums are the actual "tech trees" that you improve through researching
 	shown = FALSE
 	item_tech_req = "syndicate" // research any traiter item and this tech will show up
 
+/datum/tech/special
+	name = "Special Technologies Research"
+	shortname = "Special Tech"
+	desc = "Technologies of another corporations that can be used for Nanotrasen benefit"
+	id = RESEARCH_SPECIAL
+	rare = 3
+	shown = FALSE
+	item_tech_req = "special" // research any special item and this tech will show up
+
 
 /datum/technology
 	var/name = "name"
@@ -1709,3 +1718,67 @@ The tech datums are the actual "tech trees" that you improve through researching
 	cost = 5000
 
 	unlocks_designs = list("camera_bug")
+
+
+/datum/technology/tier1_hud_upgrade
+	name = "Damage Scan HUD upgrade"
+	desc = "Damage Scan HUD upgrade"
+	id = "tier1_hud_upgrade"
+	tech_type = RESEARCH_SPECIAL
+
+	x = 0.1
+	y = 0.8
+	icon = "mixhudadv"
+
+	required_technologies = list("tier1_hud_upgrade")
+	required_tech_levels = list(RESEARCH_SPECIAL = 1)
+
+	unlocks_designs = list("tier1_hud_upgrade", "advanced_hud")
+
+/datum/technology/tier2_hud_upgrade
+	name = "Basic Nightvision HUD upgrade"
+	desc = "Basic Nightvision HUD upgrade"
+	id = "tier2_hud_upgrade"
+	tech_type = RESEARCH_SPECIAL
+
+	x = 0.2
+	y = 0.8
+	icon = "nvghud"
+
+	required_technologies = list("tier1_hud_upgrade")
+	required_tech_levels = list(RESEARCH_SPECIAL = 2)
+	cost = 10000
+
+	unlocks_designs = list("tier2_hud_upgrade")
+
+/datum/technology/tier3_hud_upgrade
+	name = "Thermal HUD upgrade"
+	desc = "Ultra HUD upgrade"
+	id = "tier3_hud_upgrade"
+	tech_type = RESEARCH_SPECIAL
+
+	x = 0.3
+	y = 0.8
+	icon = "thermalhud"
+
+	required_technologies = list("tier2_hud_upgrade")
+	required_tech_levels = list(RESEARCH_SPECIAL = 3)
+	cost = 20000
+
+	unlocks_designs = list("tier3_hud_upgrade")
+
+/datum/technology/tier4_hud_upgrade
+	name = "Advanced Thermal HUD upgrade"
+	desc = "Advanced Thermal HUD upgrade"
+	id = "tier4_hud_upgrade"
+	tech_type = RESEARCH_SPECIAL
+
+	x = 0.4
+	y = 0.8
+	icon = "4thtier"
+
+	required_technologies = list("tier3_hud_upgrade")
+	required_tech_levels = list(RESEARCH_SPECIAL = 4)
+	cost = 30000
+
+	unlocks_designs = list("tier4_hud_upgrade")