From c14e5ce82eea88e29bbe842fe2d35eae5e6058a6 Mon Sep 17 00:00:00 2001 From: Ikarrus Date: Wed, 5 Aug 2015 20:35:33 -0600 Subject: [PATCH] Gang Dominator Tweaks - Fixes #11040 Made the beeping a bit quieter - Fixes a case where you could activate the same dominator multiple times, wasting a domination attempt by mistake --- code/game/gamemodes/gang/dominator.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/gang/dominator.dm b/code/game/gamemodes/gang/dominator.dm index c8e42325e8c..898f558d087 100644 --- a/code/game/gamemodes/gang/dominator.dm +++ b/code/game/gamemodes/gang/dominator.dm @@ -37,7 +37,7 @@ ..() if(gang && isnum(gang.dom_timer)) if(gang.dom_timer > 0) - playsound(loc, 'sound/items/timer.ogg', 30, 0) + playsound(loc, 'sound/items/timer.ogg', 10, 0) if(!warned && (gang.dom_timer < 180)) warned = 1 var/area/domloc = get_area(loc) @@ -169,7 +169,7 @@ var/time = round(get_domination_time(tempgang)/60,0.1) if(alert(user,"With [round((tempgang.territory.len/start_state.num_territories)*100, 1)]% station control, a takeover will require [time] minutes.\nYour gang will be unable to gain influence while it is active.\nThe entire station will likely be alerted to it once it starts.\nYou have [tempgang.dom_attempts] attempt(s) remaining. Are you ready?","Confirm","Ready","Later") == "Ready") - if (!tempgang.dom_attempts || !in_range(src, user) || !istype(src.loc, /turf)) + if (isnum(tempgang.dom_timer) || !tempgang.dom_attempts || !in_range(src, user) || !istype(src.loc, /turf)) return 0 var/area/A = get_area(loc)