Merge pull request #124 from Mirag1993/master

Апдейт ионных движков , добавление новых технологий

_maps/shuttles/syndicate/syndicate_cybersun_remora.dmm

@@ -74,12 +74,12 @@
 	dir = 8
 	},
 /obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/hardsuit/syndi/scarlet,
 /obj/item/clothing/mask/gas/syndicate,
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
 /obj/item/tank/jetpack/carbondioxide,
+/obj/item/clothing/suit/space/hardsuit/syndi/cybersun,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/hallway/central)
 "aq" = (
@@ -98,10 +98,10 @@
 /area/ship/hallway/central)
 "at" = (
 /obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/hardsuit/syndi/scarlet,
 /obj/item/clothing/mask/gas/syndicate,
 /obj/machinery/light/directional/east,
 /obj/item/tank/jetpack/carbondioxide,
+/obj/item/clothing/suit/space/hardsuit/syndi/cybersun,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/hallway/central)
 "au" = (
@@ -365,13 +365,13 @@
 	},
 /obj/structure/window/reinforced,
 /obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/hardsuit/syndi/scarlet,
 /obj/item/clothing/mask/gas/syndicate,
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
 /obj/machinery/door/firedoor/border_only,
 /obj/item/tank/jetpack/carbondioxide,
+/obj/item/clothing/suit/space/hardsuit/syndi/cybersun,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/hallway/central)
 "aV" = (
@@ -385,10 +385,10 @@
 "aX" = (
 /obj/structure/window/reinforced,
 /obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/hardsuit/syndi/scarlet,
 /obj/item/clothing/mask/gas/syndicate,
 /obj/machinery/door/firedoor/border_only,
 /obj/item/tank/jetpack/carbondioxide,
+/obj/item/clothing/suit/space/hardsuit/syndi/cybersun,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/hallway/central)
 "aY" = (
@@ -1121,7 +1121,6 @@
 	dir = 1
 	},
 /obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/hardsuit/cybersun,
 /obj/item/clothing/mask/gas/syndicate,
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
@@ -1130,6 +1129,7 @@
 	dir = 1
 	},
 /obj/item/tank/jetpack/carbondioxide,
+/obj/item/clothing/suit/space/hardsuit/syndi/cybersun/paramed,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/hallway/central)
 "ct" = (
@@ -1145,12 +1145,12 @@
 	dir = 1
 	},
 /obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/hardsuit/cybersun,
 /obj/item/clothing/mask/gas/syndicate,
 /obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
 /obj/item/tank/jetpack/carbondioxide,
+/obj/item/clothing/suit/space/hardsuit/syndi/cybersun/paramed,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/hallway/central)
 "cv" = (
@@ -1327,12 +1327,12 @@
 	dir = 8
 	},
 /obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/hardsuit/cybersun,
 /obj/item/clothing/mask/gas/syndicate,
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
 /obj/item/tank/jetpack/carbondioxide,
+/obj/item/clothing/suit/space/hardsuit/syndi/cybersun/paramed,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/hallway/central)
 "cL" = (
@@ -2264,10 +2264,10 @@
 /area/ship/hallway/central)
 "ey" = (
 /obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/hardsuit/cybersun,
 /obj/item/clothing/mask/gas/syndicate,
 /obj/machinery/light/directional/east,
 /obj/item/tank/jetpack/carbondioxide,
+/obj/item/clothing/suit/space/hardsuit/syndi/cybersun/paramed,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/hallway/central)
 "ez" = (

code/__byond_version_compat.dm

@@ -15,9 +15,9 @@
 #error Please consider upgrading to 514.1577 or above.
 #endif
 
-#if (DM_VERSION == 514 && DM_BUILD == 1589)
-#error Warning! Byond 514.1589 has been known to be unstable. Use at your own risk.
-#error Please consider using 514.1588.
+#if (DM_VERSION == 514 && DM_BUILD == 1590)
+#error Warning! Byond 514.1590 has been known to be unstable. Use at your own risk.
+#error Please consider using 514.1589.
 #endif
 
 // Keep savefile compatibilty at minimum supported level

code/game/machinery/shuttle/shuttle_engine_types.dm

@@ -90,15 +90,15 @@
 	desc = "A thruster that burns plasma from an adjacent heater to create thrust."
 	circuit = /obj/item/circuitboard/machine/shuttle/engine/plasma
 	fuel_type = GAS_PLASMA
-	fuel_use = 20
-	thrust = 25
+	fuel_use = 30
+	thrust = 12
 
 /obj/machinery/power/shuttle/engine/fueled/expulsion
 	name = "expulsion thruster"
 	desc = "A thruster that expels gas inefficiently to create thrust."
 	circuit = /obj/item/circuitboard/machine/shuttle/engine/expulsion
-	fuel_use = 80
-	thrust = 15
+	fuel_use = 90
+	thrust = 8
 	//All fuel code already handled
 
 /**
@@ -113,20 +113,53 @@
 	icon_state_off = "burst_off"
 	icon_state_closed = "burst"
 	icon_state_open = "burst_open"
-	thrust = 1.5
+	thrust = 0.8
 	///Amount, in kilojoules, needed for a full burn.
-	var/power_per_burn = 85000
+	var/power_per_burn = 25000
+
+/obj/machinery/power/shuttle/engine/electric/tech1
+	name = "1-st ion thruster"
+	desc = "A thruster that expels charged particles to generate thrust."
+	circuit = /obj/item/circuitboard/machine/shuttle/engine/electric/tech1
+	icon_state = "tech1"
+	icon_state_off = "tech1_off"
+	icon_state_closed = "tech1"
+	icon_state_open = "tech1_open"
+	thrust = 2
+	power_per_burn = 35000
+
+/obj/machinery/power/shuttle/engine/electric/tech2
+	name = "2-st ion thruster"
+	desc = "A thruster that expels charged particles to generate thrust."
+	circuit = /obj/item/circuitboard/machine/shuttle/engine/electric/tech2
+	icon_state = "tech2"
+	icon_state_off = "tech2_off"
+	icon_state_closed = "tech2"
+	icon_state_open = "tech2_open"
+	thrust = 4
+	power_per_burn = 50000
+
+/obj/machinery/power/shuttle/engine/electric/tech3
+	name = "3-st ion thruster"
+	desc = "A thruster that expels charged particles to generate thrust."
+	circuit = /obj/item/circuitboard/machine/shuttle/engine/electric/tech3
+	icon_state = "tech3"
+	icon_state_off = "tech3_off"
+	icon_state_closed = "tech3"
+	icon_state_open = "tech3_open"
+	thrust = 6
+	power_per_burn = 65000
 
 /obj/machinery/power/shuttle/engine/electric/bad
 	name = "Outdated Ion Thruster"
 	circuit = /obj/item/circuitboard/machine/shuttle/engine/electric/bad
-	thrust = 2
-	power_per_burn = 70000
+	thrust = 0.5
+	power_per_burn = 50000
 
 /obj/machinery/power/shuttle/engine/electric/premium
 	name = "high performance ion thruster"
 	desc = "An expensive variant of a standard ion thruster, using highest quality components in order to achieve much better performance."
-	thrust = 30
+	thrust = 3
 	power_per_burn = 65000
 
 /obj/machinery/power/smes/shuttle

code/game/objects/items/circuitboards/machine_circuitboards.dm

@@ -1454,6 +1454,24 @@
 	req_components = list(/obj/item/stock_parts/capacitor = 2,
 		/obj/item/stock_parts/micro_laser = 2)
 
+/obj/item/circuitboard/machine/shuttle/engine/electric/tech1
+	name = "1st Ion Thruster (Machine Board)"
+	build_path = /obj/machinery/power/shuttle/engine/electric/tech1
+	req_components = list(/obj/item/stock_parts/capacitor = 2,
+		/obj/item/stock_parts/micro_laser = 2)
+
+/obj/item/circuitboard/machine/shuttle/engine/electric/tech2
+	name = "2st Ion Thruster (Machine Board)"
+	build_path = /obj/machinery/power/shuttle/engine/electric/tech2
+	req_components = list(/obj/item/stock_parts/capacitor = 2,
+		/obj/item/stock_parts/micro_laser = 2)
+
+/obj/item/circuitboard/machine/shuttle/engine/electric/tech3
+	name = "3st Ion Thruster (Machine Board)"
+	build_path = /obj/machinery/power/shuttle/engine/electric/tech3
+	req_components = list(/obj/item/stock_parts/capacitor = 2,
+		/obj/item/stock_parts/micro_laser = 2)
+
 /obj/item/circuitboard/machine/shuttle/engine/expulsion
 	name = "Expulsion Thruster (Machine Board)"
 	build_path = /obj/machinery/power/shuttle/engine/fueled/expulsion

code/modules/research/designs/machine_designs.dm

@@ -664,6 +664,33 @@
 	category = list ("Shuttle Machinery")
 	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
 
+/datum/design/board/shuttle/engine/electric/tech1
+	name = "Machine Design (Ion Thruster Board) 1st generation"
+	desc = "The circuit board for an 1st generation ion thruster."
+	id = "engine_ion_t1"
+	materials = list(/datum/material/glass = 1000, /datum/material/silver = 2000, /datum/material/bluespace = 1000)
+	build_path = /obj/item/circuitboard/machine/shuttle/engine/electric/tech1
+	category = list ("Shuttle Machinery")
+	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
+
+/datum/design/board/shuttle/engine/electric/tech2
+	name = "Machine Design (Ion Thruster Board) 2nd generation"
+	desc = "The circuit board for an 2nd generation ion thruster."
+	id = "engine_ion_t2"
+	materials = list(/datum/material/glass = 1000, /datum/material/gold = 2000, /datum/material/bluespace = 1000, /datum/material/silver = 2000)
+	build_path = /obj/item/circuitboard/machine/shuttle/engine/electric/tech2
+	category = list ("Shuttle Machinery")
+	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
+
+/datum/design/board/shuttle/engine/electric/tech3
+	name = "Machine Design (Ion Thruster Board) 3nd generation"
+	desc = "The circuit board for an 3nd generation ion thruster."
+	id = "engine_ion_t3"
+	materials = list(/datum/material/glass = 1000, /datum/material/gold = 2000, /datum/material/bluespace = 1000, /datum/material/silver = 2000,/datum/material/diamond = 1500)
+	build_path = /obj/item/circuitboard/machine/shuttle/engine/electric/tech3
+	category = list ("Shuttle Machinery")
+	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
+
 /datum/design/board/shuttle/engine/expulsion
 	name = "Machine Design (Expulsion Thruster Board)"
 	desc = "The circuit board for an expulsion thruster."

code/modules/research/techweb/all_nodes.dm

@@ -1155,17 +1155,44 @@
 	description = "Research the technology required to create and use basic shuttles."
 	prereq_ids = list("bluespace_travel", "adv_engi")
 	design_ids = list("engine_plasma", "engine_ion", "engine_heater", "engine_smes", "shuttle_helm", "rapid_shuttle_designator")
+	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
+	export_price = 2500
+
+/datum/techweb_node/t1_shuttle_tech
+	id = "t1_ion"
+	display_name = "First generation ion Propulsion"
+	description = "Pioneer space travel with First Gen ion engines—where it all began."
+	prereq_ids = list("basic_shuttle")
+	design_ids = list("engine_ion_t1")
+	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 6500)
+	export_price = 6500
+
+/datum/techweb_node/t2_shuttle_tech
+	id = "t2_ion"
+	display_name = "Second generation ion Propulsion"
+	description = "Upgrade to Second Gen ion engines for advanced cosmic navigation."
+	prereq_ids = list("t1_ion")
+	design_ids = list("engine_ion_t2")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 10000)
-	export_price = 5000
+	export_price = 10000
+
+/datum/techweb_node/t3_shuttle_tech
+	id = "t3_ion"
+	display_name = "Third generation ion Propulsion"
+	description = "Unleash ultimate exploration with Third Gen ion propulsion."
+	prereq_ids = list("t2_ion")
+	design_ids = list("engine_ion_t3")
+	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 15000)
+	export_price = 15000
 
 /datum/techweb_node/exp_shuttle_tech
 	id = "exp_shuttle"
 	display_name = "Experimental Shuttle Research"
 	description = "A bunch of engines and related shuttle parts that are likely not really that useful, but could be in strange situations."
-	prereq_ids = list("basic_shuttle")
+	prereq_ids = list("t3_ion")
 	design_ids = list("engine_expulsion")
-	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000)
-	export_price = 2500
+	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 7500)
+	export_price = 7500
 
 ////////////////////// IPC Parts ///////////////////////
 /datum/techweb_node/ipc_organs