diff --git a/Resources/Locale/ru-RU/_CP14/markings/human-facial-hair.ftl b/Resources/Locale/ru-RU/_CP14/markings/human-facial-hair.ftl index 98770436e3..345bbc0697 100644 --- a/Resources/Locale/ru-RU/_CP14/markings/human-facial-hair.ftl +++ b/Resources/Locale/ru-RU/_CP14/markings/human-facial-hair.ftl @@ -1,3 +1,4 @@ marking-CPHumanFacialHair3Clock = Легкая щетина marking-CPHumanFacialHairAbe = Серьезная щетина -marking-CPHumanFacialHairDwarf = Дворф \ No newline at end of file +marking-CPHumanFacialHairDwarf = Дворф +marking-CPHumanFacialHairGoateeMush = Козлиная бородка с усиками \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/markings/human-hair.ftl b/Resources/Locale/ru-RU/_CP14/markings/human-hair.ftl index c704248d4c..bf3d015434 100644 --- a/Resources/Locale/ru-RU/_CP14/markings/human-hair.ftl +++ b/Resources/Locale/ru-RU/_CP14/markings/human-hair.ftl @@ -8,4 +8,5 @@ marking-CPHumanHairBeeHive = Аристократия в крови marking-CPHumanHairBigBraid = Хвост во весь рост marking-CPHumanHairBigDoubleBun = Два пунпона marking-CPHumanHairBigPompadour = Бард +marking-CPHumanHairCrazyBald = Безумная проплешина marking-CPHumanHairBob = Неприметливая \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/markings/tiefling-horns.ftl b/Resources/Locale/ru-RU/_CP14/markings/tiefling-horns.ftl new file mode 100644 index 0000000000..14f1a55b40 --- /dev/null +++ b/Resources/Locale/ru-RU/_CP14/markings/tiefling-horns.ftl @@ -0,0 +1,8 @@ +marking-CPTieflingHorns = Извилистые +marking-CPTieflingHorns2 = Прилежность +marking-CPTieflingHorns3 = Вертикаль власти +marking-CPTieflingHorns3Broken = Сломанная вертикаль +marking-CPTieflingHorns4 = Мелочь +marking-CPTieflingHorns5 = Дьявол +marking-CPTieflingHorns5Broken = Сломленный дьявол +marking-CPTieflingHorns6 = Барашек \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/markings/tiefling-tails.ftl b/Resources/Locale/ru-RU/_CP14/markings/tiefling-tails.ftl new file mode 100644 index 0000000000..f72f2fcc1d --- /dev/null +++ b/Resources/Locale/ru-RU/_CP14/markings/tiefling-tails.ftl @@ -0,0 +1,2 @@ +marking-CPTieflingTail = Хвост +marking-CPTieflingTailSpades = Заостренный хвост \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/tiles/tiles.ftl b/Resources/Locale/ru-RU/_CP14/tiles/tiles.ftl new file mode 100644 index 0000000000..617239b437 --- /dev/null +++ b/Resources/Locale/ru-RU/_CP14/tiles/tiles.ftl @@ -0,0 +1,3 @@ +cp-tiles-planet-grass = травяной покров +cp-tiles-planet-stone = камень +cp-tiles-planet-dirt = земля \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/cloak.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/cloak.yml new file mode 100644 index 0000000000..cb4749b5d6 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/cloak.yml @@ -0,0 +1,62 @@ +- type: entity + abstract: true + parent: Clothing + id: CPClothingCloakBase + components: + - type: Clothing + equipDelay: 1 + unequipDelay: 1 + slots: + - cloak + - type: Sprite + state: icon + +- type: entity + parent: CPClothingCloakBase + id: CPClothingCloakArmoredRed + name: бронированная красная накидка + description: Огромные металлические наплечники дают дополнительную защиту от отрубания головы. + components: + - type: Sprite + sprite: _CP14/Clothing/Cloak/redguardarmor.rsi + - type: Clothing + sprite: _CP14/Clothing/Cloak/redguardarmor.rsi + - type: Armor #same as regular sec armor + modifiers: + coefficients: + Blunt: 0.70 + Slash: 0.70 + Piercing: 0.70 + Heat: 0.80 + +- type: entity + parent: + - CPClothingCloakBase + - ClothingSlotBase + id: CPClothingCloakBlacksmithArpon + name: фартук кузнеца + description: Свободные кожанные полоски, все еще фактически являющиеся одеждой. + components: + - type: Sprite + sprite: _CP14/Clothing/Cloak/blacksmith_apron.rsi + - type: Clothing + sprite: _CP14/Clothing/Cloak/blacksmith_apron.rsi + +- type: entity + parent: CPClothingCloakBase + id: CPClothingCloakHoodieYellow + name: желтый короткий плащ с капюшоном + description: Защищает ваши плечи и голову от холода и интереса противоположного пола. + components: + - type: Sprite + sprite: _CP14/Clothing/Cloak/yellowhoodie.rsi + - type: Clothing + sprite: _CP14/Clothing/Cloak/yellowhoodie.rsi + - type: ToggleableClothing + clothingPrototype: CPClothingHeadHoodieYellow + requiredSlot: + - cloak + slot: head + - type: ContainerContainer + containers: + toggleable-clothing: !type:ContainerSlot {} \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Head/helmets.yml new file mode 100644 index 0000000000..c430fe4dde --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Head/helmets.yml @@ -0,0 +1,30 @@ +- type: entity + abstract: true + parent: Clothing + id: CPClothingHeadBase + components: + - type: Clothing + equipDelay: 0.3 + unequipDelay: 0.3 + slots: + - HEAD + - type: Sprite + state: icon + - type: Item + size: Small + storedRotation: -90 + +- type: entity + parent: CPClothingHeadBase + id: CPClothingHeadHoodieYellow + noSpawn: true + name: желтый капюшон + description: Вы получаете +2 к броскам скрытности от внимания противоположного пола. + components: + - type: Sprite + sprite: _CP14/Clothing/Head/yellowhoodie.rsi + - type: Clothing + sprite: _CP14/Clothing/Head/yellowhoodie.rsi + - type: Tag + tags: + - HidesHair \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/cloak.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/cloak.yml deleted file mode 100644 index c8643a299b..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/cloak.yml +++ /dev/null @@ -1,30 +0,0 @@ -- type: entity - abstract: true - parent: Clothing - id: CPClothingCloakBase - components: - - type: Clothing - equipDelay: 1 - unequipDelay: 1 - slots: - - cloak - - type: Sprite - state: icon - -- type: entity - parent: CPClothingCloakBase - id: CPClothingOuterArmoredCloak - name: бронированная накидка - description: Огромные металлические наплечники дают дополнительную защиту от отрубания головы. - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/redguardarmor.rsi - - type: Clothing - sprite: _CP14/Clothing/OuterClothing/redguardarmor.rsi - - type: Armor #same as regular sec armor - modifiers: - coefficients: - Blunt: 0.70 - Slash: 0.70 - Piercing: 0.70 - Heat: 0.80 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Pants/pants.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Pants/pants.yml new file mode 100644 index 0000000000..cf02249cb4 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Pants/pants.yml @@ -0,0 +1,23 @@ +- type: entity + abstract: true + parent: Clothing + id: CPClothingPantsBase + components: + - type: Clothing + equipDelay: 1 + unequipDelay: 1 + slots: + - pants + - type: Sprite + state: icon + +- type: entity + parent: CPClothingPantsBase + id: CPClothingPantsHarlequinRed + name: красно-желтые штаны арлекина + description: С одной стороны кроваво красные, с другой стороны солнечно желтые. Дуальность жизни и смерти всегда хороший повод для шуток. + components: + - type: Sprite + sprite: _CP14/Clothing/Pants/harlequin.rsi + - type: Clothing + sprite: _CP14/Clothing/Pants/harlequin.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/shirt.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/shirt.yml new file mode 100644 index 0000000000..5bc995ae14 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/shirt.yml @@ -0,0 +1,24 @@ +- type: entity + abstract: true + parent: Clothing + id: CPClothingShirtBase + components: + - type: Clothing + equipDelay: 1 + unequipDelay: 1 + slots: + - shirt + - type: Sprite + state: icon + +- type: entity + parent: CPClothingShirtBase + id: CPClothingShirtHarlequineRed + name: красная рубаха арлекина + description: На ней не видно пятен крови, которые остаются после неудачных шуток. + components: + - type: Sprite + sprite: _CP14/Clothing/Shirt/harlequine_red.rsi + - type: Clothing + sprite: _CP14/Clothing/Shirt/harlequine_red.rsi + \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml new file mode 100644 index 0000000000..7fc4f9617e --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml @@ -0,0 +1,25 @@ +- type: entity + abstract: true + parent: Clothing + id: CPClothingShoesBase + components: + - type: Clothing + equipDelay: 1 + unequipDelay: 1 + slots: + - FEET + - type: Sprite + state: icon + - type: Item + size: Normal + +- type: entity + parent: CPClothingShoesBase + id: CPClothingShoesBlack + name: простые черные ботинки + description: Влагу они не удержат, но это лучше чем ходить босиком. + components: + - type: Sprite + sprite: _CP14/Clothing/Shoes/black.rsi + - type: Clothing + sprite: _CP14/Clothing/Shoes/black.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_facial_hair.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_facial_hair.yml index c4112ac274..786c0ec2e6 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_facial_hair.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_facial_hair.yml @@ -20,4 +20,12 @@ markingCategory: FacialHair sprites: - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi - state: dwarf \ No newline at end of file + state: dwarf + +- type: marking + id: CPHumanFacialHairGoateeMush + bodyPart: FacialHair + markingCategory: FacialHair + sprites: + - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi + state: goateemush \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_hair.yml index 15eaad201a..c1cdbf7a35 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_hair.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_hair.yml @@ -78,6 +78,14 @@ - sprite: _CP14/Mobs/Customization/human_hair.rsi state: braid +- type: marking + id: CPHumanHairCrazyBald + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: _CP14/Mobs/Customization/human_hair.rsi + state: crazybald + - type: marking id: CPHumanHairBigDoubleBun bodyPart: Hair diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml index 5cdb09fd20..f0ed6b0f75 100644 --- a/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml +++ b/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml @@ -10,7 +10,10 @@ - type: startingGear id: CPTestGear equipment: - cloak: CPClothingOuterArmoredCloak + cloak: CPClothingCloakHoodieYellow + shirt: CPClothingShirtHarlequineRed + pants: CPClothingPantsHarlequinRed + shoes: CPClothingShoesBlack innerClothingSkirt: ClothingUniformJumpskirtCargo satchel: ClothingBackpackSatchelCargoFilled duffelbag: ClothingBackpackDuffelCargoFilled \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Tiles/natural.yml b/Resources/Prototypes/_CP14/Tiles/natural.yml index f1b2aa6893..308c979fb2 100644 --- a/Resources/Prototypes/_CP14/Tiles/natural.yml +++ b/Resources/Prototypes/_CP14/Tiles/natural.yml @@ -1,8 +1,36 @@ - type: tile - id: FloorPlanetGrassCP - name: травяной покров - sprite: /Textures/_CP14/Tiles/Grass/grass.png - variants: 8 + id: CPFloorPlanetGrass + name: cp-tiles-planet-grass + sprite: /Textures/Tiles/Planet/Grass/grass.png + variants: 4 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + edgeSpritePriority: 1 + edgeSprites: + SouthEast: /Textures/Tiles/Planet/Grass/single_edge.png + NorthEast: /Textures/Tiles/Planet/Grass/single_edge.png + NorthWest: /Textures/Tiles/Planet/Grass/single_edge.png + SouthWest: /Textures/Tiles/Planet/Grass/single_edge.png + South: /Textures/Tiles/Planet/Grass/double_edge.png + East: /Textures/Tiles/Planet/Grass/double_edge.png + North: /Textures/Tiles/Planet/Grass/double_edge.png + West: /Textures/Tiles/Planet/Grass/double_edge.png + baseTurf: CPFloorPlanetDirt + isSubfloor: true + footstepSounds: + collection: FootstepGrass + heatCapacity: 10000 + weather: true + indestructible: true + +- type: tile + id: CPFloorPlanetStone + name: cp-tiles-planet-stone + sprite: /Textures/_CP14/Tiles/cave.png + variants: 14 placementVariants: - 1.0 - 1.0 @@ -12,20 +40,46 @@ - 1.0 - 1.0 - 1.0 - edgeSpritePriority: 1 - edgeSprites: - SouthEast: /Textures/_CP14/Tiles/Grass/single_edge.png - NorthEast: /Textures/_CP14/Tiles/Grass/single_edge.png - NorthWest: /Textures/_CP14/Tiles/Grass/single_edge.png - SouthWest: /Textures/_CP14/Tiles/Grass/single_edge.png - South: /Textures/_CP14/Tiles/Grass/double_edge.png - East: /Textures/_CP14/Tiles/Grass/double_edge.png - North: /Textures/_CP14/Tiles/Grass/double_edge.png - West: /Textures/_CP14/Tiles/Grass/double_edge.png + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 baseTurf: FloorPlanetGrass isSubfloor: true footstepSounds: - collection: FootstepGrass + collection: FootstepAsteroid + heatCapacity: 10000 + weather: true + indestructible: true + +- type: tile + id: CPFloorPlanetDirt + name: cp-tiles-planet-dirt + sprite: /Textures/_CP14/Tiles/cavedrought.png + variants: 16 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: FloorPlanetGrass + isSubfloor: true + footstepSounds: + collection: FootstepAsteroid heatCapacity: 10000 weather: true indestructible: true \ No newline at end of file diff --git a/Resources/Textures/_CP14/Clothing/Cloak/blacksmith_apron.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/Cloak/blacksmith_apron.rsi/equipped-CLOAK.png new file mode 100644 index 0000000000..cab70ed930 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Cloak/blacksmith_apron.rsi/equipped-CLOAK.png differ diff --git a/Resources/Textures/_CP14/Clothing/Cloak/blacksmith_apron.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Cloak/blacksmith_apron.rsi/icon.png new file mode 100644 index 0000000000..f7b90c3ccb Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Cloak/blacksmith_apron.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Cloak/blacksmith_apron.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/blacksmith_apron.rsi/meta.json new file mode 100644 index 0000000000..41471dc9c7 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Cloak/blacksmith_apron.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "CrystallPunk14, by TheShuEd", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-CLOAK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Cloak/redguardarmor.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/Cloak/redguardarmor.rsi/equipped-CLOAK.png new file mode 100644 index 0000000000..c7db685232 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Cloak/redguardarmor.rsi/equipped-CLOAK.png differ diff --git a/Resources/Textures/_CP14/Clothing/Cloak/redguardarmor.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Cloak/redguardarmor.rsi/icon.png new file mode 100644 index 0000000000..76220c19f1 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Cloak/redguardarmor.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/redguardarmor.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/redguardarmor.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/OuterClothing/redguardarmor.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Cloak/redguardarmor.rsi/meta.json diff --git a/Resources/Textures/_CP14/Clothing/Cloak/yellowhoodie.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/Cloak/yellowhoodie.rsi/equipped-CLOAK.png new file mode 100644 index 0000000000..14ec4a5405 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Cloak/yellowhoodie.rsi/equipped-CLOAK.png differ diff --git a/Resources/Textures/_CP14/Clothing/Cloak/yellowhoodie.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Cloak/yellowhoodie.rsi/icon.png new file mode 100644 index 0000000000..71c30d9798 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Cloak/yellowhoodie.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Cloak/yellowhoodie.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/yellowhoodie.rsi/meta.json new file mode 100644 index 0000000000..cf600d0ec5 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Cloak/yellowhoodie.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "CrystallPunk14, by KBAS5", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-CLOAK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Head/yellowhoodie.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Clothing/Head/yellowhoodie.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..cd7a38e715 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/yellowhoodie.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/yellowhoodie.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Head/yellowhoodie.rsi/icon.png new file mode 100644 index 0000000000..9c4e3743d7 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/yellowhoodie.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/yellowhoodie.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Head/yellowhoodie.rsi/meta.json new file mode 100644 index 0000000000..78a728f7c5 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Head/yellowhoodie.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "CrystallPunk14, by KBAS5", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/redguardarmor.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/OuterClothing/redguardarmor.rsi/equipped-CLOAK.png deleted file mode 100644 index 7b7b1f9cb0..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/OuterClothing/redguardarmor.rsi/equipped-CLOAK.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/redguardarmor.rsi/icon.png b/Resources/Textures/_CP14/Clothing/OuterClothing/redguardarmor.rsi/icon.png deleted file mode 100644 index 4c4b6e00ae..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/OuterClothing/redguardarmor.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Pants/harlequin.rsi/equipped-PANTS.png b/Resources/Textures/_CP14/Clothing/Pants/harlequin.rsi/equipped-PANTS.png new file mode 100644 index 0000000000..1811517d8b Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Pants/harlequin.rsi/equipped-PANTS.png differ diff --git a/Resources/Textures/_CP14/Clothing/Pants/harlequin.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Pants/harlequin.rsi/icon.png new file mode 100644 index 0000000000..4d326fb5cb Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Pants/harlequin.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Pants/harlequin.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Pants/harlequin.rsi/meta.json new file mode 100644 index 0000000000..901ce57fa4 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Pants/harlequin.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "CrystallPunk14, by KBAS5", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-PANTS", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Shirt/harlequine_red.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/harlequine_red.rsi/equipped-SHIRT.png new file mode 100644 index 0000000000..1ce430d87d Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/harlequine_red.rsi/equipped-SHIRT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/harlequine_red.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/harlequine_red.rsi/icon.png new file mode 100644 index 0000000000..8530cf24a3 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/harlequine_red.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/harlequine_red.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/harlequine_red.rsi/meta.json new file mode 100644 index 0000000000..fd31e639e1 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Shirt/harlequine_red.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "CrystallPunk14, by KBAS5", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-SHIRT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Shoes/black.rsi/equipped-FEET.png b/Resources/Textures/_CP14/Clothing/Shoes/black.rsi/equipped-FEET.png new file mode 100644 index 0000000000..12686abe4a Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shoes/black.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shoes/black.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shoes/black.rsi/icon.png new file mode 100644 index 0000000000..c66723b606 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shoes/black.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shoes/black.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shoes/black.rsi/meta.json new file mode 100644 index 0000000000..b20cb0d59f --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Shoes/black.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "CrystallPunk14, by KBAS5", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/goateemush.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/goateemush.png new file mode 100644 index 0000000000..70ba9f6a55 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/goateemush.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/meta.json index 7668b0bc3b..1d39b1c095 100644 --- a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/meta.json +++ b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/meta.json @@ -4,7 +4,7 @@ "x": 48, "y": 48 }, - "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi", + "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi, adapted by TheShuEd. goateemush by TheShuEd", "license": "CC-BY-SA-3.0", "states": [ { @@ -18,6 +18,10 @@ { "name": "dwarf", "directions": 4 + }, + { + "name": "goateemush", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/crazybald.png b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/crazybald.png new file mode 100644 index 0000000000..175ef8617c Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/crazybald.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/meta.json index 383b3499da..47c7c5a5fd 100644 --- a/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/meta.json +++ b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/meta.json @@ -4,7 +4,7 @@ "x": 48, "y": 48 }, - "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi ,resprited by Alekshhh, a modified by potato1234x, uneven and tailed is drawn by Ubaser, adapted to CrystallPunk by TheShuEd", + "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi ,resprited by Alekshhh, a modified by potato1234x, uneven and tailed is drawn by Ubaser, adapted to CrystallPunk by TheShuEd. Crazybald by TheShuEd", "license": "CC-BY-SA-3.0", "states": [ { @@ -47,6 +47,10 @@ "name": "braid", "directions": 4 }, + { + "name": "crazybald", + "directions": 4 + }, { "name": "doublebun", "directions": 4 diff --git a/Resources/Textures/_CP14/Structures/Floors/wood.rsi/meta.json b/Resources/Textures/_CP14/Structures/Floors/wood.rsi/meta.json new file mode 100644 index 0000000000..0bbf25c0bf --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Floors/wood.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Made pace Station 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "wood_1" + }, + { + "name": "wood_2" + }, + { + "name": "wood_3" + }, + { + "name": "wood_4" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Structures/Floors/wood.rsi/wood_1.png b/Resources/Textures/_CP14/Structures/Floors/wood.rsi/wood_1.png new file mode 100644 index 0000000000..f28adb738d Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Floors/wood.rsi/wood_1.png differ diff --git a/Resources/Textures/_CP14/Structures/Floors/wood.rsi/wood_2.png b/Resources/Textures/_CP14/Structures/Floors/wood.rsi/wood_2.png new file mode 100644 index 0000000000..5e27c3be6f Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Floors/wood.rsi/wood_2.png differ diff --git a/Resources/Textures/_CP14/Structures/Floors/wood.rsi/wood_3.png b/Resources/Textures/_CP14/Structures/Floors/wood.rsi/wood_3.png new file mode 100644 index 0000000000..e9769c9391 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Floors/wood.rsi/wood_3.png differ diff --git a/Resources/Textures/_CP14/Structures/Floors/wood.rsi/wood_4.png b/Resources/Textures/_CP14/Structures/Floors/wood.rsi/wood_4.png new file mode 100644 index 0000000000..2529eaa5ab Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Floors/wood.rsi/wood_4.png differ diff --git a/Resources/Textures/_CP14/Structures/Floors/wood_big.rsi/meta.json b/Resources/Textures/_CP14/Structures/Floors/wood_big.rsi/meta.json new file mode 100644 index 0000000000..74ee50ab19 --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Floors/wood_big.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Made pace Station 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "wood_big_1" + }, + { + "name": "wood_big_2" + }, + { + "name": "wood_big_3" + }, + { + "name": "wood_big_4" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Structures/Floors/wood_big.rsi/wood_big_1.png b/Resources/Textures/_CP14/Structures/Floors/wood_big.rsi/wood_big_1.png new file mode 100644 index 0000000000..bcb7d680f5 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Floors/wood_big.rsi/wood_big_1.png differ diff --git a/Resources/Textures/_CP14/Structures/Floors/wood_big.rsi/wood_big_2.png b/Resources/Textures/_CP14/Structures/Floors/wood_big.rsi/wood_big_2.png new file mode 100644 index 0000000000..bcb7d680f5 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Floors/wood_big.rsi/wood_big_2.png differ diff --git a/Resources/Textures/_CP14/Structures/Floors/wood_big.rsi/wood_big_3.png b/Resources/Textures/_CP14/Structures/Floors/wood_big.rsi/wood_big_3.png new file mode 100644 index 0000000000..bcb7d680f5 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Floors/wood_big.rsi/wood_big_3.png differ diff --git a/Resources/Textures/_CP14/Structures/Floors/wood_big.rsi/wood_big_4.png b/Resources/Textures/_CP14/Structures/Floors/wood_big.rsi/wood_big_4.png new file mode 100644 index 0000000000..bcb7d680f5 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Floors/wood_big.rsi/wood_big_4.png differ diff --git a/Resources/Textures/_CP14/Tiles/Grass/attributions.yml b/Resources/Textures/_CP14/Tiles/Grass/attributions.yml deleted file mode 100644 index 2e7adfa8d3..0000000000 --- a/Resources/Textures/_CP14/Tiles/Grass/attributions.yml +++ /dev/null @@ -1,7 +0,0 @@ -- files: - - grass.png - - double_edge.png - - single_edge.png - license: "CC-BY-SA-3.0" - copyright: "https://github.com/discordia-space/CEV-Eris/commit/026ee3250ac1de938b503e3eb46ad73dd9c3ca82, recolored by TheShuEd for CrystallPunk14" - source: "https://github.com/discordia-space/CEV-Eris/commit/026ee3250ac1de938b503e3eb46ad73dd9c3ca82" diff --git a/Resources/Textures/_CP14/Tiles/Grass/double_edge.png b/Resources/Textures/_CP14/Tiles/Grass/double_edge.png deleted file mode 100644 index 80dc9528ff..0000000000 Binary files a/Resources/Textures/_CP14/Tiles/Grass/double_edge.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Tiles/Grass/grass.png b/Resources/Textures/_CP14/Tiles/Grass/grass.png deleted file mode 100644 index b0bbe82fac..0000000000 Binary files a/Resources/Textures/_CP14/Tiles/Grass/grass.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Tiles/Grass/single_edge.png b/Resources/Textures/_CP14/Tiles/Grass/single_edge.png deleted file mode 100644 index a9109e726f..0000000000 Binary files a/Resources/Textures/_CP14/Tiles/Grass/single_edge.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Tiles/Grass/triple_edge.png b/Resources/Textures/_CP14/Tiles/Grass/triple_edge.png deleted file mode 100644 index de2355094b..0000000000 Binary files a/Resources/Textures/_CP14/Tiles/Grass/triple_edge.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Tiles/cave.png b/Resources/Textures/_CP14/Tiles/cave.png new file mode 100644 index 0000000000..c90c1d240e Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/cave.png differ diff --git a/Resources/Textures/_CP14/Tiles/cavedrought.png b/Resources/Textures/_CP14/Tiles/cavedrought.png new file mode 100644 index 0000000000..11d119d2c5 Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/cavedrought.png differ