cyberpresidentvanellope/Citadel-Station-13-RP
1
0
Fork 0
mirror of https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git synced 2026-08-24 16:36:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into init_three

Browse Source
This commit is contained in:
kevinz000
2019-09-06 11:40:31 -07:00
parent 25af320f12 ab9d990b67
commit fb4a154ea3
11 changed files with 1636 additions and 1363 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/lore_codex/lore_data/orgs.dm
+1 -1
View File
@@ -30,6 +30,6 @@
/*
/datum/lore/codex/category/auto_org/mil
name = "Militaries"
name = "Para-Militaries & Private Security"
desired_type = /datum/lore/organization/mil
*/
code/modules/lore_codex/lore_data_vr/orgs.dm
+2 -2
View File
@@ -34,6 +34,6 @@
/datum/lore/codex/category/auto_org/mil
name = "Militaries"
auto_keywords = list("Mil","Military", "Militaries")
name = "Military Forces & Private Security"
auto_keywords = list("Mil","Military","Militaries","Security")
desired_type = /datum/lore/organization/mil