diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 7e861db0d5..8893c9d59f 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -630,6 +630,12 @@ - JetpackBlue - JetpackMini # End Nyano additions + # Lost Paradise: start + - LPPERPModuleBorg + - LPPDroneModuleSecurityTaser + - LPPBorgModuleAresst + - LPPBattleBorgModule + # Lost Paradise: end - type: MaterialStorage whitelist: tags: diff --git a/Resources/Prototypes/_LostParadise/Recipes/Lathes/robotics.yml b/Resources/Prototypes/_LostParadise/Recipes/Lathes/robotics.yml new file mode 100644 index 0000000000..9a05ff2a4a --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Recipes/Lathes/robotics.yml @@ -0,0 +1,871 @@ + +# ============================================================ +# +# [Части тела киборгов] +# +# ============================================================ +# +# - type: latheRecipe +# id: LeftArmBorg +# result: LeftArmBorg +# category: Robotics +# completetime: 2 +# materials: +# Steel: 250 +# Glass: 100 +# +# - type: latheRecipe +# id: RightArmBorg +# result: RightArmBorg +# category: Robotics +# completetime: 2 +# materials: +# Steel: 250 +# Glass: 100 +# +# - type: latheRecipe +# id: LeftLegBorg +# result: LeftLegBorg +# category: Robotics +# completetime: 2 +# materials: +# Steel: 250 +# Glass: 100 +# +# - type: latheRecipe +# id: RightLegBorg +# result: RightLegBorg +# category: Robotics +# completetime: 2 +# materials: +# Steel: 250 +# Glass: 100 +# +# - type: latheRecipe +# id: LightHeadBorg +# result: LightHeadBorg +# category: Robotics +# completetime: 2 +# materials: +# Steel: 250 +# Glass: 100 +# +# - type: latheRecipe +# id: TorsoBorg +# result: TorsoBorg +# category: Robotics +# completetime: 2 +# materials: +# Steel: 250 +# Glass: 100 +# +# - type: latheRecipe +# id: LeftArmBorgEngineer +# result: LeftArmBorgEngineer +# category: Robotics +# completetime: 2 +# materials: +# Steel: 250 +# Glass: 100 +# +# - type: latheRecipe +# id: RightArmBorgEngineer +# result: RightArmBorgEngineer +# category: Robotics +# completetime: 2 +# materials: +# Steel: 250 +# Glass: 100 +# +# - type: latheRecipe +# id: LeftLegBorgEngineer +# result: LeftLegBorgEngineer +# category: Robotics +# completetime: 2 +# materials: +# Steel: 250 +# Glass: 100 +# +# - type: latheRecipe +# id: RightLegBorgEngineer +# result: RightLegBorgEngineer +# category: Robotics +# completetime: 2 +# materials: +# Steel: 250 +# Glass: 100 +# +# - type: latheRecipe +# id: HeadBorgEngineer +# result: HeadBorgEngineer +# category: Robotics +# completetime: 2 +# materials: +# Steel: 250 +# Glass: 100 +# +# - type: latheRecipe +# id: TorsoBorgEngineer +# result: TorsoBorgEngineer +# category: Robotics +# completetime: 2 +# materials: +# Steel: 250 +# Glass: 100 +# +# - type: latheRecipe +# id: LeftArmBorgMedical +# result: LeftArmBorgMedical +# category: Robotics +# completetime: 2 +# materials: +# Steel: 250 +# Glass: 100 +# +# - type: latheRecipe +# id: RightArmBorgMedical +# result: RightArmBorgMedical +# category: Robotics +# completetime: 2 +# materials: +# Steel: 250 +# Glass: 100 +# +# - type: latheRecipe +# id: LeftLegBorgMedical +# result: LeftLegBorgMedical +# category: Robotics +# completetime: 2 +# materials: +# Steel: 250 +# Glass: 100 +# +# - type: latheRecipe +# id: RightLegBorgMedical +# result: RightLegBorgMedical +# category: Robotics +# completetime: 2 +# materials: +# Steel: 250 +# Glass: 100 +# +# - type: latheRecipe +# id: HeadBorgMedical +# result: HeadBorgMedical +# category: Robotics +# completetime: 2 +# materials: +# Steel: 250 +# Glass: 100 +# +# - type: latheRecipe +# id: TorsoBorgMedical +# result: TorsoBorgMedical +# category: Robotics +# completetime: 2 +# materials: +# Steel: 250 +# Glass: 100 +# +# - type: latheRecipe +# id: LeftArmBorgService +# result: LeftArmBorgService +# category: Robotics +# completetime: 2 +# materials: +# Steel: 250 +# Glass: 100 +# +# - type: latheRecipe +# id: RightArmBorgService +# result: RightArmBorgService +# category: Robotics +# completetime: 2 +# materials: +# Steel: 250 +# Glass: 100 +# +# - type: latheRecipe +# id: LeftLegBorgService +# result: LeftLegBorgService +# category: Robotics +# completetime: 2 +# materials: +# Steel: 250 +# Glass: 100 +# +# - type: latheRecipe +# id: RightLegBorgService +# result: RightLegBorgService +# category: Robotics +# completetime: 2 +# materials: +# Steel: 250 +# Glass: 100 +# +# - type: latheRecipe +# id: HeadBorgService +# result: HeadBorgService +# category: Robotics +# completetime: 2 +# materials: +# Steel: 250 +# Glass: 100 +# +# - type: latheRecipe +# id: TorsoBorgService +# result: TorsoBorgService +# category: Robotics +# completetime: 2 +# materials: +# Steel: 250 +# Glass: 100 +# +# - type: latheRecipe +# id: LeftLegBorgJanitor +# result: LeftLegBorgJanitor +# category: Robotics +# completetime: 2 +# materials: +# Steel: 250 +# Glass: 100 +# +# - type: latheRecipe +# id: RightLegBorgJanitor +# result: RightLegBorgJanitor +# category: Robotics +# completetime: 2 +# materials: +# Steel: 250 +# Glass: 100 +# +# - type: latheRecipe +# id: HeadBorgJanitor +# result: HeadBorgJanitor +# category: Robotics +# completetime: 4 +# materials: +# Steel: 500 +# Glass: 200 +# +# - type: latheRecipe +# id: TorsoBorgJanitor +# result: TorsoBorgJanitor +# category: Robotics +# completetime: 4 +# materials: +# Steel: 500 +# Glass: 200 +# +# # ============================================================ +# # +# # [Центральные процессоры киборгов] +# # +# # ============================================================ +# +# - type: latheRecipe +# id: MMI +# result: MMI +# category: Robotics +# completetime: 3 +# icon: +# sprite: Objects/Specific/Robotics/mmi.rsi +# state: mmi_off +# materials: +# Steel: 1000 +# Glass: 200 +# Plastic: 500 +# Gold: 200 +# +# - type: latheRecipe +# id: PositronicBrain +# result: PositronicBrain +# category: Robotics +# completetime: 3 +# materials: +# Steel: 500 +# Plastic: 500 +# Gold: 100 +# Silver: 100 +# Plasma: 1000 +# +# # ============================================================ +# # +# # [Модули киборгов] +# # +# # ============================================================ +# +# - type: latheRecipe +# id: BorgModuleCable +# result: BorgModuleCable +# category: Robotics +# completetime: 3 +# materials: +# Steel: 250 +# Glass: 250 +# Plastic: 250 +# +# - type: latheRecipe +# id: BorgModuleFireExtinguisher +# result: BorgModuleFireExtinguisher +# category: Robotics +# completetime: 3 +# materials: +# Steel: 250 +# Glass: 250 +# Plastic: 250 +# +# - type: latheRecipe +# id: BorgModuleGPS +# result: BorgModuleGPS +# category: Robotics +# completetime: 3 +# materials: +# Steel: 250 +# Glass: 250 +# Plastic: 250 +# +# - type: latheRecipe +# id: BorgModuleRadiationDetection +# result: BorgModuleRadiationDetection +# category: Robotics +# completetime: 3 +# materials: +# Steel: 250 +# Glass: 250 +# Plastic: 250 +# +# - type: latheRecipe +# id: BorgModuleTool +# result: BorgModuleTool +# category: Robotics +# completetime: 3 +# materials: +# Steel: 250 +# Glass: 250 +# Plastic: 250 +# +# - type: latheRecipe +# id: BorgModuleAppraisal +# result: BorgModuleAppraisal +# category: Robotics +# completetime: 3 +# materials: +# Steel: 250 +# Glass: 250 +# Plastic: 250 +# +# - type: latheRecipe +# id: BorgModuleMining +# result: BorgModuleMining +# category: Robotics +# completetime: 3 +# materials: +# Steel: 250 +# Glass: 250 +# Plastic: 250 +# +# - type: latheRecipe +# id: BorgModuleGrapplingGun +# result: BorgModuleGrapplingGun +# category: Robotics +# completetime: 3 +# materials: +# Steel: 500 +# Glass: 500 +# Plastic: 250 +# Gold: 50 +# +# - type: latheRecipe +# id: BorgModuleAdvancedTool +# result: BorgModuleAdvancedTool +# category: Robotics +# completetime: 3 +# materials: +# Steel: 500 +# Glass: 500 +# Plastic: 250 +# Gold: 50 +# +# - type: latheRecipe +# id: BorgModuleConstruction +# result: BorgModuleConstruction +# category: Robotics +# completetime: 3 +# materials: +# Steel: 500 +# Glass: 500 +# Plastic: 250 +# +# - type: latheRecipe +# id: BorgModuleRCD +# result: BorgModuleRCD +# category: Robotics +# completetime: 3 +# materials: +# Steel: 500 +# Glass: 500 +# Plastic: 250 +# Gold: 50 +# +# - type: latheRecipe +# id: BorgModuleLightReplacer +# result: BorgModuleLightReplacer +# category: Robotics +# completetime: 3 +# materials: +# Steel: 250 +# Glass: 250 +# Plastic: 250 +# +# - type: latheRecipe +# id: BorgModuleCleaning +# result: BorgModuleCleaning +# category: Robotics +# completetime: 3 +# materials: +# Steel: 250 +# Glass: 250 +# Plastic: 250 +# +# - type: latheRecipe +# id: BorgModuleAdvancedCleaning +# result: BorgModuleAdvancedCleaning +# category: Robotics +# completetime: 3 +# materials: +# Steel: 250 +# Glass: 250 +# Plastic: 250 +# Gold: 50 +# +# - type: latheRecipe +# id: BorgModuleDiagnosis +# result: BorgModuleDiagnosis +# category: Robotics +# completetime: 3 +# materials: +# Steel: 250 +# Glass: 250 +# Plastic: 250 +# +# - type: latheRecipe +# id: BorgModuleTreatment +# result: BorgModuleTreatment +# category: Robotics +# completetime: 3 +# materials: +# Steel: 250 +# Glass: 250 +# Plastic: 250 +# +# - type: latheRecipe +# id: BorgModuleAdvancedTreatment +# result: BorgModuleAdvancedTreatment +# category: Robotics +# completetime: 3 +# materials: +# Steel: 500 +# Glass: 500 +# Plastic: 250 +# Gold: 50 +# +# - type: latheRecipe +# id: BorgModuleDefibrillator +# result: BorgModuleDefibrillator +# category: Robotics +# completetime: 3 +# materials: +# Steel: 500 +# Glass: 500 +# Plastic: 250 +# Gold: 50 +# +# - type: latheRecipe +# id: BorgModuleArtifact +# result: BorgModuleArtifact +# category: Robotics +# completetime: 3 +# materials: +# Steel: 250 +# Glass: 250 +# Plastic: 250 +# +# - type: latheRecipe +# id: BorgModuleAnomaly +# result: BorgModuleAnomaly +# category: Robotics +# completetime: 3 +# materials: +# Steel: 250 +# Glass: 250 +# Plastic: 250 +# +# - type: latheRecipe +# id: BorgModuleService +# result: BorgModuleService +# category: Robotics +# completetime: 3 +# materials: +# Steel: 250 +# Glass: 250 +# Plastic: 250 +# +# - type: latheRecipe +# id: BorgModuleMusique +# result: BorgModuleMusique +# category: Robotics +# completetime: 3 +# materials: +# Steel: 250 +# Glass: 250 +# Plastic: 250 +# +# - type: latheRecipe +# id: BorgModuleGardening +# result: BorgModuleGardening +# category: Robotics +# completetime: 3 +# materials: +# Steel: 250 +# Glass: 250 +# Plastic: 250 +# +# - type: latheRecipe +# id: BorgModuleHarvesting +# result: BorgModuleHarvesting +# category: Robotics +# completetime: 3 +# materials: +# Steel: 250 +# Glass: 250 +# Plastic: 250 +# +# - type: latheRecipe +# id: BorgModuleClowning +# result: BorgModuleClowning +# category: Robotics +# completetime: 3 +# materials: +# Steel: 250 +# Glass: 250 +# Plastic: 250 + +# ============================================================ +# +# [Части киборгов LPP] +# +# ============================================================ + +# [Киборг службы безопасности] + +- type: latheRecipe + id: LPPLeftArmBorgSecurity + result: LPPLeftArmBorgSecurity + category: Robotics + completetime: 4 + materials: + Steel: 350 + Glass: 200 + +- type: latheRecipe + id: LPPRightArmBorgSecurity + result: LPPRightArmBorgSecurity + category: Robotics + completetime: 4 + materials: + Steel: 350 + Glass: 200 + +- type: latheRecipe + id: LPPLeftLegBorgSecurity + result: LPPLeftLegBorgSecurity + category: Robotics + completetime: 4 + materials: + Steel: 350 + Glass: 200 + +- type: latheRecipe + id: LPPRightLegBorgSecurity + result: LPPRightLegBorgSecurity + category: Robotics + completetime: 4 + materials: + Steel: 350 + Glass: 200 + +- type: latheRecipe + id: LPPHeadBorgSecurity + result: LPPHeadBorgSecurity + category: Robotics + completetime: 4 + materials: + Steel: 350 + Glass: 200 + +- type: latheRecipe + id: LPPTorsoBorgSecurity + result: LPPTorsoBorgSecurity + category: Robotics + completetime: 4 + materials: + Steel: 350 + Glass: 200 + +# [Эротический киборг] +- type: latheRecipe + id: LPPLeftArmBorgErotic + result: LPPLeftArmBorgErotic + category: Robotics + completetime: 2 + materials: + Steel: 250 + Glass: 100 + Plastic: 350 + +- type: latheRecipe + id: LPPRightArmBorgErotic + result: LPPRightArmBorgErotic + category: Robotics + completetime: 2 + materials: + Steel: 250 + Glass: 100 + Plastic: 350 + +- type: latheRecipe + id: LPPLeftLegBorgErotic + result: LPPLeftLegBorgErotic + category: Robotics + completetime: 2 + materials: + Steel: 250 + Glass: 100 + Plastic: 350 + +- type: latheRecipe + id: LPPRightLegBorgErotic + result: LPPRightLegBorgErotic + category: Robotics + completetime: 2 + materials: + Steel: 250 + Glass: 100 + Plastic: 350 + +- type: latheRecipe + id: LPPHeadBorgErotic + result: LPPHeadBorgErotic + category: Robotics + completetime: 2 + materials: + Steel: 250 + Glass: 100 + Plastic: 350 + +- type: latheRecipe + id: LPPTorsoBorgErotic + result: LPPTorsoBorgErotic + category: Robotics + completetime: 2 + materials: + Steel: 250 + Glass: 100 + Plastic: 350 +# [Шахтёрский киборг] +- type: latheRecipe + id: LPPLeftArmBorgMining + result: LPPLeftArmBorgMining + category: Robotics + completetime: 2 + materials: + Steel: 350 + Glass: 100 + +- type: latheRecipe + id: LPPRightArmBorgMining + result: LPPRightArmBorgMining + category: Robotics + completetime: 2 + materials: + Steel: 350 + Glass: 100 + +- type: latheRecipe + id: LPPLeftLegBorgMining + result: LPPLeftLegBorgMining + category: Robotics + completetime: 2 + materials: + Steel: 350 + Glass: 100 + +- type: latheRecipe + id: LPPRightLegBorgMining + result: LPPRightLegBorgMining + category: Robotics + completetime: 2 + materials: + Steel: 350 + Glass: 100 + +- type: latheRecipe + id: LPPHeadBorgMining + result: LPPHeadBorgMining + category: Robotics + completetime: 2 + materials: + Steel: 350 + Glass: 100 + +- type: latheRecipe + id: LPPTorsoBorgMining + result: LPPTorsoBorgMining + category: Robotics + completetime: 2 + materials: + Steel: 350 + Glass: 100 +# [РНД киборг] +- type: latheRecipe + id: LPPLeftArmBorgScience + result: LPPLeftArmBorgScience + category: Robotics + completetime: 2 + materials: + Steel: 250 + Glass: 100 + Plastic: 200 + +- type: latheRecipe + id: LPPRightArmBorgScience + result: LPPRightArmBorgScience + category: Robotics + completetime: 2 + materials: + Steel: 250 + Glass: 100 + Plastic: 200 + +- type: latheRecipe + id: LPPLeftLegBorgScience + result: LPPLeftLegBorgScience + category: Robotics + completetime: 2 + materials: + Steel: 250 + Glass: 100 + Plastic: 200 + +- type: latheRecipe + id: LPPRightLegBorgScience + result: LPPRightLegBorgScience + category: Robotics + completetime: 2 + materials: + Steel: 250 + Glass: 100 + Plastic: 200 + +- type: latheRecipe + id: LPPHeadBorgScience + result: LPPHeadBorgScience + category: Robotics + completetime: 2 + materials: + Steel: 250 + Glass: 100 + Plastic: 200 + +- type: latheRecipe + id: LPPTorsoBorgScience + result: LPPTorsoBorgScience + category: Robotics + completetime: 2 + materials: + Steel: 250 + Glass: 100 + Plastic: 200 + +# ============================================================ +# +# [Модули киборгов LPP] +# +# ============================================================ + +- type: latheRecipe + id: LPPERPModuleBorg + result: LPPERPModuleBorg + category: Robotics + completetime: 3 + materials: + Steel: 250 + Glass: 250 + Plastic: 350 + +- type: latheRecipe + id: LPPBorgModuleLaserWeaponAdvanced + result: LPPBorgModuleLaserWeaponAdvanced + category: Robotics + completetime: 3 + materials: + Steel: 500 + Glass: 500 + Plastic: 200 + Silver: 200 + +- type: latheRecipe + id: LPPBorgModuleLaserWeapon + result: LPPBorgModuleLaserWeapon + category: Robotics + completetime: 3 + materials: + Steel: 400 + Glass: 400 + Plastic: 100 + Silver: 100 + +- type: latheRecipe + id: LPPDroneModuleSecurityTaser + result: LPPDroneModuleSecurityTaser + category: Robotics + completetime: 3 + materials: + Steel: 200 + Glass: 400 + Plastic: 100 + Silver: 100 + +- type: latheRecipe + id: LPPBorgModuleAresst + result: LPPBorgModuleAresst + category: Robotics + completetime: 3 + materials: + Steel: 500 + Glass: 100 + Plastic: 100 + Silver: 100 + +- type: latheRecipe + id: LPPBattleBorgModule + result: LPPBattleBorgModule + category: Robotics + completetime: 3 + materials: + Steel: 500 + Glass: 500 + Plastic: 100 + Silver: 100 + +- type: latheRecipe + id: LPPModuleBorgHands + result: LPPModuleBorgHands + category: Robotics + completetime: 3 + materials: + Steel: 500 + Glass: 500 + Plastic: 500 + Silver: 200 diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/Command/stationai.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/Command/stationai.yml index 8ae517e5d6..8c5ad7b2db 100644 --- a/Resources/Prototypes/_LostParadise/Roles/Jobs/Command/stationai.yml +++ b/Resources/Prototypes/_LostParadise/Roles/Jobs/Command/stationai.yml @@ -11,7 +11,7 @@ department: Science time: 14400 - !type:DepartmentTimeRequirement - department: Security + department: Epistemics time: 14400 - !type:DepartmentTimeRequirement department: Civilian @@ -32,4 +32,4 @@ jobEntity: AICore alwaysUseSpawner: true joinNotifyCrew: true - whitelisted: true \ No newline at end of file + whitelisted: true diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/Science/roboticist.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/Science/roboticist.yml index f3cb0d6e35..aff4f4551c 100644 --- a/Resources/Prototypes/_LostParadise/Roles/Jobs/Science/roboticist.yml +++ b/Resources/Prototypes/_LostParadise/Roles/Jobs/Science/roboticist.yml @@ -5,7 +5,7 @@ playTimeTracker: JobRoboticist requirements: - !type:CharacterDepartmentTimeRequirement - department: Science + department: Epistemics time: 36000 #10 hrs startingGear: RoboticistGear icon: "JobIconRoboticist" @@ -23,5 +23,3 @@ ears: ClothingHeadsetRobotics eyes: ClothingEyesHudDiagnostic belt: ClothingBeltUtilityEngineering - - diff --git a/Resources/Prototypes/_LostParadise/lobbyscreenslpp.yml b/Resources/Prototypes/_LostParadise/lobbyscreenslpp.yml index 3d4a5c8c93..4ec6681c8b 100644 --- a/Resources/Prototypes/_LostParadise/lobbyscreenslpp.yml +++ b/Resources/Prototypes/_LostParadise/lobbyscreenslpp.yml @@ -1,31 +1,31 @@ - type: lobbyBackground id: Borman - background: /Textures/LPP/LobbyScreens/borman.png + background: /Textures/_LostParadise/LobbyScreens/borman.png - type: lobbyBackground id: Teftelka - background: /Textures/LPP/LobbyScreens/teftelka.png + background: /Textures/_LostParadise/LobbyScreens/teftelka.png - type: lobbyBackground id: Penisher - background: /Textures/LPP/LobbyScreens/penisher.png + background: /Textures/_LostParadise/LobbyScreens/penisher.png - type: lobbyBackground id: Amina - background: /Textures/LPP/LobbyScreens/amina.png + background: /Textures/_LostParadise/LobbyScreens/amina.png - type: lobbyBackground id: Bigmoon - background: /Textures/LPP/LobbyScreens/bigmoon.png + background: /Textures/_LostParadise/LobbyScreens/bigmoon.png - type: lobbyBackground id: Girls - background: /Textures/LPP/LobbyScreens/girls.png + background: /Textures/_LostParadise/LobbyScreens/girls.png - type: lobbyBackground id: Clara - background: /Textures/LPP/LobbyScreens/clara.png + background: /Textures/_LostParadise/LobbyScreens/clara.png - type: lobbyBackground id: Kirashet - background: /Textures/LPP/LobbyScreens/kirashet.png + background: /Textures/_LostParadise/LobbyScreens/kirashet.png diff --git a/migration_script.sql b/migration_script.sql new file mode 100644 index 0000000000..3fe66f2186 --- /dev/null +++ b/migration_script.sql @@ -0,0 +1,16 @@ +-- ---------------------------------------------------------------------------- +-- MySQL Workbench Migration +-- Migrated Schemata: preferences +-- Source Schemata: preferences +-- Created: Mon Aug 19 23:35:37 2024 +-- Workbench Version: 8.0.36 +-- ---------------------------------------------------------------------------- + +SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------------------------------------------------------- +-- Schema preferences +-- ---------------------------------------------------------------------------- +DROP SCHEMA IF EXISTS `preferences` ; +CREATE SCHEMA IF NOT EXISTS `preferences` ; +SET FOREIGN_KEY_CHECKS = 1;