diff --git a/Resources/Locale/en-US/_DV/accessories/hair.ftl b/Resources/Locale/en-US/_DV/accessories/hair.ftl index 13bdeeca9cd..c8fb9c7dc18 100644 --- a/Resources/Locale/en-US/_DV/accessories/hair.ftl +++ b/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 diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml index fbd5e158168..033ba70ebf0 100644 --- a/Resources/Prototypes/GameRules/roundstart.yml +++ b/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 diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/hair.yml b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/hair.yml index 836c0c9bd89..91db0d17fa2 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/hair.yml +++ b/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 diff --git a/Resources/Textures/_DV/Mobs/Customization/additional_hair.rsi/classic_bun.png b/Resources/Textures/_DV/Mobs/Customization/additional_hair.rsi/classic_bun.png new file mode 100644 index 00000000000..ac653453ebd Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/additional_hair.rsi/classic_bun.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/additional_hair.rsi/loosebun.png b/Resources/Textures/_DV/Mobs/Customization/additional_hair.rsi/loosebun.png new file mode 100644 index 00000000000..47e6584415f Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/additional_hair.rsi/loosebun.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/additional_hair.rsi/lowponytail.png b/Resources/Textures/_DV/Mobs/Customization/additional_hair.rsi/lowponytail.png new file mode 100644 index 00000000000..0afeab9a061 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/additional_hair.rsi/lowponytail.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/additional_hair.rsi/meta.json b/Resources/Textures/_DV/Mobs/Customization/additional_hair.rsi/meta.json new file mode 100644 index 00000000000..0868cd63e85 --- /dev/null +++ b/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 + } + ] +}