cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

Browse Source
This commit is contained in:
izac112
2020-06-17 04:30:06 +02:00
parent 12f84343ab dae1d92832
commit 4864ad384d
116 changed files with 10186 additions and 4123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/lore_codex/lore_data_vr/main.dm
View File

@@ -10,6 +10,7 @@
/datum/lore/codex/category/important_locations,
/datum/lore/codex/category/species,
/datum/lore/codex/category/auto_org/tsc,
/datum/lore/codex/category/auto_org/other,
/datum/lore/codex/category/auto_org/gov,
/datum/lore/codex/category/auto_org/mil,
/datum/lore/codex/category/political_factions,

8
code/modules/lore_codex/lore_data_vr/orgs.dm
View File

@@ -27,13 +27,17 @@
the biggest and most influential of them all. Some people also categorize the different TSCs into 'major' and 'minor' TSCs."
desired_type = /datum/lore/organization/tsc
/datum/lore/codex/category/auto_org/other
name = "Other Factions"
auto_keywords = list("KHI","SDF","Smuggler","Smugglers","Pirate","Pirates")
desired_type = /datum/lore/organization/other
/datum/lore/codex/category/auto_org/gov
name = "Governments"
auto_keywords = list("Gov","Government","Governments")
desired_type = /datum/lore/organization/gov
/datum/lore/codex/category/auto_org/mil
name = "Militaries"
name = "Military Forces & PMCs"
auto_keywords = list("Mil","Military", "Militaries")
desired_type = /datum/lore/organization/mil