[MIRROR] Clean up all sorts of crap, mostly defines (#5788)

* Clean up all sorts of crap, mostly defines

* fixes compile errors
This commit is contained in:
CitadelStationBot
2018-03-05 13:23:28 -06:00
committed by Poojawa
parent c6aab4b38b
commit 30a4705c01
43 changed files with 168 additions and 346 deletions
@@ -18,6 +18,11 @@ field_generator power level display
#define FG_CHARGING 1
#define FG_ONLINE 2
//field generator construction defines
#define FG_UNSECURED 0
#define FG_SECURED 1
#define FG_WELDED 2
/obj/machinery/field/generator
name = "field generator"
desc = "A large thermal battery that projects a high amount of energy when powered."
+4 -7
View File
@@ -81,14 +81,8 @@
#define COMPFRICTION 5e5
#define COMPSTARTERLOAD 2800
// Crucial to make things work!!!!
// OLD FIX - explanation given down below.
// /obj/machinery/power/compressor/CanPass(atom/movable/mover, turf/target)
// return !density
/obj/machinery/power/compressor/locate_machinery()
if(turbine)
return
@@ -169,7 +163,6 @@
// These are crucial to working of a turbine - the stats modify the power output. TurbGenQ modifies how much raw energy can you get from
// rpms, TurbGenG modifies the shape of the curve - the lower the value the less straight the curve is.
#define TURBPRES 9000000
#define TURBGENQ 100000
#define TURBGENG 0.5
@@ -370,3 +363,7 @@
if("reconnect")
locate_machinery()
. = TRUE
#undef COMPFRICTION
#undef TURBGENQ
#undef TURBGENG