diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm index 8a7763410bf..18175766871 100644 --- a/code/datums/outfits/outfit_admin.dm +++ b/code/datums/outfits/outfit_admin.dm @@ -647,20 +647,20 @@ name = "Solar Federation Marine" uniform = /obj/item/clothing/under/solgov suit = /obj/item/clothing/suit/armor/bulletproof - back = /obj/item/storage/backpack/security + 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 + 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/storage/box/responseteam = 1, /obj/item/clothing/shoes/magboots = 1, /obj/item/whetstone = 1, /obj/item/clothing/mask/gas/explorer/marines = 1, @@ -702,13 +702,12 @@ 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 + 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/responseteam = 1, /obj/item/storage/box/handcuffs = 1, /obj/item/clothing/shoes/magboots/advance = 1, /obj/item/reagent_containers/hypospray/autoinjector/survival = 1, @@ -720,14 +719,14 @@ /datum/outfit/admin/solgov/elite name = "Solar Federation Specops Marine" uniform = /obj/item/clothing/under/solgov/elite - head = /obj/item/clothing/head/soft/solgov/marines/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/storage/box/responseteam = 1, /obj/item/clothing/shoes/magboots/advance = 1, /obj/item/whetstone = 1, - /obj/item/clothing/mask/gas/explorer/marines = 1, /obj/item/reagent_containers/hypospray/autoinjector/survival = 1 ) cybernetic_implants = list( @@ -737,22 +736,22 @@ /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 - head = /obj/item/clothing/head/beret/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 - back = /obj/item/storage/backpack/satchel 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 + l_ear = /obj/item/radio/headset/ert/alt/commander/solgov backpack_contents = list( - /obj/item/storage/box/responseteam = 1, /obj/item/storage/box/handcuffs = 1, /obj/item/clothing/shoes/magboots/advance = 1, - /obj/item/clothing/mask/gas/explorer/marines = 1, /obj/item/reagent_containers/hypospray/autoinjector/survival = 1, /obj/item/ammo_box/magazine/m50 = 3 ) diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index 03326235953..9ffad32b15d 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -11,7 +11,7 @@ GLOBAL_LIST_INIT(possible_changeling_IDs, list("Alpha","Beta","Gamma","Delta","E name = "changeling" config_tag = "changeling" restricted_jobs = list("AI", "Cyborg") - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Security Pod Pilot", "Magistrate", "Brig Physician", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer") + protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Security Pod Pilot", "Magistrate", "Brig Physician", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation Brigadier General") protected_species = list("Machine") required_players = 15 required_enemies = 1 diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 60ded97ac3f..e3ede981b48 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -48,7 +48,7 @@ GLOBAL_LIST_EMPTY(all_cults) /datum/game_mode/cult name = "cult" config_tag = "cult" - restricted_jobs = list("Chaplain", "AI", "Cyborg", "Internal Affairs Agent", "Security Officer", "Warden", "Detective", "Security Pod Pilot", "Head of Security", "Captain", "Head of Personnel", "Blueshield", "Nanotrasen Representative", "Magistrate", "Brig Physician", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer") + restricted_jobs = list("Chaplain", "AI", "Cyborg", "Internal Affairs Agent", "Security Officer", "Warden", "Detective", "Security Pod Pilot", "Head of Security", "Captain", "Head of Personnel", "Blueshield", "Nanotrasen Representative", "Magistrate", "Brig Physician", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation Brigadier General") protected_jobs = list() required_players = 30 required_enemies = 3 diff --git a/code/game/gamemodes/shadowling/shadowling.dm b/code/game/gamemodes/shadowling/shadowling.dm index 1cb4e6fbb35..14fa2c74ec0 100644 --- a/code/game/gamemodes/shadowling/shadowling.dm +++ b/code/game/gamemodes/shadowling/shadowling.dm @@ -74,7 +74,7 @@ Made by Xhuis required_enemies = 2 recommended_enemies = 2 restricted_jobs = list("AI", "Cyborg") - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Head of Personnel", "Captain", "Blueshield", "Nanotrasen Representative", "Security Pod Pilot", "Magistrate", "Brig Physician", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer") + protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Head of Personnel", "Captain", "Blueshield", "Nanotrasen Representative", "Security Pod Pilot", "Magistrate", "Brig Physician", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation Brigadier General") /datum/game_mode/shadowling/announce() to_chat(world, "The current game mode is - Shadowling!") diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index 6cbfeca3c10..bb3df423653 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -11,7 +11,7 @@ name = "traitor" config_tag = "traitor" restricted_jobs = list("Cyborg")//They are part of the AI if he is traitor so are they, they use to get double chances - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Security Pod Pilot", "Magistrate", "Internal Affairs Agent", "Brig Physician", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer") + protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Security Pod Pilot", "Magistrate", "Internal Affairs Agent", "Brig Physician", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation Brigadier General") required_players = 0 required_enemies = 1 recommended_enemies = 4 diff --git a/code/game/gamemodes/vampire/traitor_vamp.dm b/code/game/gamemodes/vampire/traitor_vamp.dm index 9ad66fdb976..86f496d057d 100644 --- a/code/game/gamemodes/vampire/traitor_vamp.dm +++ b/code/game/gamemodes/vampire/traitor_vamp.dm @@ -2,7 +2,7 @@ name = "traitor+vampire" config_tag = "traitorvamp" traitors_possible = 3 //hard limit on traitors if scaling is turned off - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Security Pod Pilot", "Magistrate", "Chaplain", "Brig Physician", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer") + protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Security Pod Pilot", "Magistrate", "Chaplain", "Brig Physician", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Solar Federation Brigadier General") restricted_jobs = list("Cyborg") secondary_restricted_jobs = list("AI") required_players = 10 diff --git a/code/game/gamemodes/vampire/vampire.dm b/code/game/gamemodes/vampire/vampire.dm index 69972d2bea5..e646213c7da 100644 --- a/code/game/gamemodes/vampire/vampire.dm +++ b/code/game/gamemodes/vampire/vampire.dm @@ -9,7 +9,7 @@ name = "vampire" config_tag = "vampire" restricted_jobs = list("AI", "Cyborg") - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Security Pod Pilot", "Magistrate", "Chaplain", "Brig Physician", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer") + protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Security Pod Pilot", "Magistrate", "Chaplain", "Brig Physician", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation Brigadier General") protected_species = list("Machine") required_players = 15 required_enemies = 1 diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index f2b28fea297..42d91002257 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -100,6 +100,8 @@ return get_all_centcom_access() + get_all_accesses() if("Special Operations Officer") return get_all_centcom_access() + get_all_accesses() + if("Solar Federation Brigadier General") + return get_all_centcom_access() + get_all_accesses() if("Nanotrasen Navy Representative") return get_all_centcom_access() + get_all_accesses() if("Nanotrasen Navy Officer") @@ -401,7 +403,7 @@ return list("VIP Guest","Custodian","Thunderdome Overseer","Emergency Response Team Member","Emergency Response Team Leader","Intel Officer","Medical Officer","Death Commando","Research Officer","Deathsquad Officer","Special Operations Officer","Nanotrasen Navy Representative","Nanotrasen Navy Officer","Nanotrasen Navy Captain","Supreme Commander") /proc/get_all_solgov_jobs() - return list("Solar Federation Lieutenant","Solar Federation Specops Lieutenant","Solar Federation Marine","Solar Federation Specops Marine","Solar Federation Representative","Sol Trader") + return list("Solar Federation Lieutenant","Solar Federation Specops Lieutenant","Solar Federation Marine","Solar Federation Specops Marine","Solar Federation Representative","Sol Trader","Solar Federation Brigadier General") //gets the actual job rank (ignoring alt titles) //this is used solely for sechuds diff --git a/code/game/jobs/job/central.dm b/code/game/jobs/job/central.dm index e4ce321082e..8a74598951d 100644 --- a/code/game/jobs/job/central.dm +++ b/code/game/jobs/job/central.dm @@ -69,9 +69,9 @@ /datum/outfit/job/ntspecops name = "Special Operations Officer" jobtype = /datum/job/ntspecops + allow_backbag_choice = FALSE uniform = /obj/item/clothing/under/rank/centcom/captain suit = /obj/item/clothing/suit/space/deathsquad/officer - back = /obj/item/storage/backpack/ert/security belt = /obj/item/storage/belt/military/assault gloves = /obj/item/clothing/gloves/combat shoes = /obj/item/clothing/shoes/combat @@ -82,8 +82,8 @@ id = /obj/item/card/id/centcom pda = /obj/item/pda/centcom r_pocket = /obj/item/storage/box/matches + back = /obj/item/storage/backpack/satchel box = /obj/item/storage/box/centcomofficer - backpack = /obj/item/storage/backpack/satchel backpack_contents = list( /obj/item/clothing/shoes/magboots/advance = 1, /obj/item/storage/box/zipties = 1 @@ -104,3 +104,23 @@ if(visualsOnly) return H.mind.offstation_role = TRUE + +/datum/job/ntspecops/solgovspecops + title = "Solar Federation Brigadier General" + outfit = /datum/outfit/job/ntspecops/solgovspecops + +/datum/outfit/job/ntspecops/solgovspecops + name = "Solar Federation Brigadier General" + uniform = /obj/item/clothing/under/rank/centcom/captain/solgov + suit = /obj/item/clothing/suit/space/deathsquad/officer/solgov + head = /obj/item/clothing/head/helmet/space/deathsquad/beret/solgov + +/datum/outfit/job/ntspecops/solgovspecops/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + if(visualsOnly) + return + var/obj/item/card/id/I = H.wear_id + if(istype(I)) + apply_to_card(I, H, get_centcom_access(name), name, "lifetimeid") + H.sec_hud_set_ID() + H.mind.offstation_role = TRUE diff --git a/code/game/machinery/tcomms/nttc.dm b/code/game/machinery/tcomms/nttc.dm index 0576bbe7e41..5ca240171b0 100644 --- a/code/game/machinery/tcomms/nttc.dm +++ b/code/game/machinery/tcomms/nttc.dm @@ -51,6 +51,11 @@ "Emergency Response Team Officer" = "dsquadradio", "Nanotrasen Navy Officer" = "dsquadradio", "Special Operations Officer" = "dsquadradio", + "Solar Federation Brigadier General" = "dsquadradio", + "Solar Federation Specops Lieutenant" = "dsquadradio", + "Solar Federation Specops Marine" = "dsquadradio", + "Solar Federation Lieutenant" = "dsquadradio", + "Solar Federation Marine" = "dsquadradio", // Medical "Chemist" = "medradio", "Chief Medical Officer" = "medradio", @@ -119,7 +124,9 @@ /// List of ERT jobs var/list/ert_jobs = list("Emergency Response Team Officer", "Emergency Response Team Engineer", "Emergency Response Team Medic", "Emergency Response Team Leader", "Emergency Response Team Member") /// List of CentComm jobs - var/list/cc_jobs = list("Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer") + var/list/cc_jobs = list("Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation Brigadier General") + /// List of SolGov Marine jobs + var/list/tsf_jobs = list("Solar Federation Specops Lieutenant", "Solar Federation Specops Marine", "Solar Federation Lieutenant", "Solar Federation Marine") // Defined so code compiles and incase someone has a non-standard job var/job_class = "radio" // NOW FOR ACTUAL TOGGLES @@ -278,7 +285,7 @@ // Makes heads of staff bold if(toggle_command_bold) var/job = tcm.sender_job - if((job in ert_jobs) || (job in heads) || (job in cc_jobs)) + if((job in ert_jobs) || (job in heads) || (job in cc_jobs) || (job in tsf_jobs)) for(var/I in 1 to length(message_pieces)) var/datum/multilingual_say_piece/S = message_pieces[I] if(!S.message) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 235750a2b48..79f49b39c94 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -307,12 +307,18 @@ icon_state = "com_headset_alt" item_state = "com_headset_alt" +/obj/item/radio/headset/ert/alt/solgov + name = "\improper Trans-Solar Federation Marine's bowman headset" + /obj/item/radio/headset/ert/alt/commander name = "ERT commander's bowman headset" desc = "The headset of the boss. Protects ears from flashbangs. Can transmit even if telecomms are down." requires_tcomms = FALSE instant = TRUE +/obj/item/radio/headset/ert/alt/commander/solgov + name = "\improper Trans-Solar Federation Lieutenant's bowman headset" + /obj/item/radio/headset/centcom name = "centcom officer's bowman headset" desc = "The headset of final authority. Protects ears from flashbangs. Can transmit even if telecomms are down." diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index b142d5cb7e5..f5a47c31b0a 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -584,3 +584,9 @@ name = "emergency response team janitor backpack" desc = "A spacious backpack with lots of pockets, worn by janitorial members of a Nanotrasen Emergency Response Team." icon_state = "ert_janitor" + +//Solgov +/obj/item/storage/backpack/ert/solgov + name = "\improper TSF marine backpack" + desc = "A spacious backpack with lots of pockets, worn by marines of the Trans-Solar Federation." + icon_state = "ert_solgov" diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index dd99bba3211..728884e263f 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -206,11 +206,13 @@ icon_state = "solgovcberet" item_color = "solgovc" dog_fashion = null - armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 60) + armor = list("melee" = 20, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 60) strip_delay = 80 /obj/item/clothing/head/beret/solgov/command/elite name = "\improper Trans-Solar Federation Specops Lieutenant's beret" - desc = "A beret worn by marines of the Trans-Solar Federation Psiops division. The insignia signifies the wearer bears the rank of a Lieutenant." + desc = "A beret worn by marines of the Trans-Solar Federation Specops division. The insignia signifies the wearer bears the rank of a Lieutenant." + armor = list("melee" = 35, "bullet" = 60, "laser" = 10, "energy" = 10, "bomb" = 25, "bio" = 10, "rad" = 50, "fire" = 80, "acid" = 80) icon_state = "solgovceliteberet" item_color = "solgovcelite" + resistance_flags = FIRE_PROOF diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index ca0e6d5aad5..f55be1d578e 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -125,28 +125,32 @@ dog_fashion = null /obj/item/clothing/head/soft/solgov/marines - armor = list("melee" = 35, "bullet" = 30, "laser" = 30,"energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 50) - strip_delay = 60 + armor = list("melee" = 20, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 60) icon_state = "solgovsoft_flipped" + strip_delay = 60 flipped = TRUE /obj/item/clothing/head/soft/solgov/marines/elite name = "\improper Trans-Solar Federation Specops marine cap" - desc = "A soft cap worn by marines of the Trans-Solar Federation Specops division." + desc = "A cap worn by marines of the Trans-Solar Federation Specops division. You aren't quite sure how they made this bulletproof, but you are glad it is!" + armor = list("melee" = 35, "bullet" = 60, "laser" = 10, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 50, "fire" = 80, "acid" = 80) icon_state = "solgovelitesoft_flipped" item_color = "solgovelite" + resistance_flags = FIRE_PROOF /obj/item/clothing/head/soft/solgov/marines/command name = "\improper Trans-Solar Federation lieutenant's cap" desc = "A soft cap worn by marines of the Trans-Solar Federation. The insignia signifies the wearer bears the rank of a Lieutenant." + armor = list("melee" = 20, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 60) icon_state = "solgovcsoft_flipped" item_color = "solgovc" dog_fashion = null - armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 60) strip_delay = 80 /obj/item/clothing/head/soft/solgov/marines/command/elite name = "\improper Trans-Solar Federation Specops Lieutenant's cap" - desc = "A soft cap worn by marines of the Trans-Solar Federation Specops division. The insignia signifies the wearer bears the rank of a Lieutenant." + desc = "A cap worn by marines of the Trans-Solar Federation Specops division. You aren't quite sure how they made this bulletproof, but you are glad it is! The insignia signifies the wearer bears the rank of a Lieutenant." + armor= list("melee" = 35, "bullet" = 60, "laser" = 10, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 50, "fire" = 80, "acid" = 80) icon_state = "solgovcelitesoft" item_color = "solgovcelite" + resistance_flags = FIRE_PROOF diff --git a/code/modules/clothing/spacesuits/ert.dm b/code/modules/clothing/spacesuits/ert.dm index 8e9d3f3e94a..b8c4c7e86f0 100644 --- a/code/modules/clothing/spacesuits/ert.dm +++ b/code/modules/clothing/spacesuits/ert.dm @@ -259,3 +259,38 @@ helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal/berserker armor = list(melee = 65, bullet = 50, laser = 50, energy = 50, bomb = 50, bio = 100, rad = 100, fire = 80, acid = 80) slowdown = 0 + +// Solgov + +/obj/item/clothing/head/helmet/space/hardsuit/ert/solgov + name = "\improper Trans-Solar Federation Specops Marine helmet" + max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT + desc = "A helmet worn by marines of the Trans-Solar Federation. Armored, space ready, and fireproof." + icon_state = "hardsuit0-solgovmarine" + item_state = "hardsuit0-solgovmarine" + item_color = "solgovmarine" + armor = list("melee" = 35, "bullet" = 60, "laser" = 15, "energy" = 10, "bomb" = 25, "bio" = 100, "rad" = 50, "fire" = 100, "acid" = 100) + +/obj/item/clothing/suit/space/hardsuit/ert/solgov + name = "\improper Trans-Solar Federation Specops Marine hardsuit" + max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT + desc = "A suit worn by marines of the Trans-Solar Federation. Armored, space ready, and fireproof." + icon_state = "ert_solgov_marine" + item_state = "ert_solgov_marine" + helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/solgov + slowdown = 0 + armor = list("melee" = 35, "bullet" = 60, "laser" = 15, "energy" = 10, "bomb" = 25, "bio" = 100, "rad" = 50, "fire" = 100, "acid" = 100) + +/obj/item/clothing/head/helmet/space/hardsuit/ert/solgov/command + name = "\improper Trans-Solar Federation Specops Lieutenant helmet" + desc = "A helmet worn by Lieutenants of the Trans-Solar Federation Marines. Has gold highlights to denote the wearer's rank. Armored, space ready, and fireproof." + icon_state = "hardsuit0-solgovcommand" + item_state = "hardsuit0-solgovcommand" + item_color = "solgovcommand" + +/obj/item/clothing/suit/space/hardsuit/ert/solgov/command + name = "\improper Trans-Solar Federation Specops Lieutenant hardsuit" + desc = "A suit worn by Lieutenants of the Trans-Solar Federation Marines. Has gold highlights to denote the wearer's rank. Armored, space ready, and fireproof." + icon_state = "ert_solgov_command" + item_state = "ert_solgov_command" + helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/solgov/command diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index d732f3a00ab..226196fbc32 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -87,6 +87,11 @@ armor = list("melee" = 80, "bullet" = 80, "laser" = 50, "energy" = 50, "bomb" = 100, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100) flags = STOPSPRESSUREDMAGE | THICKMATERIAL +/obj/item/clothing/head/helmet/space/deathsquad/beret/solgov + name = "\improper Trans-Solar Federation commander's beret" + desc = "A camouflaged beret adorned with the star of the Trans-Solar Federation, worn by generals of the Trans-Solar Federation." + icon_state = "solgovceliteberet" + /obj/item/clothing/suit/space/deathsquad/officer name = "officer jacket" desc = "An armored jacket used in special operations." @@ -99,6 +104,12 @@ resistance_flags = FIRE_PROOF | ACID_PROOF w_class = WEIGHT_CLASS_NORMAL +/obj/item/clothing/suit/space/deathsquad/officer/solgov + name = "\improper Trans-Solar Federation commander's jacket" + icon_state = "solgovcommander" + item_state = "solgovcommander" + + //Space santa outfit suit /obj/item/clothing/head/helmet/space/santahat name = "Santa's hat" diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index e91942e8e5f..71bd1e165d0 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -129,6 +129,10 @@ armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30) displays_id = 0 +/obj/item/clothing/under/rank/centcom/captain/solgov + name = "\improper Trans-Solar Federation commander's uniform" + desc = "Gold trim on space-black cloth, this uniform is worn by generals of the Trans-Solar Federation. It has exotic materials for protection." + /obj/item/clothing/under/rank/centcom/blueshield name = "formal blueshield's uniform" desc = "Gold trim on space-black cloth, this uniform bears \"Close Protection\" on the left shoulder. It's got exotic materials for protection." diff --git a/code/modules/tgui/modules/ert_manager.dm b/code/modules/tgui/modules/ert_manager.dm index b31adf47120..a39b6239035 100644 --- a/code/modules/tgui/modules/ert_manager.dm +++ b/code/modules/tgui/modules/ert_manager.dm @@ -97,4 +97,3 @@ trigger_armed_response_team(D, commander_slots, security_slots, medical_slots, engineering_slots, janitor_slots, paranormal_slots, cyborg_slots) else return FALSE - diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi index 6fffc9e1f57..4ef2490b554 100644 Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 59d04780446..8109e23d3cf 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index e73ec9917eb..61a1003db98 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index c1b757e2f3e..c1228bee4c3 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index b39a4262086..674c20510cf 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index 28b2a79a06d..b75eae77d79 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ