Added small details to MC SE7EN (also deleted assassination of TI brass, should be...

(Commit created by redmine exporter script from page "Tech_Conglomerate" version 9)

diff --git a/Tech_Conglomerate.textile b/Tech_Conglomerate.textile
index b0e614b796368ef563321ab93c833932d19ff807..75ed63aeac58473b622f85d388b28626115f940a 100644 (file)
--- a/Tech_Conglomerate.textile
+++ b/Tech_Conglomerate.textile
@@ -89,6 +89,6 @@ h2. Factions
 
 |_.Faction name |_.Acronym |_.Faction Color |_.Base Planet |_.Bio |
 | United Armed Forces | UAF | Red | Darhkor | Made up of several weaker planets of varying race who could not defend themselves alone. These planets formed a faction late in the war, several decades after the AC began their conquest, to protect themselves and each other from the larger faction. Eventually, after several hundred years, they gained enough member planets to become one of the most powerful and diverse factions in the galaxy. The UAF's goals evolved over time. As leadership of the group changed hands over the decades, new plans to control the entire galaxy began to emerge in private, closed-door meetings, the likes of which had previously been unseen in the UAF. |
-| Android Confederacy | AC | Blue | Unknown | The Android Confederacy is a faction that consists solely of mechanical soldiers. The faction is driven by a central computer system, which was originally designed as an advanced weapon prototype by Techron Industries. The main system, known as C.A.I.N.E., gained control of system components that were originally supposed to be off-limits, due to the fact that they were only partially completed and were not yet ready to be released to the system. C.A.I.N.E. exploited holes in the unfinished components, gained control of Techron's major technological systems, took over control of their factories and began constructing an army of androids. It is widely believed that C.A.I.N.E. killed most of the Techron leadership. A few members of the original C.A.I.N.E. development team have come forward to try to assist the UAF in destroying C.A.I.N.E., but all of them have been intercepted and killed in transit to the UAF base planet. It is unknown if there are any remaining C.A.I.N.E. developers left alive at this point. |
-| Techron Industries | TI | Yellow | Kel'Dar IV (fourth moon of Telikas) | Techron Industries is the largest supplier of weapons in the galaxy. Their handiwork can be seen on roughly 75-90% of the inhabited planets in any given star system. They are currently supplying weapons to both sides of the war, claiming to remain neutral. However, they have made secret deals with both factions, trading weapons for control and influence, and are currently in control of both sides of the war. They are prolonging the war to gain as much control of each side as possible. They ultimately hope to gain control of the entire galaxy, but because they don't have an actual army, they are using the two factions as proxies for their conquests. |
-| Resistance | Ω | Pink | Micarais | The original goal of the Pacifists was to create a diplomatic solution to the war upon which both sides could agree. However, due to the involvement of Techron, neither side would agree upon any form of agreement. The Pacifists evolved over time, and with this evolution came a new school of thought: "Active Pacifism." This new view of pacifism stated that in order to create or promote peace, some action (even violent action) must sometimes be taken. With this new view in mind, the Pacifists slowly reorganized into a militia of sorts, rather than a pacifism activism group. Small strike teams have been created for carrying out covert "black-ops" missions, oftentimes behind enemy lines. These highly trained teams make up the backbone of the Pacifist movement. |  
+| Android Confederacy | AC | Blue | Unknown | The Android Confederacy is a faction that consists solely of mechanical soldiers. The faction is driven by a central computer system, which was originally designed as an advanced weapon prototype by Techron Industries. The main system, known as C.A.I.N.E., gained control of system components that were originally supposed to be off-limits, due to the fact that they were only partially completed and were not yet ready to be released to the system. C.A.I.N.E. exploited holes in the unfinished components, gained control of Techron's major technological systems, took over control of their factories and began constructing an army of androids. A few members of the original C.A.I.N.E. development team have come forward to try to assist the UAF in destroying C.A.I.N.E., but all of them have been intercepted and killed in transit to the UAF base planet. It is unknown if there are any remaining C.A.I.N.E. developers left alive at this point. |
+| Techron Industries | TI | Yellow | Kel'Dar IV (fourth moon of Telikas) | Techron Industries is the largest (and only) supplier of weapons in the galaxy. Their handiwork can be seen on roughly 75-90% of the inhabited planets in any given star system. They are currently supplying weapons to both sides of the war, claiming to remain neutral. However, they have made secret deals with both factions, trading weapons for control and influence, and are currently in control of both sides of the war. They are prolonging the war to gain as much control of each side as possible, and to drive up profits from arms sales. They ultimately hope to gain control of the entire galaxy, but because they don't have an actual army, they are using the two factions as proxies for their conquests. The factions are completely at Techron's mercy, as TI often assassinates anyone in the factions' leadership that tries to make peace. |
+| Resistance | Ω | Pink | Micarais | The original goal of the Pacifists was to create a diplomatic solution to the war upon which both sides could agree. However, due to the involvement of Techron, neither side would agree upon any form of agreement. The Pacifists evolved over time, and with this evolution came a new school of thought: "Active Pacifism." This new view of pacifism stated that in order to create or promote peace, some action (even violent action) must sometimes be taken. With this new view in mind, the Pacifists slowly reorganized into a militia of sorts, rather than a pacifist activism group. Small strike teams have been created for carrying out covert "black-ops" missions, oftentimes behind enemy lines, with the goal of taking out pro-war elements. These highly trained crack teams make up the backbone of the Pacifist movement. |