Flammable Items, Abstractness, and hypnosis (#19267)

* Laser Eyes

* Update dna.dm

* Mecha

* Update positive_genes.dm

* These

* These 2

* yeh

* Rest of these

* Update turf.dm

* Update food.dm

* Some moar

* mooove

* Update vorestation.dme

* Update burning.dm

* firesuit

* flags

* HYPNOCOLOR

* xd

* no filter

* dc

* Update ore_bag.dm

* Update misc.dm

* Update misc.dm
This commit is contained in:
Cameron Lennox
2026-04-13 00:30:02 -04:00
committed by GitHub
parent ee2fd148ae
commit d8c1932cb9
145 changed files with 791 additions and 203 deletions
@@ -18,7 +18,7 @@
return nozzle.get_thrust()
/datum/ship_engine/gas_thruster/burn()
return nozzle.burn()
return nozzle.thrust_burn()
/datum/ship_engine/gas_thruster/set_thrust_limit(var/new_limit)
nozzle.thrust_limit = new_limit
@@ -145,7 +145,7 @@
A = get_step(A, exhaust_dir)
return blockage
/obj/machinery/atmospherics/unary/engine/proc/burn()
/obj/machinery/atmospherics/unary/engine/proc/thrust_burn()
if(!is_on())
return 0
if(!check_fuel() || (use_power_oneoff(charge_per_burn) < charge_per_burn) || check_blockage())
@@ -17,7 +17,7 @@
return thruster.get_thrust()
/datum/ship_engine/ion/burn()
return thruster.burn()
return thruster.thrust_burn()
/datum/ship_engine/ion/set_thrust_limit(var/new_limit)
thruster.thrust_limit = new_limit
@@ -69,7 +69,7 @@
if(!powered())
.+= list(list("Insufficient power to operate.", "bad"))
/obj/machinery/ion_engine/proc/burn()
/obj/machinery/ion_engine/proc/thrust_burn()
if(!on && !powered())
return 0
use_power_oneoff(burn_cost)
+2 -2
View File
@@ -91,7 +91,7 @@
//Does actual burn and returns the resulting acceleration
/obj/effect/overmap/visitable/ship/proc/get_burn_acceleration()
return round(burn() / get_vessel_mass(), SHIP_MOVE_RESOLUTION)
return round(thrust_burn() / get_vessel_mass(), SHIP_MOVE_RESOLUTION)
/obj/effect/overmap/visitable/ship/proc/get_vessel_mass()
. = vessel_mass
@@ -245,7 +245,7 @@
/obj/effect/overmap/visitable/ship/set_dir(new_dir)
return ..(NORTH) // NO! We always face north.
/obj/effect/overmap/visitable/ship/proc/burn()
/obj/effect/overmap/visitable/ship/proc/thrust_burn()
for(var/datum/ship_engine/E in engines)
. += E.burn()