cyberpresidentvanellope/Hyper-Station-13
1
0
Fork 0
mirror of https://github.com/quotefox/Hyper-Station-13.git synced 2026-07-18 19:22:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into fairylights

Browse Source
This commit is contained in:
Dahlular
2022-04-04 20:48:35 -06:00
parent 592ded05c0 d3de9ae466
commit 1af2d40d66
4 changed files with 130 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hyperstation/code/modules/busy_space/organisations.dm
+2 -2
View File
@@ -385,7 +385,7 @@
Dzar works side-by-side with Kinaris, where Radiant Technology is their reward in return for high-grade metals."
history = ""
work = "metalsmithing, mining, and material research"
headquarters = "the hollow-world of Salis Major"
headquarters = "the hollow-world of Salis Primary A-4"
motto = "in virtue we trust"
ship_prefixes = list("DZ" = "hauling", "DZ" = "cargo", "DZA" = "asset security")
@@ -451,7 +451,7 @@
concerns peacefully through vigilance."
history = ""
work = "contracted policework"
headquarters = "Incandesce Seconda"
headquarters = "the ringworld of Incandesce Primara"
motto = "secure the people, save the future"
ship_prefixes = list("ZCO" = "transportation", "ZC" = "patrol")