diff --git a/Resources/Locale/en-US/markings/goblin_markings.ftl b/Resources/Locale/en-US/markings/goblin_markings.ftl index 6dc4421d943..3f5c96da32b 100644 --- a/Resources/Locale/en-US/markings/goblin_markings.ftl +++ b/Resources/Locale/en-US/markings/goblin_markings.ftl @@ -1,2 +1,15 @@ # goblin ears -marking-GoblinEarsBasic = Basic Ears \ No newline at end of file +marking-GoblinEarsBasic = Basic Ears +marking-GoblinEarsBasicAlt = Basic Ears (Alt) +marking-GoblinEarsLong01 = Long Ears (tips down) +marking-GoblinEarsLong02 = Long Ears (tips up) + +# goblin noses +marking-GoblinNoseBasic = Basic Nose +marking-GoblinNoseLong = Long Nose +marking-GoblinNoseCrooked = Crooked Nose + +# goblin tusks +marking-GoblinTusksBasic = No Tusks +marking-GoblinTusksSmall = Small Tusks +marking-GoblinTusksBig = Long Tusks diff --git a/Resources/Prototypes/_NF/Entities/Mobs/Customization/Markings/goblin_markings.yml b/Resources/Prototypes/_NF/Entities/Mobs/Customization/Markings/goblin_markings.yml index ba7be7a6582..a1c093feff8 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/Customization/Markings/goblin_markings.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/Customization/Markings/goblin_markings.yml @@ -7,3 +7,86 @@ sprites: - sprite: _NF/Mobs/Customization/goblin_ears.rsi state: goblin_ears_default + +- type: marking + id: GoblinEarsBasicAlt + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [Goblin] + sprites: + - sprite: _NF/Mobs/Customization/goblin_ears.rsi + state: goblin_ears_default_alt + +- type: marking + id: GoblinEarsLong01 + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [Goblin] + sprites: + - sprite: _NF/Mobs/Customization/goblin_ears.rsi + state: goblin_ears_long_01 + +- type: marking + id: GoblinEarsLong02 + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [Goblin] + sprites: + - sprite: _NF/Mobs/Customization/goblin_ears.rsi + state: goblin_ears_long_02 + +# Goblin Noses +- type: marking + id: GoblinNoseBasic + bodyPart: Snout + markingCategory: Snout + speciesRestriction: [Goblin] + sprites: + - sprite: _NF/Mobs/Customization/goblin_noses.rsi + state: goblin_nose_default + +- type: marking + id: GoblinNoseLong + bodyPart: Snout + markingCategory: Snout + speciesRestriction: [Goblin] + sprites: + - sprite: _NF/Mobs/Customization/goblin_noses.rsi + state: goblin_nose_long + +- type: marking + id: GoblinNoseCrooked + bodyPart: Snout + markingCategory: Snout + speciesRestriction: [Goblin] + sprites: + - sprite: _NF/Mobs/Customization/goblin_noses.rsi + state: goblin_nose_crooked + +# Goblin Tusks +- type: marking + id: GoblinTusksBasic + bodyPart: Snout + markingCategory: Snout + speciesRestriction: [Goblin] + sprites: + - sprite: _NF/Mobs/Customization/goblin_tusks.rsi + state: goblin_tusks_none + +- type: marking + id: GoblinTusksSmall + bodyPart: Snout + markingCategory: Snout + speciesRestriction: [Goblin] + sprites: + - sprite: _NF/Mobs/Customization/goblin_tusks.rsi + state: goblin_tusks_small + +- type: marking + id: GoblinTusksBig + bodyPart: Snout + markingCategory: Snout + speciesRestriction: [Goblin] + sprites: + - sprite: _NF/Mobs/Customization/goblin_tusks.rsi + state: goblin_tusks_big diff --git a/Resources/Prototypes/_NF/Species/goblin_species.yml b/Resources/Prototypes/_NF/Species/goblin_species.yml index 6c09380a83c..5bff2106d99 100644 --- a/Resources/Prototypes/_NF/Species/goblin_species.yml +++ b/Resources/Prototypes/_NF/Species/goblin_species.yml @@ -7,7 +7,7 @@ sprites: MobGoblinSprites markingLimits: MobGoblinMarkingLimits dollPrototype: MobGoblinDummy - skinColoration: TintedHues #Possible values: TintedHues, Hues, HumanToned + skinColoration: HumanToned #Possible values: TintedHues, Hues, HumanToned maleFirstNames: names_goblin_male femaleFirstNames: names_goblin_female lastNames: names_goblin_last @@ -16,6 +16,7 @@ id: MobGoblinSprites sprites: Hair: MobHumanoidAnyMarking + Snout: MobHumanoidAnyMarking FacialHair: MobHumanoidAnyMarking Head: MobGoblinHead HeadTop: MobHumanoidAnyMarking @@ -44,6 +45,10 @@ points: 1 required: true defaultMarkings: [ GoblinEarsBasic ] + Snout: + points: 2 + required: false +# defaultMarkings: [ GoblinNoseBasic ] Chest: points: 1 required: false diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/goblin_ears_default_alt.png b/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/goblin_ears_default_alt.png new file mode 100644 index 00000000000..a78ad8039df Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/goblin_ears_default_alt.png differ diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/goblin_ears_long_01.png b/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/goblin_ears_long_01.png new file mode 100644 index 00000000000..f72a92c2a02 Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/goblin_ears_long_01.png differ diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/goblin_ears_long_02.png b/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/goblin_ears_long_02.png new file mode 100644 index 00000000000..d5a93bc82d4 Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/goblin_ears_long_02.png differ diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/meta.json b/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/meta.json index 0105bfa5b20..5ed9ae60691 100644 --- a/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/meta.json +++ b/Resources/Textures/_NF/Mobs/Customization/goblin_ears.rsi/meta.json @@ -10,6 +10,18 @@ { "name": "goblin_ears_default", "directions": 4 + }, + { + "name": "goblin_ears_default_alt", + "directions": 4 + }, + { + "name": "goblin_ears_long_01", + "directions": 4 + }, + { + "name": "goblin_ears_long_02", + "directions": 4 } ] } diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_noses.rsi/goblin_nose_crooked.png b/Resources/Textures/_NF/Mobs/Customization/goblin_noses.rsi/goblin_nose_crooked.png new file mode 100644 index 00000000000..57391860376 Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Customization/goblin_noses.rsi/goblin_nose_crooked.png differ diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_noses.rsi/goblin_nose_default.png b/Resources/Textures/_NF/Mobs/Customization/goblin_noses.rsi/goblin_nose_default.png new file mode 100644 index 00000000000..fdef1887b21 Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Customization/goblin_noses.rsi/goblin_nose_default.png differ diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_noses.rsi/goblin_nose_long.png b/Resources/Textures/_NF/Mobs/Customization/goblin_noses.rsi/goblin_nose_long.png new file mode 100644 index 00000000000..0403c86463c Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Customization/goblin_noses.rsi/goblin_nose_long.png differ diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_noses.rsi/meta.json b/Resources/Textures/_NF/Mobs/Customization/goblin_noses.rsi/meta.json new file mode 100644 index 00000000000..4c1b829d8a2 --- /dev/null +++ b/Resources/Textures/_NF/Mobs/Customization/goblin_noses.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "copyright": "Sprited by erhardsteinhauer (discord)", + "license": "CC-BY-SA-4.0", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "goblin_nose_default", + "directions": 4 + }, + { + "name": "goblin_nose_crooked", + "directions": 4 + }, + { + "name": "goblin_nose_long", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_big.png b/Resources/Textures/_NF/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_big.png new file mode 100644 index 00000000000..fb706ac649e Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_big.png differ diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_none.png b/Resources/Textures/_NF/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_none.png new file mode 100644 index 00000000000..c8b755b2283 Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_none.png differ diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_small.png b/Resources/Textures/_NF/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_small.png new file mode 100644 index 00000000000..2b0a11239ad Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_small.png differ diff --git a/Resources/Textures/_NF/Mobs/Customization/goblin_tusks.rsi/meta.json b/Resources/Textures/_NF/Mobs/Customization/goblin_tusks.rsi/meta.json new file mode 100644 index 00000000000..0983b297549 --- /dev/null +++ b/Resources/Textures/_NF/Mobs/Customization/goblin_tusks.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "copyright": "Sprited by erhardsteinhauer (discord)", + "license": "CC-BY-SA-4.0", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "goblin_tusks_small", + "directions": 4 + }, + { + "name": "goblin_tusks_big", + "directions": 4 + }, + { + "name": "goblin_tusks_none", + "directions": 4 + } + ] +}