diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index cfe66421c9..edf0a46aaf 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -399,7 +399,7 @@ SUBSYSTEM_DEF(ticker) /datum/controller/subsystem/ticker/proc/send_tip_of_the_round() var/message - var/tip_file = pick("strings/marinetips.txt", "strings/metatips.txt", 15;"strings/memetips.txt") + var/tip_file = pick("strings/loretips.txt") var/list/tip_list = file2list(tip_file) if(length(tip_file)) message = pick(tip_list) @@ -407,7 +407,7 @@ SUBSYSTEM_DEF(ticker) CRASH("send_tip_of_the_round() failed somewhere") if(message) - to_chat(world, SPAN_PURPLE("Tip of the round: [html_encode(message)]")) + to_chat(world, SPAN_PURPLE("Lore tidbit of the round: [html_encode(message)]")) return TRUE else return FALSE diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm index 49e5ab34b6..e060d0e0c1 100644 --- a/code/modules/client/preferences_toggles.dm +++ b/code/modules/client/preferences_toggles.dm @@ -427,8 +427,7 @@ var/picked_type = tgui_alert(src, "What kind of tip?", "Tip Type", list("Marine", "Meta")) //no memetips for them joker imp var/message var/static/list/types_to_pick = list( - "Marine" = "strings/marinetips.txt", - "Meta" = "strings/metatips.txt" + "Marine" = "strings/loretips.txt" ) var/list/tip_list = file2list(types_to_pick[picked_type]) if(length(types_to_pick[picked_type])) diff --git a/strings/loretips.txt b/strings/loretips.txt new file mode 100644 index 0000000000..85bb220478 --- /dev/null +++ b/strings/loretips.txt @@ -0,0 +1,14 @@ +In the USCM, every marine is a specially trained technician capable of performing repairs and maintenance on various USCM equipment, from vehicles to rifles to blast doors. +A desperate attempt at surviving in the modern age, the formation of the UPP came directly as a result of the European Union's prior dissolution, spurred by mass famine, a collapse of societal structures, and a general abandonment of support and relations from the recently formed United Americas and Three World Empire. +The Service or Jail Act is a legislation in the United Americas that permits incarcerated individuals to enlist in the USCM to avoid jail time provided they are capable of meeting the strict requirements of service. +USCM Platoons on the Golden Arrow are formed by 11 marines—two squads of four, a corpsman, a platoon sergeant, and the platoon's commanding officer. Squads are split into two teams, a gun team comprised of a rifleman and a smartgunner, and a rifle team consisting of the squad leader and a rifleman. +Weyland-Yutani and the Three World Empire have close relations, with the exception of the Royal Marine Commandos, the TWE's primary military force is backed up by Weyland-Yutani's private military contractors. +Despite popular belief, the USCM and UPP are not in a proper war. Over the centuries, what will and won't cause all-out war has shifted. Skirmishes in the outer fringes of space between the UPP and the United Americas are frequent and the use of nuclear weapons is almost as common as missile attacks were in the 21st century. +The USCM operates on a fast response doctrine, patrolling the outer reaches of the territories of the United Americas and ready to deploy at a moment's notice. +Typical operations for the marines in the USCM involve handling minor things for the outer colonies. If a colony stops sending all clear signals, a ship is tasked to investigate. More often than not it is a transmitter or relay satellite that was disabled for one reason or another, though they do frequently respond to civil riots and quell worker strikes on colonies where the CMB, if even present, are incapable of handling the situation. +The Office of the Colonial Marshals, otherwise known as the OCM and frequently referred to as the CMB is a law enforcement agency responsible for policing colonial centers and space stations. Often colonies are too small to even warrant a presence of the Colonial Marshals and simply rely on self policing. If the CMB can't handle something or aren't present, it's up to the USCM to deal with the problem. +The M577 APC is the most lightly armored vehicle in the USCM arsenal and operates as a mobile command center for a marine platoon, though due to it's fragile nature marines tend to frown upon it's use in the field. +Capable of a max speed of Mach 8, the UD-4 "Cheyenne" Dropship is a combat utility spacecraft used by the USCM. Though not built to enage in significant with ground or space defenses, the UD-4 is capable of withstanding a significant beating while still remaining airborne. Despite this, even light damage can prevent it from exiting the atmosphere of a planet. +Excluding the Commanding Officer and synthetic support units, most USCM vessels only carry combat personnel aboard. Any supply, engineering, or medical duties are carried out by the marines themselves. Repairs too complex for marines are carried out by synthetics, with surgeries being handled by an autodoc suite. Occasionally a vessel may employ additional support staff in the form of doctors, engineers, and requisitions personnel, though this is uncommon. +Military Police are not a frequently present force aboard marine ships, with the bulk of disciplinary action being carried out by the NCOs of the vessel. +USCM FTL is highly dangerous, utilizing a tachyon shunt to get from one destination to the other, speeding up time in the ship itself. Anyone not in hypersleep is, for lack of a better description, is forced into a tachyonic state, undergoing psychosis and rapid aging before quicky succumbing to the effects. Synthetics, however, are still capable of operating while a tachyon shunt is underway. Even with this process, the fastest vessels often take several days or even weeks to reach their destinations.