Gang mode sync (#933)

* Revert "Gang mode now calls a 4 minute shuttle once 60% of the crew is dead"

* gang fixes

* gang modernizations
This commit is contained in:
CitadelStationBot
2017-05-18 11:33:37 -05:00
committed by Poojawa
parent 715900f7f1
commit 3f35592f4e
6 changed files with 19 additions and 12 deletions
+1 -1
View File
@@ -209,4 +209,4 @@
gang.message_gangtools("Hostile takeover in progress: Estimated [time] minutes until victory.[gang.dom_attempts ? "" : " This is your final attempt."]")
for(var/datum/gang/G in SSticker.mode.gangs)
if(G != gang)
G.message_gangtools("Enemy takeover attempt detected in [locname]: Estimated [time] minutes until our defeat.",1,1)
G.message_gangtools("Enemy takeover attempt detected in [locname]: Estimated [time] minutes until our defeat.",1,1)
+14 -7
View File
@@ -58,13 +58,19 @@ GLOBAL_LIST_INIT(gang_colors_pool, list("red","orange","yellow","green","blue","
gangs += G
//Now assign a boss for the gang
var/datum/mind/boss = pick(antag_candidates)
antag_candidates -= boss
G.bosses += boss
boss.gang_datum = G
boss.special_role = "[G.name] Gang Boss"
boss.restricted_roles = restricted_jobs
log_game("[boss.key] has been selected as the Boss for the [G.name] Gang")
for(var/n in 1 to 3)
var/datum/mind/boss = pick(antag_candidates)
antag_candidates -= boss
G.bosses += boss
boss.gang_datum = G
var/title
if(n == 1)
title = "Boss"
else
title = "Lieutenant"
boss.special_role = "[G.name] Gang [title]"
boss.restricted_roles = restricted_jobs
log_game("[boss.key] has been selected as the [title] for the [G.name] Gang")
if(gangs.len < 2) //Need at least two gangs
return 0
@@ -251,6 +257,7 @@ GLOBAL_LIST_INIT(gang_colors_pool, list("red","orange","yellow","green","blue","
/proc/determine_domination_time(var/datum/gang/G)
return max(180,480 - (round((G.territory.len/GLOB.start_state.num_territories)*100, 1) * 9))
//////////////////////////////////////////////////////////////////////
//Announces the end of the game with all relavent information stated//
//////////////////////////////////////////////////////////////////////
+1 -1
View File
@@ -263,4 +263,4 @@
ganghud = new()
/datum/gang/multiverse/income()
return
return
+1 -1
View File
@@ -316,4 +316,4 @@
return ..()
/datum/gang_item/equipment/dominator/spawn_item(mob/living/carbon/user, datum/gang/gang, obj/item/device/gangtool/gangtool)
new item_path(user.loc)
new item_path(user.loc)
+1 -1
View File
@@ -57,4 +57,4 @@
cooldown = 0
icon_state = "pen"
var/mob/M = get(src, /mob)
to_chat(M, "<span class='notice'>\icon[src] [src][(src.loc == M)?(""):(" in your [src.loc]")] vibrates softly. It is ready to be used again.</span>")
to_chat(M, "<span class='notice'>\icon[src] [src][(src.loc == M)?(""):(" in your [src.loc]")] vibrates softly. It is ready to be used again.</span>")
+1 -1
View File
@@ -241,4 +241,4 @@
outfits = 1
/obj/item/device/gangtool/spare/lt
promotable = 1
promotable = 1