Custom striketeams can now choose a custom outfit. (#28599)

This commit is contained in:
ShiftyRail
2021-01-18 20:14:19 +01:00
committed by GitHub
parent f530963b15
commit b263c4ca1c
5 changed files with 19 additions and 6 deletions

View File

@@ -25,7 +25,7 @@ var/list/sent_strike_teams = list()
/datum/striketeam/proc/trigger_strike(var/mob/user, var/missiontext)
mission = missiontext
//Is the game started
if(!ticker)
if(user)
@@ -357,7 +357,12 @@ var/list/sent_strike_teams = list()
if(customsquad)
customsquad.HandleNewMind(new_commando.mind) //First come, first served
var/datum/outfit/concrete_outfit = new outfit_datum
concrete_outfit.equip(new_commando)
if (outfit_datum)
var/datum/outfit/concrete_outfit = new outfit_datum
concrete_outfit.equip(new_commando)
else
message_admins("Striketeam member created without an outfit selected.")
var/datum/outfit/concrete_outfit = new /datum/outfit/striketeam/death_commando
concrete_outfit.equip(new_commando)
return new_commando

View File

@@ -813,7 +813,7 @@ var/global/floorIsLava = 0
<A href='?src=\ref[src];secretsfun=striketeam-deathsquad'>Send in a Death Squad!</A><BR>
<A href='?src=\ref[src];secretsfun=striketeam-ert'>Send in an Emergency Response Team!</A><BR>
<A href='?src=\ref[src];secretsfun=striketeam-syndi'>Send in a Syndicate Elite Strike Team!</A><BR>
<A href='?src=\ref[src];secretsfun=striketeam-custom'>Send in a Custom Strike Team! (Work in Progress!)</A><BR>
<A href='?src=\ref[src];secretsfun=striketeam-custom'>Send in a Custom Strike Team!</A><BR>
<BR>
<BR>
"}

View File

@@ -3245,8 +3245,7 @@
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)
custom_strike_team(usr)
if("tripleAI")
usr.client.triple_ai()
feedback_inc("admin_secrets_fun_used",1)

View File

@@ -0,0 +1,8 @@
/datum/admins/proc/custom_strike_team(var/mob/user)
var/list/outfits = (typesof(/datum/outfit/) - /datum/outfit/ - /datum/outfit/striketeam/)
var/outfit_type = input(user,"Outfit Type","Equip Outfit","") as null|anything in outfits
var/datum/striketeam/custom/team = new /datum/striketeam/custom()
team.outfit_datum = outfit_type
team.trigger_strike(user)

View File

@@ -1317,6 +1317,7 @@
#include "code\modules\admin\verbs\pray.dm"
#include "code\modules\admin\verbs\profiling.dm"
#include "code\modules\admin\verbs\randomverbs.dm"
#include "code\modules\admin\verbs\striketeam.dm"
#include "code\modules\admin\verbs\ticklag.dm"
#include "code\modules\admin\verbs\tripAI.dm"
#include "code\modules\admin\verbs\SDQL_2\SDQL_2.dm"