From b8ff112b43bb89f7005c49c69223d0e0c88d8900 Mon Sep 17 00:00:00 2001 From: S34NW <12197162+S34NW@users.noreply.github.com> Date: Sat, 10 Jul 2021 15:41:42 +0100 Subject: [PATCH] updates --- code/datums/outfits/outfit_admin.dm | 115 ++++++++++++++++++ code/modules/response_team/ert.dm | 16 --- code/modules/response_team/ert_outfits.dm | 125 -------------------- code/modules/tgui/modules/ert_manager.dm | 6 +- tgui/packages/tgui/interfaces/ERTManager.js | 27 ----- tgui/packages/tgui/public/tgui.bundle.js | 2 +- 6 files changed, 117 insertions(+), 174 deletions(-) diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm index bf017248c17..34135e29640 100644 --- a/code/datums/outfits/outfit_admin.dm +++ b/code/datums/outfits/outfit_admin.dm @@ -642,6 +642,121 @@ I.assignment = "Solar Federation Representative" H.sec_hud_set_ID() + +/datum/outfit/admin/solgov + name = "Solar Federation Marine" + uniform = /obj/item/clothing/under/solgov + suit = /obj/item/clothing/suit/armor/bulletproof + back = /obj/item/storage/backpack/ert/solgov + belt = /obj/item/storage/belt/military/assault/marines/full + head = /obj/item/clothing/head/soft/solgov/marines + glasses = /obj/item/clothing/glasses/night + gloves = /obj/item/clothing/gloves/combat + shoes = /obj/item/clothing/shoes/combat + l_ear = /obj/item/radio/headset/ert/alt/solgov + id = /obj/item/card/id + l_hand = /obj/item/gun/projectile/automatic/shotgun/bulldog + suit_store = /obj/item/gun/projectile/automatic/pistol/m1911 + r_pocket = /obj/item/flashlight/seclite + pda = /obj/item/pda + box = /obj/item/storage/box/responseteam + backpack_contents = list( + /obj/item/clothing/shoes/magboots = 1, + /obj/item/whetstone = 1, + /obj/item/clothing/mask/gas/explorer/marines = 1, + /obj/item/reagent_containers/hypospray/autoinjector/survival = 1 + ) + cybernetic_implants = list( + /obj/item/organ/internal/cyberimp/arm/flash, + /obj/item/organ/internal/cyberimp/chest/nutriment, + /obj/item/organ/internal/cyberimp/eyes/hud/security + ) + implants = list(/obj/item/implant/mindshield, + /obj/item/implant/death_alarm + ) + + var/is_solgov_lieutenant = FALSE + + +/datum/outfit/admin/solgov/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + if(visualsOnly) + return + + if(is_solgov_lieutenant) + H.real_name = "Lieutenant [pick(GLOB.last_names)]" + else + H.real_name = "[pick("Corporal", "Sergeant", "Staff Sergeant", "Sergeant First Class", "Master Sergeant", "Sergeant Major")] [pick(GLOB.last_names)]" + H.name = H.real_name + var/obj/item/card/id/I = H.wear_id + I.assignment = name + if(istype(I) && is_solgov_lieutenant) + apply_to_card(I, H, get_centcom_access("Emergency Response Team Leader"), name, "lifetimeid") + else if(istype(I)) + apply_to_card(I, H, get_centcom_access("Emergency Response Team Member"), name, "lifetimeid") + H.sec_hud_set_ID() + +/datum/outfit/admin/solgov/lieutenant + name = "Solar Federation Lieutenant" + uniform = /obj/item/clothing/under/solgov/command + head = /obj/item/clothing/head/beret/solgov/command + glasses = /obj/item/clothing/glasses/night + back = /obj/item/storage/backpack/satchel + l_ear = /obj/item/radio/headset/ert/alt/commander/solgov + l_hand = null + belt = /obj/item/melee/baton/loaded + suit_store = /obj/item/gun/projectile/automatic/pistol/deagle + l_pocket = /obj/item/pinpointer/advpinpointer + backpack_contents = list( + /obj/item/storage/box/handcuffs = 1, + /obj/item/clothing/shoes/magboots/advance = 1, + /obj/item/reagent_containers/hypospray/autoinjector/survival = 1, + /obj/item/clothing/mask/gas/explorer/marines = 1, + /obj/item/ammo_box/magazine/m50 = 3 + ) + is_solgov_lieutenant = TRUE + +/datum/outfit/admin/solgov/elite + name = "Solar Federation Specops Marine" + uniform = /obj/item/clothing/under/solgov/elite + suit = /obj/item/clothing/suit/space/hardsuit/ert/solgov + head = null + mask = /obj/item/clothing/mask/gas/explorer/marines + belt = /obj/item/storage/belt/military/assault/marines/elite/full + l_hand = /obj/item/gun/projectile/automatic/ar + backpack_contents = list( + /obj/item/clothing/shoes/magboots/advance = 1, + /obj/item/whetstone = 1, + /obj/item/reagent_containers/hypospray/autoinjector/survival = 1 + ) + cybernetic_implants = list( + /obj/item/organ/internal/cyberimp/eyes/hud/security, + /obj/item/organ/internal/cyberimp/chest/nutriment, + /obj/item/organ/internal/cyberimp/brain/anti_stun/hardened, + /obj/item/organ/internal/cyberimp/arm/flash, + /obj/item/organ/internal/eyes/cybernetic/shield + ) + +/datum/outfit/admin/solgov/elite/lieutenant + name = "Solar Federation Specops Lieutenant" + uniform = /obj/item/clothing/under/solgov/command/elite + suit = /obj/item/clothing/suit/space/hardsuit/ert/solgov/command + head = null + mask = /obj/item/clothing/mask/gas/explorer/marines + glasses = /obj/item/clothing/glasses/night + belt = /obj/item/melee/baton/loaded + l_hand = null + suit_store = /obj/item/gun/projectile/automatic/pistol/deagle + l_pocket = /obj/item/pinpointer/advpinpointer + l_ear = /obj/item/radio/headset/ert/alt/commander/solgov + backpack_contents = list( + /obj/item/storage/box/handcuffs = 1, + /obj/item/clothing/shoes/magboots/advance = 1, + /obj/item/reagent_containers/hypospray/autoinjector/survival = 1, + /obj/item/ammo_box/magazine/m50 = 3 + ) + is_solgov_lieutenant = TRUE + /datum/outfit/admin/sol_trader name = "Sol Trader" diff --git a/code/modules/response_team/ert.dm b/code/modules/response_team/ert.dm index 52531f381c0..f709e0455f9 100644 --- a/code/modules/response_team/ert.dm +++ b/code/modules/response_team/ert.dm @@ -301,22 +301,6 @@ GLOBAL_VAR_INIT(ert_request_answered, FALSE) /datum/response_team/gamma/announce_team() GLOB.event_announcement.Announce("Attention, [station_name()]. We are sending a code GAMMA elite Emergency Response Team. Standby.", "ERT En-Route") -/datum/response_team/solgov - security_outfit = /datum/outfit/job/centcom/response_team/solgov - command_outfit = /datum/outfit/job/centcom/response_team/solgov/lieutenant - borg_path = /mob/living/silicon/robot/ert/red - -/datum/response_team/solgov/announce_team() - GLOB.event_announcement.Announce("Attention, [station_name()], this is the TSF-NV Aurelia. Boarding shuttles have been scrambled and marines are en-route to your location. Standby for boarding.", "Marines En-Route") - -/datum/response_team/solgovspecops - security_outfit = /datum/outfit/job/centcom/response_team/solgov/elite - command_outfit = /datum/outfit/job/centcom/response_team/solgov/elite/lieutenant - borg_path = /mob/living/silicon/robot/ert/gamma - -/datum/response_team/solgovspecops/announce_team() - GLOB.event_announcement.Announce("Attention, [station_name()], this is the TSF-NV Aurelia. Boarding shuttles have been scrambled and specops marines are en-route to your location. Standby for boarding.", "Marines En-Route") - /datum/outfit/job/centcom/response_team name = "Response team" var/rt_assignment = "Emergency Response Team Member" diff --git a/code/modules/response_team/ert_outfits.dm b/code/modules/response_team/ert_outfits.dm index 7f292161242..8c3fbda5e57 100644 --- a/code/modules/response_team/ert_outfits.dm +++ b/code/modules/response_team/ert_outfits.dm @@ -534,128 +534,3 @@ implants = list(/obj/item/implant/mindshield, /obj/item/implant/death_alarm ) - -//////////////////// OORAH MARINES /////////////////// -/datum/outfit/job/centcom/response_team/solgov - name = "Solar Federation Marine" - rt_assignment = "Solar Federation Marine" - rt_job = "Solar Federation Marine" - rt_mob_job = "ERT Security" - uniform = /obj/item/clothing/under/solgov - suit = /obj/item/clothing/suit/armor/bulletproof - back = /obj/item/storage/backpack/ert/solgov - belt = /obj/item/storage/belt/military/assault/marines/full - head = /obj/item/clothing/head/soft/solgov/marines - glasses = /obj/item/clothing/glasses/night - gloves = /obj/item/clothing/gloves/combat - shoes = /obj/item/clothing/shoes/combat - l_ear = /obj/item/radio/headset/ert/alt/solgov - id = /obj/item/card/id - l_hand = /obj/item/gun/projectile/automatic/shotgun/bulldog - suit_store = /obj/item/gun/projectile/automatic/pistol/m1911 - r_pocket = /obj/item/flashlight/seclite - pda = /obj/item/pda - backpack_contents = list( - /obj/item/clothing/shoes/magboots = 1, - /obj/item/whetstone = 1, - /obj/item/clothing/mask/gas/explorer/marines = 1, - /obj/item/reagent_containers/hypospray/autoinjector/survival = 1 - ) - cybernetic_implants = list( - /obj/item/organ/internal/cyberimp/arm/flash, - /obj/item/organ/internal/cyberimp/chest/nutriment, - /obj/item/organ/internal/cyberimp/eyes/hud/security - ) - implants = list(/obj/item/implant/mindshield, - /obj/item/implant/death_alarm - ) - - var/is_solgov_lieutenant = FALSE - - -/datum/outfit/job/centcom/response_team/solgov/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - . = ..() - if(visualsOnly) - return - - if(is_solgov_lieutenant) - H.real_name = "Lieutenant [pick(GLOB.last_names)]" - else - H.real_name = "[pick("Corporal", "Sergeant", "Staff Sergeant", "Sergeant First Class", "Master Sergeant", "Sergeant Major")] [pick(GLOB.last_names)]" - H.name = H.real_name - var/obj/item/card/id/I = H.wear_id - I.assignment = name - if(istype(I) && is_solgov_lieutenant) - apply_to_card(I, H, get_centcom_access("Emergency Response Team Leader"), name, "lifetimeid") - else if(istype(I)) - apply_to_card(I, H, get_centcom_access("Emergency Response Team Member"), name, "lifetimeid") - H.sec_hud_set_ID() - -/datum/outfit/job/centcom/response_team/solgov/lieutenant - name = "Solar Federation Lieutenant" - rt_assignment = "Solar Federation Lieutenant" - rt_job = "Solar Federation Lieutenant" - rt_mob_job = "ERT Commander" - uniform = /obj/item/clothing/under/solgov/command - head = /obj/item/clothing/head/beret/solgov/command - glasses = /obj/item/clothing/glasses/night - back = /obj/item/storage/backpack/satchel - l_ear = /obj/item/radio/headset/ert/alt/commander/solgov - l_hand = null - belt = /obj/item/melee/baton/loaded - suit_store = /obj/item/gun/projectile/automatic/pistol/deagle - l_pocket = /obj/item/pinpointer/advpinpointer - backpack_contents = list( - /obj/item/storage/box/handcuffs = 1, - /obj/item/clothing/shoes/magboots/advance = 1, - /obj/item/reagent_containers/hypospray/autoinjector/survival = 1, - /obj/item/clothing/mask/gas/explorer/marines = 1, - /obj/item/ammo_box/magazine/m50 = 3 - ) - is_solgov_lieutenant = TRUE - -/datum/outfit/job/centcom/response_team/solgov/elite - name = "Solar Federation Specops Marine" - rt_assignment = "Solar Federation Specops Marine" - rt_job = "Solar Federation Specops Marine" - uniform = /obj/item/clothing/under/solgov/elite - suit = /obj/item/clothing/suit/space/hardsuit/ert/solgov - head = null - mask = /obj/item/clothing/mask/gas/explorer/marines - belt = /obj/item/storage/belt/military/assault/marines/elite/full - l_hand = /obj/item/gun/projectile/automatic/ar - backpack_contents = list( - /obj/item/clothing/shoes/magboots/advance = 1, - /obj/item/whetstone = 1, - /obj/item/reagent_containers/hypospray/autoinjector/survival = 1 - ) - cybernetic_implants = list( - /obj/item/organ/internal/cyberimp/eyes/hud/security, - /obj/item/organ/internal/cyberimp/chest/nutriment, - /obj/item/organ/internal/cyberimp/brain/anti_stun/hardened, - /obj/item/organ/internal/cyberimp/arm/flash, - /obj/item/organ/internal/eyes/cybernetic/shield - ) - -/datum/outfit/job/centcom/response_team/solgov/elite/lieutenant - name = "Solar Federation Specops Lieutenant" - rt_assignment = "Solar Federation Specops Lieutenant" - rt_job = "Solar Federation Specops Lieutenant" - rt_mob_job = "ERT Commander" - uniform = /obj/item/clothing/under/solgov/command/elite - suit = /obj/item/clothing/suit/space/hardsuit/ert/solgov/command - head = null - mask = /obj/item/clothing/mask/gas/explorer/marines - glasses = /obj/item/clothing/glasses/night - belt = /obj/item/melee/baton/loaded - l_hand = null - suit_store = /obj/item/gun/projectile/automatic/pistol/deagle - l_pocket = /obj/item/pinpointer/advpinpointer - l_ear = /obj/item/radio/headset/ert/alt/commander/solgov - backpack_contents = list( - /obj/item/storage/box/handcuffs = 1, - /obj/item/clothing/shoes/magboots/advance = 1, - /obj/item/reagent_containers/hypospray/autoinjector/survival = 1, - /obj/item/ammo_box/magazine/m50 = 3 - ) - is_solgov_lieutenant = TRUE diff --git a/code/modules/tgui/modules/ert_manager.dm b/code/modules/tgui/modules/ert_manager.dm index b141da41cab..0a2b1e7249f 100644 --- a/code/modules/tgui/modules/ert_manager.dm +++ b/code/modules/tgui/modules/ert_manager.dm @@ -12,7 +12,7 @@ /datum/ui_module/ert_manager/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.admin_state) ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) - ui = new(user, src, ui_key, "ERTManager", name, 350, 450, master_ui, state) + ui = new(user, src, ui_key, "ERTManager", name, 350, 430, master_ui, state) ui.autoupdate = TRUE ui.open() @@ -70,10 +70,6 @@ D = new /datum/response_team/red if("Gamma") D = new /datum/response_team/gamma - if("SolGov") - D = new /datum/response_team/solgov - if("SolGov Specops") - D = new /datum/response_team/solgovspecops else to_chat(usr, "Invalid ERT type.") return diff --git a/tgui/packages/tgui/interfaces/ERTManager.js b/tgui/packages/tgui/interfaces/ERTManager.js index 20db30d10b8..615bbdde508 100644 --- a/tgui/packages/tgui/interfaces/ERTManager.js +++ b/tgui/packages/tgui/interfaces/ERTManager.js @@ -33,29 +33,6 @@ export const ERTManager = (props, context) => { ? "purple" : ""} onClick={() => act('ert_type', { ert_type: "Gamma" })} /> -
-