diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 1c38c155183..6d8f394dbca 100644 --- a/Resources/Changelog/Changelog.yml +++ b/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' diff --git a/Resources/Locale/en-US/_NF/bluespace-events/events.ftl b/Resources/Locale/en-US/_NF/bluespace-events/events.ftl index 50d771864c0..45b2e6bf175 100644 --- a/Resources/Locale/en-US/_NF/bluespace-events/events.ftl +++ b/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. diff --git a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl index 76d1cdae2c2..1e143700da3 100644 --- a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl +++ b/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 diff --git a/Resources/Locale/en-US/lathe/lathe-categories.ftl b/Resources/Locale/en-US/lathe/lathe-categories.ftl index 6b1917d8351..5f04bdd18a9 100644 --- a/Resources/Locale/en-US/lathe/lathe-categories.ftl +++ b/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 diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml index d0d43f0e3d9..e352fc698c0 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml index 4adb69c6db9..df5dd1aac91 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml +++ b/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 diff --git a/Resources/Prototypes/Procedural/salvage_factions.yml b/Resources/Prototypes/Procedural/salvage_factions.yml index 376f8678104..cf7865280e0 100644 --- a/Resources/Prototypes/Procedural/salvage_factions.yml +++ b/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 diff --git a/Resources/Prototypes/Recipes/Lathes/categories.yml b/Resources/Prototypes/Recipes/Lathes/categories.yml index d03bbaa8161..d904f24ca7e 100644 --- a/Resources/Prototypes/Recipes/Lathes/categories.yml +++ b/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 diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag_npc_loot.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag_npc_loot.yml index baeb525e55f..6a2726824f9 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag_npc_loot.yml +++ b/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 diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/syndicate.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/syndicate.yml index f70dc549da0..20b7816b7d9 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/syndicate.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/syndicate.yml @@ -3,5 +3,5 @@ parent: CrateSyndicate components: - type: SurplusBundle - totalPrice: 30 + totalPrice: 20 storePreset: StorePresetLightUplink diff --git a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml b/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml index 9cf89cb5863..abe3a74f238 100644 --- a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml +++ b/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml @@ -83,6 +83,43 @@ - SeniorOfficer - Sheriff +- type: listing + id: UplinkSecurityCombatHardsuit + name: uplink-security-hardsuit-combat-name + description: uplink-security-hardsuit-combat-desc + productEntity: ClothingOuterHardsuitNfsdCombat + icon: { sprite: _NF/Clothing/OuterClothing/Hardsuits/nfsd_combat.rsi, state: icon } + cost: + FrontierUplinkCoin: 10 + categories: + - UplinkSecurityHardsuits + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - SecurityUplink + +- type: listing + id: UplinkSecurityCommandHardsuit + name: uplink-security-hardsuit-commmand-name + description: uplink-security-hardsuit-commmand-desc + productEntity: ClothingOuterHardsuitNfsdCommand + icon: { sprite: _NF/Clothing/OuterClothing/Hardsuits/nfsd_command.rsi, state: icon } + cost: + FrontierUplinkCoin: 10 + categories: + - UplinkSecurityHardsuits + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - SecurityUplink + - !type:BuyerJobCondition + whitelist: + - Bailiff + - SeniorOfficer + - Sheriff + - type: listing id: UplinkSecurityHardsuitSyndieReverseEngineered name: uplink-security-hardsuit-experimental-name @@ -406,7 +443,7 @@ name: uplink-security-holo-name description: uplink-security-holo-desc productEntity: HoloprojectorNfsd - icon: { sprite: Objects/Devices/Holoprojectors/security.rsi, state: icon } + icon: { sprite: _NF/Objects/Devices/Holoprojectors/nfsd.rsi, state: icon } cost: FrontierUplinkCoin: 1 categories: @@ -450,11 +487,11 @@ - SecurityUplink - type: listing - id: UplinkSecurityTechfab + id: UplinkNfsdTechfab name: uplink-security-techfab-name description: uplink-security-techfab-desc productEntity: NfsdTechFabCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: security } + icon: { sprite: Objects/Misc/module.rsi, state: nfsd } cost: FrontierUplinkCoin: 5 categories: @@ -830,8 +867,8 @@ id: UplinkSecuritySwat name: uplink-security-swat-name description: uplink-security-swat-desc - productEntity: ClothingMaskGasSwat - icon: { sprite: Clothing/Mask/swat.rsi, state: icon} + productEntity: ClothingMaskGasSheriff + icon: { sprite: _NF/Clothing/Masks/nfsd_sheriff.rsi, state: icon} cost: FrontierUplinkCoin: 3 categories: diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Back/messenger.yml b/Resources/Prototypes/_NF/Entities/Clothing/Back/messenger.yml index dbc9663b13d..ef06b89ce91 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Back/messenger.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Back/messenger.yml @@ -202,3 +202,11 @@ components: - type: Sprite sprite: _NF/Clothing/Back/Messenger/nfsd_cream.rsi + +- type: entity + parent: ClothingBackpackMessenger + id: ClothingBackpackMessengerBloodCult + name: cultist messenger bag + components: + - type: Sprite + sprite: _NF/Clothing/Back/Messenger/bloodcult.rsi diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml index 7e254c7b15b..6525399496d 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml @@ -96,4 +96,30 @@ - type: Sprite sprite: _NF/Clothing/Belt/nfsd_webbing.rsi - type: Clothing - sprite: _NF/Clothing/Belt/nfsd_webbing.rsi \ No newline at end of file + sprite: _NF/Clothing/Belt/nfsd_webbing.rsi + +- type: entity + parent: ClothingBeltBase + id: ClothingBeltCultForceField + name: cult runic belt buckle + components: + - type: Sprite + sprite: _NF/Clothing/Belt/cult_force_field.rsi + shader: unshaded + - type: Clothing + sprite: _NF/Clothing/Belt/cult_force_field.rsi + - type: Reflect + enabled: true + reflectProb: .1 + spread: 90 + +- type: entity + parent: ClothingBeltStorageBase + id: ClothingBeltCultWebbing + name: cult webbing + description: A webbing with pockets lined with waterproof (water, huh?) material. + components: + - type: Sprite + sprite: _NF/Clothing/Belt/cult_webbing.rsi + - type: Clothing + sprite: _NF/Clothing/Belt/cult_webbing.rsi diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/helmets.yml index be27d3f4cf6..3d34e9458e5 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/helmets.yml @@ -58,3 +58,20 @@ sprite: _NF/Clothing/Head/Helmets/nfsd.rsi - type: Clothing sprite: _NF/Clothing/Head/Helmets/nfsd.rsi + +# Bloodcult Janitor Helmet +- type: entity + parent: ClothingHeadHelmetBasic + id: ClothingHeadHelmetCultJanitor + name: cult leader helmet + components: + - type: Sprite + sprite: _NF/Clothing/Head/Helmets/cult_janitor.rsi + - type: Clothing + sprite: _NF/Clothing/Head/Helmets/cult_janitor.rsi + - type: Contraband + - type: Tag + tags: + - ClothMade + - HidesHair + - WhitelistChameleon diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml index ff4c0e351c1..18f16acd12c 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml @@ -35,3 +35,27 @@ sprite: Clothing/Head/Hoods/Coat/hoodsyndicate.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodsyndicate.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatHoodBloodCulthood + name: cult hood + noSpawn: true + components: + - type: Sprite + sprite: _NF/Clothing/Head/Hoods/cult.rsi + - type: Clothing + sprite: _NF/Clothing/Head/Hoods/cult.rsi + - type: Tag + tags: + - HidesHair + - WhitelistChameleon + - type: Contraband + +- type: entity # for looks only + parent: [ ClothingHeadHatHoodBloodCulthood, ClothingHeadHelmetBasic ] # hehe + id: ClothingHeadHatHoodBloodCulthoodUnremoveable + noSpawn: true + name: cult hood + components: + - type: Unremoveable diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml index 93bd1b35324..f69be10d0ff 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml @@ -58,3 +58,35 @@ sprite: _NF/Clothing/Masks/nfsd_sheriff.rsi - type: Clothing sprite: _NF/Clothing/Masks/nfsd_sheriff.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.95 + Piercing: 0.95 + Heat: 0.95 + +- type: entity + parent: ClothingMaskPullableBase + id: ClothingMaskCultJanitor + name: cult leader mask + description: A close-fitting imposing breathing mask designed for cult leaders who value style. + components: + - type: Sprite + sprite: _NF/Clothing/Masks/cult_janitor_mask.rsi + - type: Clothing + sprite: _NF/Clothing/Masks/cult_janitor_mask.rsi + - type: BreathMask + - type: IdentityBlocker + - type: Armor + modifiers: + coefficients: + Blunt: 0.90 + Slash: 0.90 + Piercing: 0.90 + Heat: 0.90 + - type: Contraband + - type: Tag + tags: + - ClothMade + - HidesHair diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats.yml index c14e4d24182..872f9fc7a21 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats.yml @@ -105,7 +105,35 @@ sprite: _NF/Clothing/OuterClothing/Misc/nfsd_long.rsi - type: Clothing sprite: _NF/Clothing/OuterClothing/Misc/nfsd_long.rsi - + +# Bloodcult Robes +- type: entity + parent: [ ClothingOuterStorageBase, ClothingOuterArmorBulletproof ] + id: ClothingOuterCoatCultJanitor + name: cult leader armored robes + description: Regal robes fitting for a cult leader. + components: + - type: Sprite + sprite: _NF/Clothing/OuterClothing/Coats/cult_janitor_robe.rsi + - type: Clothing + sprite: _NF/Clothing/OuterClothing/Coats/cult_janitor_robe.rsi + - type: Contraband + +- type: entity + parent: [ ClothingOuterStorageToggleableBase, ClothingOuterArmorBasic ] + id: ClothingOuterCoatBloodCultRobes + name: cult robes + description: There's no cult without classic red/crimson cult robes with bulletproof vests. + suffix: Frontier + components: + - type: Sprite + sprite: _NF/Clothing/OuterClothing/Coats/cult_robes.rsi + - type: Clothing + sprite: _NF/Clothing/OuterClothing/Coats/cult_robes.rsi + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodBloodCulthood + - type: Contraband + - type: entity parent: ClothingOuterWinterHoP id: ClothingOuterJacketSr diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml index 493d9ea90e5..0fcdf7c486a 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml @@ -157,7 +157,7 @@ Caustic: 0.75 - type: ClothingSpeedModifier walkModifier: 0.95 - sprintModifier: 0.85 + sprintModifier: 0.9 - type: entity parent: ClothingOuterHardsuitNfsdBronze @@ -238,7 +238,7 @@ Radiation: 0.2 Caustic: 0.2 - type: ClothingSpeedModifier - walkModifier: 0.9 + walkModifier: 0.75 sprintModifier: 0.65 #Security Combat Hardsuit @@ -287,7 +287,7 @@ - type: Armor modifiers: coefficients: - Blunt: 0.6 + Blunt: 0.5 Slash: 0.5 Piercing: 0.5 Heat: 0.50 diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/bloodcultmobs.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/bloodcultmobs.yml new file mode 100644 index 00000000000..ebe3483fc50 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/bloodcultmobs.yml @@ -0,0 +1,177 @@ +- type: entity + name: Blood Cult Priest Spawner + suffix: AI, Hostile, Caster + id: SpawnMobBloodCultistPriest + parent: MarkerBase + components: + - type: Sprite + layers: + - state: red + - state: ai + - sprite: Mobs/Species/Human/parts.rsi + state: full + - sprite: Clothing/Head/Helmets/cult.rsi + state: equipped-HELMET + - sprite: Clothing/Shoes/Specific/cult.rsi + state: equipped-FEET + - sprite: Clothing/OuterClothing/Armor/cult_armour.rsi + state: equipped-OUTERCLOTHING + - sprite: Objects/Weapons/Guns/Basic/staves.rsi + state: animation-inhand-right + - type: ConditionalSpawner + prototypes: + - MobBloodCultistPriest + +- type: entity + name: Blood Cult Acolyte + suffix: AI, Hostile, Melee + id: SpawnMobBloodCultistAcolyte + parent: MarkerBase + components: + - type: Sprite + layers: + - state: red + - state: ai + - sprite: Mobs/Species/Human/parts.rsi + state: full + - sprite: Clothing/Head/Helmets/cult.rsi + state: equipped-HELMET + - sprite: Clothing/Shoes/Specific/cult.rsi + state: equipped-FEET + - sprite: Clothing/OuterClothing/Armor/cult_armour.rsi + state: equipped-OUTERCLOTHING + - sprite: Objects/Weapons/Melee/cult_blade.rsi + state: inhand-right + - type: ConditionalSpawner + prototypes: + - MobBloodCultistAcolyte + +- type: entity + name: Blood Cult Zealot + suffix: AI, Hostile, Melee + id: SpawnMobBloodCultistZealotMelee + parent: MarkerBase + components: + - type: Sprite + layers: + - state: red + - state: ai + - sprite: Mobs/Species/Human/parts.rsi + state: full + - sprite: Clothing/Head/Hoods/cult.rsi + state: equipped-HELMET + - sprite: Clothing/Shoes/Specific/cult.rsi + state: equipped-FEET + - sprite: Clothing/OuterClothing/Misc/cultrobes.rsi + state: equipped-OUTERCLOTHING + - sprite: Objects/Weapons/Melee/cult_dagger.rsi + state: inhand-right + - type: ConditionalSpawner + prototypes: + - MobBloodCultistZealotMelee + +- type: entity + name: Blood Cult Zealot + suffix: AI, Hostile, Ranged + id: SpawnMobBloodCultistZealotRanged + parent: MarkerBase + components: + - type: Sprite + layers: + - state: red + - state: ai + - sprite: Mobs/Species/Human/parts.rsi + state: full + - sprite: Clothing/Head/Hoods/cult.rsi + state: equipped-HELMET + - sprite: Clothing/Shoes/Specific/cult.rsi + state: equipped-FEET + - sprite: Clothing/OuterClothing/Misc/cultrobes.rsi + state: equipped-OUTERCLOTHING + - sprite: _NF/Objects/Weapons/Guns/Bow/crossbow.rsi + state: inhand-left + - type: ConditionalSpawner + prototypes: + - MobBloodCultistZealotRanged + +- type: entity + name: Blood Cult Zealot + suffix: AI, Hostile, Caster + id: SpawnMobBloodCultistCaster + parent: MarkerBase + components: + - type: Sprite + layers: + - state: red + - state: ai + - sprite: Mobs/Species/Human/parts.rsi + state: full + - sprite: Clothing/Head/Hoods/cult.rsi + state: equipped-HELMET + - sprite: Clothing/Shoes/Specific/cult.rsi + state: equipped-FEET + - sprite: Clothing/OuterClothing/Misc/cultrobes.rsi + state: equipped-OUTERCLOTHING + - sprite: Objects/Weapons/Guns/Basic/staves.rsi + state: animation-inhand-right + - type: ConditionalSpawner + prototypes: + - MobBloodCultistCaster + +- type: entity + name: Blood Cult Leech + suffix: AI, Hostile, Melee, Fast + id: SpawnMobBloodCultLeech + parent: MarkerBase + components: + - type: Sprite + layers: + - state: red + - state: ai + - sprite: _NF/Mobs/BloodCult/bloodcultleech.rsi + state: leech + - type: ConditionalSpawner + prototypes: + - MobBloodCultLeech + +- type: entity + name: Ascended Cultist + suffix: AI, Hostile, Caster, Megafauna + id: SpawnMobBloodCultistAscended + parent: MarkerBase + components: + - type: Sprite + layers: + - state: red + - state: ai + - sprite: _NF/Mobs/BloodCult/ascended_cultist.rsi + state: ascended_cultist + - type: ConditionalSpawner + prototypes: + - MobBloodCultistAscended + +- type: entity + name: Blood Cult Janitor + suffix: AI, Hostile, Melee + id: SpawnMobBloodCultistJanitor + parent: MarkerBase + components: + - type: Sprite + layers: + - state: red + - state: ai + - sprite: Mobs/Species/Human/parts.rsi + state: full + - sprite: _NF/Clothing/Masks/cult_janitor_mask.rsi + state: equipped-MASK + - sprite: _NF/Clothing/Head/Helmets/cult_janitor.rsi + state: equipped-HELMET + - sprite: Clothing/Shoes/Specific/cult.rsi + state: equipped-FEET + - sprite: _NF/Clothing/OuterClothing/Coats/cult_janitor_robe.rsi + state: equipped-OUTERCLOTHING + - sprite: Objects/Weapons/Melee/cult_blade.rsi + state: inhand-right + - type: ConditionalSpawner + prototypes: + - MobBloodCultistJanitor diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/bloodcult_inhand_weapons.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/bloodcult_inhand_weapons.yml new file mode 100644 index 00000000000..d081f0df67d --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/bloodcult_inhand_weapons.yml @@ -0,0 +1,70 @@ +- type: entity + name: random melee weapon + id: SpawnInhandMeleeWeaponBloodCultLow + parent: MarkerBase + suffix: "Blood cult, Low" + noSpawn: true + components: + - type: Sprite + layers: + - state: green + scale: 0.7, 0.7 + - sprite: Objects/Weapons/Melee/cult_blade.rsi + state: icon + - type: RandomSpawner + prototypes: + - RitualDagger + - RitualDagger + - RitualDagger + - RitualDagger + - RitualDagger + - RitualDagger + - Machete + - ButchCleaver + - WeaponCrusherGlaive + - SpearBone + chance: 1.0 + offset: 0.0 + rarePrototypes: + - UnholyHalberd + - EldritchBlade + - Katana + - FireAxe + - BrokenBottle + rareChance: 0.01 + +- type: entity + name: random melee weapon + id: SpawnInhandMeleeWeaponBloodCultHigh + parent: MarkerBase + suffix: "Blood cult, High" + noSpawn: true + components: + - type: Sprite + layers: + - state: green + scale: 0.7, 0.7 + - sprite: Objects/Weapons/Melee/cult_blade.rsi + state: icon + - type: RandomSpawner + prototypes: + - EldritchBlade + - EldritchBlade + - EldritchBlade + - EldritchBlade + - EldritchBlade + - EldritchBlade + - EldritchBlade + - UnholyHalberd + - FireAxe + - SpearBone + - SpearUranium + chance: 1.0 + offset: 0.0 + rarePrototypes: + - RitualDagger + - Machete + - ButchCleaver + - WeaponCrusherGlaive + - BrokenBottle + rareChance: 0.01 diff --git a/Resources/Prototypes/_NF/Entities/Spawners/syndicatemobs.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/syndicatemobs.yml similarity index 100% rename from Resources/Prototypes/_NF/Entities/Spawners/syndicatemobs.yml rename to Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/syndicatemobs.yml diff --git a/Resources/Prototypes/_NF/Entities/Spawners/wizardfederationmobs.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/wizardfederationmobs.yml similarity index 100% rename from Resources/Prototypes/_NF/Entities/Spawners/wizardfederationmobs.yml rename to Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/wizardfederationmobs.yml diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/base_humanoid_hostile.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/base_humanoid_hostile.yml index eb7ee760a69..d0524c133aa 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/base_humanoid_hostile.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/base_humanoid_hostile.yml @@ -43,7 +43,6 @@ # Human NPC, uses equipment, immune to vacuum/low pressure # but otherwise should be the same as base line human mob -# Going to use this prototype later for other mobs - type: entity name: Human NPC suffix: AI, Hostile @@ -69,31 +68,31 @@ 160: Dead - type: Stamina critThreshold: 130 -# Missing stuff from BaseMobSpeciesOrganic - type: Flashable - type: Blindable - type: Butcherable - butcheringType: Spike # TODO human. + butcheringType: Spike spawned: - id: FoodMeatHuman amount: 5 # AI package - type: HTN rootTask: - task: SimpleHumanoidHostileCompound -# Alt root tasks -# task: MeleeCombatCompound -# task: SimpleRangedHostileCompound + task: SimpleHumanoidHostileCompound # Alt root tasks: MeleeCombatCompound, SimpleRangedHostileCompound blackboard: - NavClimb: !type:Bool # They use this option too much for my liking, but without this mobs usually get stuck on spawn in expeds + NavClimb: !type:Bool false + NavInteract: !type:Bool + true + NavPry: !type:Bool + true - type: NpcFactionMember factions: - SimpleHostile - type: Carriable # Carrying system from nyanotrasen. - type: MobPrice - price: 1500 # Kidnapping a living person and selling them for cred is a good move. - deathPenalty: 0.5 # However they really ought to be living and intact, otherwise they're worth 2x less. + price: 1500 + deathPenalty: 0.5 - type: Contraband - type: Advertise pack: syndicatehumanoidchatter # Don't have neutral one @@ -136,13 +135,10 @@ - ShoesRequiredStepTriggerImmune - type: HTN rootTask: - task: SimpleHumanoidHostileCompound -# Alt root tasks -# task: MeleeCombatCompound -# task: SimpleRangedHostileCompound + task: SimpleHumanoidHostileCompound # Alt root tasks: MeleeCombatCompound, SimpleRangedHostileCompound blackboard: - NavClimb: !type:Bool # They use this option too much for my liking, but I'll keep it here as an option - true + NavClimb: !type:Bool + false NavInteract: !type:Bool true NavPry: !type:Bool @@ -168,6 +164,6 @@ Base: dead - type: Carriable # Carrying system from nyanotrasen. - type: MobPrice - price: 1500 # Kidnapping a living person and selling them for cred is a good move. - deathPenalty: 0.5 # However they really ought to be living and intact, otherwise they're worth 2x less. + price: 1500 + deathPenalty: 0.5 - type: Contraband diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/bloodcultistmob.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/bloodcultistmob.yml index 658cd602f41..810ea1fba6a 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/bloodcultistmob.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/bloodcultistmob.yml @@ -11,12 +11,11 @@ rechargeCooldown: 1.5 rechargeSound: path: /Audio/_NF/Effects/silence.ogg -# - type: ArchaicAccent - type: Advertise pack: bloodcultisthumanoidchatter - minimumWait: 120 # 1 * 2 - maximumWait: 240 # 2 * 60 - NextAdvertisementTime: 0 + minimumWait: 30 + maximumWait: 120 + NextAdvertisementTime: 10 - type: AutoWakeUp - type: MovementAlwaysTouching @@ -27,7 +26,7 @@ name: Blood Cult Priest parent: MobBloodCultistBase id: MobBloodCultistPriest - suffix: AI, Ranged + noSpawn: true components: - type: Loadout prototypes: @@ -52,12 +51,44 @@ soundGunshot: path: /Audio/Effects/Lightning/lightningshock.ogg +# Blood Cult Janitor, ranged mab, bolts deal 10 slash damage +# Look for magic bolt here:\Resources\Prototypes\_NF\Entities\Objects\Weapons\Guns\Projectiles\magic.yml +- type: entity + name: Blood Cult Janitor + parent: MobBloodCultistBase + id: MobBloodCultistJanitor + noSpawn: true + components: + - type: Loadout + prototypes: + - BloodCultistJanitorGear + - type: Reflect + enabled: true + reflectProb: .3 + spread: 90 + - type: Stamina + critThreshold: 500 + - type: BasicEntityAmmoProvider + proto: ShellSoapConjuredBloodCultCluster # SoapConjuredBloodCultCluster + capacity: 1 + count: 1 + - type: Gun + showExamineText: false + fireRate: 4 + selectedMode: SemiAuto + soundGunshot: + path: /Audio/Effects/Lightning/lightningshock.ogg + - type: RechargeBasicEntityAmmo + rechargeCooldown: 12 + rechargeSound: + path: /Audio/_NF/Effects/silence.ogg + # Blood Cult Acolyte, melee mob armed with eldritch sword (16 slash) - type: entity name: Blood Cult Acolyte parent: MobBloodCultistBase id: MobBloodCultistAcolyte - suffix: AI, Melee + noSpawn: true components: - type: Loadout prototypes: @@ -66,13 +97,23 @@ enabled: true reflectProb: .3 spread: 90 + - type: HTN + rootTask: + task: MeleeCombatCompound + blackboard: + NavClimb: !type:Bool + false + NavInteract: !type:Bool + true + NavPry: !type:Bool + true # Blood Cult Acolyte, melee mob armed with ritual dagger (12 slash) - type: entity name: Blood Cult Zealot parent: MobBloodCultistBase id: MobBloodCultistZealotMelee - suffix: AI, Melee + noSpawn: true components: - type: Loadout prototypes: @@ -81,14 +122,24 @@ enabled: true reflectProb: .1 spread: 90 + - type: HTN + rootTask: + task: MeleeCombatCompound + blackboard: + NavClimb: !type:Bool + false + NavInteract: !type:Bool + true + NavPry: !type:Bool + true # Blood Cult Zealot, ranged mob, crossbow bolt deals 20 slash and 5 bloodloss # Look for crossbow bolt here: \Resources\Prototypes\_NF\Entities\Objects\Weapons\Guns\Projectiles\crossbow_bolts.yml - type: entity name: Blood Cult Zealot - suffix: AI, Crossbow parent: MobBloodCultistBase id: MobBloodCultistZealotRanged + noSpawn: true components: - type: Loadout prototypes: @@ -101,7 +152,7 @@ capacity: 1 count: 1 - type: Gun - useKey: false + showExamineText: false fireRate: 0.5 selectedMode: SemiAuto availableModes: @@ -113,9 +164,9 @@ # Look for magic bolt here:\Resources\Prototypes\_NF\Entities\Objects\Weapons\Guns\Projectiles\magic.yml - type: entity name: Blood Cult Zealot - suffix: AI, Ranged parent: MobBloodCultistBase id: MobBloodCultistCaster + noSpawn: true components: - type: Loadout prototypes: @@ -137,10 +188,8 @@ # Ascended Cultist, spawns 2 Drained Ones - type: entity name: Ascended Cultist # Megafauna - suffix: AI, Ranged - parent: - - MobNonHumanHostileBase - - FlyingMobBase + noSpawn: true + parent: MobNonHumanHostileBase id: MobBloodCultistAscended components: - type: NpcFactionMember @@ -148,6 +197,7 @@ - BloodCultNF - type: MovementIgnoreGravity - type: MovementAlwaysTouching + - type: CanMoveInAir - type: Advertise pack: bloodcultisthumanoidchatter - type: Reflect @@ -180,6 +230,7 @@ capacity: 2 count: 2 - type: Gun + showExamineText: false fireRate: 1 soundGunshot: path: /Audio/Effects/teleport_arrival.ogg @@ -199,6 +250,7 @@ energy: 1.2 color: "#ff0000" castShadows: false + - type: SoundWhileAlive - type: AmbientSound volume: -9 range: 5 @@ -212,7 +264,7 @@ # Blood Leech, melee, fast, has moderate health regen - type: entity name: Blood Leech - suffix: AI, Melee + noSpawn: true parent: - MobNonHumanHostileBase - MobPassiveRegen @@ -258,8 +310,8 @@ # Drained One, melee - type: entity name: Drained One - suffix: AI, Melee - parent: + noSpawn: true + parent: - MobNonHumanHostileBase - FlyingMobBase id: MobBloodCultDrainedOne @@ -315,7 +367,7 @@ # Drained One (summonable by players), melee - type: entity name: Drained One - suffix: AI, Melee + noSpawn: true parent: MobBloodCultDrainedOne id: MobBloodCultDrainedOneNanoTrasen components: @@ -349,6 +401,7 @@ interactSuccessSound: path: /Audio/_NF/Effects/bloodcult/ghost-scream.ogg - type: Gun + showExamineText: false fireRate: 2 selectedMode: FullAuto availableModes: @@ -361,8 +414,6 @@ path: /Audio/_NF/Effects/silence.ogg - type: BallisticAmmoProvider proto: BulletBloodCultDarkBolt -# capacity: 1000 -# count: 1000 - type: HTN rootTask: task: TurretCompound @@ -381,3 +432,26 @@ range: 5 sound: path: /Audio/Effects/shuttle_thruster.ogg + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 600 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 300 + # TODO: Construction graph + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + collection: MetalGlassBreak + - !type:SpawnEntitiesBehavior + spawn: + ShardCrystalRed: + min: 1 + max: 3 diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/syndicatemob.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/syndicatemob.yml index ed68256edf0..3ec108980f1 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/syndicatemob.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/syndicatemob.yml @@ -2,7 +2,6 @@ name: Syndicate Naval Agent abstract: true noSpawn: true -# parent: BaseMobHuman parent: MobHumanoidHostileBase id: MobSyndicateNavalBase components: @@ -12,21 +11,21 @@ - type: NpcFactionMember factions: - Syndicate - - type: AutoImplant - implants: - - DeathRattleImplant - - DeathAcidifierImplantNF -# - DeathAcidifierImplant -# - MicroBombImplant + #- type: AutoImplant # muh loot! nooo + #implants: + #- DeathRattleImplant + #- DeathAcidifierImplantNF + #- DeathAcidifierImplant + #- MicroBombImplant - type: RechargeBasicEntityAmmo rechargeCooldown: 1 rechargeSound: path: /Audio/_NF/Effects/silence.ogg - type: Advertise pack: syndicatehumanoidchatter - minimumWait: 20 - maximumWait: 120 # 2 * 60 - NextAdvertisementTime: 5 + minimumWait: 30 + maximumWait: 120 + NextAdvertisementTime: 10 - type: Buckle disable: true - type: AutoWakeUp @@ -42,10 +41,6 @@ - type: Loadout prototypes: - SyndicateNavalCaptainGearA - - type: Reflect - enabled: true - reflectProb: .05 - spread: 90 - type: RechargeBasicEntityAmmo rechargeCooldown: 0.75 rechargeSound: @@ -55,8 +50,8 @@ capacity: 1 count: 1 - type: Gun + showExamineText: false fireRate: 0.75 - useKey: false selectedMode: SemiAuto availableModes: - SemiAuto @@ -123,8 +118,8 @@ capacity: 1 count: 1 - type: Gun + showExamineText: false fireRate: 2 - useKey: false selectedMode: SemiAuto availableModes: - SemiAuto @@ -188,8 +183,8 @@ capacity: 1 count: 1 - type: Gun + showExamineText: false fireRate: 4 - useKey: false selectedMode: SemiAuto availableModes: - SemiAuto @@ -254,8 +249,8 @@ maxCharge: 600 startingCharge: 600 - type: Gun + showExamineText: false fireRate: 1 - useKey: false selectedMode: SemiAuto availableModes: - SemiAuto @@ -313,7 +308,7 @@ capacity: 8 count: 8 - type: Gun - useKey: false + showExamineText: false minAngle: 10 maxAngle: 30 fireRate: 8 @@ -376,7 +371,7 @@ capacity: 1 count: 1 - type: Gun - useKey: false + showExamineText: false fireRate: 1 selectedMode: SemiAuto availableModes: @@ -444,12 +439,11 @@ capacity: 4 count: 4 - type: Gun + showExamineText: false fireRate: 6 - useKey: false selectedMode: FullAuto availableModes: - FullAuto - - SemiAuto soundGunshot: /Audio/Weapons/Guns/Gunshots/pistol.ogg - type: entity @@ -484,11 +478,8 @@ # Hostile Victim of Experimentation, "armed" with shiv - type: entity - name: Captive #Victim of Experimentation + name: Captive parent: MobHumanoidHostileBase -# - MobBloodstream -# - MobFlammable -# - BaseMobSpecies id: MobExperimentationVictim noSpawn: true components: @@ -521,7 +512,7 @@ - type: AutoImplant implants: - DeathRattleImplant - - DeathAcidifierImplantNF + #- DeathAcidifierImplantNF - type: RechargeBasicEntityAmmo rechargeCooldown: 1.5 rechargeSound: @@ -531,8 +522,8 @@ capacity: 4 count: 4 - type: Gun + showExamineText: false fireRate: 5 - useKey: false selectedMode: SemiAuto availableModes: - SemiAuto @@ -552,8 +543,8 @@ capacity: 4 count: 4 - type: Gun + showExamineText: false fireRate: 5 - useKey: false selectedMode: SemiAuto availableModes: - SemiAuto @@ -598,12 +589,11 @@ capacity: 4 count: 4 - type: Gun + showExamineText: false fireRate: 0.5 - useKey: false selectedMode: FullAuto availableModes: - FullAuto - - SemiAuto soundGunshot: /Audio/Weapons/Guns/Gunshots/pistol.ogg - type: entity @@ -647,7 +637,7 @@ prototypes: - SyndicateNavalMimeGear - type: Stamina - critThreshold: 500 # Extra hard to incapacitate and loot + critThreshold: 500 - type: MovementSpeedModifier baseWalkSpeed: 4 baseSprintSpeed: 6 @@ -677,8 +667,8 @@ capacity: 3 count: 3 - type: Gun + showExamineText: false fireRate: 4 - useKey: false selectedMode: SemiAuto availableModes: - SemiAuto diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/wizardfederationmob.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/wizardfederationmob.yml index 29f8504def0..87c8f17e244 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/wizardfederationmob.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/wizardfederationmob.yml @@ -1,6 +1,5 @@ - type: entity name: Wizard - suffix: AI abstract: true parent: - MobHumanoidHostileBase @@ -14,34 +13,31 @@ rechargeCooldown: 3 rechargeSound: path: /Audio/_NF/Effects/silence.ogg - - type: AutoImplant - implants: - - DeathAcidifierImplantNF + #- type: AutoImplant # muh loot! nooo + #implants: + #- DeathAcidifierImplantNF - type: Reflect enabled: true reflectProb: .35 spread: 90 -# Immunity to Heat damage from being lit on fire - type: Flammable fireSpread: true canResistFire: true damage: types: Heat: 0 -# Mad stamina - type: Stamina critThreshold: 400 -# Narrow dmg thresholds - type: MobThresholds thresholds: 0: Alive - 110: Critical - 120: Dead + 120: Critical + 160: Dead - type: Advertise pack: wizardhumanoidchatter - minimumWait: 120 # 1 * 2 - maximumWait: 240 # 2 * 60 - NextAdvertisementTime: 0 + minimumWait: 30 + maximumWait: 120 + NextAdvertisementTime: 10 - type: AutoWakeUp - type: MovementAlwaysTouching @@ -51,6 +47,7 @@ name: Blue Wizard parent: MobWizFedlBase id: MobWizFedWizardBlue + noSpawn: true components: - type: Loadout prototypes: @@ -60,6 +57,7 @@ capacity: 2 count: 2 - type: Gun + showExamineText: false fireRate: 1 soundGunshot: path: /Audio/Effects/teleport_arrival.ogg @@ -74,35 +72,17 @@ name: Red Wizard parent: MobWizFedlBase id: MobWizFedWizardRed + noSpawn: true components: - type: Loadout prototypes: - NPCWizardRedGear -# Will keep it here for later use -# - type: SolutionContainerManager -# solutions: -# chamber: -# maxVol: 2000 #100 shots -# reagents: -# - ReagentId: Phlogiston -# Quantity: 40 -# - ReagentId: ChlorineTrifluoride -# Quantity: 40 -# - ReagentId: Napalm -# Quantity: 1920 -# - type: SolutionAmmoProvider -# solutionId: chamber -# proto: BulletWaterShot -# - type: SolutionTransfer -# transferAmount: 20 -# maxTransferAmount: 50 -# minTransferAmount: 20 -# canChangeTransferAmount: false - type: BasicEntityAmmoProvider proto: BulletFireBolt capacity: 1 count: 1 - type: Gun + showExamineText: false fireRate: 1 soundGunshot: path: /Audio/Magic/fireball.ogg @@ -113,6 +93,7 @@ name: Violet Wizard parent: MobWizFedlBase id: MobWizFedWizardViolet + noSpawn: true components: - type: Loadout prototypes: @@ -122,6 +103,7 @@ capacity: 8 count: 8 - type: Gun + showExamineText: false fireRate: 6 soundGunshot: path: /Audio/Magic/fireball.ogg @@ -134,9 +116,9 @@ # Look for soap here: \Resources\Prototypes\_NF\Entities\Objects\Specific\Wizard\conjured_items.yml - type: entity name: Soap Wizard - suffix: AI parent: MobWizFedlBase id: MobWizFedWizardSoap + noSpawn: true components: - type: Loadout prototypes: @@ -146,6 +128,7 @@ capacity: 1 count: 1 - type: Gun + showExamineText: false fireRate: 1 soundGunshot: path: /Audio/Effects/teleport_arrival.ogg @@ -153,9 +136,9 @@ # Wizards in hardsuits - type: entity name: Blue Wizard - suffix: AI, Hardsuit parent: MobWizFedWizardBlue id: MobWizFedWizardBlueHardsuit + noSpawn: true components: - type: Loadout prototypes: @@ -163,9 +146,9 @@ - type: entity name: Red Wizard - suffix: AI, Hardsuit parent: MobWizFedWizardRed id: MobWizFedWizardRedHardsuit + noSpawn: true components: - type: Loadout prototypes: @@ -173,9 +156,9 @@ - type: entity name: Violet Wizard - suffix: AI, Hardsuit parent: MobWizFedWizardViolet id: MobWizFedWizardVioletHardsuit + noSpawn: true components: - type: Loadout prototypes: @@ -186,6 +169,7 @@ suffix: AI, Hardsuit parent: MobWizFedWizardSoap id: MobWizFedWizardSoapHardsuit + noSpawn: true components: - type: Loadout prototypes: @@ -194,7 +178,7 @@ # Conjured Creatures - type: entity name: Blue Curacao Elemental - suffix: AI + noSpawn: true parent: - MobNonHumanHostileBase id: WaterElementalConjured @@ -214,7 +198,7 @@ - type: PointLight radius: 2.0 energy: 3.5 - color: "#75b1f0" # Edited through the LiquidAnomalySystem + color: "#75b1f0" - type: MobThresholds thresholds: 0: Alive @@ -231,7 +215,7 @@ Slash: 15 - type: MeleeChemicalInjector solution: bloodstream - transferAmount: 5 + transferAmount: 10 - type: TimedDespawn lifetime: 30 - type: Ammo diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Wizard/conjured_items.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Wizard/conjured_items.yml index f733bcf09eb..a3ea8614362 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/Wizard/conjured_items.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Wizard/conjured_items.yml @@ -59,3 +59,125 @@ color: MediumPurple radius: 1.5 softness: 1 + +# Blood Cult Soaps +- type: entity + name: soaplet + id: SoapletBloodCult + noSpawn: true + parent: SoapConjured + components: + - type: Sprite + layers: + - state: soaplet + shader: unshaded + color: red + - type: StepTrigger + intersectRatio: 0.04 + - type: Fixtures + fixtures: + fix1: + shape: !type:PhysShapeCircle + radius: 0.2 + density: 5 + mask: + - ItemMask + restitution: 0.3 + friction: 0.1 + projectile: + shape: + !type:PhysShapeAabb + bounds: "-0.08,-0.06,0.08,0.06" + hard: false + mask: + - Impassable + - BulletImpassable + - type: Projectile + deleteOnCollide: false + onlyCollideWhenShot: false + damage: + types: + Slash: 1 + - type: StaminaDamageOnCollide + damage: 1 + - type: PointLight + color: red + radius: 1.2 + softness: 1 + +- type: entity + name: soap + id: SoapConjuredBloodCultCluster # I swear, I'll use it some how + parent: + - Soap + - ConjuredObject10 + components: + - type: Sprite + sprite: _NF/Objects/Specific/Wizard/conjuredsoap.rsi + layers: + - state: soap-4 + shader: unshaded + color: red + - type: Appearance + - type: ClusterGrenade + fillPrototype: SoapletBloodCult + maxGrenadesCount: 20 + grenadeTriggerIntervalMax: 0 + grenadeTriggerIntervalMin: 0 + baseTriggerDelay: 60 + randomSpread: true + velocity: 25 + - type: DamageOnLand + damage: + types: + Blunt: 9 + - type: PassiveDamage + damage: + groups: + Brute: 10 + - type: Damageable + damageContainer: Inorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 10 + behaviors: + - !type:TriggerBehavior + - !type:DoActsBehavior + acts: ["Destruction"] + - type: ContainerContainer + containers: + cluster-payload: !type:Container + - type: Ammo + muzzleFlash: null + - type: Projectile + deleteOnCollide: false + onlyCollideWhenShot: true + damage: + types: + Slash: 5 + - type: PointLight + color: red + radius: 1.2 + softness: 1 + +- type: entity + id: ShellSoapConjuredBloodCultCluster + parent: + - SoapConjured + - BaseCartridge + #- ConjuredObject10 + components: + - type: Sprite + sprite: _NF/Objects/Specific/Wizard/conjuredsoap.rsi + layers: + - state: soap-4 + shader: unshaded + color: red + - type: CartridgeAmmo + proto: SoapletBloodCult # SoapConjuredBloodCultCluster + count: 35 + spread: 40 + - type: Ammo + muzzleFlash: null diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/wizard_staff.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/wizard_staff.yml index e30e0863509..419fcac920f 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/wizard_staff.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/wizard_staff.yml @@ -24,7 +24,7 @@ - type: Contraband - type: entity - name: red wizard staff + name: inert red wizard staff parent: WizardStaffMeleeBase id: WizardStaffMeleeRed components: @@ -35,7 +35,7 @@ - type: Contraband - type: entity - name: violet wizard staff + name: inert violet wizard staff parent: WizardStaffMeleeBase id: WizardStaffMeleeViolet components: @@ -46,7 +46,7 @@ - type: Contraband - type: entity - name: soap wizard staff + name: inert soap wizard staff parent: WizardStaffMeleeBase id: WizardStaffMeleeSoap components: @@ -58,7 +58,7 @@ # Blood Cult - type: entity - name: blood cult staff + name: inert cultist staff parent: WizardStaffMeleeRed id: WizardStaffMeleeBlood components: @@ -73,3 +73,14 @@ soundHit: path: /Audio/Effects/bite.ogg - type: Contraband + +- type: entity + name: cultist staff + parent: WizardStaffMeleeBlood + id: WizardStaffDarkBolt + suffix: "Dark bolt" + components: + - type: BasicEntityAmmoProvider + proto: BulletBloodCultDarkBolt + capacity: 10 + count: 10 diff --git a/Resources/Prototypes/_NF/Entities/Spawners/bloodcultmobs.yml b/Resources/Prototypes/_NF/Entities/Spawners/bloodcultmobs.yml deleted file mode 100644 index 5ac6e07895b..00000000000 --- a/Resources/Prototypes/_NF/Entities/Spawners/bloodcultmobs.yml +++ /dev/null @@ -1,97 +0,0 @@ -- type: entity - name: Blood Cult Priest Spawner - suffix: AI, Caster - id: SpawnMobBloodCultistPriest - parent: MarkerBase - components: - - type: Sprite - layers: - - state: red - - state: ai - - type: ConditionalSpawner - prototypes: - - MobBloodCultistPriest - -- type: entity - name: Blood Cult Acolyte - suffix: AI, Melee - id: SpawnMobBloodCultistAcolyte - parent: MarkerBase - components: - - type: Sprite - layers: - - state: red - - state: ai - - type: ConditionalSpawner - prototypes: - - MobBloodCultistAcolyte - -- type: entity - name: Blood Cult Zealot - suffix: AI, Melee - id: SpawnMobBloodCultistZealotMelee - parent: MarkerBase - components: - - type: Sprite - layers: - - state: red - - state: ai - - type: ConditionalSpawner - prototypes: - - MobBloodCultistZealotMelee - -- type: entity - name: Blood Cult Zealot - suffix: AI, Ranged - id: SpawnMobBloodCultistZealotRanged - parent: MarkerBase - components: - - type: Sprite - layers: - - state: red - - state: ai - - type: ConditionalSpawner - prototypes: - - MobBloodCultistZealotRanged - -- type: entity - name: Blood Cult Zealot - suffix: AI, Caster - id: SpawnMobBloodCultistCaster - parent: MarkerBase - components: - - type: Sprite - layers: - - state: red - - state: ai - - type: ConditionalSpawner - prototypes: - - MobBloodCultistCaster - -- type: entity - name: Blood Cult Leech - suffix: AI, Melee, Fast - id: SpawnMobBloodCultLeech - parent: MarkerBase - components: - - type: Sprite - layers: - - state: red - - state: ai - - type: ConditionalSpawner - prototypes: - - MobBloodCultLeech - -- type: entity - name: Ascended Cultist - suffix: AI, Caster, Megafauna - id: SpawnMobBloodCultistAscended - parent: MarkerBase - components: - - type: Sprite - layers: - - state: red - - state: ai - - type: ConditionalSpawner - prototypes: - - MobBloodCultistAscended diff --git a/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters.yml b/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters.yml index db40c343a6c..552a4d536c5 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters.yml @@ -93,33 +93,89 @@ - type: entity id: ThrusterNfsd - parent: ThrusterSecurity + parent: [ BaseStructureUnanchorable, BaseThrusterSecurity, ConstructibleMachine ] suffix: NFSD components: - type: Machine board: ThrusterNfsdMachineCircuitboard - type: Sprite sprite: _NF/Structures/Shuttles/thrusternfsd.rsi + layers: + - state: base + map: ["enum.ThrusterVisualLayers.Base"] + - state: thrust + map: ["enum.ThrusterVisualLayers.ThrustOn"] + shader: unshaded + visible: false + - state: thrust_burn_unshaded + map: ["enum.ThrusterVisualLayers.ThrustingUnshaded"] + shader: unshaded + visible: false + offset: 0, 1 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 600 # Considering we need a lot of thrusters didn't want to make an individual one too tanky + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] - type: entity id: ThrusterNfsdUnanchored - parent: ThrusterSecurityUnanchored + parent: ThrusterUnanchored suffix: Unanchored, NFSD components: - - type: Machine - board: ThrusterNfsdMachineCircuitboard - type: Sprite sprite: _NF/Structures/Shuttles/thrusternfsd.rsi + layers: + - state: base + map: ["enum.ThrusterVisualLayers.Base"] + - state: thrust + map: ["enum.ThrusterVisualLayers.ThrustOn"] + shader: unshaded + visible: false + - state: thrust_burn_unshaded + map: ["enum.ThrusterVisualLayers.ThrustingUnshaded"] + shader: unshaded + visible: false + offset: 0, 1 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 600 # Considering we need a lot of thrusters didn't want to make an individual one too tanky + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] - type: entity id: DebugThrusterNfsd - parent: DebugThrusterSecurity + parent: [BaseStructureDisableToolUse, DebugThruster] suffix: DEBUG, NFSD components: - - type: Machine - board: ThrusterNfsdMachineCircuitboard - type: Sprite sprite: _NF/Structures/Shuttles/thrusternfsd.rsi + layers: + - state: base + map: ["enum.ThrusterVisualLayers.Base"] + - state: thrust + map: ["enum.ThrusterVisualLayers.ThrustOn"] + shader: unshaded + visible: false + - state: thrust_burn_unshaded + map: ["enum.ThrusterVisualLayers.ThrustingUnshaded"] + shader: unshaded + visible: false + offset: 0, 1 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 600 # Considering we need a lot of thrusters didn't want to make an individual one too tanky + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] - type: entity id: SmallThruster diff --git a/Resources/Prototypes/_NF/Entities/Structures/Specific/bloodcult.yml b/Resources/Prototypes/_NF/Entities/Structures/Specific/bloodcult.yml index 4946732cc5a..e61a2d301f3 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Specific/bloodcult.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Specific/bloodcult.yml @@ -184,23 +184,58 @@ shader: unshaded - type: entity - parent: BloodCultProp01 + parent: Autolathe id: BloodCultProp02 - name: curious object - description: Huh, I wonder what this thing is and what does it do. + name: blood cult forge + description: A forge for weapon and armor production. components: - type: Sprite - sprite: _NF/Structures/Specific/BloodCult/props.rsi + sprite: _NF/Structures/Specific/BloodCult/forge.rsi + snapCardinals: true layers: - - state: prop-2 - - state: unshadedprop-2 + - state: icon + map: ["enum.LatheVisualLayers.IsRunning"] + - state: unlit shader: unshaded + map: ["enum.PowerDeviceVisualLayers.Powered"] + - state: inserting + map: ["enum.MaterialStorageVisualLayers.Inserting"] + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: MaterialStorage + whitelist: + tags: + - Sheet + - RawMaterial + - Ingot + - type: Lathe + idleState: icon + runningState: building + staticRecipes: + - RitualDagger + - EldritchBlade + - UnholyHalberd + - WizardStaffMeleeBlood + - SpearBone + - ClothingHeadHelmetCultJanitor + - ClothingMaskCultJanitor + - ClothingOuterCoatCultJanitor + - ClothingHeadHelmetCult + - ClothingOuterArmorCult + - ClothingShoesCult + - ClothingHeadHatHoodCulthood + - ClothingOuterRobesCult + - ClothingHeadHelmetBone + - ClothingOuterArmorBone + - ClothingBackpackMessengerBloodCult + - PumpkinLanternSmall + - CandleRedInfinite - type: entity parent: BloodCultProp01 id: BloodCultProp03 - name: curious object - description: Huh, I wonder what this thing is and what does it do. + name: blood cult shrine + description: An occult shrine for imbuing objects with vile energies. components: - type: Sprite sprite: _NF/Structures/Specific/BloodCult/props.rsi @@ -212,8 +247,8 @@ - type: entity parent: BloodCultProp01 id: BloodCultProp04 - name: curious object - description: Huh, I wonder what this thing is and what does it do. + name: blood cult workbench + description: An occult workbench with handy drawers. There is a severed hand in one. components: - type: Sprite sprite: _NF/Structures/Specific/BloodCult/props.rsi diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/bloodcult.yml b/Resources/Prototypes/_NF/Recipes/Lathes/bloodcult.yml new file mode 100644 index 00000000000..8c9517f6efb --- /dev/null +++ b/Resources/Prototypes/_NF/Recipes/Lathes/bloodcult.yml @@ -0,0 +1,184 @@ +# Weapons +- type: latheRecipe + id: RitualDagger + result: RitualDagger + completetime: 1 + category: Weapons + materials: + Bones: 100 + Steel: 500 + +- type: latheRecipe + id: EldritchBlade + result: EldritchBlade + completetime: 1 + category: Weapons + materials: + Bones: 200 + Steel: 700 + Plasteel: 500 + +- type: latheRecipe + id: UnholyHalberd + result: UnholyHalberd + completetime: 1 + category: Weapons + materials: + Bones: 1000 + Steel: 1000 + Plasteel: 1500 + +- type: latheRecipe + id: WizardStaffMeleeBlood + result: WizardStaffMeleeBlood + completetime: 1 + category: Weapons + materials: + Bones: 500 + Plasteel: 500 + Wood: 1500 + +- type: latheRecipe + id: SpearBone + result: SpearBone + completetime: 1 + category: Weapons + materials: + Bones: 400 + Cloth: 100 + +# Armor +- type: latheRecipe + id: ClothingHeadHelmetCultJanitor + result: ClothingHeadHelmetCultJanitor + completetime: 1 + category: ArmorNF + materials: + Bones: 200 + Cloth: 100 + Durathread: 100 + Steel: 500 + Plasteel: 500 + +- type: latheRecipe + id: ClothingMaskCultJanitor + result: ClothingMaskCultJanitor + completetime: 1 + category: ArmorNF + materials: + Bones: 200 + Cloth: 100 + Durathread: 100 + Steel: 200 + Plasteel: 200 + +- type: latheRecipe + id: ClothingOuterCoatCultJanitor + result: ClothingOuterCoatCultJanitor + completetime: 1 + category: ArmorNF + materials: + Bones: 1000 + Cloth: 300 + Durathread: 300 + Steel: 1500 + Plasteel: 1500 + +- type: latheRecipe + id: ClothingHeadHelmetCult + result: ClothingHeadHelmetCult + completetime: 1 + category: ArmorNF + materials: + Bones: 200 + Cloth: 100 + Durathread: 100 + Steel: 500 + Plasteel: 500 + +- type: latheRecipe + id: ClothingOuterArmorCult + result: ClothingOuterArmorCult + completetime: 1 + category: ArmorNF + materials: + Bones: 1000 + Cloth: 300 + Durathread: 300 + Steel: 1500 + Plasteel: 1500 + +- type: latheRecipe + id: ClothingShoesCult + result: ClothingShoesCult + completetime: 1 + category: ArmorNF + materials: + Bones: 200 + Cloth: 100 + Durathread: 100 + Steel: 200 + Plasteel: 200 + +- type: latheRecipe + id: ClothingHeadHatHoodCulthood + result: ClothingHeadHatHoodCulthood + completetime: 1 + category: ArmorNF + materials: + Cloth: 100 + Durathread: 200 + +- type: latheRecipe + id: ClothingOuterRobesCult + result: ClothingOuterRobesCult + completetime: 1 + category: ArmorNF + materials: + Bones: 200 + Cloth: 600 + Durathread: 600 + Plasteel: 200 + +- type: latheRecipe + id: ClothingHeadHelmetBone + result: ClothingHeadHelmetBone + completetime: 1 + category: ArmorNF + materials: + Bones: 400 + +- type: latheRecipe + id: ClothingOuterArmorBone + result: ClothingOuterArmorBone + completetime: 1 + category: ArmorNF + materials: + Bones: 600 + +- type: latheRecipe + id: ClothingBackpackMessengerBloodCult + result: ClothingBackpackMessengerBloodCult + completetime: 1 + category: ArmorNF + materials: + Cloth: 400 + +# Tools +- type: latheRecipe + id: PumpkinLanternSmall + result: PumpkinLanternSmall + completetime: 1 + category: Tools + materials: + Bones: 400 + Steel: 200 + +- type: latheRecipe + id: CandleRedInfinite + result: CandleRedInfinite + completetime: 1 + category: Tools + materials: + Bones: 400 + Durathread: 100 diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Hostile/blood_cultists.yml b/Resources/Prototypes/_NF/Roles/Jobs/Hostile/blood_cultists.yml index 818a06d3dd5..626dae1e443 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Hostile/blood_cultists.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Hostile/blood_cultists.yml @@ -7,8 +7,9 @@ gloves: ClothingHandsGlovesCombat neck: BedsheetCult outerClothing: ClothingOuterArmorCult + belt: ClothingBeltCultWebbing + back: ClothingBackpackBloodCultLootA inhand: -# - UnholyHalberd - WizardStaffMeleeBlood # Acolyte @@ -19,42 +20,63 @@ shoes: ClothingShoesCult gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterArmorCult + back: ClothingBackpackBloodCultLootB + belt: ClothingBeltCultWebbing inhand: - - EldritchBlade -# - RitualDagger + - SpawnInhandMeleeWeaponBloodCultHigh # Cultist (Melee) - type: startingGear id: BloodCultistZealotMeleeGear equipment: - head: ClothingHeadHatHoodCulthood + head: ClothingHeadHatHoodBloodCulthoodUnremoveable shoes: ClothingShoesCult gloves: ClothingHandsGlovesCombat mask: ClothingMaskJackal - outerClothing: ClothingOuterRobesCult + outerClothing: ClothingOuterCoatBloodCultRobes + belt: ClothingBeltCultWebbing + back: ClothingBackpackBloodCultLootD inhand: - - RitualDagger + - SpawnInhandMeleeWeaponBloodCultLow # Cultist (Ranged) - type: startingGear id: BloodCultistZealotRangedGear equipment: - head: ClothingHeadHatHoodCulthood + head: ClothingHeadHatHoodBloodCulthoodUnremoveable shoes: ClothingShoesCult mask: ClothingMaskRaven gloves: ClothingHandsGlovesColorBlackCrossbow - outerClothing: ClothingOuterRobesCult + outerClothing: ClothingOuterCoatBloodCultRobes back: ClothingBackpackBloodCultZealotLootA belt: ClothingBeltQuiverCrossbowFilledBolt + inhand: + - SpawnInhandMeleeWeaponBloodCultLow # Cultist (Caster) - type: startingGear id: BloodCultistCasterGear equipment: - head: ClothingHeadHatHoodCulthood + head: ClothingHeadHatHoodBloodCulthoodUnremoveable shoes: ClothingShoesCult mask: ClothingMaskRaven gloves: ClothingHandsGlovesCombat - outerClothing: ClothingOuterRobesCult + outerClothing: ClothingOuterCoatBloodCultRobes + back: ClothingBackpackBloodCultLootC + belt: ClothingBeltCultWebbing inhand: - WizardStaffMeleeBlood + +# Janitor (Caster) +- type: startingGear + id: BloodCultistJanitorGear + equipment: + head: ClothingHeadHelmetCultJanitor + shoes: ClothingShoesCult + mask: ClothingMaskCultJanitor + gloves: ClothingHandsGlovesCombat + outerClothing: ClothingOuterCoatCultJanitor + belt: ClothingBeltCultForceField + back: ClothingBackpackBloodCultLootA + inhand: + - SpawnInhandMeleeWeaponBloodCultHigh diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..b645db6d31b Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/icon.png new file mode 100644 index 00000000000..e93a93d031a Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/inhand-left.png new file mode 100644 index 00000000000..77dee9de3fd Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/inhand-right.png new file mode 100644 index 00000000000..b41f121b130 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/meta.json new file mode 100644 index 00000000000..fd414099766 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0345de358247afe0eb23ed0ff509b9b5f1995135 | Based on sprite by @Zydras (github), resprited (colored) for Syndicate by erhardsteinhauer (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_NF/Clothing/Belt/cult_force_field.rsi/equipped-BELT.png b/Resources/Textures/_NF/Clothing/Belt/cult_force_field.rsi/equipped-BELT.png new file mode 100644 index 00000000000..ca6516b9dee Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Belt/cult_force_field.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_NF/Clothing/Belt/cult_force_field.rsi/icon.png b/Resources/Textures/_NF/Clothing/Belt/cult_force_field.rsi/icon.png new file mode 100644 index 00000000000..623570cc6bd Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Belt/cult_force_field.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Belt/cult_force_field.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Belt/cult_force_field.rsi/inhand-left.png new file mode 100644 index 00000000000..6116c042a92 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Belt/cult_force_field.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Belt/cult_force_field.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Belt/cult_force_field.rsi/inhand-right.png new file mode 100644 index 00000000000..11be63e0cdb Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Belt/cult_force_field.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Belt/cult_force_field.rsi/meta.json b/Resources/Textures/_NF/Clothing/Belt/cult_force_field.rsi/meta.json new file mode 100644 index 00000000000..5f67545a788 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Belt/cult_force_field.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/blob/master/icons/mob/nonhuman-player/cult.dmi : modificationa to the original fila and icon and inhand spraties by erhardsteinhauer", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4, + "delays": [ + [ 0.3, 0.3, 0.3 ], + [ 0.3, 0.3, 0.3 ], + [ 0.3, 0.3, 0.3 ], + [ 0.3, 0.3, 0.3 ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Belt/cult_webbing.rsi/equipped-BELT.png b/Resources/Textures/_NF/Clothing/Belt/cult_webbing.rsi/equipped-BELT.png new file mode 100644 index 00000000000..d457326c697 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Belt/cult_webbing.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_NF/Clothing/Belt/cult_webbing.rsi/icon.png b/Resources/Textures/_NF/Clothing/Belt/cult_webbing.rsi/icon.png new file mode 100644 index 00000000000..1027479ad88 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Belt/cult_webbing.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Belt/cult_webbing.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Belt/cult_webbing.rsi/inhand-left.png new file mode 100644 index 00000000000..e62a991e4d3 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Belt/cult_webbing.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Belt/cult_webbing.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Belt/cult_webbing.rsi/inhand-right.png new file mode 100644 index 00000000000..0e7a437c011 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Belt/cult_webbing.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Belt/cult_webbing.rsi/meta.json b/Resources/Textures/_NF/Clothing/Belt/cult_webbing.rsi/meta.json new file mode 100644 index 00000000000..29a21879665 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Belt/cult_webbing.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tg at commit https://github.com/tgstation/tgstation/commit/0310aaa254607855d7273ec849c4ecad48477dd5 | resprited in blood cult colors by erhardsteinhauer", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/cult_janitor.rsi/equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Helmets/cult_janitor.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..9f74174191d Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Helmets/cult_janitor.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/cult_janitor.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Helmets/cult_janitor.rsi/icon.png new file mode 100644 index 00000000000..c61c1b2669f Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Helmets/cult_janitor.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/cult_janitor.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Head/Helmets/cult_janitor.rsi/inhand-left.png new file mode 100644 index 00000000000..d534b05118d Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Helmets/cult_janitor.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/cult_janitor.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Head/Helmets/cult_janitor.rsi/inhand-right.png new file mode 100644 index 00000000000..267039e48f9 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Helmets/cult_janitor.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/cult_janitor.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Helmets/cult_janitor.rsi/meta.json new file mode 100644 index 00000000000..068dfe738d6 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Head/Helmets/cult_janitor.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e , edited by Alekshhh, recolored for New Frontier by erhardsteinhauer", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/cult.rsi/equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hoods/cult.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..c2999a2247b Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hoods/cult.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/cult.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Hoods/cult.rsi/icon.png new file mode 100644 index 00000000000..0fbd391b8bf Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hoods/cult.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/cult.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Head/Hoods/cult.rsi/inhand-left.png new file mode 100644 index 00000000000..52c39e0b78b Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hoods/cult.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/cult.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Head/Hoods/cult.rsi/inhand-right.png new file mode 100644 index 00000000000..7e9456150e1 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hoods/cult.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/cult.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hoods/cult.rsi/meta.json new file mode 100644 index 00000000000..bb4192c2c21 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Head/Hoods/cult.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | resprited in blood cult colors by erhardsteinhauer", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Masks/cult_janitor_mask.rsi/equipped-MASK.png b/Resources/Textures/_NF/Clothing/Masks/cult_janitor_mask.rsi/equipped-MASK.png new file mode 100644 index 00000000000..fb6ed83e3c3 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Masks/cult_janitor_mask.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/_NF/Clothing/Masks/cult_janitor_mask.rsi/icon.png b/Resources/Textures/_NF/Clothing/Masks/cult_janitor_mask.rsi/icon.png new file mode 100644 index 00000000000..f679209ccd9 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Masks/cult_janitor_mask.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Masks/cult_janitor_mask.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Masks/cult_janitor_mask.rsi/inhand-left.png new file mode 100644 index 00000000000..958a46869f8 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Masks/cult_janitor_mask.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Masks/cult_janitor_mask.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Masks/cult_janitor_mask.rsi/inhand-right.png new file mode 100644 index 00000000000..49beafac712 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Masks/cult_janitor_mask.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Masks/cult_janitor_mask.rsi/meta.json b/Resources/Textures/_NF/Clothing/Masks/cult_janitor_mask.rsi/meta.json new file mode 100644 index 00000000000..ba80d1cedd3 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Masks/cult_janitor_mask.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/e89db4dd4f42377b0adafb06806a763314a89034 , edited by Alekshhh, recolored for New Frontier by erhardsteinhauer", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/cult_janitor_robe.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/cult_janitor_robe.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..6f694f7373a Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/cult_janitor_robe.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/cult_janitor_robe.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/cult_janitor_robe.rsi/icon.png new file mode 100644 index 00000000000..8b43ff96db3 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/cult_janitor_robe.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/cult_janitor_robe.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/cult_janitor_robe.rsi/inhand-left.png new file mode 100644 index 00000000000..2f57c00a816 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/cult_janitor_robe.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/cult_janitor_robe.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/cult_janitor_robe.rsi/inhand-right.png new file mode 100644 index 00000000000..fef28052d48 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/cult_janitor_robe.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/cult_janitor_robe.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/cult_janitor_robe.rsi/meta.json new file mode 100644 index 00000000000..d52461dc903 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/cult_janitor_robe.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/e89db4dd4f42377b0adafb06806a763314a89034 , edited by Alekshhh, recolored for New Frontier by erhardsteinhauer", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/cult_robes.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/cult_robes.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..f6fdd89a07d Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/cult_robes.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/cult_robes.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/cult_robes.rsi/icon.png new file mode 100644 index 00000000000..bb19fafdd17 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/cult_robes.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/cult_robes.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/cult_robes.rsi/inhand-left.png new file mode 100644 index 00000000000..f09e1f97932 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/cult_robes.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/cult_robes.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/cult_robes.rsi/inhand-right.png new file mode 100644 index 00000000000..20794e28aaa Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/cult_robes.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Coats/cult_robes.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/cult_robes.rsi/meta.json new file mode 100644 index 00000000000..0b1255fcd7e --- /dev/null +++ b/Resources/Textures/_NF/Clothing/OuterClothing/Coats/cult_robes.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | resprited in blood cult colors by erhardsteinhauer", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Specific/Wizard/conjuredsoap.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Wizard/conjuredsoap.rsi/meta.json index 1f9c900980a..0963e5ba314 100644 --- a/Resources/Textures/_NF/Objects/Specific/Wizard/conjuredsoap.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Specific/Wizard/conjuredsoap.rsi/meta.json @@ -22,6 +22,9 @@ { "name": "soap-4" }, + { + "name": "soaplet" + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/_NF/Objects/Specific/Wizard/conjuredsoap.rsi/soaplet.png b/Resources/Textures/_NF/Objects/Specific/Wizard/conjuredsoap.rsi/soaplet.png new file mode 100644 index 00000000000..5315a3324e5 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Wizard/conjuredsoap.rsi/soaplet.png differ diff --git a/Resources/Textures/_NF/Structures/Specific/BloodCult/forge.rsi/building.png b/Resources/Textures/_NF/Structures/Specific/BloodCult/forge.rsi/building.png new file mode 100644 index 00000000000..ca53a9ce208 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Specific/BloodCult/forge.rsi/building.png differ diff --git a/Resources/Textures/_NF/Structures/Specific/BloodCult/forge.rsi/icon.png b/Resources/Textures/_NF/Structures/Specific/BloodCult/forge.rsi/icon.png new file mode 100644 index 00000000000..1766c0aa2e2 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Specific/BloodCult/forge.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Structures/Specific/BloodCult/forge.rsi/inserting.png b/Resources/Textures/_NF/Structures/Specific/BloodCult/forge.rsi/inserting.png new file mode 100644 index 00000000000..a342a4b4d1c Binary files /dev/null and b/Resources/Textures/_NF/Structures/Specific/BloodCult/forge.rsi/inserting.png differ diff --git a/Resources/Textures/_NF/Structures/Specific/BloodCult/forge.rsi/meta.json b/Resources/Textures/_NF/Structures/Specific/BloodCult/forge.rsi/meta.json new file mode 100644 index 00000000000..d104b23ffb9 --- /dev/null +++ b/Resources/Textures/_NF/Structures/Specific/BloodCult/forge.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/tree/master/icons/obj/antags/cult | modified by erhardsteinhauer", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "delays": [ [ 0.2, 0.2, 0.2 ] ] + }, + { + "name": "panel" + }, + { + "name": "unlit", + "delays": [ [ 0.2, 0.2, 0.2 ] ] + }, + { + "name": "building", + "delays": [ [ 0.2, 0.2, 0.2 ] ] + }, + { + "name": "inserting", + "delays": [ [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ] ] + } + ] +} diff --git a/Resources/Textures/_NF/Structures/Specific/BloodCult/forge.rsi/panel.png b/Resources/Textures/_NF/Structures/Specific/BloodCult/forge.rsi/panel.png new file mode 100644 index 00000000000..e80c69460ac Binary files /dev/null and b/Resources/Textures/_NF/Structures/Specific/BloodCult/forge.rsi/panel.png differ diff --git a/Resources/Textures/_NF/Structures/Specific/BloodCult/forge.rsi/unlit.png b/Resources/Textures/_NF/Structures/Specific/BloodCult/forge.rsi/unlit.png new file mode 100644 index 00000000000..0b26fc475af Binary files /dev/null and b/Resources/Textures/_NF/Structures/Specific/BloodCult/forge.rsi/unlit.png differ