Small dv merges

Resources/Locale/en-US/_DV/accessories/hair.ftl

@@ -7,3 +7,6 @@ marking-HumanHairClassicLowFade = Fade (Low, Classic)
 marking-HumanHairClassicMedFade = Fade (Medium, Classic)
 marking-HumanHairClassicOmbre = Ombre Classic
 marking-HumanHairClassicLong = Long 1 (Classic)
+marking-HumanHairClassicBun = Classic Bun
+marking-HumanHairLooseBun = Loose Bun
+marking-HumanHairLowPonytail = Low Ponytail

Resources/Prototypes/GameRules/roundstart.yml

@@ -432,14 +432,16 @@
   - type: RampingStationEventScheduler
     timeKeyPoints: # DeltaV
     - 10, 10
-    - 30, 8
-    - 15, 6
-    - 15, 8
-    - 15, 3
-    - 15, 8
-    - 15, 1
+    - 10, 6
+    - 10, 1
+    - 10, 3
     - 15, 5
-    - 30, 2.5
+    - 15, 4
+    - 20, 2
+    - 10, 1
+    - 10, 4
+    - 10, 3
+    - 70, 4
     scheduledGameRules: !type:NestedSelector
       tableId: BasicGameRulesTable
 

Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/hair.yml

@@ -69,3 +69,27 @@
   sprites:
     - sprite: _DV/Mobs/Customization/hair.rsi
       state: classic_long
+
+- type: marking
+  id: HumanHairClassicBun
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: _DV/Mobs/Customization/additional_hair.rsi
+      state: classic_bun
+
+- type: marking
+  id: HumanHairLooseBun
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: _DV/Mobs/Customization/additional_hair.rsi
+      state: loosebun
+
+- type: marking
+  id: HumanHairLowPonytail
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: _DV/Mobs/Customization/additional_hair.rsi
+      state: lowponytail

Resources/Textures/_DV/Mobs/Customization/additional_hair.rsi/meta.json

@@ -0,0 +1,23 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "copyright": "loosebun and lowponytail taken from https://github.com/Monkestation/Monkestation2.0/blob/67175e73aa192336cd69ad61f2c4b42423a87969/monkestation/icons/mob/sprite_accessories/hair.dmi and modified by whowhatwhenwherewhy. Classic_bun taken from https://github.com/cmss13-devs/cmss13/blob/master/icons/mob/humans/human_hair.dmi.",
+    "license": "CC-BY-SA-3.0",
+    "states": [
+        {
+            "name": "classic_bun",
+            "directions": 4
+        },
+        {
+            "name": "loosebun",
+            "directions": 4
+        },
+        {
+            "name": "lowponytail",
+            "directions": 4
+        }
+    ]
+}