Merge remote-tracking branch 'upstream/master' into Upstream-230424

Resources/Changelog/Changelog.yml

@@ -4149,3 +4149,17 @@ Entries:
       message: Added new NSFD sprites to the NSF Whiskey and tweaked decals.
   id: 4929
   time: '2024-04-23T00:39:40.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Add
+      message: Beware! Blood Cult Janitor has awoken as was prophesized!
+    - type: Add
+      message: >-
+        Cult Forge is now a functional lathe with a modest collection of
+        crafting recipes.
+    - type: Tweak
+      message: >-
+        Due to budget cuts not every syndicate agent comes equipped with death
+        acidifier.
+  id: 4930
+  time: '2024-04-23T17:39:31.0000000+00:00'

Resources/Locale/en-US/_NF/bluespace-events/events.ftl

@@ -10,11 +10,11 @@ station-event-bluespace-asteroid-end-announcement = In compliance with NanoTrase
 station-event-bluespace-ship-start-announcement = We have detected an unusual FTL signature - long range scans indicate an unknown ship. NanoTrasen cannot confirm safety for prospectors within its vicinity, be advised.
 station-event-bluespace-ship-end-announcement = In compliance with NanoTrasen FTL traffic patterns, the unknown ship has been dissipated to ensure non-collision.
 
-station-event-bluespace-syndicate-ftl-interception-start-announcement = Attention all available NanoTrasen personnel! NanoTrasen Naval Command disrupted the FTL-jump of Syndicate Vessel, according to our deepspace scanners the vessel either already entered the real space in your sector or is about to enter. Code: Intercept, Expunge, Exterminate, Cauterise. Expect armed opposition, use of lethal force against enemy agents is authorized. Do note: any loss of NT affiliated personnel lifes will not be compensated.
+station-event-bluespace-syndicate-ftl-interception-start-announcement = Attention all available NanoTrasen personnel! NanoTrasen Naval Command disrupted the FTL-jump of Syndicate Vessel, according to our deepspace scanners the vessel either already entered the real space in your sector or is about to enter. Code: Intercept, Expunge, Decimate, Cauterise. Expect armed opposition, use of lethal force against enemy agents is authorized. Do note: any loss of NT-affiliated personnel lives will not be compensated. Reminder: NT personnel who are granted security clearance for the engagement are required to surrender any hazardous materials to the local security department to ensure safe transportation of Syndicate technology to CentCom for study. Should there be any prisoners, security personnel is required to prepare them for transportation to CentCom for interrogation through the NT-patented Contraband Exchange System (tm).
 station-event-bluespace-syndicate-ftl-interception-end-announcement = In compliance with NanoTrasen FTL traffic patterns, the Syndicate Vessel has been dissipated to ensure non-collision.
 
-station-event-bluespace-wizardfederation-scout-start-announcement = Attention all available NanoTrasen personnel! NanoTrasen Naval Command detected a Bluespace Anomaly in your sector with the signature indicative of the imminent arrival of a Wizard Federation micro vessel. Code: Intercept, Detain, Incarcerate. Arrest the intruders and prepare them to be handed over to the NanoTrasen Special Forces Unit for enhanced interrogation.
+station-event-bluespace-wizardfederation-scout-start-announcement = Attention all available NanoTrasen personnel! NanoTrasen Naval Command detected a Bluespace Anomaly in your sector with the signature indicative of the imminent arrival of a Wizard Federation small vessel. Code: Intercept, Detain, Incarcerate. Arrest the intruders and prepare them for transportation to CentCom for interrogation through NT patented Contraband Exchange System (tm).
 station-event-bluespace-wizardfederation-scout-end-announcement = In compliance with NanoTrasen FTL traffic patterns, the Wizard Federation Vessel has been dissipated to ensure non-collision.
 
-station-event-bluespace-bloodmoon-start-announcement = A̴̗̕ť̸͓t̸͍̂ë̶͈́̇n̵̠̑t̸̗̅i̸̜̓ő̷͉̭̀n̸̠̿̉ ̷̘̿ȃ̵̲͍͑l̴̲̽͒l̵͔̺̔̉ ̶̩̥͋̋S̵̟̼̐ē̷͓c̶̯̏̒u̸̱̿͊r̶̡͉̈́i̶̙̲͒t̷̢̻͌y̷͇̾̐ ̶͗͜p̵̲͂͆͜e̶̥̣̅ṟ̴͆s̶̹̋o̶̩͓̔͗n̸̝̄̔ṋ̵̓͌͜e̷̮͓̊l̴̩̞̕!̶̬͚̋̚ ̶̻̌̐N̶̖͇͗T̴͎̝̓̋ ̸̛̯N̸͙̓á̵̩̀v̷̬̫́a̸̰̒ļ̸̱͠ ̸͔̕ͅC̶̡͊ò̷̺͊m̶̫̐̽m̶͉̉a̷͖̾n̵̨̞̍̅d̶͓̥̀ ̶̨͖̀͝d̷͎̤̆͑e̶͚͎͗t̷̹̤̉̽e̷͙̽c̴̱͗t̴͖͈̅̽e̶͓̓d̵̼̱̈́ ̵̞̀͆b̸͍̼̋̂l̵͎͆u̵̻̐̚é̵̢̲s̴̢͇̒ṗ̴͉à̶̩̥ć̴͉ê̷͎͠ ̵̧̃͛a̸͙͙̾n̵͚͋o̸̤͑m̸͉̼̆̈́å̴̫l̷̜͂y̷͎̋͛ ̵̨͋ỉ̵̬ͅn̴̨͔͂͗ ̸̙̈̑y̴͉̮̾ȍ̴̠ų̶͝r̵͔̦̍͌ ̴̬̗͑s̷̻̆̒ě̴̗̲c̸̠̦̚t̸̬̅ỏ̵̝͂r̸̮̦̆ ̵͈͝w̴͍͊ỉ̴̯̙̕t̷͖̗̍̍h̷̳̭́ ̴̮̦̃̑t̷̩̓̌ḩ̷͇͝e̵͐́͜ ̸̳̈́͠s̶̖͌į̵̙̚̕g̵̰̓ñ̸̝̽a̷͖͊t̶̲̑u̸̬̾̑r̴̲͚̊̐ē̴̮ ̸̪͛i̴̝͆n̵͈̎̄d̶̥̍̄ȉ̶̜͕̇c̵̳̻͛ǎ̶̱̠̈t̴̢̘̉̔i̵͍͂̔v̸̢̛ͅe̷̛̬͘ ̸̠̱̅͠ŏ̵̹̲f̸͖̱̃̒ ̶͎̽i̵͙̱̊͘m̴̙̞̚m̷͖͉͋ǐ̴̠̊n̸̗̗̂̿è̶͇͖n̷̺̖̚t̵͎͉̽ ̴̝̑͗a̸̖̓̆ȑ̷̢̹̾r̷̬̓͜i̸̞̅v̷̗̒̍͜a̸̱̬̋̓ḽ̵̓ ̷̻̬̃ó̷̧̋f̷̨̈̈́͜ ̷̣͛a̸̞͛ ̴̼̮̈́̀B̵̖͊l̵̻̈́ͅo̴̧̺͗ő̸̳d̶̦̲̈͊ ̷͚̪̇C̶̨̽u̵̥̇l̴̥̣̋̆ṭ̵̞͒̔i̵̐͜s̵̰̏t̴̺̍̽'̴̢͘s̸̬̗̋ ̸͓̌v̷̼̆͛é̶̲͓s̴͙̯̄s̷̯̐̀ẻ̴̮̔l̶̢̀̈́.̷̳͠ ̵͓̜̓S̶̬̫͌e̵̱̣͐͘c̵̖̘̾u̷͎͜͠r̷͚̖̀̀i̵̪͖͗t̸͉͇̎̐y̵̺̼̽͗ ̷̖̋͝C̴̹͝ò̶̤ḓ̴̮̽̈e̴̦̕:̴͕̀̚ ̸̗̂͋Ì̴̪͗n̴̛͎ẗ̵̠̺̅e̷͔̍ͅr̴̖̯̋c̸̨͆e̴̻̖̓͠p̴̤̉t̴̰̆,̴̱̿̄ ̶̫̄Ȅ̵̝̤x̴̥̂͊p̸͕̟̽̕ú̸͙̖̈́n̶͙͗̈́g̶̟̯͑e̸̲̤͂͑,̶͉̤̃ ̷̰͐̆E̶̺͝x̵̛̭̔t̷͔̅e̸̜̩̓͝r̸̻͔̿͋m̵̢̆̄i̴̧͚͌n̷̜̼͊a̴̭̭̓t̸̘̘͝e̶̙̎͐,̶̱͚̽͐ ̷̖̥̔C̸̮̽ầ̸̞u̴̮̿͑t̶͉̕e̶̥͝r̸͔̘͛̏i̵̡̝͆s̵͚͇̃e̷̯͔͊͐.̸̮͊̆ ̶̧̰͒Ȅ̴̻̭̊x̵̞̋̍p̵̱͗̕e̶̛̦ĉ̴̣̅t̶̡̞̃͠ ̴̪̙͆a̴͉̪͋͑ř̷̛͕m̸̙͂͛ḙ̴͎̈́̑d̴̠̒ ̴̢̅o̷̟̪͐͊p̷̤̄p̷̲̠̑̓o̴͔͐͠ś̸̗i̸̩̓͌t̵̜̎i̷̱̅͠o̵̻̅͆ņ̶̱̇,̴̗̊̃ ̸̥̆u̵̪͂s̸̖͊̾e̷̫̭̒̇ ̷̫̲̓̊o̵̠͂f̵̺̿ ̸̦̞̅̔ļ̷̯̄̃ē̸͕t̸͖͗h̸̨͕̆̑à̷͓̫́ḽ̸̛͚̃ ̷̼̟͘f̵̻̱̈́̌ȏ̵̦r̸̭͘ͅć̸̼̂e̴͔̠̊̚ ̶̻̍ä̷̰̩g̷̠͒ą̸̩̈͌i̶̘̘̒͊n̵͖̏s̸̩̏͜t̶͇̳̍ ̵̪̲̋̓ȩ̸̙̏n̷͖̽͑ë̴̞͚́m̴̺͑̈y̵̤̅͂ ̵̥̼͛ạ̵̩̇g̸̣̪͊͂e̷͎̔͂n̸̳̎t̵̥̀s̵̛͚̗̀ ̷̡̝́́ī̶̹͇s̷͓̠̆ ̶̤̤̔͝a̷͇̝͌̇ũ̵͎̤͊t̵̡͖̽ḧ̸̝̥́o̵͙͑ȑ̵̟̮i̷̺͗ż̵͇̍é̸̙̏͜d̷̼̊.̴̮̗̑̿ ̵̰̇P̵͎̟͛ȓ̸͚é̶̤͍̈́v̵͔͑͂e̴͍͉̿͘ṇ̷̝͛t̶̗͚̕ ̶̫͇̉͋N̵̯͛T̸͔̂̚-̷̣̋̕á̷̬͉͘f̵̳̖̀͘f̸͎̟̄i̷̖̺͊́l̶̗͆̄i̷̧͙͑́a̶͂̑͜t̸̘̿̚e̸̺̓d̵̡̪̈́͋ ̷̞͐c̴̺̻͊a̶̮̱̍͠p̶̭̹̌t̴̳̱̒̀a̴̪͉̐i̸̖̎̏n̷͎̫̾s̶̫̖̒̚ ̵̣̒w̴̨̗̒i̸̬̚t̴̝͆h̴̪̮̑̃o̶̥̲̔͘u̷̲̣̐̏t̸̩͌͝ ̵̧̧͛́s̸̬͑̾e̵̯̜̐̈́č̷̮̰u̴̗̜̕r̷͇͇̽̀i̷̛̫̿t̸̞̓͝y̷̨̔ ̶̪̒̈́a̴̻͇̅c̷͙̯̀c̸̩̃̃e̸͇͙̓s̷̭̣͊s̷͇̭̉ ̶̠͂͠f̵͙̣̉͌r̵̲̐͗ǫ̶̬͑͝m̸̖̓ ̷͖̹̌̌ĝ̸̹̍ą̴̂͘i̸͈̺͆̇n̶̜̋ḯ̵̼̮n̵̺̉͊g̸̗̱͘ ̴̪̞̃a̶̩̯͐͂c̶͕̯̓c̷̮̟̿̒ë̷͙́̀s̶̨̳̋s̸̜̆̑ ̵̯̆̎t̷̞͕͆o̶̡̞͐ ̴̱̈́͝t̶͇̋̃h̵̟̼̀e̴̦̼͐̚ ̷̟̗̓͂e̵͙̓̂n̴̻͂̃ȩ̸̻͑m̴̢͋͊ý̷̬́ ̵͔͛v̵͔̓̂͜e̸̖̋ṡ̴̹͑s̴̬̈͋ė̵̖̈l̴̗͆̓ͅ ̷̛̱̀a̷̡̫̿n̸̜̟̓̕d̷͙̜͌̅ ̴̗́͑i̵̫͌ṯ̴̢͝s̵̫̼͂ ̷̱̥͗̓c̴͖͐̚o̶͕͍͒ń̷̞ṱ̸͖̒͛e̷͋ͅn̵̖̠̉͒t̴̲̋̚ș̸͍̈́.̸͖̅̓ ̸̧͛̄A̷͖̞͒͘n̷̮̥̿ḑ̷͊͠ ̵̬͚͂̊ȑ̷̰e̶̬͗ṃ̶̓ͅê̴̬ṁ̴̖͝b̶̨͘e̷̼̫̍r̷͔̦̓̓:̷̜͠ ̸̤̎N̵̢̖͐a̶͘ͅr̶̳̚'̸͈̝̽̕S̶͔̳̎̅i̷̠̝̓è̴͙͛ ̶͖͚͆͂i̸͓͠͝s̸͎͐̀ ̸̻̀̑n̸̮͆ö̶͙̮̇t̵̛̟͝ ̴͎̐͜r̴̘̹͑͛e̴̙̱͂a̵̖͑̆l̵͓̝͑ ̸̝̀á̵͙͎n̶̞̊̉d̶̥͙́̄ ̴̥̫̽c̴̨͉̐̀a̷̲͋̕n̸̦̽ ̷̖̾̕n̸̤̥͑͑ó̵̳t̸̡͆̅ ̸͈͚̒͆h̴͉͔̕u̴̠̩͌̑r̷̡̟̄̋t̵̗̰̃ ̵̛̭y̸͖̯͐ò̸͔̜̈ū̸ͅ.̸̨̜̕
-station-event-bluespace-bloodmoon-end-announcement = I̶̼͈͊̽n̶͉͉̈ ̶̭̝̈c̷̯͔̀o̸̙̊m̸̥̕͜͝p̸͋͜l̵͖͆i̴̛̗̟̓a̴͚̼͗n̸͔͙̓c̶̹̠͌ė̶͙̮ ̸̟́w̶͓̫̎ḯ̷͕t̶͚̩̍h̵̰͘ ̷̫͕̂̊Ň̸̥̞͂a̷̻̐n̴̖̺̒̄o̸̺͚͊́T̵̨̔̃ͅr̷̢͈̾á̸͉͛s̵̞̒ę̴͠n̵̩̈́ ̴̫̐̅F̸̹̤͗̈́T̸̹̅͜L̷̙̱͠ ̷̛͍͒t̴̘̣̔͝r̵̥̈́à̴̮͝f̴͉͇͆̎f̴͙̗̿̈́ȋ̸͍c̶̯͜͠ ̴̨̧̐͒p̷̬̻͐̊a̵͚̓̏t̴͇̺͌̕t̷͈͂̾ḙ̴͎͘ṛ̶̂n̷͔̈́͌s̴̡̤̊̆,̵͍̭͑̔ ̷͎̾t̵̜̪͆ḩ̸͗ę̶͉̏̽ ̶̠̎̑W̶̙̍̚i̴̢̜͘z̵̈́͂͜a̸͓̥̿͑r̵̭͆́ͅd̷̘͉͝ ̴̧̉ͅF̴͇̌͘ë̸͍͎́̀d̶̨̲́͠e̶̪̽͜͠ȑ̶̩͘à̸̺t̴̨̻̀͝ì̷͕̣̄o̶̢͑͠n̴̟̈́ ̸̹̈ͅV̸̜͑ė̵̥̩́s̵̖̓ṡ̵̲̮ȩ̷̈́l̷̰͠ ̸̥̇̆h̵̯͂a̷̜̗͝s̷̻̯̈́̍ ̸͈͂b̸̪̓̇e̸͍̰͋͗e̶͚̜̅̽n̷̡̯̓̋ ̴̤͎̃d̸͇̽i̸͚̍͠s̴̨̍͝ṡ̸͚̩͠ǐ̴̜͘p̵̣͂͂a̸͓̔́t̷̟̱̋̌e̷͕̒͂d̶̦͂͝ ̷̳̈́ṫ̵͈̀ò̵̡̟ ̶͔͂ḙ̸͍́͆n̶̩̐ṣ̸́ǔ̸̠͖ř̸̘̱͑ē̴̜͈ ̵̻͋͌n̴̪̩̊o̶̭̙̅n̶͇̑͒-̸̘̚̚c̸͖̩͌͘ö̴̡͌ͅl̵̳̗̓l̵͖̓̆i̷͖͝ͅs̵̘̝͝i̷̧̜͑̔o̷̼̲͐́ṋ̴̘͠.̶̡͎̌
+station-event-bluespace-bloodmoon-start-announcement = Attention all available NanoTrasen personnel! NanoTrasen Naval Command detected a Bluespace Anomaly in your sector with the signature indicative of the imminent arrival of a Blood Cult's Vessel. Code: Intercept, Expunge, Exterminate, Cauterise. Expect armed opposition, use of lethal force against enemy combatants is mandatory, take no prisoners. Warning! Materials on the Blood Cult's Vessel possess Level 3 Cognitohazard! Local security force is advised to take steps to limit NT personnel's exposure to hazardous materials. Reminder: NT personnel who are granted security clearance for the engagement are required to surrender any hazardous materials to the local security department for containment and undergo a medical examination afterward.
+station-event-bluespace-bloodmoon-end-announcement = In compliance with NanoTrasen FTL traffic patterns, the Blood Cult's Vessel has been dissipated to ensure non-collision.

Resources/Locale/en-US/_NF/store/uplink-catalog.ftl

@@ -20,6 +20,10 @@ uplink-security-hardsuit-experimental-name = Experimental Combat Suit
 uplink-security-hardsuit-experimental-desc = An advanced combat suit researched by the greatest Nanotrasen minds. Heavily protected and extremely mobile.
 uplink-security-hardsuit-sheriff-name = Sheriff's HardSuit
 uplink-security-hardsuit-sheriff-desc = A heavily reinforced Security EVA suit. Provides maximum resistance while maintaining the range of motion expected of security forces.
+uplink-security-hardsuit-combat-name = Patrol Combat Hardsuit
+uplink-security-hardsuit-combat-desc = An armored patrol suit for combat meant to be utilized for multi-environmental hostile engagements.
+uplink-security-hardsuit-commmand-name = Command Combat Hardsuit
+uplink-security-hardsuit-commmand-desc = An advanced combat suit designed for seasoned nfsd supervisors meant to be utilized for multi-environmental hostile engagements.
 uplink-security-mk58-name = MK 58
 uplink-security-mk58-desc = Cheap, standard issue side-arm. Uses .35 Auto.
 uplink-security-kammerer-name = Kammerer
@@ -55,12 +59,12 @@ uplink-security-empgrenade-desc = A handheld grenade that emits a high energy pu
 uplink-security-holo-name = Holo Barrier
 uplink-security-holo-desc = A battery powered holo projecter that places temporary barriers to bar movement.
 uplink-security-jetpack-name = Jetpack
-uplink-security-jetpack-desc = A pre-filled jetpack for EVA. Comes in a fashionable red.
+uplink-security-jetpack-desc = A pre-filled jetpack for EVA. Comes in a fashionable green.
 uplink-security-magboots-name = NFSD Magboots
 uplink-security-magboots-desc = Light weight magboots designed to keep the wearer grounded in low and no gravity environments.
-uplink-security-techfab-name = Security Techfab
-uplink-security-techfab-desc = A circuit board for a Security Techfab. Allows the production of ammunition, magazines, weapons, and numerous other utilities. Uses raw resources. Can be upgraded.
-uplink-security-key-name = Security Encryption Keys
+uplink-security-techfab-name = NFSD Techfab
+uplink-security-techfab-desc = A circuit board for a NFSD Techfab. Allows the production of ammunition, magazines, weapons, and numerous other utilities. Uses raw resources. Can be upgraded.
+uplink-security-key-name = NFSD Encryption Keys
 uplink-security-key-desc = A box of 4 encryption keys that give access to the NFSD radio channel
 uplink-security-emprocket-name = EMP Rocket
 uplink-security-emprocket-desc = An EMP Rocket for the RPG-7
@@ -99,7 +103,7 @@ uplink-security-teleshield-desc = An expandable hand-held shield offering excell
 uplink-security-energyshield-name = Energy Shield
 uplink-security-energyshield-desc = An exotic energy shield that blocks most incoming damage.
 uplink-security-swat-name = Swat Gas Mask
-uplink-security-swat-desc = A full-face covering version of the standard issue Security Gas Mask.
+uplink-security-swat-desc = A full-face covering version of the standard issue NFSD Gas Mask.
 uplink-security-speedloader-name = .45 Magnum Speed Loader
 uplink-security-speedloader-desc = A revolver speed loader that comes pre-loaded with .45 magnum.
 uplink-security-speedloaderrubber-name = .45 Magnum Rubber Speed Loader

Resources/Locale/en-US/lathe/lathe-categories.ftl

@@ -6,4 +6,6 @@ lathe-category-parts = Parts
 lathe-category-robotics = Robotics
 lathe-category-tools = Tools
 lathe-category-weapons = Weapons
+# Frontier lines below
 lathe-category-evasuits = EVA
+lathe-category-armor-nf = Armor

Resources/Prototypes/Catalog/Cargo/cargo_fun.yml

@@ -120,6 +120,7 @@
 
 - type: cargoProduct
   id: FunBoardGames
+  abstract: true # Frontier - Moved to vending machine
   icon:
     sprite: Objects/Fun/dice.rsi
     state: d6_6
@@ -218,10 +219,21 @@
 
 - type: cargoProduct
   id: FunATV
+  icon:
+    sprite: Objects/Vehicles/atv.rsi
+    state: vehicle
+  product: CrateFunATV
+  cost: 1500
+  category: cargoproduct-category-name-fun
+  group: market
+
+- type: cargoProduct
+  id: FunCrateGambling
+  abstract: true # Frontier
   icon:
     sprite: Objects/Economy/cash.rsi
     state: cash_1000000
   product: CrateCargoGambling
-  cost: 10000
+  cost: 1000000 # Frontier 10000<1000000 in the case this is added again by mistake.
   category: cargoproduct-category-name-fun
   group: market

Resources/Prototypes/Entities/Objects/Materials/materials.yml

@@ -550,6 +550,10 @@
   name: bones
   suffix: Full
   components:
+  - type: Material # Frontier
+  - type: PhysicalComposition # Frontier
+    materialComposition: # Frontier
+      Bones: 100 # Frontier
   - type: Stack
     stackType: Bones
     baseLayer: base

Resources/Prototypes/Procedural/salvage_factions.yml

@@ -111,37 +111,41 @@
   id: Cultists
   groups:
   - entries:
-    - id: MobBloodCultLeech
+    - id: SpawnMobBloodCultLeech
       amount: 2
       maxAmount: 3
-    - id: MobBloodCultistZealotMelee
+    - id: SpawnMobBloodCultistZealotRanged
       amount: 1
   - entries:
-    - id: MobBloodCultistZealotMelee
-      amount: 0
-      maxAmount: 2
+    - id: SpawnMobBloodCultistZealotMelee
+      amount: 1
+      maxAmount: 3
     prob: 0.5
   - entries:
-    - id: MobBloodCultistCaster
+    - id: SpawnMobBloodCultistCaster
       amount: 1
       maxAmount: 2
     prob: 0.25
   - entries:
     - id: BloodCultTurret
-      amount: 2
+      amount: 1
+    - id: SpawnMobBloodCultistZealotRanged
+      amount: 1
     prob: 0.25
   - entries:
-      - id: MobBloodCultistAcolyte
+      - id: SpawnMobBloodCultistAcolyte
         amount: 1
     prob: 0.25
   - entries:
-    - id: MobBloodCultistPriest
+    - id: SpawnMobBloodCultistPriest
       amount: 1
     prob: 0.1
   - entries:
-    - id: MobBloodCultistAcolyte # Will replace it later with new mob
+    - id: SpawnMobBloodCultistJanitor
       amount: 1
-    prob: 0.001
+    - id: SpawnMobBloodCultistZealotMelee
+      amount: 1
+    prob: 0.05
   configs:
     DefenseStructure: BloodCollector
     Mining: Xenos # No idea what this thing does or where to look for it

Resources/Prototypes/Recipes/Lathes/categories.yml

@@ -31,5 +31,9 @@
   name: lathe-category-weapons
 
 - type: latheCategory # Frontier
-  id: EVASuits
-  name: lathe-category-evasuits
+  id: EVASuits # Frontier
+  name: lathe-category-evasuits # Frontier
+
+- type: latheCategory # Frontier
+  id: ArmorNF # Frontier
+  name: lathe-category-armor-nf # Frontier

Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag_npc_loot.yml

@@ -566,13 +566,13 @@
   noSpawn: true
   components:
   - type: Sprite
-    sprite: _NF/Clothing/Back/Messenger/messenger.rsi
+    sprite: _NF/Clothing/Back/Messenger/bloodcult.rsi
     state: icon
   - type: SpawnItemsOnUse
     items:
-      - id: CrossbowImprovised
-#      - id: ClothingBeltQuiverCrossbowFilledBolt
-      - id: SpaceCash1000
+    - id: CrossbowImprovised
+    - id: ClothingBeltQuiverCrossbowFilledBolt
+    - id: SpaceCash1000
     sound:
       path: /Audio/Items/jumpsuit_equip.ogg
 
@@ -583,9 +583,9 @@
   components:
   - type: SpawnItemsOnUse
     items:
-      - id: CrossbowImprovised
-      - id: ClothingBeltQuiverCrossbowFilledUranium
-      - id: SpaceCash1000
+    - id: CrossbowImprovised
+    - id: ClothingBeltQuiverCrossbowFilledUranium
+    - id: SpaceCash1000
     sound:
       path: /Audio/Items/jumpsuit_equip.ogg
 
@@ -596,8 +596,8 @@
   components:
   - type: SpawnItemsOnUse
     items:
-      - id: ClothingBeltQuiverCrossbowFilledPlasma
-      - id: SpaceCash1000
+    - id: ClothingBeltQuiverCrossbowFilledPlasma
+    - id: SpaceCash500
     sound:
       path: /Audio/Items/jumpsuit_equip.ogg
 
@@ -608,6 +608,87 @@
   components:
   - type: SpawnItemsOnUse
     items:
-      - id: SpaceCash1000
+    - id: SpaceCash500
+    sound:
+      path: /Audio/Items/jumpsuit_equip.ogg
+
+# Blood Cultist: generic cash rewards
+- type: entity
+  parent: ClothingBackpackBloodCultZealotLootA
+  id: ClothingBackpackBloodCultLootA
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+    - id: SpaceCash1000
+      prob: 0.95
+    - id: SpaceCash1000
+      prob: 0.95
+    - id: Bloodpack
+      prob: 0.08
+    - id: Tourniquet
+      amount: 1
+      prob: 0.05
+    - id: MaterialBones
+      prob: 0.2
+    sound:
+      path: /Audio/Items/jumpsuit_equip.ogg
+
+- type: entity
+  parent: ClothingBackpackBloodCultZealotLootA
+  id: ClothingBackpackBloodCultLootB
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+    - id: SpaceCash1000
+      prob: 0.95
+    - id: SpaceCash500
+      prob: 0.5
+    - id: Bloodpack
+      prob: 0.06
+    - id: BruteAutoInjector
+      amount: 1
+      prob: 0.02
+    - id: MaterialBones
+      prob: 0.1
+    sound:
+      path: /Audio/Items/jumpsuit_equip.ogg
+
+- type: entity
+  parent: ClothingBackpackBloodCultZealotLootA
+  id: ClothingBackpackBloodCultLootC
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+    - id: SpaceCash1000
+      prob: 0.95
+    - id: Bloodpack
+      prob: 0.04
+    - id: EmergencyMedipen
+      amount: 1
+      prob: 0.02
+    - id: MaterialBones1
+      prob: 0.1
+    sound:
+      path: /Audio/Items/jumpsuit_equip.ogg
+
+- type: entity
+  parent: ClothingBackpackBloodCultZealotLootA
+  id: ClothingBackpackBloodCultLootD
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+    - id: SpaceCash500
+      prob: 0.95
+    - id: Bloodpack
+      prob: 0.02
+    - id: Gauze1
+      amount: 1
+      prob: 0.01
+    - id: MaterialBones1
+      prob: 0.05
     sound:
       path: /Audio/Items/jumpsuit_equip.ogg

Resources/Prototypes/_NF/Catalog/Fills/Crates/syndicate.yml

@@ -3,5 +3,5 @@
   parent: CrateSyndicate
   components:
     - type: SurplusBundle
-      totalPrice: 30
+      totalPrice: 20
       storePreset: StorePresetLightUplink