From d2b9898fad30de718b766f1df248dfa552c443c4 Mon Sep 17 00:00:00 2001 From: "vageyenaman@gmail.com" Date: Wed, 3 Aug 2011 00:12:56 +0000 Subject: [PATCH] Fixed the meteor gamemode always failing to start. Tweaked some numbers for deconstruction costs for laser cannons and heavy laser cannons. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1972 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/gamemodes/meteor/meteor.dm | 11 +++++++++++ code/game/objects/items/weapons/guns_new.dm | 2 ++ 2 files changed, 13 insertions(+) diff --git a/code/game/gamemodes/meteor/meteor.dm b/code/game/gamemodes/meteor/meteor.dm index 10621e5e8ba..7a562b8eca1 100644 --- a/code/game/gamemodes/meteor/meteor.dm +++ b/code/game/gamemodes/meteor/meteor.dm @@ -16,6 +16,17 @@ spawn(meteordelay) nometeors = 0 +/datum/game_mode/meteor/can_start() + var/num_players = 0 + for(var/mob/new_player/P in world) + if(P.client && P.ready) + num_players++ + + if(num_players >= 10) + return 1 // needs at least 10 players in order to play this mode + + return 0 + /datum/game_mode/meteor/process() if (nometeors) return if (prob(10)) meteor_wave() diff --git a/code/game/objects/items/weapons/guns_new.dm b/code/game/objects/items/weapons/guns_new.dm index 5971206ee5d..93335efe8d1 100644 --- a/code/game/objects/items/weapons/guns_new.dm +++ b/code/game/objects/items/weapons/guns_new.dm @@ -1077,6 +1077,7 @@ icon_state = "laser" force = 15 fire_sound = 'pulse.ogg' + origin_tech = "combat=4;materials=3;powerstorage=3" load_into_chamber() if(in_chamber) return 1 @@ -1112,6 +1113,7 @@ icon_state = "laser" force = 20 fire_sound = 'pulse.ogg' + origin_tech = "combat=4;materials=4;powerstorage=4" load_into_chamber() if(in_chamber) return 1