mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
[MIRROR] Undefines local defines and moves global to __define (#8502)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> Co-authored-by: Kashargul <KashL@t-online.de>
This commit is contained in:
@@ -43,9 +43,9 @@ var/global/pipe_processing_killed = 0
|
||||
admin_notice("<span class='danger'>Initializations complete.</span>", R_DEBUG)
|
||||
|
||||
// #if UNIT_TEST
|
||||
// #define CHECK_SLEEP_MASTER // For unit tests we don't care about a smooth lobby screen experience. We care about speed.
|
||||
// # define CHECK_SLEEP_MASTER // For unit tests we don't care about a smooth lobby screen experience. We care about speed.
|
||||
// #else
|
||||
// #define CHECK_SLEEP_MASTER if(++initialized_objects > 500) { initialized_objects=0;sleep(world.tick_lag); }
|
||||
// # define CHECK_SLEEP_MASTER if(++initialized_objects > 500) { initialized_objects=0;sleep(world.tick_lag); }
|
||||
// #endif
|
||||
|
||||
/datum/controller/game_controller/proc/setup_objects()
|
||||
@@ -53,4 +53,4 @@ var/global/pipe_processing_killed = 0
|
||||
populate_antag_type_list()
|
||||
|
||||
//Set up spawn points.
|
||||
populate_spawn_points()
|
||||
populate_spawn_points()
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
#define OBSERVER_EVENT_DESTROY "OnDestroy"
|
||||
|
||||
/atom
|
||||
var/list/observer_events
|
||||
|
||||
|
||||
@@ -162,3 +162,5 @@ SUBSYSTEM_DEF(plants)
|
||||
|
||||
for(var/mask in SSplants.gene_tag_masks)
|
||||
to_chat(usr, "[mask]: [SSplants.gene_tag_masks[mask]]")
|
||||
|
||||
#undef PLANT_TICK_TIME
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
#define DEFAULT_ROBOT_SPRITE_NAME "M-USE NanoTrasen"
|
||||
|
||||
SUBSYSTEM_DEF(robot_sprites)
|
||||
name = "Robot Sprites"
|
||||
init_order = INIT_ORDER_ROBOT_SPRITES
|
||||
|
||||
@@ -209,3 +209,6 @@ SUBSYSTEM_DEF(throwing)
|
||||
if(hit_thing)
|
||||
finalize(hit=TRUE, t_target=hit_thing)
|
||||
return TRUE
|
||||
|
||||
#undef MAX_THROWING_DIST
|
||||
#undef MAX_TICKS_TO_MAKE_UP
|
||||
|
||||
Reference in New Issue
Block a user