Обновление CorvaxlWLPaper и CorvaxWLKolter (#457)

* 14

* 42

Resources/Prototypes/Entities/Markers/Spawners/Random/grille.yml

@@ -10,7 +10,8 @@
     - type: RandomSpawner
       prototypes:
         - Grille
-        - GrilleBroken
+        # - GrilleBroken #Corvax-WL Changes
+        - ClockworkGrille #Corvax-WL Changes
       chance: 1.0
   placement:
     mode: AlignTileAny

Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml

@@ -357,6 +357,8 @@
       solutions:
         absorbed:
           maxVol: 30
+    - type: CleansForensics
+      cleanDelay: 10
     - type: UseDelay
       delay: 1.5
     - type: Tag

Resources/Prototypes/_WL/Maps/Whitelist/wl_paper.yml

@@ -51,7 +51,7 @@
   
             # science
             SeniorResearcher: [ 1, 1 ]
-            Scientist: [ 2, 2 ]
+            Scientist: [ 3, 3 ]
             ResearchAssistant: [ 2, 2 ]
 
             # security

Resources/Prototypes/_WL/Procedural/Themes/wl_paper_station_elements.yml

@@ -1,109 +1,37 @@
 - type: dungeonRoom
   id: MaintsPaperZooBottomA
-  size: 3,3
+  size: 6,3
   atlas: /Maps/_WL/Dungeon/wl_paper_zoo.yml
   offset: 1,1
   tags:
-  - StationElementZOOPaperBOTTOM
+  - StationElementZOOPaper
 
 - type: dungeonRoom
   id: MaintsPaperZooBottomB
-  size: 3,3
+  size: 6,3
   atlas: /Maps/_WL/Dungeon/wl_paper_zoo.yml
-  offset: 5,1
+  offset: 8,1
   tags:
-  - StationElementZOOPaperBOTTOM
+  - StationElementZOOPaper
 
 - type: dungeonRoom
   id: MaintsPaperZooBottomC
-  size: 3,3
+  size: 6,3
   atlas: /Maps/_WL/Dungeon/wl_paper_zoo.yml
-  offset: 9,1
+  offset: 15,1
   tags:
-  - StationElementZOOPaperBOTTOM
-
-- type: dungeonRoom
-  id: MaintsPaperZooBottomD
-  size: 3,3
-  atlas: /Maps/_WL/Dungeon/wl_paper_zoo.yml
-  offset: 13,1
-  tags:
-  - StationElementZOOPaperBOTTOM
-
-- type: dungeonRoom
-  id: MaintsPaperZooBottomE
-  size: 3,3
-  atlas: /Maps/_WL/Dungeon/wl_paper_zoo.yml
-  offset: 17,1
-  tags:
-  - StationElementZOOPaperBOTTOM
-
-
-
-- type: dungeonRoom
-  id: MaintsPaperZooTopA
-  size: 3,3
-  atlas: /Maps/_WL/Dungeon/wl_paper_zoo.yml
-  offset: 1,5
-  tags:
-  - StationElementZOOPaperTOP
-
-- type: dungeonRoom
-  id: MaintsPaperZooTopB
-  size: 3,3
-  atlas: /Maps/_WL/Dungeon/wl_paper_zoo.yml
-  offset: 5,5
-  tags:
-  - StationElementZOOPaperTOP
-
-- type: dungeonRoom
-  id: MaintsPaperZooTopC
-  size: 3,3
-  atlas: /Maps/_WL/Dungeon/wl_paper_zoo.yml
-  offset: 9,5
-  tags:
-  - StationElementZOOPaperTOP
-
-- type: dungeonRoom
-  id: MaintsPaperZooTopD
-  size: 3,3
-  atlas: /Maps/_WL/Dungeon/wl_paper_zoo.yml
-  offset: 13,5
-  tags:
-  - StationElementZOOPaperTOP
-
-- type: dungeonRoom
-  id: MaintsPaperZooTopE
-  size: 3,3
-  atlas: /Maps/_WL/Dungeon/wl_paper_zoo.yml
-  offset: 17,5
-  tags:
-  - StationElementZOOPaperTOP
-
+  - StationElementZOOPaper
 
 
 - type: entity
   parent: BaseRoomMarker
-  id: StationElementsZOOTOPPaperRoomMarker
-  name: Paper Zoo TOP
-  suffix: 3x3, Paper
-  components:
-  - type: RoomFill
-    minSize: 3,3
-    maxSize: 3,3
-    roomWhitelist:
-      tags:
-      - StationElementZOOPaperTOP
-
-- type: entity
-  parent: BaseRoomMarker
-  id: StationElementsZOOBOTTOMPaperRoomMarker
+  id: StationElementsZOOPaperRoomMarker
   name: Paper Zoo BOTTOM
-  suffix: 3x3, Paper
+  suffix: 6x3, Paper
   components:
   - type: RoomFill
-    minSize: 3,3
-    maxSize: 3,3
+    minSize: 6,3
+    maxSize: 6,3
     roomWhitelist:
       tags:
-      - StationElementZOOPaperBOTTOM
+      - StationElementZOOPaper

Resources/Prototypes/_WL/tags.yml

@@ -20,10 +20,7 @@
   id: MaintsCMOPaper
 
 - type: Tag
-  id: StationElementZOOPaperTOP
-
-- type: Tag
-  id: StationElementZOOPaperBOTTOM
+  id: StationElementZOOPaper
 
 - type: Tag
   id: MaintsPaperAproved