cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

the Strike Team rewrite (#14446)

Browse Source 
* striketeamrevamp1

* fix

* fix global

* more fixes

* wtf

* ok

* fixed
This commit is contained in:
JMWTurner
2017-03-31 00:44:34 +02:00
committed by Probe1
parent 9394f23218
commit 8d561d8fb8
18 changed files with 406 additions and 496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
code/modules/admin/topic.dm
View File

@@ -907,11 +907,11 @@
else
jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=wizard;jobban4=\ref[M]'>[replacetext("Wizard", " ", "&nbsp")]</a></td>"
//ERT
if(jobban_isbanned(M, "Emergency Response Team") || isbanned_dept)
jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=Emergency Response Team;jobban4=\ref[M]'><font color=red>Emergency Response Team</font></a></td>"
//Strike Team
if(jobban_isbanned(M, "Strike Team") || isbanned_dept)
jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=Strike Team;jobban4=\ref[M]'><font color=red>Strike Team</font></a></td>"
else
jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=Emergency Response Team;jobban4=\ref[M]'>Emergency Response Team</a></td>"
jobs += "<td width='20%'><a href='?src=\ref[src];jobban3=Strike Team;jobban4=\ref[M]'>Strike Team</a></td>"
//Vox Raider
@@ -2559,10 +2559,26 @@
for(var/mob/living/carbon/human/H in mob_list)
spawn(0)
H.corgize()
if("striketeam")
if(usr.client.strike_team())
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","Strike")
if("striketeam-deathsquad")
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","DeathQuad")
var/datum/striketeam/deathsquad/team = new /datum/striketeam/deathsquad()
team.trigger_strike(usr)
if("striketeam-ert")
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","ERT")
var/datum/striketeam/ert/team = new /datum/striketeam/ert()
team.trigger_strike(usr)
if("striketeam-syndi")
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","SyndiStrikeTeam")
var/datum/striketeam/syndicate/team = new /datum/striketeam/syndicate()
team.trigger_strike(usr)
if("striketeam-custom")
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","CustomStrikeTeam")
var/datum/striketeam/custom/team = new /datum/striketeam/custom()
team.trigger_strike(usr)
if("tripleAI")
usr.client.triple_ai()
feedback_inc("admin_secrets_fun_used",1)