Merge branch 'DeltaV-Station:master' into master

Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl

@@ -25,5 +25,5 @@ flavor-complex-lemondrop = refreshingly tart
 flavor-complex-greengrass = like a holiday in the sun
 flavor-complex-daiquiri = fashionable
 flavor-complex-arsonistsbrew = like ash and flame
-flavor-complex-dulleavene = ominous
+flavor-complex-healthcodeviolation = ominous
 flavor-complex-pumpkin = like pumpkin

Resources/Locale/en-US/deltav/markings/Oni.ftl

@@ -0,0 +1,4 @@
+marking-OniHornShaved = Shaved
+marking-OniHornShaved-shaved = Shaved
+marking-OniHornBull = Bull
+marking-OniHornBull-bull = Bull

Resources/Locale/en-US/nyanotrasen/markings/Oni.ftl

@@ -1,7 +1,14 @@
 marking-OniHornSingleCurved = Single Curved
-marking-OniHornSingleLeftCurved =Single Left Curved
+marking-OniHornSingleCurved-single_curved = Single Curved
+marking-OniHornSingleLeftCurved = Single Left Curved
+marking-OniHornSingleLeftCurved-single_left_curved = Single Left Curved
 marking-OniHornSingleRightCurved = Single Right Curved
+marking-OniHornSingleRightCurved-single_right_curved = Single Right Curved
 marking-OniHornDoubleCurvedOutwards = Double Curved Outwards
+marking-OniHornDoubleCurvedOutwards-double_curved_outwards = Double Curved Outwards
 marking-OniHornDoubleCurved = Double Curved
+marking-OniHornDoubleCurved-double_curved = Double Curved
 marking-OniHornDoubleLeftBrokeCurved = Double Left Broke Curved
+marking-OniHornDoubleLeftBrokeCurved-double_left_broke_curved = Double Left Broke Curved
 marking-OniHornDoubleRightBrokeCurved =  Double Right Broke Curved
+marking-OniHornDoubleRightBrokeCurved-double_right_broke_curved = Double Right Broke Curved

Resources/Maps/shoukou.yml

@@ -5995,14 +5995,14 @@ entities:
       pos: 15.5,-13.5
       parent: 34
     - type: DeviceLinkSink
-      invokeCounter: 1
+      invokeCounter: 2
       links:
       - 12927
       - 4532
     - type: DeviceLinkSource
       linkedPorts:
         4532:
-        - DoorStatus: DoorBolt
+        - DoorStatus: Close
   - uid: 3671
     components:
     - type: MetaData
@@ -6018,13 +6018,13 @@ entities:
       pos: 19.5,-13.5
       parent: 34
     - type: DeviceLinkSink
-      invokeCounter: 1
+      invokeCounter: 2
       links:
       - 3582
     - type: DeviceLinkSource
       linkedPorts:
         3582:
-        - DoorStatus: DoorBolt
+        - DoorStatus: Close
 - proto: AirlockSecurityLawyerLocked
   entities:
   - uid: 10148
@@ -72062,7 +72062,7 @@ entities:
       - 1163
 - proto: shuttle_manipulator
   entities:
-  - uid: 13025
+  - uid: 13019
     components:
     - type: Transform
       pos: 52.5,-34.5
@@ -76477,46 +76477,6 @@ entities:
     - type: Transform
       pos: -9.5,2.5
       parent: 34
-  - uid: 13017
-    components:
-    - type: Transform
-      pos: 51.5,-33.5
-      parent: 34
-  - uid: 13018
-    components:
-    - type: Transform
-      pos: 51.5,-34.5
-      parent: 34
-  - uid: 13019
-    components:
-    - type: Transform
-      pos: 51.5,-35.5
-      parent: 34
-  - uid: 13020
-    components:
-    - type: Transform
-      pos: 53.5,-35.5
-      parent: 34
-  - uid: 13021
-    components:
-    - type: Transform
-      pos: 52.5,-35.5
-      parent: 34
-  - uid: 13022
-    components:
-    - type: Transform
-      pos: 53.5,-34.5
-      parent: 34
-  - uid: 13023
-    components:
-    - type: Transform
-      pos: 53.5,-33.5
-      parent: 34
-  - uid: 13024
-    components:
-    - type: Transform
-      pos: 52.5,-33.5
-      parent: 34
   - uid: 13425
     components:
     - type: Transform
@@ -76919,6 +76879,48 @@ entities:
     - type: Transform
       pos: 52.5,-41.5
       parent: 34
+- proto: TableFancyBlack
+  entities:
+  - uid: 13017
+    components:
+    - type: Transform
+      pos: 51.5,-35.5
+      parent: 34
+  - uid: 13018
+    components:
+    - type: Transform
+      pos: 51.5,-34.5
+      parent: 34
+  - uid: 13020
+    components:
+    - type: Transform
+      pos: 51.5,-33.5
+      parent: 34
+  - uid: 13021
+    components:
+    - type: Transform
+      pos: 53.5,-33.5
+      parent: 34
+  - uid: 13022
+    components:
+    - type: Transform
+      pos: 52.5,-33.5
+      parent: 34
+  - uid: 13023
+    components:
+    - type: Transform
+      pos: 53.5,-34.5
+      parent: 34
+  - uid: 13024
+    components:
+    - type: Transform
+      pos: 52.5,-35.5
+      parent: 34
+  - uid: 13025
+    components:
+    - type: Transform
+      pos: 53.5,-35.5
+      parent: 34
 - proto: TableGlass
   entities:
   - uid: 74

Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/Oni_horns.yml

@@ -0,0 +1,19 @@
+- type: marking
+  id: OniHornShaved
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: DeltaV/Mobs/Customization/Oni/oni_horns.rsi
+    state: shaved
+
+- type: marking
+  id: OniHornBull
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: DeltaV/Mobs/Customization/Oni/oni_horns.rsi
+    state: bull

Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/drinks.yml

@@ -1,7 +1,7 @@
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkHealthViolationGlass
-  name: health code violation
+  suffix: health code violation
   description: Allegedly it's a cocktail. The warning cone motif seems apt.
   components:
   - type: SolutionContainerManager
@@ -11,13 +11,14 @@
         reagents:
         - ReagentId: HealthViolation
           Quantity: 30
-  - type: Sprite
-    sprite: DeltaV/Objects/Consumable/Drinks/dulleavene.rsi
+  - type: Icon
+    sprite: DeltaV/Objects/Consumable/Drinks/healthcodeviolation.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkGunmetalGlass
-  name: gunmetal glass
+  suffix: gunmetal
   description: A cloudy mix of rum, cream, and... is that welding fuel? Probably tasty.
   components:
   - type: SolutionContainerManager
@@ -27,13 +28,14 @@
         reagents:
         - ReagentId: Gunmetal
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: DeltaV/Objects/Consumable/Drinks/gunmetal.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkLemonDropGlass
-  name: lemon drop
+  suffix: lemon drop
   description: A martini glass filled with a translucent mix of refreshing lemony goodness.
   components:
   - type: SolutionContainerManager
@@ -43,13 +45,14 @@
         reagents:
         - ReagentId: LemonDrop
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: DeltaV/Objects/Consumable/Drinks/lemondrop.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkGreenGrassGlass
-  name: green grass
+  suffix: green grass
   description: An odd green cocktail, topped with oranges, ice, and a plastic straw. Curious.
   components:
   - type: SolutionContainerManager
@@ -59,13 +62,14 @@
         reagents:
         - ReagentId: GreenGrass
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: DeltaV/Objects/Consumable/Drinks/greengrass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkDaiquiriGlass
-  name: classic daiquiri
+  suffix: classic daiquiri
   description: Rum, lime, and simple syrup. Such class, such refinement.
   components:
   - type: SolutionContainerManager
@@ -75,13 +79,14 @@
         reagents:
         - ReagentId: Daiquiri
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: DeltaV/Objects/Consumable/Drinks/daiquiri.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkArsonistsBrewGlass
-  name: arsonist's brew
+  suffix: arsonist's brew
   description: It's probably not concerning that it's glowing faintly. Or bubbling. Or smoking. No, not at all.
   components:
   - type: SolutionContainerManager
@@ -91,13 +96,14 @@
         reagents:
         - ReagentId: ArsonistsBrew
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: DeltaV/Objects/Consumable/Drinks/arsonist.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkKvassGlass
-  name: kvass glass
+  suffix: kvass
   description: A cool refreshing drink with a taste of socialism.
   components:
     - type: SolutionContainerManager
@@ -107,13 +113,14 @@
           reagents:
             - ReagentId: Kvass
               Quantity: 30
-    - type: Sprite
-      sprite: Objects/Consumable/Drinks/kvass.rsi
+    - type: Icon
+      sprite: DeltaV/Objects/Consumable/Drinks/kvass.rsi
+      state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkMothamphetamineGlass
-  name: mothamphetamine
+  suffix: mothamphetamine
   description: A strangely... Fuzzy drink. It has a chaotic aura.
   components:
     - type: SolutionContainerManager
@@ -123,5 +130,6 @@
           reagents:
             - ReagentId: Mothamphetamine
               Quantity: 30
-    - type: Sprite
+    - type: Icon
       sprite: DeltaV/Objects/Consumable/Drinks/mothamphetamine.rsi
+      state: icon

Resources/Prototypes/DeltaV/Flavors/flavors.yml

@@ -87,9 +87,9 @@
 
 #Delta V
 - type: flavor
-  id: dulleavene
+  id: healthcodeviolation
   flavorType: Complex
-  description: flavor-complex-dulleavene
+  description: flavor-complex-healthcodeviolation
 
 - type: flavor
   id: gunmetal