New Comoss island map (#618)

* Create island_new.yml

* first map state

Content.IntegrationTests/Tests/PostMapInitTest.cs

@@ -51,7 +51,7 @@ namespace Content.IntegrationTests.Tests
 
             //CrystallEdge maps
             "Village",
-            "Island",
+            "Comoss",
             //CrystallEdge Map replacement end
         };
 

Content.Server/Atmos/EntitySystems/FlammableSystem.cs

@@ -448,6 +448,7 @@ namespace Content.Server.Atmos.EntitySystems
 
                 if (flammable.FireStacks > 0)
                 {
+/* CP14 Airtight walls should burn too!
                     var air = _atmosphereSystem.GetContainingMixture(uid);
 
                     // If we're in an oxygenless environment, put the fire out.
@@ -456,7 +457,7 @@ namespace Content.Server.Atmos.EntitySystems
                         Extinguish(uid, flammable);
                         continue;
                     }
-
+*/
                     var source = EnsureComp<IgnitionSourceComponent>(uid);
                     _ignitionSourceSystem.SetIgnited((uid, source));
 

Resources/Prototypes/_CP14/Catalog/Fills/closets.yml

@@ -103,4 +103,17 @@
               - id: CP14SilverCoin 
               - id: CP14SilverCoin
             rolls: !type:ConstantNumberSelector
-              value: 5
+              value: 5
+
+- type: entity
+  parent: CP14WoodenCloset
+  id: CP14WoodenClosetBlacksmithFilled
+  suffix: Blacksmith, Filled
+  #components:
+  #- type: StorageFill
+  #  contents:
+  #    - id: CP14KeyRingCommandant
+  #    - id: HandLabeler #TODO custom cp14 labeler
+  #    - id: CP14StampDenied
+  #    - id: CP14StampApproved
+  #    - id: CP14StampCommandant

Resources/Prototypes/_CP14/Catalog/Fills/crates.yml

@@ -81,7 +81,15 @@
       - id: CP14ClothingPantsSouthernMagician
       - id: CP14ClothingShirtMercenary
       - id: CP14ClothingShirtYellowWizard
-
+      - id: CP14Cloth10
+    - !type:GroupSelector
+      children:
+      - id: CP14DyeYellow
+      - id: CP14DyeGreen
+      - id: CP14DyeRed
+      - id: CP14DyePurple
+      - id: CP14DyeBlack
+      - id: CP14DyeBlue
 
 - type: entityTable
   id: CP14RandomVials

Resources/Prototypes/_CP14/Catalog/Fills/dresser.yml

@@ -52,4 +52,24 @@
       - id: CP14ClothingEyesMonocle
         prob: 0.2
       - id: CP14ClothingEyesGlasses
-        prob: 0.3
+        prob: 0.3
+
+- type: entity
+  parent: CP14WoodenCabinet
+  id: CP14WoodenCabinetBlacksmith
+  suffix: Blacksmith, Filled
+  #components:
+  #- type: StorageFill
+  #  contents:
+  #    - id: CP14ClothingCloakCommandantJacket
+  #      prob: 1
+  #    - id: CP14ClothingHeadBowlerGolden
+  #      prob: 0.5
+  #    - id: CP14ClothingPantsAristocratic
+  #      prob: 0.5
+  #    - id: CP14ClothingShirtBanker
+  #      prob: 0.5
+  #    - id: CP14ClothingEyesMonocle
+  #      prob: 0.2
+  #    - id: CP14ClothingEyesGlasses
+  #      prob: 0.3

Resources/Prototypes/_CP14/Entities/Structures/Furniture/lamppost.yml

@@ -67,7 +67,7 @@
     noRot: true
     sprite: _CP14/Structures/Furniture/lamppost.rsi
     drawdepth: Mobs
-    offset: 0,1.1
+    offset: 0,0.9
   - type: PointLight
     energy: 5
     radius: 8

Resources/Prototypes/_CP14/Maps/Pools/default.yml

@@ -1,7 +1,7 @@
 - type: gameMapPool
   id: DefaultMapPool
   maps:
-   - Village
+   - Comoss
 
 - type: gameMapPool
   id: DeathMatchMapPool

Resources/Prototypes/_CP14/Maps/arenas.yml

@@ -32,7 +32,6 @@
             CP14Alchemist: [ 2, 4 ]
             CP14Blacksmith: [ 1, 1 ]
             CP14Innkeeper: [ 3, 4 ]
-            #CP14Captain: [1, 1]
             CP14Commandant: [1, 1]
             CP14Banker: [3, 4]
             #CP14GuardCommander: [1, 1]
@@ -43,18 +42,24 @@
               path: /Maps/_CP14/tavern_cave.yml
 
 - type: gameMap
-  id: Island
-  mapName: Island
-  mapPath: /Maps/_CP14/island.yml
+  id: Comoss
+  mapName: "Comoss island"
+  mapPath: /Maps/_CP14/comoss.yml
   maxRandomOffset: 0
   randomRotation: false
   minPlayers: 0
   stations:
-    Island:
+    Comoss:
       stationProto: CP14BaseExpedition
       components:
         - type: StationNameSetup
-          mapNameTemplate: "Island"
+          mapNameTemplate: "Comoss island"
         - type: StationJobs
           availableJobs:
-            CP14Adventurer: [ -1, -1 ]
+            CP14Adventurer: [ -1, -1 ]
+            CP14Alchemist: [ 2, 4 ]
+            CP14Blacksmith: [ 1, 1 ]
+            CP14Innkeeper: [ 3, 4 ]
+            CP14Commandant: [1, 1]
+            CP14Banker: [3, 4]
+            #CP14GuardCommander: [1, 1]