diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index c1b65ae68d..530810685e 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -416,6 +416,7 @@ var/global/floorIsLava = 0 Trigger an Alien infestation
Spawn an Alien silently
Send in a space ninja
+ Send in a strike team
Trigger an Carp migration
Irradiate the station
Trigger a Prison Break
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 02bbd6884e..c84cead3e0 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -71,7 +71,6 @@ var/list/admin_verbs_fun = list( /client/proc/cmd_admin_dress, /client/proc/cmd_admin_gib_self, /client/proc/drop_bomb, - /client/proc/strike_team, /client/proc/cinematic, /client/proc/triple_ai, /client/proc/one_click_antag, @@ -168,7 +167,6 @@ var/list/admin_verbs_hideable = list( /client/proc/cmd_admin_dress, /client/proc/cmd_admin_gib_self, /client/proc/drop_bomb, - /client/proc/strike_team, /client/proc/cinematic, /client/proc/triple_ai, /datum/admins/proc/toggle_aliens, diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 3663e14534..14b6f1df20 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1595,6 +1595,10 @@ spawn(0) H.corgize() ok = 1 + if("striketeam") + if(usr.client.strike_team()) + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","Strike") if("gravity") if(!(ticker && ticker.mode)) usr << "Please wait until the game starts! Not sure how it will work otherwise." diff --git a/code/modules/admin/verbs/striketeam.dm b/code/modules/admin/verbs/striketeam.dm index 13ba97ff36..902ba1f456 100644 --- a/code/modules/admin/verbs/striketeam.dm +++ b/code/modules/admin/verbs/striketeam.dm @@ -3,22 +3,16 @@ var/const/commandos_possible = 6 //if more Commandos are needed in the future var/global/sent_strike_team = 0 /client/proc/strike_team() - set category = "Fun" - set name = "Spawn Death Squad" - set desc = "Spawns a squad of commandos in CentCom if you want to run an admin event." - if(!src.holder) - src << "Only administrators may use this command." - return if(!ticker) - alert("The game hasn't started yet!") + usr << "The game hasn't started yet!" return if(world.time < 6000) - alert("Not so fast, buddy. Wait a few minutes until the game gets going. There are [(6000-world.time)/10] seconds remaining.") + usr << "There are [(6000-world.time)/10] seconds remaining before it may be called." return if(sent_strike_team == 1) - alert("CentCom is already sending a team, Mr. Dumbass.") + usr << "CentCom is already sending a team." return - if(alert("Do you want to send in the CentCom death squad? Once enabled, this is irreversible.",,"Yes","No")=="No") + if(alert("Do you want to send in the CentCom death squad? Once enabled, this is irreversible.",,"Yes","No")!="Yes") return alert("This 'mode' will go on until everyone is dead or the station is destroyed. You may also admin-call the evac shuttle when appropriate. Spawned commandos have internals cameras which are viewable through a monitor inside the Spec. Ops. Office. Assigning the team's detailed task is recommended from there. While you will be able to manually pick the candidates from active ghosts, their assignment in the squad will be random.") @@ -30,7 +24,7 @@ var/global/sent_strike_team = 0 return if(sent_strike_team) - src << "Looks like someone beat you to it." + usr << "Looks like someone beat you to it." return sent_strike_team = 1 @@ -100,7 +94,7 @@ var/global/sent_strike_team = 0 message_admins("\blue [key_name_admin(usr)] has spawned a CentCom strike squad.", 1) log_admin("[key_name(usr)] used Spawn Death Squad.") - feedback_add_details("admin_verb","DTHS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + return 1 /client/proc/create_death_commando(obj/spawn_location, leader_selected = 0) var/mob/living/carbon/human/new_commando = new(spawn_location.loc) diff --git a/maps/tgstation.2.0.9.dmm b/maps/tgstation.2.0.9.dmm index 7fb4b3ee37..81c961c445 100644 --- a/maps/tgstation.2.0.9.dmm +++ b/maps/tgstation.2.0.9.dmm @@ -2000,7 +2000,7 @@ "aMx" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) "aMy" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 4},/obj/item/device/radio/intercom{pixel_y = 25},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) "aMz" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) -"aMA" = (/obj/item/weapon/packageWrap,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/structure/table,/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) +"aMA" = (/obj/item/weapon/packageWrap,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/structure/table,/obj/item/weapon/reagent_containers/food/snacks/sliceable/birthdaycake{name = "Pete's Birthday Cake"},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) "aMB" = (/obj/machinery/door/airlock{name = "Kitchen cold room"; req_access_txt = "28"},/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "showroomfloor"},/area/crew_quarters/kitchen) "aMC" = (/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b-f"; level = 1; name = "pipe"},/turf/simulated/wall,/area/crew_quarters/kitchen) "aMD" = (/obj/machinery/hydroponics,/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{icon_state = "dark"},/area/hydroponics)