cyberpresidentvanellope/YWPolarisVore
1
0
Fork 0
mirror of https://github.com/Yawn-Wider/YWPolarisVore.git synced 2026-08-27 23:16:43 +01: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
code/modules/catalogue/catalogue_data.dm
+3 -3
View File
@@ -352,9 +352,9 @@ GLOBAL_DATUM_INIT(catalogue_data, /datum/category_collection/catalogue, new)
name = "TSC - Major Bill's Transportation"
datum_to_copy = /datum/lore/organization/tsc/mbt
/datum/category_item/catalogue/information/organization/solgov
name = "Government - Solar Confederate Government"
datum_to_copy = /datum/lore/organization/gov/solgov
/datum/category_item/catalogue/information/organization/commonwealth //VS EDIT 1
name = "Government - Commonwealth of Sol-Procyon" //VS EDIT 2
datum_to_copy = /datum/lore/organization/gov/commonwealth //VS EDIT 3
/* //VOREStation Removal
/datum/category_item/catalogue/information/organization/virgov
code/modules/catalogue/catalogue_data_vr.dm
+3 -3
View File
@@ -66,6 +66,6 @@
/*
/datum/category_item/catalogue/information/organization/khi
name = "Government - Kitsuhana Heavy Industries"
datum_to_copy = /datum/lore/organization/gov/kitsuhana
*/
name = "Independents - Kitsuhana Heavy Industries"
datum_to_copy = /datum/lore/organization/other/kitsuhana
*/