From f6a5c71f286d384c152ea02aca862756a2f8dcb6 Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Wed, 18 Nov 2015 15:23:41 -0500 Subject: [PATCH 1/2] Ignoring .db files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 3bb4b517e45..f784b30d80e 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ data/ /_maps/map_files/**/backup/* /_maps/map_files/**/*.dmm.backup /nano/debug.html +*.db From c029cf5f50b0539ec99b69a780e36413ffd1d5f3 Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Wed, 18 Nov 2015 15:41:51 -0500 Subject: [PATCH 2/2] Meteor balance patch 3 --- code/game/gamemodes/meteor/meteor.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/meteor/meteor.dm b/code/game/gamemodes/meteor/meteor.dm index d4597c235cb..bc00753ff92 100644 --- a/code/game/gamemodes/meteor/meteor.dm +++ b/code/game/gamemodes/meteor/meteor.dm @@ -24,10 +24,10 @@ /datum/game_mode/meteor/proc/sendmeteors() - var/waveduration = world.time + rand(0,2000) + text2num("[wave]000") + var/waveduration = world.time + rand(0,1000) + text2num("[wave]000") var/waitduration = rand(3000,9000) while(waveduration - world.time > 0) - sleep(20) + sleep(50 - text2num("[wave]0") / 2) spawn() spawn_meteors(6, meteors_normal) wave++ sleep(waitduration)