From b331391aa50ad10a7c7cc905ea6793d93762728e Mon Sep 17 00:00:00 2001 From: Ikarrus Date: Fri, 1 May 2015 21:30:34 -0600 Subject: [PATCH 1/3] Batons for Light ERT Moved the batons from the lockers to their backpacks so light ERTs can use them --- .../structures/crates_lockers/closets/secure/misc.dm | 4 ---- code/modules/admin/verbs/debug.dm | 6 +++++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/misc.dm b/code/game/objects/structures/crates_lockers/closets/secure/misc.dm index fbfeb038a07..a52bcd649ec 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/misc.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/misc.dm @@ -9,7 +9,6 @@ new /obj/item/weapon/storage/firstaid/regular(src) new /obj/item/weapon/storage/box/handcuffs(src) new /obj/item/device/aicard(src) - new /obj/item/weapon/melee/baton/loaded(src) new /obj/item/device/flash/handheld(src) if(prob(50)) new /obj/item/ammo_box/magazine/m50(src) @@ -32,7 +31,6 @@ new /obj/item/weapon/storage/box/teargas(src) new /obj/item/weapon/storage/box/flashes(src) new /obj/item/weapon/storage/box/handcuffs(src) - new /obj/item/weapon/melee/baton/loaded(src) new /obj/item/weapon/shield/riot/tele(src) /obj/structure/closet/secure_closet/ertMed @@ -48,7 +46,6 @@ new /obj/item/weapon/storage/firstaid/fire(src) new /obj/item/weapon/storage/firstaid/brute(src) new /obj/item/weapon/storage/firstaid/regular(src) - new /obj/item/weapon/melee/baton/loaded(src) new /obj/item/weapon/defibrillator/compact/combat/loaded(src) new /obj/machinery/bot/medbot(src) @@ -65,7 +62,6 @@ new /obj/item/stack/sheet/glass(src, 50) new /obj/item/clothing/shoes/magboots(src) new /obj/item/weapon/storage/box/metalfoam(src) - new /obj/item/weapon/melee/baton/loaded(src) new /obj/item/weapon/rcd_ammo/large(src) new /obj/item/weapon/rcd_ammo/large(src) new /obj/item/weapon/rcd_ammo/large(src) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index b77f5bd6afe..a4620c24b00 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -1155,6 +1155,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 @@ -1179,6 +1180,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 @@ -1202,6 +1204,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 @@ -1226,6 +1229,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 @@ -1276,4 +1280,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) From 832e19a06144be75592a0735a3e4379005e7e4c9 Mon Sep 17 00:00:00 2001 From: Ikarrus Date: Sun, 3 May 2015 14:06:16 -0600 Subject: [PATCH 2/3] Fixed a bug with admins being told it failed to create a response team if they spawned a centcom official or deathsquad --- code/modules/admin/topic.dm | 10 +++++----- code/modules/admin/verbs/one_click_antag.dm | 8 +++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 7dbb6838046..67e681ff4cd 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -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()) diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index fb2f3bff40f..47d1dd3f43c 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -442,7 +442,7 @@ client/proc/one_click_antag() newmob << "
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) From 040ffc9aced0095cb62a5e75e9f5f25b7e19b20f Mon Sep 17 00:00:00 2001 From: Ikarrus Date: Sun, 3 May 2015 15:19:43 -0600 Subject: [PATCH 3/3] Grammar for special_role --- code/modules/admin/verbs/one_click_antag.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index 47d1dd3f43c..35ab45ea708 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -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 @@ -526,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