cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-18 03:26:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9277 from Ikarrus/ertbaton

Browse Source 
Batons for Light ERP
This commit is contained in:
Cheridan
2015-05-06 09:03:55 -05:00
parent f49fbf1efc 040ffc9ace
commit 95d7af4e48
4 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/topic.dm
+5 -5
View File
@@ -91,13 +91,13 @@
message_admins("[key_name(usr)] tried to start a gang war. Unfortunately, there were not enough candidates available.")
log_admin("[key_name(usr)] failed to start a gang war.")
if("13")
message_admins("[key_name(usr)] is creating an emergency response team...")
message_admins("[key_name(usr)] is creating a Centcom response team...")
if(src.makeEmergencyresponseteam())
message_admins("[key_name(usr)] created an emergency response team.")
log_admin("[key_name(usr)] created an emergency response team.")
message_admins("[key_name(usr)] created a Centcom response team.")
log_admin("[key_name(usr)] created a Centcom response team.")
else
message_admins("[key_name_admin(usr)] tried to create an emergency response team. Unfortunately, there were not enough candidates available.")
log_admin("[key_name(usr)] failed to create an emergency response team.")
message_admins("[key_name_admin(usr)] tried to create a Centcom response team. Unfortunately, there were not enough candidates available.")
log_admin("[key_name(usr)] failed to create a Centcom response team.")
if("14")
message_admins("[key_name(usr)] is creating an abductor team...")
if(src.makeAbductorTeam())
code/modules/admin/verbs/debug.dm
+5 -1
View File
@@ -1162,6 +1162,7 @@ var/global/list/g_fancy_list_of_types = null
M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/captain(M), slot_back)
M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(M), slot_in_backpack)
M.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/security/full(M), slot_belt)
M.equip_to_slot_or_del(new /obj/item/weapon/melee/baton/loaded(M), slot_in_backpack)
R.keyslot = new /obj/item/device/encryptionkey/heads/captain
@@ -1186,6 +1187,7 @@ var/global/list/g_fancy_list_of_types = null
M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(M), slot_in_backpack)
M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/handcuffs(M), slot_in_backpack)
M.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/security/full(M), slot_belt)
M.equip_to_slot_or_del(new /obj/item/weapon/melee/baton/loaded(M), slot_in_backpack)
R.keyslot = new /obj/item/device/encryptionkey/heads/hos
@@ -1209,6 +1211,7 @@ var/global/list/g_fancy_list_of_types = null
M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(M), slot_in_backpack)
M.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/medical(M), slot_belt)
M.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/regular(M), slot_r_hand)
M.equip_to_slot_or_del(new /obj/item/weapon/melee/baton/loaded(M), slot_in_backpack)
R.keyslot = new /obj/item/device/encryptionkey/heads/cmo
@@ -1233,6 +1236,7 @@ var/global/list/g_fancy_list_of_types = null
M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(M), slot_in_backpack)
M.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/utility/full(M), slot_belt)
M.equip_to_slot_or_del(new /obj/item/weapon/rcd_ammo/large(M), slot_l_store)
M.equip_to_slot_or_del(new /obj/item/weapon/melee/baton/loaded(M), slot_in_backpack)
R.keyslot = new /obj/item/device/encryptionkey/heads/ce
@@ -1283,4 +1287,4 @@ var/global/list/g_fancy_list_of_types = null
W.assignment = "Centcom Official"
W.registered_name = M.real_name
W.update_label()
M.equip_to_slot_or_del(W, slot_wear_id)
M.equip_to_slot_or_del(W, slot_wear_id)
code/modules/admin/verbs/one_click_antag.dm
+5 -7
View File
@@ -430,7 +430,7 @@ client/proc/one_click_antag()
//Assign antag status and the mission
ticker.mode.traitors += newmob.mind
newmob.mind.special_role = "centcom"
newmob.mind.special_role = "official"
var/datum/objective/missionobj = new
missionobj.owner = newmob.mind
missionobj.explanation_text = mission
@@ -442,7 +442,7 @@ client/proc/one_click_antag()
newmob << "<BR>Central Command is sending you to [station_name()] with the task: [mission]"
//Logging and cleanup
message_admins("A [key_name_admin(newmob)] has spawned with the task: [mission]")
message_admins("Centcom Official [key_name_admin(newmob)] has spawned with the task: [mission]")
log_game("[key_name(newmob)] has been selected as a Centcom Official")
return 1
@@ -456,8 +456,7 @@ client/proc/one_click_antag()
return
switch(alert)
if("Delta: Deathsquad")
makeDeathsquad()
return
return makeDeathsquad()
if("Red: Elite ERT")
alert = "Red"
if("Amber: Full ERT")
@@ -465,8 +464,7 @@ client/proc/one_click_antag()
if("Blue: Light ERT")
alert = "Blue"
if("Green: Centcom Official")
makeOfficial()
return
return makeOfficial()
var/teamsize = min(7,input("Maximum size of team? (7 max)", "Select Team Size",4) as null|num)
var/mission = input("Assign a mission to the Emergency Response Team", "Assign Mission", "Assist the station.")
var/list/mob/dead/observer/candidates = getCandidates("Do you wish to be considered for a Code [alert] Nanotrasen Emergency Response Team?", "deathsquad", null)
@@ -528,7 +526,7 @@ client/proc/one_click_antag()
//Assign antag status and the mission
ticker.mode.traitors += ERTOperative.mind
ERTOperative.mind.special_role = "ert"
ERTOperative.mind.special_role = "ERT"
var/datum/objective/missionobj = new
missionobj.owner = ERTOperative.mind
missionobj.explanation_text = mission