From c6b69807eeacabd8767569d09b269d3b7bfa9395 Mon Sep 17 00:00:00 2001 From: n3ophyt3 Date: Tue, 2 Aug 2011 22:44:28 +0000 Subject: [PATCH] Brains can no longer win survive objectives. The captain's laser once again autocharges as it did before the gun overhaul. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1969 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/gamemodes/objective.dm | 2 +- code/game/objects/items/weapons/guns_new.dm | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index bb39c282c9f..f38b1f2139b 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -201,7 +201,7 @@ datum check_completion() if(issilicon(owner.current) && owner.current != owner.original) return 0 - if(!owner.current || owner.current.stat == 2) + if(!owner.current || owner.current.stat == 2 || isbrain(owner.current)) //Brains no longer win survive objectives. --NEO return 0 return 1 diff --git a/code/game/objects/items/weapons/guns_new.dm b/code/game/objects/items/weapons/guns_new.dm index 3eb83e5f1d2..5971206ee5d 100644 --- a/code/game/objects/items/weapons/guns_new.dm +++ b/code/game/objects/items/weapons/guns_new.dm @@ -877,6 +877,18 @@ force = 10 origin_tech = null //forgotten technology of ancients lol + New() + ..() + charge() + + proc + charge() + if(power_supply.charge < power_supply.maxcharge) + power_supply.give(100) + update_icon() + spawn(50) charge() + //Added this to the cap's laser back before the gun overhaul to make it halfways worth stealing. It's back now. --NEO + cyborg load_into_chamber() if(in_chamber)