Skip to content

Commit

Permalink
Merge pull request tgstation#10328 from Ikarrus/datumgangs
Browse files Browse the repository at this point in the history 
Datum-Based Gangs [Ready]
  • Loading branch information
@Cheridan
Cheridan committed Jul 3, 2015
2 parents 1e28365 + 288a6a8 commit 7b6867b
Show file tree
Hide file tree
Showing 31 changed files with 751 additions and 890 deletions.
7 changes: 3 additions & 4 deletions code/__DEFINES/hud.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#define ANTAG_HUD_CULT 5
#define ANTAG_HUD_REV 6
#define ANTAG_HUD_OPS 7
#define ANTAG_HUD_GANG_A 8
#define ANTAG_HUD_GANG_B 9
#define ANTAG_HUD_WIZ 10
#define ANTAG_HUD_SHADOW 11

#define ANTAG_HUD_WIZ 8
#define ANTAG_HUD_SHADOW 9
15 changes: 0 additions & 15 deletions code/__HELPERS/names.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,21 +131,6 @@ var/syndicate_name = null
syndicate_name = name
return name

var/gang_name_pool = list("Clandestine", "Prima", "Zero-G", "Max", "Blasto", "Waffle", "North", "Omni", "Newton", "Cyber", "Donk", "Gene", "Gib", "Tunnel", "Diablo", "Psyke", "Osiron", "Sleeping Carp")
var/gang_A_name = null
var/gang_B_name = null
/proc/gang_name(var/gang)
if(!gang_A_name || !gang_B_name)
gang_A_name = pick(gang_name_pool)
gang_name_pool -= gang_A_name
gang_B_name = pick(gang_name_pool)
gang_name_pool -= gang_B_name

if(gang == "A")
return gang_A_name
if(gang == "B")
return gang_B_name


//Traitors and traitor silicons will get these. Revs will not.
var/syndicate_code_phrase//Code phrase for traitors.
Expand Down
4 changes: 2 additions & 2 deletions code/controllers/subsystem/ticker.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ var/datum/subsystem/ticker/ticker
if(!mode.explosion_in_progress && mode.check_finished() || force_ending)
current_state = GAME_STATE_FINISHED
auto_toggle_ooc(1) // Turn it on
declare_completion()
declare_completion(force_ending)
spawn(50)
if(mode.station_was_nuked)
world.Reboot("Station destroyed by Nuclear Device.", "end_proper", "nuke")
Expand Down Expand Up @@ -407,7 +407,7 @@ var/datum/subsystem/ticker/ticker
//calls auto_declare_completion_* for all modes
for(var/handler in typesof(/datum/game_mode/proc))
if (findtext("[handler]","auto_declare_completion_"))
call(mode, handler)()
call(mode, handler)(force_ending)

//Print a list of antagonists to the server log
var/list/total_antagonists = list()
Expand Down
7 changes: 4 additions & 3 deletions code/datums/hud.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ var/datum/atom_hud/huds = list( \
ANTAG_HUD_CULT = new/datum/atom_hud/antag(), \
ANTAG_HUD_REV = new/datum/atom_hud/antag(), \
ANTAG_HUD_OPS = new/datum/atom_hud/antag(), \
ANTAG_HUD_GANG_A = new/datum/atom_hud/antag(), \
ANTAG_HUD_GANG_B = new/datum/atom_hud/antag(), \
ANTAG_HUD_WIZ = new/datum/atom_hud/antag(), \
ANTAG_HUD_SHADOW = new/datum/atom_hud/antag(), \
)
Expand Down Expand Up @@ -56,6 +54,9 @@ var/datum/atom_hud/huds = list( \

//MOB PROCS
/mob/proc/reload_huds()
for(var/datum/atom_hud/hud in huds)
var/gang_huds = list()
for(var/datum/gang/G in ticker.mode.gangs)
gang_huds += G.ganghud
for(var/datum/atom_hud/hud in (huds|gang_huds))
if(src in hud.hudusers)
hud.add_hud_to(src)
4 changes: 2 additions & 2 deletions code/datums/martial.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -461,8 +461,8 @@
return
user << "<span class='notice'>You begin to read the scroll...</span>"
user << "<span class='sciradio'><i>And all at once the secrets of the Sleeping Carp fill your mind. The ancient clan's martial teachings have been imbued into this scroll. As you read through it, \
these secrets flood into your mind and body. You now know the martial techniques of the Sleeping Carp. Your hand-to-hand combat has become much more effective, and you may now perform powerful \
combination attacks. To learn more about these combos, use the Recall Teachings ability in the Sleeping Carp tab.</i></span>"
these secrets flood into your mind and body.<br>You now know the martial techniques of the Sleeping Carp. Your hand-to-hand combat has become much more effective, and you may now perform powerful \
combination attacks.<br>To learn more about these combos, use the Recall Teachings ability in the Sleeping Carp tab.</i></span>"
user.verbs += /mob/living/carbon/human/proc/sleeping_carp_help
var/datum/martial_art/the_sleeping_carp/theSleepingCarp = new(null)
theSleepingCarp.teach(user)
Expand Down
178 changes: 88 additions & 90 deletions code/datums/mind.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
var/miming = 0 // Mime's vow of silence
var/antag_hud_icon_state = null //this mind's ANTAG_HUD should have this icon_state
var/datum/atom_hud/antag/antag_hud = null //this mind's antag HUD
var/datum/gang/gang_datum //Which gang this mind belongs to, if any

/datum/mind/New(var/key)
src.key = key
Expand Down Expand Up @@ -163,7 +164,7 @@


/datum/mind/proc/remove_gang()
ticker.mode.remove_gangster(src,0,1)
ticker.mode.remove_gangster(src,0,1,1)
remove_objectives()

/datum/mind/proc/remove_malf()
Expand Down Expand Up @@ -223,10 +224,10 @@
alert("Not before round-start!", "Alert")
return

var/out = "<B>[name]</B>[(current&&(current.real_name!=name))?" (as [current.real_name])":""]<br>"
var/out = ""
out += "Mind currently owned by key: [key] [active?"(synced)":"(not synced)"]<br>"
out += "Assigned role: [assigned_role]. <a href='?src=\ref[src];role_edit=1'>Edit</a><br>"
out += "Factions and special roles:<br>"
out += "Faction and special role: <b><font color='red'>[special_role]</font></b><br>"

var/list/sections = list(
"revolution",
Expand All @@ -250,7 +251,7 @@
if (assigned_role in command_positions)
text += "<b>HEAD</b>|loyal|employee|headrev|rev"
else if (src in ticker.mode.head_revolutionaries)
text = "head|loyal|<a href='?src=\ref[src];revolution=clear'>employee</a>|<b>HEADREV</b>|<a href='?src=\ref[src];revolution=rev'>rev</a>"
text += "head|loyal|<a href='?src=\ref[src];revolution=clear'>employee</a>|<b>HEADREV</b>|<a href='?src=\ref[src];revolution=rev'>rev</a>"
text += "<br>Flash: <a href='?src=\ref[src];revolution=flash'>give</a>"

var/list/L = current.get_contents()
Expand Down Expand Up @@ -285,46 +286,43 @@
if (ticker.mode.config_tag=="gang")
text = uppertext(text)
text = "<i><b>[text]</b></i>: "
if (src in ticker.mode.A_bosses)
text += "loyal|<a href='?src=\ref[src];gang=clear'>none</a>|<B>(A)</B> <a href='?src=\ref[src];gang=agang'>gangster</a> <b>BOSS</b>|(B) <a href='?src=\ref[src];gang=bgang'>gangster</a> <a href='?src=\ref[src];gang=bboss'>boss</a>"
text += "<br>Equipment: <a href='?src=\ref[src];gang=equip'>give</a>"
text += "[isloyal(current) ? "<B>LOYAL</B>" : "loyal"]|"
if(src in ticker.mode.get_all_gangsters())
text += "<a href='?src=\ref[src];gang=clear'>none</a>"
else
text += "<B>NONE</B>"

var/list/L = current.get_contents()
var/obj/item/device/gangtool/gangtool = locate() in L
if (gangtool)
text += "|<a href='?src=\ref[src];gang=takeequip'>take</a>."
if(current && current.client && current.client.prefs.be_special & BE_GANG)
text += "|Enabled in Prefs<BR>"
else
text += "|Disabled in Prefs<BR>"

for(var/datum/gang/G in ticker.mode.gangs)
text += "<i>[G.name]</i>: "
if(src in (G.gangsters))
text += "<B>GANGSTER</B>"
else
text += "."
text += "<a href='?src=\ref[src];gangster=\ref[G]'>gangster</a>"
text += "|"
if(src in (G.bosses))
text += "<B>GANG LEADER</B>"
else
text += "<a href='?src=\ref[src];gangboss=\ref[G]'>gang leader</a>"
text += "<BR>"

else if (src in ticker.mode.B_bosses)
text += "loyal|<a href='?src=\ref[src];gang=clear'>none</a>|(A) <a href='?src=\ref[src];gang=agang'>gangster</a> <a href='?src=\ref[src];gang=aboss'>boss</a>|<B>(B)</B> <a href='?src=\ref[src];gang=bgang'>gangster</a> <b>BOSS</b>"
text += "<br>Equipment: <a href='?src=\ref[src];gang=equip'>give</a>"
if(gang_colors_pool)
text += "<a href='?src=\ref[src];gang=new'>Create New Gang</a>"

if(src in ticker.mode.get_gang_bosses())
text += "<br>Equipment: <a href='?src=\ref[src];gang=equip'>give</a>"
var/list/L = current.get_contents()
var/obj/item/device/gangtool/gangtool = locate() in L
if (gangtool)
text += "|<a href='?src=\ref[src];gang=takeequip'>take</a>."
else
text += "."

else if (src in ticker.mode.A_gang)
text += "loyal|<a href='?src=\ref[src];gang=clear'>none</a>|<B>(A) GANGSTER</B> <a href='?src=\ref[src];gang=aboss'>boss</a>|(B) <a href='?src=\ref[src];gang=bgang'>gangster</a> <a href='?src=\ref[src];gang=bboss'>boss</a>"
else if (src in ticker.mode.B_gang)
text += "loyal|<a href='?src=\ref[src];gang=clear'>none</a>|(A) <a href='?src=\ref[src];gang=agang'>gangster</a> <a href='?src=\ref[src];gang=aboss'>boss</a>|<B>(B) GANGSTER</B> <a href='?src=\ref[src];gang=bboss'>boss</a>"
else if(isloyal(current))
text += "<B>LOYAL</B>|none|(A) <a href='?src=\ref[src];gang=agang'>gangster</a> <a href='?src=\ref[src];gang=aboss'>boss</a>|(B) <a href='?src=\ref[src];gang=bgang'>gangster</a> <a href='?src=\ref[src];gang=bboss'>boss</a>"
else
text += "loyal|<B>NONE</B>|(A) <a href='?src=\ref[src];gang=agang'>gangster</a> <a href='?src=\ref[src];gang=aboss'>boss</a>|(B) <a href='?src=\ref[src];gang=bgang'>gangster</a> <a href='?src=\ref[src];gang=bboss'>boss</a>"


if(current && current.client && current.client.prefs.be_special & BE_GANG)
text += "|Enabled in Prefs"
else
text += "|Disabled in Prefs"

text += "|<a href='?src=\ref[src];gang=takeequip'>take</a>"

sections["gang"] = text


/** CULT ***/
text = "cult"
if (ticker.mode.config_tag=="cult")
Expand Down Expand Up @@ -538,21 +536,19 @@
if (sections["traitor"])
out += sections["traitor"]+"<br>"
if (sections["changeling"])
out += sections["changeling"]+"<br>"
out += sections["changeling"]+"<br><br>"
sections -= "traitor"
sections -= "changeling"
else
if (sections[ticker.mode.config_tag])
out += sections[ticker.mode.config_tag]+"<br>"
out += sections[ticker.mode.config_tag]+"<br><br>"
sections -= ticker.mode.config_tag
for (var/i in sections)
if (sections[i])
out += sections[i]+"<br>"


if (((src in ticker.mode.head_revolutionaries) || \
(src in ticker.mode.A_bosses) || \
(src in ticker.mode.B_bosses) || \
(src in ticker.mode.traitors) || \
(src in ticker.mode.syndicates)) && \
istype(current,/mob/living/carbon/human) )
Expand All @@ -571,7 +567,7 @@
text += "." //hiel grammar
out += text

out += "<br>"
out += "<br><br>"

out += "<b>Memory:</b><br>"
out += memory
Expand All @@ -588,7 +584,9 @@

out += "<a href='?src=\ref[src];obj_announce=1'>Announce objectives</a><br><br>"

usr << browse(out, "window=edit_memory[src];size=500x500")
var/datum/browser/popup = new(usr, "edit_memory[src]", "<B>[name]</B>[(current&&(current.real_name!=name))?" (as [current.real_name])":""]", 500, 600)
popup.set_content(out)
popup.open()

/datum/mind/Topic(href, href_list)
if(!check_rights(R_ADMIN)) return
Expand Down Expand Up @@ -823,55 +821,17 @@
else
flash.broken = 0



//////////////////// GANG MODE

else if (href_list["gang"])
switch(href_list["gang"])
if("clear")
remove_gang()
message_admins("[key_name_admin(usr)] has de-gang'ed [current].")
log_admin("[key_name(usr)] has de-gang'ed [current].")

if("agang")
if(src in ticker.mode.A_gang)
return
ticker.mode.remove_gangster(src, 0, 2)
ticker.mode.add_gangster(src,"A",0)
message_admins("[key_name_admin(usr)] has added [current] to the [gang_name("A")] Gang (A).")
log_admin("[key_name(usr)] has added [current] to the [gang_name("A")] Gang (A).")

if("aboss")
if(src in ticker.mode.A_bosses)
return
ticker.mode.remove_gangster(src, 0, 2)
ticker.mode.A_bosses += src
src.special_role = "[gang_name("A")] Gang (A) Boss"
ticker.mode.update_gang_icons_added(src, "A")
current << "<FONT size=3 color=red><B>You are a [gang_name("A")] Gang Boss!</B></FONT>"
message_admins("[key_name_admin(usr)] has added [current] to the [gang_name("A")] Gang (A) leadership.")
log_admin("[key_name(usr)] has added [current] to the [gang_name("A")] Gang (A) leadership.")
ticker.mode.forge_gang_objectives(src)
ticker.mode.greet_gang(src,0)

if("bgang")
if(src in ticker.mode.B_gang)
return
ticker.mode.remove_gangster(src, 0, 2)
ticker.mode.add_gangster(src,"B",0)
message_admins("[key_name_admin(usr)] has added [current] to the [gang_name("B")] Gang (B).")
log_admin("[key_name(usr)] has added [current] to the [gang_name("B")] Gang (B).")

if("bboss")
if(src in ticker.mode.B_bosses)
return
ticker.mode.remove_gangster(src, 0, 2)
ticker.mode.B_bosses += src
src.special_role = "[gang_name("B")] Gang (B) Boss"
ticker.mode.update_gang_icons_added(src, "B")
current << "<FONT size=3 color=red><B>You are a [gang_name("B")] Gang Boss!</B></FONT>"
message_admins("[key_name_admin(usr)] has added [current] to the [gang_name("B")] Gang (B) leadership.")
log_admin("[key_name(usr)] has added [current] to the [gang_name("B")] Gang (B) leadership.")
ticker.mode.forge_gang_objectives(src)
ticker.mode.greet_gang(src,0)

if("equip")
switch(ticker.mode.equip_gang(current))
if(1)
Expand All @@ -890,6 +850,46 @@
for(var/obj/item/toy/crayon/spraycan/gang/SC in L)
qdel(SC)

if("new")
if(gang_colors_pool.len)
var/list/names = list("Random") + gang_name_pool
var/gangname = input("Pick a gang name.","Select Name") as null|anything in names
if(gangname && gang_colors_pool.len) //Check again just in case another admin made max gangs at the same time
if(!(gangname in gang_name_pool))
gangname = null
var/datum/gang/newgang = new(null,gangname)
ticker.mode.gangs += newgang
message_admins("[key_name_admin(usr)] has created the [newgang.name] Gang.")
log_admin("[key_name(usr)] has created the [newgang.name] Gang.")

else if (href_list["gangboss"])
var/datum/gang/G = locate(href_list["gangboss"]) in ticker.mode.gangs
if(!G || (src in G.bosses))
return
ticker.mode.remove_gangster(src,0,2,1)
G.bosses += src
gang_datum = G
special_role = "[G.name] Gang Boss"
G.add_gang_hud(src)
current << "<FONT size=3 color=red><B>You are a [G.name] Gang Boss!</B></FONT>"
message_admins("[key_name_admin(usr)] has added [current] to the [G.name] Gang leadership.")
log_admin("[key_name(usr)] has added [current] to the [G.name] Gang leadership.")
ticker.mode.forge_gang_objectives(src)
ticker.mode.greet_gang(src,0)

else if (href_list["gangster"])
var/datum/gang/G = locate(href_list["gangster"]) in ticker.mode.gangs
if(!G || (src in G.gangsters))
return
ticker.mode.remove_gangster(src,0,2,1)
ticker.mode.add_gangster(src,G,0)
message_admins("[key_name_admin(usr)] has added [current] to the [G.name] Gang (A).")
log_admin("[key_name(usr)] has added [current] to the [G.name] Gang (A).")

/////////////////////////////////



else if (href_list["cult"])
switch(href_list["cult"])
if("clear")
Expand Down Expand Up @@ -1213,6 +1213,7 @@
if (!isnull(crystals))
if (suplink)
suplink.uses = crystals
message_admins("[key_name_admin(usr)] changed [current]'s telecrystal count to [crystals].")
log_admin("[key_name(usr)] changed [current]'s telecrystal count to [crystals].")
if("uplink")
if (!ticker.mode.equip_traitor(current, !(src in ticker.mode.traitors)))
Expand Down Expand Up @@ -1386,14 +1387,11 @@
fail |= !ticker.mode.equip_revolutionary(current)


/datum/mind/proc/make_Gang(var/gang)
special_role = "[gang_name(gang)] Gang ([gang]) Boss"
if(gang=="A")
ticker.mode.A_bosses += src
else if(gang=="B")
ticker.mode.B_bosses += src
ticker.mode.update_gang_icons_added(src, gang)
ticker.mode.forge_gang_objectives(src, gang)
/datum/mind/proc/make_Gang(var/datum/gang/G)
special_role = "[G.name] Gang Boss"
G.bosses += src
G.add_gang_hud(src)
ticker.mode.forge_gang_objectives(src)
ticker.mode.greet_gang(src)
ticker.mode.equip_gang(current)

Expand Down
Loading

0 comments on commit 7b6867b

Please sign in to comment.