From bef209f13c97356378cdc706a19afe0429e3e051 Mon Sep 17 00:00:00 2001 From: Chompstation Bot Date: Sat, 13 Feb 2021 05:51:00 +0000 Subject: [PATCH] [MIRROR] Excised Errant Bay Military Lore --- .../preference_setup/loadout/loadout_head.dm | 2 +- code/modules/clothing/head/jobs.dm | 1 + code/modules/clothing/head/misc.dm | 28 ++++ code/modules/clothing/head/misc_special.dm | 6 +- code/modules/clothing/head/solgov.dm | 130 ++++++++---------- code/modules/clothing/suits/armor.dm | 12 +- code/modules/clothing/suits/solgov.dm | 80 +++++------ code/modules/clothing/under/solgov.dm | 22 +-- code/modules/lore_codex/news_data/main.dm | 4 +- code/modules/persistence/filth.dm | 2 +- icons/mob/head.dmi | Bin 220396 -> 220384 bytes icons/mob/suit_solgov.dmi | Bin 36277 -> 36277 bytes icons/obj/clothing/suits_solgov.dmi | Bin 11081 -> 11082 bytes 13 files changed, 149 insertions(+), 138 deletions(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 14f78b6e91..fa3185661a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -330,7 +330,7 @@ path = /obj/item/clothing/head/welding/engie /datum/gear/head/beret/solgov - display_name = "beret sol, selection" + display_name = "beret government, selection" path = /obj/item/clothing/head/beret/solgov /datum/gear/head/beret/solgov/New() diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 23c629fac2..da22b29f1f 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -175,6 +175,7 @@ icon_state = "beret_corporate_hos" item_state_slots = list(slot_r_hand_str = "beret_black", slot_l_hand_str = "beret_black") + //Medical /obj/item/clothing/head/surgery name = "surgical cap" diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index dab5e97075..7846061025 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -452,3 +452,31 @@ icon_state = "blackngoldheaddress" flags_inv = HIDEEYES body_parts_covered = HEAD|EYES + +//Corporate Berets + +/obj/item/clothing/head/beret/corp/saare + name = "\improper SAARE beret" + desc = "A red beret denoting service with Stealth Assault Enterprises. For mercenaries that are more inclined towards style than safety." + icon_state = "beret_red" + +/obj/item/clothing/head/beret/corp/saare/officer + name = "\improper SAARE officer beret" + desc = "A red beret with a gold insignia, denoting senior service with Stealth Assault Enterprises. For mercenaries who are more inclined towards style than safety." + icon_state = "beret_redgold" + +/obj/item/clothing/head/beret/corp/pcrc + name = "\improper PCRC beret" + desc = "A black beret with a PCRC logo insignia, denoting service with Proxima Centauri Risk Control. For private security personnel that are more inclined towards style than safety." + icon_state = "beret_black_observatory" + + +/obj/item/clothing/head/beret/corp/hedberg + name = "\improper Hedberg-Hammarstrom beret" + desc = "A tan beret denoting service with Hedberg-Hammarstrom private security. For mercenaries who are more inclined towards style than safety." + icon_state = "beret_tan" + +/obj/item/clothing/head/beret/corp/xion + name = "\improper Xion beret" + desc = "An orange beret denoting employment with Xion Manufacturing. For personnel that are more inclined towards style than safety." + icon_state = "beret_orange" \ No newline at end of file diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 4cf06d6cc2..6ef9ee2be6 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -151,11 +151,11 @@ flags_inv = HIDEEARS /obj/item/clothing/head/ushanka/attack_self(mob/user as mob) - if(src.icon_state == "ushankadown") - src.icon_state = "ushankaup" + if(src.icon_state == initial(icon_state)) + src.icon_state = "[icon_state]up" to_chat(user, "You raise the ear flaps on the ushanka.") else - src.icon_state = "ushankadown" + src.icon_state = initial(icon_state) to_chat(user, "You lower the ear flaps on the ushanka.") /* diff --git a/code/modules/clothing/head/solgov.dm b/code/modules/clothing/head/solgov.dm index 6a3c585aaa..6b2623ff52 100644 --- a/code/modules/clothing/head/solgov.dm +++ b/code/modules/clothing/head/solgov.dm @@ -11,14 +11,14 @@ ) /obj/item/clothing/head/soft/solgov/veteranhat - name = "veteran hat" - desc = "It's a tacky black ballcap bearing the yellow service ribbon of the Gaia Conflict." + name = "veteran cap" + desc = "It's a tacky black ballcap bearing the yellow service ribbon of the Almach War." icon_state = "cap_veteran" /obj/item/clothing/head/soft/solgov/sifguard name = "\improper SifGuard cap" desc = "It's a black ballcap bearing a Sif Defense Force crest." - icon_state = "expeditionsoft" + icon_state = "sifguardsoft" item_state_slots = list( slot_l_hand_str = "blacksoft", slot_r_hand_str = "blacksoft", @@ -27,7 +27,7 @@ /obj/item/clothing/head/soft/solgov/sifguard/co name = "\improper SifGuard captain's cap" desc = "It's a black ballcap bearing the Sif Defense Force crest. The brim has gold trim." - icon_state = "expeditioncomsoft" + icon_state = "sifguardcomsoft" /obj/item/clothing/head/soft/solgov/fleet name = "fleet cap" @@ -88,17 +88,17 @@ /obj/item/clothing/head/service/sifguard name = "\improper SifGuard peaked cap" desc = "A peaked black uniform cap belonging to the Sif Defense Force Corps." - icon_state = "ecdresscap" + icon_state = "sifguarddresscap" /obj/item/clothing/head/service/sifguard/command name = "\improper SifGuard officer's peaked cap" desc = "A peaked black uniform cap belonging to the Sif Defense Force. This one is trimmed in gold." - icon_state = "ecdresscap_ofcr" + icon_state = "sifguarddresscap_ofcr" /obj/item/clothing/head/service/sifguard/captain name = "\improper SifGuard captain's peaked cap" desc = "A gold-trimmed peaked black uniform cap belonging to a Captain of the Sif Defense Force." - icon_state = "ecdresscap_capt" + icon_state = "sifguarddresscap_capt" /obj/item/clothing/head/service/sifguard/senior_command name = "senior SifGuard officer's peaked cap" @@ -127,7 +127,7 @@ /obj/item/clothing/head/service/army/campaign name = "campaign cover" - desc = "A green campaign cover with an SCG Marine crest. Only found on the heads of Drill Sergeants." + desc = "A green campaign cover with an SCG Marine crest. Typically found on the heads of Drill Sergeants." icon_state = "greendrill" //Dress @@ -170,60 +170,45 @@ //Berets +//Government Departments + /obj/item/clothing/head/beret/solgov - name = "peacekeeper beret" - desc = "A beret in Solar Confederate Government colors. For peacekeepers that are more inclined towards style than safety." + name = "\improper SCG beret" + desc = "A beret in basic Solar Confederate Government colors. For peacekeepers that are more inclined towards style than safety." icon_state = "beret_lightblue" -/obj/item/clothing/head/beret/solgov/homeguard - name = "home guard beret" - desc = "A red beret denoting service in the Sol Home Guard. For personnel that are more inclined towards style than safety." - icon_state = "beret_red" - -/obj/item/clothing/head/beret/solgov/gateway - name = "gateway administration beret" - desc = "An orange beret denoting service in the Gateway Administration. For personnel that are more inclined towards style than safety." - icon_state = "beret_orange" - -/obj/item/clothing/head/beret/solgov/customs - name = "customs and trade beret" - desc = "A purple beret denoting service in the Customs and Trade Bureau. For personnel that are more inclined towards style than safety." +/obj/item/clothing/head/beret/solgov/ttc + name = "transgressive technologies beret" + desc = "A purple beret denoting service in the Transgressive Technologies Commission. For g-men that are more inclined towards style than safety." icon_state = "beret_purpleyellow" -/obj/item/clothing/head/beret/solgov/orbital - name = "orbital assault beret" - desc = "A blue beret denoting orbital assault training. For helljumpers that are more inclined towards style than safety." +/obj/item/clothing/head/beret/solgov/eio + name = "intelligence oversight beret" + desc = "A blue beret denoting service in Emergent Intelligent Oversight. For g-men that are more inclined towards style than safety." icon_state = "beret_blue" -/obj/item/clothing/head/beret/solgov/research - name = "government research beret" - desc = "A green beret denoting service in the Bureau of Research. For explorers that are more inclined towards style than safety." +/obj/item/clothing/head/beret/solgov/survey + name = "government survey beret" + desc = "A green beret denoting service in the SCG Galactic Survey Administration. For explorers that are more inclined towards style than safety." icon_state = "beret_green" +/obj/item/clothing/head/beret/solgov/survey/extraplanar + name = "extraplanar survey beret" + desc = "A green beret with a silver emblem, denoting service in the Extraplanar Discovery Division of the GSA. For extraplanar explorers who are more inclined towards style than safety." + icon_state = "beret_greensilver" + +/obj/item/clothing/head/beret/solgov/inspector + name = "\improper Solar Inspection Group beret" + desc = "A grey beret with a silver insignia, denoting service in the Solar Inspection Group. For Almach-inspection personnel who are more inclined towards style than safety." + icon_state = "beret_graysilver" + /obj/item/clothing/head/beret/solgov/health name = "health service beret" desc = "A white beret denoting service in the Interstellar Health Service. For medics that are more inclined towards style than safety." icon_state = "beret_white" -/obj/item/clothing/head/beret/solgov/marcom - name = "\improper MARSCOM beret" - desc = "A red beret with a gold insignia, denoting service in the SCGDF Mars Central Command. For brass who are more inclined towards style than safety." - icon_state = "beret_redgold" -/obj/item/clothing/head/beret/solgov/stratcom - name = "\improper STRATCOM beret" - desc = "A grey beret with a silver insignia, denoting service in the SCGDF Strategic Command. For intelligence personnel who are more inclined towards style than safety." - icon_state = "beret_graysilver" - -/obj/item/clothing/head/beret/solgov/diplomatic - name = "diplomatic security beret" - desc = "A tan beret denoting service in the SCG Marines Diplomatic Security Group. For security personnel who are more inclined towards style than safety." - icon_state = "beret_tan" - -/obj/item/clothing/head/beret/solgov/borderguard - name = "border security beret" - desc = "A green beret with a silver emblem, denoting service in the Bureau of Border Security. For border guards who are more inclined towards style than safety." - icon_state = "beret_greensilver" +//SifGuard /obj/item/clothing/head/beret/solgov/sifguard name = "\improper SifGuard beret" @@ -260,15 +245,12 @@ desc = "A Sif Defense Force beret with a command crest. For personnel that are more inclined towards style than safety." icon_state = "beret_black_command" -/obj/item/clothing/head/beret/solgov/sifguard/branch - name = "\improper Field Operations beret" - desc = "An Sif Defense Force beret carrying insignia of the Field Operations section of the Sif Defense Force. For personnel that are more inclined towards style than safety." - icon_state = "beret_black_fieldOps" +/obj/item/clothing/head/beret/solgov/sifguard/patrol + name = "\improper SifGuard Anti-piracy beret" + desc = "An Sif Defense Force beret carrying insignia of the Anti-Piracy taskforce. For personnel that are more inclined towards style than safety." + icon_state = "beret_black_patrol" -/obj/item/clothing/head/beret/solgov/sifguard/branch/observatory - name = "\improper Observatory beret" - desc = "An Sif Defense Force beret carrying insignia of the Observatory section of the Sif Defense Force. For personnel that are more inclined towards style than safety." - icon_state = "beret_black_observatory" +//Fleet /obj/item/clothing/head/beret/solgov/fleet name = "fleet beret" @@ -320,6 +302,8 @@ desc = "A white SCG Fleet beret with a golden crest. For personnel that are more inclined towards style than safety." icon_state = "beret_whiterim_com" +/* +Unused Baylore Stuff /obj/item/clothing/head/beret/solgov/fleet/branch name = "first fleet beret" desc = "An SCG Fleet beret carrying insignia of First Fleet, the Sol Guard, stationed in Sol. For personnel that are more inclined towards style than safety." @@ -345,46 +329,44 @@ desc = "An SCG Fleet beret carrying insignia of Fifth Fleet, the Quick Reaction Force, recently formed and outfited with last tech. For personnel that are more inclined towards style than safety." icon_state = "beret_navy_fifth" +*/ + //ushanka /obj/item/clothing/head/ushanka/solgov name = "\improper SifGuard fur hat" desc = "An Sif Defense Force synthfur-lined hat for operating in cold environments." - icon_state = "ecushankadown" - //icon_state_up = "ecushankaup" + icon_state = "sifguardushankadown" /obj/item/clothing/head/ushanka/solgov/fleet name = "fleet fur hat" desc = "An SCG Fleet synthfur-lined hat for operating in cold environments." icon_state = "flushankadown" - //icon_state_up = "flushankaup" -/obj/item/clothing/head/ushanka/solgov/army +/obj/item/clothing/head/ushanka/solgov/marine name = "marine fur hat" desc = "An SCG Marine synthfur-lined hat for operating in cold environments." icon_state = "barushankadown" - //icon_state_up = "barushankaup" -/obj/item/clothing/head/ushanka/solgov/army/green - name = "green marine fur hat" - desc = "An SCG Marine synthfur-lined hat for operating in cold environments." +/obj/item/clothing/head/ushanka/solgov/marine/green + name = "\improper Hedberg-Hammarstrom fur hat" + desc = "An Hedberg-Hammarstrom private security synthfur-lined hat for operating in cold environments." icon_state = "arushankadown" - //icon_state_up = "mcushankaup" -//Terran +//Almachi -/obj/item/clothing/head/terran/navy/service - name = "ICCGN service cover" - desc = "A service uniform cover, worn by low-ranking crew within the Independent Navy." - icon_state = "terranservice" - item_state = "terranservice" +/obj/item/clothing/head/almach + name = "\improper Almach Militia service cover" + desc = "A service uniform cover, occasionally worn by crew within the defunct Almach Militia." + icon_state = "almachhat" + item_state = "almachhat" item_state_slots = list( slot_l_hand_str = "helmet", slot_r_hand_str = "helmet") body_parts_covered = 0 /obj/item/clothing/head/terran/navy/service/command - name = "ICCGN command service cover" - desc = "A service uniform cover, worn by high-ranking crew within the Independent Navy." - icon_state = "terranservice_comm" - item_state = "terranservice_comm" + name = "\improper Almach Militia command service cover" + desc = "A service uniform cover, occasionally worn by command crew within the defunct Almach Militia." + icon_state = "almachhat_comm" + item_state = "almachhat_comm" diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 20f33104ca..e12cef7303 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -353,6 +353,11 @@ icon_badge = "pcrcvest_badge" icon_nobadge = "pcrcvest_nobadge" +/obj/item/clothing/suit/storage/vest/solgov/hedberg + name = "Hedberg-Hammarstrom armor vest" + desc = "A simple kevlar plate carrier belonging to Hedberg-Hammarstrom. The company logo is clearly visible." + icon_state = "secwebvest" + /obj/item/clothing/suit/storage/vest/solgov name = "\improper Solar Confederate Government armored vest" desc = "A synthetic armor vest. This one is marked with the crest of the Solar Confederate Government." @@ -361,14 +366,9 @@ /obj/item/clothing/suit/storage/vest/solgov/heavy name = "\improper Solar Confederate Government heavy armored vest" - desc = "A synthetic armor vest with PEACEKEEPER printed in distinctive blue lettering on the chest. This one has added webbing and ballistic plates." + desc = "A synthetic armor vest with Solar Confederate Government printed in distinctive blue lettering on the chest. This one has added webbing and ballistic plates." icon_state = "solwebvest" -/obj/item/clothing/suit/storage/vest/solgov/security - name = "master at arms heavy armored vest" - desc = "A synthetic armor vest with MASTER AT ARMS printed in silver lettering on the chest. This one has added webbing and ballistic plates." - icon_state = "secwebvest" - /obj/item/clothing/suit/storage/vest/solgov/command name = "command heavy armored vest" desc = "A synthetic armor vest with Solar Confederate Government printed in detailed gold lettering on the chest. This one has added webbing and ballistic plates." diff --git a/code/modules/clothing/suits/solgov.dm b/code/modules/clothing/suits/solgov.dm index a0bb547f3e..73463c002c 100644 --- a/code/modules/clothing/suits/solgov.dm +++ b/code/modules/clothing/suits/solgov.dm @@ -23,19 +23,19 @@ /obj/item/clothing/suit/storage/solgov/service/sifguard name = "\improper SifGuard jacket" desc = "A uniform service jacket belonging to the Sif Defense Force." - icon_state = "ecservice_crew" + icon_state = "sgservice_crew" /obj/item/clothing/suit/storage/solgov/service/sifguard/medical starting_accessories = list(/obj/item/clothing/accessory/solgov/department/medical/service) /obj/item/clothing/suit/storage/solgov/service/sifguard/medical/command - icon_state = "ecservice_officer" + icon_state = "sgservice_officer" /obj/item/clothing/suit/storage/solgov/service/sifguard/engineering starting_accessories = list(/obj/item/clothing/accessory/solgov/department/engineering/service) /obj/item/clothing/suit/storage/solgov/service/sifguard/engineering/command - icon_state = "ecservice_officer" + icon_state = "sgservice_officer" /obj/item/clothing/suit/storage/solgov/service/sifguard/supply starting_accessories = list(/obj/item/clothing/accessory/solgov/department/supply/service) @@ -44,28 +44,28 @@ starting_accessories = list(/obj/item/clothing/accessory/solgov/department/security/service) /obj/item/clothing/suit/storage/solgov/service/sifguard/security/command - icon_state = "ecservice_officer" + icon_state = "sgservice_officer" /obj/item/clothing/suit/storage/solgov/service/sifguard/service starting_accessories = list(/obj/item/clothing/accessory/solgov/department/service/service) /obj/item/clothing/suit/storage/solgov/service/sifguard/service/command - icon_state = "ecservice_officer" + icon_state = "sgservice_officer" /obj/item/clothing/suit/storage/solgov/service/sifguard/exploration starting_accessories = list(/obj/item/clothing/accessory/solgov/department/exploration/service) /obj/item/clothing/suit/storage/solgov/service/sifguard/exploration/command - icon_state = "ecservice_officer" + icon_state = "sgservice_officer" /obj/item/clothing/suit/storage/solgov/service/sifguard/research starting_accessories = list(/obj/item/clothing/accessory/solgov/department/research/service) /obj/item/clothing/suit/storage/solgov/service/sifguard/research/command - icon_state = "ecservice_officer" + icon_state = "sgservice_officer" /obj/item/clothing/suit/storage/solgov/service/sifguard/command - icon_state = "ecservice_officer" + icon_state = "sgservice_officer" starting_accessories = list(/obj/item/clothing/accessory/solgov/department/command/service) /obj/item/clothing/suit/storage/solgov/service/fleet @@ -181,8 +181,8 @@ /obj/item/clothing/suit/storage/solgov/dress name = "dress jacket" desc = "A uniform dress jacket, fancy." - icon_state = "ecdress_xpl" - item_state = "ecdress_xpl" + icon_state = "sgdress_xpl" + item_state = "sgdress_xpl" body_parts_covered = UPPER_TORSO|ARMS armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) siemens_coefficient = 0.9 @@ -193,39 +193,39 @@ /obj/item/clothing/suit/storage/solgov/dress/sifguard name = "\improper SifGuard dress jacket" desc = "A silver and grey dress jacket belonging to the Sif Defense Force. Fashionable, for the 25th century at least." - icon_state = "ecdress_xpl" - item_state = "ecdress_xpl" + icon_state = "sgdress_xpl" + item_state = "sgdress_xpl" /obj/item/clothing/suit/storage/solgov/dress/sifguard/senior name = "\improper SifGuard senior's dress coat" - icon_state = "ecdress_sxpl" - item_state = "ecdress_sxpl" + icon_state = "sgdress_sxpl" + item_state = "sgdress_sxpl" /obj/item/clothing/suit/storage/solgov/dress/sifguard/chief name = "\improper SifGuard chief's dress coat" icon_state = "ecdress_cxpl" - item_state = "ecdress_cxpl" + item_state = "sgdress_cxpl" /obj/item/clothing/suit/storage/solgov/dress/sifguard/command name = "\improper SifGuard officer's dress coat" desc = "A gold and black dress peacoat belonging to the Sif Defense Force. The height of fashion." icon_state = "ecdress_ofcr" - item_state = "ecdress_ofcr" + item_state = "sgdress_ofcr" /obj/item/clothing/suit/storage/solgov/dress/sifguard/command/cdr name = "\improper SifGuard commander's dress coat" - icon_state = "ecdress_cdr" - item_state = "ecdress_cdr" + icon_state = "sgdress_cdr" + item_state = "sgdress_cdr" /obj/item/clothing/suit/storage/solgov/dress/sifguard/command/capt name = "\improper SifGuard captain's dress coat" - icon_state = "ecdress_capt" - item_state = "ecdress_capt" + icon_state = "sgdress_capt" + item_state = "sgdress_capt" /obj/item/clothing/suit/storage/solgov/dress/sifguard/command/adm name = "\improper SifGuard admiral's dress coat" - icon_state = "ecdress_adm" - item_state = "ecdress_adm" + icon_state = "sgdress_adm" + item_state = "sgdress_adm" /obj/item/clothing/suit/storage/solgov/dress/fleet name = "fleet dress jacket" @@ -328,36 +328,36 @@ item_state = "labcoat" blood_overlay_type = "coat" -/obj/item/clothing/suit/storage/marshal_jacket - name = "colonial marshal jacket" - desc = "A black synthleather jacket. The word 'MARSHAL' is stenciled onto the back in gold lettering." +/obj/item/clothing/suit/storage/eio_jacket + name = "EIO jacket" + desc = "A black synthleather jacket. The acronym 'EIO' of the Emergent Intelligence Oversight is stenciled onto the back in gold lettering." icon_state = "marshal_jacket" item_state_slots = list(slot_r_hand_str = "suit_black", slot_l_hand_str = "suit_black") body_parts_covered = UPPER_TORSO|ARMS -//Terrans +//SAARE Mercenaries //Service -/obj/item/clothing/suit/storage/terran/service/navy - name = "ICCGN coat" - desc = "A ICCG Navy service coat. Black and undecorated." +/obj/item/clothing/suit/storage/saare/service/ + name = "SAARE coat" + desc = "An Stealth Assault Enterprises . Black and undecorated." icon_state = "terranservice" item_state = "terranservice" icon = 'icons/obj/clothing/suits_solgov.dmi' icon_override = 'icons/mob/suit_solgov.dmi' -/obj/item/clothing/suit/storage/terran/service/navy/command - name = "indie command coat" - desc = "An ICCG Navy service command coat. White and undecorated." +/obj/item/clothing/suit/storage/saare/service/command + name = "SAARE command coat" + desc = "An Stealth Assault Enterprises command coat. White and undecorated." icon_state = "terranservice_comm" item_state = "terranservice_comm" //Dress -/obj/item/clothing/suit/dress/terran +/obj/item/clothing/suit/dress/saare name = "dress jacket" - desc = "A uniform dress jacket, fancy." + desc = "A Stealth Assault Enterprises uniform dress jacket, fancy." icon_state = "terrandress" item_state = "terrandress" icon = 'icons/obj/clothing/suits_solgov.dmi' @@ -369,19 +369,19 @@ valid_accessory_slots = (ACCESSORY_SLOT_MEDAL|ACCESSORY_SLOT_RANK) /obj/item/clothing/suit/dress/terran/navy - name = "ICCGN dress cloak" - desc = "A black ICCG Navy dress cloak with red detailing. So sexy it hurts." + name = "SAARE dress cloak" + desc = "A Stealth Assault Enterprises dress cloak with red detailing. So sexy it hurts." icon_state = "terrandress" item_state = "terrandress" /obj/item/clothing/suit/dress/terran/navy/officer - name = "ICCGN officer's dress cloak" - desc = "A black ICCG Navy dress cloak with gold detailing. Smells like ceremony." + name = "SAARE officer's dress cloak" + desc = "A black Stealth Assault Enterprises dress cloak with gold detailing. Smells like ceremony." icon_state = "terrandress_off" item_state = "terrandress_off" /obj/item/clothing/suit/dress/terran/navy/command - name = "ICCGN command dress cloak" - desc = "A black ICCG Navy dress cloak with royal detailing. Smells like ceremony." + name = "SAARE command dress cloak" + desc = "A black Stealth Assault Enterprises dress cloak with royal detailing. Smells like ceremony." icon_state = "terrandress_comm" item_state = "terrandress_comm" \ No newline at end of file diff --git a/code/modules/clothing/under/solgov.dm b/code/modules/clothing/under/solgov.dm index 815798f90d..cd2c111098 100644 --- a/code/modules/clothing/under/solgov.dm +++ b/code/modules/clothing/under/solgov.dm @@ -471,30 +471,30 @@ //Terrans -/obj/item/clothing/under/terran - name = "master ICCGN uniform" +/obj/item/clothing/under/saare + name = "master SAARE uniform" desc = "You shouldn't be seeing this." icon = 'icons/obj/clothing/uniforms_solgov.dmi' item_icons = list(slot_w_uniform_str = 'icons/mob/uniform_solgov.dmi') armor = list(melee = 5, bullet = 0, laser = 5, energy = 5, bomb = 0, bio = 5, rad = 5) siemens_coefficient = 0.8 -/obj/item/clothing/under/terran/navy/utility - name = "ICCGN utility uniform" - desc = "A comfortable black utility jumpsuit. Worn by the ICCG Navy." +/obj/item/clothing/under/saare/utility + name = "SAARE utility uniform" + desc = "A comfortable black utility jumpsuit. Worn by Stealth Assault Enterprises mercenaries." icon_state = "terranutility" worn_state = "terranutility" -/obj/item/clothing/under/terran/navy/service - name = "ICCGN service uniform" - desc = "The service uniform of the ICCG Navy, for low-ranking crew." +/obj/item/clothing/under/saare/service + name = "SAARE service uniform" + desc = "The service uniform of Stealth Assault Enterprises, for low-ranking mercenaries." icon_state = "terranservice" worn_state = "terranservice" armor = list(melee = 5, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 5, rad = 0) siemens_coefficient = 0.9 -/obj/item/clothing/under/terran/navy/service/command - name = "ICCGN command service uniform" - desc = "The service uniform of the ICCG Navy, for high-ranking crew." +/obj/item/clothing/under/saare/service/command + name = "SAARE command service uniform" + desc = "The service uniform of Stealth Assault Enterprises, for high-ranking mercenaries." icon_state = "terranservice_comm" worn_state = "terranservice_comm" \ No newline at end of file diff --git a/code/modules/lore_codex/news_data/main.dm b/code/modules/lore_codex/news_data/main.dm index f4565329bb..b9f1be4b40 100644 --- a/code/modules/lore_codex/news_data/main.dm +++ b/code/modules/lore_codex/news_data/main.dm @@ -321,7 +321,7 @@

\ Sources within the Vir Governmental Authority have reported that a full scale recall of remote drone craft under their operation has been initiated in order to improve security measures and prevent future exploitation of government systems, statements that eerily echo those of Occulum Broadcast following emergent drone attacks earlier this year. Investigations are reportedly \"well underway\" to determine the whereabouts of those responsible for the apparent manual modification of these short-range remote craft.\

\ - Erkki Laukkanen, Chief of Fleet Staff for the Vir Defense Force has commended all patrol crews involved, and has promised \"swift retribution\" for the attempted bombings." + Erkki Laukkanen, Chief of Fleet Staff for the Sif Defense Force has commended all patrol crews involved, and has promised \"swift retribution\" for the attempted bombings." /datum/lore/codex/page/article26 name = "11/24/62 - Boiling Point Stronghold Seized in Vir" data = "Combined forces from the SCG Fleet and Almach Militia have today struck a powerful blow to Boiling Point terrorist operations in the Vir system. With close cooperation from the crew of NanoTrasen facilities in the region, special forces were able to infiltrate what is believed to have been a major stronghold for the radical Mercurial group, located deep in the remote Ullran Expanse region of Sif. The raid closely follows the thwarted Boiling Point attack on the Radiance Energy Chain, a major energy collection array in the system which is now known to have been masterminded from the concealed bunker complex on Sif.\ @@ -354,7 +354,7 @@

\ No more! Shall the people of this great nation have to fear the machinations of radicals! No more! Shall these twisted minds impose their perversion of humanity through violence! No more!\

\ - This Assembly... Nay, this nation expresses its thanks the noble members of our military who joined together to make this outcome possible. We thank the Fleet, of course for their tireless action hunting down these killers, and their heroic action over this past weekend. We thank the Vir Defense Force, without whom we could never have located the intelligence that led to these decisive victories... The Almach Militia, for their cooperation in the apprehension of these so-called \"revolutionaries\". \[West clears their throat\] And of course, we thank the local forces - the police and reserves who dealt firsthand with the chaos sewn by Boiling Point in their vicious crusade.\ + This Assembly... Nay, this nation expresses its thanks the noble members of our military who joined together to make this outcome possible. We thank the Fleet, of course for their tireless action hunting down these killers, and their heroic action over this past weekend. We thank the Sif Defense Force, without whom we could never have located the intelligence that led to these decisive victories... The Almach Militia, for their cooperation in the apprehension of these so-called \"revolutionaries\". \[West clears their throat\] And of course, we thank the local forces - the police and reserves who dealt firsthand with the chaos sewn by Boiling Point in their vicious crusade.\

\ \[Mackenzie West shifts at the podium, setting down the List of Dissidents.\]\

\ diff --git a/code/modules/persistence/filth.dm b/code/modules/persistence/filth.dm index a7aa9e9cd4..6271893e98 100644 --- a/code/modules/persistence/filth.dm +++ b/code/modules/persistence/filth.dm @@ -10,4 +10,4 @@ /obj/effect/decal/cleanable/filth/Initialize() . = ..() - alpha = rand(180,220) \ No newline at end of file + alpha = rand(180,220) diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 69842406d4868f4b11a96880c05e43044b30f519..68d1ed5af6e07fdc4cb87d613ac6864f9ce06af9 100644 GIT binary patch delta 2988 zcmV;d3sdy$xeegC4Ui-OlaVDQf5>JJzHB*_$|2dy-dRnsMYIJ1NCTuS|N1?Uk|=p( zyqGPY#`V12_-3O4=;zJ9fBXH9zc!!${Nr(AO%nX()8@lJo*y3$(q+5(w0ZyT@xik6 zHqU>gOqn;IHa{8K^Yc%S51nY*eA;|?eAp=soHm~}FW1z|>(u+lhmIW`e>a~tFHbK| zE73u|k#J$x?UYUK7jtA+>kQEnFh?cd1c#1&vEoo;dKQ~8qE*x+^ zDEYqJ7ia!p1?c57u3R3{e`mOB-B`9AMUjDK`x!J;o(e7bj(mBP&yCffc(2SJgqc%ypuBG68oOyfItLjh-?fg+9)){l_9(2}!FGd#*gm)pZHX~i@_XvSp*)or7AV1i zT_^tTJbrK?#8(yfZNH-FcnH4U)mm2NZ||kIx!&QGuFB(%ygAl8e_YF|{ITza>;0`| zRsP6{;bt&KnVLHR3LvcVc^voB43yK@)%m;@R{8Wn$u_M@-=`{{*TO2Fk;G^23cYy; z2j)2YkQ(Y7$^9B#;BFG%WOf{FNYMrbM0*wQ8zg>dbu?_rSk^M^SzM%?SyS-Oko_yk z3nWQfFaAq;0XCMReDOo_gA6sz_D|4vg@HUfOKaye#+8VC* zV8T%4WZ_{ye>=yVArEH~ww*(SK055P3FQy1p_oa4@15lx{+8c@uf0i>o(ew8c#-U8<1x6;yiS{%d zA@i0*cP<>D^z;eE6VzwLj|%f(LryW|&8N-FKcC(|y>20jFV}y?&nGf93OJ2^R{SuL zj#cYmC3ACkl6`Mv{Xf4xeR%qCG5gJuZ;~P16)Q3QQl5fNe4irCdp4jco%o(~2>K)b z-DQLPfAQ(#wb)o1*m1Zs<33zTpRVLBD^S9gm2=~yw;7rpGmo5q%w#!jwQ%=4{FYP( zJ`}8+n`N7e(%4|1;dx;LXZ zokat8Vu0+EQY6}e18AI&R-*Tk#m{~Z) zVmNTQ^Kv+_L$;Sv&X%-FtlkDB;7iL=+1S)|AVZ@3!B(L%l8E@vPxxp9aFaH?-4)^ z#S{tHh@?n{8>BX%y`%5M5YX^va%F=D}A9Ef5;?eJNk~b z3j?rFptEd}{Z$t8YCtDqN+1-eS?3O8>mA$>!b)kQ=PG znnV+(p*#QyiVF%CW)Kfoc4lGIiOqk1hfx^Bs|IHC*YI09aSMuG-XeP5CN{W-3ix@; zdj6&YS(>v1UQo`8s-9rYf9F$`^5V8vc5Yb?zAFf{dR@)U+kDXN7EEP^iBw8({u&0WVeWe3N^gX`D&1s^;e%68-M@z;K_Os$qH+}+%f9?GY6e<_FZe#0{XxAh~*7U{D{ zvK_*hfFJW9*@Cr=BwOW3qAie+izM4NXfK#uYFl7)6G^s_R6+l{@U=XZ;ToCXQ`XUB z3BJ?dfwf&pd~zdlQ;2yKJh6x&#$#ikRWpr#c^HB5 zjwbdUj1QDqgqV6r#yw%o<>MQx37*Z`k##^d*BdyfbSMXK~iB5stTPk>~trgW* z@jEfF9y!URSozj4S}a2mx&>fEiW+h`5*~3bkSw{9 za3^)uKp*FB0=LWy10Yc|%fzz) delta 3000 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 diff --git a/icons/mob/suit_solgov.dmi b/icons/mob/suit_solgov.dmi index 9806d68b9c150d413f17f679174acb5816579ef1..de20b89c178aca74770435f55e1e28801a5abf39 100644 GIT binary patch delta 356 zcmV-q0h|7{n*z0)0+2d?&u)V-493s!6jpnm_NP}aQ>&?m_7$pN3`7eA#VN42-vMdO zq-n8_NWagHzr>%|!~5yue1+rXT+S5O`VlHPJUy4iVw>1Q1#hoq(Ua}^xP5Rmk)VQI z7l=ltFk7TuSu{2?V0NCbszt*f3!|llOhY1ogN}7S|%>OFtAC zXp!ZVGsVB_j8?JJx9`D_ zs!;0Lqv4xfX;!m%OYet|`b7IrK+ zYh)gTmsG?n2w9)h|RME@d@R^6JT3|!3)AZb^1?nb$avPNbwrYX?RB=)Z z)J^!VygJ`UbrVD&#`zGN$Rexk+_}VB^elr78a}kG2DhPKzh%a^-mK^6;*I^pZu)~l zeqa2J(b#7!=3*{DY|MGc$6NpzDZx)HX`N#`^94d}=uuRHM^U!R4DX|dS<%2&1Bcc| zymF&p&4_zp8ff8Gd|^R(kWfx+FbUZ93wB0cjY;kL02U0aXV!gRFrXgWEV#}xGSWwM zBhT2LLN`z17!CY;@{7h6$s)lXPR2r8E$9C`%$5$PJ?)Qm`3(gH`daA^w4Jk#0Vj-k C&9>

fFDZ*Bkpc$}5i&2ED*3y%A)QbZUMp;I>1wCRXUW9J5Fn}Nq$g7HrI3QjG@4~I) zeHJgm3AFx(+%e3orU`;55Udq>2&1TaZM`YK7-XCev5QDlwCms!N-3`~ndkH+@Y7B!6joR9JLGWpiV4X>fFDZ*Bkpc$}5iy>5dr5C`xXp2AA@s$VNh zm8fD!UcoZwbFgACvK^pr-+_v{OMSNm>G#Ly<1jgjkMn1H6{kyE&lsZhqiDqY({o)d zR;OMx;_bDrdbGDbZ5J`AgrX6L&MCM@46_A1)Rnd&iblNDm469p!0q>r5q_kEfD40r zV=Q1OCh}_JfVvpC1;mkBevT!MH+BI0z{_yAAP3a!MdD*(1`yZ*epO*+2iS|?%G^4x z6MGR#pmPtTj$vkH9Ko{!-WZk#Kd`Eo#;Nj)5tVg5=zuX6?b6$XTuN(9<|%#2IH@g} zCv~NB3huO>{(n-^ct!7KjH&Dp7VJnA{6MAAJ1RxkHnmQUY$FE)2YUnMZ_a*a&9G{s z_d;pXf%8S1oL!Oz2fRvz(|%);GBqlh@&niy@qQ|hVUZ;aL6QFu{L!>CVT;fnRc1-& pQ||vO<|xkBlQ>=4`Ws6t2