diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml index 574f33145b..8eb15206b9 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml @@ -280,4 +280,14 @@ - type: Sprite sprite: _CP14/Clothing/Shirt/Roles/General/Dress/warrior_garb.rsi - type: Clothing - sprite: _CP14/Clothing/Shirt/Roles/General/Dress/warrior_garb.rsi \ No newline at end of file + sprite: _CP14/Clothing/Shirt/Roles/General/Dress/warrior_garb.rsi + +- type: entity + parent: CP14ClothingShirtBase + id: CP14ClothinShirtMaidDress + name: maid's dress + components: + - type: Sprite + sprite: _CP14/Clothing/Shirt/Roles/General/Dress/maid_dress.rsi + - type: Clothing + sprite: _CP14/Clothing/Shirt/Roles/General/Dress/maid_dress.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/carcat.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/carcat.yml index dff84fe6aa..93e16eb977 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/carcat.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/carcat.yml @@ -43,6 +43,7 @@ footstepSoundCollection: null # Silent footstep - type: Inventory templateId: CP14Carcat # Cant wear shoes + speciesId: carcat displacements: belt: sizeMaps: @@ -113,6 +114,7 @@ species: CP14Carcat - type: Inventory templateId: CP14Carcat + speciesId: carcat displacements: belt: sizeMaps: diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml index 832b91fc41..0a8d27bb8a 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml @@ -271,6 +271,7 @@ loadouts: - CP14ClothingShirtCottonBlack - CP14ClothingShirtBlackDress + - CP14ClothinShirtMaidDress - CP14ClothingShirtCottonBlue - CP14ClothingShirtCottonBlueCollar - CP14ClothingBlueCollarDress @@ -306,6 +307,11 @@ equipment: shirt: CP14ClothingShirtBlackDress +- type: loadout + id: CP14ClothinShirtMaidDress + equipment: + shirt: CP14ClothinShirtMaidDress + - type: loadout id: CP14ClothingShirtCottonBlue equipment: diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/maid_apron.rsi/equipped-CLOAK-carcat.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/maid_apron.rsi/equipped-CLOAK-carcat.png new file mode 100644 index 0000000000..15f7b1526b Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/maid_apron.rsi/equipped-CLOAK-carcat.png differ diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/maid_apron.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/maid_apron.rsi/equipped-CLOAK.png index 2e7e5f09ac..989d0ec0a2 100644 Binary files a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/maid_apron.rsi/equipped-CLOAK.png and b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/maid_apron.rsi/equipped-CLOAK.png differ diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/maid_apron.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/maid_apron.rsi/icon.png index debf4bf168..d937b1002f 100644 Binary files a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/maid_apron.rsi/icon.png and b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/maid_apron.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/maid_apron.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/maid_apron.rsi/meta.json index 0799f0bd2c..d2497148a0 100644 --- a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/maid_apron.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/maid_apron.rsi/meta.json @@ -1,10 +1,10 @@ { "version": 1, "license": "CC-BY-SA-4.0", - "copyright": "Created by TheShuEd", + "copyright": "Created by TheShuEd, modified by creamy", "size": { - "x": 32, - "y": 32 + "x": 48, + "y": 48 }, "states": [ { @@ -13,6 +13,10 @@ { "name": "equipped-CLOAK", "directions": 4 + }, + { + "name": "equipped-CLOAK-carcat", + "directions": 4 } ] } diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/maid_dress.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/maid_dress.rsi/equipped-SHIRT.png new file mode 100644 index 0000000000..53b50bab8b Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/maid_dress.rsi/equipped-SHIRT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/maid_dress.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/maid_dress.rsi/icon.png new file mode 100644 index 0000000000..23fbaf4da1 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/maid_dress.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/maid_dress.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/maid_dress.rsi/meta.json new file mode 100644 index 0000000000..7b10adb18c --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/maid_dress.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "Created by creamy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-SHIRT", + "directions": 4 + } + ] +}