Skip to content

Commit

Permalink
Merge pull request #515 from MrCat15352/Revorks_engines
Browse files Browse the repository at this point in the history
3 реворк, чисто офы, поехали
  • Loading branch information
MrCat15352 authored May 10, 2024
2 parents 41c19f6 + 918c2ed commit b2d2958
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
12 changes: 6 additions & 6 deletions code/game/machinery/shuttle/shuttle_engine_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
// fuel_use = 20 // CELADON-EDIT - ORIGINAL
// thrust = 25 // CELADON-EDIT - ORIGINAL
fuel_use = 20
thrust = 14
thrust = 25
// [/CELADON-EDIT]

/obj/machinery/power/shuttle/engine/fueled/expulsion
Expand All @@ -104,8 +104,8 @@
// [CELADON-EDIT] - CELADON_BALANCE - Трогаем движки
// fuel_use = 80 // CELADON-EDIT - ORIGINAL
// thrust = 15 // CELADON-EDIT - ORIGINAL
fuel_use = 40
thrust = 7
fuel_use = 80
thrust = 15
// [/CELADON-EDIT]
//All fuel code already handled

Expand All @@ -126,7 +126,7 @@
///Amount, in kilojoules, needed for a full burn.
// var/power_per_burn = 50000 // CELADON-EDIT - ORIGINAL
thrust = 10
var/power_per_burn = 25000
var/power_per_burn = 50000
// [/CELADON-EDIT]

/obj/machinery/power/shuttle/engine/electric/bad
Expand All @@ -136,7 +136,7 @@
// thrust = 2 // CELADON-EDIT - ORIGINAL
// power_per_burn = 70000 // CELADON-EDIT - ORIGINAL
thrust = 2
power_per_burn = 50000
power_per_burn = 70000
// [/CELADON-EDIT]

/obj/machinery/power/shuttle/engine/electric/premium
Expand All @@ -146,7 +146,7 @@
// thrust = 30 // CELADON-EDIT - ORIGINAL
// power_per_burn = 65000 // CELADON-EDIT - ORIGINAL
thrust = 30
power_per_burn = 30000
power_per_burn = 65000
// [/CELADON-EDIT]
/obj/machinery/power/smes/shuttle
name = "electric engine precharger"
Expand Down
6 changes: 3 additions & 3 deletions mod_celadon/balance/code/engine/enginebalance.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
icon_state_closed = "tech1"
icon_state_open = "tech1_open"
thrust = 20
power_per_burn = 35000
power_per_burn = 60000

/obj/machinery/power/shuttle/engine/electric/tech2
name = "2-st ion thruster"
Expand All @@ -18,7 +18,7 @@
icon_state_closed = "tech2"
icon_state_open = "tech2_open"
thrust = 25
power_per_burn = 50000
power_per_burn = 65000

/obj/machinery/power/shuttle/engine/electric/tech3
name = "3-st ion thruster"
Expand All @@ -29,4 +29,4 @@
icon_state_closed = "tech3"
icon_state_open = "tech3_open"
thrust = 30
power_per_burn = 65000
power_per_burn = 70000

0 comments on commit b2d2958

Please sign in to comment.