Surprisingly accurate too despite being a prototype. - I know there's like, a couple of prototypes issued to some USCM detachments, but we got to have this shit in production one day. + I know there's like, a couple of prototypes issued to some UACM detachments, but we got to have this shit in production one day.
Even as a prototype, it's leagues better than some of the junk we're issued. diff --git a/code/datums/medal_awards.dm b/code/datums/medal_awards.dm index fe4e7e3c0e..64c0ceb33b 100644 --- a/code/datums/medal_awards.dm +++ b/code/datums/medal_awards.dm @@ -179,17 +179,17 @@ GLOBAL_LIST_EMPTY(jelly_awards) return if(!card.registered_ref) - user.visible_message("ERROR: ID card not registered in USCM registry. Potential medal fraud detected.") + user.visible_message("ERROR: ID card not registered in UACM registry. Potential medal fraud detected.") return var/real_owner_ref = card.registered_ref if(real_owner_ref != WEAKREF(user)) - user.visible_message("ERROR: ID card not registered for [user.real_name] in USCM registry. Potential medal fraud detected.") + user.visible_message("ERROR: ID card not registered for [user.real_name] in UACM registry. Potential medal fraud detected.") return if(!(FACTION_USCM in user.faction_group)) - to_chat(user, SPAN_WARNING("Medals only available for USCM personnel.")) + to_chat(user, SPAN_WARNING("Medals only available for UACM personnel.")) return if(length(GLOB.medal_awards)) diff --git a/code/datums/origin/uscm.dm b/code/datums/origin/uscm.dm index 8021ed3fd3..1a82d2daa2 100644 --- a/code/datums/origin/uscm.dm +++ b/code/datums/origin/uscm.dm @@ -42,12 +42,12 @@ /datum/origin/uscm/convict/minor name = ORIGIN_USCM_CONVICT_MINOR - desc = "Where you were born is irrelevant, as far as anyone is concerned you are were convicted for numerous minor crimes and offered a way out: the USCM." + desc = "Where you were born is irrelevant, as far as anyone is concerned you are were convicted for numerous minor crimes and offered a way out: the UACM." /datum/origin/uscm/convict/gang name = ORIGIN_USCM_CONVICT_GANG - desc = "Where you were born is irrelevant, as far as anyone is concerned you are were convicted for gang related crimes and offered a way out: the USCM." + desc = "Where you were born is irrelevant, as far as anyone is concerned you are were convicted for gang related crimes and offered a way out: the UACM." /datum/origin/uscm/convict/smuggling name = ORIGIN_USCM_CONVICT_SMUGGLING - desc = "Where you were born is irrelevant, as far as anyone is concerned you are were convicted for smuggling (and likely some piracy) and offered a way out: the USCM." + desc = "Where you were born is irrelevant, as far as anyone is concerned you are were convicted for smuggling (and likely some piracy) and offered a way out: the UACM." diff --git a/code/datums/skills/freelancer.dm b/code/datums/skills/freelancer.dm index 7f7256318e..977c8fe6cb 100644 --- a/code/datums/skills/freelancer.dm +++ b/code/datums/skills/freelancer.dm @@ -4,7 +4,7 @@ FREELANCERS ----------- */ -//NOTE: Freelancer training is similar to the USCM's, but with additional construction skills +//NOTE: Freelancer training is similar to the UACM's, but with additional construction skills /datum/skills/freelancer name = "Freelancer Private" diff --git a/code/datums/skills/pmc.dm b/code/datums/skills/pmc.dm index df7027e2a7..98afa4eb0e 100644 --- a/code/datums/skills/pmc.dm +++ b/code/datums/skills/pmc.dm @@ -4,7 +4,7 @@ Private Military Contractors ---------------------------- */ -//NOTE: Compared to the USCM, PMCs have additional firearms training, construction skills and policing skills +//NOTE: Compared to the UACM, PMCs have additional firearms training, construction skills and policing skills /datum/skills/pmc name = "PMC Private" diff --git a/code/datums/supply_packs/ammo.dm b/code/datums/supply_packs/ammo.dm index 164511c25c..6fa6cfadaa 100644 --- a/code/datums/supply_packs/ammo.dm +++ b/code/datums/supply_packs/ammo.dm @@ -399,7 +399,7 @@ //This crate has a little bit of everything, mostly okay stuff, but it does have some really unique picks. /datum/supply_packs/ammo_surplus - name = "Surplus ammo crate (various USCM magazines x10)" + name = "Surplus ammo crate (various UACM magazines x10)" randomised_num_contained = 10 contains = list( /obj/item/ammo_magazine/rifle, diff --git a/code/datums/supply_packs/black_market.dm b/code/datums/supply_packs/black_market.dm index e70d47c6be..dae79b93fd 100644 --- a/code/datums/supply_packs/black_market.dm +++ b/code/datums/supply_packs/black_market.dm @@ -58,7 +58,7 @@ black market prices are NOT based on real or in-universe costs. they are based o /* -Non-USCM items, from CLF, UPP, colonies, etc. Mostly combat-related. +Non-UACM items, from CLF, UPP, colonies, etc. Mostly combat-related. */ @@ -624,17 +624,17 @@ Primarily made up of things that would be best utilized, well, shipside. Recreat /* -USCM spare items, miscellaneous gear that's too niche and distant (or restricted) to put in normal req but juuuust USCM-related enough to fit here. +UACM spare items, miscellaneous gear that's too niche and distant (or restricted) to put in normal req but juuuust UACM-related enough to fit here. */ /datum/supply_packs/contraband/surplus group = "Surplus Equipment" -/* - Misc. USCM equipment - */ +/* - Misc. UACM equipment - */ /datum/supply_packs/contraband/surplus/uscm_poncho - name = "surplus USCM poncho crate (x2)" + name = "surplus UACM poncho crate (x2)" dollar_cost = 15 containertype = /obj/structure/largecrate/black_market/poncho crate_heat = -2 @@ -643,7 +643,7 @@ USCM spare items, miscellaneous gear that's too niche and distant (or restricted . = ..() var/obj/item/paper/nope = new(src) nope.name = "automated ASRS note" - nope.info = "Sorry! Your requested order of USCM PONCHO (X2) was not succesfully delivered because: 'No items of that type found in storage.'" + nope.info = "Sorry! Your requested order of UACM PONCHO (X2) was not succesfully delivered because: 'No items of that type found in storage.'" nope.color = "green" nope.update_icon() @@ -691,7 +691,7 @@ USCM spare items, miscellaneous gear that's too niche and distant (or restricted dollar_cost = 50 containertype = /obj/structure/largecrate/black_market -/* - Misc. USCM weaponry - */ +/* - Misc. UACM weaponry - */ /datum/supply_packs/contraband/surplus/mk45_automag name = "surplus MK-45 Automagnum case" @@ -845,7 +845,7 @@ This is where the RO can reclaim their lost honor and purchase the M44 custom, t // Headgear /datum/supply_packs/contraband/deep_storage/bandana_random - name = "USCM Bandana" + name = "UACM Bandana" randomised_num_contained = 1 contains = list( /obj/item/clothing/head/cmbandana, @@ -855,14 +855,14 @@ This is where the RO can reclaim their lost honor and purchase the M44 custom, t containertype = /obj/structure/largecrate/black_market /datum/supply_packs/contraband/deep_storage/uscm_earpiece - name = "USCM Earpiece" + name = "UACM Earpiece" randomised_num_contained = 1 contains = list(/obj/item/clothing/head/headset) dollar_cost = 10 containertype = /obj/structure/largecrate/black_market /datum/supply_packs/contraband/deep_storage/uscm_headband - name = "USCM Headband" + name = "UACM Headband" randomised_num_contained = 1 contains = list( /obj/item/clothing/head/headband, @@ -875,7 +875,7 @@ This is where the RO can reclaim their lost honor and purchase the M44 custom, t containertype = /obj/structure/largecrate/black_market /datum/supply_packs/contraband/deep_storage/uscm_boonie_hat - name = "USCM Boonie Hat" + name = "UACM Boonie Hat" randomised_num_contained = 1 contains = list( /obj/item/clothing/head/cmcap/boonie/tan, diff --git a/code/datums/supply_packs/food.dm b/code/datums/supply_packs/food.dm index 9e0527aed6..979f6d6f66 100644 --- a/code/datums/supply_packs/food.dm +++ b/code/datums/supply_packs/food.dm @@ -155,14 +155,14 @@ group = "Food" /datum/supply_packs/mre - name = "USCM MRE crate(x2)" + name = "UACM MRE crate(x2)" contains = list( /obj/item/ammo_box/magazine/misc/mre, /obj/item/ammo_box/magazine/misc/mre, ) cost = 10 containertype = /obj/structure/closet/crate/supply - containername = "\improper USCM MRE crate(x2)" + containername = "\improper UACM MRE crate(x2)" group = "Food" /datum/supply_packs/funfood diff --git a/code/game/cas_manager/datums/cas_fire_envelope.dm b/code/game/cas_manager/datums/cas_fire_envelope.dm index 864d7f23a3..134ddda100 100644 --- a/code/game/cas_manager/datums/cas_fire_envelope.dm +++ b/code/game/cas_manager/datums/cas_fire_envelope.dm @@ -385,7 +385,7 @@ return ..(marker) var/turf/TU = get_turf(marker.signal_loc) if(!is_ground_level(TU.z) && z_level_restriction) - mission_error = "USCM Dropships can only operate with planetside targets." + mission_error = "UACM Dropships can only operate with planetside targets." return FALSE return ..(marker) diff --git a/code/game/gamemodes/cm_process.dm b/code/game/gamemodes/cm_process.dm index 10b3342b22..b0e561dad1 100644 --- a/code/game/gamemodes/cm_process.dm +++ b/code/game/gamemodes/cm_process.dm @@ -254,7 +254,7 @@ GLOBAL_VAR_INIT(next_admin_bioscan, 30 MINUTES) for(var/mob/living/carbon/human/current_human as anything in GLOB.alive_human_list) if(!(current_human.z && (current_human.z in z_levels) && !istype(current_human.loc, /turf/open/space))) continue - if(current_human.faction in FACTION_LIST_WY || current_human.job == "Corporate Liaison") //The CL is assigned the USCM faction for gameplay purposes + if(current_human.faction in FACTION_LIST_WY || current_human.job == "Corporate Liaison") //The CL is assigned the UACM faction for gameplay purposes num_WY++ num_headcount++ continue diff --git a/code/game/gamemodes/colonialmarines/whiskey_outpost.dm b/code/game/gamemodes/colonialmarines/whiskey_outpost.dm index d8907911e9..5d56d5b497 100644 --- a/code/game/gamemodes/colonialmarines/whiskey_outpost.dm +++ b/code/game/gamemodes/colonialmarines/whiskey_outpost.dm @@ -116,7 +116,7 @@ sleep(10) to_world(SPAN_ROUND_HEADER("The current game mode is - WHISKEY OUTPOST!")) to_world(SPAN_ROUNDBODY("It is the year 2177 on the planet LV-624, five years before the arrival of the USS Almayer and the 2nd 'Falling Falcons' Battalion in the sector")) - to_world(SPAN_ROUNDBODY("The 3rd 'Dust Raiders' Battalion is charged with establishing a USCM presence in the Neroid Sector")) + to_world(SPAN_ROUNDBODY("The 3rd 'Dust Raiders' Battalion is charged with establishing a UACM presence in the Neroid Sector")) to_world(SPAN_ROUNDBODY("[SSmapping.configs[GROUND_MAP].map_name], one of the Dust Raider bases being established in the sector, has come under attack from unrecognized alien forces")) to_world(SPAN_ROUNDBODY("With casualties mounting and supplies running thin, the Dust Raiders at [SSmapping.configs[GROUND_MAP].map_name] must survive for an hour to alert the rest of their battalion in the sector")) to_world(SPAN_ROUNDBODY("Hold out for as long as you can.")) @@ -260,7 +260,7 @@ log_game("Round end result - xenos won") to_world(SPAN_ROUND_HEADER("The Xenos have succesfully defended their hive from colonization.")) to_world(SPAN_ROUNDBODY("Well done, you've secured LV-624 for the hive!")) - to_world(SPAN_ROUNDBODY("It will be another five years before the USCM returns to the Neroid Sector, with the arrival of the 2nd 'Falling Falcons' Battalion and the USS Almayer.")) + to_world(SPAN_ROUNDBODY("It will be another five years before the UACM returns to the Neroid Sector, with the arrival of the 2nd 'Falling Falcons' Battalion and the USS Almayer.")) to_world(SPAN_ROUNDBODY("The xenomorph hive on LV-624 remains unthreatened until then...")) world << sound('sound/misc/Game_Over_Man.ogg') if(round_statistics) diff --git a/code/game/gamemodes/colonialmarines/whiskey_outpost/equipping.dm b/code/game/gamemodes/colonialmarines/whiskey_outpost/equipping.dm index eb3e46a268..ca59279094 100644 --- a/code/game/gamemodes/colonialmarines/whiskey_outpost/equipping.dm +++ b/code/game/gamemodes/colonialmarines/whiskey_outpost/equipping.dm @@ -48,7 +48,7 @@ Destruction in inevitable. At the very least, you can assist in preventing other /datum/job/command/executive/whiskey/generate_entry_message(mob/living/carbon/human/H) . = {"You've been with the commander for as long as you can remember. You've always been the bookish nerd to the Honor Guard Squad Leader's jock; as such, you're the commander's right-hand man. Assist the commander in ensuring that Whiskey Outpost stands long enough for a distress signal to be sent out. -Make the USCM proud!"} +Make the UACM proud!"} //************************************* @@ -79,7 +79,7 @@ You must lead his Honor guard, his elite unit of marines, to protect the command . = {"You were assigned to guard the commander in this hostile enviroment; that hasn't changed. Ensure your extra training and equipment isn't wasted! You've survived through enough battles that you've been entrusted with more training, and can use overwatch consoles, as well as give orders. You're expected to defend not only the commander, but the bunker at large; leave the outside defenses to the marines. -Glory to the commander. Glory to the USCM."} +Glory to the commander. Glory to the UACM."} //************************************* @@ -93,7 +93,7 @@ Glory to the commander. Glory to the USCM."} . = {"You were assigned to guard the commander in this hostile enviroment; that hasn't changed. Ensure your extra training and equipment isn't wasted! You're expected to defend not only the commander, but the bunker at large; leave the outside defenses to the marines. You've been through much, and as such, have been given special-weapons training. Use it well. -Glory to the commander. Glory to the USCM."} +Glory to the commander. Glory to the UACM."} //************************************* @@ -106,7 +106,7 @@ Glory to the commander. Glory to the USCM."} /datum/job/command/police/whiskey/generate_entry_message(mob/living/carbon/human/H) . = {"You were assigned to guard the commander in this hostile enviroment; that hasn't changed. Ensure your extra training and equipment isn't wasted! You're expected to defend not only the commander, but the bunker at large; leave the outside defenses to the marines. -Glory to the commander. Glory to the USCM."} +Glory to the commander. Glory to the UACM."} //************************************* diff --git a/code/game/jobs/job/civilians/other/reporter.dm b/code/game/jobs/job/civilians/other/reporter.dm index c681768f93..0a304ed8f4 100644 --- a/code/game/jobs/job/civilians/other/reporter.dm +++ b/code/game/jobs/job/civilians/other/reporter.dm @@ -25,7 +25,7 @@ /datum/job/civilian/reporter/generate_entry_message(mob/living/carbon/human/H) if(military) - . = {"The USCM has assigned you to the [MAIN_SHIP_NAME] to better handle messaging on how things run in the Neroid Sector. Get out there and show the universe that the USCM is doing great things!"} + . = {"The UACM has assigned you to the [MAIN_SHIP_NAME] to better handle messaging on how things run in the Neroid Sector. Get out there and show the universe that the UACM is doing great things!"} else . = {"What a scoop! You've been assigned to the [MAIN_SHIP_NAME] to see what kinda mischief they'd get into and it seems trouble is here! This could be the story of the sector! 'Brave Marines responding to dangerous distress signal!' It'd surely get Mr. Parkerson to notice you in the office if you brought him a story like this!"} diff --git a/code/game/jobs/job/civilians/other/survivors.dm b/code/game/jobs/job/civilians/other/survivors.dm index 07598483b8..ce9c28abda 100644 --- a/code/game/jobs/job/civilians/other/survivors.dm +++ b/code/game/jobs/job/civilians/other/survivors.dm @@ -82,9 +82,9 @@ tell_survivor_story(survivor) if(hostile) - to_chat(survivor, SPAN_HIGHDANGER("You are HOSTILE to the USCM!")) + to_chat(survivor, SPAN_HIGHDANGER("You are HOSTILE to the UACM!")) else - to_chat(survivor, SPAN_XENOHIGHDANGER("You are NON-HOSTILE to the USCM!")) + to_chat(survivor, SPAN_XENOHIGHDANGER("You are NON-HOSTILE to the UACM!")) /datum/job/civilian/survivor/proc/tell_survivor_story(mob/living/carbon/human/H) var/list/survivor_story = list( diff --git a/code/game/jobs/job/civilians/support/cmo.dm b/code/game/jobs/job/civilians/support/cmo.dm index 835f16f7d8..b7875ae348 100644 --- a/code/game/jobs/job/civilians/support/cmo.dm +++ b/code/game/jobs/job/civilians/support/cmo.dm @@ -6,7 +6,7 @@ selection_class = "job_cmo" flags_startup_parameters = ROLE_ADD_TO_DEFAULT gear_preset = /datum/equipment_preset/uscm_ship/uscm_medical/cmo - entry_message_body = "You're a commissioned officer of the USCM. You have authority over everything related to Medbay and Research, only able to be overriden by the XO and CO. You are in charge of medical staff, surgery, chemistry, stimulants and keeping the marines healthy overall." + entry_message_body = "You're a commissioned officer of the UACM. You have authority over everything related to Medbay and Research, only able to be overriden by the XO and CO. You are in charge of medical staff, surgery, chemistry, stimulants and keeping the marines healthy overall." AddTimelock(/datum/job/civilian/professor, list( JOB_MEDIC_ROLES = 10 HOURS diff --git a/code/game/jobs/job/civilians/support/doctor.dm b/code/game/jobs/job/civilians/support/doctor.dm index ff1b2146be..7a44a222d9 100644 --- a/code/game/jobs/job/civilians/support/doctor.dm +++ b/code/game/jobs/job/civilians/support/doctor.dm @@ -32,9 +32,9 @@ //check what job option you took and generate the corresponding the good texte. /datum/job/civilian/doctor/generate_entry_message(mob/living/carbon/human/H) if(doctor) - . = {"You're a commissioned officer of the USCM, though you are not in the ship's chain of command. You are a doctor and tasked with keeping the marines healthy and strong, usually in the form of surgery. You are a jack of all trades in medicine: you can medicate, perform surgery and produce pharmaceuticals. If you do not know what you are doing, mentorhelp so a mentor can assist you."} + . = {"You're a commissioned officer of the UACM, though you are not in the ship's chain of command. You are a doctor and tasked with keeping the marines healthy and strong, usually in the form of surgery. You are a jack of all trades in medicine: you can medicate, perform surgery and produce pharmaceuticals. If you do not know what you are doing, mentorhelp so a mentor can assist you."} else - . = {"You're a commissioned officer of the USCM, though you are not in the ship's chain of command. You are a surgeon and tasked with keeping the marines healthy and strong, usually in the form of surgery. You are a doctor that specializes in surgery, but you are also very capable in pharmacy and triage. If you do not know what you are doing, mentorhelp so a mentor can assist you."} + . = {"You're a commissioned officer of the UACM, though you are not in the ship's chain of command. You are a surgeon and tasked with keeping the marines healthy and strong, usually in the form of surgery. You are a doctor that specializes in surgery, but you are also very capable in pharmacy and triage. If you do not know what you are doing, mentorhelp so a mentor can assist you."} /datum/job/civilian/doctor/set_spawn_positions(count) spawn_positions = doc_slot_formula(count) diff --git a/code/game/jobs/job/civilians/support/researcher.dm b/code/game/jobs/job/civilians/support/researcher.dm index 21163f2795..4ee0a8b88d 100644 --- a/code/game/jobs/job/civilians/support/researcher.dm +++ b/code/game/jobs/job/civilians/support/researcher.dm @@ -10,7 +10,7 @@ selection_class = "job_researcher" flags_startup_parameters = ROLE_ADD_TO_DEFAULT gear_preset = /datum/equipment_preset/uscm_ship/uscm_medical/researcher - entry_message_body = "You're a commissioned officer of the USCM, though you are not in the ship's chain of command. You are tasked with researching and developing new medical treatments, helping your fellow doctors, and generally learning new things. Your role involves a lot of roleplaying, but you can perform the function of a regular doctor. Do not hand out things to Marines without getting permission from your supervisor." + entry_message_body = "You're a commissioned officer of the UACM, though you are not in the ship's chain of command. You are tasked with researching and developing new medical treatments, helping your fellow doctors, and generally learning new things. Your role involves a lot of roleplaying, but you can perform the function of a regular doctor. Do not hand out things to Marines without getting permission from your supervisor." /datum/job/civilian/researcher/set_spawn_positions(count) spawn_positions = rsc_slot_formula(count) diff --git a/code/game/jobs/job/civilians/support/synthetic.dm b/code/game/jobs/job/civilians/support/synthetic.dm index 70060fb36a..f09a1d1638 100644 --- a/code/game/jobs/job/civilians/support/synthetic.dm +++ b/code/game/jobs/job/civilians/support/synthetic.dm @@ -9,7 +9,7 @@ flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADMIN_NOTIFY|ROLE_WHITELISTED|ROLE_CUSTOM_SPAWN flags_whitelist = WHITELIST_SYNTHETIC gear_preset = /datum/equipment_preset/synth/uscm - entry_message_body = "You are a Synthetic! You are held to a higher standard and are required to obey not only the Server Rules but Marine Law and Synthetic Rules. Failure to do so may result in your White-list Removal. Your primary job is to support and assist all USCM Departments and Personnel on-board. In addition, being a Synthetic gives you knowledge in every field and specialization possible on-board the ship. As a Synthetic you answer to the acting commanding officer. Special circumstances may change this!" + entry_message_body = "You are a Synthetic! You are held to a higher standard and are required to obey not only the Server Rules but Marine Law and Synthetic Rules. Failure to do so may result in your White-list Removal. Your primary job is to support and assist all UACM Departments and Personnel on-board. In addition, being a Synthetic gives you knowledge in every field and specialization possible on-board the ship. As a Synthetic you answer to the acting commanding officer. Special circumstances may change this!" /datum/job/civilian/synthetic/New() . = ..() diff --git a/code/game/jobs/job/command/auxiliary/intel.dm b/code/game/jobs/job/command/auxiliary/intel.dm index 9905bc9d37..7554024871 100644 --- a/code/game/jobs/job/command/auxiliary/intel.dm +++ b/code/game/jobs/job/command/auxiliary/intel.dm @@ -7,8 +7,8 @@ scaled = 1 supervisors = "the auxiliary support officer" flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD - gear_preset = "USCM Intelligence Officer (IO) (Cryo)" - entry_message_body = "Your job is to assist the marines in collecting intelligence related to the current operation to better inform command of their opposition. You are in charge of gathering any data disks, folders, and notes you may find on the operational grounds and decrypt them to grant the USCM additional resources." + gear_preset = "UACM Intelligence Officer (IO) (Cryo)" + entry_message_body = "Your job is to assist the marines in collecting intelligence related to the current operation to better inform command of their opposition. You are in charge of gathering any data disks, folders, and notes you may find on the operational grounds and decrypt them to grant the UACM additional resources." /datum/job/command/intel/set_spawn_positions(count) spawn_positions = int_slot_formula(count) diff --git a/code/game/jobs/job/command/auxiliary/senior.dm b/code/game/jobs/job/command/auxiliary/senior.dm index 014db9569b..8bdf1fd75f 100644 --- a/code/game/jobs/job/command/auxiliary/senior.dm +++ b/code/game/jobs/job/command/auxiliary/senior.dm @@ -7,7 +7,7 @@ job_options = list("Gunnery Sergeant" = "GySGT", "Master Sergeant" = "MSgt", "First Sergeant" = "1Sgt", "Master Gunnery Sergeant" = "MGySgt", "Sergeant Major" = "SgtMaj") /datum/job/command/senior/on_config_load() - entry_message_body = "You are held to a higher standard and are required to obey not only the Server Rules but Marine Law and Standard Operating Procedure. Failure to do so may result in your Mentorship Removal. Your primary job is to teach others the game and its mechanics, and offer advice to all USCM Departments and Personnel on-board." + entry_message_body = "You are held to a higher standard and are required to obey not only the Server Rules but Marine Law and Standard Operating Procedure. Failure to do so may result in your Mentorship Removal. Your primary job is to teach others the game and its mechanics, and offer advice to all UACM Departments and Personnel on-board." return ..() /datum/job/command/senior/announce_entry_message(mob/living/carbon/human/H) diff --git a/code/game/jobs/job/command/cic/captain.dm b/code/game/jobs/job/command/cic/captain.dm index 72f8613519..9b5329eb10 100644 --- a/code/game/jobs/job/command/cic/captain.dm +++ b/code/game/jobs/job/command/cic/captain.dm @@ -1,7 +1,7 @@ //Commander /datum/job/command/commander title = JOB_CO - supervisors = "USCM high command" + supervisors = "UACM high command" selection_class = "job_co" flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADMIN_NOTIFY|ROLE_WHITELISTED flags_whitelist = WHITELIST_COMMANDER diff --git a/code/game/jobs/job/command/cic/executive.dm b/code/game/jobs/job/command/cic/executive.dm index f717a03e12..67f291770f 100644 --- a/code/game/jobs/job/command/cic/executive.dm +++ b/code/game/jobs/job/command/cic/executive.dm @@ -5,7 +5,7 @@ gear_preset = /datum/equipment_preset/uscm_ship/xo /datum/job/command/executive/generate_entry_message(mob/living/carbon/human/H) - entry_message_body = "You are second in command aboard the [MAIN_SHIP_NAME], and are in next in the chain of command after the Commanding Officer. Where applicable, you must abide by the Commanding Officer Code of Conduct. You may need to fill in for other duties if areas are understaffed, and you are given access to do so. Make the USCM proud!" + entry_message_body = "You are second in command aboard the [MAIN_SHIP_NAME], and are in next in the chain of command after the Commanding Officer. Where applicable, you must abide by the Commanding Officer Code of Conduct. You may need to fill in for other duties if areas are understaffed, and you are given access to do so. Make the UACM proud!" return ..() /datum/job/command/executive/generate_entry_conditions(mob/living/M, whitelist_status) diff --git a/code/game/jobs/job/logistics/engi/ordnance_tech.dm b/code/game/jobs/job/logistics/engi/ordnance_tech.dm index 43a8a7122a..2406750cd9 100644 --- a/code/game/jobs/job/logistics/engi/ordnance_tech.dm +++ b/code/game/jobs/job/logistics/engi/ordnance_tech.dm @@ -9,7 +9,7 @@ selection_class = "job_ot" flags_startup_parameters = ROLE_ADD_TO_DEFAULT gear_preset = /datum/equipment_preset/uscm_ship/ordn - entry_message_body = "Your job is to maintain the integrity of the USCM weapons, munitions and equipment, including the orbital cannon. You can use the workshop in the portside hangar to construct new armaments for the marines. However you remain one of the more flexible roles on the ship and as such may receive other menial tasks from your superiors." + entry_message_body = "Your job is to maintain the integrity of the UACM weapons, munitions and equipment, including the orbital cannon. You can use the workshop in the portside hangar to construct new armaments for the marines. However you remain one of the more flexible roles on the ship and as such may receive other menial tasks from your superiors." /datum/job/logistics/otech/set_spawn_positions(count) spawn_positions = ot_slot_formula(count) diff --git a/code/game/machinery/ARES/ARES_interface.dm b/code/game/machinery/ARES/ARES_interface.dm index 0e45d5ee17..3bd5b8479e 100644 --- a/code/game/machinery/ARES/ARES_interface.dm +++ b/code/game/machinery/ARES/ARES_interface.dm @@ -398,7 +398,7 @@ return FALSE if(SShijack.evac_admin_denied) - to_chat(usr, SPAN_WARNING("The USCM has placed a lock on deploying the evacuation pods.")) + to_chat(usr, SPAN_WARNING("The UACM has placed a lock on deploying the evacuation pods.")) playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) return FALSE @@ -436,7 +436,7 @@ if((R_ADMIN|R_MOD) & admin.admin_holder.rights) playsound_client(admin,'sound/effects/sos-morse-code.ogg',10) SSticker.mode.request_ert(usr, TRUE) - to_chat(usr, SPAN_NOTICE("A distress beacon request has been sent to USCM High Command.")) + to_chat(usr, SPAN_NOTICE("A distress beacon request has been sent to UACM High Command.")) COOLDOWN_START(datacore, ares_distress_cooldown, COOLDOWN_COMM_REQUEST) return TRUE @@ -462,10 +462,10 @@ if((R_ADMIN|R_MOD) & admin.admin_holder.rights) playsound_client(admin,'sound/effects/sos-morse-code.ogg',10) message_admins("[key_name(usr)] has requested use of Nuclear Ordnance (via ARES)! Reason: [reason] [CC_MARK(usr)] (APPROVE) (DENY) [ADMIN_JMP_USER(usr)] [CC_REPLY(usr)]") - to_chat(usr, SPAN_NOTICE("A nuclear ordnance request has been sent to USCM High Command for the following reason: [reason]")) + to_chat(usr, SPAN_NOTICE("A nuclear ordnance request has been sent to UACM High Command for the following reason: [reason]")) log_ares_security("Nuclear Ordnance Request", "[last_login] has sent a request for nuclear ordnance for the following reason: [reason]") if(ares_can_interface()) - ai_silent_announcement("[last_login] has sent a request for nuclear ordnance to USCM High Command.", ".V") + ai_silent_announcement("[last_login] has sent a request for nuclear ordnance to UACM High Command.", ".V") ai_silent_announcement("Reason given: [reason].", ".V") COOLDOWN_START(datacore, ares_nuclear_cooldown, COOLDOWN_COMM_DESTRUCT) return TRUE diff --git a/code/game/machinery/ARES/ARES_procs.dm b/code/game/machinery/ARES/ARES_procs.dm index 64a30a230d..6d451af94d 100644 --- a/code/game/machinery/ARES/ARES_procs.dm +++ b/code/game/machinery/ARES/ARES_procs.dm @@ -200,11 +200,11 @@ GLOBAL_LIST_INIT(maintenance_categories, list( if(ARES_ACCESS_CE)//5 return "Chief Engineer" if(ARES_ACCESS_SYNTH)//6 - return "USCM Synthetic" + return "UACM Synthetic" if(ARES_ACCESS_CO)//7 return "[MAIN_SHIP_NAME] Commanding Officer" if(ARES_ACCESS_HIGH)//8 - return "USCM High Command" + return "UACM High Command" if(ARES_ACCESS_WY_COMMAND)//9 return "Weyland-Yutani Directorate" if(ARES_ACCESS_DEBUG)//10 diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 76ff409669..341aea62c1 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -559,7 +559,7 @@ /obj/structure/machinery/autolathe/armylathe name = "\improper Armylathe" - desc = "A specialized autolathe made for printing USCM weaponry and parts." + desc = "A specialized autolathe made for printing UACM weaponry and parts." icon_state = "armylathe" base_state = "armylathe" recipes = null diff --git a/code/game/machinery/bioprinter.dm b/code/game/machinery/bioprinter.dm index 65f6fe1842..2a2694a689 100644 --- a/code/game/machinery/bioprinter.dm +++ b/code/game/machinery/bioprinter.dm @@ -2,7 +2,7 @@ /obj/structure/machinery/bioprinter name = "\improper Weyland-Yutani synthetic limb printer 2000" - desc = "A machine that can produce synthetic limbs of dubious quality. Smells of smoke and battery acid. The USCM has recently rejected an offer for the 3000 series, which can also print synthetic organs, on the basis of unreliability." + desc = "A machine that can produce synthetic limbs of dubious quality. Smells of smoke and battery acid. The UACM has recently rejected an offer for the 3000 series, which can also print synthetic organs, on the basis of unreliability." icon = 'icons/obj/structures/machinery/surgery.dmi' anchored = TRUE diff --git a/code/game/machinery/computer/almayer_control.dm b/code/game/machinery/computer/almayer_control.dm index fb9f7a0375..364f3a52bb 100644 --- a/code/game/machinery/computer/almayer_control.dm +++ b/code/game/machinery/computer/almayer_control.dm @@ -121,7 +121,7 @@ return FALSE if(SShijack.evac_admin_denied) - to_chat(usr, SPAN_WARNING("The USCM has placed a lock on deploying the evacuation pods.")) + to_chat(usr, SPAN_WARNING("The UACM has placed a lock on deploying the evacuation pods.")) return FALSE if(!SShijack.initiate_evacuation()) @@ -169,13 +169,13 @@ if(!COOLDOWN_FINISHED(src, cooldown_central)) to_chat(usr, SPAN_WARNING("Arrays are re-cycling. Please stand by.")) return FALSE - var/input = stripped_input(usr, "Please choose a message to transmit to USCM. Please be aware that this process is very expensive, and abuse will lead to termination. Transmission does not guarantee a response. There is a small delay before you may send another message. Be clear and concise.", "To abort, send an empty message.", "") + var/input = stripped_input(usr, "Please choose a message to transmit to UACM. Please be aware that this process is very expensive, and abuse will lead to termination. Transmission does not guarantee a response. There is a small delay before you may send another message. Be clear and concise.", "To abort, send an empty message.", "") if(!input || !(usr in view(1,src)) || !COOLDOWN_FINISHED(src, cooldown_central)) return FALSE high_command_announce(input, usr) to_chat(usr, SPAN_NOTICE("Message transmitted.")) - log_announcement("[key_name(usr)] has made an USCM announcement: [input]") + log_announcement("[key_name(usr)] has made an UACM announcement: [input]") COOLDOWN_START(src, cooldown_central, COOLDOWN_COMM_CENTRAL) . = TRUE @@ -225,7 +225,7 @@ if((R_ADMIN|R_MOD) & admin_client.admin_holder.rights) admin_client << 'sound/effects/sos-morse-code.ogg' SSticker.mode.request_ert(usr) - to_chat(usr, SPAN_NOTICE("A distress beacon request has been sent to USCM Central Command.")) + to_chat(usr, SPAN_NOTICE("A distress beacon request has been sent to UACM Central Command.")) COOLDOWN_START(src, cooldown_request, COOLDOWN_COMM_REQUEST) . = TRUE @@ -256,7 +256,7 @@ if((R_ADMIN|R_MOD) & admin_client.admin_holder.rights) admin_client << 'sound/effects/sos-morse-code.ogg' message_admins("[key_name(usr)] has requested Self-Destruct! [CC_MARK(usr)] (GRANT) (DENY) [ADMIN_JMP_USER(usr)] [CC_REPLY(usr)]") - to_chat(usr, SPAN_NOTICE("A self-destruct request has been sent to USCM Central Command.")) + to_chat(usr, SPAN_NOTICE("A self-destruct request has been sent to UACM Central Command.")) COOLDOWN_START(src, cooldown_destruct, COOLDOWN_COMM_DESTRUCT) . = TRUE diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index b39f59530a..d4759bfe47 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -139,7 +139,7 @@ return FALSE if(SShijack.evac_admin_denied) - to_chat(usr, SPAN_WARNING("The USCM has placed a lock on deploying the evacuation pods.")) + to_chat(usr, SPAN_WARNING("The UACM has placed a lock on deploying the evacuation pods.")) return FALSE if(!SShijack.initiate_evacuation()) @@ -193,7 +193,7 @@ if((R_ADMIN|R_MOD) & C.admin_holder.rights) C << 'sound/effects/sos-morse-code.ogg' SSticker.mode.request_ert(usr) - to_chat(usr, SPAN_NOTICE("A distress beacon request has been sent to USCM Central Command.")) + to_chat(usr, SPAN_NOTICE("A distress beacon request has been sent to UACM Central Command.")) cooldown_request = world.time return TRUE @@ -227,7 +227,7 @@ if((R_ADMIN|R_MOD) & C.admin_holder.rights) C << 'sound/effects/sos-morse-code.ogg' message_admins("[key_name(usr)] has requested Self-Destruct! [CC_MARK(usr)] (GRANT) (DENY) [ADMIN_JMP_USER(usr)] [CC_REPLY(usr)]") - to_chat(usr, SPAN_NOTICE("A self-destruct request has been sent to USCM Central Command.")) + to_chat(usr, SPAN_NOTICE("A self-destruct request has been sent to UACM Central Command.")) cooldown_destruct = world.time return TRUE @@ -275,12 +275,12 @@ if(world.time < cooldown_central + COOLDOWN_COMM_CENTRAL) to_chat(usr, SPAN_WARNING("Arrays recycling. Please stand by.")) return FALSE - var/input = stripped_input(usr, "Please choose a message to transmit to USCM. Please be aware that this process is very expensive, and abuse will lead to termination. Transmission does not guarantee a response. There is a small delay before you may send another message. Be clear and concise.", "To abort, send an empty message.", "") + var/input = stripped_input(usr, "Please choose a message to transmit to UACM. Please be aware that this process is very expensive, and abuse will lead to termination. Transmission does not guarantee a response. There is a small delay before you may send another message. Be clear and concise.", "To abort, send an empty message.", "") if(!input || !(usr in view(1,src)) || authenticated != 2 || world.time < cooldown_central + COOLDOWN_COMM_CENTRAL) return FALSE high_command_announce(input, usr) to_chat(usr, SPAN_NOTICE("Message transmitted.")) - log_announcement("[key_name(usr)] has made an USCM announcement: [input]") + log_announcement("[key_name(usr)] has made an UACM announcement: [input]") cooldown_central = world.time if("securitylevel") @@ -340,7 +340,7 @@ dat += "
Select primary LZ" dat += "
" dat += "
Make an announcement" - dat += GLOB.admins.len > 0 ? "
Send a message to USCM" : "
USCM communication offline" + dat += GLOB.admins.len > 0 ? "
Send a message to UACM" : "
UACM communication offline" dat += "
Award a medal" dat += "
Send Distress Beacon" dat += "
Activate Self-Destruct" diff --git a/code/game/machinery/computer/emails.dm b/code/game/machinery/computer/emails.dm index 794bb3549f..a3fd090e81 100644 --- a/code/game/machinery/computer/emails.dm +++ b/code/game/machinery/computer/emails.dm @@ -7,7 +7,7 @@ icon = 'icons/obj/structures/machinery/computer.dmi' icon_state = "terminal1" var/screen = 0 - var/email_type = /datum/fluff_email/almayer //the type of emails this computer will show. e.g. USCM emails for the personal computers on the Almayer + var/email_type = /datum/fluff_email/almayer //the type of emails this computer will show. e.g. UACM emails for the personal computers on the Almayer var/list/email_list var/selected_mail diff --git a/code/game/machinery/fax_machine.dm b/code/game/machinery/fax_machine.dm index 77a7de45a6..e7f90e5d4a 100644 --- a/code/game/machinery/fax_machine.dm +++ b/code/game/machinery/fax_machine.dm @@ -2,9 +2,9 @@ var/list/obj/structure/machinery/faxmachine/allfaxes = list() var/list/alldepartments = list() #define DEPARTMENT_WY "Weyland-Yutani" -#define DEPARTMENT_HC "USCM High Command" +#define DEPARTMENT_HC "UACM High Command" #define DEPARTMENT_CMB "CMB Incident Command Center, Local Operations" -#define DEPARTMENT_PROVOST "USCM Provost Office" +#define DEPARTMENT_PROVOST "UACM Provost Office" #define DEPARTMENT_PRESS "Various Press Organizations" #define HIGHCOM_DEPARTMENTS list(DEPARTMENT_WY, DEPARTMENT_HC, DEPARTMENT_CMB, DEPARTMENT_PROVOST, DEPARTMENT_PRESS) @@ -276,7 +276,7 @@ var/list/alldepartments = list() /obj/structure/machinery/faxmachine/vv_get_dropdown() . = ..() . += "" - . += "" + . += "" . += "" . += "" . += "" @@ -396,10 +396,10 @@ var/list/alldepartments = list() P.update_icon() switch(network) - if("USCM High Command Quantum Relay") + if("UACM High Command Quantum Relay") var/image/stampoverlay = image('icons/obj/items/paper.dmi') stampoverlay.icon_state = "paper_stamp-uscm" - P.stamps += "
This paper has been stamped by the USCM High Command Quantum Relay." + P.stamps += "
This paper has been stamped by the UACM High Command Quantum Relay." if("NC4 UA Federal Secure Network - CMB Relay") var/image/stampoverlay = image('icons/obj/items/paper.dmi') stampoverlay.icon_state = "paper_stamp-cmb" @@ -440,9 +440,9 @@ var/list/alldepartments = list() network = "Weyland-Yutani Quantum Relay" /obj/structure/machinery/faxmachine/uscm - name = "\improper USCM Military Fax Machine" - department = "USCM Local Operations" - network = "USCM Encrypted Network" + name = "\improper UACM Military Fax Machine" + department = "UACM Local Operations" + network = "UACM Encrypted Network" target_department = DEPARTMENT_HC /obj/structure/machinery/faxmachine/uscm/command @@ -454,10 +454,10 @@ var/list/alldepartments = list() /obj/structure/machinery/faxmachine/uscm/command/highcom department = DEPARTMENT_HC target_department = "Commanding Officer" - network = "USCM High Command Quantum Relay" + network = "UACM High Command Quantum Relay" /obj/structure/machinery/faxmachine/uscm/brig - name = "\improper USCM Provost Fax Machine" + name = "\improper UACM Provost Fax Machine" department = "Brig" target_department = DEPARTMENT_PROVOST @@ -467,7 +467,7 @@ var/list/alldepartments = list() /obj/structure/machinery/faxmachine/uscm/brig/provost department = DEPARTMENT_PROVOST target_department = "Brig" - network = "USCM High Command Quantum Relay" + network = "UACM High Command Quantum Relay" /datum/fax var/data diff --git a/code/game/machinery/vending/cm_vending.dm b/code/game/machinery/vending/cm_vending.dm index fee6f9a53c..c5d02ca57d 100644 --- a/code/game/machinery/vending/cm_vending.dm +++ b/code/game/machinery/vending/cm_vending.dm @@ -563,7 +563,7 @@ GLOBAL_LIST_EMPTY(vending_products) available_specialist_sets -= p_name else if(vendor_role.Find(JOB_SYNTH)) if(user.job != JOB_SYNTH) - to_chat(user, SPAN_WARNING("Only USCM Synthetics may vend experimental tool tokens.")) + to_chat(user, SPAN_WARNING("Only UACM Synthetics may vend experimental tool tokens.")) vend_fail() return FALSE diff --git a/code/game/machinery/vending/vending_types.dm b/code/game/machinery/vending/vending_types.dm index 445a5c5b9f..1a66701dc8 100644 --- a/code/game/machinery/vending/vending_types.dm +++ b/code/game/machinery/vending/vending_types.dm @@ -223,7 +223,7 @@ /obj/structure/machinery/vending/security name = "\improper ColMarTech Military Police Vendor" - desc = "A USCM Military Police vendor." + desc = "A UACM Military Police vendor." product_ads = "Crack capitalist skulls!;Beat some heads in!;Don't forget - harm is good!;Your weapons are right here.;Handcuffs!;Freeze, scumbag!;Don't tase me bro!;Tase them, bro.;Why not have a donut?" icon_state = "sec" icon_deny = "sec-deny" diff --git a/code/game/machinery/vending/vendor_types/antag/antag_clothing.dm b/code/game/machinery/vending/vendor_types/antag/antag_clothing.dm index 85210e1aaa..14db62be1f 100644 --- a/code/game/machinery/vending/vendor_types/antag/antag_clothing.dm +++ b/code/game/machinery/vending/vendor_types/antag/antag_clothing.dm @@ -3,7 +3,7 @@ /obj/structure/machinery/cm_vending/clothing/antag name = "\improper Suspicious Automated Equipment Rack" - desc = "While similar in function to ColMarTech automated racks, this one is clearly not of USCM origin. Contains various equipment." + desc = "While similar in function to ColMarTech automated racks, this one is clearly not of UACM origin. Contains various equipment." icon_state = "antag_clothing" req_one_access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_UPP_GENERAL, ACCESS_CLF_GENERAL) req_access = null diff --git a/code/game/machinery/vending/vendor_types/antag/antag_gear.dm b/code/game/machinery/vending/vendor_types/antag/antag_gear.dm index 3e847b4919..d577b81866 100644 --- a/code/game/machinery/vending/vendor_types/antag/antag_gear.dm +++ b/code/game/machinery/vending/vendor_types/antag/antag_gear.dm @@ -2,7 +2,7 @@ /obj/structure/machinery/cm_vending/gear/antag name = "\improper Suspicious Automated Gear Rack" - desc = "While similar in function to ColMarTech automated racks, this one is clearly not of USCM origin. Contains various gear." + desc = "While similar in function to ColMarTech automated racks, this one is clearly not of UACM origin. Contains various gear." icon_state = "gear" req_one_access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_UPP_GENERAL, ACCESS_CLF_GENERAL) diff --git a/code/game/machinery/vending/vendor_types/antag/antag_guns_snowflake.dm b/code/game/machinery/vending/vendor_types/antag/antag_guns_snowflake.dm index 73a2c7346a..a6cb8748ed 100644 --- a/code/game/machinery/vending/vendor_types/antag/antag_guns_snowflake.dm +++ b/code/game/machinery/vending/vendor_types/antag/antag_guns_snowflake.dm @@ -2,7 +2,7 @@ /obj/structure/machinery/cm_vending/gear/antag_guns name = "\improper Suspicious Automated Guns Rack" - desc = "While similar in function to ColMarTech automated racks, this one is clearly not of USCM origin. Contains various weapons, ammunition and explosives." + desc = "While similar in function to ColMarTech automated racks, this one is clearly not of UACM origin. Contains various weapons, ammunition and explosives." icon_state = "antag_guns" req_one_access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_UPP_GENERAL, ACCESS_CLF_GENERAL) req_access = null diff --git a/code/game/machinery/vending/vendor_types/antag/antag_guns_sorted.dm b/code/game/machinery/vending/vendor_types/antag/antag_guns_sorted.dm index ab319f1eca..94094d2267 100644 --- a/code/game/machinery/vending/vendor_types/antag/antag_guns_sorted.dm +++ b/code/game/machinery/vending/vendor_types/antag/antag_guns_sorted.dm @@ -2,7 +2,7 @@ /obj/structure/machinery/cm_vending/sorted/cargo_guns/antag_guns name = "\improper Suspicious Automated Guns Rack" - desc = "While similar in function to ColMarTech automated racks, this one is clearly not of USCM origin. Contains various weapons." + desc = "While similar in function to ColMarTech automated racks, this one is clearly not of UACM origin. Contains various weapons." icon_state = "antag_guns" req_one_access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_UPP_GENERAL, ACCESS_CLF_GENERAL) req_access = null diff --git a/code/game/machinery/vending/vendor_types/crew/commanding_officer.dm b/code/game/machinery/vending/vendor_types/crew/commanding_officer.dm index d7d49a8ae0..e81b181f7b 100644 --- a/code/game/machinery/vending/vendor_types/crew/commanding_officer.dm +++ b/code/game/machinery/vending/vendor_types/crew/commanding_officer.dm @@ -58,7 +58,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_commanding_officer, list( /obj/structure/machinery/cm_vending/gear/commanding_officer name = "\improper ColMarTech Commanding Officer Weapon Rack" - desc = "An automated weapons rack for the Commanding Officer. It features a robust selection of weaponry meant only for the USCM's top officers." + desc = "An automated weapons rack for the Commanding Officer. It features a robust selection of weaponry meant only for the UACM's top officers." req_access = list(ACCESS_MARINE_SENIOR) vendor_role = list(JOB_CO, JOB_WO_CO) icon_state = "guns" @@ -123,7 +123,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_commanding_officer, list( /obj/structure/machinery/cm_vending/clothing/commanding_officer name = "\improper ColMarTech Commanding Officer Equipment Rack" - desc = "An automated equipment vendor for the Commanding Officer. Contains a prime selection of equipment for only the USCM's top officers." + desc = "An automated equipment vendor for the Commanding Officer. Contains a prime selection of equipment for only the UACM's top officers." req_access = list(ACCESS_MARINE_SENIOR) vendor_role = list(JOB_CO, JOB_WO_CO) diff --git a/code/game/machinery/vending/vendor_types/crew/sea.dm b/code/game/machinery/vending/vendor_types/crew/sea.dm index cb6698c6f7..4b17715bf1 100644 --- a/code/game/machinery/vending/vendor_types/crew/sea.dm +++ b/code/game/machinery/vending/vendor_types/crew/sea.dm @@ -56,7 +56,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_sea, list( list("M3-L Pattern Light Armor", 0, /obj/item/clothing/suit/storage/marine/light, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_RECOMMENDED), list("M3 Pattern Padded Armor", 0, /obj/item/clothing/suit/storage/marine/padded, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), list("Bulletproof Vest", 0, /obj/item/clothing/suit/armor/bulletproof, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), - list("USCM Service Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/service, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), + list("UACM Service Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/service, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/crew/senior_officers.dm b/code/game/machinery/vending/vendor_types/crew/senior_officers.dm index b5bc42eabb..d06c4c4e98 100644 --- a/code/game/machinery/vending/vendor_types/crew/senior_officers.dm +++ b/code/game/machinery/vending/vendor_types/crew/senior_officers.dm @@ -106,7 +106,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_chief_engineer, list( list("Blue Hazard Vest", 0, /obj/item/clothing/suit/storage/hazardvest/blue, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), list("Orange Hazard Vest", 0, /obj/item/clothing/suit/storage/hazardvest, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), list("Yellow Hazard Vest", 0, /obj/item/clothing/suit/storage/hazardvest/yellow, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), - list("USCM Service Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/service, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), + list("UACM Service Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/service, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), list("BACKPACK (CHOOSE 1)", 0, null, null, null), list("Leather Satchel", 0, /obj/item/storage/backpack/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), @@ -229,8 +229,8 @@ GLOBAL_LIST_INIT(cm_vending_clothing_cmo, list( list("BAG (CHOOSE 1)", 0, null, null, null), list("Medical Satchel", 0, /obj/item/storage/backpack/marine/satchel/medic, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_RECOMMENDED), list("Medical Backpack", 0, /obj/item/storage/backpack/marine/medic, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), - list("USCM Satchel", 0, /obj/item/storage/backpack/marine/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), - list("USCM Backpack", 0, /obj/item/storage/backpack/marine, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), + list("UACM Satchel", 0, /obj/item/storage/backpack/marine/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), + list("UACM Backpack", 0, /obj/item/storage/backpack/marine, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), list("PERSONAL SIDEARM (CHOOSE 1)", 0, null, null, null), list("M4A3 Service Pistol", 0, /obj/item/storage/belt/gun/m4a3/full, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_REGULAR), @@ -300,7 +300,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_xo, list( list("PATCHES", 0, null, null, null), list("Solar Devils Shoulder Patch", 0, /obj/item/clothing/accessory/patch/devils, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_MANDATORY), - list("USCM Shoulder Patch", 0, /obj/item/clothing/accessory/patch, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), + list("UACM Shoulder Patch", 0, /obj/item/clothing/accessory/patch, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("POUCHES (CHOOSE 2)", 0, null, null, null), list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/crew/synthetic.dm b/code/game/machinery/vending/vendor_types/crew/synthetic.dm index 1526613988..d89a60ab0d 100644 --- a/code/game/machinery/vending/vendor_types/crew/synthetic.dm +++ b/code/game/machinery/vending/vendor_types/crew/synthetic.dm @@ -90,8 +90,8 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth, list( list("UNIFORM (CHOOSE 1)", 0, null, null, null), list("Uniform, Outdated Synth", 0, /obj/item/clothing/under/rank/synthetic/old, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), list("Uniform, Standard Synth", 0, /obj/item/clothing/under/rank/synthetic, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), - list("USCM Standard Uniform", 0, /obj/item/clothing/under/marine, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), - list("USCM Medical Uniform", 0, /obj/item/clothing/under/marine/medic, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), + list("UACM Standard Uniform", 0, /obj/item/clothing/under/marine, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), + list("UACM Medical Uniform", 0, /obj/item/clothing/under/marine/medic, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), list("WEBBING (CHOOSE 1)", 0, null, null, null), list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), @@ -179,19 +179,19 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth, list( //------------SNOWFLAKE VENDOR--------------- GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list( - list("USCM UNIFORMS", 0, null, null, null), + list("UACM UNIFORMS", 0, null, null, null), list("Medical Scrubs, Blue", 12, /obj/item/clothing/under/rank/medical/blue, null, VENDOR_ITEM_REGULAR), list("Medical Scrubs, Light Blue", 0, /obj/item/clothing/under/rank/medical/lightblue, null, VENDOR_ITEM_REGULAR), list("Medical Scrubs, Green", 12, /obj/item/clothing/under/rank/medical/green, null, VENDOR_ITEM_REGULAR), list("Medical Scrubs, Purple", 12, /obj/item/clothing/under/rank/medical/purple, null, VENDOR_ITEM_REGULAR), list("Medical Scrubs, White", 12, /obj/item/clothing/under/rank/medical, null, VENDOR_ITEM_REGULAR), - list("USCM Service Uniform", 12, /obj/item/clothing/under/marine/officer/bridge, null, VENDOR_ITEM_REGULAR), - list("USCM Flightsuit", 12, /obj/item/clothing/under/rank/synthetic/flight, null, VENDOR_ITEM_REGULAR), - list("USCM Engineers Uniform", 12, /obj/item/clothing/under/marine/engineer/standard, null, VENDOR_ITEM_REGULAR), - list("USCM Engineers Uniform (Darker)", 12, /obj/item/clothing/under/marine/engineer/darker, null, VENDOR_ITEM_REGULAR), - list("USCM Engineering Officers Uniform", 12, /obj/item/clothing/under/marine/officer/engi, null, VENDOR_ITEM_REGULAR), - list("USCM Military Police Uniform", 12, /obj/item/clothing/under/marine/mp/standard, null, VENDOR_ITEM_REGULAR), - list("USCM Military Police Uniform (Darker)", 12, /obj/item/clothing/under/marine/mp/darker, null, VENDOR_ITEM_REGULAR), + list("UACM Service Uniform", 12, /obj/item/clothing/under/marine/officer/bridge, null, VENDOR_ITEM_REGULAR), + list("UACM Flightsuit", 12, /obj/item/clothing/under/rank/synthetic/flight, null, VENDOR_ITEM_REGULAR), + list("UACM Engineers Uniform", 12, /obj/item/clothing/under/marine/engineer/standard, null, VENDOR_ITEM_REGULAR), + list("UACM Engineers Uniform (Darker)", 12, /obj/item/clothing/under/marine/engineer/darker, null, VENDOR_ITEM_REGULAR), + list("UACM Engineering Officers Uniform", 12, /obj/item/clothing/under/marine/officer/engi, null, VENDOR_ITEM_REGULAR), + list("UACM Military Police Uniform", 12, /obj/item/clothing/under/marine/mp/standard, null, VENDOR_ITEM_REGULAR), + list("UACM Military Police Uniform (Darker)", 12, /obj/item/clothing/under/marine/mp/darker, null, VENDOR_ITEM_REGULAR), list("NON-STANDARD UNIFORMS", 0, null, null, null), list("White T-Shirt and Brown Jeans", 12, /obj/item/clothing/under/tshirt/w_br, null, VENDOR_ITEM_REGULAR), @@ -269,8 +269,8 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list( list("Hazard Vest(Yellow)", 12, /obj/item/clothing/suit/storage/hazardvest/yellow, null, VENDOR_ITEM_REGULAR), list("Hazard Vest(Black)", 12, /obj/item/clothing/suit/storage/hazardvest/black, null, VENDOR_ITEM_REGULAR), list("Synthetic's Snow Suit", 12, /obj/item/clothing/suit/storage/snow_suit/synth, null, VENDOR_ITEM_REGULAR), - list("USCM Service Jacket", 12, /obj/item/clothing/suit/storage/jacket/marine/service, null, VENDOR_ITEM_REGULAR), - list("USCM MP Service Jacket", 12, /obj/item/clothing/suit/storage/jacket/marine/service/mp, null, VENDOR_ITEM_REGULAR), + list("UACM Service Jacket", 12, /obj/item/clothing/suit/storage/jacket/marine/service, null, VENDOR_ITEM_REGULAR), + list("UACM MP Service Jacket", 12, /obj/item/clothing/suit/storage/jacket/marine/service/mp, null, VENDOR_ITEM_REGULAR), list("Windbreaker, Brown", 12, /obj/item/clothing/suit/storage/windbreaker/windbreaker_brown, null, VENDOR_ITEM_REGULAR), list("Windbreaker, Grey", 12, /obj/item/clothing/suit/storage/windbreaker/windbreaker_gray, null, VENDOR_ITEM_REGULAR), list("Windbreaker, Green", 12, /obj/item/clothing/suit/storage/windbreaker/windbreaker_green, null, VENDOR_ITEM_REGULAR), @@ -280,25 +280,25 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list( list("Labcoat, Researcher", 12, /obj/item/clothing/suit/storage/labcoat/researcher, null, VENDOR_ITEM_REGULAR), list("Quartermaster Jacket", 12, /obj/item/clothing/suit/storage/RO, null, VENDOR_ITEM_REGULAR), list("Bio Suit", 12, /obj/item/clothing/suit/storage/synthbio, null, VENDOR_ITEM_REGULAR), - list("USCM Poncho (Mission-Specific Camo)", 12, /obj/item/clothing/accessory/poncho, null, VENDOR_ITEM_REGULAR), - list("USCM Poncho (Green)", 12, /obj/item/clothing/accessory/poncho/green, null, VENDOR_ITEM_REGULAR), - list("USCM Poncho (Brown)", 12, /obj/item/clothing/accessory/poncho/brown, null, VENDOR_ITEM_REGULAR), - list("USCM Poncho (Black)", 12, /obj/item/clothing/accessory/poncho/black, null, VENDOR_ITEM_REGULAR), - list("USCM Poncho (Blue)", 12, /obj/item/clothing/accessory/poncho/blue, null, VENDOR_ITEM_REGULAR), - list("USCM Poncho (Purple)", 12, /obj/item/clothing/accessory/poncho/purple, null, VENDOR_ITEM_REGULAR), + list("UACM Poncho (Mission-Specific Camo)", 12, /obj/item/clothing/accessory/poncho, null, VENDOR_ITEM_REGULAR), + list("UACM Poncho (Green)", 12, /obj/item/clothing/accessory/poncho/green, null, VENDOR_ITEM_REGULAR), + list("UACM Poncho (Brown)", 12, /obj/item/clothing/accessory/poncho/brown, null, VENDOR_ITEM_REGULAR), + list("UACM Poncho (Black)", 12, /obj/item/clothing/accessory/poncho/black, null, VENDOR_ITEM_REGULAR), + list("UACM Poncho (Blue)", 12, /obj/item/clothing/accessory/poncho/blue, null, VENDOR_ITEM_REGULAR), + list("UACM Poncho (Purple)", 12, /obj/item/clothing/accessory/poncho/purple, null, VENDOR_ITEM_REGULAR), list("BACKPACK", 0, null, null, null), list("Backpack, Industrial", 12, /obj/item/storage/backpack/industrial, null, VENDOR_ITEM_REGULAR), - list("Backpack, USCM Medical", 12, /obj/item/storage/backpack/marine/medic, null, VENDOR_ITEM_REGULAR), + list("Backpack, UACM Medical", 12, /obj/item/storage/backpack/marine/medic, null, VENDOR_ITEM_REGULAR), list("Chestrig, Technician", 12, /obj/item/storage/backpack/marine/satchel/tech, null, VENDOR_ITEM_REGULAR), - list("Satchel, USCM", 12, /obj/item/storage/backpack/marine/satchel, null, VENDOR_ITEM_REGULAR), + list("Satchel, UACM", 12, /obj/item/storage/backpack/marine/satchel, null, VENDOR_ITEM_REGULAR), list("Satchel, Leather", 12, /obj/item/storage/backpack/satchel, null, VENDOR_ITEM_REGULAR), list("Satchel, Medical", 12, /obj/item/storage/backpack/satchel/med, null, VENDOR_ITEM_REGULAR), - list("USCM RTO Pack", 12, /obj/item/storage/backpack/marine/satchel/rto, null, VENDOR_ITEM_REGULAR), - list("USCM Welderpack", 12, /obj/item/storage/backpack/marine/engineerpack, null, VENDOR_ITEM_REGULAR), - list("USCM Weldersatchel", 12, /obj/item/storage/backpack/marine/engineerpack/satchel, null, VENDOR_ITEM_REGULAR), - list("USCM Welder Chestrig", 12, /obj/item/storage/backpack/marine/engineerpack/welder_chestrig, null, VENDOR_ITEM_REGULAR), + list("UACM RTO Pack", 12, /obj/item/storage/backpack/marine/satchel/rto, null, VENDOR_ITEM_REGULAR), + list("UACM Welderpack", 12, /obj/item/storage/backpack/marine/engineerpack, null, VENDOR_ITEM_REGULAR), + list("UACM Weldersatchel", 12, /obj/item/storage/backpack/marine/engineerpack/satchel, null, VENDOR_ITEM_REGULAR), + list("UACM Welder Chestrig", 12, /obj/item/storage/backpack/marine/engineerpack/welder_chestrig, null, VENDOR_ITEM_REGULAR), list("OTHER", 0, null, null, null), list("Red Armband", 6, /obj/item/clothing/accessory/armband, null, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/food.dm b/code/game/machinery/vending/vendor_types/food.dm index 51749ab2a0..dd16b000a2 100644 --- a/code/game/machinery/vending/vendor_types/food.dm +++ b/code/game/machinery/vending/vendor_types/food.dm @@ -1,7 +1,7 @@ //------------CANTEEN MRE VENDOR--------------- /obj/structure/machinery/cm_vending/sorted/marine_food name = "\improper ColMarTech Food Vendor" - desc = "USCM Food Vendor, containing standard military Prepared Meals." + desc = "UACM Food Vendor, containing standard military Prepared Meals." icon_state = "marine_food" hackable = TRUE unacidable = FALSE @@ -11,17 +11,17 @@ /obj/structure/machinery/cm_vending/sorted/marine_food/populate_product_list(scale) listed_products = list( list("PREPARED MEALS", -1, null, null), - list("USCM Prepared Meal (Chicken)", 15, /obj/item/reagent_container/food/snacks/mre_pack/meal5, VENDOR_ITEM_REGULAR), - list("USCM Prepared Meal (Cornbread)", 15, /obj/item/reagent_container/food/snacks/mre_pack/meal1, VENDOR_ITEM_REGULAR), - list("USCM Prepared Meal (Pasta)", 15, /obj/item/reagent_container/food/snacks/mre_pack/meal3, VENDOR_ITEM_REGULAR), - list("USCM Prepared Meal (Pizza)", 15, /obj/item/reagent_container/food/snacks/mre_pack/meal4, VENDOR_ITEM_REGULAR), - list("USCM Prepared Meal (Pork)", 15, /obj/item/reagent_container/food/snacks/mre_pack/meal2, VENDOR_ITEM_REGULAR), - list("USCM Prepared Meal (Tofu)", 15, /obj/item/reagent_container/food/snacks/mre_pack/meal6, VENDOR_ITEM_REGULAR), - list("USCM Protein Bar", 50, /obj/item/reagent_container/food/snacks/protein_pack, VENDOR_ITEM_REGULAR), + list("UACM Prepared Meal (Chicken)", 15, /obj/item/reagent_container/food/snacks/mre_pack/meal5, VENDOR_ITEM_REGULAR), + list("UACM Prepared Meal (Cornbread)", 15, /obj/item/reagent_container/food/snacks/mre_pack/meal1, VENDOR_ITEM_REGULAR), + list("UACM Prepared Meal (Pasta)", 15, /obj/item/reagent_container/food/snacks/mre_pack/meal3, VENDOR_ITEM_REGULAR), + list("UACM Prepared Meal (Pizza)", 15, /obj/item/reagent_container/food/snacks/mre_pack/meal4, VENDOR_ITEM_REGULAR), + list("UACM Prepared Meal (Pork)", 15, /obj/item/reagent_container/food/snacks/mre_pack/meal2, VENDOR_ITEM_REGULAR), + list("UACM Prepared Meal (Tofu)", 15, /obj/item/reagent_container/food/snacks/mre_pack/meal6, VENDOR_ITEM_REGULAR), + list("UACM Protein Bar", 50, /obj/item/reagent_container/food/snacks/protein_pack, VENDOR_ITEM_REGULAR), list("FLASKS", -1, null, null), list("Canteen", 10, /obj/item/reagent_container/food/drinks/flask/canteen, VENDOR_ITEM_REGULAR), list("Metal Flask", 10, /obj/item/reagent_container/food/drinks/flask, VENDOR_ITEM_REGULAR), - list("USCM Flask", 5, /obj/item/reagent_container/food/drinks/flask/marine, VENDOR_ITEM_REGULAR), + list("UACM Flask", 5, /obj/item/reagent_container/food/drinks/flask/marine, VENDOR_ITEM_REGULAR), list("W-Y Flask", 5, /obj/item/reagent_container/food/drinks/flask/weylandyutani, VENDOR_ITEM_REGULAR) ) diff --git a/code/game/machinery/vending/vendor_types/medical.dm b/code/game/machinery/vending/vendor_types/medical.dm index 52d4e98396..7a29299899 100644 --- a/code/game/machinery/vending/vendor_types/medical.dm +++ b/code/game/machinery/vending/vendor_types/medical.dm @@ -392,7 +392,7 @@ ) /obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited - desc = "Wall-mounted Medical Equipment Dispenser. This version is more limited than standard USCM NanoMeds." + desc = "Wall-mounted Medical Equipment Dispenser. This version is more limited than standard UACM NanoMeds." chem_refill = list( /obj/item/reagent_container/hypospray/autoinjector/skillless, diff --git a/code/game/machinery/vending/vendor_types/requisitions.dm b/code/game/machinery/vending/vendor_types/requisitions.dm index f3c4973c3f..7d86386740 100644 --- a/code/game/machinery/vending/vendor_types/requisitions.dm +++ b/code/game/machinery/vending/vendor_types/requisitions.dm @@ -392,8 +392,8 @@ list("Marine Combat Boots", 20, /obj/item/clothing/shoes/marine, VENDOR_ITEM_REGULAR), list("M276 Ammo Load Rig", 10, /obj/item/storage/belt/marine, VENDOR_ITEM_REGULAR), list("M276 Shotgun Shell Loading Rig", 10, /obj/item/storage/belt/shotgun, VENDOR_ITEM_REGULAR), - list("USCM Satchel", 20, /obj/item/storage/backpack/marine/satchel, VENDOR_ITEM_REGULAR), - list("USCM Uniform", 20, /obj/item/clothing/under/marine, VENDOR_ITEM_REGULAR), + list("UACM Satchel", 20, /obj/item/storage/backpack/marine/satchel, VENDOR_ITEM_REGULAR), + list("UACM Uniform", 20, /obj/item/clothing/under/marine, VENDOR_ITEM_REGULAR), list("ARMOR", -1, null, null), list("M10 Pattern Marine Helmet", 20, /obj/item/clothing/head/helmet/marine, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm index 6539757051..aa3e21763b 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm @@ -59,7 +59,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_engi, list( list("CLOTHING ITEMS", 0, null, null, null), list("Machete Scabbard (Full)", 6, /obj/item/storage/large_holster/machete/full, null, VENDOR_ITEM_REGULAR), list("Machete Pouch (Full)", 8, /obj/item/storage/pouch/machete/full, null, VENDOR_ITEM_REGULAR), - list("USCM Radio Telephone Pack", 15, /obj/item/storage/backpack/marine/satchel/rto, null, VENDOR_ITEM_REGULAR), + list("UACM Radio Telephone Pack", 15, /obj/item/storage/backpack/marine/satchel/rto, null, VENDOR_ITEM_REGULAR), list("Fuel Tank Strap Pouch", 4, /obj/item/storage/pouch/flamertank, null, VENDOR_ITEM_REGULAR), list("Sling Pouch", 6, /obj/item/storage/pouch/sling, null, VENDOR_ITEM_REGULAR), list("Large General Pouch", 6, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm index 81c1941c34..d0b5ef3061 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm @@ -21,7 +21,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_leader, list( list("CLOTHING ITEMS", 0, null, null, null), list("Machete Scabbard (Full)", 4, /obj/item/storage/large_holster/machete/full, null, VENDOR_ITEM_REGULAR), list("Machete Pouch (Full)", 4, /obj/item/storage/pouch/machete/full, null, VENDOR_ITEM_REGULAR), - list("USCM Radio Telephone Pack", 5, /obj/item/storage/backpack/marine/satchel/rto, null, VENDOR_ITEM_REGULAR), + list("UACM Radio Telephone Pack", 5, /obj/item/storage/backpack/marine/satchel/rto, null, VENDOR_ITEM_REGULAR), list("M276 Pattern Combat Toolbelt Rig", 15, /obj/item/storage/belt/gun/utility, null, VENDOR_ITEM_REGULAR), list("Night Vision Optic", 20, /obj/item/device/helmet_visor/night_vision, null, VENDOR_ITEM_RECOMMENDED), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm index 465edd3c24..a35ad8ddd5 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm @@ -74,7 +74,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_medic, list( list("CLOTHING ITEMS", 0, null, null, null), list("Machete Scabbard (Full)", 6, /obj/item/storage/large_holster/machete/full, null, VENDOR_ITEM_REGULAR), list("Machete Pouch (Full)", 8, /obj/item/storage/pouch/machete/full, null, VENDOR_ITEM_REGULAR), - list("USCM Radio Telephone Pack", 15, /obj/item/storage/backpack/marine/satchel/rto, null, VENDOR_ITEM_REGULAR), + list("UACM Radio Telephone Pack", 15, /obj/item/storage/backpack/marine/satchel/rto, null, VENDOR_ITEM_REGULAR), list("Fuel Tank Strap Pouch", 4, /obj/item/storage/pouch/flamertank, null, VENDOR_ITEM_REGULAR), list("Welding Goggles", 3, /obj/item/clothing/glasses/welding, null, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm index 7ba67133b5..eb0127e361 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm @@ -71,7 +71,7 @@ listed_products = list( list("STANDARD EQUIPMENT", -1, null, null, null), list("Marine Combat Boots", round(scale * 15), /obj/item/clothing/shoes/marine/knife, VENDOR_ITEM_REGULAR), - list("USCM Uniform", round(scale * 15), /obj/item/clothing/under/marine, VENDOR_ITEM_REGULAR), + list("UACM Uniform", round(scale * 15), /obj/item/clothing/under/marine, VENDOR_ITEM_REGULAR), list("Marine Combat Gloves", round(scale * 15), /obj/item/clothing/gloves/marine, VENDOR_ITEM_REGULAR), list("M10 Pattern Marine Helmet", round(scale * 15), /obj/item/clothing/head/helmet/marine, VENDOR_ITEM_REGULAR), list("Marine Radio Headset", round(scale * 15), /obj/item/device/radio/headset/almayer/marine, VENDOR_ITEM_REGULAR), @@ -95,8 +95,8 @@ list("BACKPACK", -1, null, null, null), list("Lightweight IMP Backpack", round(scale * 15), /obj/item/storage/backpack/marine, VENDOR_ITEM_REGULAR), - list("USCM Technician Backpack", round(scale * 15), /obj/item/storage/backpack/marine/tech, VENDOR_ITEM_REGULAR), - list("USCM Satchel", round(scale * 15), /obj/item/storage/backpack/marine/satchel, VENDOR_ITEM_REGULAR), + list("UACM Technician Backpack", round(scale * 15), /obj/item/storage/backpack/marine/tech, VENDOR_ITEM_REGULAR), + list("UACM Satchel", round(scale * 15), /obj/item/storage/backpack/marine/satchel, VENDOR_ITEM_REGULAR), list("Technician Chestrig", round(scale * 15), /obj/item/storage/backpack/marine/satchel/tech, VENDOR_ITEM_REGULAR), list("Shotgun Scabbard", round(scale * 5), /obj/item/storage/large_holster/m37, VENDOR_ITEM_REGULAR), @@ -144,9 +144,9 @@ list("M10 Helmet Netting", round(scale * 10), /obj/item/prop/helmetgarb/netting, VENDOR_ITEM_REGULAR), list("M10 Helmet Rain Cover", round(scale * 10), /obj/item/prop/helmetgarb/raincover, VENDOR_ITEM_REGULAR), list("Firearm Lubricant", round(scale * 15), /obj/item/prop/helmetgarb/gunoil, VENDOR_ITEM_REGULAR), - list("USCM Flair", round(scale * 15), /obj/item/prop/helmetgarb/flair_uscm, VENDOR_ITEM_REGULAR), + list("UACM Flair", round(scale * 15), /obj/item/prop/helmetgarb/flair_uscm, VENDOR_ITEM_REGULAR), list("Solar Devils Shoulder Patch", round(scale * 15), /obj/item/clothing/accessory/patch/devils, VENDOR_ITEM_REGULAR), - list("USCM Shoulder Patch", round(scale * 15), /obj/item/clothing/accessory/patch, VENDOR_ITEM_REGULAR), + list("UACM Shoulder Patch", round(scale * 15), /obj/item/clothing/accessory/patch, VENDOR_ITEM_REGULAR), list("Bedroll", round(scale * 20), /obj/item/roller/bedroll, VENDOR_ITEM_REGULAR), ) @@ -240,7 +240,7 @@ listed_products = list( list("STANDARD EQUIPMENT", -1, null, null, null), list("Marine Combat Boots", round(scale * 15), /obj/item/clothing/shoes/marine/jungle/knife, VENDOR_ITEM_REGULAR), - list("USCM Uniform", round(scale * 15), /obj/item/clothing/under/marine/standard, VENDOR_ITEM_REGULAR), + list("UACM Uniform", round(scale * 15), /obj/item/clothing/under/marine/standard, VENDOR_ITEM_REGULAR), list("Marine Black Gloves", round(scale * 15), /obj/item/clothing/gloves/marine, VENDOR_ITEM_REGULAR), list("Marine Brown Gloves", round(scale * 15), /obj/item/clothing/gloves/marine/brown, VENDOR_ITEM_REGULAR), list("Marine Radio Headset", round(scale * 15), /obj/item/device/radio/headset/almayer/sof/survivor_forecon, VENDOR_ITEM_REGULAR), @@ -258,7 +258,7 @@ list("BACKPACK", -1, null, null, null), list("Lightweight IMP Backpack", round(scale * 15), /obj/item/storage/backpack/marine/standard, VENDOR_ITEM_REGULAR), - list("USCM Satchel", round(scale * 15), /obj/item/storage/backpack/marine/satchel, VENDOR_ITEM_REGULAR), + list("UACM Satchel", round(scale * 15), /obj/item/storage/backpack/marine/satchel, VENDOR_ITEM_REGULAR), list("Shotgun Scabbard", round(scale * 5), /obj/item/storage/large_holster/m37/standard, VENDOR_ITEM_REGULAR), list("BELTS", -1, null, null), @@ -301,9 +301,9 @@ list("M10 Helmet Netting", round(scale * 10), /obj/item/prop/helmetgarb/netting, VENDOR_ITEM_REGULAR), list("M10 Helmet Rain Cover", round(scale * 10), /obj/item/prop/helmetgarb/raincover, VENDOR_ITEM_REGULAR), list("Firearm Lubricant", round(scale * 15), /obj/item/prop/helmetgarb/gunoil, VENDOR_ITEM_REGULAR), - list("USCM Flair", round(scale * 15), /obj/item/prop/helmetgarb/flair_uscm, VENDOR_ITEM_REGULAR), + list("UACM Flair", round(scale * 15), /obj/item/prop/helmetgarb/flair_uscm, VENDOR_ITEM_REGULAR), list("FORECON Shoulder Patch", round(scale * 15), /obj/item/clothing/accessory/patch/forecon, VENDOR_ITEM_REGULAR), - list("USCM Shoulder Patch", round(scale * 15), /obj/item/clothing/accessory/patch, VENDOR_ITEM_REGULAR), + list("UACM Shoulder Patch", round(scale * 15), /obj/item/clothing/accessory/patch, VENDOR_ITEM_REGULAR), list("Bedroll", round(scale * 20), /obj/item/roller/bedroll, VENDOR_ITEM_REGULAR), ) diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm index efc3c9eb8e..09f8a6f313 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm @@ -80,7 +80,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_marine, list( list("Shoulder Holster", 15, /obj/item/clothing/accessory/storage/holster, null, VENDOR_ITEM_REGULAR), list("Machete Scabbard (Full)", 15, /obj/item/storage/large_holster/machete/full, null, VENDOR_ITEM_REGULAR), list("Machete Pouch (Full)", 15, /obj/item/storage/pouch/machete/full, null, VENDOR_ITEM_REGULAR), - list("USCM Radio Telephone Pack", 15, /obj/item/storage/backpack/marine/satchel/rto, null, VENDOR_ITEM_REGULAR), + list("UACM Radio Telephone Pack", 15, /obj/item/storage/backpack/marine/satchel/rto, null, VENDOR_ITEM_REGULAR), list("Fuel Tank Strap Pouch", 5, /obj/item/storage/pouch/flamertank, null, VENDOR_ITEM_REGULAR), list("Welding Goggles", 5, /obj/item/clothing/glasses/welding, null, VENDOR_ITEM_REGULAR), list("Sling Pouch", 15, /obj/item/storage/pouch/sling, null, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm index e800fc1efd..07170d7d5e 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm @@ -99,7 +99,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_specialist, list( list("CLOTHING ITEMS", 0, null, null, null), list("Machete Scabbard (Full)", 6, /obj/item/storage/large_holster/machete/full, null, VENDOR_ITEM_REGULAR), list("Machete Pouch (Full)", 15, /obj/item/storage/pouch/machete/full, null, VENDOR_ITEM_REGULAR), - list("USCM Radio Telephone Pack", 15, /obj/item/storage/backpack/marine/satchel/rto, null, VENDOR_ITEM_REGULAR), + list("UACM Radio Telephone Pack", 15, /obj/item/storage/backpack/marine/satchel/rto, null, VENDOR_ITEM_REGULAR), list("Fuel Tank Strap Pouch", 5, /obj/item/storage/pouch/flamertank, null, VENDOR_ITEM_REGULAR), list("Welding Goggles", 3, /obj/item/clothing/glasses/welding, null, VENDOR_ITEM_REGULAR), list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm index 7bd45cb46a..8677666228 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm @@ -35,7 +35,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_tl, list( list("CLOTHING ITEMS", 0, null, null, null), list("Machete Scabbard (Full)", 5, /obj/item/storage/large_holster/machete/full, null, VENDOR_ITEM_REGULAR), list("Machete Pouch (Full)", 15, /obj/item/storage/pouch/machete/full, null, VENDOR_ITEM_REGULAR), - list("USCM Radio Telephone Pack", 5, /obj/item/storage/backpack/marine/satchel/rto, null, VENDOR_ITEM_REGULAR), + list("UACM Radio Telephone Pack", 5, /obj/item/storage/backpack/marine/satchel/rto, null, VENDOR_ITEM_REGULAR), list("Welding Goggles", 3, /obj/item/clothing/glasses/welding, null, VENDOR_ITEM_REGULAR), list("M276 Pattern Combat Toolbelt Rig", 15, /obj/item/storage/belt/gun/utility, null, VENDOR_ITEM_REGULAR), list("Autoinjector Pouch (Full)", 15, /obj/item/storage/pouch/autoinjector/full, null, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/wo_vendors.dm b/code/game/machinery/vending/vendor_types/wo_vendors.dm index 37e5aa1c27..6abf36a167 100644 --- a/code/game/machinery/vending/vendor_types/wo_vendors.dm +++ b/code/game/machinery/vending/vendor_types/wo_vendors.dm @@ -17,8 +17,8 @@ list("M276 M82F Holster Rig", 10, /obj/item/storage/belt/gun/flaregun, VENDOR_ITEM_REGULAR), list("M276 Shotgun Shell Loading Rig", 10, /obj/item/storage/belt/shotgun, VENDOR_ITEM_REGULAR), list("Marine Combat Boots", 20, /obj/item/clothing/shoes/marine, VENDOR_ITEM_REGULAR), - list("USCM Satchel", 10, /obj/item/storage/backpack/marine/satchel, VENDOR_ITEM_REGULAR), - list("USCM Uniform", 20, /obj/item/clothing/under/marine, VENDOR_ITEM_REGULAR), + list("UACM Satchel", 10, /obj/item/storage/backpack/marine/satchel, VENDOR_ITEM_REGULAR), + list("UACM Uniform", 20, /obj/item/clothing/under/marine, VENDOR_ITEM_REGULAR), list("Technician Welder-Satchel", 10, /obj/item/storage/backpack/marine/engineerpack/satchel, VENDOR_ITEM_REGULAR), list("POUCHES", -1, null, null), diff --git a/code/game/objects/effects/decals/posters/poster_list.dm b/code/game/objects/effects/decals/posters/poster_list.dm index 27d8a06a41..a0f2503eb0 100644 --- a/code/game/objects/effects/decals/posters/poster_list.dm +++ b/code/game/objects/effects/decals/posters/poster_list.dm @@ -101,7 +101,7 @@ Template /datum/poster/poster_19 icon_state = "poster19" name = "suspicious looking poster" - desc = "This poster describes USCM as the enemy." + desc = "This poster describes UACM as the enemy." /datum/poster/poster_20 icon_state="poster20" diff --git a/code/game/objects/effects/landmarks/corpsespawner.dm b/code/game/objects/effects/landmarks/corpsespawner.dm index fe338bceab..b43ee6786b 100644 --- a/code/game/objects/effects/landmarks/corpsespawner.dm +++ b/code/game/objects/effects/landmarks/corpsespawner.dm @@ -201,5 +201,5 @@ //FORECON /obj/effect/landmark/corpsespawner/forecon_spotter - name = "USCM Reconnaissance Spotter" + name = "UACM Reconnaissance Spotter" equip_path = /datum/equipment_preset/corpse/forecon_spotter diff --git a/code/game/objects/effects/landmarks/survivor_spawner.dm b/code/game/objects/effects/landmarks/survivor_spawner.dm index a53fead0d3..5b3666e06d 100644 --- a/code/game/objects/effects/landmarks/survivor_spawner.dm +++ b/code/game/objects/effects/landmarks/survivor_spawner.dm @@ -35,7 +35,7 @@ intro_text = list("
You are a survivor of a crash landing!
",\ "You are NOT aware of the xenomorph threat.",\ "Your primary objective is to heal up and survive. If you want to assault the hive - adminhelp.") - story_text = "You are a soldier of Colonial Liberation Front. Your ship received a distress signal from a planet bordering the CLF controlled space under USCM control. Ready and willing to save poor colonists from parasitic tyrants, you and your team boarded small ship called Marie Curie. Unfortunately, right before you came close to a landing zone, a glob of acid hit the ship, damaging one of the engines. Despite all the efforts of the pilot, the ship went straight into nearby mountain. You were hurt pretty badly in the crash. Dumbfounded, you rose up and noticed that one of your limbs is at a weird angle, broken. You looked at other survivors, also limping and trying to fix their broken bones." + story_text = "You are a soldier of Colonial Liberation Front. Your ship received a distress signal from a planet bordering the CLF controlled space under UACM control. Ready and willing to save poor colonists from parasitic tyrants, you and your team boarded small ship called Marie Curie. Unfortunately, right before you came close to a landing zone, a glob of acid hit the ship, damaging one of the engines. Despite all the efforts of the pilot, the ship went straight into nearby mountain. You were hurt pretty badly in the crash. Dumbfounded, you rose up and noticed that one of your limbs is at a weird angle, broken. You looked at other survivors, also limping and trying to fix their broken bones." roundstart_damage_min = 3 roundstart_damage_max = 10 roundstart_damage_times = 2 @@ -49,7 +49,7 @@ intro_text = list("You are a survivor of a crash landing!
",\ "You are NOT aware of the xenomorph threat.",\ "Your primary objective is to heal up and survive. If you want to assault the hive - adminhelp.") - story_text = "You are a soldier of Colonial Liberation Front. Your ship received a distress signal from a planet bordering the CLF controlled space under USCM control. Ready and willing to save poor colonists from parasitic tyrants, you and your team boarded small ship called Marie Curie. Unfortunately, right before you came close to a landing zone, a glob of acid hit the ship, damaging one of the engines. Despite all the efforts of the pilot, the ship went straight into nearby mountain. You were hurt pretty badly in the crash. Dumbfounded, you rose up and noticed that one of your limbs is at a weird angle, broken. You looked at other survivors, also limping and trying to fix their broken bones." + story_text = "You are a soldier of Colonial Liberation Front. Your ship received a distress signal from a planet bordering the CLF controlled space under UACM control. Ready and willing to save poor colonists from parasitic tyrants, you and your team boarded small ship called Marie Curie. Unfortunately, right before you came close to a landing zone, a glob of acid hit the ship, damaging one of the engines. Despite all the efforts of the pilot, the ship went straight into nearby mountain. You were hurt pretty badly in the crash. Dumbfounded, you rose up and noticed that one of your limbs is at a weird angle, broken. You looked at other survivors, also limping and trying to fix their broken bones." roundstart_damage_min = 3 roundstart_damage_max = 10 roundstart_damage_times = 2 @@ -63,7 +63,7 @@ intro_text = list("You are a survivor of a crash landing!
",\ "You are NOT aware of the xenomorph threat.",\ "Your primary objective is to heal up and survive. If you want to assault the hive - adminhelp.") - story_text = "You are a soldier of Colonial Liberation Front. Your ship received a distress signal from a planet bordering the CLF controlled space under USCM control. Ready and willing to save poor colonists from parasitic tyrants, you and your team boarded small ship called Marie Curie. Unfortunately, right before you came close to a landing zone, a glob of acid hit the ship, damaging one of the engines. Despite all the efforts of the pilot, the ship went straight into nearby mountain. You were hurt pretty badly in the crash. Dumbfounded, you rose up and noticed that one of your limbs is at a weird angle, broken. You looked at other survivors, also limping and trying to fix their broken bones." + story_text = "You are a soldier of Colonial Liberation Front. Your ship received a distress signal from a planet bordering the CLF controlled space under UACM control. Ready and willing to save poor colonists from parasitic tyrants, you and your team boarded small ship called Marie Curie. Unfortunately, right before you came close to a landing zone, a glob of acid hit the ship, damaging one of the engines. Despite all the efforts of the pilot, the ship went straight into nearby mountain. You were hurt pretty badly in the crash. Dumbfounded, you rose up and noticed that one of your limbs is at a weird angle, broken. You looked at other survivors, also limping and trying to fix their broken bones." roundstart_damage_min = 3 roundstart_damage_max = 10 roundstart_damage_times = 2 diff --git a/code/game/objects/effects/spawners/faction_spawners.dm b/code/game/objects/effects/spawners/faction_spawners.dm index eb634e383d..e268411a71 100644 --- a/code/game/objects/effects/spawners/faction_spawners.dm +++ b/code/game/objects/effects/spawners/faction_spawners.dm @@ -1,9 +1,9 @@ /* - * USCM weapons + * UACM weapons */ /obj/effect/spawner/random/gun/uscm_primary - name = "USCM primary weapon spawner" - desc = "spawns USCM primary weapons" + name = "UACM primary weapon spawner" + desc = "spawns UACM primary weapons" mags_max = 2 mags_min = 1 guns = list( @@ -27,8 +27,8 @@ icon_state = "loot_rifle_80" /obj/effect/spawner/random/gun/uscm_secondary - name = "USCM secondary weapon spawner" - desc = "spawns USCM secondary weapons" + name = "UACM secondary weapon spawner" + desc = "spawns UACM secondary weapons" spawn_nothing_percentage = 0 mags_max = 2 mags_min = 1 diff --git a/code/game/objects/items/XMAS.dm b/code/game/objects/items/XMAS.dm index b10ea2035d..a70a78957a 100644 --- a/code/game/objects/items/XMAS.dm +++ b/code/game/objects/items/XMAS.dm @@ -3,7 +3,7 @@ /obj/item/m_gift //Marine Gift name = "Present" - desc = "One, standard issue USCM Present" + desc = "One, standard issue UACM Present" icon = 'icons/obj/items/items.dmi' icon_state = "gift1" item_state = "gift1" diff --git a/code/game/objects/items/books/manuals.dm b/code/game/objects/items/books/manuals.dm index ba2a30c35c..abf06eba21 100644 --- a/code/game/objects/items/books/manuals.dm +++ b/code/game/objects/items/books/manuals.dm @@ -700,9 +700,9 @@ /obj/item/book/manual/security_space_law name = "Standard Operating Procedure" - desc = "A set of USCM guidelines for keeping law and order on their vessels." + desc = "A set of UACM guidelines for keeping law and order on their vessels." icon_state = "bookSpaceLaw" - author = "USCM High Command" + author = "UACM High Command" title = "Standard Operating Procedure" dat = {" @@ -722,7 +722,7 @@ name = "Marine Law" desc = "A set of guidelines for keeping law and order on military vessels." icon_state = "bookSpaceLaw" - author = "USCM High Command" + author = "UACM High Command" title = "Marine Law" dat = {" @@ -1249,10 +1249,10 @@ /obj/item/book/manual/orbital_cannon_manual - name = "USCM Orbital Bombardment System Manual" + name = "UACM Orbital Bombardment System Manual" icon_state = "bookEngineering" - author = "USCM R&D" - title = "USCM Orbital Bombardment System Manual" + author = "UACM R&D" + title = "UACM Orbital Bombardment System Manual" dat = {" @@ -1267,7 +1267,7 @@ -Guide to the USCM Orbital Bombardment System
+Guide to the UACM Orbital Bombardment System
Step by step instructions:
-
@@ -1287,12 +1287,12 @@
- If you've loaded a tray with an incorrect payload, you can still unload the tray's payload as long as it hasn't been chambered.
- If an incorrect payload is chambered, it can only be removed by firing it.
- If the Orbital Cannon Console has no power, check the Weapon Control Room's APC. -
- If the Orbital Cannon Console is broken, contact USCM HQ for a replacement. +
- If the Orbital Cannon Console is broken, contact UACM HQ for a replacement.
- In case of direct damage to the Orbital Cannon itself, do not attempt to use or repair the cannon.
- In case of hull breach or fire, make sure to remove the Cannon's payload and move it to a safe location.
- If the Orbital Tray jams, apply lubricant to the conveyor belt. -
- If a cable of the Orbital Cannon System is severed, contact USCM HQ for a replacement. -
- If Cannon's cable connector breaks, turn off the Orbital Cannon Console and contact USCM HQ for a replacement. +
- If a cable of the Orbital Cannon System is severed, contact UACM HQ for a replacement. +
- If Cannon's cable connector breaks, turn off the Orbital Cannon Console and contact UACM HQ for a replacement. diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index 2b6ae446d8..cb0c4abfe2 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -253,7 +253,7 @@ name = "general officer holo-badge" desc = "Top brass of the top brass. Issued to only the most dedicated." icon_state = "general" - registered_name = "The USCM" + registered_name = "The UACM" assignment = "General" /obj/item/card/id/general/New() diff --git a/code/game/objects/items/cosmetics.dm b/code/game/objects/items/cosmetics.dm index e03defc37d..0ec78fcf4f 100644 --- a/code/game/objects/items/cosmetics.dm +++ b/code/game/objects/items/cosmetics.dm @@ -42,7 +42,7 @@ icon_state = "skull_camo" /obj/item/facepaint/sunscreen_stick - name= "\improper USCM issue sunscreen" + name= "\improper UACM issue sunscreen" desc = "A stick of SPF 50 sunscreen, issued to you by the good brass of the Corps. Whereas the previously issued sunscreen was toxic upon ingestion, this batch improves upon that by only containing excessive amounts of cadmium." paint_type = "sunscreen_stick" icon_state = "sunscreen_stick" diff --git a/code/game/objects/items/devices/binoculars.dm b/code/game/objects/items/devices/binoculars.dm index f8cf524731..9eccf0a544 100644 --- a/code/game/objects/items/devices/binoculars.dm +++ b/code/game/objects/items/devices/binoculars.dm @@ -353,13 +353,13 @@ //IMPROVED LASER DESIGNATER, faster cooldown, faster target acquisition, can be found only in scout spec kit /obj/item/device/binoculars/range/designator/scout name = "scout laser designator" - desc = "An improved laser designator, issued to USCM scouts, with two modes: target marking for CAS with IR laser and rangefinding. Ctrl + Click turf to target something. Ctrl + Click designator to stop lasing. Alt + Click designator to switch modes." + desc = "An improved laser designator, issued to UACM scouts, with two modes: target marking for CAS with IR laser and rangefinding. Ctrl + Click turf to target something. Ctrl + Click designator to stop lasing. Alt + Click designator to switch modes." cooldown_duration = 80 target_acquisition_delay = 30 /obj/item/device/binoculars/range/designator/spotter name = "spotter's laser designator" - desc = "A specially-designed laser designator, issued to USCM spotters, with two modes: target marking for CAS with IR laser and rangefinding. Ctrl + Click turf to target something. Ctrl + Click designator to stop lasing. Alt + Click designator to switch modes. Additionally, a trained spotter can laze targets for a USCM marksman, increasing the speed of target acquisition. A targeting beam will connect the binoculars to the target, but it may inherit the user's cloak, if possible." + desc = "A specially-designed laser designator, issued to UACM spotters, with two modes: target marking for CAS with IR laser and rangefinding. Ctrl + Click turf to target something. Ctrl + Click designator to stop lasing. Alt + Click designator to switch modes. Additionally, a trained spotter can laze targets for a UACM marksman, increasing the speed of target acquisition. A targeting beam will connect the binoculars to the target, but it may inherit the user's cloak, if possible." var/is_spotting = FALSE var/spotting_time = 10 SECONDS diff --git a/code/game/objects/items/devices/cictablet.dm b/code/game/objects/items/devices/cictablet.dm index 69e745da08..8dc82b4ff7 100644 --- a/code/game/objects/items/devices/cictablet.dm +++ b/code/game/objects/items/devices/cictablet.dm @@ -139,7 +139,7 @@ return FALSE if(SShijack.evac_admin_denied) - to_chat(usr, SPAN_WARNING("The USCM has placed a lock on deploying the evacuation pods.")) + to_chat(usr, SPAN_WARNING("The UACM has placed a lock on deploying the evacuation pods.")) return FALSE if(!SShijack.initiate_evacuation()) @@ -163,7 +163,7 @@ if((R_ADMIN|R_MOD) & C.admin_holder.rights) playsound_client(C,'sound/effects/sos-morse-code.ogg',10) SSticker.mode.request_ert(usr) - to_chat(usr, SPAN_NOTICE("A distress beacon request has been sent to USCM Central Command.")) + to_chat(usr, SPAN_NOTICE("A distress beacon request has been sent to UACM Central Command.")) COOLDOWN_START(src, distress_cooldown, COOLDOWN_COMM_REQUEST) return TRUE diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 3f9dc09ae6..1c74388a92 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -235,7 +235,7 @@ /obj/item/device/flashlight/flare name = "flare" - desc = "A red USCM issued flare. There are instructions on the side, it reads 'pull cord, make light'." + desc = "A red UACM issued flare. There are instructions on the side, it reads 'pull cord, make light'." w_class = SIZE_SMALL light_power = 2 light_range = 7 @@ -460,7 +460,7 @@ //Signal Flare /obj/item/device/flashlight/flare/signal name = "signal flare" - desc = "A green USCM issued signal flare. The telemetry computer works on chemical reaction that releases smoke and light and thus works only while the flare is burning." + desc = "A green UACM issued signal flare. The telemetry computer works on chemical reaction that releases smoke and light and thus works only while the flare is burning." icon_state = "cas_flare" item_state = "cas_flare" layer = ABOVE_FLY_LAYER diff --git a/code/game/objects/items/devices/helmet_visors.dm b/code/game/objects/items/devices/helmet_visors.dm index 7bdcf2339d..cabc672ca2 100644 --- a/code/game/objects/items/devices/helmet_visors.dm +++ b/code/game/objects/items/devices/helmet_visors.dm @@ -1,6 +1,6 @@ /obj/item/device/helmet_visor name = "squad optic" - desc = "An insertable visor HUD into a standard USCM helmet." + desc = "An insertable visor HUD into a standard UACM helmet." icon = 'icons/obj/items/clothing/helmet_visors.dmi' icon_state = "hud_sight" w_class = SIZE_TINY @@ -179,7 +179,7 @@ /obj/item/device/helmet_visor/night_vision name = "night vision optic" - desc = "An insertable visor HUD into a standard USCM helmet. This type gives a form of night vision and is standard issue in units with regular funding." + desc = "An insertable visor HUD into a standard UACM helmet. This type gives a form of night vision and is standard issue in units with regular funding." icon_state = "nvg_sight" hud_type = null action_icon_string = "nvg_sight_down" @@ -289,7 +289,7 @@ /obj/item/device/helmet_visor/night_vision/marine_raider name = "advanced night vision optic" - desc = "An insertable visor HUD into a standard USCM helmet. This type gives a form of night vision and is standard issue in special forces units." + desc = "An insertable visor HUD into a standard UACM helmet. This type gives a form of night vision and is standard issue in special forces units." hud_type = list(MOB_HUD_FACTION_USCM, MOB_HUD_MEDICAL_ADVANCED) helmet_overlay = "nvg_sight_right_raider" power_use = 0 diff --git a/code/game/objects/items/devices/motion_detector.dm b/code/game/objects/items/devices/motion_detector.dm index 60cf62b4e2..cc4cbff1f2 100644 --- a/code/game/objects/items/devices/motion_detector.dm +++ b/code/game/objects/items/devices/motion_detector.dm @@ -304,32 +304,32 @@ /obj/item/device/motiondetector/m717/hacked/contractor name = "modified M717 pocket motion detector" - desc = "This prototype motion detector sacrifices versatility, having only the long-range mode, for size, being so small it can even fit in pockets. This one has been modified with an after-market IFF sensor to filter out Vanguard's Arrow Incorporated signals instead of USCM ones. Fight fire with fire!" + desc = "This prototype motion detector sacrifices versatility, having only the long-range mode, for size, being so small it can even fit in pockets. This one has been modified with an after-market IFF sensor to filter out Vanguard's Arrow Incorporated signals instead of UACM ones. Fight fire with fire!" iff_signal = FACTION_CONTRACTOR /obj/item/device/motiondetector/hacked name = "hacked motion detector" - desc = "A device that usually picks up non-USCM signals, but this one's been hacked to detect all non-UPP movement instead. Fight fire with fire!" + desc = "A device that usually picks up non-UACM signals, but this one's been hacked to detect all non-UPP movement instead. Fight fire with fire!" iff_signal = FACTION_UPP /obj/item/device/motiondetector/hacked/elite_merc name = "hacked motion detector" - desc = "A device that usually picks up non-USCM signals, but this one's been hacked to detect all non-freelancer movement instead. Fight fire with fire!" + desc = "A device that usually picks up non-UACM signals, but this one's been hacked to detect all non-freelancer movement instead. Fight fire with fire!" iff_signal = FACTION_MERCENARY /obj/item/device/motiondetector/hacked/pmc name = "corporate motion detector" - desc = "A device that usually picks up non-USCM signals, but this one's been reprogrammed to detect all non-PMC movement instead. Very corporate." + desc = "A device that usually picks up non-UACM signals, but this one's been reprogrammed to detect all non-PMC movement instead. Very corporate." iff_signal = FACTION_PMC /obj/item/device/motiondetector/hacked/dutch name = "hacked motion detector" - desc = "A device that usually picks up non-USCM signals, but this one's been hacked to detect all non-Dutch's Dozen movement instead. Fight fire with fire!" + desc = "A device that usually picks up non-UACM signals, but this one's been hacked to detect all non-Dutch's Dozen movement instead. Fight fire with fire!" iff_signal = FACTION_DUTCH /obj/item/device/motiondetector/hacked/contractor name = "modified motion detector" - desc = "A device that usually picks up non-USCM signals, but this one's been modified with after-market IFF sensors to detect all non-Vanguard's Arrow Incorporated movement instead. Fight fire with fire!" + desc = "A device that usually picks up non-UACM signals, but this one's been modified with after-market IFF sensors to detect all non-Vanguard's Arrow Incorporated movement instead. Fight fire with fire!" iff_signal = FACTION_CONTRACTOR #undef MOTION_DETECTOR_RANGE_LONG diff --git a/code/game/objects/items/devices/personal_data_transmitter.dm b/code/game/objects/items/devices/personal_data_transmitter.dm index 2e92b3f0b0..5fb7b8fa6a 100644 --- a/code/game/objects/items/devices/personal_data_transmitter.dm +++ b/code/game/objects/items/devices/personal_data_transmitter.dm @@ -160,7 +160,7 @@ /obj/item/storage/box/pdt_kit name = "\improper Boots! PDT/L Battle Buddy kit" desc = "Contains a PDT/L set, consisting of the PDT bracelet and its sister locator tube, alongside a spare cell seemingly wedged into the kit." - desc_lore = "This kit was distributed in the 200th (Season 4) Issue of the Boots! magazine, 'Privates die without their battlebuddy!', to drive up sales. Many have noted the poor battery life of these units, leading many to speculate that these were faulty units that were repackaged and shipped off to various USCM-adjacent mil-surplus good stores. The Department of the Navy Observation in Photographs (DNOP) has not released a statement regarding these theories." + desc_lore = "This kit was distributed in the 200th (Season 4) Issue of the Boots! magazine, 'Privates die without their battlebuddy!', to drive up sales. Many have noted the poor battery life of these units, leading many to speculate that these were faulty units that were repackaged and shipped off to various UACM-adjacent mil-surplus good stores. The Department of the Navy Observation in Photographs (DNOP) has not released a statement regarding these theories." icon_state = "pdt_box" can_hold = list(/obj/item/device/pdt_locator_tube, /obj/item/clothing/accessory/pdt_bracelet) foldable = /obj/item/stack/sheet/cardboard diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index a945aa76b8..a04e824f26 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -339,12 +339,12 @@ channels = list(RADIO_CHANNEL_CLF_CMD = TRUE, RADIO_CHANNEL_CLF_GEN = TRUE, RADIO_CHANNEL_CLF_ENGI = TRUE, RADIO_CHANNEL_CLF_MED = TRUE, RADIO_CHANNEL_CLF_CCT = TRUE) //--------------------------------------------------- /obj/item/device/encryptionkey/highcom - name = "\improper USCM High Command Radio Encryption Key" + name = "\improper UACM High Command Radio Encryption Key" icon_state = "binary_key" channels = list(RADIO_CHANNEL_HIGHCOM = TRUE, SQUAD_SOF = TRUE, RADIO_CHANNEL_PROVOST = TRUE, RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = FALSE, RADIO_CHANNEL_JTAC = FALSE, RADIO_CHANNEL_INTEL = TRUE) /obj/item/device/encryptionkey/provost - name = "\improper USCM Provost Radio Encryption Key" + name = "\improper UACM Provost Radio Encryption Key" icon_state = "sec_key" channels = list(RADIO_CHANNEL_PROVOST = TRUE, RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = FALSE, RADIO_CHANNEL_JTAC = FALSE, RADIO_CHANNEL_INTEL = TRUE) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index f00ba138ef..617613583e 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -469,7 +469,7 @@ /obj/item/device/radio/headset/almayer/ct name = "supply radio headset" - desc = "Used by the lowly Cargo Technicians of the USCM, light weight and portable. To access the supply channel, use :u." + desc = "Used by the lowly Cargo Technicians of the UACM, light weight and portable. To access the supply channel, use :u." icon_state = "req_headset" initial_keys = list(/obj/item/device/encryptionkey/req/ct) @@ -565,7 +565,7 @@ /obj/item/device/radio/headset/almayer/mcom/synth name = "marine synth headset" - desc = "Issued only to USCM synthetics. Channels are as follows: :v - marine command, :p - military police, :a - alpha squad, :b - bravo squad, :c - charlie squad, :d - delta squad, :n - engineering, :m - medbay, :u - requisitions, :j - JTAC, :t - intel" + desc = "Issued only to UACM synthetics. Channels are as follows: :v - marine command, :p - military police, :a - alpha squad, :b - bravo squad, :c - charlie squad, :d - delta squad, :n - engineering, :m - medbay, :u - requisitions, :j - JTAC, :t - intel" icon_state = "ms_headset" initial_keys = list(/obj/item/device/encryptionkey/cmpcom/synth) volume = RADIO_VOLUME_CRITICAL @@ -1035,32 +1035,32 @@ initial_keys = list(/obj/item/device/encryptionkey/WY, /obj/item/device/encryptionkey/cmb) /obj/item/device/radio/headset/almayer/highcom - name = "USCM High Command headset" - desc = "Issued to members of USCM High Command and their immediate subordinates. Channels are as follows: :v - marine command, :p - military police, :a - alpha squad, :b - bravo squad, :c - charlie squad, :d - delta squad, :n - engineering, :m - medbay, :u - requisitions, :j - JTAC, :t - intel, :z - HighCom" + name = "UACM High Command headset" + desc = "Issued to members of UACM High Command and their immediate subordinates. Channels are as follows: :v - marine command, :p - military police, :a - alpha squad, :b - bravo squad, :c - charlie squad, :d - delta squad, :n - engineering, :m - medbay, :u - requisitions, :j - JTAC, :t - intel, :z - HighCom" icon_state = "mhc_headset" frequency = HC_FREQ initial_keys = list(/obj/item/device/encryptionkey/highcom) volume = RADIO_VOLUME_CRITICAL /obj/item/device/radio/headset/almayer/provost - name = "USCM Provost headset" - desc = "Issued to members of the USCM Provost Office and their immediate subordinates." + name = "UACM Provost headset" + desc = "Issued to members of the UACM Provost Office and their immediate subordinates." icon_state = "pvst_headset" frequency = PVST_FREQ initial_keys = list(/obj/item/device/encryptionkey/provost) volume = RADIO_VOLUME_CRITICAL /obj/item/device/radio/headset/almayer/sof - name = "USCM SOF headset" - desc = "Issued exclusively to Marine Raiders and members of the USCM's Force Reconnaissance." + name = "UACM SOF headset" + desc = "Issued exclusively to Marine Raiders and members of the UACM's Force Reconnaissance." icon_state = "soc_headset" frequency = SOF_FREQ initial_keys = list(/obj/item/device/encryptionkey/soc) volume = RADIO_VOLUME_IMPORTANT /obj/item/device/radio/headset/almayer/sof/survivor_forecon - name = "USCM SOF headset" - desc = "Issued exclusively to Marine Raiders and members of the USCM's Force Reconnaissance." + name = "UACM SOF headset" + desc = "Issued exclusively to Marine Raiders and members of the UACM's Force Reconnaissance." icon_state = "soc_headset" frequency = SOF_FREQ initial_keys = list(/obj/item/device/encryptionkey/soc/forecon) @@ -1070,7 +1070,7 @@ /obj/item/device/radio/headset/almayer/mcom/vc name = "marine vehicle crew radio headset" - desc = "Used by USCM vehicle crew, features a non-standard brace. Channels are as follows: :v - marine command, :n - engineering, :m - medbay, :u - requisitions" + desc = "Used by UACM vehicle crew, features a non-standard brace. Channels are as follows: :v - marine command, :n - engineering, :m - medbay, :u - requisitions" initial_keys = list(/obj/item/device/encryptionkey/vc) volume = RADIO_VOLUME_RAISED multibroadcast_cooldown = HIGH_MULTIBROADCAST_COOLDOWN diff --git a/code/game/objects/items/explosives/grenades/marines.dm b/code/game/objects/items/explosives/grenades/marines.dm index 36ba614041..5842ad2451 100644 --- a/code/game/objects/items/explosives/grenades/marines.dm +++ b/code/game/objects/items/explosives/grenades/marines.dm @@ -106,7 +106,7 @@ /obj/item/explosive/grenade/high_explosive/m15 name = "\improper M15 fragmentation grenade" - desc = "An outdated USCM Fragmentation Grenade. With decades of service in the USCM, the old M15 Fragmentation Grenade is slowly being replaced by the slightly safer M40-series grenades. It is set to detonate in 4 seconds." + desc = "An outdated UACM Fragmentation Grenade. With decades of service in the UACM, the old M15 Fragmentation Grenade is slowly being replaced by the slightly safer M40-series grenades. It is set to detonate in 4 seconds." icon_state = "grenade_ex" item_state = "grenade_ex" throw_speed = SPEED_FAST diff --git a/code/game/objects/items/fulton.dm b/code/game/objects/items/fulton.dm index c28d5e5d5a..a9cedee0e9 100644 --- a/code/game/objects/items/fulton.dm +++ b/code/game/objects/items/fulton.dm @@ -9,7 +9,7 @@ var/global/list/deployed_fultons = list() icon_state = "fulton" amount = 20 max_amount = 20 - desc = "A system used by the USCM for retrieving objects of interest on the ground from an AUD-25 dropship. Can be used to extract unrevivable corpses, or crates, typically lasting around 3 minutes in the air." + desc = "A system used by the UACM for retrieving objects of interest on the ground from an AUD-25 dropship. Can be used to extract unrevivable corpses, or crates, typically lasting around 3 minutes in the air." throwforce = 10 w_class = SIZE_SMALL throw_speed = SPEED_SLOW diff --git a/code/game/objects/items/pamphlets.dm b/code/game/objects/items/pamphlets.dm index c1544d6d73..585609d317 100644 --- a/code/game/objects/items/pamphlets.dm +++ b/code/game/objects/items/pamphlets.dm @@ -137,13 +137,13 @@ /obj/item/pamphlet/language name = "translation pamphlet" - desc = "A pamphlet used by lazy USCM interpreters to quickly learn new languages on the spot." + desc = "A pamphlet used by lazy UACM interpreters to quickly learn new languages on the spot." flavour_text = "You go over the pamphlet, learning a new language." bypass_pamphlet_limit = TRUE /obj/item/pamphlet/language/russian name = "Printed Copy of Pari" - desc = "Pari, also known as 'The Bet' in English, is a short story written by Russian playwright Anton Chekhov about a bet between a lawyer and a banker; the banker wagers that the lawyer cannot remain in solitary confinement for 15 years, and promises 2 million rubles in exchange. You must be a refined reader if you know this one; why are you even in the USCM if you know that?" + desc = "Pari, also known as 'The Bet' in English, is a short story written by Russian playwright Anton Chekhov about a bet between a lawyer and a banker; the banker wagers that the lawyer cannot remain in solitary confinement for 15 years, and promises 2 million rubles in exchange. You must be a refined reader if you know this one; why are you even in the UACM if you know that?" trait = /datum/character_trait/language/russian /obj/item/pamphlet/language/japanese diff --git a/code/game/objects/items/props/helmetgarb.dm b/code/game/objects/items/props/helmetgarb.dm index ce63aaa13a..d97b809260 100644 --- a/code/game/objects/items/props/helmetgarb.dm +++ b/code/game/objects/items/props/helmetgarb.dm @@ -90,7 +90,7 @@ /obj/item/prop/helmetgarb/helmet_nvg name = "\improper M2 night vision goggles" - desc = "USCM standard M2 Night vision goggles for military operations. Requires a battery in order to work" + desc = "UACM standard M2 Night vision goggles for military operations. Requires a battery in order to work" icon_state = "nvg" gender = PLURAL garbage = FALSE @@ -476,7 +476,7 @@ icon_state = "flair_peace_smiley" /obj/item/prop/helmetgarb/flair_uscm - name = "\improper USCM flair" + name = "\improper UACM flair" desc = "These pins get handed out like candy at enlistment offices. Wear it with pride marine." icon_state = "flair_uscm" @@ -493,7 +493,7 @@ /obj/item/prop/helmetgarb/helmet_gasmask name = "\improper M5 integrated gasmask" - desc = "The USCM had its funding pulled for these when it became apparent that not every deployed enlisted was wearing a helmet 24/7; much to the bafflement of UA High Command." + desc = "The UACM had its funding pulled for these when it became apparent that not every deployed enlisted was wearing a helmet 24/7; much to the bafflement of UA High Command." icon_state = "helmet_gasmask" /obj/item/prop/helmetgarb/helmet_gasmask/on_enter_storage(obj/item/storage/internal/helmet_internal_inventory) @@ -527,11 +527,11 @@ /obj/item/prop/helmetgarb/bullet_pipe name = "10x99mm XM42B casing pipe" - desc = "The XM42B was an experimental weapons platform briefly fielded by the USCM and Wey-Yu PMC teams. It was manufactured by ARMAT systems at the Atlas weapons facility. Unfortunately the project had its funding pulled alongside the M5 integrated gasmask program. This spent casing has been converted into a pipe, but there is too much tar in the mouthpiece for it to be useable." + desc = "The XM42B was an experimental weapons platform briefly fielded by the UACM and Wey-Yu PMC teams. It was manufactured by ARMAT systems at the Atlas weapons facility. Unfortunately the project had its funding pulled alongside the M5 integrated gasmask program. This spent casing has been converted into a pipe, but there is too much tar in the mouthpiece for it to be useable." icon_state = "bullet_pipe" /obj/item/prop/helmetgarb/chaplain_patch - name = "\improper USCM chaplain helmet patch" + name = "\improper UACM chaplain helmet patch" desc = "This patch is all that remains of the Chaplaincy of the USS Almayer, along with the Chaplains themselves. Both no longer exist as a result of losses suffered during Operation Tychon Tackle." icon_state = "chaplain_patch" flags_obj = OBJ_NO_HELMET_BAND diff --git a/code/game/objects/items/reagent_containers/food/drinks.dm b/code/game/objects/items/reagent_containers/food/drinks.dm index 9f88990e53..b6ce180900 100644 --- a/code/game/objects/items/reagent_containers/food/drinks.dm +++ b/code/game/objects/items/reagent_containers/food/drinks.dm @@ -213,7 +213,7 @@ reagents.add_reagent("coffee", 20) /obj/item/reagent_container/food/drinks/coffee/marine - desc = "Recycled water, lab-grown coffee plants genetically designed for minimum expense and maximum production, and re-recycled coffee grounds have mixed together to create this insultingly cheap USCM culinary 'wonder'. You're just glad the troops get issued water for free." + desc = "Recycled water, lab-grown coffee plants genetically designed for minimum expense and maximum production, and re-recycled coffee grounds have mixed together to create this insultingly cheap UACM culinary 'wonder'. You're just glad the troops get issued water for free." /obj/item/reagent_container/food/drinks/tea name = "\improper Duke Purple Tea" @@ -329,8 +329,8 @@ center_of_mass = "x=17;y=8" /obj/item/reagent_container/food/drinks/flask/marine - name = "\improper USCM flask" - desc = "A metal flask embossed with the USCM logo and probably filled with a slurry of water, motor oil, and medicinal alcohol." + name = "\improper UACM flask" + desc = "A metal flask embossed with the UACM logo and probably filled with a slurry of water, motor oil, and medicinal alcohol." icon_state = "flask_uscm" volume = 60 center_of_mass = "x=17;y=8" @@ -353,7 +353,7 @@ /obj/item/reagent_container/food/drinks/flask/canteen name = "canteen" - desc = "You take a sip from your trusty USCM canteen..." + desc = "You take a sip from your trusty UACM canteen..." icon_state = "canteen" volume = 60 center_of_mass = "x=17;y=8" @@ -396,8 +396,8 @@ center_of_mass = "x=15;y=13" /obj/item/reagent_container/food/drinks/coffeecup/uscm - name = "USCM coffee mug" - desc = "A red, white and blue coffee mug depicting the emblem of the USCM. Patriotic and bold, and commonly seen among veterans as a novelty." + name = "UACM coffee mug" + desc = "A red, white and blue coffee mug depicting the emblem of the UACM. Patriotic and bold, and commonly seen among veterans as a novelty." icon_state = "uscmcup" /obj/item/reagent_container/food/drinks/coffeecup/wy diff --git a/code/game/objects/items/reagent_containers/food/snacks.dm b/code/game/objects/items/reagent_containers/food/snacks.dm index d27d6adb09..cf2b9a9982 100644 --- a/code/game/objects/items/reagent_containers/food/snacks.dm +++ b/code/game/objects/items/reagent_containers/food/snacks.dm @@ -3371,7 +3371,7 @@ playsound(loc,"rip", 15, 1) name = "\improper" + flavor - desc = "The contents of a USCM Standard issue MRE. This one is [flavor]." + desc = "The contents of a UACM Standard issue MRE. This one is [flavor]." icon_state = flavor package = 0 return diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 81e838b30b..0d7e931cab 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -286,7 +286,7 @@ desc = "It's a backpack especially designed for use in a sterile environment." icon_state = "medicalpack" -/obj/item/storage/backpack/security //Universal between USCM MPs & Colony, should be split at some point. +/obj/item/storage/backpack/security //Universal between UACM MPs & Colony, should be split at some point. name = "security backpack" desc = "It's a very robust backpack." icon_state = "securitypack" @@ -392,7 +392,7 @@ desc = "Useful for holding research materials." icon_state = "satchel-tox" -/obj/item/storage/backpack/satchel/sec //Universal between USCM MPs & Colony, should be split at some point. +/obj/item/storage/backpack/satchel/sec //Universal between UACM MPs & Colony, should be split at some point. name = "security satchel" desc = "A robust satchel composed of two drop pouches and a large internal pocket. Made of a stiff fabric, it isn't very comfy to wear." icon_state = "satchel-sec" @@ -407,7 +407,7 @@ /obj/item/storage/backpack/marine name = "\improper lightweight IMP backpack" - desc = "The standard-issue pack of the USCM forces. Designed to lug gear into the battlefield." + desc = "The standard-issue pack of the UACM forces. Designed to lug gear into the battlefield." icon_state = "marinepack" item_state = "marinepack" has_gamemode_skin = TRUE //replace this with the atom_flag NO_SNOW_TYPE at some point, just rename it to like, NO_MAP_VARIANT_SKIN @@ -448,8 +448,8 @@ UnregisterSignal(user, COMSIG_HUMAN_POST_MOVE_DELAY) /obj/item/storage/backpack/marine/medic - name = "\improper USCM corpsman backpack" - desc = "A standard-issue backpack worn by USCM medics." + name = "\improper UACM corpsman backpack" + desc = "A standard-issue backpack worn by UACM medics." icon_state = "marinepack_medic" item_state = "marinepack_medic" xeno_icon_state = "medicpack" @@ -460,25 +460,25 @@ /obj/item/storage/backpack/marine/medic/upp name = "\improper UPP corpsman backpack" - desc = "Uncommon issue backpack worn by UPP medics from isolated sectors. You can swear you can see a faded USCM symbol." + desc = "Uncommon issue backpack worn by UPP medics from isolated sectors. You can swear you can see a faded UACM symbol." /obj/item/storage/backpack/marine/tech - name = "\improper USCM technician backpack" - desc = "A standard-issue backpack worn by USCM technicians." + name = "\improper UACM technician backpack" + desc = "A standard-issue backpack worn by UACM technicians." icon_state = "marinepack_techi" item_state = "marinepack_techi" xeno_icon_state = "marinepack" xeno_types = list(/mob/living/carbon/xenomorph/runner, /mob/living/carbon/xenomorph/praetorian, /mob/living/carbon/xenomorph/drone, /mob/living/carbon/xenomorph/warrior, /mob/living/carbon/xenomorph/defender, /mob/living/carbon/xenomorph/sentinel, /mob/living/carbon/xenomorph/spitter) /obj/item/storage/backpack/marine/satchel/intel - name = "\improper USCM lightweight expedition pack" - desc = "A heavy-duty IMP based backpack that can be slung around the front or to the side, and can quickly be accessed with only one hand. Usually issued to USCM intelligence officers." + name = "\improper UACM lightweight expedition pack" + desc = "A heavy-duty IMP based backpack that can be slung around the front or to the side, and can quickly be accessed with only one hand. Usually issued to UACM intelligence officers." icon_state = "marinebigsatch" max_storage_space = 20 /obj/item/storage/backpack/marine/satchel - name = "\improper USCM satchel" - desc = "A heavy-duty satchel carried by some USCM soldiers and support personnel." + name = "\improper UACM satchel" + desc = "A heavy-duty satchel carried by some UACM soldiers and support personnel." icon_state = "marinesatch" worn_accessible = TRUE storage_slots = null @@ -489,7 +489,7 @@ has_gamemode_skin = FALSE /obj/item/storage/backpack/marine/satchel/big //wacky squad marine loadout item, its the IO backpack. - name = "\improper USCM logistics IMP backpack" + name = "\improper UACM logistics IMP backpack" desc = "A standard-issue backpack worn by logistics personnel. It is occasionally issued to combat personnel for longer term expeditions and deep space incursions." icon_state = "marinebigsatch" worn_accessible = TRUE @@ -497,20 +497,20 @@ max_storage_space = 21 //backpack size /obj/item/storage/backpack/marine/satchel/medic - name = "\improper USCM corpsman satchel" - desc = "A heavy-duty satchel used by USCM medics. It sacrifices capacity for usability. A small patch is sewn to the top flap." + name = "\improper UACM corpsman satchel" + desc = "A heavy-duty satchel used by UACM medics. It sacrifices capacity for usability. A small patch is sewn to the top flap." icon_state = "marinesatch_medic" /obj/item/storage/backpack/marine/satchel/medic/standard has_gamemode_skin = FALSE /obj/item/storage/backpack/marine/satchel/tech - name = "\improper USCM technician chestrig" - desc = "A heavy-duty chestrig used by some USCM technicians." + name = "\improper UACM technician chestrig" + desc = "A heavy-duty chestrig used by some UACM technicians." icon_state = "marinesatch_techi" /obj/item/storage/backpack/marine/satchel/rto - name = "\improper USCM Radio Telephone Pack" + name = "\improper UACM Radio Telephone Pack" desc = "A heavy-duty pack, used for telecommunications between central command. Commonly carried by RTOs." icon_state = "rto_backpack" item_state = "rto_backpack" @@ -551,7 +551,7 @@ networks_transmit = list(FACTION_UPP) /obj/item/storage/backpack/marine/satchel/rto/small - name = "\improper USCM Small Radio Telephone Pack" + name = "\improper UACM Small Radio Telephone Pack" max_storage_space = 10 /obj/item/storage/backpack/marine/satchel/rto/small/upp_net @@ -572,7 +572,7 @@ xeno_types = null /obj/item/storage/backpack/marine/marsoc - name = "\improper USCM SOF IMP tactical rucksack" + name = "\improper UACM SOF IMP tactical rucksack" icon_state = "tacrucksack" desc = "With a backpack like this, you'll forget you're on a hell march designed to kill you." worn_accessible = TRUE @@ -580,15 +580,15 @@ xeno_types = null /obj/item/storage/backpack/marine/rocketpack - name = "\improper USCM IMP M22 rocket bags" - desc = "A specially-designed backpack that fits to the IMP mounting frame on standard USCM pattern M3 armors. It's made of two waterproofed reinforced tubes and one smaller satchel slung at the bottom. The two silos are for rockets, but no one is stopping you from cramming other things in there." + name = "\improper UACM IMP M22 rocket bags" + desc = "A specially-designed backpack that fits to the IMP mounting frame on standard UACM pattern M3 armors. It's made of two waterproofed reinforced tubes and one smaller satchel slung at the bottom. The two silos are for rockets, but no one is stopping you from cramming other things in there." icon_state = "rocketpack" worn_accessible = TRUE has_gamemode_skin = FALSE //monkeysfist101 never sprited a snowtype but included duplicate icons. Why?? Recolor and touch up sprite at a later date. xeno_types = null /obj/item/storage/backpack/marine/grenadepack - name = "\improper USCM IMP M63A1 grenade satchel" + name = "\improper UACM IMP M63A1 grenade satchel" desc = "A secure satchel with dedicated grenade pouches meant to minimize risks of secondary ignition." icon_state = "grenadierpack" overlays = list("+grenadierpack_unlocked") @@ -607,7 +607,7 @@ return ..() /obj/item/storage/backpack/marine/mortarpack - name = "\improper USCM mortar shell backpack" + name = "\improper UACM mortar shell backpack" desc = "A backpack specifically designed to hold ammunition for the M402 mortar." icon_state = "mortarpack" max_w_class = SIZE_HUGE @@ -652,7 +652,7 @@ // Scout Cloak /obj/item/storage/backpack/marine/satchel/scout_cloak name = "\improper M68 Thermal Cloak" - desc = "The lightweight thermal dampeners and optical camouflage provided by this cloak are weaker than those found in standard USCM ghillie suits. In exchange, the cloak can be worn over combat armor and offers the wearer high maneuverability and adaptability to many environments." + desc = "The lightweight thermal dampeners and optical camouflage provided by this cloak are weaker than those found in standard UACM ghillie suits. In exchange, the cloak can be worn over combat armor and offers the wearer high maneuverability and adaptability to many environments." icon_state = "scout_cloak" uniform_restricted = list(/obj/item/clothing/suit/storage/marine/M3S) //Need to wear Scout armor and helmet to equip this. has_gamemode_skin = FALSE //same sprite for all gamemode. @@ -799,8 +799,8 @@ // Welder Backpacks // /obj/item/storage/backpack/marine/engineerpack - name = "\improper USCM technician welderpack" - desc = "A specialized backpack worn by USCM technicians. It carries a fueltank for quick welder refueling and use." + name = "\improper UACM technician welderpack" + desc = "A specialized backpack worn by UACM technicians. It carries a fueltank for quick welder refueling and use." icon_state = "welderbackpack" item_state = "welderbackpack" var/max_fuel = 260 @@ -879,8 +879,8 @@ . += "[reagents.total_volume] units of fuel left!" /obj/item/storage/backpack/marine/engineerpack/satchel - name = "\improper USCM technician welder-satchel" - desc = "A specialized satchel worn by USCM technicians and engineers. It carries two small fuel tanks for quick welder refueling and use." + name = "\improper UACM technician welder-satchel" + desc = "A specialized satchel worn by UACM technicians and engineers. It carries two small fuel tanks for quick welder refueling and use." icon_state = "satchel_marine_welder" item_state = "satchel_marine_welder" max_storage_space = 12 @@ -900,8 +900,8 @@ // Pyrotechnician Spec backpack fuel tank /obj/item/storage/backpack/marine/engineerpack/flamethrower - name = "\improper USCM Pyrotechnician G6-2 fueltank" - desc = "A specialized fueltank worn by USCM Pyrotechnicians for use with the M240-T incinerator unit. A small general storage compartment is installed." + name = "\improper UACM Pyrotechnician G6-2 fueltank" + desc = "A specialized fueltank worn by UACM Pyrotechnicians for use with the M240-T incinerator unit. A small general storage compartment is installed." icon_state = "flamethrower_tank" max_fuel = 500 fuel_type = "utnapthal" @@ -960,7 +960,7 @@ . = ..() /obj/item/storage/backpack/marine/engineerpack/flamethrower/kit - name = "\improper USCM Pyrotechnician G4-1 fueltank" + name = "\improper UACM Pyrotechnician G4-1 fueltank" desc = "A much older-generation back rig that holds fuel in two tanks. A small regulator sits between them. Has a few straps for holding up to three of the actual flamer tanks you'll be refilling." icon_state = "flamethrower_backpack" item_state = "flamethrower_backpack" diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 04e765dec5..d59eec9685 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -85,7 +85,7 @@ /obj/item/storage/belt/utility name = "\improper M276 pattern toolbelt rig" //Carn: utility belt is nicer, but it bamboozles the text parsing. - desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This version lacks any combat functionality, and is commonly used by engineers to transport important tools." + desc = "The M276 is the standard load-bearing equipment of the UACM. It consists of a modular belt with various clips. This version lacks any combat functionality, and is commonly used by engineers to transport important tools." icon_state = "utilitybelt" item_state = "utility" can_hold = list( @@ -145,7 +145,7 @@ /obj/item/storage/belt/medical name = "\improper M276 pattern medical storage rig" - desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This version is a less common configuration, designed to transport medical supplies and pistol ammunition. \nRight click its sprite and click \"toggle belt mode\" to take pills out of bottles by simply clicking them." + desc = "The M276 is the standard load-bearing equipment of the UACM. It consists of a modular belt with various clips. This version is a less common configuration, designed to transport medical supplies and pistol ammunition. \nRight click its sprite and click \"toggle belt mode\" to take pills out of bottles by simply clicking them." icon_state = "medicalbelt" item_state = "medical" storage_slots = 14 @@ -236,7 +236,7 @@ /obj/item/storage/belt/medical/lifesaver name = "\improper M276 pattern lifesaver bag" - desc = "The M276 is the standard load-bearing equipment of the USCM. This configuration mounts a duffel bag filled with a range of injectors and light medical supplies, and is common among medics. \nRight click its sprite and click \"toggle belt mode\" to take pills out of bottles by simply clicking them." + desc = "The M276 is the standard load-bearing equipment of the UACM. This configuration mounts a duffel bag filled with a range of injectors and light medical supplies, and is common among medics. \nRight click its sprite and click \"toggle belt mode\" to take pills out of bottles by simply clicking them." icon_state = "medicbag" item_state = "medicbag" storage_slots = 21 //can hold 3 "rows" of very limited medical equipment, but it *should* give a decent boost to squad medics. @@ -357,7 +357,7 @@ /obj/item/storage/belt/security name = "\improper M276 pattern security rig" - desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This configuration is commonly seen among USCM Military Police and peacekeepers, though it can hold some light munitions." + desc = "The M276 is the standard load-bearing equipment of the UACM. It consists of a modular belt with various clips. This configuration is commonly seen among UACM Military Police and peacekeepers, though it can hold some light munitions." icon_state = "securitybelt" item_state = "security"//Could likely use a better one. item_state_slots = list( @@ -405,7 +405,7 @@ /obj/item/storage/belt/security/MP name = "\improper M276 pattern military police rig" - desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This version is filled with an array of small pouches, meant to carry non-lethal equipment and restraints." + desc = "The M276 is the standard load-bearing equipment of the UACM. It consists of a modular belt with various clips. This version is filled with an array of small pouches, meant to carry non-lethal equipment and restraints." storage_slots = 8 max_w_class = SIZE_MEDIUM max_storage_space = 30 @@ -473,7 +473,7 @@ /obj/item/storage/belt/marine name = "\improper M276 pattern ammo load rig" - desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This is the standard variant, designed for bulk ammunition-carrying operations." + desc = "The M276 is the standard load-bearing equipment of the UACM. It consists of a modular belt with various clips. This is the standard variant, designed for bulk ammunition-carrying operations." icon_state = "marinebelt" item_state = "marinebelt" w_class = SIZE_LARGE @@ -586,7 +586,7 @@ /obj/item/storage/belt/marine/smartgunner name = "\improper M280 pattern smartgunner drum belt" - desc = "Despite the fact that 1. drum magazines are incredibly non-ergonomical, and 2. require incredibly precise machining in order to fit universally (spoiler, they don't, adding further to the myth of 'Smartgun Personalities'), the USCM decided to issue a modified marine belt (more formally known by the designation M280) with hooks and dust covers (overly complex for the average jarhead) for the M56B system's drum munitions. When the carry catch on the drum isn't getting stuck in the oiled up velcro, the rig actually does do a decent job at holding a plentiful amount of drums. But at the end of the day, compared to standard rigs... it sucks, but isn't that what being a Marine is all about?" + desc = "Despite the fact that 1. drum magazines are incredibly non-ergonomical, and 2. require incredibly precise machining in order to fit universally (spoiler, they don't, adding further to the myth of 'Smartgun Personalities'), the UACM decided to issue a modified marine belt (more formally known by the designation M280) with hooks and dust covers (overly complex for the average jarhead) for the M56B system's drum munitions. When the carry catch on the drum isn't getting stuck in the oiled up velcro, the rig actually does do a decent job at holding a plentiful amount of drums. But at the end of the day, compared to standard rigs... it sucks, but isn't that what being a Marine is all about?" icon_state = "sgbelt_ammo" storage_slots = 6 bypass_w_limit = list( @@ -854,7 +854,7 @@ /obj/item/storage/belt/knifepouch name="\improper M276 pattern knife rig" - desc="The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This version is specially designed to store knives. Not commonly issued, but kept in service." + desc="The M276 is the standard load-bearing equipment of the UACM. It consists of a modular belt with various clips. This version is specially designed to store knives. Not commonly issued, but kept in service." icon_state = "knifebelt" item_state = "marinebelt" // aslo temp, maybe somebody update these icons with better ones? w_class = SIZE_LARGE @@ -894,7 +894,7 @@ /obj/item/storage/belt/grenade name="\improper M276 pattern M40 Grenade rig" - desc="The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This version is designed to carry bulk quantities of M40 pattern and AGM pattern Grenades." + desc="The M276 is the standard load-bearing equipment of the UACM. It consists of a modular belt with various clips. This version is designed to carry bulk quantities of M40 pattern and AGM pattern Grenades." icon_state = "grenadebelt" // temp item_state = "grenadebelt" item_state_slots = list( @@ -1152,7 +1152,7 @@ /obj/item/storage/belt/gun/m4a3 name = "\improper M276 pattern general pistol holster rig" - desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This version has a holster assembly that allows one to carry the most common pistols. It also contains side pouches that can store most pistol magazines." + desc = "The M276 is the standard load-bearing equipment of the UACM. It consists of a modular belt with various clips. This version has a holster assembly that allows one to carry the most common pistols. It also contains side pouches that can store most pistol magazines." storage_slots = 7 can_hold = list( /obj/item/weapon/gun/pistol, @@ -1261,7 +1261,7 @@ /obj/item/storage/belt/gun/m39 name = "\improper M276 pattern M39 holster rig" - desc = "Special issue variant of the M276 designed to holster a M39 submachine gun and two spare magazines. Uncommonly issued to USCM support and specialist personnel." + desc = "Special issue variant of the M276 designed to holster a M39 submachine gun and two spare magazines. Uncommonly issued to UACM support and specialist personnel." icon_state = "m39_armor" item_state = "s_marinebelt" storage_slots = 3 @@ -1277,7 +1277,7 @@ /obj/item/storage/belt/gun/m44 name = "\improper M276 pattern M44 holster rig" - desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This version is for the M44 magnum revolver, along with six small pouches for speedloaders. It smells faintly of hay." + desc = "The M276 is the standard load-bearing equipment of the UACM. It consists of a modular belt with various clips. This version is for the M44 magnum revolver, along with six small pouches for speedloaders. It smells faintly of hay." icon_state = "m44r_holster" storage_slots = 7 can_hold = list( @@ -1393,7 +1393,7 @@ /obj/item/storage/belt/gun/mateba name = "\improper M276 pattern Mateba holster rig" - desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This version is for the powerful Mateba magnum revolver, along with five small pouches for speedloaders. This one is aging poorly, and seems to be surplus equipment. It's stamped '3rd 'Dust Raiders' Battalion'." + desc = "The M276 is the standard load-bearing equipment of the UACM. It consists of a modular belt with various clips. This version is for the powerful Mateba magnum revolver, along with five small pouches for speedloaders. This one is aging poorly, and seems to be surplus equipment. It's stamped '3rd 'Dust Raiders' Battalion'." icon_state = "s_cmateba_holster" item_state = "s_marinebelt" storage_slots = 6 @@ -1418,7 +1418,7 @@ /obj/item/storage/belt/gun/mateba/cmateba name = "\improper M276 pattern Mateba holster rig" - desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This version is for the powerful Mateba magnum revolver, along with five small pouches for speedloaders. It was included with the mail-order USCM edition of the Mateba autorevolver in the early 2170s." + desc = "The M276 is the standard load-bearing equipment of the UACM. It consists of a modular belt with various clips. This version is for the powerful Mateba magnum revolver, along with five small pouches for speedloaders. It was included with the mail-order UACM edition of the Mateba autorevolver in the early 2170s." icon_state = "cmateba_holster" item_state = "marinebelt" has_gamemode_skin = TRUE @@ -1443,7 +1443,7 @@ /obj/item/storage/belt/gun/mateba/council name = "colonel's M276 pattern Mateba holster rig" - desc = "The M276 is the standard load-bearing equipment of the USCM. \ + desc = "The M276 is the standard load-bearing equipment of the UACM. \ It consists of a modular belt with various clips. This version is for the powerful Mateba magnum revolver, \ along with five small pouches for speedloaders. This specific one is tinted black and engraved with gold, heavily customized for a high-ranking official." @@ -1460,7 +1460,7 @@ /obj/item/storage/belt/gun/mateba/general name = "general's M276 pattern Mateba holster rig" - desc = "The M276 is the standard load-bearing equipment of the USCM. \ + desc = "The M276 is the standard load-bearing equipment of the UACM. \ It consists of a modular belt with various clips. This version is for the powerful Mateba magnum revolver, \ along with five small pouches for speedloaders. This specific one is tinted black and engraved with gold, heavily customized for a high-ranking official." @@ -1493,7 +1493,7 @@ /obj/item/storage/belt/gun/mateba/pmc name = "PMC M276 pattern Mateba holster rig" - desc = "The M276 is the standard load-bearing equipment of the USCM. \ + desc = "The M276 is the standard load-bearing equipment of the UACM. \ It consists of a modular belt with various clips. This version is for the powerful Mateba magnum revolver, \ along with five small pouches for speedloaders. This specific one is tinted black and engraved with gold, heavily customized for a high-ranking official." @@ -1594,7 +1594,7 @@ /obj/item/storage/belt/gun/smartpistol name = "\improper M276 pattern SU-6 Smartpistol holster rig" - desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This version is for the SU-6 smartpistol." + desc = "The M276 is the standard load-bearing equipment of the UACM. It consists of a modular belt with various clips. This version is for the SU-6 smartpistol." icon_state = "smartpistol_holster" storage_slots = 7 holster_slots = list( @@ -1618,7 +1618,7 @@ /obj/item/storage/belt/gun/flaregun name = "\improper M276 pattern M82F flare gun holster rig" - desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This version is for the M82F flare gun." + desc = "The M276 is the standard load-bearing equipment of the UACM. It consists of a modular belt with various clips. This version is for the M82F flare gun." storage_slots = 28 max_storage_space = 31 icon_state = "m82f_holster" @@ -1670,7 +1670,7 @@ /obj/item/storage/belt/gun/smartgunner name = "\improper M802 pattern smartgunner sidearm rig" - desc = "The M802 is a limited-issue mark of USCM load-bearing equipment, designed to carry smartgun ammunition and a sidearm." + desc = "The M802 is a limited-issue mark of UACM load-bearing equipment, designed to carry smartgun ammunition and a sidearm." icon_state = "sgbelt" holster_slots = list( "1" = list( @@ -1801,7 +1801,7 @@ /obj/item/storage/belt/gun/utility name = "\improper M276 pattern combat toolbelt rig" - desc = "The M276 pattern combat toolbelt rig is an alternative load-bearing equipment of the USCM for engineers conducting repairs within combat zones. It consists of a modular belt with various clips and pouches for tools along with a holster for a sidearm. Due to the bulk of the sidearm, it is unable to hold as many tools as its standard counterpart." + desc = "The M276 pattern combat toolbelt rig is an alternative load-bearing equipment of the UACM for engineers conducting repairs within combat zones. It consists of a modular belt with various clips and pouches for tools along with a holster for a sidearm. Due to the bulk of the sidearm, it is unable to hold as many tools as its standard counterpart." storage_slots = 9 icon_state = "combatutility" item_state= "utility" @@ -1850,7 +1850,7 @@ /obj/item/storage/belt/tank name = "\improper M103 pattern vehicle ammo rig" - desc = "The M103 is a limited-issue mark of USCM load-bearing equipment, made specially for crewmen to carry their vehicle's ammunition." + desc = "The M103 is a limited-issue mark of UACM load-bearing equipment, made specially for crewmen to carry their vehicle's ammunition." icon_state = "tankbelt" item_state = "tankbelt" item_state_slots = list( diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index d544b5b281..a9d393b304 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -548,7 +548,7 @@ /obj/item/storage/box/m94 name = "\improper M94 marking flare pack" - desc = "A packet of twenty one M94 Marking Flares. Carried by USCM soldiers to light dark areas that cannot be reached with the usual TNR Shoulder Lamp." + desc = "A packet of twenty one M94 Marking Flares. Carried by UACM soldiers to light dark areas that cannot be reached with the usual TNR Shoulder Lamp." icon_state = "m94" w_class = SIZE_MEDIUM storage_slots = 21 @@ -706,7 +706,7 @@ new /obj/item/lightstick/red(src) /obj/item/storage/box/MRE - name = "\improper USCM MRE" + name = "\improper UACM MRE" desc = "A Meal, Ready-to-Eat. A single-meal combat ration designed to provide a soldier with enough nutrients for a day of strenuous work. Its expiration date is at least 20 years ahead of your combat life expectancy." icon_state = "mealpack" w_class = SIZE_SMALL diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 49f790410c..33338744dc 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -729,7 +729,7 @@ /obj/item/storage/pill_bottle/stimulant/skillless skilllock = SKILL_MEDICAL_DEFAULT -//NOT FOR USCM USE!!!! +//NOT FOR UACM USE!!!! /obj/item/storage/pill_bottle/paracetamol name = "\improper Paracetamol pill bottle" desc = "This is probably someone's prescription bottle." diff --git a/code/game/objects/items/storage/large_holster.dm b/code/game/objects/items/storage/large_holster.dm index 81e483ef96..ba6bee6b38 100644 --- a/code/game/objects/items/storage/large_holster.dm +++ b/code/game/objects/items/storage/large_holster.dm @@ -58,7 +58,7 @@ /obj/item/storage/large_holster/m37 name = "\improper L44 M37A2 scabbard" - desc = "A large leather holster fitted for USCM-issue shotguns. It has harnesses that allow it to be secured to the back for easy storage." + desc = "A large leather holster fitted for UACM-issue shotguns. It has harnesses that allow it to be secured to the back for easy storage." icon_state = "m37_holster" max_w_class = SIZE_HUGE can_hold = list( @@ -123,7 +123,7 @@ /obj/item/storage/large_holster/m39 name = "\improper M276 pattern M39 holster rig" - desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This holster features a larger frame and stiff backboard to support a submachinegun. It's designed for the M39, but the clips are adjustable enough to fit most compact submachineguns. Due to its unorthodox design, it isn't a very common sight, and is only specially issued." + desc = "The M276 is the standard load-bearing equipment of the UACM. It consists of a modular belt with various clips. This holster features a larger frame and stiff backboard to support a submachinegun. It's designed for the M39, but the clips are adjustable enough to fit most compact submachineguns. Due to its unorthodox design, it isn't a very common sight, and is only specially issued." icon_state = "m39_holster" icon = 'icons/obj/items/clothing/belts.dmi' flags_equip_slot = SLOT_WAIST @@ -187,7 +187,7 @@ /obj/item/storage/large_holster/fuelpack name = "\improper Broiler-T flexible refueling system" - desc = "A specialized back harness that carries the Broiler-T flexible refueling system. Designed by and for USCM Pyrotechnicians." + desc = "A specialized back harness that carries the Broiler-T flexible refueling system. Designed by and for UACM Pyrotechnicians." icon = 'icons/obj/items/clothing/backpacks.dmi' icon_state = "flamethrower_broiler" flags_atom = FPRINT|CONDUCT diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm index e1f4a17204..3b3d4770fc 100644 --- a/code/game/objects/items/storage/pouch.dm +++ b/code/game/objects/items/storage/pouch.dm @@ -697,7 +697,7 @@ /obj/item/storage/pouch/medical/socmed/dutch name = "\improper Dutch's Medical Pouch" - desc = "A pouch bought from a black market trader by Dutch quite a few years ago. Rumoured to be stolen from secret USCM assets. Its contents have been slowly used up and replaced over the years." + desc = "A pouch bought from a black market trader by Dutch quite a few years ago. Rumoured to be stolen from secret UACM assets. Its contents have been slowly used up and replaced over the years." /obj/item/storage/pouch/medical/socmed/dutch/fill_preset_inventory() new /obj/item/device/healthanalyzer(src) diff --git a/code/game/objects/items/storage/smartpack.dm b/code/game/objects/items/storage/smartpack.dm index d012e77361..2b97ab22d8 100644 --- a/code/game/objects/items/storage/smartpack.dm +++ b/code/game/objects/items/storage/smartpack.dm @@ -11,7 +11,7 @@ /obj/item/storage/backpack/marine/smartpack name = "\improper S-V42 prototype smartpack" - desc = "A joint project between the USCM and Wey-Yu. It is said to be top-class engineering and state of the art technology. Given to USCM deployed synthetic units and the intended usage involve assisting in battlefield support. Can be recharged by grabbing onto an APC and completing the circuit with one's fingers (procedure not advised for non-synthetic personnel). WARNING - User is advised to take precautions." + desc = "A joint project between the UACM and Wey-Yu. It is said to be top-class engineering and state of the art technology. Given to UACM deployed synthetic units and the intended usage involve assisting in battlefield support. Can be recharged by grabbing onto an APC and completing the circuit with one's fingers (procedure not advised for non-synthetic personnel). WARNING - User is advised to take precautions." item_state = "smartpack" icon_state = "smartpack" has_gamemode_skin = FALSE diff --git a/code/game/objects/items/tools/flame_tools.dm b/code/game/objects/items/tools/flame_tools.dm index 7681e74a1d..f4a5e32cfb 100644 --- a/code/game/objects/items/tools/flame_tools.dm +++ b/code/game/objects/items/tools/flame_tools.dm @@ -448,7 +448,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM //////////// /obj/item/clothing/mask/cigarette/cigar name = "\improper premium cigar" - desc = "A huge, brown roll of tobacco and some other stuff that you're meant to smoke. Makes you feel like a true USCM sergeant." + desc = "A huge, brown roll of tobacco and some other stuff that you're meant to smoke. Makes you feel like a true UACM sergeant." icon_state = "cigar_off" icon_on = "cigar_on" icon_off = "cigar_off" diff --git a/code/game/objects/items/tools/misc_tools.dm b/code/game/objects/items/tools/misc_tools.dm index f70f934970..929d6974cf 100644 --- a/code/game/objects/items/tools/misc_tools.dm +++ b/code/game/objects/items/tools/misc_tools.dm @@ -277,7 +277,7 @@ /obj/item/tool/pen/fountain desc = "A lavish testament to the ingenuity of ARMAT's craftsmanship, this fountain pen is a paragon of design and functionality. Detailed with golden accents and intricate mechanics, the pen allows for a swift change between a myriad of ink colors with a simple twist. A product of precision engineering, each mechanism inside the pen is designed to provide a seamless, effortless transition from one color to the next, creating an instrument of luxurious versatility." - desc_lore = "More than just a tool for writing, ARMAT's fountain pen is a symbol of distinction and authority within the ranks of the United States Colonial Marine Corps (USCM). It is a legacy item, exclusively handed out to the top-tier command personnel, each pen a tribute to the recipient's leadership and dedication.\n \nARMAT, renowned for their weapons technology, took a different approach in crafting this piece. The fountain pen, though seemingly a departure from their usual field, is deeply ingrained with the company's engineering philosophy, embodying precision, functionality, and robustness.\n \nThe golden accents are not mere embellishments; they're an identifier, setting apart these pens and their owners from the rest. The gold is meticulously alloyed with a durable metallic substance, granting it resilience to daily wear and tear. Such resilience is symbolic of the tenacity and perseverance required of USCM command personnel.\n \nEach pen is equipped with an intricate color changing mechanism, allowing the user to switch between various ink colors. This feature, inspired by the advanced targeting systems of ARMAT's weaponry, uses miniaturized actuators and precision-ground components to smoothly transition the ink flow. A simple twist of the pen's body activates the change, rotating the internal ink cartridges into place with mechanical grace, ready for the user's command.\n \nThe ink colors are not chosen arbitrarily. Each represents a different echelon within the USCM, allowing the pen's owner to write in the hue that corresponds with their rank or the rank of the recipient of their written orders. This acts as a silent testament to the authority of their words, as if each stroke of the pen echoes through the halls of USCM authority.\n \nDespite its ornate appearance, the pen is as robust as any ARMAT weapon, reflecting the company's commitment to reliability and durability. The metal components are corrosion-resistant, ensuring the pen's longevity, even under the challenging conditions often faced by USCM high command.\n \nThe fusion of luxury and utility, the blend of gold and metal, is an embodiment of the hard-won elegance of command, of the fusion between power and grace. It's more than a writing instrument - it's an emblem of leadership, an accolade to the dedication and strength of those who bear it. ARMAT's fountain pen stands as a monument to the precision, integrity, and courage embodied by the USCM's highest-ranking officers." + desc_lore = "More than just a tool for writing, ARMAT's fountain pen is a symbol of distinction and authority within the ranks of the United States Colonial Marine Corps (UACM). It is a legacy item, exclusively handed out to the top-tier command personnel, each pen a tribute to the recipient's leadership and dedication.\n \nARMAT, renowned for their weapons technology, took a different approach in crafting this piece. The fountain pen, though seemingly a departure from their usual field, is deeply ingrained with the company's engineering philosophy, embodying precision, functionality, and robustness.\n \nThe golden accents are not mere embellishments; they're an identifier, setting apart these pens and their owners from the rest. The gold is meticulously alloyed with a durable metallic substance, granting it resilience to daily wear and tear. Such resilience is symbolic of the tenacity and perseverance required of UACM command personnel.\n \nEach pen is equipped with an intricate color changing mechanism, allowing the user to switch between various ink colors. This feature, inspired by the advanced targeting systems of ARMAT's weaponry, uses miniaturized actuators and precision-ground components to smoothly transition the ink flow. A simple twist of the pen's body activates the change, rotating the internal ink cartridges into place with mechanical grace, ready for the user's command.\n \nThe ink colors are not chosen arbitrarily. Each represents a different echelon within the UACM, allowing the pen's owner to write in the hue that corresponds with their rank or the rank of the recipient of their written orders. This acts as a silent testament to the authority of their words, as if each stroke of the pen echoes through the halls of UACM authority.\n \nDespite its ornate appearance, the pen is as robust as any ARMAT weapon, reflecting the company's commitment to reliability and durability. The metal components are corrosion-resistant, ensuring the pen's longevity, even under the challenging conditions often faced by UACM high command.\n \nThe fusion of luxury and utility, the blend of gold and metal, is an embodiment of the hard-won elegance of command, of the fusion between power and grace. It's more than a writing instrument - it's an emblem of leadership, an accolade to the dedication and strength of those who bear it. ARMAT's fountain pen stands as a monument to the precision, integrity, and courage embodied by the UACM's highest-ranking officers." name = "fountain pen" icon_state = "fountain_pen" item_state = "fountain_pen" @@ -428,7 +428,7 @@ icon_state = "stamp-weyyu" /obj/item/tool/stamp/uscm - name = "USCM rubber stamp" + name = "UACM rubber stamp" icon_state = "stamp-uscm" /obj/item/tool/stamp/cmb diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index d9d40e003c..847bdbfa80 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -103,8 +103,8 @@ icon_state = "syndi_cakes" /obj/item/trash/uscm_mre - name = "\improper crumbled USCM MRE" - desc = "It has done its part for the USCM. Have you?" + name = "\improper crumbled UACM MRE" + desc = "It has done its part for the UACM. Have you?" icon = 'icons/obj/items/trash.dmi' icon_state = "mealpackempty" @@ -182,7 +182,7 @@ icon_state = "tray" /obj/item/trash/USCMtray - name = "\improper USCM Tray" + name = "\improper UACM Tray" desc = "Finished with its tour of duty." icon_state = "MREtray" diff --git a/code/game/objects/items/weapons/blades.dm b/code/game/objects/items/weapons/blades.dm index 2f3410238a..48caafb55e 100644 --- a/code/game/objects/items/weapons/blades.dm +++ b/code/game/objects/items/weapons/blades.dm @@ -27,7 +27,7 @@ /obj/item/weapon/sword/machete name = "\improper M2132 machete" - desc = "Latest issue of the USCM Machete. Great for clearing out jungle or brush on outlying colonies. Found commonly in the hands of scouts and trackers, but difficult to carry with the usual kit." + desc = "Latest issue of the UACM Machete. Great for clearing out jungle or brush on outlying colonies. Found commonly in the hands of scouts and trackers, but difficult to carry with the usual kit." icon_state = "machete" /obj/item/weapon/sword/machete/attack_self(mob/user) @@ -49,14 +49,14 @@ /obj/item/weapon/sword/machete/arnold name = "\improper M2100 \"Ngájhe\" machete" - desc = "An older issue USCM machete, never left testing. Designed in the Central African Republic. The notching made it hard to clean, and as such the USCM refused to adopt it - despite the superior bludgeoning power offered. Difficult to carry with the usual kit ." + desc = "An older issue UACM machete, never left testing. Designed in the Central African Republic. The notching made it hard to clean, and as such the UACM refused to adopt it - despite the superior bludgeoning power offered. Difficult to carry with the usual kit ." icon_state = "arnold-machete" item_state = "arnold-machete" force = MELEE_FORCE_TIER_11 /obj/item/weapon/sword/machete/arnold/weak name = "\improper M2100 machete" - desc = "An older issue USCM machete, never left testing. Designed in the Central African Republic. The notching made it hard to clean, and as such the USCM refused to adopt it - despite the superior bludgeoning power offered. This one has been poorly maintained and as such can't really outperform adopted M2132 machete." + desc = "An older issue UACM machete, never left testing. Designed in the Central African Republic. The notching made it hard to clean, and as such the UACM refused to adopt it - despite the superior bludgeoning power offered. This one has been poorly maintained and as such can't really outperform adopted M2132 machete." force = MELEE_FORCE_STRONG /obj/item/weapon/sword/hefa diff --git a/code/game/objects/prop.dm b/code/game/objects/prop.dm index ac94e8ab03..244385490b 100644 --- a/code/game/objects/prop.dm +++ b/code/game/objects/prop.dm @@ -80,14 +80,14 @@ desc = "A miniature table flag of the United Americas, representing all of North, South, and Central America." /obj/item/prop/tableflag/uscm - name = "USCM table flag" + name = "UACM table flag" icon_state = "uscmflag" desc = "A miniature table flag of the United States Colonial Marines. 'Semper Fi' is written on the flag's bottom." /obj/item/prop/tableflag/uscm2 - name = "USCM historical table flag" + name = "UACM historical table flag" icon_state = "uscmflag2" - desc = "A miniature historical table flag of the United States Colonial Marines, in traditional scarlet and gold. The USCM logo sits in the center; an eagle is perched atop it and an anchor rests behind it." + desc = "A miniature historical table flag of the United States Colonial Marines, in traditional scarlet and gold. The UACM logo sits in the center; an eagle is perched atop it and an anchor rests behind it." /obj/item/prop/tableflag/upp name = "UPP table flag" @@ -124,7 +124,7 @@ /obj/item/prop/colony/used_flare name = "flare" - desc = "A used USCM issued flare. There are instructions on the side, it reads 'pull cord, make light'." + desc = "A used UACM issued flare. There are instructions on the side, it reads 'pull cord, make light'." icon_state = "flare-empty" icon = 'icons/obj/items/lighting.dmi' @@ -253,7 +253,7 @@ /obj/item/prop/magazine/book/borntokill name = "\improper Born to Kill" - desc = "An autobiography penned by Derik A.W. Tomahawk it recounts his service in the USCM. The book was harshly criticised for its bland and uncreative writing and wasn't well received by the general public or members of the UA military. However, artificial soldiers typically value the information contained within." + desc = "An autobiography penned by Derik A.W. Tomahawk it recounts his service in the UACM. The book was harshly criticised for its bland and uncreative writing and wasn't well received by the general public or members of the UA military. However, artificial soldiers typically value the information contained within." /obj/item/prop/magazine/book/bladerunner name = "\improper Bladerunner: A True Detectives Story" @@ -270,24 +270,24 @@ //boots magazine /obj/item/prop/magazine/boots name = "generic Boots! magazine" - desc = "The only official USCM magazine!" + desc = "The only official UACM magazine!" /obj/item/prop/magazine/boots/n117 name = "Boots!: Issue No.117" - desc = "The only official USCM magazine, the headline reads 'STOP CANNING' the short paragraph further explains the dangers of marines throwing CN-20 Nerve gas into bathrooms as a prank." + desc = "The only official UACM magazine, the headline reads 'STOP CANNING' the short paragraph further explains the dangers of marines throwing CN-20 Nerve gas into bathrooms as a prank." /obj/item/prop/magazine/boots/n150 name = "Boots!: Issue No.150" - desc = "The only official USCM magazine, the headline reads 'UPP Rations, The truth.' the short paragraph further explains UPP field rations aren't standardized and are produced at a local level. Because of this, captured and confiscated UPP rations have included some odd choices such as duck liver, century eggs, lutefisk, pickled pig snout, canned tripe, and dehydrated candied radish snacks." + desc = "The only official UACM magazine, the headline reads 'UPP Rations, The truth.' the short paragraph further explains UPP field rations aren't standardized and are produced at a local level. Because of this, captured and confiscated UPP rations have included some odd choices such as duck liver, century eggs, lutefisk, pickled pig snout, canned tripe, and dehydrated candied radish snacks." /obj/item/prop/magazine/boots/n160 name = "Boots!: Issue No.160" - desc = "The only official USCM magazine, the headline reads 'Corporate Liaison 'emotionally exhausted' from screwing so many people over.'" + desc = "The only official UACM magazine, the headline reads 'Corporate Liaison 'emotionally exhausted' from screwing so many people over.'" /obj/item/prop/magazine/boots/n054 name = "Boots!: Issue No.54" - desc = "The only official USCM magazine, the headline reads 'ARMAT strikes back against litigants in M41A-MK2 self cleaning case'" + desc = "The only official UACM magazine, the headline reads 'ARMAT strikes back against litigants in M41A-MK2 self cleaning case'" /obj/item/prop/magazine/boots/n055 name = "Boots!: Issue No.55" - desc = "The only official USCM magazine, the headline reads 'TEN tips to keep your UD4 cockpit both safer and more relaxing.'" + desc = "The only official UACM magazine, the headline reads 'TEN tips to keep your UD4 cockpit both safer and more relaxing.'" diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 119615ab7a..3a4f5d93d1 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -174,7 +174,7 @@ /obj/structure/closet/crate/green name = "green crate" - desc = "A standard green storage crate employed by the USCM. These things are so common, just about anything could be inside." + desc = "A standard green storage crate employed by the UACM. These things are so common, just about anything could be inside." icon_state = "closed_green" icon_opened = "open_green" icon_closed = "closed_green" diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index cfe7531f5f..bcc8c12df7 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -328,7 +328,7 @@ /obj/structure/largecrate/guns - name = "\improper USCM firearms crate (x3)" + name = "\improper UACM firearms crate (x3)" fill_from_loc = FALSE var/num_guns = 3 var/num_mags = 3 diff --git a/code/game/objects/structures/crates_lockers/largecrate_supplies.dm b/code/game/objects/structures/crates_lockers/largecrate_supplies.dm index 9a45b4256d..cc4af0e629 100644 --- a/code/game/objects/structures/crates_lockers/largecrate_supplies.dm +++ b/code/game/objects/structures/crates_lockers/largecrate_supplies.dm @@ -277,8 +277,8 @@ supplies = list(/obj/item/frame/table = 10, /obj/item/frame/rack = 10) /obj/structure/largecrate/supply/supplies/mre - name = "\improper USCM MRE crate (x60)" - desc = "A supply crate containing sixty USCM MRE packets." + name = "\improper UACM MRE crate (x60)" + desc = "A supply crate containing sixty UACM MRE packets." supplies = list(/obj/item/ammo_box/magazine/misc/mre = 5) /obj/structure/largecrate/supply/supplies/water diff --git a/code/game/objects/structures/gun_rack.dm b/code/game/objects/structures/gun_rack.dm index 099d8d4c20..7d58c390ee 100644 --- a/code/game/objects/structures/gun_rack.dm +++ b/code/game/objects/structures/gun_rack.dm @@ -1,6 +1,6 @@ /obj/structure/gun_rack name = "gun rack" - desc = "ARMAT-produced gun rack for storage of long guns. While initial model was supposed to be extremely modifiable, USCM comissioned racks with fixed slots which only fit M41A rifles. Some say they were cheaper, and some say the main reason was marine's ability to easily break anything more complex than a tungsten ball." + desc = "ARMAT-produced gun rack for storage of long guns. While initial model was supposed to be extremely modifiable, UACM comissioned racks with fixed slots which only fit M41A rifles. Some say they were cheaper, and some say the main reason was marine's ability to easily break anything more complex than a tungsten ball." icon = 'icons/obj/structures/gun_racks.dmi' icon_state = "m41a" density = TRUE diff --git a/code/game/objects/structures/props.dm b/code/game/objects/structures/props.dm index 4a4af8fef3..3485d51120 100644 --- a/code/game/objects/structures/props.dm +++ b/code/game/objects/structures/props.dm @@ -1075,7 +1075,7 @@ /obj/structure/prop/invuln/ice_prefab name = "prefabricated structure" - desc = "This structure is made of metal support rods and robust poly-kevlon plastics. A derivative of the stuff used in UA ballistics vests, USCM and UPP uniforms. The loose walls roll with each gust of wind." + desc = "This structure is made of metal support rods and robust poly-kevlon plastics. A derivative of the stuff used in UA ballistics vests, UACM and UPP uniforms. The loose walls roll with each gust of wind." icon = 'icons/obj/structures/props/ice_colony/fabs_tileset.dmi' icon_state = "fab" density = TRUE @@ -1110,7 +1110,7 @@ /obj/structure/prop/invuln/remote_console_pod name = "Remote Console Pod" - desc = "A drop pod used to launch remote piloting equipment to USCM areas of operation" + desc = "A drop pod used to launch remote piloting equipment to UACM areas of operation" icon = 'icons/obj/structures/droppod_32x64.dmi' icon_state = "techpod_open" layer = DOOR_CLOSED_LAYER diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index 765c717c6b..551dd17cd9 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -575,23 +575,23 @@ //=================// /obj/structure/sign/ROsign - name = "\improper USCM Requisitions Office Guidelines" + name = "\improper UACM Requisitions Office Guidelines" desc = " 1. You are not entitled to service or equipment. Attachments are a privilege, not a right.\n 2. You must be fully dressed to obtain service. Cryosleep underwear is non-permissible.\n 3. The Quartermaster has the final say and the right to decline service. Only the Acting Commanding Officer may override their decisions.\n 4. Please treat your Requsitions staff with respect. They work hard." icon_state = "roplaque" /obj/structure/sign/prop1 - name = "\improper USCM Poster" + name = "\improper UACM Poster" desc = "The symbol of the United States Colonial Marines corps." icon_state = "prop1" /obj/structure/sign/prop2 - name = "\improper USCM Poster" + name = "\improper UACM Poster" desc = "A deeply faded poster of a group of glamorous Colonial Marines in uniform. Probably taken pre-Alpha." icon_state = "prop2" /obj/structure/sign/prop3 - name = "\improper USCM Poster" - desc = "An old recruitment poster for the USCM. Looking at it floods you with a mixture of pride and sincere regret." + name = "\improper UACM Poster" + desc = "An old recruitment poster for the UACM. Looking at it floods you with a mixture of pride and sincere regret." icon_state = "prop3" diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index 95c5d8e45f..fbd412540b 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -423,7 +423,7 @@ var/global/list/activated_medevac_stretchers = list() /obj/item/roller/bedroll name = "folded bedroll" - desc = "A standard issue USCMC bedroll, They've been in service for as long as you can remember. The tag on it states to unfold it before rest, but who needs rules anyway, right?" + desc = "A standard issue UACM bedroll, They've been in service for as long as you can remember. The tag on it states to unfold it before rest, but who needs rules anyway, right?" icon = 'icons/monkey_icos.dmi' icon_state = "bedroll" rollertype = /obj/structure/bed/bedroll diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index e523906f4c..306a27a813 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -278,7 +278,7 @@ /obj/structure/bed/chair/comfy/alpha icon_state = "comfychair_alpha" name = "Alpha squad chair" - desc = "A simple chair permanently attached to the floor. Covered with a squeaky and way too hard faux-leather, unevenly painted in Alpha squad red. Only for the bravest and freshest USCM recruits." + desc = "A simple chair permanently attached to the floor. Covered with a squeaky and way too hard faux-leather, unevenly painted in Alpha squad red. Only for the bravest and freshest UACM recruits." /obj/structure/bed/chair/comfy/bravo icon_state = "comfychair_bravo" diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index 2e3a536536..983526c7a3 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -1143,7 +1143,7 @@ var/datum/controller/supply/supply_controller = new() //linebreak temp += SPAN_WARNING("Name's Mendoza, Cargo Technician. Formerly, I suppose. I tripped into this stupid pit god knows how long ago. A crate of mattresses broke my fall, thankfully. The fuckin' MPs never even bothered to look for me!
- Equip yourself with a multi-tool
- Use the multitool on each machine, that is the broadcaster, receiver and the relay.
- Turn all the machines on, it has already been configured for you to listen on.
- 145.7 - Common Channel
- 144.7 - Private AI Channel
- 135.9 - Security Channel
- 135.7 - Engineering Channel
- 135.5 - Medical Channel
- 135.3 - Command Channel
- 135.1 - Science Channel
- 134.9 - Mining Channel
- 134.7 - Cargo Channel " /obj/item/paper/warhead_recycle - name = "USCM Recycling Efforts" - info = "Hello USCM Orbital Cannon System Owner!
") temp += SPAN_WARNING("They probably wrote off my file as a friggin' clerical error. Bastards, all of them.... but I've got a plan.
") - temp += SPAN_WARNING("I'm gonna smuggle all these ASRS goods out of the ship next time it docks. I'm gonna sell them, and use the money to sue the fuck out of the USCM!
") + temp += SPAN_WARNING("I'm gonna smuggle all these ASRS goods out of the ship next time it docks. I'm gonna sell them, and use the money to sue the fuck out of the UACM!
") temp += SPAN_WARNING("Imagine the look on their faces! Mendoza, the little CT, in court as they lose all their fuckin' money!
") //linebreak temp += SPAN_WARNING("I do need... money. You wouldn't believe the things I've seen here. There's an aisle full of auto-doc crates, and that's the least of it.
") @@ -1178,7 +1178,7 @@ var/datum/controller/supply/supply_controller = new() if(26 to 30) temp += "You know... don't tell anyone, but I actually really like blue-flavored Souto for some reason. Not the diet version, that cyan junk's as nasty as any other flavor, but... there's just somethin' about that blue-y goodness. If you see any, I wouldn't mind havin' them thrown down the elevator.
" if(31 to 35) - temp += "If you see any, er.. 'elite' equipment, be sure to throw it down here. I know a few people that'd offer quite the amount of money for a USCM commander's gun, or pet. Even the armor is worth a fortune. Don't kill yourself doin' it, though.
" + temp += "If you see any, er.. 'elite' equipment, be sure to throw it down here. I know a few people that'd offer quite the amount of money for a UACM commander's gun, or pet. Even the armor is worth a fortune. Don't kill yourself doin' it, though.
" temp += "Hell, any kind of wildlife too, actually! Anythin' that isn't a replicant animal is worth a truly ridiculous sum back on Terra, I'll give ya quite the amount of points for 'em. As long as it isn't plannin' on killing me.
" /proc/get_black_market_value(atom/movable/movable_atom) diff --git a/code/game/turfs/floor_types.dm b/code/game/turfs/floor_types.dm index d71d42ff2c..f668d25617 100644 --- a/code/game/turfs/floor_types.dm +++ b/code/game/turfs/floor_types.dm @@ -274,7 +274,7 @@ //Others /turf/open/floor/almayer/uscm icon_state = "logo_c" - name = "\improper USCM Logo" + name = "\improper UACM Logo" /turf/open/floor/almayer/uscm/directional icon_state = "logo_directional" diff --git a/code/game/turfs/walls/wall_types.dm b/code/game/turfs/walls/wall_types.dm index 35a5d53379..e34624ce99 100644 --- a/code/game/turfs/walls/wall_types.dm +++ b/code/game/turfs/walls/wall_types.dm @@ -657,7 +657,7 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen) /turf/closed/wall/shiva/prefabricated name = "prefabricated structure wall" icon_state = "shiva_fab" - desc = "This structure is made of metal support rods and robust poly-kevlon plastics. A derivative of the stuff used in UA ballistics vests, USCM and UPP uniforms. These walls are pulled taught and have been reinforced into a more permanent structure." + desc = "This structure is made of metal support rods and robust poly-kevlon plastics. A derivative of the stuff used in UA ballistics vests, UACM and UPP uniforms. These walls are pulled taught and have been reinforced into a more permanent structure." walltype = WALL_SHIVA_FAB damage_cap = HEALTH_WALL diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm index 7c647f5dcf..b970cd0d01 100644 --- a/code/game/verbs/who.dm +++ b/code/game/verbs/who.dm @@ -8,7 +8,7 @@ "Humans" = 0, "Infected humans" = 0, FACTION_MARINE = 0, - "USCM Marines" = 0, + "UACM Marines" = 0, "Lobby" = 0, FACTION_YAUTJA = 0, @@ -84,7 +84,7 @@ if(C.mob.faction == FACTION_MARINE) counted_humanoids[FACTION_MARINE]++ if(C.mob.job in (ROLES_MARINES)) - counted_humanoids["USCM Marines"]++ + counted_humanoids["UACM Marines"]++ else counted_humanoids[C.mob.faction]++ else if(isxeno(C.mob)) @@ -103,7 +103,7 @@ dat += "
Observers: [counted_humanoids["Observers"]] players and [counted_humanoids["Admin observers"]] staff members" dat += "
Humans: [counted_humanoids["Humans"]] (Infected: [counted_humanoids["Infected humans"]])" if(counted_humanoids[FACTION_MARINE]) - dat += "
USCM personnel: [counted_humanoids[FACTION_MARINE]] (Marines: [counted_humanoids["USCM Marines"]])" + dat += "
UACM personnel: [counted_humanoids[FACTION_MARINE]] (Marines: [counted_humanoids["UACM Marines"]])" if(counted_humanoids[FACTION_YAUTJA]) dat += "
Predators: [counted_humanoids[FACTION_YAUTJA]] [counted_humanoids["Infected preds"] ? "(Infected: [counted_humanoids["Infected preds"]])" : ""]" if(counted_humanoids[FACTION_ZOMBIE]) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index a8f6a7e988..4535af237f 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -21,7 +21,7 @@ var/list/admin_verbs_default = list( /client/proc/cmd_admin_create_AI_report, //Allows creation of IC reports by the ships AI utilizing Almayer General channel. Relies on ARES being intact and tcomms being powered. /client/proc/cmd_admin_create_AI_shipwide_report, //Allows creation of IC reports by the ships AI utilizing announcement code. Will be shown to every conscious human on Almayer z-level regardless of ARES and tcomms status. /client/proc/cmd_admin_create_AI_apollo_report, //Allows creation of IC reports to the Apollo subprocessor, transmitting to Working Joes and Maintenance Drones. - /client/proc/cmd_admin_create_centcom_report, //Messages from USCM command/other factions. + /client/proc/cmd_admin_create_centcom_report, //Messages from UACM command/other factions. /client/proc/cmd_admin_create_predator_report, //Predator ship AI report /client/proc/admin_ghost, /*allows us to ghost/reenter body at will*/ /client/proc/invismin, @@ -119,7 +119,7 @@ var/list/admin_verbs_minor_event = list( /client/proc/cmd_admin_world_narrate, /*sends text to all players with no padding*/ /client/proc/cmd_admin_ground_narrate, /client/proc/cmd_admin_atom_narrate, - /client/proc/cmd_admin_create_centcom_report, //Messages from USCM command/other factions. + /client/proc/cmd_admin_create_centcom_report, //Messages from UACM command/other factions. /client/proc/cmd_admin_create_predator_report, //Predator ship AI report /client/proc/toggle_ob_spawn, /client/proc/toggle_sniper_upgrade, @@ -144,6 +144,7 @@ var/list/admin_verbs_minor_event = list( /client/proc/set_narration_preset, /client/proc/speak_to_comms, /client/proc/call_tgui_play_directly, + /client/proc/opener_blurb, ) var/list/admin_verbs_major_event = list( diff --git a/code/modules/admin/tabs/admin_tab.dm b/code/modules/admin/tabs/admin_tab.dm index 3d6edda7cb..06a5fa9516 100644 --- a/code/modules/admin/tabs/admin_tab.dm +++ b/code/modules/admin/tabs/admin_tab.dm @@ -308,7 +308,7 @@ #define SUBTLE_MESSAGE_IN_HEAD "Voice in Head" #define SUBTLE_MESSAGE_WEYLAND "Weyland-Yutani" -#define SUBTLE_MESSAGE_USCM "USCM High Command" +#define SUBTLE_MESSAGE_USCM "UACM High Command" #define SUBTLE_MESSAGE_FACTION "Faction Specific" /datum/admins/proc/subtlemessageall() diff --git a/code/modules/admin/tabs/event_tab.dm b/code/modules/admin/tabs/event_tab.dm index 24b448d3ef..35d585707b 100644 --- a/code/modules/admin/tabs/event_tab.dm +++ b/code/modules/admin/tabs/event_tab.dm @@ -1135,3 +1135,8 @@ client?.tgui_panel?.play_music(web_sound_url, music_extra_data) else client?.tgui_panel?.stop_music() + +/client/proc/opener_blurb() + show_blurb(GLOB.player_list, duration = 15 SECONDS, message = "The year is 2224.\n\nLocated on the edge of the Neroid Sector\nLV-624 grew from an insignificant prison\nplanet with a minor corporate interest\nto an important way-station, with all\nthree major factions maintaining\ninstallations on the planet.\n\nOn February 11th, 2224, an unidentified\nflying object enters the solar system\nand impacts the planets communications\narray.\nAll contact with the planet and its\nsurrounding infrastructure is lost.",scroll_down = TRUE, screen_position = "CENTER,BOTTOM+4.5:16", text_alignment = "center", text_color = "#ffaef2", blurb_key = "introduction", ignore_key = TRUE, speed = 1) + sleep(600) + show_blurb(GLOB.player_list, duration = 15 SECONDS, message = "Due to the politics involved, it takes\nmonths to organize a rescue. Now, thanks\nto an one-of-a-kind agreement\nthe 1st United Expeditionary Response\nconsisting of elements coming from all\nthree of the major political players\nback on Earth is finally close to\narriving in the system.\n\nYou are part of the United Americas\nColonial Marines element of the UER.\nYou have been hand picked from a narrow\nfield of qualified volunteers to take\npart in this operation and have been\nassigned to the UAS Arrowhead.\nYou are the first organized military\nresponse in the system since it lost\ncontact.\n\nYour mission begins now.",scroll_down = TRUE, screen_position = "CENTER,BOTTOM+3.5:16", text_alignment = "center", text_color = "#ffaef2", blurb_key = "introduction", ignore_key = TRUE, speed = 1) diff --git a/code/modules/admin/tacmap_panel/tacmap_admin_panel_tgui.dm b/code/modules/admin/tacmap_panel/tacmap_admin_panel_tgui.dm index e4b6f68460..8503c2efd5 100644 --- a/code/modules/admin/tacmap_panel/tacmap_admin_panel_tgui.dm +++ b/code/modules/admin/tacmap_panel/tacmap_admin_panel_tgui.dm @@ -4,7 +4,7 @@ GLOBAL_DATUM_INIT(tacmap_admin_panel, /datum/tacmap_admin_panel, new) /datum/tacmap_admin_panel var/name = "Tacmap Panel" - /// The index picked last for USCM (zero indexed), -1 will try to select latest if it exists + /// The index picked last for UACM (zero indexed), -1 will try to select latest if it exists var/uscm_selection = LATEST_SELECTION /// The index picked last for Xenos (zero indexed), -1 will try to select latest if it exists var/xeno_selection = LATEST_SELECTION diff --git a/code/modules/admin/topic/topic.dm b/code/modules/admin/topic/topic.dm index 9d0a6de572..c68486072e 100644 --- a/code/modules/admin/topic/topic.dm +++ b/code/modules/admin/topic/topic.dm @@ -1309,15 +1309,15 @@ to_chat(usr, "The person you are trying to contact is not wearing a headset") return - var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via their headset.","Outgoing message from USCM", "") + var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via their headset.","Outgoing message from UACM", "") if(!input) return to_chat(src.owner, "You sent [input] to [H] via a secure channel.") - log_admin("[src.owner] replied to [key_name(H)]'s USCM message with the message [input].") + log_admin("[src.owner] replied to [key_name(H)]'s UACM message with the message [input].") for(var/client/X in GLOB.admins) if((R_ADMIN|R_MOD) & X.admin_holder.rights) - to_chat(X, SPAN_STAFF_IC("ADMINS/MODS: \red [src.owner] replied to [key_name(H)]'s USCM message with: \blue \")[input]\"")) + to_chat(X, SPAN_STAFF_IC("ADMINS/MODS: \red [src.owner] replied to [key_name(H)]'s UACM message with: \blue \")[input]\"")) to_chat(H, SPAN_DANGER("You hear something crackle in your headset before a voice speaks, please stand by for a message:\" \blue \"[input]\"")) else if(href_list["SyndicateReply"]) @@ -1427,17 +1427,17 @@ var/mob/living/carbon/human/H = locate(href_list["USCMFaxReply"]) var/obj/structure/machinery/faxmachine/fax = locate(href_list["originfax"]) - var/template_choice = tgui_input_list(usr, "Use which template or roll your own?", "Fax Templates", list("USCM High Command", "USCM Provost General", "Custom")) + var/template_choice = tgui_input_list(usr, "Use which template or roll your own?", "Fax Templates", list("UACM High Command", "UACM Provost General", "Custom")) if(!template_choice) return var/datum/fax/fax_message switch(template_choice) if("Custom") - var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via secure connection. NOTE: BBCode does not work, but HTML tags do! Use
for line breaks.", "Outgoing message from USCM", "") as message|null + var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via secure connection. NOTE: BBCode does not work, but HTML tags do! Use
for line breaks.", "Outgoing message from UACM", "") as message|null if(!input) return fax_message = new(input) - if("USCM High Command", "USCM Provost General") - var/subject = input(src.owner, "Enter subject line", "Outgoing message from USCM", "") as message|null + if("UACM High Command", "UACM Provost General") + var/subject = input(src.owner, "Enter subject line", "Outgoing message from UACM", "") as message|null if(!subject) return var/addressed_to = "" @@ -1445,22 +1445,22 @@ if(address_option == "Sender") addressed_to = "[H.real_name]" else if(address_option == "Custom") - addressed_to = input(src.owner, "Enter Addressee Line", "Outgoing message from USCM", "") as message|null + addressed_to = input(src.owner, "Enter Addressee Line", "Outgoing message from UACM", "") as message|null if(!addressed_to) return else return - var/message_body = input(src.owner, "Enter Message Body, use for paragraphs", "Outgoing message from Weyland USCM", "") as message|null + var/message_body = input(src.owner, "Enter Message Body, use for paragraphs", "Outgoing message from Weyland UACM", "") as message|null if(!message_body) return - var/sent_by = input(src.owner, "Enter the name and rank you are sending from.", "Outgoing message from USCM", "") as message|null + var/sent_by = input(src.owner, "Enter the name and rank you are sending from.", "Outgoing message from UACM", "") as message|null if(!sent_by) return var/sent_title = "Office of the Provost General" - if(template_choice == "USCM High Command") - sent_title = "USCM High Command" + if(template_choice == "UACM High Command") + sent_title = "UACM High Command" - fax_message = new(generate_templated_fax(0, "USCM CENTRAL COMMAND", subject,addressed_to, message_body,sent_by, sent_title, "United States Colonial Marine Corps")) + fax_message = new(generate_templated_fax(0, "UACM CENTRAL COMMAND", subject,addressed_to, message_body,sent_by, sent_title, "United States Colonial Marine Corps")) show_browser(usr, "[fax_message.data]", "uscmfaxpreview", "size=500x400") var/send_choice = tgui_input_list(usr, "Send this fax?", "Fax Template", list("Send", "Cancel")) if(send_choice != "Send") @@ -1471,7 +1471,7 @@ GLOB.USCMFaxes.Add("\[view '[customname]' from [key_name(usr)] at [time2text(world.timeofday, "hh:mm:ss")]\]") - var/msg_ghost = SPAN_NOTICE("USCM FAX REPLY: ") + var/msg_ghost = SPAN_NOTICE("UACM FAX REPLY: ") msg_ghost += "Transmitting '[customname]' via secure connection ... " msg_ghost += "view message" announce_fax( ,msg_ghost) @@ -1486,7 +1486,7 @@ // give the sprite some time to flick spawn(20) var/obj/item/paper/P = new /obj/item/paper( F.loc ) - P.name = "USCM High Command - [customname]" + P.name = "UACM High Command - [customname]" P.info = fax_message.data P.update_icon() @@ -1499,7 +1499,7 @@ P.stamped = new P.stamped += /obj/item/tool/stamp P.overlays += stampoverlay - P.stamps += "
This paper has been stamped by the USCM High Command Quantum Relay." + P.stamps += "
This paper has been stamped by the UACM High Command Quantum Relay." to_chat(src.owner, "Message reply to transmitted successfully.") message_admins(SPAN_STAFF_IC("[key_name_admin(src.owner)] replied to a fax message from [key_name_admin(H)]"), 1) @@ -2020,7 +2020,7 @@ supply_controller.ordernum++ new_order.object = supply_controller.supply_packs[nuketype] new_order.orderedby = ref_person - new_order.approvedby = "USCM High Command" + new_order.approvedby = "UACM High Command" supply_controller.shoppinglist += new_order //Can no longer request a nuke @@ -2034,7 +2034,7 @@ var/mob/ref_person = locate(href_list["nukedeny"]) if(!istype(ref_person)) return FALSE - marine_announcement("Your request for nuclear ordnance deployment has been reviewed and denied by USCM High Command for operational security and colonial preservation reasons. Have a good day.", "NUCLEAR ORDNANCE DENIED", 'sound/misc/notice2.ogg', logging = ARES_LOG_MAIN) + marine_announcement("Your request for nuclear ordnance deployment has been reviewed and denied by UACM High Command for operational security and colonial preservation reasons. Have a good day.", "NUCLEAR ORDNANCE DENIED", 'sound/misc/notice2.ogg', logging = ARES_LOG_MAIN) log_game("[key_name_admin(usr)] has denied nuclear ordnance, requested by [key_name_admin(ref_person)]") message_admins("[key_name_admin(usr)] has dnied nuclear ordnance, requested by [key_name_admin(ref_person)]") diff --git a/code/modules/admin/verbs/mob_verbs.dm b/code/modules/admin/verbs/mob_verbs.dm index 7d4c123510..b617f63a2b 100644 --- a/code/modules/admin/verbs/mob_verbs.dm +++ b/code/modules/admin/verbs/mob_verbs.dm @@ -126,7 +126,7 @@ to_chat(src, "Only administrators may use this command.") return - var/list/subtle_message_options = list("Voice in head", "QM Psychic Whisper", "Weyland-Yutani", "USCM High Command", "Faction-specific") + var/list/subtle_message_options = list("Voice in head", "QM Psychic Whisper", "Weyland-Yutani", "UACM High Command", "Faction-specific") var/message_option = tgui_input_list(usr, "Choose the method of subtle messaging", "", subtle_message_options) diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index e0210e4577..4ad8bc65df 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -31,7 +31,7 @@ /proc/high_command_announce(text , mob/Sender , iamessage) var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN) - msg = "[SPAN_STAFF_IC("USCM[iamessage ? "IA" : ""]:")][key_name(Sender, 1)] [CC_MARK(Sender)] [ADMIN_PP(Sender)] [ADMIN_VV(Sender)] [ADMIN_SM(Sender)] [ADMIN_JMP_USER(Sender)] [CC_REPLY(Sender)]: [msg]" + msg = "[SPAN_STAFF_IC("UACM[iamessage ? "IA" : ""]:")][key_name(Sender, 1)] [CC_MARK(Sender)] [ADMIN_PP(Sender)] [ADMIN_VV(Sender)] [ADMIN_SM(Sender)] [ADMIN_JMP_USER(Sender)] [CC_REPLY(Sender)]: [msg]" log_admin(msg) for(var/client/C in GLOB.admins) if((R_ADMIN|R_MOD) & C.admin_holder.rights) diff --git a/code/modules/almayer/machinery.dm b/code/modules/almayer/machinery.dm index 400e1f0f6f..4a17800208 100644 --- a/code/modules/almayer/machinery.dm +++ b/code/modules/almayer/machinery.dm @@ -147,13 +147,13 @@ /obj/structure/prop/almayer/computers/mission_planning_system name = "\improper MPS IV computer" - desc = "The Mission Planning System IV (MPS IV), an enhancement in mission planning and charting for dropship pilots across the USCM. Fully capable of customizing their flight paths and loadouts to suit their combat needs." + desc = "The Mission Planning System IV (MPS IV), an enhancement in mission planning and charting for dropship pilots across the UACM. Fully capable of customizing their flight paths and loadouts to suit their combat needs." icon = 'icons/obj/structures/props/almayer_props.dmi' icon_state = "mps" /obj/structure/prop/almayer/computers/mapping_computer name = "\improper CMPS II computer" - desc = "The Common Mapping Production System version II allows for sensory input from satellites and ship systems to derive planetary maps in a standardized fashion for all USCM pilots." + desc = "The Common Mapping Production System version II allows for sensory input from satellites and ship systems to derive planetary maps in a standardized fashion for all UACM pilots." icon = 'icons/obj/structures/props/almayer_props.dmi' icon_state = "mapping_comp" @@ -187,7 +187,7 @@ /obj/structure/prop/almayer/ship_memorial name = "slab of victory" - desc = "A ship memorial dedicated to the triumphs of the USCM and the fallen marines of this ship. On the left there are grand tales of victory etched into the slab. On the right there is a list of famous marines who have fallen in combat serving the USCM." + desc = "A ship memorial dedicated to the triumphs of the UACM and the fallen marines of this ship. On the left there are grand tales of victory etched into the slab. On the right there is a list of famous marines who have fallen in combat serving the UACM." icon = 'icons/obj/structures/props/almayer_props64.dmi' icon_state = "ship_memorial" bound_width = 64 diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index af1f6a03c9..06d4b2523d 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -166,24 +166,24 @@ var/global/list/gear_datums_by_name = list() allowed_origins = USCM_ORIGINS /datum/gear/mask/uscm/balaclava_green - display_name = "USCM balaclava, green" + display_name = "UACM balaclava, green" path = /obj/item/clothing/mask/rebreather/scarf/green /datum/gear/mask/uscm/balaclava_grey - display_name = "USCM balaclava, grey" + display_name = "UACM balaclava, grey" path = /obj/item/clothing/mask/rebreather/scarf/gray /datum/gear/mask/uscm/balaclava_tan - display_name = "USCM balaclava, tan" + display_name = "UACM balaclava, tan" path = /obj/item/clothing/mask/rebreather/scarf/tan /datum/gear/mask/uscm/skull_balaclava_blue - display_name = "USCM balaclava, blue skull" + display_name = "UACM balaclava, blue skull" path = /obj/item/clothing/mask/rebreather/skull cost = 4 /datum/gear/mask/uscm/skull_balaclava_black - display_name = "USCM balaclava, black skull" + display_name = "UACM balaclava, black skull" path = /obj/item/clothing/mask/rebreather/skull/black cost = 4 @@ -204,123 +204,123 @@ var/global/list/gear_datums_by_name = list() allowed_origins = USCM_ORIGINS /datum/gear/headwear/uscm/bandana_green - display_name = "USCM bandana, green" + display_name = "UACM bandana, green" path = /obj/item/clothing/head/cmbandana /datum/gear/headwear/uscm/bandana_tan - display_name = "USCM bandana, tan" + display_name = "UACM bandana, tan" path = /obj/item/clothing/head/cmbandana/tan /datum/gear/headwear/uscm/beanie_grey - display_name = "USCM beanie, grey" + display_name = "UACM beanie, grey" path = /obj/item/clothing/head/beanie/gray /datum/gear/headwear/uscm/beanie_green - display_name = "USCM beanie, green" + display_name = "UACM beanie, green" path = /obj/item/clothing/head/beanie/green /datum/gear/headwear/uscm/beanie_tan - display_name = "USCM beanie, tan" + display_name = "UACM beanie, tan" path = /obj/item/clothing/head/beanie/tan /datum/gear/headwear/uscm/beret_green - display_name = "USCM beret, green" + display_name = "UACM beret, green" path = /obj/item/clothing/head/beret/cm /datum/gear/headwear/uscm/beret_tan - display_name = "USCM beret, tan" + display_name = "UACM beret, tan" path = /obj/item/clothing/head/beret/cm/tan /datum/gear/headwear/uscm/beret_black - display_name = "USCM beret, black" + display_name = "UACM beret, black" path = /obj/item/clothing/head/beret/cm/black /datum/gear/headwear/uscm/beret_white - display_name = "USCM beret, white" + display_name = "UACM beret, white" path = /obj/item/clothing/head/beret/cm/white /datum/gear/headwear/uscm/beret_alpha - display_name = "USCM beret, red flash" + display_name = "UACM beret, red flash" path = /obj/item/clothing/head/beret/cm/alpha /datum/gear/headwear/uscm/beret_bravo - display_name = "USCM beret, yellow flash" + display_name = "UACM beret, yellow flash" path = /obj/item/clothing/head/beret/cm/bravo /datum/gear/headwear/uscm/beret_charlie - display_name = "USCM beret, purple flash" + display_name = "UACM beret, purple flash" path = /obj/item/clothing/head/beret/cm/charlie /datum/gear/headwear/uscm/beret_delta - display_name = "USCM beret, blue flash" + display_name = "UACM beret, blue flash" path = /obj/item/clothing/head/beret/cm/delta /datum/gear/headwear/uscm/beret_echo - display_name = "USCM beret, green flash" + display_name = "UACM beret, green flash" path = /obj/item/clothing/head/beret/cm/echo /datum/gear/headwear/uscm/beret_foxtrot - display_name = "USCM beret, brown flash" + display_name = "UACM beret, brown flash" path = /obj/item/clothing/head/beret/cm/foxtrot /datum/gear/headwear/uscm/beret_intel - display_name = "USCM beret, black flash" + display_name = "UACM beret, black flash" path = /obj/item/clothing/head/beret/cm/intel /datum/gear/headwear/uscm/boonie_olive - display_name = "USCM boonie hat, olive" + display_name = "UACM boonie hat, olive" path = /obj/item/clothing/head/cmcap/boonie /datum/gear/headwear/uscm/boonie_tan - display_name = "USCM boonie hat, tan" + display_name = "UACM boonie hat, tan" path = /obj/item/clothing/head/cmcap/boonie/tan /datum/gear/headwear/uscm/cap - display_name = "USCM cap" + display_name = "UACM cap" path = /obj/item/clothing/head/cmcap /datum/gear/headwear/uscm/headband_brown - display_name = "USCM headband, brown" + display_name = "UACM headband, brown" path = /obj/item/clothing/head/headband/brown /datum/gear/headwear/uscm/headband_green - display_name = "USCM headband, green" + display_name = "UACM headband, green" path = /obj/item/clothing/head/headband /datum/gear/headwear/uscm/headband_grey - display_name = "USCM headband, grey" + display_name = "UACM headband, grey" path = /obj/item/clothing/head/headband/gray /datum/gear/headwear/uscm/headband_red - display_name = "USCM headband, red" + display_name = "UACM headband, red" path = /obj/item/clothing/head/headband/red /datum/gear/headwear/uscm/headband_tan - display_name = "USCM headband, tan" + display_name = "UACM headband, tan" path = /obj/item/clothing/head/headband/tan /datum/gear/headwear/uscm/headband_intel - display_name = "USCM headband, black" + display_name = "UACM headband, black" path = /obj/item/clothing/head/headband/intel /datum/gear/headwear/uscm/headband_bravo - display_name = "USCM headband, orange" + display_name = "UACM headband, orange" path = /obj/item/clothing/head/headband/bravo /datum/gear/headwear/uscm/headband_charlie - display_name = "USCM headband, purple" + display_name = "UACM headband, purple" path = /obj/item/clothing/head/headband/charlie /datum/gear/headwear/uscm/headband_delta - display_name = "USCM headband, blue" + display_name = "UACM headband, blue" path = /obj/item/clothing/head/headband/delta /datum/gear/headwear/uscm/headband_echo - display_name = "USCM headband, cyan green" + display_name = "UACM headband, cyan green" path = /obj/item/clothing/head/headband/echo /datum/gear/headwear/uscm/headset - display_name = "USCM headset" + display_name = "UACM headset" path = /obj/item/clothing/head/headset /datum/gear/helmet_garb @@ -340,7 +340,7 @@ var/global/list/gear_datums_by_name = list() path = /obj/item/prop/helmetgarb/flair_peace /datum/gear/helmet_garb/flair_uscm - display_name = "Flair, USCM" + display_name = "Flair, UACM" path = /obj/item/prop/helmetgarb/flair_uscm /datum/gear/helmet_garb/helmet_gasmask @@ -421,7 +421,7 @@ var/global/list/gear_datums_by_name = list() allowed_origins = USCM_ORIGINS /datum/gear/helmet_garb/chaplain_patch - display_name = "USCM chaplain helmet patch" + display_name = "UACM chaplain helmet patch" path = /obj/item/prop/helmetgarb/chaplain_patch allowed_origins = USCM_ORIGINS @@ -834,7 +834,7 @@ var/global/list/gear_datums_by_name = list() path = /obj/item/reagent_container/food/drinks/flask /datum/gear/flask/uscm - display_name = "USCM flask" + display_name = "UACM flask" path = /obj/item/reagent_container/food/drinks/flask/marine /datum/gear/flask/vacuum @@ -1071,13 +1071,13 @@ var/global/list/gear_datums_by_name = list() cost = 3 /datum/gear/misc/sunscreen_stick - display_name = "USCM issue sunscreen" + display_name = "UACM issue sunscreen" path = /obj/item/facepaint/sunscreen_stick cost = 1 //The cadmium poisoning pays for the discounted cost longterm allowed_origins = USCM_ORIGINS /datum/gear/misc/patch_uscm - display_name = "USCM shoulder patch" + display_name = "UACM shoulder patch" path = /obj/item/clothing/accessory/patch cost = 1 slot = WEAR_IN_ACCESSORY diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 0fbca14801..9c7e2f540f 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -378,7 +378,7 @@ /obj/item/clothing/glasses/mgoggles name = "marine ballistic goggles" - desc = "Standard issue USCM goggles. While commonly found mounted atop M10 pattern helmets, they are also capable of preventing insects, dust, and other things from getting into one's eyes." + desc = "Standard issue UACM goggles. While commonly found mounted atop M10 pattern helmets, they are also capable of preventing insects, dust, and other things from getting into one's eyes." icon_state = "mgoggles" flags_equip_slot = SLOT_EYES|SLOT_FACE flags_obj = OBJ_NO_HELMET_BAND|OBJ_IS_HELMET_GARB @@ -393,27 +393,27 @@ /obj/item/clothing/glasses/mgoggles/prescription name = "prescription marine ballistic goggles" - desc = "Standard issue USCM goggles. Mostly used to decorate one's helmet. Contains prescription lenses in case you weren't sure if they were lame or not." + desc = "Standard issue UACM goggles. Mostly used to decorate one's helmet. Contains prescription lenses in case you weren't sure if they were lame or not." icon_state = "mgoggles" prescription = TRUE /obj/item/clothing/glasses/mgoggles/black name = "black marine ballistic goggles" - desc = "Standard issue USCM goggles. While commonly found mounted atop M10 pattern helmets, they are also capable of preventing insects, dust, and other things from getting into one's eyes. This one has black tinted lenses." + desc = "Standard issue UACM goggles. While commonly found mounted atop M10 pattern helmets, they are also capable of preventing insects, dust, and other things from getting into one's eyes. This one has black tinted lenses." icon_state = "mgogglesblk" active_icon_state = "mgogglesblk_down" inactive_icon_state = "mgogglesblk" /obj/item/clothing/glasses/mgoggles/orange name = "orange marine ballistic goggles" - desc = "Standard issue USCM goggles. While commonly found mounted atop M10 pattern helmets, they are also capable of preventing insects, dust, and other things from getting into one's eyes. This one has amber colored day lenses." + desc = "Standard issue UACM goggles. While commonly found mounted atop M10 pattern helmets, they are also capable of preventing insects, dust, and other things from getting into one's eyes. This one has amber colored day lenses." icon_state = "mgogglesorg" active_icon_state = "mgogglesorg_down" inactive_icon_state = "mgogglesorg" /obj/item/clothing/glasses/mgoggles/v2 name = "M1A1 marine ballistic goggles" - desc = "Newer issue USCM goggles. While commonly found mounted atop M10 pattern helmets, they are also capable of preventing insects, dust, and other things from getting into one's eyes. This version has larger lenses." + desc = "Newer issue UACM goggles. While commonly found mounted atop M10 pattern helmets, they are also capable of preventing insects, dust, and other things from getting into one's eyes. This version has larger lenses." icon_state = "mgoggles2" active_icon_state = "mgoggles2_down" inactive_icon_state = "mgoggles2" @@ -584,7 +584,7 @@ /obj/item/clothing/glasses/sunglasses/big name = "\improper BiMex personal shades" - desc = "These are an expensive pair of BiMex sunglasses. This brand is popular with USCM foot sloggers because its patented mirror refraction has been said to offer protection from atomic flash, solar radiation, and targeting lasers. To top it all off, everyone seems to know a guy who knows a guy who knows a guy that had a laser pistol reflect off of his shades. BiMex came into popularity with the Marines after its 'Save the Colonies and Look Cool Doing It' ad campaign." + desc = "These are an expensive pair of BiMex sunglasses. This brand is popular with UACM foot sloggers because its patented mirror refraction has been said to offer protection from atomic flash, solar radiation, and targeting lasers. To top it all off, everyone seems to know a guy who knows a guy who knows a guy that had a laser pistol reflect off of his shades. BiMex came into popularity with the Marines after its 'Save the Colonies and Look Cool Doing It' ad campaign." icon_state = "bigsunglasses" item_state = "bigsunglasses" eye_protection = EYE_PROTECTION_FLASH @@ -601,14 +601,14 @@ /obj/item/clothing/glasses/sunglasses/sechud name = "Security HUD-Glasses" - desc = "Sunglasses wired up with the best nano-tech the USCM can muster out on the frontier. Displays information about any person you decree worthy of your gaze." + desc = "Sunglasses wired up with the best nano-tech the UACM can muster out on the frontier. Displays information about any person you decree worthy of your gaze." icon_state = "sunhud" eye_protection = EYE_PROTECTION_FLASH hud_type = MOB_HUD_SECURITY_ADVANCED /obj/item/clothing/glasses/sunglasses/sechud/prescription name = "Prescription Security HUD-Glasses" - desc = "Sunglasses wired up with the best nano-tech the USCM can muster out on the frontier. Displays information about any person you decree worthy of your gaze. Contains prescription lenses." + desc = "Sunglasses wired up with the best nano-tech the UACM can muster out on the frontier. Displays information about any person you decree worthy of your gaze. Contains prescription lenses." prescription = TRUE /obj/item/clothing/glasses/sunglasses/sechud/eyepiece diff --git a/code/modules/clothing/glasses/night.dm b/code/modules/clothing/glasses/night.dm index fbb6fcab27..71f39221be 100644 --- a/code/modules/clothing/glasses/night.dm +++ b/code/modules/clothing/glasses/night.dm @@ -68,7 +68,7 @@ /obj/item/clothing/glasses/night/m42_night_goggles/spotter name = "\improper M42 spotter sight" - desc = "A companion headset and night vision goggles system for USCM spotters. Allows highlighted imaging of surroundings. Click it to toggle." + desc = "A companion headset and night vision goggles system for UACM spotters. Allows highlighted imaging of surroundings. Click it to toggle." /obj/item/clothing/glasses/night/m42_night_goggles/m42c name = "\improper M42C special operations sight" diff --git a/code/modules/clothing/gloves/marine_gloves.dm b/code/modules/clothing/gloves/marine_gloves.dm index 16fbc969b5..d80ec888c5 100644 --- a/code/modules/clothing/gloves/marine_gloves.dm +++ b/code/modules/clothing/gloves/marine_gloves.dm @@ -3,7 +3,7 @@ /obj/item/clothing/gloves/marine name = "marine combat gloves" - desc = "Standard USCMC issue combat gloves, reinforced against small sharp objects, and even insulated from electric shock. Very uncomfortable." + desc = "Standard UACM issue combat gloves, reinforced against small sharp objects, and even insulated from electric shock. Very uncomfortable." icon_state = "black" item_state = "black" siemens_coefficient = 0 @@ -47,14 +47,14 @@ /obj/item/clothing/gloves/marine/brown name = "marine brown combat gloves" - desc = "USCMC issue combat gloves, now in brown rather than black, reinforced against small sharp objects, and even insulated from electric shock. Very uncomfortable." + desc = "UACM issue combat gloves, now in brown rather than black, reinforced against small sharp objects, and even insulated from electric shock. Very uncomfortable." icon_state = "brown" item_state = "brown" adopts_squad_color = FALSE /obj/item/clothing/gloves/marine/medical name = "marine medical combat gloves" - desc = "Special USCMC issue to hospital corpsmen or other field medical workers. Offers protection from shock and cuts while also improving one's grip on medical tools. Unlike the regular gloves, these are relatively comfortable to wear." + desc = "Special UACM issue to hospital corpsmen or other field medical workers. Offers protection from shock and cuts while also improving one's grip on medical tools. Unlike the regular gloves, these are relatively comfortable to wear." icon_state = "latex" item_state = "lgloves" adopts_squad_color = FALSE diff --git a/code/modules/clothing/head/head.dm b/code/modules/clothing/head/head.dm index f6a3297148..6abacfea04 100644 --- a/code/modules/clothing/head/head.dm +++ b/code/modules/clothing/head/head.dm @@ -53,8 +53,8 @@ icon_state = "beanietan" /obj/item/clothing/head/beret/cm - name = "\improper USCM beret" - desc = "A hat typically worn by the field-officers of the USCM. Occasionally they find their way down the ranks into the hands of squad-leaders and decorated grunts." + name = "\improper UACM beret" + desc = "A hat typically worn by the field-officers of the UACM. Occasionally they find their way down the ranks into the hands of squad-leaders and decorated grunts." icon = 'icons/obj/items/clothing/cm_hats.dmi' icon_state = "beret" item_icons = list( @@ -177,7 +177,7 @@ ) /obj/item/clothing/head/headset - name = "\improper USCM headset" + name = "\improper UACM headset" desc = "A headset typically found in use by radio-operators and officers. This one appears to be malfunctioning." icon_state = "headset" icon = 'icons/obj/items/clothing/cm_hats.dmi' @@ -328,7 +328,7 @@ update_clothing_icon() /obj/item/clothing/head/cmcap/boonie - name = "\improper USCM boonie hat" + name = "\improper UACM boonie hat" desc = "A floppy bush hat. Protects only from the sun and rain, but very comfortable." icon_state = "booniehat" flipping_message = list( @@ -341,40 +341,40 @@ flags_atom = FPRINT|NO_SNOW_TYPE /obj/item/clothing/head/cmcap/co - name = "\improper USCM Commanding officer cap" + name = "\improper UACM Commanding officer cap" icon_state = "cocap" - desc = "A hat usually worn by senior officers in the USCM. While it provides no protection, some officers wear it in the field to make themselves more recognisable." + desc = "A hat usually worn by senior officers in the UACM. While it provides no protection, some officers wear it in the field to make themselves more recognisable." /obj/item/clothing/head/cmcap/co/formal - name = "\improper USCM formal Commanding Officer's white cap" + name = "\improper UACM formal Commanding Officer's white cap" icon_state = "co_formalhat_white" - desc = "A formal cover worn by senior officers of the USCM." + desc = "A formal cover worn by senior officers of the UACM." flags_marine_hat = HAT_GARB_OVERLAY flags_atom = FPRINT|NO_SNOW_TYPE /obj/item/clothing/head/cmcap/co/formal/black - name = "\improper USCM formal Commanding Officer's black cap" + name = "\improper UACM formal Commanding Officer's black cap" icon_state = "co_formalhat_black" /obj/item/clothing/head/cmcap/req/ro - name = "\improper USCM quartermaster cap" + name = "\improper UACM quartermaster cap" desc = "It's a fancy hat for a not-so-fancy military supply clerk." icon_state = "rocap" flags_atom = NO_SNOW_TYPE /obj/item/clothing/head/cmcap/req - name = "\improper USCM requisition cap" + name = "\improper UACM requisition cap" desc = "It's a not-so-fancy hat for a not-so-fancy military supply clerk." icon_state = "cargocap" flags_atom = FPRINT|NO_SNOW_TYPE /obj/item/clothing/head/cmcap/bridge - name = "\improper USCM officer cap" - desc = "A hat usually worn by officers in the USCM. While it provides no protection, some officers wear it in the field to make themselves more recognisable." + name = "\improper UACM officer cap" + desc = "A hat usually worn by officers in the UACM. While it provides no protection, some officers wear it in the field to make themselves more recognisable." icon_state = "cap_officer" /obj/item/clothing/head/cmcap/flap - name = "\improper USCM expedition cap" + name = "\improper UACM expedition cap" desc = "It's a cap, with flaps. A patch stitched across the front reads \"USS ALMAYER\"." icon = 'icons/obj/items/clothing/cm_hats.dmi' icon_state = "flapcap" @@ -404,13 +404,13 @@ //Berets DO NOT have armor, so they have their own category. PMC caps are helmets, so they're in helmets.dm. /obj/item/clothing/head/beret/marine name = "marine officer beret" - desc = "A beret with the USCM insignia emblazoned on it. It radiates respect and authority." + desc = "A beret with the UACM insignia emblazoned on it. It radiates respect and authority." icon_state = "beret_badge" /obj/item/clothing/head/beret/marine/mp - name = "\improper USCM MP beret" + name = "\improper UACM MP beret" icon_state = "beretred" - desc = "A beret with the USCM Military Police insignia emblazoned on it." + desc = "A beret with the UACM Military Police insignia emblazoned on it." icon = 'icons/obj/items/clothing/cm_hats.dmi' item_icons = list( WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi' @@ -418,35 +418,35 @@ black_market_value = 25 /obj/item/clothing/head/beret/marine/mp/warden - name = "\improper USCM MP warden peaked cap" + name = "\improper UACM MP warden peaked cap" icon_state = "warden" - desc = "A peaked cap with the USCM Military Police Lieutenant insignia emblazoned on it. It is typically used by Wardens on USCM ships." + desc = "A peaked cap with the UACM Military Police Lieutenant insignia emblazoned on it. It is typically used by Wardens on UACM ships." /obj/item/clothing/head/beret/marine/mp/cmp - name = "\improper USCM chief MP beret" - desc = "A beret with the USCM Military Police First Lieutenant insignia emblazoned on it. It shines with the glow of corrupt authority and a smudge of doughnut." + name = "\improper UACM chief MP beret" + desc = "A beret with the UACM Military Police First Lieutenant insignia emblazoned on it. It shines with the glow of corrupt authority and a smudge of doughnut." icon_state = "beretwo" black_market_value = 30 /obj/item/clothing/head/beret/marine/mp/mppeaked - name = "\improper USCM MP peaked cap" - desc = "A peaked cap worn by the USCM's Military Police. Something about it reminds you of an event you once read about in a history book." + name = "\improper UACM MP peaked cap" + desc = "A peaked cap worn by the UACM's Military Police. Something about it reminds you of an event you once read about in a history book." icon_state = "mppeaked" /obj/item/clothing/head/beret/marine/mp/mpcap - name = "\improper USCM MP ball-cap" - desc = "A ball-cap, typically worn by the more casual of the USCM's Military Police." + name = "\improper UACM MP ball-cap" + desc = "A ball-cap, typically worn by the more casual of the UACM's Military Police." icon_state = "mpcap" /obj/item/clothing/head/beret/marine/mp/provost - name = "\improper USCM provost beret" + name = "\improper UACM provost beret" icon_state = "beretwo" - desc = "A beret with the USCM Military Police insignia emblazoned on it." + desc = "A beret with the UACM Military Police insignia emblazoned on it." /obj/item/clothing/head/beret/marine/mp/provost/senior - name = "\improper USCM senior provost beret" + name = "\improper UACM senior provost beret" icon_state = "coblackberet" - desc = "A beret with the USCM Military Police insignia emblazoned on it." + desc = "A beret with the UACM Military Police insignia emblazoned on it." /obj/item/clothing/head/beret/marine/mp/tis name = "\improper UAAC-TIS Special Agent Beret" @@ -728,7 +728,7 @@ select_gamemode_skin(/obj/item/clothing/head/durag) /obj/item/clothing/head/drillhat - name = "\improper USCM drill hat" + name = "\improper UACM drill hat" desc = "A formal hat worn by drill sergeants. Police that moustache." icon_state = "drillhat" icon = 'icons/obj/items/clothing/cm_hats.dmi' diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index a2366692f9..d4ac5abc5a 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -829,7 +829,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( /obj/item/clothing/head/helmet/marine/grenadier name = "\improper M12 grenadier helmet" - desc = "Strictly speaking, the M12 is more of an offshoot of the B-series armor systems, and is fully enclosed, with hearing protection and anti-impact liquid armor layers to cushion blast. USCMC assault teams sometimes use these in close combat, grenade heavy operations." + desc = "Strictly speaking, the M12 is more of an offshoot of the B-series armor systems, and is fully enclosed, with hearing protection and anti-impact liquid armor layers to cushion blast. UACM assault teams sometimes use these in close combat, grenade heavy operations." icon_state = "grenadier_helmet" item_state = "grenadier_helmet" armor_melee = CLOTHING_ARMOR_MEDIUMHIGH @@ -847,7 +847,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( /obj/item/clothing/head/helmet/marine/scout name = "\improper M10-S light helmet" icon_state = "scout_helmet" - desc = "M10 fitted with thermal camouflage and improved radar absorbent shell. Issued to USCMC Scouts." + desc = "M10 fitted with thermal camouflage and improved radar absorbent shell. Issued to UACM Scouts." min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT specialty = "M3-S light" flags_item = MOB_LOCK_ON_EQUIP|NO_CRYO_STORE @@ -893,7 +893,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( /obj/item/clothing/head/helmet/marine/ghillie name = "\improper M10 ghillie helmet" - desc = "M10 helmet fitted with thermal camouflage ghillie strips. Used and customized by USCMC Scout Snipers." + desc = "M10 helmet fitted with thermal camouflage ghillie strips. Used and customized by UACM Scout Snipers." icon_state = "ghillie_coif" armor_bomb = CLOTHING_ARMOR_MEDIUM armor_bio = CLOTHING_ARMOR_LOW @@ -906,7 +906,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( /obj/item/clothing/head/helmet/marine/CO name = "\improper M10 pattern commanding officer helmet" - desc = "A special M10 Pattern Helmet worn by Commanding Officers of the USCM. It reads on the label, 'The difference between an open-casket and closed-casket funeral. Wear on head for best results.'." + desc = "A special M10 Pattern Helmet worn by Commanding Officers of the UACM. It reads on the label, 'The difference between an open-casket and closed-casket funeral. Wear on head for best results.'." icon_state = "co_officer" item_state = "co_officer" armor_melee = CLOTHING_ARMOR_MEDIUMHIGH @@ -919,7 +919,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( /obj/item/clothing/head/helmet/marine/MP name = "\improper M10 pattern MP helmet" - desc = "A special variant of the M10 Pattern Helmet worn by the Military Police of the USCM. Whether you're facing a crime syndicate or a mutiny, this bucket will keep your brains intact." + desc = "A special variant of the M10 Pattern Helmet worn by the Military Police of the UACM. Whether you're facing a crime syndicate or a mutiny, this bucket will keep your brains intact." icon_state = "mp_helmet" item_state = "mp_helmet" armor_energy = CLOTHING_ARMOR_MEDIUMLOW @@ -935,7 +935,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( /obj/item/clothing/head/helmet/marine/MP/SO name = "\improper M10 pattern Officer Helmet" - desc = "A special variant of the M10 Pattern Helmet worn by Officers of the USCM, attracting the attention of the grunts and sniper fire alike." + desc = "A special variant of the M10 Pattern Helmet worn by Officers of the UACM, attracting the attention of the grunts and sniper fire alike." icon_state = "helmet" item_state = "helmet" specialty = "M10 pattern officer" @@ -951,7 +951,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( /obj/item/clothing/head/helmet/marine/sof name = "\improper M09 Custom Helmet" - desc = "Partially due to old stocks, partially due to preference. USCM MARSOC commando ballistic helmet, customized and updated to mission requirements." + desc = "Partially due to old stocks, partially due to preference. UACM MARSOC commando ballistic helmet, customized and updated to mission requirements." icon_state = "marsoc_helmet" armor_melee = CLOTHING_ARMOR_MEDIUMHIGH armor_bullet = CLOTHING_ARMOR_HIGH diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index b171b4ed93..06e016f595 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -85,11 +85,11 @@ /obj/item/clothing/head/helmet/space/compression/uscm name = "\improper MK.50 compression helmet" - desc = "A heavy space helmet, designed to be coupled with the MK.50 compression suit, it bears USCM styling. Feels like you could hotbox in here." + desc = "A heavy space helmet, designed to be coupled with the MK.50 compression suit, it bears UACM styling. Feels like you could hotbox in here." /obj/item/clothing/suit/space/compression/uscm name = "\improper MK.50 compression suit" - desc = "A heavy, bulky civilian space suit, fitted with armored plates. This specific suit has found its way into the ragtag inventory of the USCM's patrol boat requisitions system." + desc = "A heavy, bulky civilian space suit, fitted with armored plates. This specific suit has found its way into the ragtag inventory of the UACM's patrol boat requisitions system." allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/baton,/obj/item/handcuffs,/obj/item/tank) // Souto man diff --git a/code/modules/clothing/spacesuits/void.dm b/code/modules/clothing/spacesuits/void.dm index f518ff6a2f..c98117d6d4 100644 --- a/code/modules/clothing/spacesuits/void.dm +++ b/code/modules/clothing/spacesuits/void.dm @@ -1,14 +1,14 @@ //NASA Voidsuit /obj/item/clothing/head/helmet/space/uscm - name = "\improper USCM Compression Helmet" - desc = "A high tech, USCM designed, dark red space suit helmet. Used for maintenance in space." + name = "\improper UACM Compression Helmet" + desc = "A high tech, UACM designed, dark red space suit helmet. Used for maintenance in space." icon_state = "void" item_state = "void" /obj/item/clothing/suit/space/uscm - name = "\improper USCM Compression Suit" + name = "\improper UACM Compression Suit" icon_state = "void" item_state = "void" - desc = "A high tech, USCM designed, dark red Space suit. Used for maintenance in space." + desc = "A high tech, UACM designed, dark red Space suit. Used for maintenance in space." slowdown = 1 diff --git a/code/modules/clothing/suits/marine_armor.dm b/code/modules/clothing/suits/marine_armor.dm index 6bdb55e7d7..d676fc0e29 100644 --- a/code/modules/clothing/suits/marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor.dm @@ -32,7 +32,7 @@ /obj/item/clothing/suit/storage/marine name = "\improper M3 pattern marine armor" - desc = "Standard USCMC issue M3 Pattern Personal Armor. Composite ballistic armor, integral biomonitoring system, and brackets for the IMP system as well as the TNR Shoulder Lamp. \nHas some extra pouches on the sides for storage." + desc = "Standard UACM issue M3 Pattern Personal Armor. Composite ballistic armor, integral biomonitoring system, and brackets for the IMP system as well as the TNR Shoulder Lamp. \nHas some extra pouches on the sides for storage." icon = 'icons/obj/items/clothing/cm_suits.dmi' icon_state = "1" item_state = "marine_armor" //Make unique states for Officer & Intel armors. @@ -498,7 +498,7 @@ /obj/item/clothing/suit/storage/marine/tanker name = "\improper M3 pattern tanker armor" - desc = "Armored vest sometimes worn by USCMC armor crews. More bulky than a flak vest or service jacket, but substantially improved protection should the wearer need to dismount." + desc = "Armored vest sometimes worn by UACM armor crews. More bulky than a flak vest or service jacket, but substantially improved protection should the wearer need to dismount." icon_state = "tanker" uniform_restricted = list(/obj/item/clothing/under/marine/officer/tanker) specialty = "M3 pattern tanker" @@ -554,7 +554,7 @@ /obj/item/clothing/suit/storage/marine/light/vest name = "\improper M3-VL pattern ballistics vest" - desc = "Up until 2182 USCM non-combat personnel were issued non-standardized ballistics vests, though the lack of IMP compatibility and suit lamps proved time and time again inefficient. This modified M3-L shell is the result of a 6-year R&D program; It provides utility, protection, AND comfort to all USCM non-combat personnel." + desc = "Up until 2182 UACM non-combat personnel were issued non-standardized ballistics vests, though the lack of IMP compatibility and suit lamps proved time and time again inefficient. This modified M3-L shell is the result of a 6-year R&D program; It provides utility, protection, AND comfort to all UACM non-combat personnel." icon_state = "VL" flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE flags_marine_armor = ARMOR_LAMP_OVERLAY //No squad colors when wearing this since it'd look funny. @@ -707,7 +707,7 @@ /obj/item/clothing/suit/storage/marine/M3G name = "\improper M3-G4 grenadier armor" - desc = "A custom set of M3 armor packed to the brim with padding, plating, and every form of ballistic protection under the sun. Used exclusively by USCM Grenadiers." + desc = "A custom set of M3 armor packed to the brim with padding, plating, and every form of ballistic protection under the sun. Used exclusively by UACM Grenadiers." icon_state = "grenadier" armor_melee = CLOTHING_ARMOR_MEDIUMHIGH armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH @@ -735,7 +735,7 @@ /obj/item/clothing/suit/storage/marine/M3S name = "\improper M3-S light armor" - desc = "A custom set of M3 armor designed for USCM Scouts." + desc = "A custom set of M3 armor designed for UACM Scouts." icon_state = "scout_armor" armor_melee = CLOTHING_ARMOR_MEDIUMHIGH slowdown = SLOWDOWN_ARMOR_LIGHT @@ -747,7 +747,7 @@ /obj/item/clothing/suit/storage/marine/M35 name = "\improper M35 pyrotechnician armor" - desc = "A custom set of M35 armor designed for use by USCM Pyrotechnicians." + desc = "A custom set of M35 armor designed for use by UACM Pyrotechnicians." icon_state = "pyro_armor" armor_bio = CLOTHING_ARMOR_MEDIUMHIGH armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH @@ -898,7 +898,7 @@ /obj/item/clothing/suit/storage/marine/ghillie name = "\improper M45 pattern ghillie armor" - desc = "A lightweight ghillie camouflage suit, used by USCM snipers on recon missions. Very lightweight, but doesn't protect much." + desc = "A lightweight ghillie camouflage suit, used by UACM snipers on recon missions. Very lightweight, but doesn't protect much." icon_state = "ghillie_armor" armor_bio = CLOTHING_ARMOR_MEDIUMHIGH slowdown = SLOWDOWN_ARMOR_LIGHT @@ -1053,7 +1053,7 @@ /obj/item/clothing/suit/storage/marine/ghillie/forecon name = "UDEP Thermal Poncho" - desc = "UDEP or the Ultra Diffusive Environmental Poncho is a camouflaged rain-cover worn to protect against the elements and chemical spills. It's commonly treated with an infrared absorbing coating, making a marine almost invisible in the rain. Favoured by USCM specialists for it's comfort and practicality." + desc = "UDEP or the Ultra Diffusive Environmental Poncho is a camouflaged rain-cover worn to protect against the elements and chemical spills. It's commonly treated with an infrared absorbing coating, making a marine almost invisible in the rain. Favoured by UACM specialists for it's comfort and practicality." icon_state = "mercenary_miner_armor" flags_atom = MOB_LOCK_ON_EQUIP|NO_SNOW_TYPE|NO_NAME_OVERRIDE @@ -1320,7 +1320,7 @@ /obj/item/clothing/suit/storage/marine/faction/UPP name = "\improper UM5 personal armor" - desc = "Standard body armor of the UPP military, the UM5 (Union Medium MK5) is a medium body armor, roughly on par with the M3 pattern body armor in service with the USCM, specialized towards ballistics protection. Unlike the M3, however, the plate has a heavier neckplate. This has earned many UA members to refer to UPP soldiers as 'tin men'." + desc = "Standard body armor of the UPP military, the UM5 (Union Medium MK5) is a medium body armor, roughly on par with the M3 pattern body armor in service with the UACM, specialized towards ballistics protection. Unlike the M3, however, the plate has a heavier neckplate. This has earned many UA members to refer to UPP soldiers as 'tin men'." icon_state = "upp_armor" armor_bullet = CLOTHING_ARMOR_HIGH armor_energy = CLOTHING_ARMOR_MEDIUM @@ -1332,7 +1332,7 @@ /obj/item/clothing/suit/storage/marine/faction/UPP/support name = "\improper UL6 personal armor" - desc = "Standard body armor of the UPP military, the UL6 (Union Light MK6) is a light body armor, slightly weaker than the M3 pattern body armor in service with the USCM, specialized towards ballistics protection. This set of personal armor lacks the iconic neck piece and some of the armor in favor of user mobility." + desc = "Standard body armor of the UPP military, the UL6 (Union Light MK6) is a light body armor, slightly weaker than the M3 pattern body armor in service with the UACM, specialized towards ballistics protection. This set of personal armor lacks the iconic neck piece and some of the armor in favor of user mobility." storage_slots = 4 icon_state = "upp_armor_support" slowdown = SLOWDOWN_ARMOR_LIGHT @@ -1443,7 +1443,7 @@ /obj/item/clothing/suit/storage/marine/faction/freelancer name = "freelancer cuirass" - desc = "An armored protective chestplate scrapped together from various plates. It keeps up remarkably well, as the craftsmanship is solid, and the design mirrors such armors in the UPP and the USCM. The many skilled craftsmen in the freelancers ranks produce these vests at a rate about one a month." + desc = "An armored protective chestplate scrapped together from various plates. It keeps up remarkably well, as the craftsmanship is solid, and the design mirrors such armors in the UPP and the UACM. The many skilled craftsmen in the freelancers ranks produce these vests at a rate about one a month." icon_state = "freelancer_armor" slowdown = SLOWDOWN_ARMOR_LIGHT flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS @@ -1595,7 +1595,7 @@ /obj/item/clothing/suit/storage/RO name = "quartermaster jacket" - desc = "A green jacket worn by USCM personnel. The back has the flag of the United Americas on it." + desc = "A green jacket worn by UACM personnel. The back has the flag of the United Americas on it." icon_state = "RO_jacket" blood_overlay_type = "coat" flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_ARMS @@ -1743,7 +1743,7 @@ /obj/item/clothing/suit/storage/marine/uaac/tis/sa name = "\improper M3 pattern UAAC-TIS Special Agent Armor" - desc = "A modified luxury armor, originally meant for a USCM Provost Marshall, modified to use the colors and insignia of the TIS. The Three Eyes is technically able to requisition any equipment or personnel to fulfill its mission and often uses this privilege to outfit their agents with high-quality gear from other UA military forces." + desc = "A modified luxury armor, originally meant for a UACM Provost Marshall, modified to use the colors and insignia of the TIS. The Three Eyes is technically able to requisition any equipment or personnel to fulfill its mission and often uses this privilege to outfit their agents with high-quality gear from other UA military forces." icon_state = "tis" item_state_slots = list(WEAR_JACKET = "tis") armor_melee = CLOTHING_ARMOR_MEDIUMHIGH @@ -1781,7 +1781,7 @@ /obj/item/clothing/suit/storage/marine/veteran/ua_riot name = "\improper UA-M1 body armor" - desc = "Based on the M-3 pattern employed by the USCM, the UA-M1 body armor is employed by UA security, riot control and union-busting teams. While robust against melee and bullet attacks, it critically lacks coverage of the legs and arms." + desc = "Based on the M-3 pattern employed by the UACM, the UA-M1 body armor is employed by UA security, riot control and union-busting teams. While robust against melee and bullet attacks, it critically lacks coverage of the legs and arms." icon_state = "ua_riot" flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN @@ -1811,7 +1811,7 @@ /obj/item/clothing/suit/storage/marine/veteran/royal_marine name = "kestrel armoured vest" - desc = "A customizable personal armor system used by the Three World Empire's Royal Marines Commandos. Designers from a Weyland Yutani subsidary, Lindenthal-Ehrenfeld Militärindustrie, iterated on the USCMC's M3 pattern personal armor in their Tokonigara lab to create an armor systemed to suit the unique needs of the Three World Empire's smaller but better equipped Royal Marines." + desc = "A customizable personal armor system used by the Three World Empire's Royal Marines Commandos. Designers from a Weyland Yutani subsidary, Lindenthal-Ehrenfeld Militärindustrie, iterated on the UACM's M3 pattern personal armor in their Tokonigara lab to create an armor systemed to suit the unique needs of the Three World Empire's smaller but better equipped Royal Marines." icon_state = "rmc_light" item_state = "rmc_light" flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE @@ -1855,7 +1855,7 @@ /obj/item/clothing/suit/storage/marine/veteran/royal_marine/pointman //Pointman Spec Armor name = "kestrel pointman armour" - desc = "A heavier version of the armor system used by the Three World Empire's Royal Marines Commandos. Designers from a Weyland Yutani subsidary, Lindenthal-Ehrenfeld Militärindustrie, iterated on the USCMC's M3 pattern personal armor in their Tokonigara lab to create an armor systemed to suit the unique needs of the Three World Empire's smaller but better equipped Royal Marines." + desc = "A heavier version of the armor system used by the Three World Empire's Royal Marines Commandos. Designers from a Weyland Yutani subsidary, Lindenthal-Ehrenfeld Militärindustrie, iterated on the UACM's M3 pattern personal armor in their Tokonigara lab to create an armor systemed to suit the unique needs of the Three World Empire's smaller but better equipped Royal Marines." icon_state = "rmc_pointman" item_state = "rmc_pointman" armor_melee = CLOTHING_ARMOR_HIGH diff --git a/code/modules/clothing/suits/marine_coat.dm b/code/modules/clothing/suits/marine_coat.dm index 2ccc2d948a..a25686c25f 100644 --- a/code/modules/clothing/suits/marine_coat.dm +++ b/code/modules/clothing/suits/marine_coat.dm @@ -77,7 +77,7 @@ //Marine service & tanker jacket + MP themed variants /obj/item/clothing/suit/storage/jacket/marine/service name = "marine service jacket" - desc = "A USCMC service jacket, usually officer issue. While technically armored to frag/handgun ammunition, it's best if you don't try your luck." + desc = "A UACM service jacket, usually officer issue. While technically armored to frag/handgun ammunition, it's best if you don't try your luck." has_buttons = TRUE icon_state = "coat_officer" @@ -91,7 +91,7 @@ /obj/item/clothing/suit/storage/jacket/marine/service/mp name = "military police service jacket" - desc = "Marine service jacket in USCMC Military Police scheme. Usually not used due to local standards requiring service armor instead." + desc = "Marine service jacket in UACM Military Police scheme. Usually not used due to local standards requiring service armor instead." has_buttons = TRUE icon_state = "coat_mp" flags_atom = NO_SNOW_TYPE @@ -99,7 +99,7 @@ /obj/item/clothing/suit/storage/jacket/marine/service/warden name = "military warden service jacket" - desc = "A marine service jacket adopted for use by Military Wardens on board USCM ships. Ironically most ships require their MP departments to use full armor, making these barely used by on duty Wardens. The jacket of choice for looking all night at a set of monitors, while cigarette butts pile around you." + desc = "A marine service jacket adopted for use by Military Wardens on board UACM ships. Ironically most ships require their MP departments to use full armor, making these barely used by on duty Wardens. The jacket of choice for looking all night at a set of monitors, while cigarette butts pile around you." has_buttons = TRUE icon_state = "coat_warden" flags_atom = NO_SNOW_TYPE @@ -107,7 +107,7 @@ /obj/item/clothing/suit/storage/jacket/marine/service/cmp name = "chief military police service jacket" - desc = "A marine service jacket adopted for use by Military Police personnel on board USCM ships. Ironically most ships require their MP departments to use full armor, making these barely used by on duty MPs. Very popular among those who want to inexplicably smell like donuts." + desc = "A marine service jacket adopted for use by Military Police personnel on board UACM ships. Ironically most ships require their MP departments to use full armor, making these barely used by on duty MPs. Very popular among those who want to inexplicably smell like donuts." has_buttons = TRUE icon_state = "coat_cmp" flags_atom = NO_SNOW_TYPE @@ -153,7 +153,7 @@ /obj/item/clothing/suit/storage/jacket/marine/dress/officer name = "marine officer dress jacket" - desc = "Dress Jacket worn by Commanding Officers of the USCM." + desc = "Dress Jacket worn by Commanding Officers of the UACM." icon_state = "co_jacket" has_buttons = FALSE valid_accessory_slots = list(ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_DECOR, ACCESSORY_SLOT_MEDAL) @@ -210,7 +210,7 @@ /obj/item/clothing/suit/storage/jacket/marine/dress/bridge_coat name = "bridge coat" - desc = "A heavy synthetic woolen coat issued to USCM Officers. Based on a classical design this coat is quite nice on cold nights in the Air conditioned CIC or a miserable cold night on a barren world. This one is a Dressy Blue for a Commanding officer." + desc = "A heavy synthetic woolen coat issued to UACM Officers. Based on a classical design this coat is quite nice on cold nights in the Air conditioned CIC or a miserable cold night on a barren world. This one is a Dressy Blue for a Commanding officer." has_buttons = FALSE item_state = "bridge_coat" icon_state = "bridge_coat" @@ -218,7 +218,7 @@ /obj/item/clothing/suit/storage/jacket/marine/dress/bridge_coat_grey name = "bridge coat" - desc = "A heavy synthetic woolen coat issued to USCM Officers. Based on a classical design this coat is quite nice on cold nights in the Air conditioned CIC or a miserable cold night on a barren world. This one is Black." + desc = "A heavy synthetic woolen coat issued to UACM Officers. Based on a classical design this coat is quite nice on cold nights in the Air conditioned CIC or a miserable cold night on a barren world. This one is Black." has_buttons = FALSE item_state = "bridge_coat_grey" icon_state = "bridge_coat_grey" diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index 6232f0eef4..f960426880 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -3,7 +3,7 @@ */ /obj/item/clothing/under/rank/rdalt - desc = "A simple blue utilitarian jumpsuit that serves as the standard issue service uniform of support synthetics onboard USCM facilities. While commonly associated with the staple Bishop units, reduced funding to the Colonial Marines has led to a wide range of models filling these uniforms, especially in battalions operating in the edge frontier." + desc = "A simple blue utilitarian jumpsuit that serves as the standard issue service uniform of support synthetics onboard UACM facilities. While commonly associated with the staple Bishop units, reduced funding to the Colonial Marines has led to a wide range of models filling these uniforms, especially in battalions operating in the edge frontier." name = "synthetic service uniform" icon_state = "rdalt" armor_melee = CLOTHING_ARMOR_NONE diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm index fae81f0216..5e07f87a93 100644 --- a/code/modules/clothing/under/marine_uniform.dm +++ b/code/modules/clothing/under/marine_uniform.dm @@ -3,7 +3,7 @@ /obj/item/clothing/under/marine - name = "\improper USCM uniform" + name = "\improper UACM uniform" desc = "Standard-issue Marine uniform, with venlar armor inserts at critical areas to protect from blades and ballistics." siemens_coefficient = 0.9 icon_state = "marine_jumpsuit" @@ -18,7 +18,7 @@ armor_internaldamage = CLOTHING_ARMOR_LOW flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE ///Makes it so that we can see the right name in the vendor. - var/specialty = "USCM" + var/specialty = "UACM" ///List of map variants that use sleeve rolling on something else, like snow uniforms rolling the collar, and therefore shouldn't hide patches etc when rolled. var/list/map_variants_roll_accessories = list("s_") layer = UPPER_ITEM_LAYER @@ -52,21 +52,21 @@ flags_atom = NO_SNOW_TYPE /obj/item/clothing/under/marine/medic - name = "\improper USCM corpsman uniform" + name = "\improper UACM corpsman uniform" desc = "Standard-issue Marine hospital corpsman fatigues with venlar armor inserts at critical areas to protect from blades and ballistics." icon_state = "marine_medic" worn_state = "marine_medic" - specialty = "USCM Hospital Corpsman" + specialty = "UACM Hospital Corpsman" /obj/item/clothing/under/marine/medic/standard flags_atom = NO_SNOW_TYPE /obj/item/clothing/under/marine/engineer - name = "\improper USCM combat technician uniform" - desc = "USCMC combat technician's fatigues, shielded by venlar panels and no longer electrically insulated due to 'budget reprioritization'." + name = "\improper UACM combat technician uniform" + desc = "UACM combat technician's fatigues, shielded by venlar panels and no longer electrically insulated due to 'budget reprioritization'." icon_state = "marine_engineer" worn_state = "marine_engineer" - specialty = "USCM Combat Technician" + specialty = "UACM Combat Technician" /obj/item/clothing/under/marine/engineer/standard flags_atom = NO_SNOW_TYPE @@ -77,23 +77,23 @@ flags_atom = NO_SNOW_TYPE /obj/item/clothing/under/marine/rto - name = "\improper USCM radio telephone operator uniform" - desc = "The uniform of a USCMC radio-telephone operator. Venlar panels provide marginal protection from shrapnel and ballistics." + name = "\improper UACM radio telephone operator uniform" + desc = "The uniform of a UACM radio-telephone operator. Venlar panels provide marginal protection from shrapnel and ballistics." icon_state = "marine_rto" item_state = "marine_rto" specialty = "marine Radio Telephone Operator" /obj/item/clothing/under/marine/sniper - name = "\improper USCM sniper uniform" + name = "\improper UACM sniper uniform" flags_jumpsuit = FALSE - specialty = "USCM Sniper" + specialty = "UACM Sniper" /obj/item/clothing/under/marine/tanker - name = "\improper USCM tanker uniform" + name = "\improper UACM tanker uniform" icon_state = "marine_tanker" worn_state = "marine_tanker" flags_jumpsuit = FALSE - specialty = "USCM tanker" + specialty = "UACM tanker" /obj/item/clothing/under/marine/tanker/New(loc, new_protection = list(MAP_ICE_COLONY = ICE_PLANET_MIN_COLD_PROT), @@ -102,17 +102,17 @@ ..(loc, new_protection, override_icon_state) /obj/item/clothing/under/marine/chef - name = "\improper USCM Mess Technician uniform" - desc = "The stain resistant uniform of a mess technician. Why the USCMC requires them to wear the venlar armor inserts is unknown." + name = "\improper UACM Mess Technician uniform" + desc = "The stain resistant uniform of a mess technician. Why the UACM requires them to wear the venlar armor inserts is unknown." icon_state = "chef_uniform" worn_state = "chef_uniform" flags_jumpsuit = FALSE - specialty = "USCM mess technician" + specialty = "UACM mess technician" flags_atom = NO_SNOW_TYPE /obj/item/clothing/under/marine/mp - name = "USCMC military police uniform" - desc = "Cut and stab resistant USCMC military police uniform. The venlar liner also offers marginal ballistic defense." + name = "UACM military police uniform" + desc = "Cut and stab resistant UACM military police uniform. The venlar liner also offers marginal ballistic defense." icon_state = "MP_jumpsuit" worn_state = "MP_jumpsuit" suit_restricted = list(/obj/item/clothing/suit/storage/marine, /obj/item/clothing/suit/armor/riot/marine, /obj/item/clothing/suit/storage/jacket/marine/service/mp) @@ -157,8 +157,8 @@ specialty = "marine intelligence officer" /obj/item/clothing/under/marine/officer/warrant - name = "\improper USCM MP chief uniform" - desc = "USCMC Military Police Chief's uniform. Alongside the standard armor panels, it has an uncomfortable energy dispersive polymer lining, and is also rated for low MOPP conditions." + name = "\improper UACM MP chief uniform" + desc = "UACM Military Police Chief's uniform. Alongside the standard armor panels, it has an uncomfortable energy dispersive polymer lining, and is also rated for low MOPP conditions." icon_state = "WO_jumpsuit" item_state = "WO_jumpsuit" worn_state = "WO_jumpsuit" @@ -176,7 +176,7 @@ /obj/item/clothing/under/marine/officer/pilot name = "pilot officer bodysuit" - desc = "A bodysuit worn by pilot officers of the USCM, good for operating express elevators to hell. Some armor protection provided by the venlar armor weave against shrapnel and ballistics." + desc = "A bodysuit worn by pilot officers of the UACM, good for operating express elevators to hell. Some armor protection provided by the venlar armor weave against shrapnel and ballistics." icon_state = "pilot_flightsuit" item_state = "pilot_flightsuit" worn_state = "pilot_flightsuit" @@ -187,7 +187,7 @@ /obj/item/clothing/under/marine/officer/pilot/flight name = "tactical pilot officer flightsuit" - desc = "A flightsuit worn by pilot officers of the USCM, with plenty of leather straps, pouches, and other essential gear you will never use. Looks badass." + desc = "A flightsuit worn by pilot officers of the UACM, with plenty of leather straps, pouches, and other essential gear you will never use. Looks badass." icon_state = "pilot_flightsuit_alt" item_state = "pilot_flightsuit_alt" worn_state = "pilot_flightsuit_alt" @@ -206,7 +206,7 @@ /obj/item/clothing/under/marine/officer/tanker name = "vehicle crewman uniform" - desc = "Armored vehicle crew uniform worn by tankers and cav crew of the USCMC. Shrapnel protection provided by venlar panels, badassery hinges on how well the operator works their vehicle. Do the Corps proud." + desc = "Armored vehicle crew uniform worn by tankers and cav crew of the UACM. Shrapnel protection provided by venlar panels, badassery hinges on how well the operator works their vehicle. Do the Corps proud." icon_state = "marine_tanker" worn_state = "marine_tanker" suit_restricted = list(/obj/item/clothing/suit/storage/marine/tanker, /obj/item/clothing/suit/storage/jacket/marine/service/tanker) @@ -234,11 +234,11 @@ specialty = "marine operations" /obj/item/clothing/under/marine/officer/command - name = "\improper USCM officer uniform" - desc = "A USCMC commanding officer's uniform, custom cut for maximum comfort while staying within regulation." + name = "\improper UACM officer uniform" + desc = "A UACM commanding officer's uniform, custom cut for maximum comfort while staying within regulation." icon_state = "CO_jumpsuit" worn_state = "CO_jumpsuit" - specialty = "USCM officer" + specialty = "UACM officer" /obj/item/clothing/under/marine/officer/general name = "general uniform" @@ -299,7 +299,7 @@ /obj/item/clothing/under/marine/officer/formal/white name = "Commanding Officer's white formal uniform" - desc = "A well-ironed USCM officer uniform in brilliant white with gold accents, intended for parades or hot weather. Wear this with pride." + desc = "A well-ironed UACM officer uniform in brilliant white with gold accents, intended for parades or hot weather. Wear this with pride." icon_state = "CO_formal_white" worn_state = "CO_formal_white" specialty = "captain's white formal" @@ -307,7 +307,7 @@ /obj/item/clothing/under/marine/officer/formal/black name = "Commanding Officer's gray formal uniform" - desc = "A well-ironed USCM officer uniform in subdued gray with gold accents, intended for more formal or somber events. Wear this with pride." + desc = "A well-ironed UACM officer uniform in subdued gray with gold accents, intended for more formal or somber events. Wear this with pride." icon_state = "CO_formal_black" worn_state = "CO_formal_black" specialty = "captain's gray formal" @@ -315,7 +315,7 @@ /obj/item/clothing/under/marine/dress name = "marine formal service uniform" - desc = "A formal service uniform typically worn by marines of the USCM. Still practicable while still being more formal than the standard service uniform." + desc = "A formal service uniform typically worn by marines of the UACM. Still practicable while still being more formal than the standard service uniform." icon_state = "formal_jumpsuit" worn_state = "formal_jumpsuit" specialty = "marine formal" @@ -325,7 +325,7 @@ /obj/item/clothing/under/marine/dress/command name = "marine officer formal service uniform" - desc = "A formal service uniform typically worn by marines of the USCM. Still practicable while still being more formal than the standard service uniform. This one belongs to an officer." + desc = "A formal service uniform typically worn by marines of the UACM. Still practicable while still being more formal than the standard service uniform. This one belongs to an officer." icon_state = "formal_jumpsuit" worn_state = "formal_jumpsuit" specialty = "command formal" @@ -397,7 +397,7 @@ /obj/item/clothing/under/uaac/tis name = "\improper UAAC-TIS Special Agent Uniform" - desc = "A modified USCM Provost uniform, with its original insignia replaced by those of the UAAC-TIS Intelligence Service. TIS Special Agents are often recruited from the upper echelons of law enforcement agencies in various UA armed forces. These recruits often take all their gear, uniform included with them and later modify them to include TIS and UAAC insignia." + desc = "A modified UACM Provost uniform, with its original insignia replaced by those of the UAAC-TIS Intelligence Service. TIS Special Agents are often recruited from the upper echelons of law enforcement agencies in various UA armed forces. These recruits often take all their gear, uniform included with them and later modify them to include TIS and UAAC insignia." flags_jumpsuit = FALSE flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE siemens_coefficient = 0.9 @@ -414,15 +414,15 @@ /obj/item/clothing/under/uaac/tis/io name = "\improper UAAC-TIS Intelligence Officer uniform" - desc = "Originally a USCM officer uniform, all insignia have been carefully removed and replaced by a simple TIS pin worn over the right breast. Like their Special Agent counterparts, TIS Intel Officers are typically transplants from UA aligned armed forces, often initially recruited on a temporary basis then transferred permanently. As such, officers are often forced to adapt their original uniforms." + desc = "Originally a UACM officer uniform, all insignia have been carefully removed and replaced by a simple TIS pin worn over the right breast. Like their Special Agent counterparts, TIS Intel Officers are typically transplants from UA aligned armed forces, often initially recruited on a temporary basis then transferred permanently. As such, officers are often forced to adapt their original uniforms." icon_state = "BO_jumpsuit" worn_state = "BO_jumpsuit" flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE -//=========================//USCM Survivors\\================================\\ +//=========================//UACM Survivors\\================================\\ //=======================================================================\\ /obj/item/clothing/under/marine/reconnaissance - name = "\improper USCM uniform" + name = "\improper UACM uniform" desc = "Torn, Burned and blood stained. This uniform has seen much more than you could possibly imagine." icon_state = "recon_marine" worn_state = "recon_marine" @@ -940,7 +940,7 @@ flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE /obj/item/clothing/under/rank/synthetic - name = "\improper USCM Support Uniform" + name = "\improper UACM Support Uniform" desc = "A simple uniform made for Synthetic crewmembers." icon_state = "rdalt" worn_state = "rdalt" @@ -979,7 +979,7 @@ worn_state = "synth_blue_utility" /obj/item/clothing/under/rank/synthetic/councillor - name = "\improper USCM Pristine Support Uniform" + name = "\improper UACM Pristine Support Uniform" desc = "A nicely handcrafted uniform made for Synthetic crewmembers." icon_state = "synth_councillor" worn_state = "synth_councillor" @@ -1031,7 +1031,7 @@ /obj/item/clothing/under/marine/veteran/royal_marine name = "royal marines commando uniform" - desc = "The field uniform of the royal marines commando. They have shards of light Kevlar to help protect against stabbing weapons and bullets. Onpar with similar USCM equipment." + desc = "The field uniform of the royal marines commando. They have shards of light Kevlar to help protect against stabbing weapons and bullets. Onpar with similar UACM equipment." icon_state = "rmc_uniform" worn_state = "rmc_uniform" flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE @@ -1044,7 +1044,7 @@ /obj/item/clothing/under/marine/veteran/royal_marine/lt name = "royal marines commando officers uniform" - desc = "The officers uniform of the royal marines commando. They have shards of light Kevlar to help protect against stabbing weapons and bullets. Onpar with similar USCM equipment." + desc = "The officers uniform of the royal marines commando. They have shards of light Kevlar to help protect against stabbing weapons and bullets. Onpar with similar UACM equipment." icon_state = "rmc_uniform_lt" worn_state = "rmc_uniform_lt" diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm index db82f31c0e..e23d3cb726 100644 --- a/code/modules/clothing/under/ties.dm +++ b/code/modules/clothing/under/ties.dm @@ -260,7 +260,7 @@ /obj/item/clothing/accessory/medal/bronze/conduct name = MARINE_CONDUCT_MEDAL - desc = "A bronze medal awarded for distinguished conduct. Whilst a great honor, this is the most basic award given by the USCM" + desc = "A bronze medal awarded for distinguished conduct. Whilst a great honor, this is the most basic award given by the UACM" icon_state = "bronze_b" /obj/item/clothing/accessory/medal/bronze/heart @@ -296,7 +296,7 @@ /obj/item/clothing/accessory/medal/gold/heroism name = MARINE_HEROISM_MEDAL - desc = "An extremely rare golden medal awarded only by the USCM. To receive such a medal is the highest honor and as such, very few exist." + desc = "An extremely rare golden medal awarded only by the UACM. To receive such a medal is the highest honor and as such, very few exist." /obj/item/clothing/accessory/medal/platinum name = "platinum medal" @@ -305,20 +305,20 @@ /obj/item/clothing/accessory/medal/bronze/service name = "bronze service medal" - desc = "A bronze medal awarded for a marine's service within the USCM. It is a very common medal, and is typically the first medal a marine would receive." + desc = "A bronze medal awarded for a marine's service within the UACM. It is a very common medal, and is typically the first medal a marine would receive." icon_state = "bronze" /obj/item/clothing/accessory/medal/silver/service name = "silver service medal" - desc = "A shiny silver medal awarded for a marine's service within the USCM. It is a somewhat common medal which signifies the amount of time a marine has spent in the line of duty." + desc = "A shiny silver medal awarded for a marine's service within the UACM. It is a somewhat common medal which signifies the amount of time a marine has spent in the line of duty." icon_state = "silver" /obj/item/clothing/accessory/medal/gold/service name = "gold service medal" - desc = "A prestigious gold medal awarded for a marine's service within the USCM. It is a rare medal which signifies the amount of time a marine has spent in the line of duty." + desc = "A prestigious gold medal awarded for a marine's service within the UACM. It is a rare medal which signifies the amount of time a marine has spent in the line of duty." icon_state = "gold" /obj/item/clothing/accessory/medal/platinum/service name = "platinum service medal" - desc = "The highest service medal that can be awarded to a marine; such medals are hand-given by USCM Generals to a marine. It signifies the sheer amount of time a marine has spent in the line of duty." + desc = "The highest service medal that can be awarded to a marine; such medals are hand-given by UACM Generals to a marine. It signifies the sheer amount of time a marine has spent in the line of duty." icon_state = "platinum" //Armbands /obj/item/clothing/accessory/armband @@ -372,24 +372,24 @@ //patches /obj/item/clothing/accessory/patch - name = "USCM patch" + name = "UACM patch" desc = "A fire-resistant shoulder patch, worn by the men and women of the United States Colonial Marines." icon_state = "uscmpatch" jumpsuit_hide_states = (UNIFORM_SLEEVE_CUT|UNIFORM_JACKET_REMOVED) /obj/item/clothing/accessory/patch/falcon - name = "USCM Falling Falcons patch" - desc = "A fire-resistant shoulder patch, worn by the men and women of the Falling Falcons, the 2nd battalion of the 4th brigade of the USCM." + name = "UACM Falling Falcons patch" + desc = "A fire-resistant shoulder patch, worn by the men and women of the Falling Falcons, the 2nd battalion of the 4th brigade of the UACM." icon_state = "fallingfalconspatch" /obj/item/clothing/accessory/patch/devils - name = "USCM Solar Devils patch" - desc = "A fire-resistant shoulder patch, worn by the men and women of the Solar Devils, the 3rd battalion of the 2nd division of the USCM." + name = "UACM Solar Devils patch" + desc = "A fire-resistant shoulder patch, worn by the men and women of the Solar Devils, the 3rd battalion of the 2nd division of the UACM." icon_state = "solardevilspatch" /obj/item/clothing/accessory/patch/forecon - name = "USCM Force Reconnaissance patch" - desc = "A fire-resistant shoulder patch, worn by the men and women of USCM FORECON. Swift, Silent, Deadly." + name = "UACM Force Reconnaissance patch" + desc = "A fire-resistant shoulder patch, worn by the men and women of UACM FORECON. Swift, Silent, Deadly." icon_state = "forecon_patch" /obj/item/clothing/accessory/patch/royal_marines @@ -413,8 +413,8 @@ icon_state = "navalpatch" /obj/item/clothing/accessory/poncho - name = "USCM Poncho" - desc = "The standard USCM poncho has variations for every climate. Custom fitted to be attached to standard USCM armor variants it is comfortable, warming or cooling as needed, and well-fit. A marine couldn't ask for more. Affectionately referred to as a \"woobie\"." + name = "UACM Poncho" + desc = "The standard UACM poncho has variations for every climate. Custom fitted to be attached to standard UACM armor variants it is comfortable, warming or cooling as needed, and well-fit. A marine couldn't ask for more. Affectionately referred to as a \"woobie\"." icon_state = "poncho" slot = ACCESSORY_SLOT_PONCHO var/has_variation = TRUE @@ -704,7 +704,7 @@ /obj/item/clothing/accessory/storage/knifeharness name = "M272 pattern knife vest" - desc = "An older generation M272 pattern knife vest once employed by the USCM. Can hold up to 5 knives. It is made of synthcotton." + desc = "An older generation M272 pattern knife vest once employed by the UACM. Can hold up to 5 knives. It is made of synthcotton." icon_state = "vest_knives" hold = /obj/item/storage/internal/accessory/knifeharness diff --git a/code/modules/cm_marines/Donator_Items.dm b/code/modules/cm_marines/Donator_Items.dm index d1e2011e8c..b09e935bf6 100644 --- a/code/modules/cm_marines/Donator_Items.dm +++ b/code/modules/cm_marines/Donator_Items.dm @@ -454,7 +454,7 @@ /obj/item/clothing/suit/storage/marine/fluff/jackmcintyre //CKEY=jackmcintyre (UNIQUE) name = "Exo-Suit Jackert" - desc = "Some sort of strange Exo-suit jacket. It has the letters USCM stamped over a faded word that appears to be ATLAS... UNIQUE DONOR ITEM" + desc = "Some sort of strange Exo-suit jacket. It has the letters UACM stamped over a faded word that appears to be ATLAS... UNIQUE DONOR ITEM" icon_state = "Adam_jacket_u" item_state = "Adam_jacket_u" @@ -819,7 +819,7 @@ flags_inv_hide = HIDEEARS|HIDEMASK|HIDEALLHAIR /obj/item/clothing/head/helmet/marine/fluff/leondark //CKEY=leondark16 - name = "Hunter's USCM Cap" + name = "Hunter's UACM Cap" desc = "A well-worn cap with the name 'Barrientos' written on the inside. DONOR ITEM" icon_state = "USCM_cap" item_state = "USCM_cap" @@ -889,8 +889,8 @@ flags_inv_hide = HIDEEARS|HIDEMASK|HIDEEYES|HIDEALLHAIR /obj/item/clothing/head/helmet/marine/fluff/jackmcintyre //CKEY=jackmcintyre (UNIQUE) - name = "USCM Ball Cap" - desc = "USCM Cold Weather Ball Cap... DONOR ITEM" + name = "UACM Ball Cap" + desc = "UACM Cold Weather Ball Cap... DONOR ITEM" icon_state = "Adam_hat" item_state = "Adam_hat" flags_inventory = BLOCKSHARPOBJ @@ -942,7 +942,7 @@ /obj/item/clothing/head/helmet/marine/fluff/edgelord name = "Operator Cap" - desc = "A sturdy brown USCM cap with an attached radio headset. This one has the name 'Mann' printed on the back. DONOR ITEM" + desc = "A sturdy brown UACM cap with an attached radio headset. This one has the name 'Mann' printed on the back. DONOR ITEM" icon_state = "edgelord_cap" item_state = "edgelord_cap" @@ -1214,8 +1214,8 @@ flags_jumpsuit = FALSE /obj/item/clothing/under/marine/fluff/sailordave //CKEY=sailordave - name = "Eden USCM uniform" - desc = "An older model USCM uniform. UNIQUE DONOR ITEM" + name = "Eden UACM uniform" + desc = "An older model UACM uniform. UNIQUE DONOR ITEM" icon_state = "syndicate" worn_state = "syndicate" flags_jumpsuit = FALSE diff --git a/code/modules/cm_marines/dropship_equipment.dm b/code/modules/cm_marines/dropship_equipment.dm index 17d612b3ba..09e645363e 100644 --- a/code/modules/cm_marines/dropship_equipment.dm +++ b/code/modules/cm_marines/dropship_equipment.dm @@ -793,7 +793,7 @@ /obj/structure/dropship_equipment/weapon/laser_beam_gun name = "\improper LWU-6B Laser Cannon" icon_state = "laser_beam" - desc = "State of the art technology recently acquired by the USCM, it fires a battery-fed pulsed laser beam at near lightspeed setting on fire everything it touches. Moving this will require some sort of lifter. Accepts the BTU-17/LW Hi-Cap Laser Batteries." + desc = "State of the art technology recently acquired by the UACM, it fires a battery-fed pulsed laser beam at near lightspeed setting on fire everything it touches. Moving this will require some sort of lifter. Accepts the BTU-17/LW Hi-Cap Laser Batteries." icon = 'icons/obj/structures/props/almayer_props64.dmi' firing_sound = 'sound/effects/phasein.ogg' firing_delay = 50 //5 seconds diff --git a/code/modules/cm_marines/equipment/gear.dm b/code/modules/cm_marines/equipment/gear.dm index 9a943c7072..cb77d6e38c 100644 --- a/code/modules/cm_marines/equipment/gear.dm +++ b/code/modules/cm_marines/equipment/gear.dm @@ -13,7 +13,7 @@ /obj/item/bodybag/tarp name = "\improper V1 thermal-dapening tarp (folded)" - desc = "A tarp carried by USCM Snipers. When laying underneath the tarp, the sniper is almost indistinguishable from the landscape if utilized correctly. The tarp contains a thermal-dampening weave to hide the wearer's heat signatures, optical camouflage, and smell dampening." + desc = "A tarp carried by UACM Snipers. When laying underneath the tarp, the sniper is almost indistinguishable from the landscape if utilized correctly. The tarp contains a thermal-dampening weave to hide the wearer's heat signatures, optical camouflage, and smell dampening." icon = 'icons/obj/bodybag.dmi' icon_state = "jungletarp_folded" w_class = SIZE_MEDIUM @@ -27,7 +27,7 @@ /obj/item/bodybag/tarp/reactive name = "\improper V2 reactive thermal tarp (folded)" - desc = "A tarp carried by some USCM infantry. This updated tarp is capable of blending into its environment nearly flawlessly, given that it can properly collate data once deployed. The tarp is able to hide the wearer's heat signature." + desc = "A tarp carried by some UACM infantry. This updated tarp is capable of blending into its environment nearly flawlessly, given that it can properly collate data once deployed. The tarp is able to hide the wearer's heat signature." icon = 'icons/obj/bodybag.dmi' icon_state = "reactivetarp_folded" unfolded_path = /obj/structure/closet/bodybag/tarp/reactive @@ -42,7 +42,7 @@ /obj/structure/closet/bodybag/tarp name = "\improper V1 thermal-dampening tarp" bag_name = "\improper V1 thermal-dampening tarp" - desc = "A tarp carried by USCM Snipers. When laying underneath the tarp, the sniper is almost indistinguishable from the landscape if utilized correctly. The tarp contains a thermal-dampening weave to hide the wearer's heat signatures, optical camouflage, and smell dampening." + desc = "A tarp carried by UACM Snipers. When laying underneath the tarp, the sniper is almost indistinguishable from the landscape if utilized correctly. The tarp contains a thermal-dampening weave to hide the wearer's heat signatures, optical camouflage, and smell dampening." icon = 'icons/obj/bodybag.dmi' icon_state = "jungletarp_closed" icon_closed = "jungletarp_closed" @@ -70,7 +70,7 @@ /obj/structure/closet/bodybag/tarp/reactive name = "\improper V2 reactive thermal tarp" bag_name = "\improper V2 reactive thermal tarp" - desc = "A tarp carried by some USCM infantry. This updated tarp is capable of blending into its environment nearly flawlessly, given that it can properly collate data once deployed. The tarp is able to hide the wearer's heat signature." + desc = "A tarp carried by some UACM infantry. This updated tarp is capable of blending into its environment nearly flawlessly, given that it can properly collate data once deployed. The tarp is able to hide the wearer's heat signature." icon_state = "reactivetarp_closed" icon_closed = "reactivetarp_closed" icon_opened = "reactivetarp_open" @@ -170,7 +170,7 @@ /obj/item/storage/box/uscm_mre - name = "\improper USCM meal ready to eat" + name = "\improper UACM meal ready to eat" desc = "Instructions: Extract food using maximum firepower. Eat.\n\nOn the box is a picture of a shouting Squad Leader. \n\"YOU WILL EAT YOUR NUTRIENT GOO AND YOU WILL ENJOY IT, MAGGOT.\"" icon_state = "mre1" @@ -198,7 +198,7 @@ /obj/item/reagent_container/food/snacks/protein_pack - name = "stale USCM protein bar" + name = "stale UACM protein bar" desc = "The most fake-looking protein bar you have ever laid eyes on, covered in a substitution chocolate. The powder used to make these is a substitute of a substitute of whey substitute." icon_state = "yummers" filling_color = "#ED1169" @@ -217,8 +217,8 @@ w_class = SIZE_SMALL /obj/item/reagent_container/food/snacks/mre_pack/meal1 - name = "\improper USCM Prepared Meal (cornbread)" - desc = "A tray of standard USCM food. Stale cornbread, tomato paste and some green goop fill this tray." + name = "\improper UACM Prepared Meal (cornbread)" + desc = "A tray of standard UACM food. Stale cornbread, tomato paste and some green goop fill this tray." icon_state = "MREa" filling_color = "#ED1169" @@ -228,8 +228,8 @@ bitesize = 3 /obj/item/reagent_container/food/snacks/mre_pack/meal2 - name = "\improper USCM Prepared Meal (pork)" - desc = "A tray of standard USCM food. Partially raw pork, goopy corn and some watery mashed potatoes fill this tray." + name = "\improper UACM Prepared Meal (pork)" + desc = "A tray of standard UACM food. Partially raw pork, goopy corn and some watery mashed potatoes fill this tray." icon_state = "MREb" /obj/item/reagent_container/food/snacks/mre_pack/meal2/Initialize() @@ -238,8 +238,8 @@ bitesize = 2 /obj/item/reagent_container/food/snacks/mre_pack/meal3 - name = "\improper USCM Prepared Meal (pasta)" - desc = "A tray of standard USCM food. Overcooked spaghetti, waterlogged carrots and two french fries fill this tray." + name = "\improper UACM Prepared Meal (pasta)" + desc = "A tray of standard UACM food. Overcooked spaghetti, waterlogged carrots and two french fries fill this tray." icon_state = "MREc" /obj/item/reagent_container/food/snacks/mre_pack/meal3/Initialize() @@ -248,8 +248,8 @@ bitesize = 3 /obj/item/reagent_container/food/snacks/mre_pack/meal4 - name = "\improper USCM Prepared Meal (pizza)" - desc = "A tray of standard USCM food. Cold pizza, wet green beans and a shitty egg fill this tray. Get something other than pizza, lardass." + name = "\improper UACM Prepared Meal (pizza)" + desc = "A tray of standard UACM food. Cold pizza, wet green beans and a shitty egg fill this tray. Get something other than pizza, lardass." icon_state = "MREd" /obj/item/reagent_container/food/snacks/mre_pack/meal4/Initialize() @@ -258,8 +258,8 @@ bitesize = 1 /obj/item/reagent_container/food/snacks/mre_pack/meal5 - name = "\improper USCM Prepared Meal (chicken)" - desc = "A tray of standard USCM food. Moist chicken, dry rice and a mildly depressed piece of broccoli fill this tray." + name = "\improper UACM Prepared Meal (chicken)" + desc = "A tray of standard UACM food. Moist chicken, dry rice and a mildly depressed piece of broccoli fill this tray." icon_state = "MREe" /obj/item/reagent_container/food/snacks/mre_pack/meal5/Initialize() @@ -268,8 +268,8 @@ bitesize = 3 /obj/item/reagent_container/food/snacks/mre_pack/meal6 - name = "\improper USCM Prepared Meal (tofu)" - desc = "The USCM doesn't serve tofu you grass sucking hippie. The flag signifies your defeat." + name = "\improper UACM Prepared Meal (tofu)" + desc = "The UACM doesn't serve tofu you grass sucking hippie. The flag signifies your defeat." icon_state = "MREf" /obj/item/reagent_container/food/snacks/mre_pack/meal6/Initialize() @@ -278,8 +278,8 @@ bitesize = 1 /obj/item/reagent_container/food/snacks/mre_pack/xmas1 - name = "\improper USCM M25 'X-MAS' Meal: Sugar Cookies" - desc = "The USCM M25 Sugar Cookies Meal was designed to give marines a feeling of Christmas joy. But to the bemusement of superior officers, the costs-savings measure of simply fabricating protein bars in the shape of cookies with chocolate substitute chips and the replacement of the expected milk with artificially colored water did not go over well with most marines." + name = "\improper UACM M25 'X-MAS' Meal: Sugar Cookies" + desc = "The UACM M25 Sugar Cookies Meal was designed to give marines a feeling of Christmas joy. But to the bemusement of superior officers, the costs-savings measure of simply fabricating protein bars in the shape of cookies with chocolate substitute chips and the replacement of the expected milk with artificially colored water did not go over well with most marines." icon_state = "mreCookies" black_market_value = 10 @@ -290,8 +290,8 @@ bitesize = 8 /obj/item/reagent_container/food/snacks/mre_pack/xmas2 - name = "\improper USCM M25 'X-MAS' Meal: Gingerbread Cookies" - desc = "The USCM M25 Gingerbread Cookies Meal was designed to give marines convenient and cheap access to gingerbread cookies as a replacement for annual gingerbread making classes due to rising expenses and comically low success rates for the Basic Holidays Festivities Course. However, due to cost saving measures, these cookies seldom inspire happiness, nor holiday spirit." + name = "\improper UACM M25 'X-MAS' Meal: Gingerbread Cookies" + desc = "The UACM M25 Gingerbread Cookies Meal was designed to give marines convenient and cheap access to gingerbread cookies as a replacement for annual gingerbread making classes due to rising expenses and comically low success rates for the Basic Holidays Festivities Course. However, due to cost saving measures, these cookies seldom inspire happiness, nor holiday spirit." icon_state = "mreGingerbread" black_market_value = 10 @@ -302,8 +302,8 @@ bitesize = 8 /obj/item/reagent_container/food/snacks/mre_pack/xmas3 - name = "\improper USCM M25 'X-MAS' Meal: Fruitcake" - desc = "The USCM M25 Fruitcake Meal was the third meal designed by an officers' committee as part of the M25 Project; this shows through the terrible hardness and tartness of the bread and raisined fruits. It can be logically deduced that the people who vended this option are worse than the Grinch and the Miser combined, along with the people who designed and prepared this fruitcake." + name = "\improper UACM M25 'X-MAS' Meal: Fruitcake" + desc = "The UACM M25 Fruitcake Meal was the third meal designed by an officers' committee as part of the M25 Project; this shows through the terrible hardness and tartness of the bread and raisined fruits. It can be logically deduced that the people who vended this option are worse than the Grinch and the Miser combined, along with the people who designed and prepared this fruitcake." icon_state = "mreFruitcake" black_market_value = 10 @@ -314,8 +314,8 @@ bitesize = 8 /obj/item/reagent_container/food/snacks/mre_pack/thanksgiving - name = "\improper USCM Prepared Meal (turkey)" - desc = "A tray of standard USCM food. A few slices of turkey and some regenerated mashed potatos with a rather viscous gravy on top. A classic, if rather half-hearted, Thanksgiving meal." + name = "\improper UACM Prepared Meal (turkey)" + desc = "A tray of standard UACM food. A few slices of turkey and some regenerated mashed potatos with a rather viscous gravy on top. A classic, if rather half-hearted, Thanksgiving meal." icon_state = "MREe" /obj/item/reagent_container/food/snacks/mre_pack/thanksgiving/Initialize() diff --git a/code/modules/cm_marines/equipment/guncases.dm b/code/modules/cm_marines/equipment/guncases.dm index b5c29ef21b..9c693bcd70 100644 --- a/code/modules/cm_marines/equipment/guncases.dm +++ b/code/modules/cm_marines/equipment/guncases.dm @@ -259,7 +259,7 @@ /obj/item/storage/box/guncase/nsg23_marine name = "\improper NSG-23 assault rifle case" - desc = "A gun case containing the NSG 23 assault rifle. While usually seen in the hands of PMCs, this weapon is sometimes issued to USCM personnel." + desc = "A gun case containing the NSG 23 assault rifle. While usually seen in the hands of PMCs, this weapon is sometimes issued to UACM personnel." storage_slots = 6 can_hold = list(/obj/item/weapon/gun/rifle/nsg23/no_lock, /obj/item/ammo_magazine/rifle/nsg23) @@ -273,7 +273,7 @@ /obj/item/storage/box/guncase/m3717 name = "\improper M37-17 pump shotgun case" - desc = "A gun case containing the M37-17 pump shotgun. Rarely seen issued to USCM vessels on the edges of inhabited space who need the extra bang for their buck (literally) the M37-17 has. Like this one! Well, if it had the budget for it." + desc = "A gun case containing the M37-17 pump shotgun. Rarely seen issued to UACM vessels on the edges of inhabited space who need the extra bang for their buck (literally) the M37-17 has. Like this one! Well, if it had the budget for it." storage_slots = 4 can_hold = list(/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb/m3717, /obj/item/ammo_magazine/shotgun/buckshot) diff --git a/code/modules/cm_marines/equipment/kit_boxes.dm b/code/modules/cm_marines/equipment/kit_boxes.dm index 6058ae93ec..52ed123701 100644 --- a/code/modules/cm_marines/equipment/kit_boxes.dm +++ b/code/modules/cm_marines/equipment/kit_boxes.dm @@ -480,7 +480,7 @@ /obj/item/storage/box/kit/cryo_self_defense name = "\improper Cryo Self Defense Kit" - desc = "A basic self-defense kit reserved for emergencies. As you might expect, not much care was put into keeping the stock fresh, who would be insane enough to attack a USCM ship directly?" + desc = "A basic self-defense kit reserved for emergencies. As you might expect, not much care was put into keeping the stock fresh, who would be insane enough to attack a UACM ship directly?" icon_state = "cryo_defense_kit" storage_slots = 3 diff --git a/code/modules/cm_marines/m2c.dm b/code/modules/cm_marines/m2c.dm index ff16c924cd..bc777aaa9e 100644 --- a/code/modules/cm_marines/m2c.dm +++ b/code/modules/cm_marines/m2c.dm @@ -181,7 +181,7 @@ // MACHINEGUN, AUTOMATIC /obj/structure/machinery/m56d_hmg/auto name = "\improper M2C Heavy Machinegun" - desc = "A deployable, heavy machine gun. The M2C 'Chimp' HB is a modified M2 HB reconfigured to fire 10x28 Caseless Tungsten rounds for USCM use. It is capable of recoilless fire and fast-rotating. However it has a debilitating overheating issue due to the poor quality of metals used in the parts, forcing it to be used in decisive, crushing engagements as a squad support weapon. Click its sprite while behind it without holding anything to man it. Click-drag on NON-GRAB intent to disassemble the gun, GRAB INTENT to remove ammo magazines." + desc = "A deployable, heavy machine gun. The M2C 'Chimp' HB is a modified M2 HB reconfigured to fire 10x28 Caseless Tungsten rounds for UACM use. It is capable of recoilless fire and fast-rotating. However it has a debilitating overheating issue due to the poor quality of metals used in the parts, forcing it to be used in decisive, crushing engagements as a squad support weapon. Click its sprite while behind it without holding anything to man it. Click-drag on NON-GRAB intent to disassemble the gun, GRAB INTENT to remove ammo magazines." icon = 'icons/turf/whiskeyoutpost.dmi' icon_state = "M56DE" icon_full = "M56DE" diff --git a/code/modules/cm_marines/marines_consoles.dm b/code/modules/cm_marines/marines_consoles.dm index 14911faf85..6f65b1968b 100644 --- a/code/modules/cm_marines/marines_consoles.dm +++ b/code/modules/cm_marines/marines_consoles.dm @@ -10,7 +10,7 @@ /obj/structure/machinery/computer/card name = "Identification Computer" - desc = "Terminal for programming USCM employee ID card access." + desc = "Terminal for programming UACM employee ID card access." icon_state = "id" req_access = list(ACCESS_MARINE_DATABASE) circuit = /obj/item/circuitboard/computer/card @@ -241,7 +241,7 @@ target_id_card.access |= (is_centcom ? get_access(ACCESS_LIST_WY_ALL) : get_access(ACCESS_LIST_MARINE_MAIN)) target_id_card.faction_group |= factions - log_idmod(target_id_card, " [key_name_admin(usr)] granted the ID all access and USCM IFF. ") + log_idmod(target_id_card, " [key_name_admin(usr)] granted the ID all access and UACM IFF. ") return TRUE if("PRG_denyall") if(!authenticated || !target_id_card) @@ -250,7 +250,7 @@ var/list/access = target_id_card.access access.Cut() target_id_card.faction_group -= factions - log_idmod(target_id_card, " [key_name_admin(usr)] removed all accesses and USCM IFF. ") + log_idmod(target_id_card, " [key_name_admin(usr)] removed all accesses and UACM IFF. ") return TRUE if("PRG_grantregion") if(!authenticated || !target_id_card) @@ -258,7 +258,7 @@ if(params["region"] == "Faction (IFF system)") target_id_card.faction_group |= factions - log_idmod(target_id_card, " [key_name_admin(usr)] granted USCM IFF. ") + log_idmod(target_id_card, " [key_name_admin(usr)] granted UACM IFF. ") return TRUE var/region = text2num(params["region"]) if(isnull(region)) @@ -273,7 +273,7 @@ if(params["region"] == "Faction (IFF system)") target_id_card.faction_group -= factions - log_idmod(target_id_card, " [key_name_admin(usr)] revoked USCM IFF. ") + log_idmod(target_id_card, " [key_name_admin(usr)] revoked UACM IFF. ") return TRUE var/region = text2num(params["region"]) if(isnull(region)) diff --git a/code/modules/cm_marines/orbital_cannon.dm b/code/modules/cm_marines/orbital_cannon.dm index 3aafc4b7c4..9e6db97d52 100644 --- a/code/modules/cm_marines/orbital_cannon.dm +++ b/code/modules/cm_marines/orbital_cannon.dm @@ -6,7 +6,7 @@ var/list/ob_type_fuel_requirements /obj/structure/orbital_cannon name = "\improper Orbital Cannon" - desc = "The USCM Orbital Cannon System. Used for shooting large targets on the planet that is orbited. It accelerates its payload with solid fuel for devastating results upon impact." + desc = "The UACM Orbital Cannon System. Used for shooting large targets on the planet that is orbited. It accelerates its payload with solid fuel for devastating results upon impact." icon = 'icons/effects/128x128.dmi' icon_state = "OBC_unloaded" density = TRUE diff --git a/code/modules/cm_tech/droppod/equipment.dm b/code/modules/cm_tech/droppod/equipment.dm index 727bfccf0e..3c8e8e59c5 100644 --- a/code/modules/cm_tech/droppod/equipment.dm +++ b/code/modules/cm_tech/droppod/equipment.dm @@ -1,5 +1,5 @@ /obj/structure/droppod/equipment - name = "\improper USCM droppod" + name = "\improper UACM droppod" var/obj/equipment_to_spawn /obj/structure/droppod/equipment/Initialize(mapload, equipment, mob/M) diff --git a/code/modules/cm_tech/droppod/marine.dm b/code/modules/cm_tech/droppod/marine.dm index 051a250299..5aaeddfb52 100644 --- a/code/modules/cm_tech/droppod/marine.dm +++ b/code/modules/cm_tech/droppod/marine.dm @@ -1,5 +1,5 @@ /obj/structure/droppod/tech - name = "\improper USCM droppod" + name = "\improper UACM droppod" var/time_until_return = 2 MINUTES /obj/structure/droppod/tech/Initialize(mapload, contents_name = "Empty") diff --git a/code/modules/cm_tech/droppod/supply.dm b/code/modules/cm_tech/droppod/supply.dm index 1da7d8d7b6..849a938acb 100644 --- a/code/modules/cm_tech/droppod/supply.dm +++ b/code/modules/cm_tech/droppod/supply.dm @@ -1,5 +1,5 @@ /obj/structure/droppod/supply - name = "\improper USCM requisitions package" + name = "\improper UACM requisitions package" drop_time = 10 SECONDS dropping_time = 2 SECONDS open_time = 2 SECONDS diff --git a/code/modules/decorators/christmas.dm b/code/modules/decorators/christmas.dm index 2a87c7cb49..324cac0d8f 100644 --- a/code/modules/decorators/christmas.dm +++ b/code/modules/decorators/christmas.dm @@ -45,7 +45,7 @@ /datum/decorator/christmas/marine_helmet/decorate(obj/item/clothing/head/helmet/marine/helmet) if(!istype(helmet)) return - helmet.name = "\improper USCM [helmet.specialty] santa hat" + helmet.name = "\improper UACM [helmet.specialty] santa hat" helmet.desc = "Ho ho ho, Merry Christmas!" helmet.icon = 'icons/obj/items/clothing/hats.dmi' helmet.icon_override = 'icons/mob/humans/onmob/head_0.dmi' @@ -84,7 +84,7 @@ list("FLASKS", -1, null, null), list("Canteen", 10, /obj/item/reagent_container/food/drinks/flask/canteen, VENDOR_ITEM_REGULAR), list("Metal Flask", 10, /obj/item/reagent_container/food/drinks/flask, VENDOR_ITEM_REGULAR), - list("USCM Flask", 5, /obj/item/reagent_container/food/drinks/flask/marine, VENDOR_ITEM_REGULAR), + list("UACM Flask", 5, /obj/item/reagent_container/food/drinks/flask/marine, VENDOR_ITEM_REGULAR), list("W-Y Flask", 5, /obj/item/reagent_container/food/drinks/flask/weylandyutani, VENDOR_ITEM_REGULAR), list("UTILITIES", -1, null, null), diff --git a/code/modules/defenses/handheld.dm b/code/modules/defenses/handheld.dm index d1f9a3cf20..37547400f1 100644 --- a/code/modules/defenses/handheld.dm +++ b/code/modules/defenses/handheld.dm @@ -1,6 +1,6 @@ /obj/item/defenses/handheld name = "Don't see this." - desc = "A compact version of the USCM defenses. Designed for quick deployment of the associated type in the field." + desc = "A compact version of the UACM defenses. Designed for quick deployment of the associated type in the field." icon = 'icons/obj/structures/machinery/defenses/sentry.dmi' icon_state = "DMR uac_sentry_handheld" diff --git a/code/modules/defenses/planted_flag.dm b/code/modules/defenses/planted_flag.dm index f0f6b05565..50abe529c5 100644 --- a/code/modules/defenses/planted_flag.dm +++ b/code/modules/defenses/planted_flag.dm @@ -4,7 +4,7 @@ /obj/structure/machinery/defenses/planted_flag name = "\improper JIMA planted flag" icon = 'icons/obj/structures/machinery/defenses/planted_flag.dmi' - desc = "A planted flag with the iconic USCM flag plastered all over it, you feel a burst of energy by its mere sight." + desc = "A planted flag with the iconic UACM flag plastered all over it, you feel a burst of energy by its mere sight." handheld_type = /obj/item/defenses/handheld/planted_flag disassemble_time = 10 var/datum/shape/range_bounds diff --git a/code/modules/events/inflation.dm b/code/modules/events/inflation.dm index 377c689fa1..3aafb0f5c4 100644 --- a/code/modules/events/inflation.dm +++ b/code/modules/events/inflation.dm @@ -67,7 +67,7 @@ "withdrawal of government funding in relevant sectors", "a vital Seegson industries space station going dark", // A:I, "several mining colonies defecting to the UPP", - "a critical USCM defeat by CLF insurgents in the Tychon's Rift sector", + "a critical UACM defeat by CLF insurgents in the Tychon's Rift sector", "newly imposed sanctions as a result of corporate investigations", "flaring tensions with Arcturus", "a Sol-wide solar flare technological blackout", diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm index e62ad15a64..53b8d942ef 100644 --- a/code/modules/flufftext/Dreaming.dm +++ b/code/modules/flufftext/Dreaming.dm @@ -4,7 +4,7 @@ "whispering","deep space","a medic","an FTL engine","alarm","an ally","darkness", \ "dim light","a scientist","a great leader","a catastrophe","desertion","a mistake","ice","freezing","warning lights", \ "a helmet","mandibles","an abandoned station","a colony","monsters","air","a morgue","a military bridge","blinking lights", \ -"a blue light","an abandoned colony","USCM","blood","a bandage","fear","a stiff corpse","military fleet", \ +"a blue light","an abandoned colony","UACM","blood","a bandage","fear","a stiff corpse","military fleet", \ "loyalty","space","a crash","loneliness","suffocation","a fall","heat","flames","ice","cigarettes","falling","a buzzer","a PDA", \ "snow","searing heat","calamity","the dead","a rifle", \ "a knife","a distress beacon","a pistol","a spider","empty space","claws", \ diff --git a/code/modules/gear_presets/cmb.dm b/code/modules/gear_presets/cmb.dm index 0f5f67e071..d7370d20ec 100644 --- a/code/modules/gear_presets/cmb.dm +++ b/code/modules/gear_presets/cmb.dm @@ -389,7 +389,7 @@ //Anchorpoint Station Squad Marine - Similar to the Movie squad but nerfed a bit. /datum/equipment_preset/uscm/cmb - name = "USCM Anchorpoint Station Squad Marine" + name = "UACM Anchorpoint Station Squad Marine" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE /datum/equipment_preset/uscm/cmb/New() @@ -441,7 +441,7 @@ //Anchorpoint Station Marine Squad Leader /datum/equipment_preset/uscm/cmb/leader - name = "USCM Anchorpoint Station Team Leader" + name = "UACM Anchorpoint Station Team Leader" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE /datum/equipment_preset/uscm/cmb/leader/New() . = ..() @@ -486,7 +486,7 @@ //Anchorpoint Station Marine RTO - technical specialist, has the responsibility of engineering as well /datum/equipment_preset/uscm/cmb/rto - name = "USCM Anchorpoint Station Technical Specialist" + name = "UACM Anchorpoint Station Technical Specialist" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE /datum/equipment_preset/uscm/cmb/rto/New() . = ..() @@ -531,7 +531,7 @@ //Anchorpoint Station Corpsman /datum/equipment_preset/uscm/cmb/medic - name = "USCM Anchorpoint Station Corpsman" + name = "UACM Anchorpoint Station Corpsman" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE /datum/equipment_preset/uscm/cmb/medic/New() . = ..() @@ -588,7 +588,7 @@ //Anchorpoint Station Marine Smartgunnner /datum/equipment_preset/uscm/cmb/smartgunner - name = "USCM Anchorpoint Station Smartgunner" + name = "UACM Anchorpoint Station Smartgunner" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE /datum/equipment_preset/uscm/cmb/smartgunner/New() . = ..() diff --git a/code/modules/gear_presets/corpses.dm b/code/modules/gear_presets/corpses.dm index 450758c691..d0a7f9fd85 100644 --- a/code/modules/gear_presets/corpses.dm +++ b/code/modules/gear_presets/corpses.dm @@ -982,7 +982,7 @@ //FORECON /datum/equipment_preset/corpse/forecon_spotter - name = "Corpse - USCM Reconnaissance Spotter" + name = "Corpse - UACM Reconnaissance Spotter" assignment = "Reconnaissance Spotter" xenovictim = FALSE paygrade = "ME5" diff --git a/code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm b/code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm index 825228f297..3187989163 100644 --- a/code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm +++ b/code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm @@ -101,7 +101,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(new_human), WEAR_HEAD) /datum/equipment_preset/survivor/forecon/standard - name = "Survivor - USCM Reconnaissance Marine" + name = "Survivor - UACM Reconnaissance Marine" assignment = JOB_FORECON_RIFLEMAN skills = /datum/skills/military/survivor/forecon_standard @@ -115,7 +115,7 @@ ///*****************************// /datum/equipment_preset/survivor/forecon/tech - name = "Survivor - USCM Reconnaissance Support Technician" + name = "Survivor - UACM Reconnaissance Support Technician" assignment = JOB_FORECON_SUPPORT skills = /datum/skills/military/survivor/forecon_techician @@ -137,7 +137,7 @@ ///*****************************// /datum/equipment_preset/survivor/forecon/marksman - name = "Survivor - USCM Reconnaissance Designated Marksman" + name = "Survivor - UACM Reconnaissance Designated Marksman" assignment = JOB_FORECON_MARKSMAN skills = /datum/skills/military/survivor/forecon_marksman @@ -153,7 +153,7 @@ ///*****************************// /datum/equipment_preset/survivor/forecon/smartgunner - name = "Survivor - USCM Reconnaissance Smartgunner" + name = "Survivor - UACM Reconnaissance Smartgunner" assignment = JOB_FORECON_SMARTGUNNER skills = /datum/skills/military/survivor/forecon_smartgunner @@ -171,7 +171,7 @@ ///*****************************// /datum/equipment_preset/survivor/forecon/sniper - name = "Survivor - USCM Reconnaissance Sniper" + name = "Survivor - UACM Reconnaissance Sniper" assignment = JOB_FORECON_SNIPER skills = /datum/skills/military/survivor/forecon_sniper @@ -205,7 +205,7 @@ //---------------------------\\ /datum/equipment_preset/survivor/forecon/squad_leader - name = "Survivor - USCM Reconnaissance Squad Leader" + name = "Survivor - UACM Reconnaissance Squad Leader" assignment = JOB_FORECON_SL skills = /datum/skills/military/survivor/forecon_squad_leader paygrade = "MO1" @@ -231,7 +231,7 @@ //---------------------------\\ /datum/equipment_preset/survivor/forecon/major - name = "Survivor - USCM Reconnaissance Major" + name = "Survivor - UACM Reconnaissance Major" assignment = JOB_FORECON_CO skills = /datum/skills/commander paygrade = "MO4" @@ -264,7 +264,7 @@ //----------------------\\ /datum/equipment_preset/synth/survivor/forecon - name = "Survivor - USCM Synthetic" + name = "Survivor - UACM Synthetic" assignment = JOB_FORECON_SYN faction_group = list(FACTION_MARINE, FACTION_SURVIVOR) idtype = /obj/item/card/id/gold diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm index 70efeb9f39..b590e3c00c 100644 --- a/code/modules/gear_presets/synths.dm +++ b/code/modules/gear_presets/synths.dm @@ -35,7 +35,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/synth/uscm - name = "USCM Synthetic" + name = "UACM Synthetic" flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE faction = FACTION_MARINE idtype = /obj/item/card/id/gold @@ -59,7 +59,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/synth/uscm/councillor - name = "USCM Synthetic Councillor" + name = "UACM Synthetic Councillor" flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE faction = FACTION_MARINE idtype = /obj/item/card/id/gold diff --git a/code/modules/gear_presets/uscm.dm b/code/modules/gear_presets/uscm.dm index 82ba128bcd..8d8a22579d 100644 --- a/code/modules/gear_presets/uscm.dm +++ b/code/modules/gear_presets/uscm.dm @@ -1,5 +1,5 @@ /datum/equipment_preset/uscm - name = "USCM" + name = "UACM" faction = FACTION_MARINE faction_group = FACTION_LIST_MARINE languages = list(LANGUAGE_ENGLISH) @@ -96,7 +96,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm/pfc - name = "USCM Squad Rifleman" + name = "UACM Squad Rifleman" flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE access = list(ACCESS_MARINE_PREP) @@ -155,7 +155,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm/sg - name = "USCM Squad Smartgunner" + name = "UACM Squad Smartgunner" flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_SMARTPREP) @@ -216,7 +216,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm/sg/full - name = "USCM Squad Smartgunner" + name = "UACM Squad Smartgunner" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE /datum/equipment_preset/uscm/sg/full/load_gear(mob/living/carbon/human/new_human) @@ -233,7 +233,7 @@ return //No cryo munchies /datum/equipment_preset/uscm/rto - name = "USCM Radio Telephone Operator" + name = "UACM Radio Telephone Operator" flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_SPECPREP) @@ -258,7 +258,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm/tank - name = "USCM Vehicle Crewman (CRMN) (Cryo)" + name = "UACM Vehicle Crewman (CRMN) (Cryo)" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE access = list( @@ -295,7 +295,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm/tank/full - name = "USCM Vehicle Crewman (CRMN)" + name = "UACM Vehicle Crewman (CRMN)" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE utility_under = list(/obj/item/clothing/under/marine/officer/tanker) @@ -317,7 +317,7 @@ /*****************************************************************************************************/ /datum/equipment_preset/uscm/tank/recon - name = "USCM Reconnaissance Vehicle Operator (CRMN)" + name = "UACM Reconnaissance Vehicle Operator (CRMN)" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE assignment = "Reconnaissance Vehicle Operator" @@ -365,7 +365,7 @@ /*****************************************************************************************************/ /datum/equipment_preset/uscm/spec - name = "USCM (Cryo) Squad Weapons Specialist" + name = "UACM (Cryo) Squad Weapons Specialist" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_SPECPREP) @@ -386,7 +386,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/specrag(new_human), WEAR_HEAD) /datum/equipment_preset/uscm/spec/cryo - name = "USCM Cryo Squad Weapons Specialist" + name = "UACM Cryo Squad Weapons Specialist" auto_squad_name = SQUAD_MARINE_CRYO /datum/equipment_preset/uscm/spec/cryo/load_gear(mob/living/carbon/human/new_human) @@ -397,7 +397,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm/spec/full_armor - name = "USCM Weapons Specialist (B18 Armor)" + name = "UACM Weapons Specialist (B18 Armor)" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE /datum/equipment_preset/uscm/spec/full_armor/load_gear(mob/living/carbon/human/new_human) @@ -422,7 +422,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm/medic - name = "USCM Squad Hospital Corpsman" + name = "UACM Squad Hospital Corpsman" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_MEDPREP, ACCESS_MARINE_MEDBAY) assignment = JOB_SQUAD_MEDIC @@ -483,7 +483,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm/tl - name = "USCM Squad Sergeant" + name = "UACM Squad Sergeant" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_TL_PREP) @@ -533,7 +533,7 @@ /*****************************************************************************************************/ /datum/equipment_preset/uscm/engineer - name = "USCM Squad Combat Technician" + name = "UACM Squad Combat Technician" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_ENGPREP, ACCESS_CIVILIAN_ENGINEERING) @@ -555,7 +555,7 @@ new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) /datum/equipment_preset/uscm/engineer/cryo - name = "USCM Cryo Squad Combat Technician" + name = "UACM Cryo Squad Combat Technician" auto_squad_name = SQUAD_MARINE_CRYO /datum/equipment_preset/uscm/engineer/cryo/load_gear(mob/living/carbon/human/new_human) @@ -565,7 +565,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm/leader - name = "USCM Platoon Sergeant" + name = "UACM Platoon Sergeant" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP) assignment = JOB_SQUAD_LEADER @@ -625,7 +625,7 @@ // ERT members that spawn with full gear from DEFCON /datum/equipment_preset/uscm/private_equipped - name = "USCM Squad Rifleman (Equipped)" + name = "UACM Squad Rifleman (Equipped)" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE access = list(ACCESS_MARINE_PREP) @@ -666,7 +666,7 @@ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1(new_human.back), WEAR_IN_BACK) /datum/equipment_preset/uscm/private_equipped/random - name = "USCM Squad Rifleman (Equipped Random)" + name = "UACM Squad Rifleman (Equipped Random)" /datum/equipment_preset/uscm/private_equipped/random/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY) @@ -689,7 +689,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm/leader_equipped - name = "USCM Platoon Sergeant (Equipped)" + name = "UACM Platoon Sergeant (Equipped)" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP) @@ -725,7 +725,7 @@ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1(new_human.back), WEAR_IN_BACK) /datum/equipment_preset/uscm/leader_equipped/random - name = "USCM Platoon Sergeant (Equipped Random)" + name = "UACM Platoon Sergeant (Equipped Random)" /datum/equipment_preset/uscm/leader_equipped/random/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY) @@ -748,7 +748,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm/smartgunner_equipped - name = "USCM Squad Smartgunner (Equipped)" + name = "UACM Squad Smartgunner (Equipped)" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_SMARTPREP) @@ -780,7 +780,7 @@ new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo(new_human), WEAR_L_EAR) /datum/equipment_preset/uscm/smartgunner_equipped/random - name = "USCM Squad Smartgunner (Equipped Random)" + name = "UACM Squad Smartgunner (Equipped Random)" /datum/equipment_preset/uscm/smartgunner_equipped/random/spawn_marine_fluff_items(mob/living/carbon/human/new_human) var/obj/item/helmet_accessory = pick(GLOB.allowed_helmet_items) @@ -835,7 +835,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm/engineer_equipped - name = "USCM Squad Combat Technician (Equipped)" + name = "UACM Squad Combat Technician (Equipped)" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_ENGPREP, ACCESS_CIVILIAN_ENGINEERING) @@ -875,13 +875,13 @@ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1(new_human.back), WEAR_IN_BACK) /datum/equipment_preset/uscm/engineer_equipped/cryo - name = "USCM Cryo Squad Combat Technician (Equipped)" + name = "UACM Cryo Squad Combat Technician (Equipped)" auto_squad_name = SQUAD_MARINE_CRYO //*****************************************************************************************************/ /datum/equipment_preset/uscm/medic_equipped - name = "USCM Squad Hospital Corpsman (Equipped)" + name = "UACM Squad Hospital Corpsman (Equipped)" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_MEDPREP, ACCESS_MARINE_MEDBAY) @@ -928,7 +928,7 @@ new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft(new_human), WEAR_IN_BACK) /datum/equipment_preset/uscm/medic_equipped/random - name = "USCM Squad Hospital Corpsman (Equipped Random)" + name = "UACM Squad Hospital Corpsman (Equipped Random)" /datum/equipment_preset/uscm/medic_equipped/random/spawn_marine_fluff_items(mob/living/carbon/human/new_human) var/obj/item/helmet_accessory = pick(GLOB.allowed_helmet_items) @@ -972,7 +972,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm/specialist_equipped - name = "USCM Squad Weapons Specialist (Equipped)" + name = "UACM Squad Weapons Specialist (Equipped)" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_SPECPREP) @@ -1010,13 +1010,13 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_BACK) /datum/equipment_preset/uscm/specialist_equipped/cryo - name = "USCM Cryo Squad Weapons Specialist (Equipped)" + name = "UACM Cryo Squad Weapons Specialist (Equipped)" auto_squad_name = SQUAD_MARINE_CRYO //*****************************************************************************************************/ /datum/equipment_preset/uscm/specialist_equipped/sniper - name = "USCM Sniper Specialist (Equipped)" + name = "UACM Sniper Specialist (Equipped)" /datum/equipment_preset/uscm/specialist_equipped/sniper/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels @@ -1042,7 +1042,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm/tl_equipped - name = "USCM Squad Sergeant (Equipped)" + name = "UACM Squad Sergeant (Equipped)" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE access = list(ACCESS_MARINE_PREP, ACCESS_MARINE_TL_PREP) @@ -1076,7 +1076,7 @@ new_human.back.pickup(new_human) /datum/equipment_preset/uscm/tl_equipped/random - name = "USCM Squad Sergeant (Equipped Random)" + name = "UACM Squad Sergeant (Equipped Random)" /datum/equipment_preset/uscm/tl_equipped/random/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel/rto(new_human), WEAR_BACK) diff --git a/code/modules/gear_presets/uscm_event.dm b/code/modules/gear_presets/uscm_event.dm index 5f7c40c016..5c70ca77bb 100644 --- a/code/modules/gear_presets/uscm_event.dm +++ b/code/modules/gear_presets/uscm_event.dm @@ -1,5 +1,5 @@ /datum/equipment_preset/uscm_event - name = "USCM (Event Roles)" + name = "UACM (Event Roles)" faction = FACTION_MARINE faction_group = FACTION_LIST_MARINE minimum_age = 30 @@ -9,7 +9,7 @@ /*****************************************************************************************************/ /datum/equipment_preset/uscm_event/colonel - name = "USCM O-6 - Colonel (High Command)" + name = "UACM O-6 - Colonel (High Command)" flags = EQUIPMENT_PRESET_EXTRA idtype = /obj/item/card/id/general @@ -54,7 +54,7 @@ new_human.equip_to_slot_or_del(new /obj/item/device/flash, WEAR_IN_JACKET) /datum/equipment_preset/uscm_event/general - name = "USCM O-7 - Brigadier General (High Command)" + name = "UACM O-7 - Brigadier General (High Command)" flags = EQUIPMENT_PRESET_EXTRA idtype = /obj/item/card/id/general @@ -101,30 +101,30 @@ new_human.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(new_human), WEAR_EYES) /datum/equipment_preset/uscm_event/general/o7 - name = "USCM O-7 - Brigadier General (High Command)" + name = "UACM O-7 - Brigadier General (High Command)" paygrade = "MO7" /datum/equipment_preset/uscm_event/general/o8 - name = "USCM O-8 - Major General (High Command)" + name = "UACM O-8 - Major General (High Command)" paygrade = "MO8" /datum/equipment_preset/uscm_event/general/o9 - name = "USCM O-9 - Lieutenant General (High Command)" + name = "UACM O-9 - Lieutenant General (High Command)" paygrade = "MO9" /datum/equipment_preset/uscm_event/general/o10 - name = "USCM O-10 - General (High Command)" + name = "UACM O-10 - General (High Command)" paygrade = "MO10" /datum/equipment_preset/uscm_event/general/o10c - name = "USCM O-10C - Assistant Commandant of the Marine Corps (High Command)" + name = "UACM O-10C - Assistant Commandant of the Marine Corps (High Command)" paygrade = "MO10C" assignment = JOB_ACMC rank = JOB_ACMC role_comm_title = "ACMC" /datum/equipment_preset/uscm_event/general/o10s - name = "USCM O-10S - Commandant of the Marine Corps (High Command)" + name = "UACM O-10S - Commandant of the Marine Corps (High Command)" paygrade = "MO10S" assignment = JOB_CMC rank = JOB_CMC @@ -182,7 +182,7 @@ /*****************************************************************************************************/ /datum/equipment_preset/uscm_event/provost - name = "USCM Provost" + name = "UACM Provost" idtype = /obj/item/card/id/provost skills = /datum/skills/provost diff --git a/code/modules/gear_presets/uscm_medical.dm b/code/modules/gear_presets/uscm_medical.dm index 54f2c71317..f9ebbe3ba6 100644 --- a/code/modules/gear_presets/uscm_medical.dm +++ b/code/modules/gear_presets/uscm_medical.dm @@ -21,7 +21,7 @@ dress_shoes = list(/obj/item/clothing/shoes/laceup) /datum/equipment_preset/uscm_ship/uscm_medical/cmo - name = "USCM Chief Medical Officer (CMO)" + name = "UACM Chief Medical Officer (CMO)" idtype = /obj/item/card/id/silver access = list( @@ -76,7 +76,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/uscm_medical/doctor - name = "USCM Surgeon" + name = "UACM Surgeon" assignment = JOB_DOCTOR rank = JOB_DOCTOR @@ -113,7 +113,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/uscm_medical/nurse - name = "USCM Nurse" + name = "UACM Nurse" assignment = JOB_NURSE rank = JOB_NURSE @@ -148,7 +148,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/uscm_medical/researcher - name = "USCM Researcher" + name = "UACM Researcher" access = list(ACCESS_MARINE_MEDBAY, ACCESS_MARINE_RESEARCH, ACCESS_MARINE_CHEMISTRY, ACCESS_MARINE_MORGUE) assignment = JOB_RESEARCHER diff --git a/code/modules/gear_presets/uscm_police.dm b/code/modules/gear_presets/uscm_police.dm index 108aca26d9..30ec0446d2 100644 --- a/code/modules/gear_presets/uscm_police.dm +++ b/code/modules/gear_presets/uscm_police.dm @@ -1,12 +1,12 @@ /datum/equipment_preset/uscm_ship/uscm_police - name = "USCM (police roles)" + name = "UACM (police roles)" faction = FACTION_MARINE minimum_age = 22 //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/uscm_police/mp - name = "USCM Military Police (MP)" + name = "UACM Military Police (MP)" flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE idtype = /obj/item/card/id/dogtag access = list( @@ -67,7 +67,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/uscm_police/warden - name = "USCM Military Warden (MW)" + name = "UACM Military Warden (MW)" flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE idtype = /obj/item/card/id/dogtag @@ -124,7 +124,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/uscm_police/cmp - name = "USCM Chief MP (CMP)" + name = "UACM Chief MP (CMP)" flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE idtype = /obj/item/card/id/silver @@ -186,7 +186,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/uscm_police/riot_mp - name = "USCM Riot MP (RMP)" + name = "UACM Riot MP (RMP)" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE idtype = /obj/item/card/id/silver @@ -236,7 +236,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/uscm_police/riot_mp/riot_cmp - name = "USCM Riot Chief MP (RCMP)" + name = "UACM Riot Chief MP (RCMP)" flags = EQUIPMENT_PRESET_EXTRA assignment = JOB_RIOT_CHIEF diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm index 905fa8265b..6ec8ffcb05 100644 --- a/code/modules/gear_presets/uscm_ship.dm +++ b/code/modules/gear_presets/uscm_ship.dm @@ -1,5 +1,5 @@ /datum/equipment_preset/uscm_ship - name = "USCM (ship roles)" + name = "UACM (ship roles)" faction = FACTION_MARINE faction_group = FACTION_LIST_MARINE minimum_age = 20 @@ -51,7 +51,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/liaison - name = "USCM Corporate Liaison (CL)" + name = "UACM Corporate Liaison (CL)" flags = EQUIPMENT_PRESET_START_OF_ROUND idtype = /obj/item/card/id/silver/cl @@ -168,7 +168,7 @@ new_human.equip_to_slot_or_del(new /obj/item/notepad(new_human), WEAR_IN_BACK) /datum/equipment_preset/uscm_ship/reporter_uscm - name = "Combat Correspondent (USCM)" + name = "Combat Correspondent (UACM)" flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE access = list( ACCESS_MARINE_COMMAND, @@ -212,7 +212,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/chief_engineer - name = "USCM Chief Engineer (CE)" + name = "UACM Chief Engineer (CE)" flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE idtype = /obj/item/card/id/silver @@ -255,7 +255,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/maint - name = "USCM Maintenance Technician (MT)" + name = "UACM Maintenance Technician (MT)" flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE access = list( @@ -299,7 +299,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/ordn - name = "USCM Ordnance Technician (OT)" + name = "UACM Ordnance Technician (OT)" flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE access = list( @@ -336,7 +336,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/qm - name = "USCM Quartermaster (QM)" + name = "UACM Quartermaster (QM)" flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE idtype = /obj/item/card/id/silver @@ -379,7 +379,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/cargo - name = "USCM Cargo Technician (CT)" + name = "UACM Cargo Technician (CT)" flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE access = list(ACCESS_MARINE_CARGO, ACCESS_MARINE_PREP) @@ -416,7 +416,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/commander - name = "USCM Commanding Officer (CO)" + name = "UACM Commanding Officer (CO)" flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE idtype = /obj/item/card/id/gold @@ -490,7 +490,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/commander/council - name = "USCM Commanding Officer (CO+)" + name = "UACM Commanding Officer (CO+)" flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE idtype = /obj/item/card/id/gold/council @@ -512,7 +512,7 @@ . = ..() /datum/equipment_preset/uscm_ship/commander/council/plus - name = "USCM Commanding Officer (CO++)" + name = "UACM Commanding Officer (CO++)" idtype = /obj/item/card/id/general paygrade = "MO6" @@ -523,7 +523,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/xo - name = "USCM Executive Officer (XO)" + name = "UACM Executive Officer (XO)" flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE idtype = /obj/item/card/id/silver @@ -561,7 +561,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/so - name = "USCM Platoon Commander (PltCo)" + name = "UACM Platoon Commander (PltCo)" flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE idtype = /obj/item/card/id/silver @@ -630,7 +630,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/sea - name = "USCM Senior Enlisted Advisor (SEA)" + name = "UACM Senior Enlisted Advisor (SEA)" flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE idtype = /obj/item/card/id/silver @@ -675,7 +675,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/auxiliary_officer - name = "USCM Auxiliary Support Officer (ASO)" + name = "UACM Auxiliary Support Officer (ASO)" flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE idtype = /obj/item/card/id/silver @@ -733,7 +733,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/po - name = "USCM Pilot (DP) (Cryo)" + name = "UACM Pilot (DP) (Cryo)" flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE idtype = /obj/item/card/id/silver @@ -759,7 +759,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/po/full - name = "USCM Pilot Officer (PO)" + name = "UACM Pilot Officer (PO)" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE utility_under = list(/obj/item/clothing/under/marine/officer/pilot) @@ -783,7 +783,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/po/recon - name = "USCM Reconnaissance Pilot" + name = "UACM Reconnaissance Pilot" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE assignment = "Reconnaissance Pilot" @@ -826,7 +826,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/dcc - name = "USCM Dropship Crew Chief (DCC) (Cryo)" + name = "UACM Dropship Crew Chief (DCC) (Cryo)" flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE idtype = /obj/item/card/id/silver @@ -852,7 +852,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/dcc/full - name = "USCM Dropship Crew Chief (DCC)" + name = "UACM Dropship Crew Chief (DCC)" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE utility_under = list(/obj/item/clothing/under/marine/officer/pilot/dcc) @@ -876,13 +876,13 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/officer - name = "USCM Officer (USCM Command)" + name = "UACM Officer (UACM Command)" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE idtype = /obj/item/card/id/general access = list(ACCESS_MARINE_MEDBAY, ACCESS_MARINE_CHEMISTRY, ACCESS_MARINE_MORGUE) - assignment = "USCM Officer" - rank = "USCM Officer" + assignment = "UACM Officer" + rank = "UACM Officer" paygrade = "MO3" role_comm_title = "Cpt" minimum_age = 40 @@ -917,7 +917,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/chef - name = "USCM Mess Technician (MST)" + name = "UACM Mess Technician (MST)" flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE access = list(ACCESS_MARINE_KITCHEN) diff --git a/code/modules/holidays/thanskgiving/decorators.dm b/code/modules/holidays/thanskgiving/decorators.dm index d539be2299..143fd328e3 100644 --- a/code/modules/holidays/thanskgiving/decorators.dm +++ b/code/modules/holidays/thanskgiving/decorators.dm @@ -11,11 +11,11 @@ for(var/obj/structure/machinery/cm_vending/sorted/marine_food/cycled_food_vendor in world) cycled_food_vendor.listed_products = list( list("PREPARED MEALS", -1, null, null), - list("USCM Prepared Meal (Turkey)", 15, /obj/item/reagent_container/food/snacks/mre_pack/thanksgiving, VENDOR_ITEM_REGULAR), - list("USCM Protein Bar", 50, /obj/item/reagent_container/food/snacks/protein_pack, VENDOR_ITEM_REGULAR), + list("UACM Prepared Meal (Turkey)", 15, /obj/item/reagent_container/food/snacks/mre_pack/thanksgiving, VENDOR_ITEM_REGULAR), + list("UACM Protein Bar", 50, /obj/item/reagent_container/food/snacks/protein_pack, VENDOR_ITEM_REGULAR), list("FLASKS", -1, null, null), list("Canteen", 10, /obj/item/reagent_container/food/drinks/flask/canteen, VENDOR_ITEM_REGULAR), list("Metal Flask", 10, /obj/item/reagent_container/food/drinks/flask, VENDOR_ITEM_REGULAR), - list("USCM Flask", 5, /obj/item/reagent_container/food/drinks/flask/marine, VENDOR_ITEM_REGULAR), + list("UACM Flask", 5, /obj/item/reagent_container/food/drinks/flask/marine, VENDOR_ITEM_REGULAR), list("W-Y Flask", 5, /obj/item/reagent_container/food/drinks/flask/weylandyutani, VENDOR_ITEM_REGULAR) ) diff --git a/code/modules/law/laws/major_crime.dm b/code/modules/law/laws/major_crime.dm index 58b30dfd6c..40192aa2f5 100644 --- a/code/modules/law/laws/major_crime.dm +++ b/code/modules/law/laws/major_crime.dm @@ -40,7 +40,7 @@ /datum/law/major_law/subterfuge name = "Subterfuge" - desc = "Carrying out objectives or being tied to material that describe planned actions that go against the USCM. Strong proof is required that the individual is working against USCM." + desc = "Carrying out objectives or being tied to material that describe planned actions that go against the UACM. Strong proof is required that the individual is working against UACM." special_punishment = "Termination of ID/Discharge to planet" brig_time = 15 diff --git a/code/modules/law/laws/precautionary_charge.dm b/code/modules/law/laws/precautionary_charge.dm index c06cd6ca52..a9348e107b 100644 --- a/code/modules/law/laws/precautionary_charge.dm +++ b/code/modules/law/laws/precautionary_charge.dm @@ -6,7 +6,7 @@ /datum/law/precautionary_charge/discretionary_arrest name = "Discretionary Detainment" desc = "A discretionary charge used by Commanding Officers to detain personnel for any reason, for the safety and benefit of the operation or security. The duration of this charge is variable and may be pardoned/lifted at any time by the Commanding Officer." - special_punishment = "Not inclusive for execution criteria. May only be appealed to the Acting Commander or Provost/USCM HC." + special_punishment = "Not inclusive for execution criteria. May only be appealed to the Acting Commander or Provost/UACM HC." /datum/law/precautionary_charge/insanity name = "Insanity" @@ -14,5 +14,5 @@ /datum/law/precautionary_charge/prisoner_of_war name = "Prisoner of War" - desc = "Being a member of a legitimate and recognised faction currently hostile to the USCM." + desc = "Being a member of a legitimate and recognised faction currently hostile to the UACM." special_punishment = "Execution is forbidden barring exceptional circumstances." diff --git a/code/modules/maptext_alerts/text_blurbs.dm b/code/modules/maptext_alerts/text_blurbs.dm index d34a4ef19a..0e77bb3bf5 100644 --- a/code/modules/maptext_alerts/text_blurbs.dm +++ b/code/modules/maptext_alerts/text_blurbs.dm @@ -64,7 +64,7 @@ base = the base the marines are staging from. The ship, Whiskey Outpost etc. Non mobarray["misc"] += H for(var/L in mobarray) - show_blurb(mobarray[L], 3 SECONDS, "[base_text][post_text[L]]", TRUE, blurb_key = "USCM") + show_blurb(mobarray[L], 3 SECONDS, "[base_text][post_text[L]]", TRUE, blurb_key = "UACM") /**Shows a ticker reading out the given text on a client's screen. targets = mob or list of mobs to show it to. @@ -87,8 +87,8 @@ text_color = color of the text. blurb_key = a key used for specific blurb types so they are not shown repeatedly. Ex. someone who joins as CLF repeatedly only seeing the mission blurb the first time. -ignore_key = used to skip key checks. Ex. a USCM ERT member shouldn't see the normal USCM drop message, -but should see their own spawn message even if the player already dropped as USCM.**/ +ignore_key = used to skip key checks. Ex. a UACM ERT member shouldn't see the normal UACM drop message, +but should see their own spawn message even if the player already dropped as UACM.**/ /proc/show_blurb(list/mob/targets, duration = 3 SECONDS, message, scroll_down, screen_position = "LEFT+0:16,BOTTOM+1:16",\ text_alignment = "left", text_color = "#FFFFFF", blurb_key, ignore_key = FALSE, speed = 1) set waitfor = 0 diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index cf225caadc..53a361cb81 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -879,7 +879,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp GLOB.hive_datum[hives[faction]].hive_ui.open_hive_status(src) /mob/dead/observer/verb/view_uscm_tacmap() - set name = "View USCM Tacmap" + set name = "View UACM Tacmap" set category = "Ghost.View" GLOB.uscm_tacmap_status.tgui_interact(src) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 3e98167488..6a30a9ab58 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -53,7 +53,7 @@ else output += "View the Crew Manifest
" output += "View Hive Leaders
" - output += "" + output += "" output += "" if(SSticker.mode.flags_round_type & MODE_PREDATOR) if(SSticker.mode.check_predator_late_join(src,0)) output += "" diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 751dbe5bf7..4eefd55709 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -501,8 +501,8 @@ info = "Welcome new owner!
You have purchased the latest in listening equipment. The telecommunication setup we created is the best in listening to common and private radio fequencies. Here is a step by step guide to start listening in on those saucy radio channels:
We regret to inform you that a communications mishap has resulted in your orbital bombardment warheads being recycled for spare metal! Worry not, the metal has been put to good use in High Command's chest freezer." + name = "UACM Recycling Efforts" + info = "Hello UACM Orbital Cannon System Owner!
We regret to inform you that a communications mishap has resulted in your orbital bombardment warheads being recycled for spare metal! Worry not, the metal has been put to good use in High Command's chest freezer." /obj/item/paper/flag name = "paper flag" @@ -556,7 +556,7 @@ info = "
We found him.
His location, anyway. Figures that he'd end up in the Fop, given our reputation.
As good an escape artist he is, he ain't getting out by himself. Too many security measures, and no way off without a ship. They're prepared for anything coming from inside.
They AREN'T prepared for a \"tramp freighter\" ramming straight through their hull.
Hang tight, Jack. We're coming for you." /obj/item/paper/prison_station/pirate_note/clfship - info = "
We're hit!
MAYDAY! MAYDAY! We have been hit by the -... .
We're on a planet somewhere, seems there is a colony to our south. Might head on over there and see if there is any USCM presence. Our ship is fucking busted beyond normal means of repair, still waiting for a damage assessment tho.
Coby and Ryan died today from their wounds... \"Fucking USCM.\" I'll have my revenge someday...
And the colonies will be freed one day from the oppressive regime of Wey-Yu and USCM henchmen." + info = "
We're hit!
MAYDAY! MAYDAY! We have been hit by the -... .
We're on a planet somewhere, seems there is a colony to our south. Might head on over there and see if there is any UACM presence. Our ship is fucking busted beyond normal means of repair, still waiting for a damage assessment tho.
Coby and Ryan died today from their wounds... \"Fucking UACM.\" I'll have my revenge someday...
And the colonies will be freed one day from the oppressive regime of Wey-Yu and UACM henchmen." /obj/item/paper/prison_station/nursery_rhyme info = "
Mary had a little lamb,
\nits fleece was white as snow;
\nAnd everywhere that Mary went,
\nthe lamb was sure to go.
It followed her to school one day,
\nwhich was against the rule;
\nIt made the children laugh and play,
\nto see a lamb at school.
And so the teacher turned it out,
\nbut still it lingered near,
\nAnd waited patiently about,
\ntill Mary did appear.
\"Why does the lamb love Mary so?\"
\nthe eager children cry;
\n\"Why, Mary loves the lamb, you know\",
\nthe teacher did reply."
@@ -608,7 +608,7 @@
. = ..()
var/datum/asset/asset = get_asset_datum(/datum/asset/simple/paper)
- info = "
["upplogo.png"]])
Union Of Progressive People's Fourth Fleet
No.52
Order of Military Officer of the UPP
Kolonel
Commander of MV-35
Date: 2182
The actions of the hostile Weyland-Yutani corporation on the fringes of the Neroid sector have grown increasingly intolerable. However, evidence suggesting they are researching into the creation and deployment of some form of biological weapons program represent an unacceptable risk to the security of UPP interests in this sector. The risk of these items falling into UA/USCM hands is unacceptable.
Orders for the Boris squad of the 173rd Airborne Recon are as follows. Initiate airborne reconnaissance of WY colony Oxley's Buttle, Trijent Dam, location on planet Raijin (UA Code: LV-670). Ascertain veracity of onsight biological weapons program. If positive confirmation of the weapons program is identified, authorization for rapid assault and recovery is granted. Avoid all contact with UA/USCM military forces, abort missions if UA/USCM forces are encountered.
Name and Rank: Kolonel
FOR SANCTIONED USE ONLY" + info = "
Union Of Progressive People's Fourth Fleet
No.52
Order of Military Officer of the UPP
Kolonel
Commander of MV-35
Date: 2182
The actions of the hostile Weyland-Yutani corporation on the fringes of the Neroid sector have grown increasingly intolerable. However, evidence suggesting they are researching into the creation and deployment of some form of biological weapons program represent an unacceptable risk to the security of UPP interests in this sector. The risk of these items falling into UA/UACM hands is unacceptable.
Orders for the Boris squad of the 173rd Airborne Recon are as follows. Initiate airborne reconnaissance of WY colony Oxley's Buttle, Trijent Dam, location on planet Raijin (UA Code: LV-670). Ascertain veracity of onsight biological weapons program. If positive confirmation of the weapons program is identified, authorization for rapid assault and recovery is granted. Avoid all contact with UA/UACM military forces, abort missions if UA/UACM forces are encountered.
Name and Rank: Kolonel
FOR SANCTIONED USE ONLY" /obj/item/paper/crumpled name = "paper scrap" @@ -872,7 +872,7 @@ /obj/item/paper/incident/Initialize() . = ..() var/template = {"\[center\]\[logo\]\[/center\] - \[center\]\[b\]\[i\]Encoded USCM Incident Report\[/b\]\[/i\]\[hr\] + \[center\]\[b\]\[i\]Encoded UACM Incident Report\[/b\]\[/i\]\[hr\] \[small\]FOR USE BY MP'S ONLY\[/small\]\[br\] \[barcode\]\[/center\]"} info = parsepencode(template, null, null, FALSE) @@ -911,7 +911,7 @@ icon = 'icons/obj/items/paper.dmi' icon_state = "paper_stack_words" name = "Colonial Space Grunts" - desc = "A tabletop game based around the USCM, easy to get into, simple to play, and most inportantly fun for the whole squad." + desc = "A tabletop game based around the UACM, easy to get into, simple to play, and most inportantly fun for the whole squad." /obj/item/paper/colonial_grunts/Initialize(mapload, ...) . = ..() diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index eafbb3c12c..6e915f1c62 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -17,8 +17,8 @@ sec_paper_type = "Company Document" /obj/item/paper_bin/uscm - sec_paper_type = "USCM Document" - paper_types = list("Carbon-Copy", "USCM Document") + sec_paper_type = "UACM Document" + paper_types = list("Carbon-Copy", "UACM Document") /obj/item/paper_bin/MouseDrop(atom/over_object) if(over_object == usr && ishuman(usr) && !usr.is_mob_restrained() && !usr.stat && (loc == usr || in_range(src, usr))) @@ -30,7 +30,7 @@ var/response = "" if(!papers.len > 0) response = alert(user, "What kind of paper?", "Paper type request", "Regular", sec_paper_type, "Cancel") - if (response != "Regular" && response != "Carbon-Copy" && response != "Company Document" && response != "USCM Document") + if (response != "Regular" && response != "Carbon-Copy" && response != "Company Document" && response != "UACM Document") add_fingerprint(user) return if(amount >= 1) @@ -49,7 +49,7 @@ P = new /obj/item/paper/carbon else if (response == "Company Document") P = new /obj/item/paper/wy - else if (response == "USCM Document") + else if (response == "UACM Document") P = new /obj/item/paper/uscm @@ -93,6 +93,6 @@ set src in view(1) var/response = "" response = alert(usr, "What kind of paper?", "Paper type request", paper_types[1], paper_types[2], "Cancel") - if (response != "Carbon-Copy" && response != "Company Document" && response != "USCM Document") + if (response != "Carbon-Copy" && response != "Company Document" && response != "UACM Document") return sec_paper_type = response diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index 0b14f1db09..230b529598 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -328,7 +328,7 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/bayonet/co2 name = "\improper M8 cartridge bayonet" - desc = "A back issue USCM approved exclusive for Boots subscribers found in issue #255 'Inside the Night Raider - morale breaking alternatives with 2nd LT. Juliane Gerd'. A pressurized tube runs along the inside of the blade, and a button allows one to inject compressed CO2 into the stab wound. It feels cheap to the touch. Faulty even." + desc = "A back issue UACM approved exclusive for Boots subscribers found in issue #255 'Inside the Night Raider - morale breaking alternatives with 2nd LT. Juliane Gerd'. A pressurized tube runs along the inside of the blade, and a button allows one to inject compressed CO2 into the stab wound. It feels cheap to the touch. Faulty even." icon_state = "co2_knife" attach_icon = "co2_bayonet_a" var/filled = FALSE @@ -831,7 +831,7 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/magnetic_harness name = "magnetic harness" - desc = "A magnetically attached harness kit that attaches to the rail mount of a weapon. When dropped, the weapon will sling to any set of USCM armor." + desc = "A magnetically attached harness kit that attaches to the rail mount of a weapon. When dropped, the weapon will sling to any set of UACM armor." icon = 'icons/obj/items/weapons/guns/attachments/rail.dmi' icon_state = "magnetic" attach_icon = "magnetic_a" @@ -1916,7 +1916,7 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/stock/rifle name = "\improper M41A solid stock" - desc = "A rare stock distributed in small numbers to USCM forces. Compatible with the M41A, this stock reduces recoil and improves accuracy, but at a reduction to handling and agility. Also enhances the thwacking of things with the stock-end of the rifle." + desc = "A rare stock distributed in small numbers to UACM forces. Compatible with the M41A, this stock reduces recoil and improves accuracy, but at a reduction to handling and agility. Also enhances the thwacking of things with the stock-end of the rifle." slot = "stock" melee_mod = 10 size_mod = 1 @@ -2317,7 +2317,7 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/stock/smg name = "submachinegun stock" - desc = "A rare ARMAT stock distributed in small numbers to USCM forces. Compatible with the M39, this stock reduces recoil and improves accuracy, but at a reduction to handling and agility. Seemingly a bit more effective in a brawl" + desc = "A rare ARMAT stock distributed in small numbers to UACM forces. Compatible with the M39, this stock reduces recoil and improves accuracy, but at a reduction to handling and agility. Seemingly a bit more effective in a brawl" slot = "stock" melee_mod = 15 size_mod = 1 @@ -2340,7 +2340,7 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/stock/smg/collapsible name = "submachinegun folding stock" - desc = "A Kirchner brand K2 M39 folding stock, standard issue in the USCM. The stock, when extended, reduces recoil and improves accuracy, but at a reduction to handling and agility. Seemingly a bit more effective in a brawl. This stock can collapse in, removing all positive and negative effects." + desc = "A Kirchner brand K2 M39 folding stock, standard issue in the UACM. The stock, when extended, reduces recoil and improves accuracy, but at a reduction to handling and agility. Seemingly a bit more effective in a brawl. This stock can collapse in, removing all positive and negative effects." slot = "stock" melee_mod = 10 size_mod = 1 diff --git a/code/modules/projectiles/guns/boltaction.dm b/code/modules/projectiles/guns/boltaction.dm index c97d0f82f9..f79171a4b1 100644 --- a/code/modules/projectiles/guns/boltaction.dm +++ b/code/modules/projectiles/guns/boltaction.dm @@ -123,7 +123,7 @@ desc_lore = {" Put into production in 2175 as an economical answer to rising militancy in the Outer Rim, the M707 was derived from jury-rigged anti-materiel rifles that were captured during the Linna 349 campaign. - The rebels (colloquially known among the USCMC as bug-boys and beebops) had achieved extensive success at Neusheune using the aforementioned rifles to pick off incinerator-wielding marines by detonating their napthal fuel tank in the midst of squad formations, subsequently leading to the USCMC designating users of those rifles as high-priority targets, as well as changes in USCMC patrol tactics. + The rebels (colloquially known among the UACM as bug-boys and beebops) had achieved extensive success at Neusheune using the aforementioned rifles to pick off incinerator-wielding marines by detonating their napthal fuel tank in the midst of squad formations, subsequently leading to the UACM designating users of those rifles as high-priority targets, as well as changes in UACM patrol tactics. Some of the failings and quirks of the beebops' jury-rigged rifle were quickly noticed by vehicle crews early on in the campaign, as in multiple memoirs the crews mention that: "Once the rain starts, that's when you know you've got an ambush." diff --git a/code/modules/projectiles/guns/misc.dm b/code/modules/projectiles/guns/misc.dm index c65d422344..bde77e374d 100644 --- a/code/modules/projectiles/guns/misc.dm +++ b/code/modules/projectiles/guns/misc.dm @@ -276,7 +276,7 @@ /obj/item/weapon/gun/pkp/iff name = "\improper QYJ-72-I General Purpose Machine Gun" - desc = "The QYJ-72-I is an experimental variant of common UPP GPMG featuring IFF capabilities which were developed by reverse-engineering USCM smartweapons. Aside from that, not much has been done to this machinegun: it's still heavy, overheats rather quickly and is able to lay down range unprecedented amounts of lead. \nAlt-click it to open the feed cover and allow for reloading." + desc = "The QYJ-72-I is an experimental variant of common UPP GPMG featuring IFF capabilities which were developed by reverse-engineering UACM smartweapons. Aside from that, not much has been done to this machinegun: it's still heavy, overheats rather quickly and is able to lay down range unprecedented amounts of lead. \nAlt-click it to open the feed cover and allow for reloading." actions_types = list(/datum/action/item_action/toggle_iff_pkp) aim_slowdown = SLOWDOWN_ADS_SPECIALIST var/iff_enabled = TRUE diff --git a/code/modules/projectiles/guns/pistols.dm b/code/modules/projectiles/guns/pistols.dm index ae8bef53f6..1a82c7a0cd 100644 --- a/code/modules/projectiles/guns/pistols.dm +++ b/code/modules/projectiles/guns/pistols.dm @@ -108,7 +108,7 @@ /obj/item/weapon/gun/pistol/m1911 name = "\improper M1911 service pistol" - desc = "A timeless classic since the first World War. Once standard issue for the USCM, now back order only. Chambered in .45 ACP. Unfortunately, due to the progression of IFF technology, M1911 .45 ACP is NOT compatible with the SU-6." + desc = "A timeless classic since the first World War. Once standard issue for the UACM, now back order only. Chambered in .45 ACP. Unfortunately, due to the progression of IFF technology, M1911 .45 ACP is NOT compatible with the SU-6." icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi' icon_state = "m4a345" item_state = "m4a3" @@ -133,7 +133,7 @@ /obj/item/weapon/gun/pistol/m1911/socom name = "\improper M48A4 service pistol" - desc = "A timeless classic since the first World War, the M1911A1 has limited use with the USCM, and is often used as a sidearm by non-governmental bodies due to its reliability. This is a modernized version with an ammo counter and a polymer grip, designated M48A4. Chambered in .45 ACP." + desc = "A timeless classic since the first World War, the M1911A1 has limited use with the UACM, and is often used as a sidearm by non-governmental bodies due to its reliability. This is a modernized version with an ammo counter and a polymer grip, designated M48A4. Chambered in .45 ACP." icon_state = "m4a345_s" item_state = "m4a3" flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_ONE_HAND_WIELDED|GUN_AMMO_COUNTER @@ -488,11 +488,11 @@ //------------------------------------------------------- //.45 MARSHALS PISTOL //Inspired by the Browning Hipower // rebalanced - singlefire, very strong bullets but slow to fire and heavy recoil -// redesigned - now rejected USCM sidearm model, utilized by Colonial Marshals and other stray groups. +// redesigned - now rejected UACM sidearm model, utilized by Colonial Marshals and other stray groups. /obj/item/weapon/gun/pistol/highpower name = "\improper MK-45 'High-Power' Automagnum" - desc = "Originally designed as a replacement for the USCM's M44 combat revolver, it was rejected at the last minute by a committee, citing its need to be cocked after every loaded magazine to be too cumbersone and antiquated. The design has recently been purchased by the Henjin-Garcia company, refitted for .45 ACP, and sold to the Colonial Marshals and other various unscrupulous armed groups." + desc = "Originally designed as a replacement for the UACM's M44 combat revolver, it was rejected at the last minute by a committee, citing its need to be cocked after every loaded magazine to be too cumbersone and antiquated. The design has recently been purchased by the Henjin-Garcia company, refitted for .45 ACP, and sold to the Colonial Marshals and other various unscrupulous armed groups." icon = 'icons/obj/items/weapons/guns/guns_by_faction/colony.dmi' icon_state = "highpower" item_state = "highpower" @@ -574,7 +574,7 @@ //unimplemented /obj/item/weapon/gun/pistol/highpower/tactical name = "\improper MK-44 SOCOM Automagnum" - desc = "Originally designed as a replacement for the USCM's M44 combat revolver, it was rejected at the last minute by a committee, citing its need to be cocked after every loaded magazine to be too cumbersone and antiquated. The design has recently been purchased by the Henjin-Garcia company and sold to the Colonial Marshals and other various unscrupulous armed groups. This one has a sleek, dark design." + desc = "Originally designed as a replacement for the UACM's M44 combat revolver, it was rejected at the last minute by a committee, citing its need to be cocked after every loaded magazine to be too cumbersone and antiquated. The design has recently been purchased by the Henjin-Garcia company and sold to the Colonial Marshals and other various unscrupulous armed groups. This one has a sleek, dark design." current_mag = /obj/item/ammo_magazine/pistol/highpower/black icon_state = "highpower_tac" item_state = "highpower_tac" @@ -586,7 +586,7 @@ /obj/item/weapon/gun/pistol/mod88 name = "\improper 88 Mod 4 combat pistol" - desc = "Standard issue USCM firearm. Also found in the hands of Weyland-Yutani PMC teams. Fires 9mm armor shredding rounds and is capable of 3-round burst." + desc = "Standard issue UACM firearm. Also found in the hands of Weyland-Yutani PMC teams. Fires 9mm armor shredding rounds and is capable of 3-round burst." icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi' icon_state = "88m4" item_state = "88m4" @@ -681,7 +681,7 @@ /obj/item/weapon/gun/pistol/vp78 name = "\improper VP78 pistol" - desc = "A massive, formidable semi-automatic handgun chambered in 9mm squash-head rounds. A common sight throughout both UA and 3WE space, often held by both Weyland-Yutani PMC units and corporate executives. This weapon is also undergoing limited field testing as part of the USCM's next generation pistol program. The slide is engraved with the Weyland-Yutani logo reminding you who's really in charge." + desc = "A massive, formidable semi-automatic handgun chambered in 9mm squash-head rounds. A common sight throughout both UA and 3WE space, often held by both Weyland-Yutani PMC units and corporate executives. This weapon is also undergoing limited field testing as part of the UACM's next generation pistol program. The slide is engraved with the Weyland-Yutani logo reminding you who's really in charge." icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi' icon_state = "vp78" item_state = "vp78" diff --git a/code/modules/projectiles/guns/revolvers.dm b/code/modules/projectiles/guns/revolvers.dm index 76e3e07106..e204155df8 100644 --- a/code/modules/projectiles/guns/revolvers.dm +++ b/code/modules/projectiles/guns/revolvers.dm @@ -289,7 +289,7 @@ /obj/item/weapon/gun/revolver/m44 name = "\improper M44 revolver" - desc = ".44 Magnum revolver, in limited service with the USCMC for personal defense against larger xenofauna. For best results, aim carefully." + desc = ".44 Magnum revolver, in limited service with the UACM for personal defense against larger xenofauna. For best results, aim carefully." icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi' icon_state = "m44r" item_state = "m44r" @@ -667,7 +667,7 @@ /obj/item/weapon/gun/revolver/mateba/cmateba name = "\improper Mateba autorevolver custom" - desc = "The .454 Mateba 6 Unica autorevolver is a semi-automatic handcannon that uses its own recoil to rotate the cylinders. Extremely rare, prohibitively costly, and unyieldingly powerful, it's found in the hands of a select few high-ranking USCM officials. Stylish, sophisticated, and above all, extremely deadly." + desc = "The .454 Mateba 6 Unica autorevolver is a semi-automatic handcannon that uses its own recoil to rotate the cylinders. Extremely rare, prohibitively costly, and unyieldingly powerful, it's found in the hands of a select few high-ranking UACM officials. Stylish, sophisticated, and above all, extremely deadly." icon_state = "cmateba" item_state = "cmateba" current_mag = /obj/item/ammo_magazine/internal/revolver/mateba/impact diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm index 48918ef2ee..d01059c3d6 100644 --- a/code/modules/projectiles/guns/rifles.dm +++ b/code/modules/projectiles/guns/rifles.dm @@ -286,7 +286,7 @@ /obj/item/weapon/gun/rifle/m41a/elite/xm40 name = "\improper XM40 pulse rifle" - desc = "One of the experimental predecessors to the M41 line that never saw widespread adoption beyond elite marine units. Of the rifles in the USCM inventory that are still in production, this is the only one to feature an integrated suppressor. It can accept M41A MK2 magazines, but also features its own proprietary magazine system. Extremely lethal in burstfire mode." + desc = "One of the experimental predecessors to the M41 line that never saw widespread adoption beyond elite marine units. Of the rifles in the UACM inventory that are still in production, this is the only one to feature an integrated suppressor. It can accept M41A MK2 magazines, but also features its own proprietary magazine system. Extremely lethal in burstfire mode." icon_state = "m40sd" item_state = "m40sd" reload_sound = 'sound/weapons/handling/m40sd_reload.ogg' @@ -364,7 +364,7 @@ /obj/item/weapon/gun/rifle/m41aMK1 name = "\improper M41A pulse rifle" - desc = "Pulse action 10x24mm caseless assault rifle of the USCMC, personal friend of any Marine." + desc = "Pulse action 10x24mm caseless assault rifle of the UACM, personal friend of any Marine." icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi' icon_state = "m41amk1" //Placeholder. item_state = "m41amk1" //Placeholder. @@ -427,7 +427,7 @@ starting_attachment_types = list(/obj/item/attachable/stock/rifle/collapsible, /obj/item/attachable/attached_gun/grenade/mk1) /obj/item/weapon/gun/rifle/m41aMK1/forecon - desc = "Pulse action 10x24mm caseless assault rifle of the USCMC, personal friend of any Marine. This one is painted in a fresh coat of the newer Humbrol 76 camouflage and is used by Force Reconnaissance units." + desc = "Pulse action 10x24mm caseless assault rifle of the UACM, personal friend of any Marine. This one is painted in a fresh coat of the newer Humbrol 76 camouflage and is used by Force Reconnaissance units." icon_state = "reconm41amk1" item_state = "reconm41amk1" current_mag = /obj/item/ammo_magazine/rifle/m41aMK1/recon @@ -1545,11 +1545,11 @@ //------------------------------------------------------- -//M4RA Battle Rifle, standard USCM DMR +//M4RA Battle Rifle, standard UACM DMR /obj/item/weapon/gun/rifle/m4ra name = "\improper M4RA battle rifle" - desc = "The M4RA battle rifle is a designated marksman rifle in service with the USCM. Sporting a bullpup configuration, the M4RA battle rifle is perfect for reconnaissance and fire support teams.\nTakes *only* non-high-velocity M4RA magazines." + desc = "The M4RA battle rifle is a designated marksman rifle in service with the UACM. Sporting a bullpup configuration, the M4RA battle rifle is perfect for reconnaissance and fire support teams.\nTakes *only* non-high-velocity M4RA magazines." icon_state = "m4ra" item_state = "m4ra" fire_sound = 'sound/weapons/gun_m4ra.ogg' @@ -1609,7 +1609,7 @@ /obj/item/weapon/gun/rifle/m4ra/pve name = "\improper M4RA-R2 battle rifle" desc = "The M4RA-R2 is a souped-up M4RA, the result of an ARMAT upgrade program that didn't pan out in huge numbers. Its main attraction is the ability to chamber and fire devastating A19 depleted uranium rounds, infamous for their overpenetration abilities and toxic effects on anyone unfortunate enough to survive a hit. The thicker barrel, of course, also has no issue with non-HV ammo." - desc_lore = "The USCMC was not terribly enthusiastic about unproven hand-held plasma weaponry. Before the XM99A was eventually adopted into use, the USCMC instead sought out a traditional squad-portable, precision, armor-piercing weapon, and contracted ARMAT to upgrade their M4RA platform to be capable of firing advanced AP rounds. They succeeded- sort of.
The R2 was rejected for several reasons. It's a killer, but also a piece of junk. It kicks hard enough that precision sights simply don't stay zeroed, and its oversized muzzle-device extends an already long barrel-length. Additionally, A19 ammo, already expensive, was driven to absurd highs by the ammunition's specs. Depleted uranium is expensive...and cutting the service life of the M4RA's barrel in half is even more expensive.
Those that were made, however, are still service-ready and were issued where the XM99A was unavailable due to its production only just starting." + desc_lore = "The UACM was not terribly enthusiastic about unproven hand-held plasma weaponry. Before the XM99A was eventually adopted into use, the UACM instead sought out a traditional squad-portable, precision, armor-piercing weapon, and contracted ARMAT to upgrade their M4RA platform to be capable of firing advanced AP rounds. They succeeded- sort of.
The R2 was rejected for several reasons. It's a killer, but also a piece of junk. It kicks hard enough that precision sights simply don't stay zeroed, and its oversized muzzle-device extends an already long barrel-length. Additionally, A19 ammo, already expensive, was driven to absurd highs by the ammunition's specs. Depleted uranium is expensive...and cutting the service life of the M4RA's barrel in half is even more expensive.
Those that were made, however, are still service-ready and were issued where the XM99A was unavailable due to its production only just starting." icon = 'icons/obj/items/weapons/guns/guns_by_map/urban/guns_obj.dmi' icon_state = "m4ra" item_state = "m4ra" @@ -1672,7 +1672,7 @@ /obj/item/weapon/gun/rifle/l42a name = "\improper L42A battle rifle" - desc = "The L42A Battle Rifle, found commonly around the frontiers of the Galaxy. It's commonly used by colonists for self defense, as well as many colonial militias, whomever they serve due to it's rugged reliability and ease of use without much training. This rifle was put up for adoption by the USCM and tested for a time, but ultimately lost to the M4RA already in service." + desc = "The L42A Battle Rifle, found commonly around the frontiers of the Galaxy. It's commonly used by colonists for self defense, as well as many colonial militias, whomever they serve due to it's rugged reliability and ease of use without much training. This rifle was put up for adoption by the UACM and tested for a time, but ultimately lost to the M4RA already in service." icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi' icon_state = "l42mk1" item_state = "l42mk1" diff --git a/code/modules/projectiles/guns/shotguns.dm b/code/modules/projectiles/guns/shotguns.dm index 9ea6624dc6..85b628c07b 100644 --- a/code/modules/projectiles/guns/shotguns.dm +++ b/code/modules/projectiles/guns/shotguns.dm @@ -318,10 +318,10 @@ can cause issues with ammo types getting mixed up during the burst. starting_attachment_types = list(/obj/item/attachable/magnetic_harness, /obj/item/attachable/extended_barrel) current_mag = /obj/item/ammo_magazine/internal/shotgun/buckshot -//SOF MK210, an earlier developmental variant of the MK211 tactical used by USCM SOF. +//SOF MK210, an earlier developmental variant of the MK211 tactical used by UACM SOF. /obj/item/weapon/gun/shotgun/combat/marsoc name = "\improper XM38 tactical shotgun" - desc = "Way back in 2168, Wey-Yu began testing the MK221. The USCM picked up an early prototype, and later adopted it with a limited military contract. But the USCM Special Operations Forces wasn't satisfied, and iterated on the early prototypes they had access to; eventually, their internal armorers and tinkerers produced the MK210, designated XM38, a lightweight folding shotgun that snaps to the belt. And to boot, it's fully automatic, made of stamped medal, and keeps the UGL. Truly an engineering marvel." + desc = "Way back in 2168, Wey-Yu began testing the MK221. The UACM picked up an early prototype, and later adopted it with a limited military contract. But the UACM Special Operations Forces wasn't satisfied, and iterated on the early prototypes they had access to; eventually, their internal armorers and tinkerers produced the MK210, designated XM38, a lightweight folding shotgun that snaps to the belt. And to boot, it's fully automatic, made of stamped medal, and keeps the UGL. Truly an engineering marvel." icon_state = "mk210" item_state = "mk210" @@ -1285,7 +1285,7 @@ can cause issues with ammo types getting mixed up during the burst. /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb/m3717 name = "\improper M37-17 pump shotgun" - desc = "A military version of the iconic HG 37-12, this design can fit one extra shell in each of its dual-tube internal magazines, and fires shells with increased velocity, resulting in more damage. Issued to select USCM vessels and stations in the outer veil. A button on the side toggles the internal tubes." + desc = "A military version of the iconic HG 37-12, this design can fit one extra shell in each of its dual-tube internal magazines, and fires shells with increased velocity, resulting in more damage. Issued to select UACM vessels and stations in the outer veil. A button on the side toggles the internal tubes." icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi' icon_state = "m3717" item_state = "m3717" diff --git a/code/modules/projectiles/guns/smartgun.dm b/code/modules/projectiles/guns/smartgun.dm index dca1410900..87ac8031cb 100644 --- a/code/modules/projectiles/guns/smartgun.dm +++ b/code/modules/projectiles/guns/smartgun.dm @@ -717,7 +717,7 @@ /obj/item/smartgun_battery name = "smartgun DV9 battery" - desc = "A standard-issue 9-volt lithium dry-cell battery, most commonly used within the USCMC to power smartguns. Per the manual, one battery is good for up to 50000 rounds and plugs directly into the smartgun's power receptacle, which is only compatible with this type of battery. Various auxiliary modes usually bring the round count far lower. While this cell is incompatible with most standard electrical system, it can be charged by common rechargers in a pinch. USCMC smartgunners often guard them jealously." + desc = "A standard-issue 9-volt lithium dry-cell battery, most commonly used within the UACM to power smartguns. Per the manual, one battery is good for up to 50000 rounds and plugs directly into the smartgun's power receptacle, which is only compatible with this type of battery. Various auxiliary modes usually bring the round count far lower. While this cell is incompatible with most standard electrical system, it can be charged by common rechargers in a pinch. UACM smartgunners often guard them jealously." icon = 'icons/obj/structures/machinery/power.dmi' icon_state = "smartguncell" diff --git a/code/modules/projectiles/guns/smgs.dm b/code/modules/projectiles/guns/smgs.dm index b5923a202e..a630e0fec0 100644 --- a/code/modules/projectiles/guns/smgs.dm +++ b/code/modules/projectiles/guns/smgs.dm @@ -40,7 +40,7 @@ /obj/item/weapon/gun/smg/m39 name = "\improper M39 submachinegun" - desc = "The Armat Battlefield Systems M-39 submachinegun. Occasionally carried by light-infantry, scouts, engineers and medics. A lightweight, lower caliber alternative to the various Pulse weapons used the USCM. Fires 10x20mm rounds out of 48 round magazines." + desc = "The Armat Battlefield Systems M-39 submachinegun. Occasionally carried by light-infantry, scouts, engineers and medics. A lightweight, lower caliber alternative to the various Pulse weapons used the UACM. Fires 10x20mm rounds out of 48 round magazines." icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi' icon_state = "m39" item_state = "m39" diff --git a/code/modules/projectiles/guns/specialist/launcher/rocket_launcher.dm b/code/modules/projectiles/guns/specialist/launcher/rocket_launcher.dm index 356d0e6c3b..f2769f701d 100644 --- a/code/modules/projectiles/guns/specialist/launcher/rocket_launcher.dm +++ b/code/modules/projectiles/guns/specialist/launcher/rocket_launcher.dm @@ -4,7 +4,7 @@ /obj/item/weapon/gun/launcher/rocket name = "\improper M5 RPG" - desc = "The M5 RPG is the primary anti-armor weapon of the USCM. Used to take out light-tanks and enemy structures, the M5 RPG is a dangerous weapon with a variety of combat uses." + desc = "The M5 RPG is the primary anti-armor weapon of the UACM. Used to take out light-tanks and enemy structures, the M5 RPG is a dangerous weapon with a variety of combat uses." icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi' icon_state = "m5" item_state = "m5" diff --git a/code/modules/projectiles/guns/specialist/scout.dm b/code/modules/projectiles/guns/specialist/scout.dm index c2c5abd54a..9e4652f186 100644 --- a/code/modules/projectiles/guns/specialist/scout.dm +++ b/code/modules/projectiles/guns/specialist/scout.dm @@ -2,7 +2,7 @@ /obj/item/weapon/gun/rifle/m4ra_custom name = "\improper M4RA custom battle rifle" - desc = "This is a further improvement upon the already rock-solid M4RA. Made by the USCM armorers on Chinook station - This variant of the M4RA has a specifically milled magazine well to accept A19 rounds. It sports a light-weight titantium-alloy frame, better responsive to the heavy kick of the tailor-made A19 rounds." + desc = "This is a further improvement upon the already rock-solid M4RA. Made by the UACM armorers on Chinook station - This variant of the M4RA has a specifically milled magazine well to accept A19 rounds. It sports a light-weight titantium-alloy frame, better responsive to the heavy kick of the tailor-made A19 rounds." icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi' icon_state = "m4ra_custom" item_state = "m4ra_custom" diff --git a/code/modules/projectiles/magazines/pistols.dm b/code/modules/projectiles/magazines/pistols.dm index 3ae221fd42..51fad13ca5 100644 --- a/code/modules/projectiles/magazines/pistols.dm +++ b/code/modules/projectiles/magazines/pistols.dm @@ -283,7 +283,7 @@ //------------------------------------------------------- //.45 MARSHALS PISTOL //Inspired by the Browning Hipower // rebalanced - singlefire, very strong bullets but slow to fire and heavy recoil -// redesigned - now rejected USCM sidearm model, utilized by Colonial Marshals and other stray groups. +// redesigned - now rejected UACM sidearm model, utilized by Colonial Marshals and other stray groups. /obj/item/ammo_magazine/pistol/highpower name = "\improper MK-45 Automagnum magazine (.45)" diff --git a/code/modules/projectiles/magazines/rifles.dm b/code/modules/projectiles/magazines/rifles.dm index 6721920583..d2767d5c66 100644 --- a/code/modules/projectiles/magazines/rifles.dm +++ b/code/modules/projectiles/magazines/rifles.dm @@ -316,7 +316,7 @@ /obj/item/ammo_magazine/rifle/lmg/heap name = "\improper M41AE2 HEAP ammo box (10x24mm)" - desc = "A semi-rectangular box of rounds for the M41AE2 Heavy Pulse Rifle. This one contains the standard Armor-Piercing explosive tipped round of the USCM." + desc = "A semi-rectangular box of rounds for the M41AE2 Heavy Pulse Rifle. This one contains the standard Armor-Piercing explosive tipped round of the UACM." default_ammo = /datum/ammo/bullet/rifle/heap max_rounds = 300 gun_type = /obj/item/weapon/gun/rifle/lmg diff --git a/code/modules/projectiles/magazines/shotguns.dm b/code/modules/projectiles/magazines/shotguns.dm index 3c26685a55..56fe0d3937 100644 --- a/code/modules/projectiles/magazines/shotguns.dm +++ b/code/modules/projectiles/magazines/shotguns.dm @@ -80,8 +80,8 @@ var/list/shotgun_boxes_12g = list( caliber = "20g" /obj/item/ammo_magazine/shotgun/buckshot/special - name = "box of buckshot shells, USCM special type" - desc = "A box filled with buckshot spread shotgun shells, USCM special type. 12 Gauge." + name = "box of buckshot shells, UACM special type" + desc = "A box filled with buckshot spread shotgun shells, UACM special type. 12 Gauge." icon_state = "special" default_ammo = /datum/ammo/bullet/shotgun/buckshot/special //------------------------------------------------------- @@ -205,7 +205,7 @@ var/list/shotgun_handfuls_12g = list( handful_state = "buckshot_shell" /obj/item/ammo_magazine/handful/shotgun/buckshot/special - name = "handful of shotgun buckshot shells, USCM special type (12g)" + name = "handful of shotgun buckshot shells, UACM special type (12g)" icon_state = "special_buck_5" default_ammo = /datum/ammo/bullet/shotgun/buckshot/special diff --git a/code/modules/tents/deployed_tents.dm b/code/modules/tents/deployed_tents.dm index 9ea06e357d..1c369a3e78 100644 --- a/code/modules/tents/deployed_tents.dm +++ b/code/modules/tents/deployed_tents.dm @@ -120,13 +120,13 @@ /obj/structure/tent/cmd icon_state = "cmd_interior" roof_state = "cmd_top" - desc = "A standard USCM Command Tent. This one comes equipped with a self-powered Overwatch Console and a Telephone. It is very frail, do not burn, expose to sharp objects, or explosives. Can be torn down with an entrenching tool." + desc = "A standard UACM Command Tent. This one comes equipped with a self-powered Overwatch Console and a Telephone. It is very frail, do not burn, expose to sharp objects, or explosives. Can be torn down with an entrenching tool." /// Medical tent, procures a buff to surgery speed /obj/structure/tent/med icon_state = "med_interior" roof_state = "med_top" - desc = "A standard USCM Medical Tent. This one comes equipped with advanced field surgery facilities. It is very fragile however and won't withstand the rigors of war. Can be torn down with an entrenching tool." + desc = "A standard UACM Medical Tent. This one comes equipped with advanced field surgery facilities. It is very fragile however and won't withstand the rigors of war. Can be torn down with an entrenching tool." var/surgery_speed_mult = 0.9 var/surgery_pain_reduction = 5 diff --git a/code/modules/tents/equipment.dm b/code/modules/tents/equipment.dm index bf9a76fc2d..a58e3f08ef 100644 --- a/code/modules/tents/equipment.dm +++ b/code/modules/tents/equipment.dm @@ -76,7 +76,7 @@ /obj/structure/tent_curtain icon = 'icons/obj/structures/tents_equipment.dmi' icon_state = "curtains-classic-o" - desc = "USCM Curtains for USCM Tents used by USCM Personnel. Close this with right-click to ensure USCM Contents are contained." + desc = "UACM Curtains for UACM Tents used by UACM Personnel. Close this with right-click to ensure UACM Contents are contained." flags_atom = ON_BORDER layer = INTERIOR_DOOR_INSIDE_LAYER dir = SOUTH diff --git a/code/modules/tents/folded_tents.dm b/code/modules/tents/folded_tents.dm index 2bed879a0a..92a4106191 100644 --- a/code/modules/tents/folded_tents.dm +++ b/code/modules/tents/folded_tents.dm @@ -94,7 +94,7 @@ return if(!is_ground_level(deploy_turf.z) && !unrestricted_deployment) - to_chat(user, SPAN_WARNING("USCM Operational Tents are intended for operations, not ship or space recreation.")) + to_chat(user, SPAN_WARNING("UACM Operational Tents are intended for operations, not ship or space recreation.")) return var/list/obj/effect/overlay/temp/tent_deployment_area/turf_overlay = list() @@ -128,27 +128,27 @@ qdel(src) // Success! /obj/item/folded_tent/cmd - name = "folded USCM Command Tent" + name = "folded UACM Command Tent" icon_state = "cmd" - desc = "A standard USCM Command Tent. This one comes equipped with a self-powered Overwatch Console and a Telephone. Unfold in a suitable location to maximize usefulness. Staff Officer not included. ENTRANCE TO THE SOUTH." + desc = "A standard UACM Command Tent. This one comes equipped with a self-powered Overwatch Console and a Telephone. Unfold in a suitable location to maximize usefulness. Staff Officer not included. ENTRANCE TO THE SOUTH." template_preset = "tent_cmd" /obj/item/folded_tent/med - name = "folded USCM Medical Tent" + name = "folded UACM Medical Tent" icon_state = "med" - desc = "A standard USCM Medical Tent. This one comes equipped with advanced field surgery facilities. Unfold in a suitable location to maximize health gains. Surgical Tray not included. ENTRANCE TO THE SOUTH." + desc = "A standard UACM Medical Tent. This one comes equipped with advanced field surgery facilities. Unfold in a suitable location to maximize health gains. Surgical Tray not included. ENTRANCE TO THE SOUTH." template_preset = "tent_med" /obj/item/folded_tent/reqs - name = "folded USCM Requisitions Tent" + name = "folded UACM Requisitions Tent" icon_state = "req" - desc = "A standard USCM Requisitions Tent. Now, you can enjoy req line anywhere you go! Unfold in a suitable location to maximize resource distribution. ASRS not included. ENTRANCE TO THE SOUTH." + desc = "A standard UACM Requisitions Tent. Now, you can enjoy req line anywhere you go! Unfold in a suitable location to maximize resource distribution. ASRS not included. ENTRANCE TO THE SOUTH." template_preset = "tent_reqs" /obj/item/folded_tent/big - name = "folded USCM Big Tent" + name = "folded UACM Big Tent" icon_state = "big" - desc = "A standard USCM Tent. This one is just a bigger, general purpose version. Unfold in a suitable location for maximum FOB vibes. Mess Tech not included. ENTRANCE TO THE SOUTH." + desc = "A standard UACM Tent. This one is just a bigger, general purpose version. Unfold in a suitable location for maximum FOB vibes. Mess Tech not included. ENTRANCE TO THE SOUTH." template_preset = "tent_big" /obj/effect/overlay/temp/tent_deployment_error diff --git a/code/modules/vehicles/multitile/multitile.dm b/code/modules/vehicles/multitile/multitile.dm index 6a25d72e46..8921071af0 100644 --- a/code/modules/vehicles/multitile/multitile.dm +++ b/code/modules/vehicles/multitile/multitile.dm @@ -100,7 +100,7 @@ //revivable corpses slots var/revivable_dead_slots = 0 //Special roles categories slots. These allow to set specific roles in categories with their own slots. - //For example, (list(JOB_CREWMAN, JOB_UPP_CREWMAN) = 2) means that USCM and UPP crewman will always have 2 slots reserved for them. + //For example, (list(JOB_CREWMAN, JOB_UPP_CREWMAN) = 2) means that UACM and UPP crewman will always have 2 slots reserved for them. //Only first encounter of job will be checked for slots, so don't put job in more than one category. var/list/role_reserved_slots = list() diff --git a/code/modules/vehicles/tank/aev.dm b/code/modules/vehicles/tank/aev.dm index 3ce66b94f3..8514960c14 100644 --- a/code/modules/vehicles/tank/aev.dm +++ b/code/modules/vehicles/tank/aev.dm @@ -1,7 +1,7 @@ /obj/vehicle/multitile/tank/aev name = "M34E1 Armored Engineering Vehicle" desc = "A giant piece of armor with a plow, you know what to do. Entrance in the back." - desc_lore = "M34E1 is an extremely rare vehicle in the arsenal of USCMC that was developed after Operation Odolla Onslaught conducted by USS Stalwart forces against massive CLF insurrection. Being pinned down with improvised mortars and surrounded by IEDs, marines of 1/2 \"Iron Heads\" outfitted a Longstreet tank with improvised armor and mine plow, sending it unmanned into a minefield and allowing for a quick assault against enemy positions. MEUCOM took notice of this event, and after record-breaking 3 months of development and 10 million dollars of cost introduced M34E1 in limited numbers." + desc_lore = "M34E1 is an extremely rare vehicle in the arsenal of UACM that was developed after Operation Odolla Onslaught conducted by USS Stalwart forces against massive CLF insurrection. Being pinned down with improvised mortars and surrounded by IEDs, marines of 1/2 \"Iron Heads\" outfitted a Longstreet tank with improvised armor and mine plow, sending it unmanned into a minefield and allowing for a quick assault against enemy positions. MEUCOM took notice of this event, and after record-breaking 3 months of development and 10 million dollars of cost introduced M34E1 in limited numbers." icon_state = "aev_base" diff --git a/maps/lv522_chances_claim.json b/maps/lv522_chances_claim.json index 4e050d2aa9..69060acbbe 100644 --- a/maps/lv522_chances_claim.json +++ b/maps/lv522_chances_claim.json @@ -22,8 +22,8 @@ 580, 0.0 ], - "survivor_message": "You are USCM Force Reconnaissance (FORECON) marine from the USS Hanyut, stranded on this planet after your team was wiped out while investigating the distress signal. With your pilot dead along with the majority of your unit, you and your team have been running and gunning to survive... but with supplies low and food running out maybe your only means of survival is to move west to the crashed dropship to salvage anything useful.", - "announce_text": "Pan-Pan. This is the commanding officer of the USS Hanyut, USCMC FORECON. We are currently grounded on planet LV-522 in the immediate area of Chance's Claim. We are unable to contact the Hanyut and our dropships are unable to take off at this time. We are requesting assistance from any nearby vessels; this broadcast is set to repeat every 24 hours.", + "survivor_message": "You are UACM Force Reconnaissance (FORECON) marine from the USS Hanyut, stranded on this planet after your team was wiped out while investigating the distress signal. With your pilot dead along with the majority of your unit, you and your team have been running and gunning to survive... but with supplies low and food running out maybe your only means of survival is to move west to the crashed dropship to salvage anything useful.", + "announce_text": "Pan-Pan. This is the commanding officer of the USS Hanyut, UACM FORECON. We are currently grounded on planet LV-522 in the immediate area of Chance's Claim. We are unable to contact the Hanyut and our dropships are unable to take off at this time. We are requesting assistance from any nearby vessels; this broadcast is set to repeat every 24 hours.", "map_item_type": "/obj/item/map/lv522_map", "monkey_types": [ "neaera", diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm index c1ff18c9fa..09b78527d3 100644 --- a/maps/map_files/BigRed/BigRed.dmm +++ b/maps/map_files/BigRed/BigRed.dmm @@ -29378,7 +29378,7 @@ "jbU" = ( /obj/effect/decal/cleanable/blood{ base_icon = 'icons/obj/items/weapons/grenade.dmi'; - desc = "An expended M55C tear gas grenade that was used for nonlethal riot control. These used to be used on USCM ships until they found out that marines are already used to teargas so the U.S.S Re-education made a better model through 'extensive trials' that works on marines, which is now the M66 used by MPs today. Being now utterly useless to marines and phased out by the M66, M55Cs were spread around the colonies across the UA galaxy like salt to be used on poor colonists instead."; + desc = "An expended M55C tear gas grenade that was used for nonlethal riot control. These used to be used on UACM ships until they found out that marines are already used to teargas so the U.S.S Re-education made a better model through 'extensive trials' that works on marines, which is now the M66 used by MPs today. Being now utterly useless to marines and phased out by the M66, M55Cs were spread around the colonies across the UA galaxy like salt to be used on poor colonists instead."; icon = 'icons/obj/items/weapons/grenade.dmi'; icon_state = "grenade_custom"; name = "M55C Teargas grenade" @@ -33225,7 +33225,7 @@ "oIc" = ( /obj/effect/decal/cleanable/blood{ base_icon = 'icons/obj/items/weapons/grenade.dmi'; - desc = "An expended M55C tear gas grenade that was used for nonlethal riot control. These used to be used on USCM ships until they found out that marines are already used to teargas so the U.S.S Re-education made a better model through 'extensive trials' that works on marines, which is now the M66 used by MPs today. Being now utterly useless to marines and phased out by the M66, M55Cs were spread around the colonies across the UA galaxy like salt to be used on poor colonists instead."; + desc = "An expended M55C tear gas grenade that was used for nonlethal riot control. These used to be used on UACM ships until they found out that marines are already used to teargas so the U.S.S Re-education made a better model through 'extensive trials' that works on marines, which is now the M66 used by MPs today. Being now utterly useless to marines and phased out by the M66, M55Cs were spread around the colonies across the UA galaxy like salt to be used on poor colonists instead."; icon = 'icons/obj/items/weapons/grenade.dmi'; icon_state = "grenade_custom"; name = "M55C Teargas grenade" @@ -33671,7 +33671,7 @@ "pmN" = ( /obj/effect/decal/cleanable/blood{ base_icon = 'icons/obj/items/weapons/grenade.dmi'; - desc = "An expended M55C tear gas grenade that was used for nonlethal riot control. These used to be used on USCM ships until they found out that marines are already used to teargas so the U.S.S Re-education made a better model through 'extensive trials' that works on marines, which is now the M66 used by MPs today. Being now utterly useless to marines and phased out by the M66, M55Cs were spread around the colonies across the UA galaxy like salt to be used on poor colonists instead."; + desc = "An expended M55C tear gas grenade that was used for nonlethal riot control. These used to be used on UACM ships until they found out that marines are already used to teargas so the U.S.S Re-education made a better model through 'extensive trials' that works on marines, which is now the M66 used by MPs today. Being now utterly useless to marines and phased out by the M66, M55Cs were spread around the colonies across the UA galaxy like salt to be used on poor colonists instead."; icon = 'icons/obj/items/weapons/grenade.dmi'; icon_state = "grenade_custom"; name = "M55C Teargas grenade" @@ -35751,7 +35751,7 @@ "sqc" = ( /obj/effect/decal/cleanable/blood{ base_icon = 'icons/obj/items/weapons/grenade.dmi'; - desc = "An expended M55C tear gas grenade that was used for nonlethal riot control. These used to be used on USCM ships until they found out that marines are already used to teargas so the U.S.S Re-education made a better model through 'extensive trials' that works on marines, which is now the M66 used by MPs today. Being now utterly useless to marines and phased out by the M66, M55Cs were spread around the colonies across the UA galaxy like salt to be used on poor colonists instead."; + desc = "An expended M55C tear gas grenade that was used for nonlethal riot control. These used to be used on UACM ships until they found out that marines are already used to teargas so the U.S.S Re-education made a better model through 'extensive trials' that works on marines, which is now the M66 used by MPs today. Being now utterly useless to marines and phased out by the M66, M55Cs were spread around the colonies across the UA galaxy like salt to be used on poor colonists instead."; icon = 'icons/obj/items/weapons/grenade.dmi'; icon_state = "grenade_custom"; name = "M55C Teargas grenade" diff --git a/maps/map_files/BigRed/sprinkles/20.etatunnel_open.dmm b/maps/map_files/BigRed/sprinkles/20.etatunnel_open.dmm index 633a79f6ac..4dbdca55a4 100644 --- a/maps/map_files/BigRed/sprinkles/20.etatunnel_open.dmm +++ b/maps/map_files/BigRed/sprinkles/20.etatunnel_open.dmm @@ -414,7 +414,7 @@ }, /obj/effect/decal/cleanable/blood{ base_icon = 'icons/obj/items/weapons/grenade.dmi'; - desc = "An expended M55C tear gas grenade that was used for nonlethal riot control. These used to be used on USCM ships until they found out that marines are already used to teargas so the U.S.S Re-education made a better model through 'extensive trials' that works on marines, which is now the M66 used by MPs today. Being now utterly useless to marines and phased out by the M66, M55Cs were spread around the colonies across the UA galaxy like salt to be used on poor colonists instead."; + desc = "An expended M55C tear gas grenade that was used for nonlethal riot control. These used to be used on UACM ships until they found out that marines are already used to teargas so the U.S.S Re-education made a better model through 'extensive trials' that works on marines, which is now the M66 used by MPs today. Being now utterly useless to marines and phased out by the M66, M55Cs were spread around the colonies across the UA galaxy like salt to be used on poor colonists instead."; icon = 'icons/obj/items/weapons/grenade.dmi'; icon_state = "grenade_custom"; name = "M55C Teargas grenade" @@ -496,7 +496,7 @@ "Tm" = ( /obj/effect/decal/cleanable/blood{ base_icon = 'icons/obj/items/weapons/grenade.dmi'; - desc = "An expended M55C tear gas grenade that was used for nonlethal riot control. These used to be used on USCM ships until they found out that marines are already used to teargas so the U.S.S Re-education made a better model through 'extensive trials' that works on marines, which is now the M66 used by MPs today. Being now utterly useless to marines and phased out by the M66, M55Cs were spread around the colonies across the UA galaxy like salt to be used on poor colonists instead."; + desc = "An expended M55C tear gas grenade that was used for nonlethal riot control. These used to be used on UACM ships until they found out that marines are already used to teargas so the U.S.S Re-education made a better model through 'extensive trials' that works on marines, which is now the M66 used by MPs today. Being now utterly useless to marines and phased out by the M66, M55Cs were spread around the colonies across the UA galaxy like salt to be used on poor colonists instead."; icon = 'icons/obj/items/weapons/grenade.dmi'; icon_state = "grenade_custom"; name = "M55C Teargas grenade" diff --git a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm index 9470a1a845..cb2b5ff40d 100644 --- a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm +++ b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm @@ -5093,7 +5093,7 @@ /area/fiorina/station/security) "dec" = ( /obj/structure/sign/prop3{ - desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." + desc = "Enlist in the Penal Battalions today! The UACM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." }, /turf/closed/wall/prison, /area/fiorina/tumor/servers) @@ -7473,7 +7473,7 @@ /area/fiorina/tumor/aux_engi) "ezn" = ( /obj/structure/sign/prop3{ - desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." + desc = "Enlist in the Penal Battalions today! The UACM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." }, /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/telecomm/lz1_cargo) @@ -8147,7 +8147,7 @@ /area/fiorina/station/botany) "eWP" = ( /obj/structure/sign/prop3{ - desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." + desc = "Enlist in the Penal Battalions today! The UACM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." }, /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/tumor/ice_lab) @@ -15301,7 +15301,7 @@ /area/fiorina/tumor/ship) "jpN" = ( /obj/structure/sign/prop3{ - desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." + desc = "Enlist in the Penal Battalions today! The UACM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." }, /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/research_cells) @@ -18386,7 +18386,7 @@ /area/fiorina/tumor/civres) "lhY" = ( /obj/structure/sign/prop3{ - desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." + desc = "Enlist in the Penal Battalions today! The UACM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." }, /turf/closed/wall/prison, /area/fiorina/station/power_ring) @@ -20821,7 +20821,7 @@ /area/fiorina/tumor/ice_lab) "mHR" = ( /obj/structure/sign/prop3{ - desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." + desc = "Enlist in the Penal Battalions today! The UACM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." }, /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/tumor/aux_engi) @@ -24498,7 +24498,7 @@ /area/fiorina/oob) "oVk" = ( /obj/structure/sign/prop3{ - desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." + desc = "Enlist in the Penal Battalions today! The UACM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." }, /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/central_ring) @@ -27552,7 +27552,7 @@ /area/fiorina/station/medbay) "qRg" = ( /obj/structure/sign/prop3{ - desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." + desc = "Enlist in the Penal Battalions today! The UACM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." }, /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/tumor/servers) @@ -29276,7 +29276,7 @@ "rTH" = ( /obj/structure/sign/prop1{ layer = 2.5; - name = "\improper USCM Emblem" + name = "\improper UACM Emblem" }, /turf/open/floor/carpet, /area/fiorina/station/security/wardens) @@ -30400,7 +30400,7 @@ /area/fiorina/station/chapel) "sJN" = ( /obj/structure/sign/prop3{ - desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." + desc = "Enlist in the Penal Battalions today! The UACM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." }, /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/lz/near_lzI) @@ -32674,7 +32674,7 @@ /area/fiorina/lz/near_lzI) "ued" = ( /obj/structure/sign/prop3{ - desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." + desc = "Enlist in the Penal Battalions today! The UACM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." }, /turf/closed/wall/prison, /area/fiorina/station/central_ring) @@ -37436,7 +37436,7 @@ /area/fiorina/tumor/aux_engi) "xgx" = ( /obj/structure/machinery/defenses/tesla_coil{ - faction_group = list("USCM") + faction_group = list("UACM") }, /turf/open/organic/grass{ name = "astroturf" @@ -39114,7 +39114,7 @@ /area/fiorina/station/botany) "yhR" = ( /obj/structure/sign/prop3{ - desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." + desc = "Enlist in the Penal Battalions today! The UACM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." }, /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/medbay) diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/20.medicalhold.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/20.medicalhold.dmm index 368d8e5faa..0123f694c4 100644 --- a/maps/map_files/FOP_v3_Sciannex/sprinkles/20.medicalhold.dmm +++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/20.medicalhold.dmm @@ -116,7 +116,7 @@ /area/template_noop) "go" = ( /obj/structure/sign/prop3{ - desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." + desc = "Enlist in the Penal Battalions today! The UACM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." }, /turf/closed/wall/r_wall/prison_unmeltable, /area/template_noop) diff --git a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm index a196e2f20c..43a81f939d 100644 --- a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm +++ b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm @@ -2320,7 +2320,7 @@ armor_melee = 20; armor_rad = 10; desc = "A headset typically found in use by radio-operators and officers. This one bears a purple stripe down its side."; - name = "\improper personalized USCM headset" + name = "\improper personalized UACM headset" }, /turf/open/floor/prison, /area/lv522/indoors/a_block/admin) @@ -5692,7 +5692,7 @@ desc = "Something about a research lab."; icon = 'icons/obj/items/paper.dmi'; icon_state = "folder_black"; - name = "USCM classified intelligence folder" + name = "UACM classified intelligence folder" }, /turf/open/floor/corsat{ dir = 1; @@ -53479,7 +53479,7 @@ /obj/item/clothing/head/helmet/marine/scout{ armor_bullet = 5; armor_melee = 15; - desc = "A custom helmet designed for USCM Scouts. Looks like this one has seen some action."; + desc = "A custom helmet designed for UACM Scouts. Looks like this one has seen some action."; name = "\improper Battered M3-S light helmet"; pixel_x = -8; pixel_y = 13 diff --git a/maps/map_files/LV624/standalone/clfship.dmm b/maps/map_files/LV624/standalone/clfship.dmm index f37a7b1954..6926a852f1 100644 --- a/maps/map_files/LV624/standalone/clfship.dmm +++ b/maps/map_files/LV624/standalone/clfship.dmm @@ -1767,7 +1767,7 @@ /area/lv624/lazarus/crashed_ship) "Tx" = ( /obj/structure/largecrate/supply/supplies/mre{ - desc = "A supply crate containing fifty reposessed USCM MRE packets."; + desc = "A supply crate containing fifty reposessed UACM MRE packets."; name = "\improper CLF Supply MRE crate (x50)" }, /turf/open/floor/plating{ diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 128256587e..2ec0088dfa 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -37888,7 +37888,7 @@ pixel_x = -8 }, /obj/item/toy/plush/therapy/red{ - desc = "A USCM approved plush doll. It's not soft and hardly comforting!"; + desc = "A UACM approved plush doll. It's not soft and hardly comforting!"; force = 15; layer = 4.1; name = "Sergeant Huggs"; @@ -51879,7 +51879,7 @@ pixel_y = 13 }, /obj/item/toy/plush/therapy/red{ - desc = "A USCM approved plush doll. It's not soft and hardly comforting!"; + desc = "A UACM approved plush doll. It's not soft and hardly comforting!"; force = 15; layer = 4.1; name = "Sergeant Huggs"; @@ -78377,7 +78377,7 @@ "xgS" = ( /obj/structure/largecrate/supply/supplies/mre{ desc = "A supply crate containing everything you need to stop a CLF uprising."; - name = "\improper USCM crate 'FOB supplies'" + name = "\improper UACM crate 'FOB supplies'" }, /obj/structure/sign/arcturianstopsign{ pixel_y = 32 diff --git a/maps/map_files/chapaev/chapaev.dmm b/maps/map_files/chapaev/chapaev.dmm index ec03e22945..4cc1b47154 100644 --- a/maps/map_files/chapaev/chapaev.dmm +++ b/maps/map_files/chapaev/chapaev.dmm @@ -1207,7 +1207,7 @@ pixel_y = 38 }, /obj/item/toy/plush/therapy/red{ - desc = "A USCM approved plush doll. It's not soft and hardly comforting!"; + desc = "A UACM approved plush doll. It's not soft and hardly comforting!"; force = 15; layer = 2.9; name = "Commando Huggs"; @@ -1914,7 +1914,7 @@ /area/golden_arrow/medical) "tq" = ( /obj/structure/machinery/cm_vending/sorted/marine_food{ - desc = "USCM Food Vendor, containing standard military Prepared Meals. It was gifted to Chapaev by Marines of 1st Platoon, Sun Riders as a sign of good will. They did not complain receiving a crate of vodka in return." + desc = "UACM Food Vendor, containing standard military Prepared Meals. It was gifted to Chapaev by Marines of 1st Platoon, Sun Riders as a sign of good will. They did not complain receiving a crate of vodka in return." }, /turf/open/floor/strata{ dir = 6; diff --git a/maps/map_files/derelict_almayer/derelict_almayer.dmm b/maps/map_files/derelict_almayer/derelict_almayer.dmm index aeab7ffa35..896dd0e1dc 100644 --- a/maps/map_files/derelict_almayer/derelict_almayer.dmm +++ b/maps/map_files/derelict_almayer/derelict_almayer.dmm @@ -76664,7 +76664,7 @@ "xKL" = ( /obj/structure/largecrate/supply/supplies/mre{ desc = "A supply crate containing everything you need to stop a CLF uprising."; - name = "\improper USCM crate 'FOB supplies'" + name = "\improper UACM crate 'FOB supplies'" }, /obj/structure/sign/arcturianstopsign{ pixel_y = 32 diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm index 37c6f5290e..ac14a8a05d 100644 --- a/maps/map_files/golden_arrow/golden_arrow.dmm +++ b/maps/map_files/golden_arrow/golden_arrow.dmm @@ -10944,7 +10944,7 @@ "PV" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/prop/dam/crane/cargo{ - desc = "Standard cargo crane used by the USCM. Looks like this one has replacement parts for the Tripoli on it. You probably couldn't name half of these."; + desc = "Standard cargo crane used by the UACM. Looks like this one has replacement parts for the Tripoli on it. You probably couldn't name half of these."; dir = 4 }, /turf/open/floor/plating, @@ -13257,11 +13257,11 @@ "Yc" = ( /obj/structure/closet/secure_closet, /obj/structure/machinery/prop{ - desc = "This stylized recruitment poster for the USCM depicts a the head of a screaming eagle breaking into orbit, surrounded by flames. Death from above."; + desc = "This stylized recruitment poster for the UACM depicts a the head of a screaming eagle breaking into orbit, surrounded by flames. Death from above."; icon = 'icons/obj/structures/props/posters.dmi'; icon_state = "poster41"; layer = 3.5; - name = "USCM recruitment poster"; + name = "UACM recruitment poster"; pixel_x = -1; pixel_y = 34 }, diff --git a/maps/map_files/golden_arrow_classic/golden_arrow_classic.dmm b/maps/map_files/golden_arrow_classic/golden_arrow_classic.dmm index ab5d87ee73..2e308f95ab 100644 --- a/maps/map_files/golden_arrow_classic/golden_arrow_classic.dmm +++ b/maps/map_files/golden_arrow_classic/golden_arrow_classic.dmm @@ -6368,7 +6368,7 @@ pixel_y = 22 }, /obj/item/toy/plush/therapy/red{ - desc = "A USCM approved plush doll. It's not soft and hardly comforting!"; + desc = "A UACM approved plush doll. It's not soft and hardly comforting!"; force = 15; layer = 4.1; name = "Sergeant Huggs"; diff --git a/maps/map_files/rover/rover.dmm b/maps/map_files/rover/rover.dmm index e672e1b887..3bc19913ad 100644 --- a/maps/map_files/rover/rover.dmm +++ b/maps/map_files/rover/rover.dmm @@ -2875,7 +2875,7 @@ pixel_x = 29 }, /obj/item/toy/plush/therapy/red{ - desc = "A USCM approved plush doll. It's not soft and hardly comforting!"; + desc = "A UACM approved plush doll. It's not soft and hardly comforting!"; force = 15; layer = 4.1; name = "Commando Huggs"; diff --git a/strings/marinetips.txt b/strings/marinetips.txt index 2607c986a9..d6ee6b44ad 100644 --- a/strings/marinetips.txt +++ b/strings/marinetips.txt @@ -47,7 +47,7 @@ Holocards are a useful triage tool for doctors and medics. Ensure you assign the You can change what your SL tracker beacon is tracking by right clicking on your headset and clicking "Switch Tracker Target". The amount of items in Requisitions and Squad Preparations depend on how many players readied up at the start of the round. You can carry a variety of items inside your helmet - from gauze and cigarettes to flares and screwdrivers. -the PLTCO can track every USCM-aligned person via the suit sensors console and overwatch console - useful for finding escaped prisoners or dead marines. +the PLTCO can track every UACM-aligned person via the suit sensors console and overwatch console - useful for finding escaped prisoners or dead marines. W-Y PMCs do not have marine IFF. Don't fire Smartguns at them! To talk on multiple radio channels at once, put a COMMA [,] before your message and add up to four prefixes. E.g, ,abcd talks on the main four squad channels at once. Put .w or :w before your message to whisper. Another way to whisper is to use the verb "whisper" in the IC tab or command bar. diff --git a/tgui/packages/tgui/interfaces/AlmayerControl.jsx b/tgui/packages/tgui/interfaces/AlmayerControl.jsx index cd70bdc75c..00cbaa4122 100644 --- a/tgui/packages/tgui/interfaces/AlmayerControl.jsx +++ b/tgui/packages/tgui/interfaces/AlmayerControl.jsx @@ -121,11 +121,11 @@ export const AlmayerControl = (_props) => { )}