diff --git a/code/game/response_team.dm b/code/game/response_team.dm
index 09871374089..69957fdbfbd 100644
--- a/code/game/response_team.dm
+++ b/code/game/response_team.dm
@@ -33,7 +33,6 @@ var/send_emergency_team
if(alert("Do you want to dispatch an Emergency Response Team?",,"Yes","No") != "Yes")
return
-
if(get_security_level() != "red") // Allow admins to reconsider if the alert level isn't Red
switch(alert("The station is not in red alert. Do you still want to dispatch a response team?",,"Yes","No"))
if("No")
@@ -137,10 +136,13 @@ var/send_emergency_team
var/obj/item/weapon/paper/P = new
P.info = "Your orders, Commander, are to use all means necessary to return the station to a survivable condition.
To this end, you have been provided with the best tools we can give for Security, Medical, Engineering and Janitorial duties. The nuclear authorization code is: [ nuke ? nuke.r_code : "UNKNOWN"]. Be warned, if you detonate this without good reason, we will hold you to account for damages. Memorise this code, and then destroy this message."
P.name = "ERT Orders and Emergency Nuclear Code"
+ var/obj/item/weapon/stamp/centcom/stamp = new
+ P.stamp(stamp)
+ qdel(stamp)
for (var/obj/effect/landmark/A in world)
if (A.name == "nukecode")
P.loc = A.loc
- del(A)
+ qdel(A)
continue
*/
@@ -186,7 +188,7 @@ var/send_emergency_team
M.real_name = "[pick("Corporal", "Sergeant", "Staff Sergeant", "Sergeant First Class", "Master Sergeant", "Sergeant Major")] [pick(last_names)]"
M.name = M.real_name
- M.age = rand(23,45)
+ M.age = rand(23,35)
//Creates mind stuff.
M.mind = new
@@ -320,6 +322,12 @@ var/send_emergency_team
if("Commander")
command_slots = 0
+
+ // Override name and age for the commander
+ M.real_name = "[pick("Lieutenant", "Captain", "Major")] [pick(last_names)]"
+ M.name = M.real_name
+ M.age = rand(35,45)
+
M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(M), slot_w_uniform)
M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/ert/commander(M), slot_back)
M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/responseteam(M), slot_in_backpack)
diff --git a/code/modules/admin/verbs/striketeam.dm b/code/modules/admin/verbs/striketeam.dm
index c4fda49439a..2ca410ac6da 100644
--- a/code/modules/admin/verbs/striketeam.dm
+++ b/code/modules/admin/verbs/striketeam.dm
@@ -7,9 +7,6 @@ var/global/sent_strike_team = 0
if(!ticker)
usr << "The game hasn't started yet!"
return
- if(world.time < 6000)
- usr << "There are [(6000-world.time)/10] seconds remaining before it may be called."
- return
if(sent_strike_team == 1)
usr << "CentCom is already sending a team."
return
diff --git a/code/modules/admin/verbs/striketeam_syndicate.dm b/code/modules/admin/verbs/striketeam_syndicate.dm
index 42a635feafb..6729f81a27c 100644
--- a/code/modules/admin/verbs/striketeam_syndicate.dm
+++ b/code/modules/admin/verbs/striketeam_syndicate.dm
@@ -12,9 +12,6 @@ var/global/sent_syndicate_strike_team = 0
if(!ticker)
alert("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.")
-// return
if(sent_syndicate_strike_team == 1)
alert("The Syndicate are already sending a team, Mr. Dumbass.")
return