diff --git a/maps/torch/torch_ranks.dm b/maps/torch/torch_ranks.dm index d91760ff0e5fa..3edb53509c661 100644 --- a/maps/torch/torch_ranks.dm +++ b/maps/torch/torch_ranks.dm @@ -14,7 +14,8 @@ /datum/mil_branch/alien, /datum/mil_branch/skrell_fleet, /datum/mil_branch/iccgn, - /datum/mil_branch/scga + /datum/mil_branch/scga, + /datum/mil_branch/auf ) spawn_branch_types = list( @@ -25,7 +26,8 @@ /datum/mil_branch/alien, /datum/mil_branch/skrell_fleet, /datum/mil_branch/iccgn, - /datum/mil_branch/scga + /datum/mil_branch/scga, + /datum/mil_branch/auf ) species_to_branch_blacklist = list( diff --git a/packs/factions/fa/_pack.dm b/packs/factions/fa/_pack.dm index a27ad0f365df2..6ad74174e52c0 100644 --- a/packs/factions/fa/_pack.dm +++ b/packs/factions/fa/_pack.dm @@ -1,5 +1,6 @@ #include "badges.dm" #include "clothing.dm" +#include "faction.dm" #include "misc.dm" #include "outfits.dm" #include "tweaks.dm" diff --git a/packs/factions/fa/faction.dm b/packs/factions/fa/faction.dm new file mode 100644 index 0000000000000..92aec0178b554 --- /dev/null +++ b/packs/factions/fa/faction.dm @@ -0,0 +1,50 @@ +/datum/mil_branch/auf + name = "Alliance United Flotillas" + name_short = "AUF" + email_domain = "flot.freeiolaus.int" + assistant_job = null + min_skill = list( // 5 points + SKILL_HAULING = SKILL_BASIC, // 1 point + SKILL_WEAPONS = SKILL_BASIC, // 2 points + SKILL_EVA = SKILL_TRAINED // 2 point + ) + + rank_types = list( + /datum/mil_rank/auf/ga, + /datum/mil_rank/auf/wa, + /datum/mil_rank/auf/sa + ) + + spawn_rank_types = list( + /datum/mil_rank/auf/ga, + /datum/mil_rank/auf/wa, + /datum/mil_rank/auf/sa + ) + +/datum/mil_branch/auf/New() + rank_types = subtypesof(/datum/mil_rank/auf) + ..() + +/datum/mil_rank/auf/ga + name = "Guardsman of the Frontier Alliance" + name_short = "GdMn" + accessory = list( + /obj/item/clothing/accessory/fa_badge/guardsman + ) + sort_order = 10 + +/datum/mil_rank/auf/wa + name = "Warden of the Frontier Alliance" + name_short = "Wrd" + accessory = list( + /obj/item/clothing/accessory/fa_badge/warden + ) + sort_order = 20 + +/datum/mil_rank/auf/sa + name = "Star Marshal of the Frontier Alliance" + name_short = "Mrshl" + accessory = list( + /obj/item/clothing/accessory/fa_badge/marshal + ) + sort_order = 30 \ No newline at end of file diff --git a/packs/factions/iccgn/faction.dm b/packs/factions/iccgn/faction.dm index 1922d19454dbb..2d935ff01a3d2 100644 --- a/packs/factions/iccgn/faction.dm +++ b/packs/factions/iccgn/faction.dm @@ -63,7 +63,8 @@ name = "Eleve Sailor" name_short = "Elv" accessory = list( - /obj/item/clothing/accessory/iccgn_rank/or1 + /obj/item/clothing/accessory/iccgn_rank/or1, + /obj/item/clothing/accessory/iccgn_badge/enlisted ) sort_order = 10 @@ -72,7 +73,8 @@ name = "Sailor" name_short = "Slr" accessory = list( - /obj/item/clothing/accessory/iccgn_rank/or3 + /obj/item/clothing/accessory/iccgn_rank/or3, + /obj/item/clothing/accessory/iccgn_badge/enlisted ) sort_order = 30 @@ -81,7 +83,8 @@ name = "Bosman" name_short = "Bsn" accessory = list( - /obj/item/clothing/accessory/iccgn_rank/or4 + /obj/item/clothing/accessory/iccgn_rank/or4, + /obj/item/clothing/accessory/iccgn_badge/enlisted ) sort_order = 40 @@ -90,7 +93,8 @@ name = "Starszy Bosman" name_short = "SBsn" accessory = list( - /obj/item/clothing/accessory/iccgn_rank/or5 + /obj/item/clothing/accessory/iccgn_rank/or5, + /obj/item/clothing/accessory/iccgn_badge/enlisted ) sort_order = 50 @@ -99,7 +103,8 @@ name = "Sierzant" name_short = "Szt" accessory = list( - /obj/item/clothing/accessory/iccgn_rank/or6 + /obj/item/clothing/accessory/iccgn_rank/or6, + /obj/item/clothing/accessory/iccgn_badge/enlisted ) sort_order = 60 @@ -108,7 +113,8 @@ name = "Starshyna" name_short = "Strs" accessory = list( - /obj/item/clothing/accessory/iccgn_rank/or7 + /obj/item/clothing/accessory/iccgn_rank/or7, + /obj/item/clothing/accessory/iccgn_badge/enlisted ) sort_order = 70 @@ -117,7 +123,8 @@ name = "Adjutant" name_short = "Adj" accessory = list( - /obj/item/clothing/accessory/iccgn_rank/or8 + /obj/item/clothing/accessory/iccgn_rank/or8, + /obj/item/clothing/accessory/iccgn_badge/enlisted ) sort_order = 80 @@ -126,7 +133,8 @@ name = "Major" name_short = "Mjr" accessory = list( - /obj/item/clothing/accessory/iccgn_rank/or9 + /obj/item/clothing/accessory/iccgn_rank/or9, + /obj/item/clothing/accessory/iccgn_badge/enlisted ) sort_order = 90 @@ -135,7 +143,8 @@ name = "Major of the Confederation Navy" name_short = "MjN" accessory = list( - /obj/item/clothing/accessory/iccgn_rank/or9_alt + /obj/item/clothing/accessory/iccgn_rank/or9_alt, + /obj/item/clothing/accessory/iccgn_badge/enlisted ) sort_order = 100 @@ -144,7 +153,8 @@ name = "Michman" name_short = "Mch" accessory = list( - /obj/item/clothing/accessory/iccgn_rank/of1 + /obj/item/clothing/accessory/iccgn_rank/of1, + /obj/item/clothing/accessory/iccgn_badge/officer ) sort_order = 110 @@ -153,7 +163,8 @@ name = "Sous-Leytenant" name_short = "SLyt" accessory = list( - /obj/item/clothing/accessory/iccgn_rank/of2 + /obj/item/clothing/accessory/iccgn_rank/of2, + /obj/item/clothing/accessory/iccgn_badge/officer ) sort_order = 120 @@ -162,7 +173,8 @@ name = "Leytenant" name_short = "Lyt" accessory = list( - /obj/item/clothing/accessory/iccgn_rank/of3 + /obj/item/clothing/accessory/iccgn_rank/of3, + /obj/item/clothing/accessory/iccgn_badge/officer ) sort_order = 130 @@ -171,7 +183,8 @@ name = "Sub-Komandor" name_short = "SKdr" accessory = list( - /obj/item/clothing/accessory/iccgn_rank/of4 + /obj/item/clothing/accessory/iccgn_rank/of4, + /obj/item/clothing/accessory/iccgn_badge/officer ) sort_order = 140 @@ -180,7 +193,8 @@ name = "Komandor" name_short = "Kdr" accessory = list( - /obj/item/clothing/accessory/iccgn_rank/of5 + /obj/item/clothing/accessory/iccgn_rank/of5, + /obj/item/clothing/accessory/iccgn_badge/officer ) sort_order = 150 @@ -189,7 +203,8 @@ name = "Kapitan" name_short = "Kpt" accessory = list( - /obj/item/clothing/accessory/iccgn_rank/of6 + /obj/item/clothing/accessory/iccgn_rank/of6, + /obj/item/clothing/accessory/iccgn_badge/officer ) sort_order = 160 @@ -198,7 +213,8 @@ name = "Starshy Kapitan" name_short = "SKpt" accessory = list( - /obj/item/clothing/accessory/iccgn_rank/of7 + /obj/item/clothing/accessory/iccgn_rank/of7, + /obj/item/clothing/accessory/iccgn_badge/officer ) sort_order = 170 @@ -207,7 +223,8 @@ name = "Vice-Admiral" name_short = "VAdm" accessory = list( - /obj/item/clothing/accessory/iccgn_rank/of8 + /obj/item/clothing/accessory/iccgn_rank/of8, + /obj/item/clothing/accessory/iccgn_badge/officer ) sort_order = 180 @@ -216,7 +233,8 @@ name = "Admiral" name_short = "Adm" accessory = list( - /obj/item/clothing/accessory/iccgn_rank/of9 + /obj/item/clothing/accessory/iccgn_rank/of9, + /obj/item/clothing/accessory/iccgn_badge/officer ) sort_order = 190 @@ -225,6 +243,7 @@ name = "Marshal of the Confederation Navy" name_short = "Mshl" accessory = list( - /obj/item/clothing/accessory/iccgn_rank/of9_alt + /obj/item/clothing/accessory/iccgn_rank/of9_alt, + /obj/item/clothing/accessory/iccgn_badge/officer ) sort_order = 200