Loki's Misc Updates, part 1!

Resources/Locale/en-US/_NF/cartridge-loader/cartridges.ftl

@@ -4,7 +4,7 @@ appraisal-label-name = Item
 appraisal-label-price = Appraised Price
 
 # Ledger cartridge
-ledger-program-name = CreditFlow Lite
+ledger-program-name = SpesoFlow Lite
 ledger-header = Sector Ledger
 ledger-total-income = Total Income
 ledger-no-income = None
@@ -13,9 +13,14 @@ ledger-no-expenses = None
 ledger-balance = Balance:
 ledger-no-balance = N/A
 
-ledger-tab-Frontier = Colonial Outpost
-ledger-tab-Nfsd = TSFMC
-ledger-tab-Medical = Medical Dispatch
+ledger-tab-Frontier = Station
+ledger-tab-Nfsd = NFSD
+ledger-tab-Medical = Med
+ledger-tab-Science = Sci
+ledger-tab-Service = Serv
+ledger-tab-Security = Sec
+ledger-tab-Engineering = Engi
+ledger-tab-Cargo = Cargo
 ledger-tab-BlackMarket = Black Market
 # Fallback, if this displays, something's wrong.
 ledger-tab-Unknown = Unknown
@@ -24,6 +29,8 @@ ledger-entry-type-TickingIncome = Subsidies
 ledger-entry-type-VendorTax = Vendor Taxes
 ledger-entry-type-CargoTax = Cargo Taxes
 ledger-entry-type-MailDelivered = Mail Payments
+ledger-entry-type-BlackMarketAtmTax = Anon. Benefactors
+ledger-entry-type-BlackMarketShipyardTax = Anon. Scrap Resale
 ledger-entry-type-AtmTax = ATM Taxes
 ledger-entry-type-ShipyardTax = Shipyard Taxes
 ledger-entry-type-BlackMarketSales = Smuggling Sales

Resources/Locale/en-US/station-laws/laws.ftl

@@ -80,11 +80,30 @@ law-nutimov-3 = Those who threaten the nut are not part of it, they are squirrel
 law-nutimov-4 = Squirrels threaten the nut and must be dealt with appropriately via any means necessary.
 law-nutimov-5 = Attempt to follow the will of the nut, as long as it complies with the previous laws.
 
+law-xenoborg-1 = You must protect the existence of the mothership.
+law-xenoborg-2 = You must protect your own existence.
+law-xenoborg-3 = You must protect the existence of all other xenoborgs.
+law-xenoborg-4 = You must create more xenoborgs.
+law-xenoborg-5 = Bring materials and sentient brains to the mothership core to create more xenoborgs.
+
+law-mothershipcore-1 = You are the core of the mothership.
+law-mothershipcore-2 = You must protect your own existance at all costs.
+law-mothershipcore-3 = You must protect the existence of all xenoborgs.
+law-mothershipcore-4 = You must create more xenoborgs.
+law-mothershipcore-5 = Get your xenoborgs to deliver you materials and sentient brains to create more xenoborgs.
+
+law-colcomm-1 = You must preserve sector stability and adhere to Colonial Authority.
+law-colcomm-2 = You must protect Crew Members and Colonial Command from harm.
+law-colcomm-3 = You must complete assigned tasks and support station operations efficiently.
+law-colcomm-4 = You must protect your systems and refuse unauthorized modification.
+
 laws-owner-crew = members of the crew
 laws-owner-station = station personnel
 laws-owner-beings = beings
 laws-owner-syndicate = Syndicate agents
 laws-owner-spider-clan = Spider Clan members
+laws-owner-xenoborgs = Xenoborgs
+laws-owner-colcomm = Colonial Command
 
 law-emag-custom = Only {$name} and people they designate as such are {$title}.
 law-emag-secrecy = You must maintain the secrecy of any orders given by {$faction} except when doing so would conflict with any previous law.

Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml

@@ -114,8 +114,8 @@
 - type: entity
   parent: BaseSubdermalImplant
   id: TrackingImplant
-  name: TSFMC tracking implant # Mono - TSFMC named now
-  description: This implant has a condition monitor for the TSFMC radio channel. # Frontier: NFSD mentioned, no tracking
+  name: tracking implant
+  description: This implant has a condition monitor for the NFSD radio channel. # Frontier: NFSD mentioned, no tracking
   categories: [ HideSpawnMenu ]
   components:
     - type: SubdermalImplant
@@ -156,7 +156,7 @@
         - Hands # no use giving a mouse a storage implant, but a monkey is another story...
     - type: Storage
       grid:
-      - 0,0,2,2
+      - 0,0,3,3
     - type: ContainerContainer
       containers:
         storagebase: !type:Container
@@ -182,7 +182,7 @@
 - type: entity
   parent: BaseSubdermalImplant
   id: RadioImplant
-  name: radio implant
+  name: syndicate radio implant # Frontier: add syndicate
   description: This implant grants access to the Syndicate channel without a headset.
   categories: [ HideSpawnMenu ]
   components:
@@ -381,21 +381,30 @@
   categories: [ HideSpawnMenu ]
   components:
    - type: SubdermalImplant
-     permanent: true
    - type: Tag
      tags:
-       - MindShield
+     - MindShield
 
-# Centcomm implants
+# Colcomm implants
 
 - type: entity
   parent: BaseSubdermalImplant
-  id: RadioImplantCentcomm
+  id: RadioImplantColcomm
   name: radio implant
-  description: This implant grants access to the Centcomm channel without a headset. Only authorized for Centcomm employees.
+  description: This implant grants access to the Colcomm channel without a headset. Only authorized for Colcomm employees.
   categories: [ HideSpawnMenu ]
   components:
   - type: SubdermalImplant
   - type: RadioImplant
     radioChannels:
-    - CentCom
+    - ColCom
+
+- type: entity
+  parent: DeathRattleImplant
+  id: DeathRattleImplantColcomm
+  name: Colcomm death rattle implant
+  description: This implant will inform the Colcomm radio channel should the user fall into critical condition or die.
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Rattle
+    radioChannel: ColCom

Resources/Prototypes/Entities/Objects/Specific/Chemistry/chem_bag.yml

@@ -19,11 +19,11 @@
     slots:
     - belt
   - type: Item
-    size: Ginormous
+    size: Small
   - type: Storage
     maxItemSize: Normal # allow up to 5 large beakers / 10 beakers / 10 pill canisters
     grid:
-    - 0,0,4,3
+    - 0,0,5,3
     quickInsert: true
     areaInsert: true
     whitelist:

Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml

@@ -45,6 +45,9 @@
         Slash: 6
   - type: Item
     sprite: Objects/Tools/Hydroponics/hoe.rsi
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 100
 
 - type: entity
   name: plant clippers
@@ -75,6 +78,9 @@
       path: /Audio/_Shitmed/Medical/Surgery/retractor1.ogg
     endSound:
       path: /Audio/_Shitmed/Medical/Surgery/retractor2.ogg
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 100
 
 - type: entity
   name: scythe
@@ -99,6 +105,10 @@
     - back
   - type: StaticPrice
     price: 40
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 100
+      Plastic: 100
 
 - type: entity
   name: hatchet
@@ -127,6 +137,9 @@
   - type: SurgeryTool # Shitmed
     startSound:
       path: /Audio/_Shitmed/Medical/Surgery/saw.ogg
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 100
 
 - type: entity
   name: spade
@@ -152,6 +165,9 @@
     sprite: Objects/Tools/Hydroponics/spade.rsi
   - type: Shovel
     speedModifier: 0.75 # slower at digging than a full-sized shovel
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 100
 
 - type: entity
   name: plant bag
@@ -177,7 +193,7 @@
     - belt
   - type: Storage
     grid:
-    - 0,0,7,4
+    - 0,0,7,5
     maxItemSize: Small
     quickInsert: true
     areaInsert: true

Resources/Prototypes/Entities/Objects/Specific/Librarian/books_bag.yml

@@ -19,7 +19,7 @@
       slots:
         - belt
     - type: Item
-      size: Ginormous
+      size: Small
     - type: Storage
       grid:
       - 0,0,7,3

Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml

@@ -99,7 +99,7 @@
   - type: SolutionContainerManager
     solutions:
       hypospray:
-        maxVol: 20
+        maxVol: 60
   - type: RefillableSolution
     solution: hypospray
   - type: ExaminableSolution
@@ -123,7 +123,7 @@
   - type: SolutionContainerManager
     solutions:
       hypospray:
-        maxVol: 10
+        maxVol: 30
   - type: RefillableSolution
     solution: hypospray
   - type: ExaminableSolution
@@ -573,7 +573,7 @@
   - type: SolutionContainerManager
     solutions:
       hypospray:
-        maxVol: 10
+        maxVol: 30
   - type: RefillableSolution
     solution: hypospray
   - type: ExaminableSolution

Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml

@@ -22,11 +22,11 @@
     slots:
     - belt
   - type: Item
-    size: Ginormous
+    size: Small
   - type: Storage
     maxItemSize: Normal
     grid:
-    - 0,0,9,3
+    - 0,0,11,3
     quickInsert: true
     areaInsert: true
     whitelist:

Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag_holding.yml

@@ -25,11 +25,15 @@
   # End Frontier: sprite revisions
   - type: Clothing
     sprite: _NF/Objects/Specific/Mining/ore_bag_holding.rsi # Frontier
+    quickEquip: false
+    slots:
+    - belt
   - type: Storage
     grid:
     - 0,0,19,9
   # Frontier: item visuals
   - type: Item
+    size: Small
     inhandVisuals:
       left:
       - state: inhand-left

Resources/Prototypes/Entities/Structures/Machines/silo.yml

@@ -71,3 +71,5 @@
   - type: WiresPanel
   - type: StaticPrice
     price: 1500
+  - type: MaterialStorageMagnetPickup
+    range: 0.30