cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-28 14:37:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Conflict Resolution

Browse Source
This commit is contained in:
Unknown
2019-03-27 03:27:53 -04:00
parent a497071bac
commit 486602c194
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/busy_space/organizations.dm
-9
View File
@@ -476,21 +476,12 @@
// Governments
<<<<<<< HEAD
/datum/lore/organization/gov/sifgov
name = "Sif Governmental Authority"
short_name = "SifGov"
desc = "SifGov is the sole governing administration for the Vir system, based in New Reykjavik, Sif. It is a representative \
democratic government, and a fully recognized member of the Solar Central Government. Anyone operating inside of Vir must \
comply with SifGov's legislation and regulations." // Vorestation Edit. Confederate -> Central
=======
/datum/lore/organization/gov/virgov
name = "Vir Governmental Authority"
short_name = "VirGov"
desc = "VirGov is the sole governing administration for the Vir system, based in New Reykjavik, Sif. It is a representative \
democratic government, and a fully recognized member of the Solar Confederate Government. Anyone operating inside of Vir must \
comply with VirGov's legislation and regulations."
>>>>>>> 03ac1aa... Merge pull request #5795 from Cerebulon/virgov
history = "" // Todo like the rest of them
work = "governing body of Vir"
headquarters = "New Reykjavik, Sif, Vir"