Остальные изменения прототипов

space-sunrise · May 29, 2024 · 08c4f1d · 08c4f1d
1 parent 03e3283
commit 08c4f1d
Show file tree

Hide file tree

Showing 160 changed files with 2,202 additions and 338 deletions.
diff --git a/Resources/Prototypes/Accents/word_replacements.yml b/Resources/Prototypes/Accents/word_replacements.yml
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
@@ -34,7 +34,7 @@
   description: "Contains an emitter. Used only for dangerous applications."
   icon:
     sprite: Structures/Power/Generation/Singularity/emitter.rsi
-    state: emitter2
+    state: emitter # Corvax-Resprite
   product: CrateEngineeringSingularityEmitter
   cost: 3000
   category: cargoproduct-category-name-engineering

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml
@@ -62,7 +62,7 @@
   id: MaterialPlasma
   icon:
     sprite: Objects/Materials/Sheets/other.rsi
-    state: plasma_3
+    state: plasma # Corvax-Resprite
   product: CrateMaterialPlasma
   cost: 2000
   category: cargoproduct-category-name-materials

diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -71,9 +71,10 @@
       - id: Flash
       #- name: StationCharter
       #- name: TelescopicBaton
+
 - type: entity
   noSpawn: true
-  parent: ClothingBackpackEngineering
+  parent: ClothingBackpackCE # Corvax-Resprite
   id: ClothingBackpackChiefEngineerFilled
   components:
   - type: StorageFill

diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
@@ -79,9 +79,10 @@
       - id: Flash
       #- name: StationCharter
       #- name: TelescopicBaton
+
 - type: entity
   noSpawn: true
-  parent: ClothingBackpackDuffelEngineering
+  parent: ClothingBackpackDuffelCE # Corvax-Resprite
   id: ClothingBackpackDuffelChiefEngineerFilled
   components:
   - type: StorageFill

diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
@@ -93,9 +93,10 @@
       - id: Flash
       #- name: StationCharter
       #- name: TelescopicBaton
+
 - type: entity
   noSpawn: true
-  parent: ClothingBackpackSatchelEngineering
+  parent: ClothingBackpackSatchelCE # Corvax-Resprite
   id: ClothingBackpackSatchelChiefEngineerFilled
   components:
   - type: StorageFill

diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -55,7 +55,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: WeaponShotgunBulldog
+      - id: WeaponShotgunBulldogBiocode # Sunrise-edit
       - id: MagazineShotgun
       - id: MagazineShotgun
       - id: MagazineShotgunBeanbag
@@ -69,7 +69,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: WeaponSubMachineGunC20r
+      - id: WeaponSubMachineGunC20rBiocode # Sunrise-edit
       - id: MagazinePistolSubMachineGun
         amount: 2
 #     - id: SMGSuppressor
@@ -82,7 +82,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: WeaponRevolverPythonAP
+      - id: WeaponRevolverPythonAPBiocode # Sunrise-edit
       - id: SpeedLoaderMagnumAP
         amount: 2
 
@@ -94,7 +94,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: WeaponLightMachineGunL6
+      - id: WeaponLightMachineGunL6Biocode # Sunrise-edit
       - id: MagazineLightRifleBox
 
 - type: entity
@@ -105,7 +105,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: WeaponLauncherChinaLake
+      - id: WeaponLauncherChinaLakeBiocode # Sunrise-edit
       - id: GrenadeBlast
         amount: 4
       - id: GrenadeFrag
@@ -119,7 +119,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: WeaponRifleM90GrenadeLauncher
+      - id: WeaponRifleM90GrenadeLauncherBiocode # Sunrise-edit
       - id: MagazineRifle
         amount: 2
       - id: GrenadeBlast
@@ -272,7 +272,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingOuterHardsuitSyndie
+      - id: ClothingOuterHardsuitSyndieBiocode # Sunrise-edit
       - id: ClothingMaskGasSyndicate
       - id: ClothingHandsGlovesCombat
       - id: DoubleEmergencyOxygenTankFilled
@@ -286,7 +286,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingOuterHardsuitSyndieElite
+      - id: ClothingOuterHardsuitSyndieEliteBiocode # Sunrise-edit
       - id: ClothingMaskGasSyndicate
       - id: ClothingHandsGlovesCombat
       - id: DoubleEmergencyOxygenTankFilled
@@ -314,7 +314,7 @@
   - type: StorageFill
     contents:
       - id: SyringeRomerol
-      - id: WeaponRevolverPython
+      - id: WeaponRevolverPythonBiocode # Sunrise-edit
       - id: MagazineBoxMagnumIncendiary
       - id: PillAmbuzolPlus
       - id: PillAmbuzol
@@ -328,7 +328,7 @@
   - type: StorageFill
     contents:
       - id: BoxSurvivalSyndicate
-      - id: WeaponPistolViper
+      - id: WeaponPistolViperBiocode # Sunrise-edit
       - id: PinpointerSyndicateNuclear
       - id: DeathAcidifierImplanter
 
@@ -346,7 +346,7 @@
       - id: SawAdvanced
       - id: Cautery
       - id: CombatKnife
-      - id: WeaponPistolViper
+      - id: WeaponPistolViperBiocode # Sunrise-edit
       - id: PinpointerSyndicateNuclear
       - id: HandheldHealthAnalyzer
       - id: CombatMedipen

diff --git a/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml b/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
@@ -122,6 +122,9 @@
       - id: BookJourney
         prob: 0.1
         orGroup: BookAuthor
+      - id: BookBusido # Corvax-Books
+        prob: 0.1
+        orGroup: BookAuthor
       - id: BookInspiration
         prob: 0.1
         orGroup: BookAuthor
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
@@ -126,7 +126,7 @@
   - type: Sprite
     layers:
       - state: box
-      - state: pda
+      - state: id # Corvax-Resprite
 
 - type: entity
   name: headset box

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
@@ -10,7 +10,7 @@
         amount: 6
   - type: Sprite
     layers:
-      - state: box
+      - state: box_medical # Corvax-Resprite
       - state: syringe
 
 - type: entity
@@ -25,7 +25,7 @@
         amount: 9
   - type: Sprite
     layers:
-      - state: box
+      - state: box_medical # Corvax-Resprite
       - state: pillbox
 
 - type: entity
@@ -55,7 +55,7 @@
         amount: 4
   - type: Sprite
     layers:
-      - state: box
+      - state: box_medical # Corvax-Resprite
       - state: sterile
 
 - type: entity
@@ -70,7 +70,7 @@
         amount: 4
   - type: Sprite
     layers:
-      - state: box
+      - state: box_medical # Corvax-Resprite
       - state: latex
 
 - type: entity
@@ -85,7 +85,7 @@
         amount: 4
   - type: Sprite
     layers:
-      - state: box
+      - state: box_medical # Corvax-Resprite
       - state: nitrile
 
 - type: entity
@@ -100,7 +100,7 @@
         amount: 4
   - type: Sprite
     layers:
-      - state: box
+      - state: box_medical # Corvax-Resprite
       - state: bodybags
     whitelist:
       tags:

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml
@@ -16,7 +16,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingOuterHardsuitJuggernaut
+      - id: ClothingOuterHardsuitJuggernautBiocode
       - id: ClothingMaskGasSyndicate
       - id: ClothingHandsGlovesCombat
       - id: DoubleEmergencyOxygenTankFilled

diff --git a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
@@ -21,7 +21,7 @@
     - 0,0,6,3
   - type: StorageFill
     contents:
-      - id: WeaponSniperHristov
+      - id: WeaponSniperHristovBiocode # Sunrise-edit
       - id: MagazineBoxAntiMateriel
       - id: ClothingNeckTieRed
       - id: ClothingHandsGlovesLatex

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -19,6 +19,7 @@
       - id: RubberStampApproved
       - id: ClothingHeadsetAltCargo
       - id: BoxEncryptionKeyCargo
+      - id: PrinterDocFlatpack # Corvax-Printer
 
 - type: entity
   id: LockerCaptainFilledHardsuit
@@ -73,6 +74,10 @@
       - id: WeaponAntiqueLaser
       - id: JetpackCaptainFilled
       - id: MedalCase
+      # Corvax-Resprite-Start
+      - id: ClothingHeadCaptainHat
+      - id: ClothingOuterCoatCaptain
+      # Corvax-Resprite-End
 
 - type: entity
   id: LockerCaptainFilledNoLaser
@@ -126,7 +131,9 @@
       - id: BoxEncryptionKeyService
       - id: ClothingBackpackIan
         prob: 0.5
+      - id: ClothingOuterCoatHOP # Corvax-Resprite
       - id: AccessConfigurator
+      - id: PrinterDocFlatpack # Corvax-Printer
 
 - type: entity
   id: LockerChiefEngineerFilledHardsuit
@@ -260,10 +267,17 @@
   - type: StorageFill
     contents:
       - id: WeaponDisabler
+      - id: ClothingHeadHatCapHoS # Corvax-SecFashion
+        prob: 0.5
       - id: ClothingOuterCoatHoSTrench
       - id: ClothingMaskNeckGaiter
+      - id: ClothingOuterCoatHoSGreatcoat # Corvax-Resprite
       - id: ClothingOuterHardsuitSecurityRed
       - id: ClothingMaskGasSwat
+#      - id: ClothingShoeSlippersDuck # Corvax-Resprite: Need more space for style
+#        prob: 0.2
+      - id: DrinkVacuumFlask
+        prob: 0.8
       - id: ClothingBeltSecurityFilled
       - id: ClothingHeadsetAltSecurity
       - id: ClothingEyesGlassesSecurity
@@ -277,6 +291,7 @@
       - id: BoxEncryptionKeySecurity
       - id: HoloprojectorSecurity
       - id: BookSecretDocuments
+      - id: BookBusido # Corvax-Books
 
 - type: entity
   id: LockerHeadOfSecurityFilled
@@ -286,8 +301,11 @@
   - type: StorageFill
     contents:
       - id: WeaponDisabler
+      - id: ClothingHeadHatCapHoS # Corvax-SecFashion
+        prob: 0.5
       - id: ClothingOuterCoatHoSTrench
       - id: ClothingMaskNeckGaiter
+      - id: ClothingOuterCoatHoSGreatcoat # Corvax-Resprite
       - id: ClothingBeltSecurityFilled
       - id: ClothingHeadsetAltSecurity
       - id: ClothingEyesGlassesSecurity

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -29,6 +29,7 @@
     contents:
       - id: FlashlightSeclite
       - id: WeaponDisabler
+      - id: ClothingHeadHatCapWardenAlt # Corvax-SecFashion
       - id: ClothingBeltSecurityFilled
       - id: Flash
       - id: ClothingEyesGlassesSecurity
@@ -37,6 +38,7 @@
       - id: ClothingShoesBootsJack
       - id: ClothingOuterCoatWarden
       - id: ClothingOuterWinterWarden
+      - id: ClothingOuterCoatWardenAlt # Corvax-SecFashion
       - id: RubberStampWarden
       - id: DoorRemoteArmory
       - id: HoloprojectorSecurity
@@ -64,6 +66,8 @@
       - id: ClothingShoesBootsJack
       - id: WeaponMeleeNeedle
         prob: 0.1
+      - id: ClothingOuterCoatSecurityOvercoat # Corvax-SecFashion
+        prob: 0.2
       - id: HoloprojectorSecurity
         prob: 0.6
 
@@ -101,6 +105,11 @@
         prob: 0.7
       - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse
         prob: 0.15
+      - id: ClothingHeadHelmetSecurityMedic # Corvax-Resprite
+      - id: ClothingOuterVestSecurityMedic # Corvax-Resprite
+        prob: 0.5
+      - id: ClothingOuterCoatLabSecurityMedic # Corvax-Resprite
+        prob: 0.5
 
 - type: entity
   id: LockerDetectiveFilled
@@ -122,6 +131,7 @@
       - id: DrinkDetFlask
       - id: ClothingHandsGlovesForensic
       - id: RubberStampDetective
+      - id: BookBusido # Corvax-Books
       - id: HoloprojectorSecurity
       - id: BoxEvidenceMarkers
 

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
@@ -11,6 +11,7 @@
     DrinkIceBucket: 2
     BarSpoon: 3
     CustomDrinkJug: 2 #to allow for custom drinks in the soda/booze dispensers
+    DrinkCampariBottleFull: 5 # Corvax
     DrinkAbsintheBottleFull: 2
     DrinkAleBottleFull: 5
     DrinkBeerBottleFull: 5

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
@@ -14,4 +14,4 @@
     ClothingUniformJumpskirtLibrarian: 3
     ClothingShoesBootsLaceup: 2
     ClothingHeadsetService: 2
-
+    PrinterDocFlatpack: 2 # Corvax-Printer
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
@@ -5,6 +5,7 @@
     ClothingUniformJumpskirtDetective: 2
     ClothingShoesColorBrown: 2
     ClothingOuterCoatDetectiveLoadout: 2
+    ClothingOuterCoatDetectiveDark: 2 # Corvax-Resprite-Detective
     ClothingHeadHatFedoraBrown: 2
     ClothingUniformJumpsuitDetectiveGrey: 2
     ClothingUniformJumpskirtDetectiveGrey: 2

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml
@@ -8,6 +8,7 @@
     BackgammonBoard: 1
     ParchisBoard: 1
     CheckerBoard: 1
+    BookStationsAndAgents: 4 # Corvax-Tabletop
     ShipBattlemap: 1
     SnowBattlemap: 1
     SandBattlemap: 1