diff --git a/code/modules/client/preference_setup/loadout/lists/accessories.dm b/code/modules/client/preference_setup/loadout/lists/accessories.dm index 231ce766536e6..e7eedc58dd36c 100644 --- a/code/modules/client/preference_setup/loadout/lists/accessories.dm +++ b/code/modules/client/preference_setup/loadout/lists/accessories.dm @@ -63,17 +63,17 @@ /datum/gear/accessory/ntaward display_name = "corporate award selection" description = "A medal or ribbon awarded to corporate personnel for significant accomplishments." - path = /obj/item/clothing/accessory/medal - cost = 8 + path = /obj/item/storage/medalbox + cost = 6 flags = GEAR_HAS_NO_CUSTOMIZATION /datum/gear/accessory/ntaward/New() ..() var/ntawards = list() - ntawards["sciences medal"] = /obj/item/clothing/accessory/medal/bronze/nanotrasen - ntawards["distinguished service"] = /obj/item/clothing/accessory/medal/silver/nanotrasen - ntawards["command medal"] = /obj/item/clothing/accessory/medal/gold/nanotrasen + ntawards["sciences medal"] = /obj/item/storage/medalbox/corp_science + ntawards["distinguished service"] = /obj/item/storage/medalbox/corp_service + ntawards["command medal"] = /obj/item/storage/medalbox/corp_command gear_tweaks += new/datum/gear_tweak/path(ntawards) diff --git a/code/modules/clothing/under/accessories/medals.dm b/code/modules/clothing/under/accessories/medals.dm index 9ff28620e3627..eaff17a77ef81 100644 --- a/code/modules/clothing/under/accessories/medals.dm +++ b/code/modules/clothing/under/accessories/medals.dm @@ -56,3 +56,33 @@ name = "corporate merit medal" desc = "An iron medal awarded to employees for merit." icon_state = "iron_nt" + +/obj/item/storage/medalbox + name = "medal box" + desc = "A small lacquered wooden box for holding decorations." + icon = 'icons/obj/medalbox.dmi' + icon_state = "medalbox" + w_class = ITEM_SIZE_SMALL + max_w_class = ITEM_SIZE_SMALL + max_storage_space = 3 + contents_allowed = list( + /obj/item/clothing/accessory/medal, + /obj/item/clothing/accessory/ribbon, + /obj/item/clothing/accessory/solgov/specialty + ) + +/obj/item/storage/medalbox/corp_command + startswith = list(/obj/item/clothing/accessory/medal/gold/nanotrasen) + +/obj/item/storage/medalbox/corp_service + startswith = list(/obj/item/clothing/accessory/medal/silver/nanotrasen) + +/obj/item/storage/medalbox/corp_science + startswith = list(/obj/item/clothing/accessory/medal/bronze/nanotrasen) + +/obj/item/storage/medalbox/corp_merit + startswith = list(/obj/item/clothing/accessory/medal/iron/nanotrasen) + +/obj/item/storage/medalbox/sol + desc = "A small aluminum box for holding decorations, adorned with gold-on-blue ribbons." + icon_state = "medalbox_sol" diff --git a/icons/obj/medalbox.dmi b/icons/obj/medalbox.dmi new file mode 100644 index 0000000000000..4e68fc43c224c Binary files /dev/null and b/icons/obj/medalbox.dmi differ diff --git a/maps/torch/items/clothing/solgov-accessory.dm b/maps/torch/items/clothing/solgov-accessory.dm index e9a281f8467d5..d8c11607d332b 100644 --- a/maps/torch/items/clothing/solgov-accessory.dm +++ b/maps/torch/items/clothing/solgov-accessory.dm @@ -75,6 +75,74 @@ medals desc = "A golden sun medal awarded by the SCG to nonmilitary individuals who have made exceptional contributions to the Sol Central Government." icon_state = "medal_service" +//medal boxes +/obj/item/storage/medalbox/sol/bronze_heart + startswith = list( + /obj/item/clothing/accessory/medal/solgov/mil/bronze_heart, + /obj/item/clothing/accessory/ribbon/solgov/medal/bronze_heart + ) + +/obj/item/storage/medalbox/sol/home_guard + startswith = list( + /obj/item/clothing/accessory/medal/solgov/mil/home_guard, + /obj/item/clothing/accessory/ribbon/solgov/medal/home_guard + ) + +/obj/item/storage/medalbox/sol/iron_star + startswith = list( + /obj/item/clothing/accessory/medal/solgov/mil/iron_star, + /obj/item/clothing/accessory/ribbon/solgov/medal/iron_star + ) + +/obj/item/storage/medalbox/sol/medical + startswith = list( + /obj/item/clothing/accessory/medal/solgov/mil/medical, + /obj/item/clothing/accessory/ribbon/solgov/medal/medical + ) + +/obj/item/storage/medalbox/sol/armed_forces + startswith = list( + /obj/item/clothing/accessory/medal/solgov/mil/armed_forces, + /obj/item/clothing/accessory/ribbon/solgov/medal/armed_forces + ) + +/obj/item/storage/medalbox/sol/silver_sword + startswith = list( + /obj/item/clothing/accessory/medal/solgov/mil/silver_sword, + /obj/item/clothing/accessory/ribbon/solgov/medal/silver_sword + ) + +/obj/item/storage/medalbox/sol/service_cross + startswith = list( + /obj/item/clothing/accessory/medal/solgov/mil/service_cross, + /obj/item/clothing/accessory/ribbon/solgov/medal/service_cross + ) + +/obj/item/storage/medalbox/sol/medal_of_honor + startswith = list( + /obj/item/clothing/accessory/medal/solgov/mil/medal_of_honor, + /obj/item/clothing/accessory/ribbon/solgov/medal/medal_of_honor + ) + +/obj/item/storage/medalbox/sol/expeditionary + startswith = list( + /obj/item/clothing/accessory/medal/solgov/civ/expeditionary, + /obj/item/clothing/accessory/ribbon/solgov/medal/expeditionary_medal + ) + +/obj/item/storage/medalbox/sol/sapientarian + startswith = list( + /obj/item/clothing/accessory/medal/solgov/civ/sapientarian, + /obj/item/clothing/accessory/ribbon/solgov/medal/sapientarian + ) + +/obj/item/storage/medalbox/sol/service + startswith = list( + /obj/item/clothing/accessory/medal/solgov/civ/service, + /obj/item/clothing/accessory/ribbon/solgov/medal/service + ) + + /obj/item/clothing/accessory/solgov var/check_codex_val = FACTION_FLEET diff --git a/maps/torch/loadout/loadout_accessories.dm b/maps/torch/loadout/loadout_accessories.dm index b878c5a9b49b9..a74e6a80222e7 100644 --- a/maps/torch/loadout/loadout_accessories.dm +++ b/maps/torch/loadout/loadout_accessories.dm @@ -1,44 +1,44 @@ /datum/gear/accessory/solgov_award_military display_name = "SolGov military award selection" description = "A selection of military awards awarded by the Sol Central Government." - path = /obj/item/clothing/accessory/medal/solgov/mil - cost = 8 + path = /obj/item/storage/medalbox/sol + cost = 6 allowed_branches = SOLGOV_BRANCHES flags = GEAR_HAS_NO_CUSTOMIZATION /datum/gear/accessory/solgov_award_military/New() ..() var/solmilitary = list() - solmilitary["Bronze Heart"] = /obj/item/clothing/accessory/medal/solgov/mil/bronze_heart - solmilitary["Home Guard medal"] = /obj/item/clothing/accessory/medal/solgov/mil/home_guard - solmilitary["Iron Star"] = /obj/item/clothing/accessory/medal/solgov/mil/iron_star - solmilitary["Combat Medical Award"] = /obj/item/clothing/accessory/medal/solgov/mil/medical - solmilitary["Armed Forces medal"] = /obj/item/clothing/accessory/medal/solgov/mil/armed_forces - solmilitary["Silver Sword"] = /obj/item/clothing/accessory/medal/solgov/mil/silver_sword - solmilitary["Superior Service Cross"] = /obj/item/clothing/accessory/medal/solgov/mil/service_cross - solmilitary["Medal of Honor"] = /obj/item/clothing/accessory/medal/solgov/mil/medal_of_honor + solmilitary["Bronze Heart"] = /obj/item/storage/medalbox/sol/bronze_heart + solmilitary["Home Guard medal"] = /obj/item/storage/medalbox/sol/home_guard + solmilitary["Iron Star"] = /obj/item/storage/medalbox/sol/iron_star + solmilitary["Combat Medical Award"] = /obj/item/storage/medalbox/sol/medical + solmilitary["Armed Forces medal"] = /obj/item/storage/medalbox/sol/armed_forces + solmilitary["Silver Sword"] = /obj/item/storage/medalbox/sol/silver_sword + solmilitary["Superior Service Cross"] = /obj/item/storage/medalbox/sol/service_cross + solmilitary["Medal of Honor"] = /obj/item/storage/medalbox/sol/medal_of_honor gear_tweaks += new/datum/gear_tweak/path(solmilitary) /datum/gear/accessory/solgov_award_civilian display_name = "SolGov civilian award selection" description = "A selection of civilian awards awarded by the Sol Central Government." path = /obj/item/clothing/accessory/medal/solgov/civ - cost = 5 + cost = 3 flags = GEAR_HAS_NO_CUSTOMIZATION /datum/gear/accessory/solgov_award_civilian/New() ..() var/solcivilian = list() - solcivilian["Expeditionary Medal"] = /obj/item/clothing/accessory/medal/solgov/civ/expeditionary - solcivilian["Sapientarian Peace Award"] = /obj/item/clothing/accessory/medal/solgov/civ/sapientarian - solcivilian["Distinguished Service Medal"] = /obj/item/clothing/accessory/medal/solgov/civ/service + solcivilian["Expeditionary Medal"] = /obj/item/storage/medalbox/sol/expeditionary + solcivilian["Sapientarian Peace Award"] = /obj/item/storage/medalbox/sol/sapientarian + solcivilian["Distinguished Service Medal"] = /obj/item/storage/medalbox/sol/service gear_tweaks += new/datum/gear_tweak/path(solcivilian) /datum/gear/accessory/solgov_award_ribbons display_name = "SolGov ribbon selection" description = "A selection of decorations and medal ribbons awarded by the Sol Central Government." path = /obj/item/clothing/accessory/ribbon/solgov - cost = 3 + cost = 2 allowed_branches = SOLGOV_BRANCHES flags = GEAR_HAS_NO_CUSTOMIZATION @@ -52,18 +52,6 @@ solribbons["Combat Action ribbon"] = /obj/item/clothing/accessory/ribbon/solgov/combat solribbons["Gaia Conflict ribbon"] = /obj/item/clothing/accessory/ribbon/solgov/gaiaconflict solribbons["Distinguished unit ribbon"] = /obj/item/clothing/accessory/ribbon/solgov/distinguished_unit - //medal ribbons - solribbons["Bronze Heart ribbon (medal)"] = /obj/item/clothing/accessory/ribbon/solgov/medal/bronze_heart - solribbons["Home Guard ribbon (medal)"] = /obj/item/clothing/accessory/ribbon/solgov/medal/home_guard - solribbons["Iron Star ribbon (medal)"] = /obj/item/clothing/accessory/ribbon/solgov/medal/iron_star - solribbons["Armed Forces ribbon (medal)"] = /obj/item/clothing/accessory/ribbon/solgov/medal/armed_forces - solribbons["Silver Sword ribbon (medal)"] = /obj/item/clothing/accessory/ribbon/solgov/medal/silver_sword - solribbons["Superior Service ribbon (medal)"] = /obj/item/clothing/accessory/ribbon/solgov/medal/service_cross - solribbons["Medal of Honor ribbon (medal)"] = /obj/item/clothing/accessory/ribbon/solgov/medal/medal_of_honor - solribbons["Expeditionary Ribbon (medal)"] = /obj/item/clothing/accessory/ribbon/solgov/medal/expeditionary_medal - solribbons["Sapientarian ribbon (medal)"] = /obj/item/clothing/accessory/ribbon/solgov/medal/sapientarian - solribbons["Distinguished Service ribbon (medal)"] = /obj/item/clothing/accessory/ribbon/solgov/medal/service - solribbons["Combat Medical ribbon (medal)"] = /obj/item/clothing/accessory/ribbon/solgov/medal/medical gear_tweaks += new/datum/gear_tweak/path(solribbons) /datum/gear/accessory/tags diff --git a/maps/torch_fd/loadout/_defines.dm b/maps/torch_fd/loadout/_defines.dm index 9e6e22210769c..ccb6e6026774b 100644 --- a/maps/torch_fd/loadout/_defines.dm +++ b/maps/torch_fd/loadout/_defines.dm @@ -52,4 +52,4 @@ #define CIVILIAN_BRANCHES list(/datum/mil_branch/civilian, /datum/mil_branch/solgov) -#define SOLGOV_BRANCHES list(/datum/mil_branch/expeditionary_corps, /datum/mil_branch/fleet, /datum/mil_branch/solgov) +#define SOLGOV_BRANCHES list(/datum/mil_branch/expeditionary_corps, /datum/mil_branch/fleet, /datum/mil_branch/scga, /datum/mil_branch/solgov) diff --git a/maps/torch_fd/torch_ranks.dm b/maps/torch_fd/torch_ranks.dm index 2edd435153cac..5f5ec332ed6cb 100644 --- a/maps/torch_fd/torch_ranks.dm +++ b/maps/torch_fd/torch_ranks.dm @@ -34,6 +34,7 @@ /datum/species/vox = list( /datum/mil_branch/expeditionary_corps, /datum/mil_branch/fleet, + /datum/mil_branch/scga, /datum/mil_branch/civilian, /datum/mil_branch/solgov, /datum/mil_branch/skrell_fleet @@ -197,6 +198,58 @@ SKILL_WEAPONS = SKILL_BASIC, SKILL_EVA = SKILL_BASIC) +/datum/mil_branch/scga + name = "Army" + name_short = "SCGA" + email_domain = "torch.army.mil" + + rank_types = list( + /datum/mil_rank/scga/e1, + /datum/mil_rank/scga/e2, + /datum/mil_rank/scga/e3, + /datum/mil_rank/scga/e4, + /datum/mil_rank/scga/e5, + /datum/mil_rank/scga/e6, + /datum/mil_rank/scga/e7, + /datum/mil_rank/scga/e8, + /datum/mil_rank/scga/e8_alt, + /datum/mil_rank/scga/e9, + /datum/mil_rank/scga/e9_alt1, + /datum/mil_rank/scga/e9_alt2, + /datum/mil_rank/scga/o1, + /datum/mil_rank/scga/o2, + /datum/mil_rank/scga/o3, + /datum/mil_rank/scga/o4, + /datum/mil_rank/scga/o5, + /datum/mil_rank/scga/o6, + /datum/mil_rank/scga/o7, + /datum/mil_rank/scga/o8, + /datum/mil_rank/scga/o9, + /datum/mil_rank/scga/o10, + /datum/mil_rank/scga/o10_alt + ) + + spawn_rank_types = list( + /datum/mil_rank/scga/e2, + /datum/mil_rank/scga/e3, + /datum/mil_rank/scga/e4, + /datum/mil_rank/scga/e5, + /datum/mil_rank/scga/e6, + /datum/mil_rank/scga/e7, + /datum/mil_rank/scga/e8, + /datum/mil_rank/scga/e8_alt, + /datum/mil_rank/scga/o1, + /datum/mil_rank/scga/o2, + /datum/mil_rank/scga/o3, + /datum/mil_rank/scga/o4 + ) + + assistant_job = /datum/job/crew + min_skill = list( + SKILL_HAULING = SKILL_TRAINED, + SKILL_WEAPONS = SKILL_BASIC, + SKILL_COMBAT = SKILL_BASIC + ) /datum/mil_branch/civilian name = "Civilian" @@ -467,6 +520,8 @@ sort_order = 18 + + /* * Civilians * ========= diff --git a/mods/_fd/fd_assets/_fd_assets.dme b/mods/_fd/fd_assets/_fd_assets.dme index 381afcbb66185..4d59022db8254 100644 --- a/mods/_fd/fd_assets/_fd_assets.dme +++ b/mods/_fd/fd_assets/_fd_assets.dme @@ -50,6 +50,8 @@ #include "code/fullscreen.dm" #include "code/loadout.dm" #include "code/research_guard.dm" +#include "code/added_branch_outfits.dm" +#include "code/added_branches.dm" #include "code/skills.dm" #include "code/~TO_MAKE.dm" diff --git a/mods/_fd/fd_assets/code/added_branch_outfits.dm b/mods/_fd/fd_assets/code/added_branch_outfits.dm new file mode 100644 index 0000000000000..f865d62804369 --- /dev/null +++ b/mods/_fd/fd_assets/code/added_branch_outfits.dm @@ -0,0 +1,83 @@ +//EC prospector +/singleton/hierarchy/outfit/job/torch/passenger/research/prospector/ec + name = OUTFIT_JOB_NAME("Prospector - Expeditionary Corps") + uniform = /obj/item/clothing/under/solgov/utility/expeditionary/supply + shoes = /obj/item/clothing/shoes/dutyboots + id_types = list(/obj/item/card/id/torch/passenger/research/mining) + pda_type = /obj/item/modular_computer/pda/mining + flags = OUTFIT_FLAGS_JOB_DEFAULT | OUTFIT_EXTENDED_SURVIVAL + l_ear = /obj/item/device/radio/headset/headset_mining + +//army outfits - all of them +//command +/singleton/hierarchy/outfit/job/torch/crew/command/cmo/army + name = OUTFIT_JOB_NAME("Chief Medical Officer - Army") + uniform = /obj/item/clothing/under/scga/utility/urban/medical + shoes = /obj/item/clothing/shoes/dutyboots + +/singleton/hierarchy/outfit/job/torch/crew/command/cos/army + name = OUTFIT_JOB_NAME("Chief of Security - Army") + uniform = /obj/item/clothing/under/scga/utility/urban/security + shoes = /obj/item/clothing/shoes/dutyboots + +//engi +/singleton/hierarchy/outfit/job/torch/crew/engineering/engineer/army + name = OUTFIT_JOB_NAME("Engineer - Army") + uniform = /obj/item/clothing/under/scga/utility/urban/engineering + shoes = /obj/item/clothing/shoes/dutyboots + +/singleton/hierarchy/outfit/job/torch/crew/engineering/roboticistarmy + name = OUTFIT_JOB_NAME("Roboticist - Army") + uniform = /obj/item/clothing/under/scga/utility/urban/engineering + shoes = /obj/item/clothing/shoes/dutyboots + id_types = list(/obj/item/card/id/torch/contractor/engineering/roboticist) + pda_type = /obj/item/modular_computer/pda/roboticist + +//medical +/singleton/hierarchy/outfit/job/torch/crew/medical/senior/army + name = OUTFIT_JOB_NAME("Physician - Army") + uniform = /obj/item/clothing/under/scga/utility/urban/medical + shoes = /obj/item/clothing/shoes/dutyboots + +/singleton/hierarchy/outfit/job/torch/crew/medical/junior/army //not even used lol + name = OUTFIT_JOB_NAME("Medical Resident - Army") + uniform = /obj/item/clothing/under/scga/utility/urban/medical + shoes = /obj/item/clothing/shoes/dutyboots + +/singleton/hierarchy/outfit/job/torch/crew/medical/doctor/army + name = OUTFIT_JOB_NAME("Medical Technician - Army") + uniform = /obj/item/clothing/under/scga/utility/urban/urban/medical/banded + shoes = /obj/item/clothing/shoes/dutyboots + l_ear = /obj/item/device/radio/headset/headset_corpsman + +//sec +/singleton/hierarchy/outfit/job/torch/crew/security/brig_chief/army + name = OUTFIT_JOB_NAME("Brig Chief - Army") + uniform = /obj/item/clothing/under/scga/utility/urban/security + shoes = /obj/item/clothing/shoes/dutyboots + +/singleton/hierarchy/outfit/job/torch/crew/security/maa/army + name = OUTFIT_JOB_NAME("Master at Arms - Army") + uniform = /obj/item/clothing/under/scga/utility/urban/security + shoes = /obj/item/clothing/shoes/dutyboots + +//service +/singleton/hierarchy/outfit/job/torch/crew/service/janitor/army + name = OUTFIT_JOB_NAME("Sanitation Technician - Army") + uniform = /obj/item/clothing/under/scga/utility/urban/service + shoes = /obj/item/clothing/shoes/dutyboots + +/singleton/hierarchy/outfit/job/torch/crew/service/cook/army + name = OUTFIT_JOB_NAME("Cook - Army") + uniform = /obj/item/clothing/under/scga/utility/urban/service + shoes = /obj/item/clothing/shoes/dutyboots + +/singleton/hierarchy/outfit/job/torch/crew/service/crewman/army + name = OUTFIT_JOB_NAME("Crewman - Army") + uniform = /obj/item/clothing/under/scga/utility/urban/service + +//supply +/singleton/hierarchy/outfit/job/torch/crew/supply/tech/army + name = OUTFIT_JOB_NAME("Deck Technician - Army") + uniform = /obj/item/clothing/under/scga/utility/urban/supply + shoes = /obj/item/clothing/shoes/dutyboots \ No newline at end of file diff --git a/mods/_fd/fd_assets/code/added_branches.dm b/mods/_fd/fd_assets/code/added_branches.dm new file mode 100644 index 0000000000000..8d56dc72d9d55 --- /dev/null +++ b/mods/_fd/fd_assets/code/added_branches.dm @@ -0,0 +1,268 @@ +//EC pharmacist and prospector as featured in the old code +/datum/job/chemist + allowed_branches = list( + /datum/mil_branch/civilian, + /datum/mil_branch/expeditionary_corps = /singleton/hierarchy/outfit/job/torch/crew/medical/doctor + ) + allowed_ranks = list( + /datum/mil_rank/ec/o1, + /datum/mil_rank/civ/contractor + ) + +/datum/job/mining + allowed_branches = list( + /datum/mil_branch/civilian, + /datum/mil_branch/expeditionary_corps = /singleton/hierarchy/outfit/job/torch/passenger/research/prospector/ec + ) + allowed_ranks = list( + /datum/mil_rank/civ/contractor, + /datum/mil_rank/ec/e3 + ) + +//army branch - important for the whole thing to work +//command +/datum/job/cmo + allowed_branches = list( + /datum/mil_branch/expeditionary_corps, + /datum/mil_branch/fleet = /singleton/hierarchy/outfit/job/torch/crew/command/cmo/fleet, + /datum/mil_branch/scga = /singleton/hierarchy/outfit/job/torch/crew/command/cmo/army + ) + allowed_ranks = list( + /datum/mil_rank/fleet/o3, + /datum/mil_rank/fleet/o4, + /datum/mil_rank/ec/o3, + /datum/mil_rank/scga/o3, + /datum/mil_rank/scga/o4 + ) + +/datum/job/hos + allowed_branches = list( + /datum/mil_branch/expeditionary_corps, + /datum/mil_branch/fleet = /singleton/hierarchy/outfit/job/torch/crew/command/cos/fleet, + /datum/mil_branch/scga = /singleton/hierarchy/outfit/job/torch/crew/command/cos/army + ) + allowed_ranks = list( + /datum/mil_rank/ec/o3, + /datum/mil_rank/fleet/o2, + /datum/mil_rank/fleet/o3, + /datum/mil_rank/scga/o2, + /datum/mil_rank/scga/o3 + ) +//engineering +/datum/job/engineer + allowed_branches = list( + /datum/mil_branch/expeditionary_corps, + /datum/mil_branch/fleet = /singleton/hierarchy/outfit/job/torch/crew/engineering/engineer/fleet, + /datum/mil_branch/scga = /singleton/hierarchy/outfit/job/torch/crew/engineering/engineer/army, + /datum/mil_branch/civilian = /singleton/hierarchy/outfit/job/torch/crew/engineering/contractor + ) + allowed_ranks = list( + /datum/mil_rank/fleet/e3, + /datum/mil_rank/fleet/e4, + /datum/mil_rank/fleet/e5, + /datum/mil_rank/ec/e3, + /datum/mil_rank/ec/e5, + /datum/mil_rank/scga/e3, + /datum/mil_rank/scga/e4, + /datum/mil_rank/scga/e5, + /datum/mil_rank/civ/contractor + ) + +/datum/job/engineer_trainee + allowed_branches = list( + /datum/mil_branch/expeditionary_corps, + /datum/mil_branch/fleet = /singleton/hierarchy/outfit/job/torch/crew/engineering/engineer/fleet, + /datum/mil_branch/scga = /singleton/hierarchy/outfit/job/torch/crew/engineering/engineer/army + ) + allowed_ranks = list( + /datum/mil_rank/ec/e3, + /datum/mil_rank/fleet/e2, + /datum/mil_rank/scga/e2 + ) + +/datum/job/roboticist + allowed_branches = list( + /datum/mil_branch/expeditionary_corps = /singleton/hierarchy/outfit/job/torch/crew/engineering/roboticistec, + /datum/mil_branch/fleet = /singleton/hierarchy/outfit/job/torch/crew/engineering/roboticistfleet, + /datum/mil_branch/scga = /singleton/hierarchy/outfit/job/torch/crew/engineering/roboticistarmy, + /datum/mil_branch/civilian = /singleton/hierarchy/outfit/job/torch/crew/engineering/roboticist + ) + allowed_ranks = list( + /datum/mil_rank/fleet/e5, + /datum/mil_rank/ec/e5, + /datum/mil_rank/scga/e4, + /datum/mil_rank/scga/e5, + /datum/mil_rank/civ/contractor + ) +//medical +/datum/job/senior_doctor + allowed_branches = list( + /datum/mil_branch/expeditionary_corps, + /datum/mil_branch/fleet = /singleton/hierarchy/outfit/job/torch/crew/medical/senior/fleet, + /datum/mil_branch/scga = /singleton/hierarchy/outfit/job/torch/crew/medical/senior/army, + /datum/mil_branch/civilian = /singleton/hierarchy/outfit/job/torch/crew/medical/contractor/senior + ) + allowed_ranks = list( + /datum/mil_rank/ec/o1, + /datum/mil_rank/fleet/o1, + /datum/mil_rank/fleet/o2, + /datum/mil_rank/scga/o1, + /datum/mil_rank/scga/o2, + /datum/mil_rank/civ/contractor + ) + +/datum/job/junior_doctor + allowed_branches = list( + /datum/mil_branch/expeditionary_corps, + /datum/mil_branch/fleet = /singleton/hierarchy/outfit/job/torch/crew/medical/senior/fleet, + /datum/mil_branch/scga = /singleton/hierarchy/outfit/job/torch/crew/medical/senior/army, + /datum/mil_branch/civilian = /singleton/hierarchy/outfit/job/torch/crew/medical/contractor/senior + ) + allowed_ranks = list( + /datum/mil_rank/ec/o1, + /datum/mil_rank/fleet/o1, + /datum/mil_rank/scga/o1, + /datum/mil_rank/civ/contractor + ) + +/datum/job/doctor + allowed_branches = list( + /datum/mil_branch/expeditionary_corps, + /datum/mil_branch/fleet = /singleton/hierarchy/outfit/job/torch/crew/medical/doctor/fleet, + /datum/mil_branch/scga = /singleton/hierarchy/outfit/job/torch/crew/medical/doctor/army, + /datum/mil_branch/civilian = /singleton/hierarchy/outfit/job/torch/crew/medical/contractor + ) + allowed_ranks = list( + /datum/mil_rank/ec/e3, + /datum/mil_rank/ec/e5, + /datum/mil_rank/fleet/e3, + /datum/mil_rank/fleet/e4, + /datum/mil_rank/fleet/e5, + /datum/mil_rank/fleet/e6, + /datum/mil_rank/scga/e3, + /datum/mil_rank/scga/e4, + /datum/mil_rank/scga/e5, + /datum/mil_rank/scga/e6, + /datum/mil_rank/civ/contractor + ) + +/datum/job/medical_trainee + allowed_branches = list( + /datum/mil_branch/expeditionary_corps, + /datum/mil_branch/fleet = /singleton/hierarchy/outfit/job/torch/crew/medical/doctor/fleet, + /datum/mil_branch/scga = /singleton/hierarchy/outfit/job/torch/crew/medical/doctor/army + ) + allowed_ranks = list( + /datum/mil_rank/ec/e3, + /datum/mil_rank/fleet/e2, + /datum/mil_rank/scga/e2 + ) + +//security +/datum/job/warden + allowed_branches = list( + /datum/mil_branch/expeditionary_corps, + /datum/mil_branch/fleet = /singleton/hierarchy/outfit/job/torch/crew/security/brig_chief/fleet, + /datum/mil_branch/scga = /singleton/hierarchy/outfit/job/torch/crew/security/brig_chief/army + ) + allowed_ranks = list( + /datum/mil_rank/ec/e7, + /datum/mil_rank/fleet/e6, + /datum/mil_rank/fleet/e7, + /datum/mil_rank/fleet/e8, + /datum/mil_rank/scga/e6, + /datum/mil_rank/scga/e7, + /datum/mil_rank/scga/e8 + ) + +/datum/job/officer + allowed_branches = list( + /datum/mil_branch/expeditionary_corps, + /datum/mil_branch/fleet = /singleton/hierarchy/outfit/job/torch/crew/security/maa/fleet, + /datum/mil_branch/scga = /singleton/hierarchy/outfit/job/torch/crew/security/maa/army + ) + allowed_ranks = list( + /datum/mil_rank/ec/e3, + /datum/mil_rank/fleet/e3, + /datum/mil_rank/fleet/e4, + /datum/mil_rank/fleet/e5, + /datum/mil_rank/scga/e3, + /datum/mil_rank/scga/e4, + /datum/mil_rank/scga/e5 + + ) + +//service +/datum/job/janitor + allowed_branches = list( + /datum/mil_branch/civilian, + /datum/mil_branch/expeditionary_corps = /singleton/hierarchy/outfit/job/torch/crew/service/janitor/ec, + /datum/mil_branch/fleet = /singleton/hierarchy/outfit/job/torch/crew/service/janitor/fleet, + /datum/mil_branch/scga = /singleton/hierarchy/outfit/job/torch/crew/service/janitor/army + ) + allowed_ranks = list( + /datum/mil_rank/civ/contractor, + /datum/mil_rank/fleet/e2, + /datum/mil_rank/ec/e3, + /datum/mil_rank/fleet/e3, + /datum/mil_rank/fleet/e4, + /datum/mil_rank/scga/e2, + /datum/mil_rank/scga/e3, + /datum/mil_rank/scga/e4 + ) + +/datum/job/chef + allowed_branches = list( + /datum/mil_branch/civilian, + /datum/mil_branch/expeditionary_corps = /singleton/hierarchy/outfit/job/torch/crew/service/cook/ec, + /datum/mil_branch/fleet = /singleton/hierarchy/outfit/job/torch/crew/service/cook/fleet, + /datum/mil_branch/scga = /singleton/hierarchy/outfit/job/torch/crew/service/cook/army + ) + allowed_ranks = list( + /datum/mil_rank/civ/contractor, + /datum/mil_rank/ec/e3, + /datum/mil_rank/ec/e5, + /datum/mil_rank/fleet/e2, + /datum/mil_rank/fleet/e3, + /datum/mil_rank/fleet/e4, + /datum/mil_rank/fleet/e5, + /datum/mil_rank/scga/e2, + /datum/mil_rank/scga/e3, + /datum/mil_rank/scga/e4 + ) + +/datum/job/crew + allowed_branches = list( + /datum/mil_branch/expeditionary_corps, + /datum/mil_branch/fleet = /singleton/hierarchy/outfit/job/torch/crew/service/crewman/fleet, + /datum/mil_branch/scga = /singleton/hierarchy/outfit/job/torch/crew/service/crewman/army + ) + allowed_ranks = list( + /datum/mil_rank/ec/e3, + /datum/mil_rank/fleet/e2, + /datum/mil_rank/fleet/e3, + /datum/mil_rank/fleet/e4, + /datum/mil_rank/scga/e2, + /datum/mil_rank/scga/e3, + /datum/mil_rank/scga/e4 + ) + +//supply +/datum/job/cargo_tech + allowed_branches = list( + /datum/mil_branch/expeditionary_corps, + /datum/mil_branch/fleet = /singleton/hierarchy/outfit/job/torch/crew/supply/tech/fleet, + /datum/mil_branch/scga = /singleton/hierarchy/outfit/job/torch/crew/supply/tech/army, + /datum/mil_branch/civilian = /singleton/hierarchy/outfit/job/torch/crew/supply/contractor + ) + allowed_ranks = list( + /datum/mil_rank/fleet/e2, + /datum/mil_rank/ec/e3, + /datum/mil_rank/fleet/e3, + /datum/mil_rank/fleet/e4, + /datum/mil_rank/scga/e2, + /datum/mil_rank/scga/e3, + /datum/mil_rank/scga/e4, + /datum/mil_rank/scga/e5, + /datum/mil_rank/civ/contractor + ) diff --git a/packs/factions/scga/badges.dm b/packs/factions/scga/badges.dm index 0a2bb7b1eacf3..32f11af5b5e08 100644 --- a/packs/factions/scga/badges.dm +++ b/packs/factions/scga/badges.dm @@ -20,14 +20,65 @@ /obj/item/clothing/accessory/scga_badge/enlisted - name = "pin badge, SCGA Enlisted" - desc = "A shiny little pin badge denoting qualification as a solar army enlistedman." + name = "army enlisted qualification pin" + desc = "A shiny little pin badge denoting qualification of an SCGA enlistedman." icon_state = "enlisted" overlay_state = "enlisted_worn" /obj/item/clothing/accessory/scga_badge/officer - name = "pin badge, SCGA Officer" - desc = "A shiny little pin badge denoting qualification as a solar army officer." + name = "army officer qualification pin" + desc = "A shiny little pin badge denoting qualification of an SCGA officer." icon_state = "officer" overlay_state = "officer_worn" + +//shoulder patches +/obj/item/clothing/accessory/solgov/army_patch + name = "\improper First Infantry Division patch" + desc = "A fancy shoulder patch carrying insignia of First Infantry Division, the PDF of Earth and main force on Gaia." + icon = 'packs/factions/scga/badges.dmi' + accessory_icons = list( + slot_w_uniform_str = 'packs/factions/scga/badges.dmi', + slot_wear_suit_str = 'packs/factions/scga/badges.dmi' + ) + icon_state = "armypatch1" + overlay_state = "armypatch1_worn" + on_rolled_down = ACCESSORY_ROLLED_NONE + slot = ACCESSORY_SLOT_INSIGNIA + +/obj/item/clothing/accessory/solgov/army_patch/secondinf + name = "\improper Second Infantry Division patch" + desc = "A hardy shoulder patch carrying insignia of Second Infantry Division, often deployed as peacekeepers and stationed in many places." + icon_state = "armypatch2" + overlay_state = "armypatch2_worn" + +/obj/item/clothing/accessory/solgov/army_patch/firstcav + name = "\improper First Cavalry Division patch" + desc = "A tacticool shoulder patch carrying insignia of First Cavalry Division, the mechanized support arm of the Army." + icon_state = "armypatch3" + overlay_state = "armypatch3_worn" + +/obj/item/clothing/accessory/solgov/army_patch/firstarm + name = "\improper First Armored Division patch" + desc = "A menacing shoulder patch carrying insignia of First Armored Division, the depreciated and partially inactive support force." + icon_state = "armypatch4" + overlay_state = "armypatch4_worn" + +/obj/item/clothing/accessory/solgov/army_patch/airborne + name = "\improper First Airborne Division patch" + desc = "A bleached shoulder patch carrying insignia of First Airborne Division, the main air unit of Army." + icon_state = "armypatch5" + overlay_state = "armypatch5_worn" + +/obj/item/clothing/accessory/solgov/army_patch/maritime + name = "\improper Maritime Corps patch" + desc = "An eyesoring shoulder patch carrying insignia of Army Maritime Corps, the waterborne unit currently on Gaia." + icon_state = "armypatch6" + overlay_state = "armypatch6_worn" + +//loadout integration +/datum/gear/accessory/armypatch + display_name = "army patch" + path = /obj/item/clothing/accessory/solgov/army_patch + flags = GEAR_HAS_TYPE_SELECTION + allowed_branches = list(/datum/mil_branch/scga) diff --git a/packs/factions/scga/badges.dmi b/packs/factions/scga/badges.dmi index 6c7a2fb184394..f27e7c802efe7 100644 Binary files a/packs/factions/scga/badges.dmi and b/packs/factions/scga/badges.dmi differ diff --git a/packs/factions/scga/clothing.dm b/packs/factions/scga/clothing.dm index 10b7040ae3b2d..9eda56f46eb89 100644 --- a/packs/factions/scga/clothing.dm +++ b/packs/factions/scga/clothing.dm @@ -18,8 +18,8 @@ /obj/item/clothing/under/scga/pt - name = "physical training uniform, SCGA" - desc = "A flexible set of black shirt and pants. Part of the solar army physical training uniform." + name = "army PT uniform" + desc = "A flexible set of black shirt and pants. Does NOT leave much to the imagination." icon_state = "under_pt" item_state_slots = list( slot_l_hand_str = "under_pt_held_l", @@ -29,8 +29,8 @@ /obj/item/clothing/under/scga/fatigues - name = "standard fatigues, SCGA" - desc = "A loose set of green tank-top and brown short-pants. Part of the solar army general off-duty uniform." + name = "army off-duty clothing" + desc = "A loose set of green tank-top and brown short-pants. Miami, sexy." icon_state = "under_fatigues" item_state_slots = list( slot_l_hand_str = "under_fatigues_held_l", @@ -41,8 +41,8 @@ /obj/item/clothing/under/scga/utility - name = "utility uniform, SCGA" - desc = "A green, durable utility jumpsuit. Belonging to the solar army uniform." + name = "green army fatigues" + desc = "Robust utility uniform of SCG Army, coloured lovely forest green for hiding in woodland." icon_state = "under_utility" item_state_slots = list( slot_l_hand_str = "under_utility_held_l", @@ -50,10 +50,34 @@ slot_w_uniform_str = "under_utility_worn" ) +/obj/item/clothing/under/scga/utility/command + accessories = list(/obj/item/clothing/accessory/solgov/department/command/fleet) + +/obj/item/clothing/under/scga/utility/engineering + accessories = list(/obj/item/clothing/accessory/solgov/department/engineering/fleet) + +/obj/item/clothing/under/scga/utility/security + accessories = list(/obj/item/clothing/accessory/solgov/department/security/fleet) + +/obj/item/clothing/under/scga/utility/medical + accessories = list(/obj/item/clothing/accessory/solgov/department/medical/fleet) + +/obj/item/clothing/under/scga/utility/medical/banded + accessories = list(/obj/item/clothing/accessory/solgov/department/medical/fleet, /obj/item/clothing/accessory/armband/medblue) + +/obj/item/clothing/under/scga/utility/supply + accessories = list(/obj/item/clothing/accessory/solgov/department/supply/fleet) + +/obj/item/clothing/under/scga/utility/service + accessories = list(/obj/item/clothing/accessory/solgov/department/service/fleet) + +/obj/item/clothing/under/scga/utility/exploration + accessories = list(/obj/item/clothing/accessory/solgov/department/exploration/fleet) + /obj/item/clothing/under/scga/utility/tan - name = "tan utility uniform, SCGA" - desc = "A tan, durable utility jumpsuit. Belonging to the solar army uniform." + name = "tan army fatigues" + desc = "Robust utility uniform of SCG Army, coloured tasteful arid tan for hiding in deserts and arid areas." icon_state = "under_utility_tan" item_state_slots = list( slot_l_hand_str = "under_utility_tan_held_l", @@ -61,10 +85,34 @@ slot_w_uniform_str = "under_utility_tan_worn" ) +/obj/item/clothing/under/scga/utility/tan/command + accessories = list(/obj/item/clothing/accessory/solgov/department/command/fleet) + +/obj/item/clothing/under/scga/utility/tan/engineering + accessories = list(/obj/item/clothing/accessory/solgov/department/engineering/fleet) + +/obj/item/clothing/under/scga/utility/tan/security + accessories = list(/obj/item/clothing/accessory/solgov/department/security/fleet) + +/obj/item/clothing/under/scga/utility/tan/medical + accessories = list(/obj/item/clothing/accessory/solgov/department/medical/fleet) + +/obj/item/clothing/under/scga/utility/tan/banded + accessories = list(/obj/item/clothing/accessory/solgov/department/medical/fleet, /obj/item/clothing/accessory/armband/medblue) + +/obj/item/clothing/under/scga/utility/tan/supply + accessories = list(/obj/item/clothing/accessory/solgov/department/supply/fleet) + +/obj/item/clothing/under/scga/utility/tan/service + accessories = list(/obj/item/clothing/accessory/solgov/department/service/fleet) + +/obj/item/clothing/under/scga/utility/tan/exploration + accessories = list(/obj/item/clothing/accessory/solgov/department/exploration/fleet) + /obj/item/clothing/under/scga/utility/urban - name = "urban utility uniform, SCGA" - desc = "A grey, durable utility jumpsuit. Belonging to the solar army utility uniform." + name = "urban army fatigues" + desc = "Robust utility uniform of SCG Army, coloured grey for blending into urban areas and space installations." icon_state = "under_utility_urban" item_state_slots = list( slot_l_hand_str = "under_utility_urban_held_l", @@ -72,10 +120,34 @@ slot_w_uniform_str = "under_utility_urban_worn" ) +/obj/item/clothing/under/scga/utility/urban/command + accessories = list(/obj/item/clothing/accessory/solgov/department/command/fleet) + +/obj/item/clothing/under/scga/utility/urban/engineering + accessories = list(/obj/item/clothing/accessory/solgov/department/engineering/fleet) + +/obj/item/clothing/under/scga/utility/urban/security + accessories = list(/obj/item/clothing/accessory/solgov/department/security/fleet) + +/obj/item/clothing/under/scga/utility/urban/medical + accessories = list(/obj/item/clothing/accessory/solgov/department/medical/fleet) + +/obj/item/clothing/under/scga/utility/urban/urban/medical/banded + accessories = list(/obj/item/clothing/accessory/solgov/department/medical/fleet, /obj/item/clothing/accessory/armband/medblue) + +/obj/item/clothing/under/scga/utility/urban/supply + accessories = list(/obj/item/clothing/accessory/solgov/department/supply/fleet) + +/obj/item/clothing/under/scga/utility/urban/service + accessories = list(/obj/item/clothing/accessory/solgov/department/service/fleet) + +/obj/item/clothing/under/scga/utility/urban/exploration + accessories = list(/obj/item/clothing/accessory/solgov/department/exploration/fleet) + /obj/item/clothing/under/scga/service - name = "service uniform, SCGA" - desc = "A slimming brown service shirt and green pants. Belonging to the solar army service uniform." + name = "army service uniform" + desc = "A slimming brown service shirt and green pants. Standard service uniform for the SCG Army." icon_state = "under_service" item_state_slots = list( slot_l_hand_str = "under_service_held_l", @@ -85,8 +157,8 @@ /obj/item/clothing/under/scga/service/skirt - name = "service skirt uniform, SCGA" - desc = "A slimming brown service shirt and green skirt. Belonging to the solar army service uniform." + name = "army service skirt" + desc = "A slimming brown service shirt and a green skirt. Standard service uniform for the SCG Army." icon_state = "under_service_skirt" item_state_slots = list( slot_l_hand_str = "under_service_skirt_held_l", @@ -96,7 +168,7 @@ /obj/item/clothing/under/scga/service_command - name = "service uniform, SCGA" + name = "army officer's service uniform" desc = "A slimming brown service shirt and green pants with beige streaks, for senior officers. Belonging to the solar army command service uniform." icon_state = "under_command" item_state_slots = list( @@ -107,7 +179,7 @@ /obj/item/clothing/under/scga/service_command/skirt - name = "service skirt uniform, SCGA" + name = "army officer's service skirt" desc = "A slimming brown service shirt and green skirt with beige streaks, for senior officers. Belonging to the solar army command service uniform." icon_state = "under_command_skirt" item_state_slots = list( @@ -118,7 +190,7 @@ /obj/item/clothing/under/scga/dress - name = "dress uniform, SCGA" + name = "army dress uniform" desc = "A classy brown shirt and black dress pants. Part of the solar army dress uniform." icon_state = "under_dress" item_state_slots = list( @@ -129,7 +201,7 @@ /obj/item/clothing/under/scga/dress/skirt - name = "dress skirt uniform, SCGA" + name = "army dress skirt" desc = "A classy brown shirt and black dress skirt. Part of the solar army dress uniform." icon_state = "under_dress_skirt" item_state_slots = list( @@ -139,7 +211,7 @@ ) /obj/item/clothing/under/scga/dress_command - name = "dress uniform, SCGA" + name = "army officer's dress uniform" desc = "A classy brown shirt and black dress pants with gold streaks, for senior officers. Part of the solar army command dress uniform." icon_state = "under_dress_command" item_state_slots = list( @@ -149,7 +221,7 @@ ) /obj/item/clothing/under/scga/dress_command/skirt - name = "dress skirt uniform, SCGA" + name = "army officer's dress skirt" desc = "A classy brown shirt and black dress skirt with gold streaks, for senior officers. Part of the solar army command dress uniform." icon_state = "under_dress_command_skirt" item_state_slots = list( @@ -177,8 +249,8 @@ /obj/item/clothing/suit/scga/hooded/wintercoat - name = "utility wintercoat, SCGA" - desc = "A comfortable winter-coat in green. Part of the solar army utility uniform." + name = "army utility wintercoat" + desc = "A comfortable, but rather heavy winter coat in green." icon_state = "suit_wintercoat" item_state_slots = list( slot_l_hand_str = "suit_wintercoat_held_l", @@ -192,7 +264,7 @@ /obj/item/clothing/suit/scga/service - name = "service jacket, SCGA" + name = "army service jacket" desc = "A rugged green service over-jacket. Part of the solar army service uniform for enlisted." icon_state = "suit_service" item_state_slots = list( @@ -207,7 +279,7 @@ /obj/item/clothing/suit/scga/service_officer - name = "service jacket, SCGA" + name = "army officer's service jacket" desc = "A rugged green service over-jacket. Part of the solar army service uniform for officers." icon_state = "suit_service_officer" item_state_slots = list( @@ -222,7 +294,7 @@ /obj/item/clothing/suit/scga/dress - name = "dress jacket, SCGA" + name = "army dress jacket" desc = "A strapping dress jacket. Part of the solar army dress uniform." icon_state = "suit_dress" item_state_slots = list( @@ -233,7 +305,7 @@ /obj/item/clothing/suit/scga/dress_command - name = "dress jacket, SCGA" + name = "army officer's dress jacket" desc = "A strapping dress jacket. Part of the solar army dress uniform for senior officers." icon_state = "suit_dress_command" item_state_slots = list( @@ -256,8 +328,8 @@ /obj/item/clothing/gloves/scga/duty - name = "duty gloves, SCGA" - desc = "Tough, brown duty gloves for the solar army personnel. Complete with reinforced knuckle-guards." + name = "army duty gloves" + desc = "Tough, brown duty gloves, Army standard issue. Complete with reinforced knuckles." icon_state = "gloves_utility" item_state_slots = list( slot_l_hand_str = "gloves_utility_held_l", @@ -279,8 +351,8 @@ /obj/item/clothing/shoes/scga/utility - name = "duty boots, SCGA" - desc = "Hardy, strong soled boots in jungle-beige camouflage configuration. Part of the solar army uniform." + name = "jungle duty boots" + desc = "Hardy, strong-soled boots in jungle beige camouflage configuration. Recognisable as SCGA standard-issue." icon_state = "boots_utility" item_state_slots = list( slot_l_hand_str = "boots_utility_held_l", @@ -299,8 +371,8 @@ /obj/item/clothing/shoes/scga/utility/tan - name = "tan duty boots, SCGA" - desc = "Hardy, strong soled boots in dusty-tan camouflage configuration. Part of the solar army uniform." + name = "tan duty boots" + desc = "Hardy, strong-soled boots in dusty tan camouflage configuration. Recognisable as SCGA standard-issue." icon_state = "boots_utility_tan" item_state_slots = list( slot_l_hand_str = "boots_utility_tan_held_l", @@ -310,8 +382,8 @@ /obj/item/clothing/shoes/scga/dress - name = "dress shoes, SCGA" - desc = "Flat, shiny dress shoes belonging to the solar army service and dress uniforms." + name = "army dress shoes" + desc = "Flat, shiny dress shoes. They're actually pre-fabricated with the polish, so you only need to dust them regularly." icon_state = "shoes_dress" item_state_slots = list( slot_l_hand_str = "shoes_dress_held_l", @@ -333,8 +405,8 @@ /obj/item/clothing/head/scga/beret - name = "tan beret, SCGA" - desc = "A tan beret denoting service in the SCG Army Diplomatic Security Group. Part of the solar army utility and service uniform." + name = "army diplo security beret" + desc = "A tan beret denoting service in the SCG Army Diplomatic Security Group. For embassy guards that are more inclined towards style than safety." icon_state = "hat_beret" item_state_slots = list( slot_l_hand_str = "hat_beret_held_l", @@ -344,8 +416,8 @@ /obj/item/clothing/head/scga/utility - name = "utility cover, SCGA" - desc = "A stern, green utility cover. Part of the solar army utility uniform." + name = "army green utility cover" + desc = "A stern, green utility cover with a small SCG Army crest on the front." icon_state = "hat_utility" item_state_slots = list( slot_l_hand_str = "hat_utility_held_l", @@ -355,8 +427,8 @@ /obj/item/clothing/head/scga/utility/tan - name = "tan utility cover, SCGA" - desc = "A stern, tan utility cover. Part of the solar army utility uniform." + name = "army tan utility cover" + desc = "A stern, tan utility cover with a small SCG Army crest on the front." icon_state = "hat_utility_tan" item_state_slots = list( slot_l_hand_str = "hat_utility_tan_held_l", @@ -366,8 +438,8 @@ /obj/item/clothing/head/scga/utility/urban - name = "urban utility cover, SCGA" - desc = "A stern, urban utility cover. Part of the solar army utility uniform." + name = "army urban utility cover" + desc = "A stern, urban utility cover with a small SCG Army crest on the front." icon_state = "hat_utility_urban" item_state_slots = list( slot_l_hand_str = "hat_utility_urban_held_l", @@ -377,8 +449,8 @@ /obj/item/clothing/head/scga/utility/ushanka - name = "ushanka hat, SCGA" - desc = "A comfy, padded ushanka hat. Part of the solar army utility uniform." + name = "army ushanka hat" + desc = "A comfy, padded ushanka hat with a small SCG Army crest on the front." icon_state = "hat_ushanka" item_state_slots = list( slot_l_hand_str = "hat_ushanka_held_l", @@ -388,8 +460,8 @@ /obj/item/clothing/head/scga/utility/ushanka/green - name = "ushanka hat, SCGA" - desc = "A comfy, padded ushanka hat in green. Part of the solar army utility uniform." + name = "green army ushanka hat" + desc = "A comfy, padded ushanka hat in green with a small SCG Army crest on the front." icon_state = "hat_ushanka_green" item_state_slots = list( slot_l_hand_str = "hat_ushanka_green_held_l", @@ -399,8 +471,8 @@ /obj/item/clothing/head/scga/utility/drill - name = "drill hat, SCGA" - desc = "A firm, green drill hat for non-commissioned officers. Part of the solar army utility and service uniform." + name = "drill sergeant's hat" + desc = "A firm green drill hat for senior non-commissioned officers. Perfect for sipping your morning coffee and yelling at recruits." icon_state = "hat_drill" item_state_slots = list( slot_l_hand_str = "hat_drill_held_l", @@ -410,8 +482,8 @@ /obj/item/clothing/head/scga/service/garrison - name = "garrison cap, SCGA" - desc = "A peaked garrison cap for enlisted. Part of the solar army service uniform." + name = "army garrison cap" + desc = "A peaked garrison cap for enlisted with a small SCG Army crest on the front." icon_state = "hat_garrison" item_state_slots = list( slot_l_hand_str = "hat_garrison_held_l", @@ -421,8 +493,8 @@ /obj/item/clothing/head/scga/service/garrison_officer - name = "garrison cap, SCGA" - desc = "A peaked garrison cap for officers. Part of the solar army service uniform." + name = "army garrison cap" + desc = "A peaked garrison cap for officers with a small SCG Army crest on the front." icon_state = "hat_garrison_officer" item_state_slots = list( slot_l_hand_str = "hat_garrison_officer_held_l", @@ -432,8 +504,8 @@ /obj/item/clothing/head/scga/service/wheel - name = "service wheel cover, SCGA" - desc = "A rounded wheel cover for officers. Part of the solar army service uniform." + name = "army service wheel cover" + desc = "A rounded wheel cover for officers with a small SCG Army crest on the front." icon_state = "hat_wheel" item_state_slots = list( slot_l_hand_str = "hat_wheel_held_l", @@ -443,8 +515,8 @@ /obj/item/clothing/head/scga/service/wheel_command - name = "service wheel cover, SCGA" - desc = "A rounded wheel cover for senior officers. Part of the solar army service uniform." + name = "army service wheel cover" + desc = "A rounded wheel cover for senior officers with a small SCG Army crest on the front." icon_state = "hat_wheel_command" item_state_slots = list( slot_l_hand_str = "hat_wheel_command_held_l", @@ -454,8 +526,8 @@ /obj/item/clothing/head/scga/dress/garrison - name = "dress garrison cap, SCGA" - desc = "A white, peaked garrison cap for enlisted. Part of the solar army dress uniform." + name = "army dress garrison cap" + desc = "A white, peaked garrison cap for enlisted with a small SCG Army crest on the front." icon_state = "hat_dress_garrison" item_state_slots = list( slot_l_hand_str = "hat_dress_garrison_held_l", @@ -465,8 +537,8 @@ /obj/item/clothing/head/scga/dress/wheel - name = "dress wheel cover, SCGA" - desc = "A white, rounded wheel cover for officers. Part of the solar army dress uniform." + name = "army dress wheel cover" + desc = "A white, rounded wheel cover for officers with a small SCG Army crest on the front." icon_state = "hat_dress_wheel" item_state_slots = list( slot_l_hand_str = "hat_dress_wheel_held_l", @@ -476,11 +548,90 @@ /obj/item/clothing/head/scga/dress/wheel_command - name = "dress wheel cover, SCGA" - desc = "A white, rounded wheel cover for senior officers. Part of the solar army dress uniform." + name = "army dress wheel cover" + desc = "A white, rounded wheel cover for senior officers with a small SCG Army crest on the front." icon_state = "hat_dress_wheel_command" item_state_slots = list( slot_l_hand_str = "hat_dress_wheel_command_held_l", slot_r_hand_str = "hat_dress_wheel_command_held_r", slot_head_str = "hat_dress_wheel_command_worn" ) + +//fancy berets +/obj/item/clothing/head/scga/beret/firstinf + name = "first infantry beret" + desc = "A black beret carrying insignia of SCG Army First Infantry Division, the current active Earth PDF and Gaia force. For infantrymen that are more inclined towards style than safety." + icon_state = "beret_firstinf" + item_state_slots = list( + slot_l_hand_str = "hat_utility_tan_held_l", + slot_r_hand_str = "hat_utility_tan_held_r", + slot_head_str = "beret_firstinf_worn" + ) + +/obj/item/clothing/head/scga/beret/airborne + name = "first airborne beret" + desc = "A red beret carrying insignia of SCG Army First Airborne Division, the main planetary air unit. For pilots that are more inclined towards style than safety." + icon_state = "beret_air" + item_state_slots = list( + slot_l_hand_str = "hat_utility_tan_held_l", + slot_r_hand_str = "hat_utility_tan_held_r", + slot_head_str = "beret_air_worn" + ) + +/obj/item/clothing/head/scga/beret/secondinf + name = "second infantry beret" + desc = "A black beret carrying insignia of SCG Army Second Infantry Division, the main peacekeeping and excercise unit off-Gaia. For infantrymen that are more inclined towards style than safety." + icon_state = "beret_secondinf" + item_state_slots = list( + slot_l_hand_str = "hat_utility_tan_held_l", + slot_r_hand_str = "hat_utility_tan_held_r", + slot_head_str = "beret_secondinf_worn" + ) + +/obj/item/clothing/head/scga/beret/firstcav + name = "first cavalry beret" + desc = "An olive beret carrying insignia of SCG Army First Cavalry Division, the mechanized unit tasked with assisting both infantry divisions. For mech pilots that are more inclined towards style than safety." + icon_state = "beret_firstcav" + item_state_slots = list( + slot_l_hand_str = "hat_utility_tan_held_l", + slot_r_hand_str = "hat_utility_tan_held_r", + slot_head_str = "beret_firstcav_worn" + ) + +/obj/item/clothing/head/scga/beret/firstarm + name = "first armored beret" + desc = "An olive beret carrying insignia of SCG Army First Armored Division, the smallest active unit tasked with heavy combat support. For tank crews that are more inclined towards style than safety." + icon_state = "beret_firstarm" + item_state_slots = list( + slot_l_hand_str = "hat_utility_tan_held_l", + slot_r_hand_str = "hat_utility_tan_held_r", + slot_head_str = "beret_firstarm_worn" + ) + +/obj/item/clothing/head/scga/beret/maritime + name = "army maritime corps beret" + desc = "An olive beret carrying insignia of SCG Army Maritime Corps, the waterborne navy stationed on Gaia. For sailors that are more inclined towards style than safety." + icon_state = "beret_maritime" + item_state_slots = list( + slot_l_hand_str = "hat_utility_tan_held_l", + slot_r_hand_str = "hat_utility_tan_held_r", + slot_head_str = "beret_maritime_worn" + ) + +//loadout injection +/datum/gear/head/armyberet + display_name = "army beret selection" + description = "A beret denoting service in one of the divisions within the SCG Army." + path = /obj/item/clothing/head/scga/beret + allowed_branches = list(/datum/mil_branch/scga) + +/datum/gear/head/armyberet/New() + ..() + var/berets = list() + berets["first infantry beret"] = /obj/item/clothing/head/scga/beret/firstinf + berets["first airborne beret"] = /obj/item/clothing/head/scga/beret/airborne + berets["second infantry beret"] = /obj/item/clothing/head/scga/beret/secondinf + berets["first cavalry beret"] = /obj/item/clothing/head/scga/beret/firstcav + berets["first armored beret"] = /obj/item/clothing/head/scga/beret/firstarm + berets["maritime corps beret"] = /obj/item/clothing/head/scga/beret/maritime + gear_tweaks += new/datum/gear_tweak/path(berets) \ No newline at end of file diff --git a/packs/factions/scga/clothing.dmi b/packs/factions/scga/clothing.dmi index 81e36a4699a8f..3306c1851306c 100644 Binary files a/packs/factions/scga/clothing.dmi and b/packs/factions/scga/clothing.dmi differ diff --git a/packs/factions/scga/faction.dm b/packs/factions/scga/faction.dm index e84cab0e02958..e4776c7733289 100644 --- a/packs/factions/scga/faction.dm +++ b/packs/factions/scga/faction.dm @@ -1,5 +1,5 @@ /datum/mil_branch/scga - name = "Sol Central Government Army" + name = "Army" name_short = "SCGA" email_domain = "army.mil.scg" assistant_job = null @@ -11,6 +11,7 @@ rank_types = list( /datum/mil_rank/scga/e1, + /datum/mil_rank/scga/e2, /datum/mil_rank/scga/e3, /datum/mil_rank/scga/e4, /datum/mil_rank/scga/e5, @@ -35,7 +36,7 @@ ) spawn_rank_types = list( - /datum/mil_rank/scga/e1, + /datum/mil_rank/scga/e2, /datum/mil_rank/scga/e3, /datum/mil_rank/scga/e4, /datum/mil_rank/scga/e5, @@ -66,21 +67,21 @@ /datum/mil_rank/scga/e1 - name = "Private" - name_short = "Pvt" + name = "Recruit" + name_short = "Rct" accessory = list( /obj/item/clothing/accessory/scga_rank/e1 ) - sort_order = 10 + sort_order = 1 /datum/mil_rank/scga/e2 - name = "Private Second Class" - name_short = "Pv2" + name = "Private" + name_short = "Pvt" accessory = list( /obj/item/clothing/accessory/scga_rank/e2 ) - sort_order = 20 + sort_order = 2 /datum/mil_rank/scga/e3 @@ -89,7 +90,7 @@ accessory = list( /obj/item/clothing/accessory/scga_rank/e3 ) - sort_order = 30 + sort_order = 3 /datum/mil_rank/scga/e4 @@ -98,7 +99,15 @@ accessory = list( /obj/item/clothing/accessory/scga_rank/e4 ) - sort_order = 40 + sort_order = 4 + +/datum/mil_rank/scga/e4_alt + name = "Specialist" + name_short = "Spc" + accessory = list( + /obj/item/clothing/accessory/scga_rank/e4_alt + ) + sort_order = 4 /datum/mil_rank/scga/e5 @@ -107,7 +116,7 @@ accessory = list( /obj/item/clothing/accessory/scga_rank/e5 ) - sort_order = 50 + sort_order = 5 /datum/mil_rank/scga/e6 @@ -116,7 +125,7 @@ accessory = list( /obj/item/clothing/accessory/scga_rank/e6 ) - sort_order = 60 + sort_order = 6 /datum/mil_rank/scga/e7 @@ -125,7 +134,7 @@ accessory = list( /obj/item/clothing/accessory/scga_rank/e7 ) - sort_order = 70 + sort_order = 7 /datum/mil_rank/scga/e8 @@ -134,7 +143,7 @@ accessory = list( /obj/item/clothing/accessory/scga_rank/e8 ) - sort_order = 80 + sort_order = 8 /datum/mil_rank/scga/e8_alt @@ -143,7 +152,7 @@ accessory = list( /obj/item/clothing/accessory/scga_rank/e8_alt ) - sort_order = 90 + sort_order = 9 /datum/mil_rank/scga/e9 @@ -152,7 +161,7 @@ accessory = list( /obj/item/clothing/accessory/scga_rank/e9 ) - sort_order = 100 + sort_order = 10 /datum/mil_rank/scga/e9_alt1 @@ -161,7 +170,7 @@ accessory = list( /obj/item/clothing/accessory/scga_rank/e9_alt1 ) - sort_order = 110 + sort_order = 11 /datum/mil_rank/scga/e9_alt2 @@ -170,103 +179,103 @@ accessory = list( /obj/item/clothing/accessory/scga_rank/e9_alt2 ) - sort_order = 120 + sort_order = 12 /datum/mil_rank/scga/o1 name = "Second Lieutenant" - name_short = "2Lt" + name_short = "2LT" accessory = list( /obj/item/clothing/accessory/scga_rank/o1 ) - sort_order = 130 + sort_order = 13 /datum/mil_rank/scga/o2 name = "First Lieutenant" - name_short = "1Lt" + name_short = "1LT" accessory = list( /obj/item/clothing/accessory/scga_rank/o2 ) - sort_order = 140 + sort_order = 14 /datum/mil_rank/scga/o3 - name = "Captain" - name_short = "Cpt" + name = "Army Captain" + name_short = "ACPT" accessory = list( /obj/item/clothing/accessory/scga_rank/o3 ) - sort_order = 150 + sort_order = 15 /datum/mil_rank/scga/o4 name = "Major" - name_short = "Mjr" + name_short = "MAJ" accessory = list( /obj/item/clothing/accessory/scga_rank/o4 ) - sort_order = 160 + sort_order = 16 /datum/mil_rank/scga/o5 name = "Lieutenant Colonel" - name_short = "LtC" + name_short = "LTC" accessory = list( /obj/item/clothing/accessory/scga_rank/o5 ) - sort_order = 170 + sort_order = 17 /datum/mil_rank/scga/o6 name = "Colonel" - name_short = "Col" + name_short = "COL" accessory = list( /obj/item/clothing/accessory/scga_rank/o6 ) - sort_order = 180 + sort_order = 18 /datum/mil_rank/scga/o7 name = "Brigadier General" - name_short = "BrgG" + name_short = "BRG" accessory = list( /obj/item/clothing/accessory/scga_rank/o7 ) - sort_order = 190 + sort_order = 19 /datum/mil_rank/scga/o8 name = "Major General" - name_short = "MjrG" + name_short = "MAJG" accessory = list( /obj/item/clothing/accessory/scga_rank/o8 ) - sort_order = 200 + sort_order = 20 /datum/mil_rank/scga/o9 name = "Lieutenant General" - name_short = "LtG" + name_short = "LTG" accessory = list( /obj/item/clothing/accessory/scga_rank/o9 ) - sort_order = 210 + sort_order = 21 /datum/mil_rank/scga/o10 name = "General" - name_short = "Gen" + name_short = "GEN" accessory = list( /obj/item/clothing/accessory/scga_rank/o10 ) - sort_order = 220 + sort_order = 22 /datum/mil_rank/scga/o10_alt - name = "Field-Marshal" - name_short = "FldM" + name = "Field Marshal" + name_short = "FLDM" accessory = list( /obj/item/clothing/accessory/scga_rank/o10_alt ) - sort_order = 230 + sort_order = 23 diff --git a/packs/factions/scga/outfits.dm b/packs/factions/scga/outfits.dm index eb26cfa27d6bd..a5f14121e1639 100644 --- a/packs/factions/scga/outfits.dm +++ b/packs/factions/scga/outfits.dm @@ -135,3 +135,391 @@ uniform = /obj/item/clothing/under/scga/dress_command/skirt suit = /obj/item/clothing/suit/scga/dress_command shoes = /obj/item/clothing/shoes/scga/dress + +//outfits for Torch-bound SCGA servicemen +/singleton/hierarchy/mil_uniform/army + name = "Master army outfit" + hierarchy_type = /singleton/hierarchy/mil_uniform/army + branches = list(/datum/mil_branch/scga) + + pt_under = /obj/item/clothing/under/scga/pt + pt_shoes = /obj/item/clothing/shoes/brown + + utility_under = /obj/item/clothing/under/scga/utility/urban + utility_shoes = /obj/item/clothing/shoes/dutyboots + utility_hat = /obj/item/clothing/head/scga/utility/urban + utility_extra = list(/obj/item/clothing/head/scga/utility/ushanka, /obj/item/clothing/head/scga/utility/ushanka/green, /obj/item/clothing/suit/scga/hooded/wintercoat) + + service_under = /obj/item/clothing/under/scga/service + service_skirt = /obj/item/clothing/under/scga/service/skirt + service_over = /obj/item/clothing/suit/scga/service + service_shoes = /obj/item/clothing/shoes/dress + service_hat = /obj/item/clothing/head/scga/service/wheel + service_extra = list(/obj/item/clothing/head/scga/dress/garrison) + + dress_under = /obj/item/clothing/under/scga/dress + dress_skirt = /obj/item/clothing/under/scga/dress/skirt + dress_over = /obj/item/clothing/suit/scga/dress + dress_shoes = /obj/item/clothing/shoes/dress + dress_hat = /obj/item/clothing/head/scga/dress/wheel + dress_gloves = /obj/item/clothing/gloves/white + +/singleton/hierarchy/mil_uniform/army/com //Can only be officers + name = "Army command" + departments = COM + + utility_under = /obj/item/clothing/under/scga/utility/urban/command + utility_extra = list(/obj/item/clothing/head/scga/utility/ushanka/green, + /obj/item/clothing/head/scga/utility/ushanka, + /obj/item/clothing/suit/scga/hooded/wintercoat, + /obj/item/clothing/under/scga/utility/command, + /obj/item/clothing/under/scga/utility/tan/command, + /obj/item/clothing/head/scga/utility, + /obj/item/clothing/head/scga/utility/tan, + /obj/item/clothing/gloves/thick) + + service_under = /obj/item/clothing/under/scga/service + service_skirt = /obj/item/clothing/under/scga/service/skirt + service_over = /obj/item/clothing/suit/scga/service_officer + service_hat = /obj/item/clothing/head/scga/service/wheel_command + service_extra = list(/obj/item/clothing/head/scga/service/garrison_officer) + + dress_under = /obj/item/clothing/under/scga/dress + dress_skirt = /obj/item/clothing/under/scga/dress/skirt + dress_over = /obj/item/clothing/suit/scga/dress_command + dress_hat = /obj/item/clothing/head/scga/dress/wheel_command + dress_extra = list(/obj/item/material/sword/replica/officersword/scga/officer) + +/singleton/hierarchy/mil_uniform/army/eng + name = "Army engineering" + departments = ENG + + utility_extra = list(/obj/item/clothing/head/scga/utility/ushanka/green, + /obj/item/clothing/head/scga/utility/ushanka, + /obj/item/clothing/suit/scga/hooded/wintercoat, + /obj/item/clothing/under/scga/utility/engineering, + /obj/item/clothing/under/scga/utility/tan/engineering, + /obj/item/clothing/head/scga/utility, + /obj/item/clothing/head/scga/utility/tan, + /obj/item/clothing/gloves/thick) + utility_under = /obj/item/clothing/under/scga/utility/urban/engineering + + +/singleton/hierarchy/mil_uniform/army/eng/sword + name = "Army NCO sword engineering" + min_rank = 4 + + dress_extra = list(/obj/item/material/sword/replica/officersword/scga) + +/singleton/hierarchy/mil_uniform/army/eng/officer + name = "Army engineering CO" + min_rank = 11 + + utility_extra = list(/obj/item/clothing/head/scga/utility/ushanka/green, + /obj/item/clothing/head/scga/utility/ushanka, + /obj/item/clothing/suit/scga/hooded/wintercoat, + /obj/item/clothing/under/scga/utility/engineering, + /obj/item/clothing/under/scga/utility/tan/engineering, + /obj/item/clothing/head/scga/utility, + /obj/item/clothing/head/scga/utility/tan, + /obj/item/clothing/gloves/thick) + + service_under = /obj/item/clothing/under/scga/service + service_skirt = /obj/item/clothing/under/scga/service/skirt + service_over = /obj/item/clothing/suit/scga/service_officer + service_hat = /obj/item/clothing/head/scga/service/wheel_command + service_extra = list(/obj/item/clothing/head/scga/service/garrison_officer) + + dress_under = /obj/item/clothing/under/scga/dress + dress_skirt = /obj/item/clothing/under/scga/dress/skirt + dress_over = /obj/item/clothing/suit/scga/dress_command + dress_hat = /obj/item/clothing/head/scga/dress/wheel_command + dress_extra = list(/obj/item/material/sword/replica/officersword/scga/officer) + +/singleton/hierarchy/mil_uniform/army/eng/officer/com //Can only be officers + name = "Army engineering command" + departments = ENG|COM + +/singleton/hierarchy/mil_uniform/army/sec + name = "Army security" + departments = SEC + + utility_under = /obj/item/clothing/under/scga/utility/urban/security + utility_extra = list(/obj/item/clothing/head/scga/utility/ushanka/green, + /obj/item/clothing/head/scga/utility/ushanka, + /obj/item/clothing/suit/scga/hooded/wintercoat, + /obj/item/clothing/under/scga/utility/security, + /obj/item/clothing/under/scga/utility/tan/security, + /obj/item/clothing/head/scga/utility, + /obj/item/clothing/head/scga/utility/tan, + /obj/item/clothing/gloves/thick) + +/singleton/hierarchy/mil_uniform/army/sec/sword + name = "Army NCO sword security" + min_rank = 4 + + dress_extra = list(/obj/item/material/sword/replica/officersword/scga) + +/singleton/hierarchy/mil_uniform/army/sec/officer + name = "Army security CO" + min_rank = 11 + + utility_extra = list(/obj/item/clothing/head/scga/utility/ushanka/green, + /obj/item/clothing/head/scga/utility/ushanka, + /obj/item/clothing/suit/scga/hooded/wintercoat, + /obj/item/clothing/under/scga/utility/security, + /obj/item/clothing/under/scga/utility/tan/security, + /obj/item/clothing/head/scga/utility, + /obj/item/clothing/head/scga/utility/tan, + /obj/item/clothing/gloves/thick) + + service_under = /obj/item/clothing/under/scga/service + service_skirt = /obj/item/clothing/under/scga/service/skirt + service_over = /obj/item/clothing/suit/scga/service_officer + service_hat = /obj/item/clothing/head/scga/service/wheel_command + service_extra = list(/obj/item/clothing/head/scga/service/garrison_officer) + + dress_under = /obj/item/clothing/under/scga/dress + dress_skirt = /obj/item/clothing/under/scga/dress/skirt + dress_over = /obj/item/clothing/suit/scga/dress_command + dress_hat = /obj/item/clothing/head/scga/dress/wheel_command + dress_extra = list(/obj/item/material/sword/replica/officersword/scga/officer) + +/singleton/hierarchy/mil_uniform/army/sec/officer/com //Can only be officers + name = "Army security command" + departments = SEC|COM + +/singleton/hierarchy/mil_uniform/army/med + name = "Army medical" + departments = MED + + utility_under = /obj/item/clothing/under/scga/utility/urban/medical + utility_extra = list(/obj/item/clothing/head/scga/utility/ushanka/green, + /obj/item/clothing/head/scga/utility/ushanka, + /obj/item/clothing/suit/scga/hooded/wintercoat, + /obj/item/clothing/under/scga/utility/medical, + /obj/item/clothing/under/scga/utility/tan/medical, + /obj/item/clothing/head/scga/utility, + /obj/item/clothing/head/scga/utility/tan, + /obj/item/clothing/gloves/thick) + +/singleton/hierarchy/mil_uniform/army/med/sword + name = "Army NCO sword medical" + min_rank = 4 + + dress_extra = list(/obj/item/material/sword/replica/officersword/scga) + +/singleton/hierarchy/mil_uniform/army/med/officer + name = "Army medical CO" + min_rank = 11 + + utility_extra = list(/obj/item/clothing/head/scga/utility/ushanka/green, + /obj/item/clothing/head/scga/utility/ushanka, + /obj/item/clothing/suit/scga/hooded/wintercoat, + /obj/item/clothing/under/scga/utility/medical, + /obj/item/clothing/under/scga/utility/tan/medical, + /obj/item/clothing/head/scga/utility, + /obj/item/clothing/head/scga/utility/tan, + /obj/item/clothing/gloves/thick) + + service_under = /obj/item/clothing/under/scga/service + service_skirt = /obj/item/clothing/under/scga/service/skirt + service_over = /obj/item/clothing/suit/scga/service_officer + service_hat = /obj/item/clothing/head/scga/service/wheel_command + service_extra = list(/obj/item/clothing/head/scga/service/garrison_officer) + + dress_under = /obj/item/clothing/under/scga/dress + dress_skirt = /obj/item/clothing/under/scga/dress/skirt + dress_over = /obj/item/clothing/suit/scga/dress_command + dress_hat = /obj/item/clothing/head/scga/dress/wheel_command + dress_extra = list(/obj/item/material/sword/replica/officersword/scga/officer) + +/singleton/hierarchy/mil_uniform/army/med/officer/com //Can only be officers + name = "Army medical command" + departments = MED|COM + +/singleton/hierarchy/mil_uniform/army/sup + name = "Army supply" + departments = SUP + + utility_under = /obj/item/clothing/under/scga/utility/urban/supply + utility_extra = list(/obj/item/clothing/head/scga/utility/ushanka/green, + /obj/item/clothing/head/scga/utility/ushanka, + /obj/item/clothing/suit/scga/hooded/wintercoat, + /obj/item/clothing/under/scga/utility/supply, + /obj/item/clothing/under/scga/utility/tan/supply, + /obj/item/clothing/head/scga/utility, + /obj/item/clothing/head/scga/utility/tan, + /obj/item/clothing/gloves/thick) + +/singleton/hierarchy/mil_uniform/army/sup/sword + name = "Army NCO sword supply" + min_rank = 4 + + dress_extra = list(/obj/item/material/sword/replica/officersword/scga) + +/singleton/hierarchy/mil_uniform/army/sup/officer + name = "Army supply CO" + min_rank = 11 + + utility_extra = list(/obj/item/clothing/head/scga/utility/ushanka/green, + /obj/item/clothing/head/scga/utility/ushanka, + /obj/item/clothing/suit/scga/hooded/wintercoat, + /obj/item/clothing/under/scga/utility/supply, + /obj/item/clothing/under/scga/utility/tan/supply, + /obj/item/clothing/head/scga/utility, + /obj/item/clothing/head/scga/utility/tan, + /obj/item/clothing/gloves/thick) + + service_under = /obj/item/clothing/under/scga/service + service_skirt = /obj/item/clothing/under/scga/service/skirt + service_over = /obj/item/clothing/suit/scga/service_officer + service_hat = /obj/item/clothing/head/scga/service/wheel_command + service_extra = list(/obj/item/clothing/head/scga/service/garrison_officer) + + dress_under = /obj/item/clothing/under/scga/dress + dress_skirt = /obj/item/clothing/under/scga/dress/skirt + dress_over = /obj/item/clothing/suit/scga/dress_command + dress_hat = /obj/item/clothing/head/scga/dress/wheel_command + dress_extra = list(/obj/item/material/sword/replica/officersword/scga/officer) + +/singleton/hierarchy/mil_uniform/army/srv + name = "Army service" + departments = SRV + + utility_under = /obj/item/clothing/under/scga/utility/urban/service + utility_extra = list(/obj/item/clothing/head/scga/utility/ushanka/green, + /obj/item/clothing/head/scga/utility/ushanka, + /obj/item/clothing/suit/scga/hooded/wintercoat, + /obj/item/clothing/under/scga/utility/service, + /obj/item/clothing/under/scga/utility/tan/service, + /obj/item/clothing/head/scga/utility, + /obj/item/clothing/head/scga/utility/tan, + /obj/item/clothing/gloves/thick) + +/singleton/hierarchy/mil_uniform/army/srv/sword + name = "Army NCO sword service" + min_rank = 4 + + dress_extra = list(/obj/item/material/sword/replica/officersword/scga) + +/singleton/hierarchy/mil_uniform/army/srv/officer + name = "Army service CO" + min_rank = 11 + + utility_extra = list(/obj/item/clothing/head/scga/utility/ushanka/green, + /obj/item/clothing/head/scga/utility/ushanka, + /obj/item/clothing/suit/scga/hooded/wintercoat, + /obj/item/clothing/under/scga/utility/service, + /obj/item/clothing/under/scga/utility/tan/service, + /obj/item/clothing/head/scga/utility, + /obj/item/clothing/head/scga/utility/tan, + /obj/item/clothing/gloves/thick) + + + service_under = /obj/item/clothing/under/scga/service + service_skirt = /obj/item/clothing/under/scga/service/skirt + service_over = /obj/item/clothing/suit/scga/service_officer + service_hat = /obj/item/clothing/head/scga/service/wheel_command + service_extra = list(/obj/item/clothing/head/scga/service/garrison_officer) + + dress_under = /obj/item/clothing/under/scga/dress + dress_skirt = /obj/item/clothing/under/scga/dress/skirt + dress_over = /obj/item/clothing/suit/scga/dress_command + dress_hat = /obj/item/clothing/head/scga/dress/wheel_command + dress_extra = list(/obj/item/material/sword/replica/officersword/scga/officer) + +/singleton/hierarchy/mil_uniform/army/exp + name = "Army exploration" + departments = EXP + + utility_under = /obj/item/clothing/under/scga/utility/urban/exploration + utility_extra = list(/obj/item/clothing/head/scga/utility/ushanka/green, + /obj/item/clothing/head/scga/utility/ushanka, + /obj/item/clothing/suit/scga/hooded/wintercoat, + /obj/item/clothing/under/scga/utility/exploration, + /obj/item/clothing/under/scga/utility/tan/exploration, + /obj/item/clothing/head/scga/utility, + /obj/item/clothing/head/scga/utility/tan, + /obj/item/clothing/gloves/thick) + + +/singleton/hierarchy/mil_uniform/army/exp/sword + name = "Army NCO sword exploration" + min_rank = 4 + + dress_extra = list(/obj/item/material/sword/replica/officersword/scga) + +/singleton/hierarchy/mil_uniform/army/exp/officer + name = "Army exploration CO" + min_rank = 11 + + utility_extra = list(/obj/item/clothing/head/scga/utility/ushanka/green, + /obj/item/clothing/head/scga/utility/ushanka, + /obj/item/clothing/suit/scga/hooded/wintercoat, + /obj/item/clothing/under/scga/utility/exploration, + /obj/item/clothing/under/scga/utility/tan/exploration, + /obj/item/clothing/head/scga/utility, + /obj/item/clothing/head/scga/utility/tan, + /obj/item/clothing/gloves/thick) + + service_under = /obj/item/clothing/under/scga/service + service_skirt = /obj/item/clothing/under/scga/service/skirt + service_over = /obj/item/clothing/suit/scga/service_officer + service_hat = /obj/item/clothing/head/scga/service/wheel_command + service_extra = list(/obj/item/clothing/head/scga/service/garrison_officer) + + dress_under = /obj/item/clothing/under/scga/dress + dress_skirt = /obj/item/clothing/under/scga/dress/skirt + dress_over = /obj/item/clothing/suit/scga/dress_command + dress_hat = /obj/item/clothing/head/scga/dress/wheel_command + dress_extra = list(/obj/item/material/sword/replica/officersword/scga/officer) + +/singleton/hierarchy/mil_uniform/army/spt + name = "Army command support" + departments = SPT + + utility_under = /obj/item/clothing/under/scga/utility/urban/command + utility_extra = list(/obj/item/clothing/head/scga/utility/ushanka/green, + /obj/item/clothing/head/scga/utility/ushanka, + /obj/item/clothing/suit/scga/hooded/wintercoat, + /obj/item/clothing/under/scga/utility/command, + /obj/item/clothing/under/scga/utility/tan/command, + /obj/item/clothing/head/scga/utility, + /obj/item/clothing/head/scga/utility/tan, + /obj/item/clothing/gloves/thick) + + service_extra = list(/obj/item/clothing/head/scga/service/garrison) + + dress_extra = list(/obj/item/material/sword/replica/officersword/scga) + +/singleton/hierarchy/mil_uniform/army/spt/officer + name = "Army command support CO" + min_rank = 11 + + utility_extra = list(/obj/item/clothing/head/scga/utility/ushanka/green, + /obj/item/clothing/head/scga/utility/ushanka, + /obj/item/clothing/suit/scga/hooded/wintercoat, + /obj/item/clothing/under/scga/utility/command, + /obj/item/clothing/under/scga/utility/tan/command, + /obj/item/clothing/head/scga/utility, + /obj/item/clothing/head/scga/utility/tan, + /obj/item/clothing/gloves/thick) + + service_under = /obj/item/clothing/under/scga/service + service_skirt = /obj/item/clothing/under/scga/service/skirt + service_over = /obj/item/clothing/suit/scga/service_officer + service_hat = /obj/item/clothing/head/scga/service/wheel_command + service_extra = list(/obj/item/clothing/head/scga/service/garrison_officer) + + dress_under = /obj/item/clothing/under/scga/dress + dress_skirt = /obj/item/clothing/under/scga/dress/skirt + dress_over = /obj/item/clothing/suit/scga/dress_command + dress_hat = /obj/item/clothing/head/scga/dress/wheel_command + dress_extra = list(/obj/item/material/sword/replica/officersword/scga/officer) + +/singleton/hierarchy/mil_uniform/army/sargehat + name = "Army Sergeant's Hat" + min_rank = 5 + + service_extra = list(/obj/item/clothing/head/scga/utility/drill) diff --git a/packs/factions/scga/ranks.dm b/packs/factions/scga/ranks.dm index cc48e91642310..ff1ab708b6537 100644 --- a/packs/factions/scga/ranks.dm +++ b/packs/factions/scga/ranks.dm @@ -24,159 +24,165 @@ /obj/item/clothing/accessory/scga_rank/e1 - name = "rank insignia, E1 Private" - desc = "Collar tabs denoting the SCGA E-1 rank of Private." + name = "ranks (E-1 recruit)" + desc = "Collar pins denoting the SCGA E-1 rank of Recruit." icon_state = "e" overlay_state = "e_worn" /obj/item/clothing/accessory/scga_rank/e2 - name = "rank insignia, E2 Private Second Class" - desc = "Collar tabs denoting the SCGA E-2 rank of Private Second Class." - icon_state = "e" + name = "ranks (E-2 private)" + desc = "Collar pins denoting the SCGA E-2 rank of Private." + icon_state = "e2_device" overlay_state = "e_worn" /obj/item/clothing/accessory/scga_rank/e3 - name = "rank insignia, E3 Private First Class" - desc = "Collar tabs denoting the SCGA E-3 rank of Private First Class." - icon_state = "e" + name = "ranks (E-3 private first class)" + desc = "Collar pins denoting the SCGA E-3 rank of Private First Class." + icon_state = "e3_device" overlay_state = "e_worn" /obj/item/clothing/accessory/scga_rank/e4 - name = "rank insignia, E4 Corporal" - desc = "Collar tabs denoting the SCGA E-4 rank of Corporal." - icon_state = "e" + name = "ranks (E-4 corporal)" + desc = "Collar pins denoting the SCGA E-4 rank of Corporal." + icon_state = "e4_device" + overlay_state = "e_worn" + +/obj/item/clothing/accessory/scga_rank/e4_alt + name = "ranks (E-4 specialist)" + desc = "Collar pins denoting the SCGA alternative E-4 rank of Specialist." + icon_state = "e4_device" overlay_state = "e_worn" /obj/item/clothing/accessory/scga_rank/e5 - name = "rank insignia, E5 Sergeant" - desc = "Collar tabs denoting the SCGA E-5 rank of Sergeant." - icon_state = "e" + name = "ranks (E-5 sergeant)" + desc = "Collar pins denoting the SCGA E-5 rank of Sergeant." + icon_state = "e5_device" overlay_state = "e_worn" /obj/item/clothing/accessory/scga_rank/e6 - name = "rank insignia, E6 Staff Sergeant" - desc = "Collar tabs denoting the SCGA E-6 rank of Staff Sergeant." - icon_state = "e" + name = "ranks (E-6 staff sergeant)" + desc = "Collar pins denoting the SCGA E-6 rank of Staff Sergeant." + icon_state = "e6_device" overlay_state = "e_worn" /obj/item/clothing/accessory/scga_rank/e7 - name = "rank insignia, E7 Sergeant First Class" - desc = "Collar tabs denoting the SCGA E-7 rank of Sergeant First Class." - icon_state = "e" + name = "ranks (E-7 sergeant first class)" + desc = "Collar pins denoting the SCGA E-7 rank of Sergeant First Class." + icon_state = "e7_device" overlay_state = "e_worn" /obj/item/clothing/accessory/scga_rank/e8 - name = "rank insignia, E8 Master Sergeant" - desc = "Collar tabs denoting the SCGA E-8 rank of Master Sergeant." - icon_state = "e" + name = "ranks (E-8 master sergeant)" + desc = "Collar pins denoting the SCGA E-8 rank of Master Sergeant." + icon_state = "e8_device" overlay_state = "e_worn" /obj/item/clothing/accessory/scga_rank/e8_alt - name = "rank insignia, E8 First Sergeant" - desc = "Collar tabs denoting the SCGA E-8 rank of First Sergeant." - icon_state = "e" + name = "ranks (E-8 first sergeant)" + desc = "Collar pins denoting the SCGA E-8 rank of First Sergeant." + icon_state = "e8_device" overlay_state = "e_worn" /obj/item/clothing/accessory/scga_rank/e9 - name = "rank insignia, E9 Sergeant Major" - desc = "Collar tabs denoting the SCGA E-9 rank of Sergeant Major." - icon_state = "e" + name = "ranks (E-9 sergeant major)" + desc = "Collar pins denoting the SCGA E-9 rank of Sergeant Major." + icon_state = "e9_device" overlay_state = "e_worn" /obj/item/clothing/accessory/scga_rank/e9_alt1 - name = "rank insignia, E9 Command Sergeant Major" - desc = "Collar tabs denoting the SCGA E-9 rank of Command Sergeant Major." - icon_state = "e" + name = "ranks (E-9 command sergeant major)" + desc = "Collar pins denoting the SCGA E-9 rank of Command Sergeant Major." + icon_state = "e9_device" overlay_state = "e_worn" /obj/item/clothing/accessory/scga_rank/e9_alt2 - name = "rank insignia, E9 Sergeant Major of the Army" - desc = "Collar tabs denoting the SCGA E-9 rank of Sergeant Major of the Army." - icon_state = "e" + name = "ranks (E-9 sergeant major of the army)" + desc = "Collar pins denoting the SCGA E-9 rank of Sergeant Major of the Army." + icon_state = "e9_device" overlay_state = "e_worn" /obj/item/clothing/accessory/scga_rank/o1 - name = "rank insignia, O1 Second Lieutenant" - desc = "Collar tabs denoting the SCGA O-1 rank of Second Lieutenant." - icon_state = "o" + name = "ranks (O-1 second lieutenant)" + desc = "Collar pins denoting the SCGA O-1 rank of Second Lieutenant." + icon_state = "o1_device" overlay_state = "o_worn" /obj/item/clothing/accessory/scga_rank/o2 - name = "rank insignia, O2 First Lieutenant" - desc = "Collar tabs denoting the SCGA O-2 rank of First Lieutenant." - icon_state = "o" - overlay_state = "o_worn" + name = "ranks (O-2 first lieutenant)" + desc = "Collar pins denoting the SCGA O-2 rank of First Lieutenant." + icon_state = "o2_device" + overlay_state = "o_flag_worn" /obj/item/clothing/accessory/scga_rank/o3 - name = "rank insignia, O3 Captain" - desc = "Collar tabs denoting the SCGA O-3 rank of Captain." - icon_state = "o" - overlay_state = "o_worn" + name = "ranks (O-3 army captain)" + desc = "Collar pins denoting the SCGA O-3 rank of Captain." + icon_state = "o3_device" + overlay_state = "o_flag_worn" /obj/item/clothing/accessory/scga_rank/o4 - name = "rank insignia, O4 Major" - desc = "Collar tabs denoting the SCGA O-4 rank of Major." - icon_state = "o" + name = "ranks (O-4 major)" + desc = "Collar pins denoting the SCGA O-4 rank of Major." + icon_state = "o4_device" overlay_state = "o_worn" /obj/item/clothing/accessory/scga_rank/o5 - name = "rank insignia, O5 Lieutenant Colonel" - desc = "Collar tabs denoting the SCGA O-5 rank of Lieutenant Colonel." - icon_state = "o" - overlay_state = "o_worn" + name = "ranks (O-5 lieutenant colonel)" + desc = "Collar pins denoting the SCGA O-5 rank of Lieutenant Colonel." + icon_state = "o5_device" + overlay_state = "o_flag_worn" /obj/item/clothing/accessory/scga_rank/o6 - name = "rank insignia, O6 Colonel" - desc = "Collar tabs denoting the SCGA O-6 rank of Colonel." - icon_state = "o" - overlay_state = "o_worn" + name = "ranks (O-6 colonel)" + desc = "Collar pins denoting the SCGA O-6 rank of Colonel." + icon_state = "o6_device" + overlay_state = "o_flag_worn" /obj/item/clothing/accessory/scga_rank/o7 - name = "rank insignia, O7 Brigadier General" - desc = "Collar tabs denoting the SCGA O-7 rank of Brigadier General." + name = "ranks (O-7 brigadier general)" + desc = "Collar pins denoting the SCGA O-7 rank of Brigadier General." icon_state = "o_flag" overlay_state = "o_flag_worn" /obj/item/clothing/accessory/scga_rank/o8 - name = "rank insignia, O8 Major General" - desc = "Collar tabs denoting the SCGA O-8 rank of Major General." + name = "ranks (O-8 major general)" + desc = "Collar pins denoting the SCGA O-8 rank of Major General." icon_state = "o_flag" overlay_state = "o_flag_worn" /obj/item/clothing/accessory/scga_rank/o9 - name = "rank insignia, O9 Lieutenant General" - desc = "Collar tabs denoting the SCGA O-9 rank of Lieutenant General." + name = "ranks (O-9 lieutenant general)" + desc = "Collar pins denoting the SCGA O-9 rank of Lieutenant General." icon_state = "o_flag" overlay_state = "o_flag_worn" /obj/item/clothing/accessory/scga_rank/o10 - name = "rank insignia, O10 General" - desc = "Collar tabs denoting the SCGA O-10 rank of General." + name = "ranks (O-10 general)" + desc = "Collar pins denoting the SCGA O-10 rank of General." icon_state = "o_flag" overlay_state = "o_flag_worn" /obj/item/clothing/accessory/scga_rank/o10_alt - name = "rank insignia, O10 Field-Marshal" - desc = "Collar tabs denoting the SCGA O-10 rank of Field-Marshal." + name = "ranks (O-10 field marshal" + desc = "Collar pins denoting the SCGA O-10 rank of Field Marshal." icon_state = "o_flag" overlay_state = "o_flag_worn" diff --git a/packs/factions/scga/ranks.dmi b/packs/factions/scga/ranks.dmi index ba749b0dbad4b..317f92fbed654 100644 Binary files a/packs/factions/scga/ranks.dmi and b/packs/factions/scga/ranks.dmi differ