cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 23:48:28 +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 13:04:56 +00: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/game/gamemodes/changeling/changeling.dm
+1 -1
View File
@@ -6,7 +6,7 @@ GLOBAL_LIST_INIT(possible_changeling_IDs, list("Alpha","Beta","Gamma","Delta","E
name = "changeling"
config_tag = "changeling"
restricted_jobs = list("AI", "Cyborg")
protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation General")
protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Trans-Solar Federation General")
protected_species = list("Machine")
required_players = 15
required_enemies = 1
code/game/gamemodes/cult/cult_mode.dm
+1 -1
View File
@@ -6,7 +6,7 @@
/datum/game_mode/cult
name = "cult"
config_tag = "cult"
restricted_jobs = list("Chaplain", "AI", "Cyborg", "Internal Affairs Agent", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Blueshield", "Nanotrasen Representative", "Magistrate", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation General")
restricted_jobs = list("Chaplain", "AI", "Cyborg", "Internal Affairs Agent", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Blueshield", "Nanotrasen Representative", "Magistrate", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Trans-Solar Federation General")
protected_jobs = list()
required_players = 30
required_enemies = 3
code/game/gamemodes/traitor/traitor.dm
+1 -1
View File
@@ -2,7 +2,7 @@
name = "traitor"
config_tag = "traitor"
restricted_jobs = list("Cyborg")//They are part of the AI if he is traitor so are they, they use to get double chances
protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation General")
protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Trans-Solar Federation General")
required_players = 0
required_enemies = 1
recommended_enemies = 4
code/game/gamemodes/trifecta/trifecta.dm
+1 -1
View File
@@ -6,7 +6,7 @@
/datum/game_mode/trifecta
name = "Trifecta"
config_tag = "trifecta"
protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Solar Federation General")
protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Trans-Solar Federation General")
restricted_jobs = list("Cyborg")
secondary_restricted_jobs = list("AI")
required_players = 25
code/game/gamemodes/vampire/traitor_vamp.dm
+1 -1
View File
@@ -2,7 +2,7 @@
name = "traitor_vampire"
config_tag = "traitorvamp"
traitors_possible = 3 //hard limit on traitors if scaling is turned off
protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Solar Federation General")
protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Trans-Solar Federation General")
restricted_jobs = list("Cyborg")
secondary_restricted_jobs = list("AI", "Chaplain")
required_players = 10
code/game/gamemodes/vampire/vampire_gamemode.dm
+1 -1
View File
@@ -2,7 +2,7 @@
name = "vampire"
config_tag = "vampire"
restricted_jobs = list("AI", "Cyborg")
protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Chaplain", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation General")
protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Chaplain", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Trans-Solar Federation General")
protected_species = list("Machine")
required_players = 15
required_enemies = 1
code/game/jobs/access.dm
+8 -8
View File
@@ -97,7 +97,7 @@
return get_all_centcom_access() + get_all_accesses()
if("Special Operations Officer")
return get_all_centcom_access() + get_all_accesses()
if("Solar Federation General")
if("Trans-Solar Federation General")
return get_all_centcom_access() + get_all_accesses()
if("Nanotrasen Navy Representative")
return get_all_centcom_access() + get_all_accesses()
@@ -388,13 +388,13 @@
/proc/get_all_solgov_jobs()
return list(
"Sol Trader",
"Solar Federation Marine",
"Solar Federation Lieutenant",
"Solar Federation Specops Marine",
"Solar Federation Specops Lieutenant",
"Solar Federation Representative",
"Solar Federation General")
"Trans-Solar Federation Trader",
"TSF Marine",
"TSF Lieutenant",
"MARSOC Marine",
"MARSOC Lieutenant",
"Trans-Solar Federation Representative",
"Trans-Solar Federation General")
/proc/get_all_soviet_jobs()
return list(
code/game/jobs/job/central.dm
+2 -2
View File
@@ -101,11 +101,11 @@
H.mind.offstation_role = TRUE
/datum/job/ntspecops/solgovspecops
title = "Solar Federation General"
title = "Trans-Solar Federation General"
outfit = /datum/outfit/job/ntspecops/solgovspecops
/datum/outfit/job/ntspecops/solgovspecops
name = "Solar Federation General"
name = "Trans-Solar Federation General"
uniform = /obj/item/clothing/under/rank/centcom/captain/solgov
suit = /obj/item/clothing/suit/space/deathsquad/officer/solgov
head = /obj/item/clothing/head/helmet/space/deathsquad/beret/solgov
code/game/machinery/tcomms/nttc.dm
+8 -8
View File
@@ -59,13 +59,13 @@
"Nanotrasen Navy Representative" = "dsquadradio",
"Research Officer" = "dsquadradio",
"Special Operations Officer" = "dsquadradio",
"Sol Trader" = "dsquadradio",
"Solar Federation General" = "dsquadradio",
"Solar Federation Representative" = "dsquadradio",
"Solar Federation Specops Lieutenant" = "dsquadradio",
"Solar Federation Specops Marine" = "dsquadradio",
"Solar Federation Lieutenant" = "dsquadradio",
"Solar Federation Marine" = "dsquadradio",
"Trans-Solar Federation Trader" = "dsquadradio",
"Trans-Solar Federation General" = "dsquadradio",
"Trans-Solar Federation Representative" = "dsquadradio",
"MARSOC Lieutenant" = "dsquadradio",
"MARSOC Marine" = "dsquadradio",
"TSF Lieutenant" = "dsquadradio",
"TSF Marine" = "dsquadradio",
"Supreme Commander" = "dsquadradio",
"Thunderdome Overseer" = "dsquadradio",
"VIP Guest" = "dsquadradio",
@@ -140,7 +140,7 @@
/// List of CentComm jobs
var/list/cc_jobs = list("Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Intel Officer", "Medical Officer", "Nanotrasen Navy Captain", "Nanotrasen Navy Representative", "Research Officer", "Supreme Commander", "Thunderdome Overseer")
/// List of SolGov Marine jobs
var/list/tsf_jobs = list("Solar Federation Specops Lieutenant", "Solar Federation Specops Marine", "Solar Federation Lieutenant", "Solar Federation Marine", "Solar Federation Representative", "Solar Federation General", "VIP Guest")
var/list/tsf_jobs = list("MARSOC Lieutenant", "MARSOC Marine", "TSF Lieutenant", "TSF Marine", "Trans-Solar Federation Representative", "Trans-Solar Federation General", "VIP Guest")
// Defined so code compiles and incase someone has a non-standard job
var/job_class = "radio"
// NOW FOR ACTUAL TOGGLES
code/game/objects/items/devices/radio/headset.dm
+6 -3
View File
@@ -352,10 +352,12 @@
item_state = "com_headset_alt"
/obj/item/radio/headset/ert/alt/solgov
name = "\improper Trans-Solar Federation Marine's bowman headset"
name = "\improper Trans-Solar Marine Corps bowman headset"
desc = "An ergonomic combat headset used by the TSMC. Protects against loud noises."
/obj/item/radio/headset/ert/alt/solgovviper
name = "\improper Trans-Solar Federation Infiltrator's bowman headset"
name = "\improper 3rd SOD bowman headset"
desc = "A custom-fitted headset used by the commandos of the Federal Army's renowned 3rd Special Operations Detachment, more commonly known as the Vipers."
/obj/item/radio/headset/ert/alt/commander
name = "ERT commander's bowman headset"
@@ -364,7 +366,8 @@
instant = TRUE
/obj/item/radio/headset/ert/alt/commander/solgov
name = "\improper Trans-Solar Federation Lieutenant's bowman headset"
name = "\improper Trans-Solar Marine Corps officer's bowman headset"
desc = "An ergonomic combat headset used by the TSMC. This model is equipped with an extra-strength transmitter for barking orders."
/obj/item/radio/headset/centcom
name = "centcom officer's bowman headset"
code/game/objects/items/weapons/storage/backpack.dm
+2 -2
View File
@@ -937,8 +937,8 @@
//Solgov
/obj/item/storage/backpack/ert/solgov
name = "\improper TSF marine backpack"
desc = "A spacious backpack with lots of pockets, worn by marines of the Trans-Solar Federation."
name = "\improper TSF marine rucksack"
desc = "A spacious rucksack covered in pouches and pockets, worn by marines of the Trans-Solar Federation."
icon_state = "ert_solgov"
/obj/item/storage/backpack/ert/deathsquad