Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit

This commit is contained in:
SandPoot
2024-03-08 19:10:22 -03:00
810 changed files with 140372 additions and 5523 deletions
+2 -2
View File
@@ -76,7 +76,7 @@
/obj/docking_port/singularity_pull()
return
/obj/docking_port/singularity_act()
return 0
return FALSE
/obj/docking_port/shuttleRotate()
return //we don't rotate with shuttles via this code.
@@ -954,7 +954,7 @@
/obj/docking_port/mobile/proc/get_engine_coeff(current,engine_mod)
var/new_value = max(0,current + engine_mod)
if(new_value == initial_engines)
return 1
return TRUE
if(new_value > initial_engines)
var/delta = new_value - initial_engines
var/change_per_engine = (1 - ENGINE_COEFF_MIN) / ENGINE_DEFAULT_MAXSPEED_ENGINES // 5 by default