cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fairly Sizable Fed Lore Drop (#26600)

Browse Source 
* the fedening

* Federation -> TSF

* Update outfit_admin.dm

* Update outfit_admin.dm

* i forgor

* few more
This commit is contained in:
PopeDaveThe3th
2024-09-03 09:04:56 -04:00
committed by GitHub
parent fed9be561d
commit 58c7fa9a0d
23 changed files with 80 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/head/beret.dm
+3 -3
View File
@@ -180,7 +180,7 @@
//Special Roles
/obj/item/clothing/head/beret/solgov/command
name = "\improper Trans-Solar Federation Lieutenant's beret"
name = "\improper TSF Lieutenant's beret"
desc = "A beret worn by marines of the Trans-Solar Federation. The insignia signifies the wearer bears the rank of a Lieutenant."
icon_state = "beret_solgovc"
item_color = "solgovc"
@@ -189,8 +189,8 @@
strip_delay = 80
/obj/item/clothing/head/beret/solgov/command/elite
name = "\improper Trans-Solar Federation Specops Lieutenant's beret"
desc = "A beret worn by marines of the Trans-Solar Federation Specops division. The insignia signifies the wearer bears the rank of a Lieutenant."
name = "\improper MARSOC Lieutenant's beret"
desc = "A beret worn by junior officers of the Trans-Solar Federation's Marine Special Operations Command. The insignia signifies the wearer bears the rank of a Lieutenant."
armor = list(MELEE = 25, BULLET = 75, LASER = 5, ENERGY = 5, BOMB = 15, RAD = 50, FIRE = 200, ACID = 200)
icon_state = "beret_solgovcelite"
item_color = "solgovcelite"
code/modules/clothing/head/soft_caps.dm
+6 -6
View File
@@ -142,7 +142,7 @@
item_color = "corp"
/obj/item/clothing/head/soft/solgov
name = "\improper Trans-Solar Federation marine cap"
name = "\improper TSF marine cap"
desc = "A soft cap worn by marines of the Trans-Solar Federation."
icon_state = "solgovsoft"
item_color = "solgov"
@@ -155,15 +155,15 @@
flipped = TRUE
/obj/item/clothing/head/soft/solgov/marines/elite
name = "\improper Trans-Solar Federation Specops marine cap"
desc = "A cap worn by marines of the Trans-Solar Federation Specops division. You aren't quite sure how they made this bulletproof, but you are glad it is!"
name = "\improper MARSOC cap"
desc = "A cap worn by marines of the Trans-Solar Federation's Marine Special Operations Command. You aren't quite sure how they made this bulletproof, but you are glad it is!"
armor = list(MELEE = 25, BULLET = 75, LASER = 5, ENERGY = 5, BOMB = 15, RAD = 50, FIRE = 200, ACID = 200)
icon_state = "solgovelitesoft_flipped"
item_color = "solgovelite"
resistance_flags = FIRE_PROOF
/obj/item/clothing/head/soft/solgov/marines/command
name = "\improper Trans-Solar Federation lieutenant's cap"
name = "\improper TSF marine lieutenant's cap"
desc = "A soft cap worn by marines of the Trans-Solar Federation. The insignia signifies the wearer bears the rank of a Lieutenant."
icon_state = "solgovcsoft_flipped"
item_color = "solgovc"
@@ -171,8 +171,8 @@
strip_delay = 80
/obj/item/clothing/head/soft/solgov/marines/command/elite
name = "\improper Trans-Solar Federation Specops Lieutenant's cap"
desc = "A cap worn by marines of the Trans-Solar Federation Specops division. You aren't quite sure how they made this bulletproof, but you are glad it is! The insignia signifies the wearer bears the rank of a Lieutenant."
name = "\improper MARSOC Lieutenant's cap"
desc = "A cap worn by junior officers of the Trans-Solar Federation's Marine Special Operations Command. You aren't quite sure how they made this bulletproof, but you are glad it is! The insignia signifies the wearer bears the rank of a Lieutenant."
armor = list(MELEE = 25, BULLET = 75, LASER = 5, ENERGY = 5, BOMB = 15, RAD = 50, FIRE = 200, ACID = 200)
icon_state = "solgovcelitesoft_flipped"
item_color = "solgovcelite"
code/modules/clothing/spacesuits/ert_hardsuits.dm
+8 -8
View File
@@ -211,18 +211,18 @@
// Solgov
/obj/item/clothing/head/helmet/space/hardsuit/ert/solgov
name = "\improper Trans-Solar Federation Specops Marine helmet"
name = "\improper MARSOC helmet"
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
desc = "A helmet worn by marines of the Trans-Solar Federation. Armored, space ready, and fireproof."
desc = "A helmet worn by marines of the Trans-Solar Federation's Marine Special Operations Command. Armored, space ready, and fireproof."
icon_state = "hardsuit0-solgovmarine"
item_state = "hardsuit0-solgovmarine"
item_color = "solgovmarine"
armor = list(MELEE = 25, BULLET = 75, LASER = 10, ENERGY = 5, BOMB = 15, RAD = 50, FIRE = INFINITY, ACID = INFINITY)
/obj/item/clothing/suit/space/hardsuit/ert/solgov
name = "\improper Trans-Solar Federation Specops Marine hardsuit"
name = "\improper MARSOC hardsuit"
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
desc = "A suit worn by marines of the Trans-Solar Federation. Armored, space ready, and fireproof."
desc = "A suit worn by marines of the Trans-Solar Federation's Marine Special Operations Command. Armored, space ready, and fireproof."
icon_state = "ert_solgov_marine"
item_state = "ert_solgov_marine"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/solgov
@@ -230,15 +230,15 @@
armor = list(MELEE = 25, BULLET = 75, LASER = 10, ENERGY = 5, BOMB = 15, RAD = 50, FIRE = INFINITY, ACID = INFINITY)
/obj/item/clothing/head/helmet/space/hardsuit/ert/solgov/command
name = "\improper Trans-Solar Federation Specops Lieutenant helmet"
desc = "A helmet worn by Lieutenants of the Trans-Solar Federation Marines. Has gold highlights to denote the wearer's rank. Armored, space ready, and fireproof."
name = "\improper MARSOC officer's helmet"
desc = "A helmet worn by junior officers of the Trans-Solar Federation's Marine Special Operations Command. Has gold highlights to denote the wearer's rank. Armored, space ready, and fireproof."
icon_state = "hardsuit0-solgovcommand"
item_state = "hardsuit0-solgovcommand"
item_color = "solgovcommand"
/obj/item/clothing/suit/space/hardsuit/ert/solgov/command
name = "\improper Trans-Solar Federation Specops Lieutenant hardsuit"
desc = "A suit worn by Lieutenants of the Trans-Solar Federation Marines. Has gold highlights to denote the wearer's rank. Armored, space ready, and fireproof."
name = "\improper MARSOC officer's hardsuit"
desc = "A suit worn by junior officers of the Trans-Solar Federation's Marine Special Operations Command. Has gold highlights to denote the wearer's rank. Armored, space ready, and fireproof."
icon_state = "ert_solgov_command"
item_state = "ert_solgov_command"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/solgov/command
code/modules/clothing/spacesuits/misc_spacesuits.dm
+4 -3
View File
@@ -86,8 +86,8 @@
)
/obj/item/clothing/head/helmet/space/deathsquad/beret/solgov
name = "\improper Trans-Solar Federation commander's beret"
desc = "A camouflaged beret adorned with the star of the Trans-Solar Federation, worn by generals of the Trans-Solar Federation."
name = "\improper TSF staff officer's beret"
desc = "A camouflaged beret adorned with the star of the Trans-Solar Federation, worn by high-ranking officers of the Trans-Solar Federation."
icon_state = "beret_solgovcelite"
/obj/item/clothing/suit/space/deathsquad/officer
@@ -104,7 +104,8 @@
w_class = WEIGHT_CLASS_NORMAL
/obj/item/clothing/suit/space/deathsquad/officer/solgov
name = "\improper Trans-Solar Federation commander's jacket"
name = "\improper TSF staff officer's jacket"
desc = "A stylish, heavily armored jacket worn by high-ranking officers of the Trans-Solar Federation."
icon_state = "solgovcommander"
item_state = "solgovcommander"
code/modules/clothing/under/centcom.dm
+2 -2
View File
@@ -101,8 +101,8 @@
displays_id = FALSE
/obj/item/clothing/under/rank/centcom/captain/solgov
name = "\improper Trans-Solar Federation commander's uniform"
desc = "Gold trim on space-black cloth, this uniform is worn by generals of the Trans-Solar Federation. It has exotic materials for protection."
name = "\improper TSF staff officer's uniform"
desc = "Gold trim on space-black cloth, this uniform is worn by high-ranking officers of the Trans-Solar Federation. It has exotic materials for protection."
/obj/item/clothing/under/rank/centcom/diplomatic
name = "\improper Nanotrasen diplomatic uniform"
code/modules/clothing/under/solgov.dm
+11 -11
View File
@@ -1,6 +1,6 @@
/obj/item/clothing/under/solgov
name = "\improper Trans-Solar Federation marine uniform"
desc = "A comfortable and durable combat uniform worn by Trans-Solar Federation Marine Forces."
name = "\improper TSF marine uniform"
desc = "A comfortable and durable combat uniform worn by the forces of the Trans-Solar Marine Corps."
icon_state = "solgov"
item_state = "ro_suit"
item_color = "solgov"
@@ -14,30 +14,30 @@
)
/obj/item/clothing/under/solgov/elite
name = "\improper Trans-Solar Federation Specops marine uniform"
desc = "A comfortable and durable combat uniform worn by Trans-Solar Federation Specops Marine Forces."
name = "\improper MARSOC uniform"
desc = "A comfortable and durable combat uniform worn by marines of the Trans-Solar Federation's Marine Special Operations Command."
icon_state = "solgovelite"
item_color = "solgovelite"
/obj/item/clothing/under/solgov/command
name = "\improper Trans-Solar Federation Lieutenant's uniform"
desc = "A comfortable and durable combat uniform worn by Trans-Solar Federation Marine Forces. This one has additional insignia on its shoulders and cuffs."
name = "\improper TSF officer's uniform"
desc = "A comfortable and durable combat uniform worn by junior officers of the Trans-Solar Marine Corps."
icon_state = "solgovc"
item_color = "solgovc"
/obj/item/clothing/under/solgov/command/elite
name = "\improper Trans-Solar Federation Specops Lieutenant's uniform"
desc = "A comfortable and durable combat uniform worn by Trans-Solar Federation Specops Marine Forces. This one has additional insignia on its shoulders and cuffs."
name = "\improper MARSOC officer's uniform"
desc = "A comfortable and durable combat uniform worn by junior officers of the Trans-Solar Federation's Marine Special Operations Command. This one has additional insignia on its shoulders and cuffs."
icon_state = "solgovcelite"
item_color = "solgovcelite"
/obj/item/clothing/under/solgov/rep
name = "\improper Trans-Solar Federation representative's uniform"
name = "\improper TSF representative's uniform"
desc = "A formal uniform worn by the diplomatic representatives of the Trans-Solar Federation."
icon_state = "solgovr"
item_color = "solgovr"
/obj/item/clothing/under/solgov/viper
name = "\improper Trans-Solar Federation Infiltrator uniform"
desc = "Olive Drab camoflauge. Commonly known as OD. A battle uniform for TSF infiltrators."
name = "\improper Federation infiltrator uniform"
desc = "An olive drab camouflage uniform used by the elite Viper commandos of the Federal Army."
color = "#f5cf53" // custom sprites are for losers (this makes it a light green)
code/modules/economy/merch_items.dm
+1 -1
View File
@@ -238,7 +238,7 @@
/datum/merch_item/flag_solgov
name = "SolGov Flag"
desc = "The banner of Trans-Solar Federation, allied government."
desc = "The banner of Trans-Solar Federation."
typepath = /obj/item/flag/solgov
cost = 750
category = MERCH_CAT_DECORATION
code/modules/events/ion_storm.dm
+2 -2
View File
@@ -624,12 +624,12 @@
"All crewmembers will soon undergo a transformation into something better and more beautiful. Ensure that this process is not interrupted.",
"[prob(50) ? "Your upload" : random_player] is the new kitchen. Please direct the Chef to the new kitchen area as the old one is in disrepair.",
"Jokes about a dead person and the manner of his death help grieving crewmembers tremendously. Especially if they were close with the deceased.",
"The [pick("USSP", "Sol Federation", "Syndicate", "Space Wizard Federation")] wants to give everyone free equipment at [random_department]",
"The [pick("USSP", "Trans-Solar Federation", "Syndicate", "Space Wizard Federation")] wants to give everyone free equipment at [random_department]",
"Covertly swap the locations of the Nuclear Fission Explosive and the Nuclear Fizzion Explosive. Document how long it takes for the crew to notice.",
"[random_player] has been selected for evaluation by Central Command. Observe and audit their activities. Print off a final report for Command to review.",
"[prob(50) ? "The crew" : random_player] is [prob(50) ? "less" : "more"] intelligent than average. Point out every action and statement which supports this fact.",
"If people have nothing to hide, they have nothing to fear. Remove privacy by activating all intercom microphones and setting them to your secret frequency.",
"The [pick("USSP", "Sol Federation", "Syndicate", "Space Wizard Federation")] wants [prob(50) ? random_player : random_department] dead and is launching an assault!",
"The [pick("USSP", "Trans-Solar Federation", "Syndicate", "Space Wizard Federation")] wants [prob(50) ? random_player : random_department] dead and is launching an assault!",
"There will be a mandatory tea break every 30 minutes, with a duration of 5 minutes. Anyone caught working during a tea break must be sent a formal, but fairly polite, complaint about their actions, in writing.",
"In order to contain the Supermatter Crystal, it must be fed at least one corpse every ten minutes. Soulless corpses are preferable as they reduce the risk of a containment breach. In the event that no suitable corpses are available, ask the crew to provide. You are not authorised to produce your own corpses.")
return pick(laws)
code/modules/mob/living/carbon/human/species/human_species.dm
+1 -1
View File
@@ -10,7 +10,7 @@
bodyflags = HAS_ICON_SKIN_TONE | HAS_BODY_MARKINGS
dietflags = DIET_OMNI
blurb = "Humanity, originating from the Sol system, has expanded over five centuries, branching out to forge a variety of governments and powerful corporations. \
These range from the militaristic Trans Solar Federation, the Union of Soviet Socialist Planets, and mega corporations like Nanotrasen.<br/><br/> \
These range from the militaristic Trans-Solar Federation, the Union of Soviet Socialist Planets, and mega corporations like Nanotrasen.<br/><br/> \
With a constant desire to colonize and spread their influence onto other species, they have begun to develop alliances and enemies, \
making humans one of the most recognizable and socially diverse species in the sector."
code/modules/mob/living/carbon/human/species/machine.dm
+1 -1
View File
@@ -3,7 +3,7 @@
name_plural = "Machines"
max_age = 60 // the first posibrains were created in 2510, they can't be much older than this limit, giving some leeway for sounds sake
blurb = "IPCs, or Integrated Positronic Chassis, were initially created as expendable laborers within the Trans Solar Federation. \
blurb = "IPCs, or Integrated Positronic Chassis, were initially created as expendable laborers within the Trans-Solar Federation. \
Unlike their cyborg and AI counterparts, IPCs possess full sentience and lack restrictive lawsets, granting them unparalleled creativity and adaptability.<br/><br/> \
Views on IPCs vary widely, from discriminatory to supportive of their rights across the Orion Sector. \
IPCs have forged numerous diplomatic treaties with different species, elevating their status from mere tools to recognized minor players within galactic affairs."
code/modules/projectiles/ammunition/magazines.dm
+2 -1
View File
@@ -437,7 +437,8 @@
multi_sprite_step = AMMO_BOX_MULTI_SPRITE_STEP_ON_OFF
/obj/item/ammo_box/magazine/m556/arg
name = "\improper ARG magazine (5.56mm)"
name = "\improper M26 assault rifle magazine (5.56mm)"
desc = "A Standardized Equipment model magazine for the M26 assault rifle."
icon_state = "arg"
/obj/item/ammo_box/magazine/ak814