From 10fe11939dfd7707ad687d6c4093e9896e2571d3 Mon Sep 17 00:00:00 2001 From: FoxxoTrystan Date: Sat, 6 Jul 2024 18:59:31 +0200 Subject: [PATCH 1/4] ItemBase --- .../Floof/Entities/Clothing/Uniforms/misc.yml | 14 ++++++++++++++ .../Clothing/Uniforms/permit-nude.rsi/icon.png | Bin 0 -> 198 bytes .../Clothing/Uniforms/permit-nude.rsi/meta.json | 14 ++++++++++++++ 3 files changed, 28 insertions(+) create mode 100644 Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/permit-nude.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/permit-nude.rsi/meta.json diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml new file mode 100644 index 00000000000..91b1f9321dd --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml @@ -0,0 +1,14 @@ +- type: entity + parent: ClothingUniformBase + id: ClothingUniformNudePermit + name: public nudity permit + description: This permit entitles the bearer to conduct their duties without a uniform. Normally issued to furred crewmembers or those with nothing to hide. + components: + - type: Item + size: Small + - type: Sprite + sprite: Floof/Clothing/Uniforms/permit-nude.rsi + - type: Clothing + sprite: Floof/Clothing/Uniforms/permit-nude.rsi + equipDelay: 0 + unequipDelay: 0 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/permit-nude.rsi/icon.png b/Resources/Textures/Floof/Clothing/Uniforms/permit-nude.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..728c50b647d8c48df86eb2891bc919813d79dc23 GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvxd5LKS0JrnmTXP_;|(b1)aZ?^+gFqQ=Q1v5B2yO9Rugn7C+hG4@fk8`P8XGfXK;x%Rn?4n#F!G4X%F0U0O6JPuT7;gNW0`yF p%*>gWmpu$RD8OEJ&}22WQ%mvv4FO#qDJH^cw{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Uniforms/permit-nude.rsi/meta.json b/Resources/Textures/Floof/Clothing/Uniforms/permit-nude.rsi/meta.json new file mode 100644 index 00000000000..29892515189 --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Uniforms/permit-nude.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/VOREStation/VOREStation", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} From 4af960e81b2e912ff8359f8999f71ed1d4fcfe72 Mon Sep 17 00:00:00 2001 From: FoxxoTrystan Date: Sat, 6 Jul 2024 19:11:07 +0200 Subject: [PATCH 2/4] Access --- .../Catalog/VendingMachines/Inventories/clothesmate.yml | 1 + Resources/Prototypes/Loadouts/uniform.yml | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index 2c4c27137f0..092cdd8b996 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -111,6 +111,7 @@ ClothingHandsGlovesColorOrange: 2 ClothingHandsGlovesColorPurple: 2 ClothingEyesGlassesCheapSunglasses: 3 + ClothingUniformNudePermit: 5 # FloofStation contrabandInventory: ClothingMaskNeckGaiter: 2 ClothingUniformJumpsuitTacticool: 1 diff --git a/Resources/Prototypes/Loadouts/uniform.yml b/Resources/Prototypes/Loadouts/uniform.yml index 5afdd303c0b..d6d2478917f 100644 --- a/Resources/Prototypes/Loadouts/uniform.yml +++ b/Resources/Prototypes/Loadouts/uniform.yml @@ -259,3 +259,11 @@ exclusive: true items: - ClothingUniformColorRainbow + +- type: loadout # FloofStation + id: LoadoutUniformNudePermit + category: Uniform + cost: 2 + exclusive: true + items: + - ClothingUniformNudePermit From 21b3577c2b624c696da14256e180b1c98d6e3ba0 Mon Sep 17 00:00:00 2001 From: FoxxoTrystan Date: Sun, 7 Jul 2024 13:20:37 +0200 Subject: [PATCH 3/4] Floof Directory and merge conflict fix --- Resources/Prototypes/Floof/Loadouts/uniform.yml | 7 +++++++ Resources/Prototypes/Loadouts/uniform.yml | 8 -------- 2 files changed, 7 insertions(+), 8 deletions(-) create mode 100644 Resources/Prototypes/Floof/Loadouts/uniform.yml diff --git a/Resources/Prototypes/Floof/Loadouts/uniform.yml b/Resources/Prototypes/Floof/Loadouts/uniform.yml new file mode 100644 index 00000000000..afe869c5059 --- /dev/null +++ b/Resources/Prototypes/Floof/Loadouts/uniform.yml @@ -0,0 +1,7 @@ +- type: loadout + id: LoadoutUniformNudePermit + category: Uniform + cost: 2 + exclusive: true + items: + - ClothingUniformNudePermit diff --git a/Resources/Prototypes/Loadouts/uniform.yml b/Resources/Prototypes/Loadouts/uniform.yml index d6d2478917f..5afdd303c0b 100644 --- a/Resources/Prototypes/Loadouts/uniform.yml +++ b/Resources/Prototypes/Loadouts/uniform.yml @@ -259,11 +259,3 @@ exclusive: true items: - ClothingUniformColorRainbow - -- type: loadout # FloofStation - id: LoadoutUniformNudePermit - category: Uniform - cost: 2 - exclusive: true - items: - - ClothingUniformNudePermit From 4922b3ae35fc316fa44717ed442e7fd2a79a5338 Mon Sep 17 00:00:00 2001 From: FoxxoTrystan Date: Fri, 12 Jul 2024 12:50:16 +0200 Subject: [PATCH 4/4] LoinCloth --- .../VendingMachines/Inventories/clothesmate.yml | 2 +- .../Floof/Entities/Clothing/Uniforms/misc.yml | 10 +++++----- Resources/Prototypes/Floof/Loadouts/uniform.yml | 4 ++-- .../Clothing/Uniforms/loincloth.rsi/icon.png | Bin 0 -> 864 bytes .../{permit-nude.rsi => loincloth.rsi}/meta.json | 0 .../Clothing/Uniforms/permit-nude.rsi/icon.png | Bin 198 -> 0 bytes 6 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 Resources/Textures/Floof/Clothing/Uniforms/loincloth.rsi/icon.png rename Resources/Textures/Floof/Clothing/Uniforms/{permit-nude.rsi => loincloth.rsi}/meta.json (100%) delete mode 100644 Resources/Textures/Floof/Clothing/Uniforms/permit-nude.rsi/icon.png diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index 092cdd8b996..aadb05df8e7 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -111,7 +111,7 @@ ClothingHandsGlovesColorOrange: 2 ClothingHandsGlovesColorPurple: 2 ClothingEyesGlassesCheapSunglasses: 3 - ClothingUniformNudePermit: 5 # FloofStation + ClothingUniformLoinCloth: 5 # FloofStation contrabandInventory: ClothingMaskNeckGaiter: 2 ClothingUniformJumpsuitTacticool: 1 diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml index 91b1f9321dd..e5c76890ba5 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml @@ -1,14 +1,14 @@ - type: entity parent: ClothingUniformBase - id: ClothingUniformNudePermit - name: public nudity permit - description: This permit entitles the bearer to conduct their duties without a uniform. Normally issued to furred crewmembers or those with nothing to hide. + id: ClothingUniformLoinCloth + name: loin cloth + description: A piece of cloth wrapped around the waist. components: - type: Item size: Small - type: Sprite - sprite: Floof/Clothing/Uniforms/permit-nude.rsi + sprite: Floof/Clothing/Uniforms/loincloth.rsi - type: Clothing - sprite: Floof/Clothing/Uniforms/permit-nude.rsi + sprite: Floof/Clothing/Uniforms/loincloth.rsi equipDelay: 0 unequipDelay: 0 diff --git a/Resources/Prototypes/Floof/Loadouts/uniform.yml b/Resources/Prototypes/Floof/Loadouts/uniform.yml index afe869c5059..35c197603f9 100644 --- a/Resources/Prototypes/Floof/Loadouts/uniform.yml +++ b/Resources/Prototypes/Floof/Loadouts/uniform.yml @@ -1,7 +1,7 @@ - type: loadout - id: LoadoutUniformNudePermit + id: LoadoutUniformLoinCloth category: Uniform cost: 2 exclusive: true items: - - ClothingUniformNudePermit + - ClothingUniformLoinCloth diff --git a/Resources/Textures/Floof/Clothing/Uniforms/loincloth.rsi/icon.png b/Resources/Textures/Floof/Clothing/Uniforms/loincloth.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..6f4518ffb941430a57e7d486c9b64882bacdbf2f GIT binary patch literal 864 zcmV-m1E2hfP)T2?c4l^xW}CP{L@!!U@IMf|EVg}Fzk_tF>l zh3p7;eda|Qx_v@FCk!2`EWtJV$kLjc5`Wal(@PEtS70H57o&BFNgQ0?^2X^y_O1DA zJ0i9PoIUx1ZHAkShY@w9(YXh&a8PT4wzlz8|2Kk`P9uX%D4S8C4UfjHFRM zYs(v0Rnyu(IXGZ?`mkMG{C2BdXJ38Z7G{Y@9(scH^>w;;Q-aV(sfvd0lIOWxOQ$4s z##)-q33{D^UN@t*sU##}pM-XKZF6uyU75eGf9-70_9m#!9SKxH+>;ShijgRy-z#uj znY~63C5|3t=~gWHClj_$5>lgAx=ATBqbAlOM7CHyBm@;)j_)zV`C7GINZFM(7#pi-op30KZYM)z5cgF z7cPDG$4E|1*{UvibaFpwKapR>>g{#Ohfl2&qE^UHKmQ`#c$kF`uJ7H8=w7|^=llMZ zV@Ir32~R$LkRne>t6U&mlG5eim2b8nr(Slg@2Avto4LzBJh+e1 qy}J0}wST?oo&ff$hJYbp2>2Z&Ej~#dSSXDE0000P_;|(b1)aZ?^+gFqQ=Q1v5B2yO9Rugn7C+hG4@fk8`P8XGfXK;x%Rn?4n#F!G4X%F0U0O6JPuT7;gNW0`yF p%*>gWmpu$RD8OEJ&}22WQ%mvv4FO#qDJH^cw{