From 00abde79e321a29b60b7e1fd5b92b9da9ef7656e Mon Sep 17 00:00:00 2001 From: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com> Date: Mon, 29 Apr 2024 21:46:54 -0400 Subject: [PATCH 01/14] masterchefhat --- .../Entities/Clothing/Head/hats.yml | 14 ++++++++++++ .../Loadouts/Jobs/Civilian/chef.yml | 22 +++++++++++++++++++ .../Prototypes/Loadouts/loadout_groups.yml | 1 + 3 files changed, 37 insertions(+) diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index a844fd724a36..c9304eb34387 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -256,6 +256,20 @@ - HamsterWearable - WhitelistChameleon +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatMasterChef + name: master chef's hat + description: "It's a hat used by chefs to keep hair out of your food. This one is very tall." + components: + - type: Sprite + sprite: Clothing/Head/Hats/chefhat.rsi + - type: Clothing + sprite: Clothing/Head/Hats/chefhat.rsi + - type: Storage + grid: + - 0,0,0,2 + - type: entity parent: ClothingHeadBase id: ClothingHeadHatFedoraBrown diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml index 5e647acb752e..11e42b22fdf1 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml @@ -1,3 +1,12 @@ +- type: loadoutEffectGroup + id: MasterChef + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobChef + time: 36000 #10 hrs + # Head - type: loadout id: ChefHead @@ -8,6 +17,19 @@ equipment: head: ClothingHeadHatChef +- type: loadout + id: ChefMasterHead + equipment: ChefMasterHead + +- type: startingGear + id: ChefMasterHead + equipment: + head: ClothingHeadHatMasterChef + effects: + - !type:GroupLoadoutEffect + proto: MasterChef + + # Mask - type: loadout id: ChefMask diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index acec697da28a..ce8d4a674820 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -184,6 +184,7 @@ minLimit: 0 loadouts: - ChefHead + - ChefMasterHead - type: loadoutGroup id: ChefMask From 75a3bad3bb7e367cd5f53ce96a60b607084dafbe Mon Sep 17 00:00:00 2001 From: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com> Date: Tue, 30 Apr 2024 20:18:00 -0400 Subject: [PATCH 02/14] Update hats.yml --- Resources/Prototypes/Entities/Clothing/Head/hats.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index c9304eb34387..7e2d1dceef1f 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -260,15 +260,15 @@ parent: ClothingHeadBase id: ClothingHeadHatMasterChef name: master chef's hat - description: "It's a hat used by chefs to keep hair out of your food. This one is very tall." + description: "It's a hat used by chefs who have truly mastered their craft. This one is very tall." components: - type: Sprite - sprite: Clothing/Head/Hats/chefhat.rsi + sprite: Clothing/Head/Hats/chefhatmaster.rsi - type: Clothing - sprite: Clothing/Head/Hats/chefhat.rsi + sprite: Clothing/Head/Hats/chefhatmaster.rsi - type: Storage grid: - - 0,0,0,2 + - 0,0,0,3 - type: entity parent: ClothingHeadBase From 1a1f3aa7e8ed60436ad776869406de2dbafe4d63 Mon Sep 17 00:00:00 2001 From: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com> Date: Tue, 30 Apr 2024 20:21:39 -0400 Subject: [PATCH 03/14] Added sprites --- .../equipped-HELMET-hamster.png | Bin 0 -> 325 bytes .../chefhatmaster.rsi/equipped-HELMET.png | Bin 0 -> 283 bytes .../Head/Hats/chefhatmaster.rsi/icon.png | Bin 0 -> 248 bytes .../Hats/chefhatmaster.rsi/inhand-left.png | Bin 0 -> 276 bytes .../Hats/chefhatmaster.rsi/inhand-right.png | Bin 0 -> 283 bytes .../Head/Hats/chefhatmaster.rsi/meta.json | 30 ++++++++++++++++++ 6 files changed, 30 insertions(+) create mode 100644 Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/equipped-HELMET-hamster.png create mode 100644 Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/meta.json diff --git a/Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000000000000000000000000000000000..32e8e8de5ee84a8ffc06714dbeda1ed18f26d0f7 GIT binary patch literal 325 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!3HFEH|A#nDaPU;cPEB*=VV?2IsZLf978JR zyuD+XcgR76eeqjWGuDQ>Ctp12Ajp# zZnY(5tlfI^d{lPz^FP&{ma|*_JO4X=i}m|4hL=p4Y#!ns#tyq2W-(r3y~Hy?Z$er_ zNuvq#67D6kbq$v%>GwX~QPdmrZxQ3Keer7#$bDu6x UB08(tlKB?=UlIhe}&Fu zi$xpC-aY(pm;^IHQXy91EQTd~_6HXIW}G~K{kkbZr@p7&mQR-Zd^$b$PtWvw4WGA` rJkNfqw%+Eo{<1xq^{ZoGb|uv3`BlE`|I_>B6G+I@)z4*}Q$iB}ka33> literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..88804bb0d99e622cab73c664cfdda8c1e429d1ef GIT binary patch literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!3HFEH|A#nDaPU;cPEB*=VV?2IafVh978JR zyuD+X*X$tC5~zLZ@9Vu>%Nu9s>=K!%>&o$&^K+bYYnsX5{r&9!&5zA^z3ZIi^ULog zlIx28<#(q0an?KkyMB>%{V|5p##xN7m`s_kux7EX;J(5WAihF!fnI>IL+paG-;Ddd z|Jjmz`=IHrKe5a@r;8#QwVyEqt%m~nXIKCJi!}dJ|9P@GOWfV}^S`zoxcGCs{R{)3 z?zDzo4rj3$f47d|J^P!VEBD=B|CteH6vG3iI)-vLj+|TmeRDyAp00i_>zopr0HvjG AzyJUM literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..04c738be84599a98806964f09630a9b94a34a519 GIT binary patch literal 248 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDaPU;cPEB*=VV?2Ih#CP978f1 z-(Ek+dsu;|HF5hZgPezj2`UopnhCSN98qQ85WQ;4tN)&sM?2>$c=T}qwS0J=caOd3 z-0?ScUMIhvYu{ejQy5ycM=0gyo$Rea>z=JOEoaE?_&se(z5)A-z4b=N@7!oBeEWy( z%<=`-w3L)qS;h7Srl;~PSS92%A?VbWJekX(bFB~TJgB$7n2W=Kfk~i&AzpC7_kFbn vhW_i44+LDzygP$^P4LI3|5<^SPp@WrUwz5oe9tv)AdkV*)z4*}Q$iB}@xW$Y literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..55117186d0c9478400ffdff9d446f0136ff0aba3 GIT binary patch literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!3HFEH|A#nDaPU;cPEB*=VV?2Ip;iG978JR zyuIVdb;v=$<)Xs9`n%yLGbhd7Qr(%r<81k4Z|`c(qxWy0W&$cc@P5^*?YXbt+5K6& zO77=B{g6=kpJjipeowb`t0_@qTEf1BbAsFiHHRvPSqv{3Gm!;uy=As>uPM3z{l#zN zHkOF%roZHX20}ps*ZXqTWqWlCjxOKL6rRt0=O4c?vSw_i@%;S#M??7?myhUySVo9B ZKW=i*|97Zw+T^`p0Z&&ymvv4FO#p0oXJ7yT literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..127be36b05fe7623ca61f989ab75041d4986e16a GIT binary patch literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!3HFEH|A#nDaPU;cPEB*=VV?2IafVh978JR zyuD+{cgR4%C6K%Df7SX)msQLSMdvnmbj*mTT<^H(*UY-RQb5HA=7xsGU*G!uUi<#g ztCxG{&$$#ITKnXc{Qt5o|3AJzu-eeUO5rTS%LWtXCCrz2Ch&O}BMao&A1MCvd|Ph) zIg9HP|2A;W5Wputceu&I2x{pDz8``f!O&wshL@tTZ}!~vY@ocfLOR lTRB_Q??Q(1Ul3yqdc}3`AL>(7d&CM7@O1TaS?83{1ON+lZ5RLm literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/meta.json new file mode 100644 index 000000000000..8538d10db814 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 64 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From 2c9d4f153ed802c6b5700e59f715c11c12a20c3f Mon Sep 17 00:00:00 2001 From: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com> Date: Tue, 30 Apr 2024 20:46:17 -0400 Subject: [PATCH 04/14] part one of removing the name 'master chef' --- Resources/Prototypes/Entities/Clothing/Head/hats.yml | 8 ++++---- Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 7e2d1dceef1f..74c9688c76bb 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -258,14 +258,14 @@ - type: entity parent: ClothingHeadBase - id: ClothingHeadHatMasterChef - name: master chef's hat + id: ClothingHeadHatHeadChef + name: head chef's hat description: "It's a hat used by chefs who have truly mastered their craft. This one is very tall." components: - type: Sprite - sprite: Clothing/Head/Hats/chefhatmaster.rsi + sprite: Clothing/Head/Hats/chefhathead.rsi - type: Clothing - sprite: Clothing/Head/Hats/chefhatmaster.rsi + sprite: Clothing/Head/Hats/chefhathead.rsi - type: Storage grid: - 0,0,0,3 diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml index 11e42b22fdf1..6fd41e702ec1 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml @@ -1,5 +1,5 @@ - type: loadoutEffectGroup - id: MasterChef + id: HeadChef effects: - !type:JobRequirementLoadoutEffect requirement: @@ -18,16 +18,16 @@ head: ClothingHeadHatChef - type: loadout - id: ChefMasterHead - equipment: ChefMasterHead + id: ChefHeadHat + equipment: ChefHeadHat - type: startingGear - id: ChefMasterHead + id: ChefHeadHat equipment: - head: ClothingHeadHatMasterChef + head: ClothingHeadHatHeadChef effects: - !type:GroupLoadoutEffect - proto: MasterChef + proto: HeadChef # Mask From c32b6408f74b0e899983058a610b80cff6d4af72 Mon Sep 17 00:00:00 2001 From: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com> Date: Tue, 30 Apr 2024 20:49:48 -0400 Subject: [PATCH 05/14] Add files via upload --- .../equipped-HELMET-hamster.png | Bin 0 -> 325 bytes .../Hats/chefhathead.rsi/equipped-HELMET.png | Bin 0 -> 283 bytes .../Head/Hats/chefhathead.rsi/icon.png | Bin 0 -> 248 bytes .../Head/Hats/chefhathead.rsi/inhand-left.png | Bin 0 -> 276 bytes .../Hats/chefhathead.rsi/inhand-right.png | Bin 0 -> 283 bytes .../Head/Hats/chefhathead.rsi/meta.json | 30 ++++++++++++++++++ 6 files changed, 30 insertions(+) create mode 100644 Resources/Textures/Clothing/Head/Hats/chefhathead.rsi/equipped-HELMET-hamster.png create mode 100644 Resources/Textures/Clothing/Head/Hats/chefhathead.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hats/chefhathead.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Hats/chefhathead.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Hats/chefhathead.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Hats/chefhathead.rsi/meta.json diff --git a/Resources/Textures/Clothing/Head/Hats/chefhathead.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/chefhathead.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000000000000000000000000000000000..32e8e8de5ee84a8ffc06714dbeda1ed18f26d0f7 GIT binary patch literal 325 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!3HFEH|A#nDaPU;cPEB*=VV?2IsZLf978JR zyuD+XcgR76eeqjWGuDQ>Ctp12Ajp# zZnY(5tlfI^d{lPz^FP&{ma|*_JO4X=i}m|4hL=p4Y#!ns#tyq2W-(r3y~Hy?Z$er_ zNuvq#67D6kbq$v%>GwX~QPdmrZxQ3Keer7#$bDu6x UB08(tlKB?=UlIhe}&Fu zi$xpC-aY(pm;^IHQXy91EQTd~_6HXIW}G~K{kkbZr@p7&mQR-Zd^$b$PtWvw4WGA` rJkNfqw%+Eo{<1xq^{ZoGb|uv3`BlE`|I_>B6G+I@)z4*}Q$iB}ka33> literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/chefhathead.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/chefhathead.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..88804bb0d99e622cab73c664cfdda8c1e429d1ef GIT binary patch literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!3HFEH|A#nDaPU;cPEB*=VV?2IafVh978JR zyuD+X*X$tC5~zLZ@9Vu>%Nu9s>=K!%>&o$&^K+bYYnsX5{r&9!&5zA^z3ZIi^ULog zlIx28<#(q0an?KkyMB>%{V|5p##xN7m`s_kux7EX;J(5WAihF!fnI>IL+paG-;Ddd z|Jjmz`=IHrKe5a@r;8#QwVyEqt%m~nXIKCJi!}dJ|9P@GOWfV}^S`zoxcGCs{R{)3 z?zDzo4rj3$f47d|J^P!VEBD=B|CteH6vG3iI)-vLj+|TmeRDyAp00i_>zopr0HvjG AzyJUM literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/chefhathead.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/chefhathead.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..04c738be84599a98806964f09630a9b94a34a519 GIT binary patch literal 248 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDaPU;cPEB*=VV?2Ih#CP978f1 z-(Ek+dsu;|HF5hZgPezj2`UopnhCSN98qQ85WQ;4tN)&sM?2>$c=T}qwS0J=caOd3 z-0?ScUMIhvYu{ejQy5ycM=0gyo$Rea>z=JOEoaE?_&se(z5)A-z4b=N@7!oBeEWy( z%<=`-w3L)qS;h7Srl;~PSS92%A?VbWJekX(bFB~TJgB$7n2W=Kfk~i&AzpC7_kFbn vhW_i44+LDzygP$^P4LI3|5<^SPp@WrUwz5oe9tv)AdkV*)z4*}Q$iB}@xW$Y literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/chefhathead.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/chefhathead.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..55117186d0c9478400ffdff9d446f0136ff0aba3 GIT binary patch literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!3HFEH|A#nDaPU;cPEB*=VV?2Ip;iG978JR zyuIVdb;v=$<)Xs9`n%yLGbhd7Qr(%r<81k4Z|`c(qxWy0W&$cc@P5^*?YXbt+5K6& zO77=B{g6=kpJjipeowb`t0_@qTEf1BbAsFiHHRvPSqv{3Gm!;uy=As>uPM3z{l#zN zHkOF%roZHX20}ps*ZXqTWqWlCjxOKL6rRt0=O4c?vSw_i@%;S#M??7?myhUySVo9B ZKW=i*|97Zw+T^`p0Z&&ymvv4FO#p0oXJ7yT literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/chefhathead.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/chefhathead.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..127be36b05fe7623ca61f989ab75041d4986e16a GIT binary patch literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!3HFEH|A#nDaPU;cPEB*=VV?2IafVh978JR zyuD+{cgR4%C6K%Df7SX)msQLSMdvnmbj*mTT<^H(*UY-RQb5HA=7xsGU*G!uUi<#g ztCxG{&$$#ITKnXc{Qt5o|3AJzu-eeUO5rTS%LWtXCCrz2Ch&O}BMao&A1MCvd|Ph) zIg9HP|2A;W5Wputceu&I2x{pDz8``f!O&wshL@tTZ}!~vY@ocfLOR lTRB_Q??Q(1Ul3yqdc}3`AL>(7d&CM7@O1TaS?83{1ON+lZ5RLm literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/chefhathead.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/chefhathead.rsi/meta.json new file mode 100644 index 000000000000..8538d10db814 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/chefhathead.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 64 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From 698f094dd90f47df18a56fad9d259bcf211ee04f Mon Sep 17 00:00:00 2001 From: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com> Date: Tue, 30 Apr 2024 20:50:31 -0400 Subject: [PATCH 06/14] Delete Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi directory --- .../equipped-HELMET-hamster.png | Bin 325 -> 0 bytes .../chefhatmaster.rsi/equipped-HELMET.png | Bin 283 -> 0 bytes .../Head/Hats/chefhatmaster.rsi/icon.png | Bin 248 -> 0 bytes .../Hats/chefhatmaster.rsi/inhand-left.png | Bin 276 -> 0 bytes .../Hats/chefhatmaster.rsi/inhand-right.png | Bin 283 -> 0 bytes .../Head/Hats/chefhatmaster.rsi/meta.json | 30 ------------------ 6 files changed, 30 deletions(-) delete mode 100644 Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/equipped-HELMET-hamster.png delete mode 100644 Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/equipped-HELMET.png delete mode 100644 Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/icon.png delete mode 100644 Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/inhand-left.png delete mode 100644 Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/inhand-right.png delete mode 100644 Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/meta.json diff --git a/Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/equipped-HELMET-hamster.png deleted file mode 100644 index 32e8e8de5ee84a8ffc06714dbeda1ed18f26d0f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 325 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!3HFEH|A#nDaPU;cPEB*=VV?2IsZLf978JR zyuD+XcgR76eeqjWGuDQ>Ctp12Ajp# zZnY(5tlfI^d{lPz^FP&{ma|*_JO4X=i}m|4hL=p4Y#!ns#tyq2W-(r3y~Hy?Z$er_ zNuvq#67D6kbq$v%>GwX~QPdmrZxQ3Keer7#$bDu6x UB08(tlKB?=UlIhe}&Fu zi$xpC-aY(pm;^IHQXy91EQTd~_6HXIW}G~K{kkbZr@p7&mQR-Zd^$b$PtWvw4WGA` rJkNfqw%+Eo{<1xq^{ZoGb|uv3`BlE`|I_>B6G+I@)z4*}Q$iB}ka33> diff --git a/Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/equipped-HELMET.png deleted file mode 100644 index 88804bb0d99e622cab73c664cfdda8c1e429d1ef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!3HFEH|A#nDaPU;cPEB*=VV?2IafVh978JR zyuD+X*X$tC5~zLZ@9Vu>%Nu9s>=K!%>&o$&^K+bYYnsX5{r&9!&5zA^z3ZIi^ULog zlIx28<#(q0an?KkyMB>%{V|5p##xN7m`s_kux7EX;J(5WAihF!fnI>IL+paG-;Ddd z|Jjmz`=IHrKe5a@r;8#QwVyEqt%m~nXIKCJi!}dJ|9P@GOWfV}^S`zoxcGCs{R{)3 z?zDzo4rj3$f47d|J^P!VEBD=B|CteH6vG3iI)-vLj+|TmeRDyAp00i_>zopr0HvjG AzyJUM diff --git a/Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/icon.png deleted file mode 100644 index 04c738be84599a98806964f09630a9b94a34a519..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 248 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDaPU;cPEB*=VV?2Ih#CP978f1 z-(Ek+dsu;|HF5hZgPezj2`UopnhCSN98qQ85WQ;4tN)&sM?2>$c=T}qwS0J=caOd3 z-0?ScUMIhvYu{ejQy5ycM=0gyo$Rea>z=JOEoaE?_&se(z5)A-z4b=N@7!oBeEWy( z%<=`-w3L)qS;h7Srl;~PSS92%A?VbWJekX(bFB~TJgB$7n2W=Kfk~i&AzpC7_kFbn vhW_i44+LDzygP$^P4LI3|5<^SPp@WrUwz5oe9tv)AdkV*)z4*}Q$iB}@xW$Y diff --git a/Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/inhand-left.png deleted file mode 100644 index 55117186d0c9478400ffdff9d446f0136ff0aba3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!3HFEH|A#nDaPU;cPEB*=VV?2Ip;iG978JR zyuIVdb;v=$<)Xs9`n%yLGbhd7Qr(%r<81k4Z|`c(qxWy0W&$cc@P5^*?YXbt+5K6& zO77=B{g6=kpJjipeowb`t0_@qTEf1BbAsFiHHRvPSqv{3Gm!;uy=As>uPM3z{l#zN zHkOF%roZHX20}ps*ZXqTWqWlCjxOKL6rRt0=O4c?vSw_i@%;S#M??7?myhUySVo9B ZKW=i*|97Zw+T^`p0Z&&ymvv4FO#p0oXJ7yT diff --git a/Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/inhand-right.png deleted file mode 100644 index 127be36b05fe7623ca61f989ab75041d4986e16a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!3HFEH|A#nDaPU;cPEB*=VV?2IafVh978JR zyuD+{cgR4%C6K%Df7SX)msQLSMdvnmbj*mTT<^H(*UY-RQb5HA=7xsGU*G!uUi<#g ztCxG{&$$#ITKnXc{Qt5o|3AJzu-eeUO5rTS%LWtXCCrz2Ch&O}BMao&A1MCvd|Ph) zIg9HP|2A;W5Wputceu&I2x{pDz8``f!O&wshL@tTZ}!~vY@ocfLOR lTRB_Q??Q(1Ul3yqdc}3`AL>(7d&CM7@O1TaS?83{1ON+lZ5RLm diff --git a/Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/meta.json deleted file mode 100644 index 8538d10db814..000000000000 --- a/Resources/Textures/Clothing/Head/Hats/chefhatmaster.rsi/meta.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", - "size": { - "x": 32, - "y": 64 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-HELMET", - "directions": 4 - }, - { - "name": "equipped-HELMET-hamster", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} From d5d47efec97b1a9101fa912b15ce3b8863c129a4 Mon Sep 17 00:00:00 2001 From: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com> Date: Tue, 30 Apr 2024 20:52:26 -0400 Subject: [PATCH 07/14] (missed one) --- Resources/Prototypes/Loadouts/loadout_groups.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index ce8d4a674820..8f6fd0e5ae9b 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -184,7 +184,7 @@ minLimit: 0 loadouts: - ChefHead - - ChefMasterHead + - ChefHeadHat - type: loadoutGroup id: ChefMask From 24249183ccff169e70df5a3e6aa9cd0d1b439770 Mon Sep 17 00:00:00 2001 From: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com> Date: Tue, 30 Apr 2024 20:54:25 -0400 Subject: [PATCH 08/14] Update hats.yml --- Resources/Prototypes/Entities/Clothing/Head/hats.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 74c9688c76bb..cb1d8fc1e2df 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -257,7 +257,7 @@ - WhitelistChameleon - type: entity - parent: ClothingHeadBase + parent: ClothingHeadHatChef id: ClothingHeadHatHeadChef name: head chef's hat description: "It's a hat used by chefs who have truly mastered their craft. This one is very tall." From 8986255033a87e66d3b29193d772a1cac45d98de Mon Sep 17 00:00:00 2001 From: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com> Date: Tue, 30 Apr 2024 20:57:36 -0400 Subject: [PATCH 09/14] Time requirement now 24 hours --- Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml index 6fd41e702ec1..43df2f46b6bf 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml @@ -5,7 +5,7 @@ requirement: !type:RoleTimeRequirement role: JobChef - time: 36000 #10 hrs + time: 86400 #24 hrs # Head - type: loadout @@ -85,4 +85,4 @@ - type: startingGear id: ChefWintercoat equipment: - outerClothing: ClothingOuterWinterChef \ No newline at end of file + outerClothing: ClothingOuterWinterChef From a54090b3b92d2fca51a3987c0ef1ed1f31ea6d1e Mon Sep 17 00:00:00 2001 From: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com> Date: Tue, 30 Apr 2024 21:09:57 -0400 Subject: [PATCH 10/14] Revert back to 10 hours --- Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml index 43df2f46b6bf..927ad16f62a6 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml @@ -5,7 +5,7 @@ requirement: !type:RoleTimeRequirement role: JobChef - time: 86400 #24 hrs + time: 36000 #10 hrs # Head - type: loadout From e7bf632751febb7a172879864f5ce3b306cbdd03 Mon Sep 17 00:00:00 2001 From: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com> Date: Wed, 1 May 2024 07:02:57 -0400 Subject: [PATCH 11/14] (hopefully) fixed YAML Linter (another victim of my terrible workflow for this project, error was introduced when I manually copied the text into github from a working local copy) --- Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml index 927ad16f62a6..81d15b93d1d9 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml @@ -20,15 +20,14 @@ - type: loadout id: ChefHeadHat equipment: ChefHeadHat + effects: + - !type:GroupLoadoutEffect + proto: HeadChef - type: startingGear id: ChefHeadHat equipment: head: ClothingHeadHatHeadChef - effects: - - !type:GroupLoadoutEffect - proto: HeadChef - # Mask - type: loadout From 4a83adc1bb84bcd8505c776533bebf7aca7f75a1 Mon Sep 17 00:00:00 2001 From: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com> Date: Sat, 4 May 2024 12:49:23 -0400 Subject: [PATCH 12/14] Update Textures, Add Textures for Sous Hat --- .../Hats/chefhathead.rsi/equipped-HELMET.png | Bin 283 -> 453 bytes .../Head/Hats/chefhathead.rsi/icon.png | Bin 248 -> 291 bytes .../Head/Hats/chefhathead.rsi/inhand-left.png | Bin 276 -> 282 bytes .../Hats/chefhathead.rsi/inhand-right.png | Bin 283 -> 286 bytes .../Head/Hats/chefhathead.rsi/meta.json | 4 --- .../equipped-HELMET-hamster.png | Bin 0 -> 325 bytes .../Hats/chefhatsous.rsi/equipped-HELMET.png | Bin 0 -> 283 bytes .../Head/Hats/chefhatsous.rsi/icon.png | Bin 0 -> 244 bytes .../Head/Hats/chefhatsous.rsi/inhand-left.png | Bin 0 -> 276 bytes .../Hats/chefhatsous.rsi/inhand-right.png | Bin 0 -> 283 bytes .../Head/Hats/chefhatsous.rsi/meta.json | 30 ++++++++++++++++++ 11 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 Resources/Textures/Clothing/Head/Hats/chefhatsous.rsi/equipped-HELMET-hamster.png create mode 100644 Resources/Textures/Clothing/Head/Hats/chefhatsous.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hats/chefhatsous.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Hats/chefhatsous.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Hats/chefhatsous.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Hats/chefhatsous.rsi/meta.json diff --git a/Resources/Textures/Clothing/Head/Hats/chefhathead.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/chefhathead.rsi/equipped-HELMET.png index 88804bb0d99e622cab73c664cfdda8c1e429d1ef..137f8c11f6f09667d92996ab2047b0a09f70ea3c 100644 GIT binary patch literal 453 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!3HFEH|A#nDaPU;cPEB*=VV?2+4Y_-jv*Cu z-rhNwdDuaOAy7D|<5ZaTDz{fIJC6x4-OKs%Cgqt@O~n7ih?-6R-hNYfy=&g{%6Y%{ z-M777YAgSDonYGe`q{cavP2xXGq@J8ny_AAn#GjC=*zgJVHrb|LokEx0?h`o3;3iD zyf~N|`EFjgadw?K8Kx+=_dWjc?Q_0y@xR|XovUY>)@vNtmK)sG@ASO>>%V_fty%2O z&)?|0K;DtCQ*gV~_>cI^^qcY@g4^rsnMw0#S`@=yqpuqJmCR|!=54ZnASqFrRe#{b e!u?z9A29z^m=;`gBGVZdFAScpelF{r5}E+rL#8wU delta 243 zcmX@gJez5PK|RA&PZ!6KiaBrZ80IxQNVEiMpZfcHFW2(M**UvJChEF!eCGTd=iHiR z@^^nf`+xIeGhXjHXZif{dx_+_qJR0F>3*E`&i}4oWL-Eu zKTkGiiM#uL{@1nx7k_TIpJ4#hp4PC-;Vd@u@76KAXMgi^<-YstKQqFNVtBw*$58IZ Uk#ozxZ!SpC)78&qol`;+0QqKVKmY&$ diff --git a/Resources/Textures/Clothing/Head/Hats/chefhathead.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/chefhathead.rsi/icon.png index 04c738be84599a98806964f09630a9b94a34a519..97136713105887653702dc28df96b9d21bbc5188 100644 GIT binary patch delta 250 zcmVNMSq(fgr&EbrAN^t$#J*^OO7$Sc2iQC zh|VM$)AYX;iC^YHz>EMPgb+dqA^*Ugb;E$FaK#tbStSyi2wiq07*qoM6N<$f+TBk AN&o-= delta 207 zcmV;=05Jcf0{8)tF@Lg2L_t(&f$i794Z|P|g<-eqFl^y*U?doaDPWuQ#3cu?TdK6` z|4BK;iJu@yjtBq%0Pyc_-Uo8d$LxMe$@R{Mw{eVdReHP|0uX=zUlE}9zI`w;Pp)IYP}OPOmd71Vf__P7srr_IdAV6@--U>usDc3RkXPs|IqY<@bXqY6&daBna8e1t`=qO z&7Z{p1V8+<*M7hEd)K=5&0DX%pJD$xwD6^e$OOI#%Nj}=OjwsNFVR$xRam>Gp>iJo z^Sht#e}W15GQMQU?ALz~TljKY?!}+RUR)8=RIT{4K!!qqLC@c~M(uKLn}2&7m@YA1 zLNRr!&Fs}%?yDCZ&1*bf&&cJ$?h))@uPM3z{l#zN zHkOF%roZHX20}ps*ZXqTWqWlCjxOKL6rRt0=O4c?vSw_i@%;S#M??7?myhUySVo9B ZKW=i*|97Zw+T^`p0Z&&ymvv4FO#p0oXJ7yT diff --git a/Resources/Textures/Clothing/Head/Hats/chefhathead.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/chefhathead.rsi/inhand-right.png index 127be36b05fe7623ca61f989ab75041d4986e16a..c164d197ab1982262c5703b88c6cf49f425a9c1d 100644 GIT binary patch delta 245 zcmbQuG>>V5Vf_tH7srr_IdAVcay1(;xLgdV66l}1xw%?HtsZb+n=8BOCLpM_ZNACU$)FkV`L6k)q4C$Ze!thgKlJM5-uZJb#fR2Dc_sh9Y|Hgtbg)u5%kZ+ngn0?` zC7ua<9>&N5dG-g2zdYZTTYt{t`ow<^8BTASb2VGYu-YDIG871GDqn7YIhxu2_U_B` zU#@MuCgUS<0H=W<8>Hu*uh0Hg&KC8%kfHn+#2ABKaozie`V`e3v4R9VUHx3vIVCg! E06PC>Z~y=R diff --git a/Resources/Textures/Clothing/Head/Hats/chefhathead.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/chefhathead.rsi/meta.json index 8538d10db814..d3f0a856a3ab 100644 --- a/Resources/Textures/Clothing/Head/Hats/chefhathead.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/chefhathead.rsi/meta.json @@ -14,10 +14,6 @@ "name": "equipped-HELMET", "directions": 4 }, - { - "name": "equipped-HELMET-hamster", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hats/chefhatsous.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/chefhatsous.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000000000000000000000000000000000..32e8e8de5ee84a8ffc06714dbeda1ed18f26d0f7 GIT binary patch literal 325 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!3HFEH|A#nDaPU;cPEB*=VV?2IsZLf978JR zyuD+XcgR76eeqjWGuDQ>Ctp12Ajp# zZnY(5tlfI^d{lPz^FP&{ma|*_JO4X=i}m|4hL=p4Y#!ns#tyq2W-(r3y~Hy?Z$er_ zNuvq#67D6kbq$v%>GwX~QPdmrZxQ3Keer7#$bDu6x UB08(tlKB?=UlIhe}&Fu zi$xpC-aY(pm;^IHQXy91EQTd~_6HXIW}G~K{kkbZr@p7&mQR-Zd^$b$PtWvw4WGA` rJkNfqw%+Eo{<1xq^{ZoGb|uv3`BlE`|I_>B6G+I@)z4*}Q$iB}ka33> literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/chefhatsous.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/chefhatsous.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..88804bb0d99e622cab73c664cfdda8c1e429d1ef GIT binary patch literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!3HFEH|A#nDaPU;cPEB*=VV?2IafVh978JR zyuD+X*X$tC5~zLZ@9Vu>%Nu9s>=K!%>&o$&^K+bYYnsX5{r&9!&5zA^z3ZIi^ULog zlIx28<#(q0an?KkyMB>%{V|5p##xN7m`s_kux7EX;J(5WAihF!fnI>IL+paG-;Ddd z|Jjmz`=IHrKe5a@r;8#QwVyEqt%m~nXIKCJi!}dJ|9P@GOWfV}^S`zoxcGCs{R{)3 z?zDzo4rj3$f47d|J^P!VEBD=B|CteH6vG3iI)-vLj+|TmeRDyAp00i_>zopr0HvjG AzyJUM literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/chefhatsous.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/chefhatsous.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..fe1a6e721fc813aa934a8130a606f60e54334351 GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDaPU;cPEB*=VV?2IqN)K978f1 z-(EY&dsu;|HF5hZgPezj2`UopnhCSN1Qfnxd^3$J^q0Nna*L0`oPI7qEesDf%>Ldq z=d-Ex{Gg({pC9JRB*#pRo6izy_C0Ftl+~5lXJrpaJ=&-GRQwEM)%*Qt49(>ZTa@i% zeij>$Eh;D&I(OZ%6`PIN1420!Jv39J%(uNrKi?EEu^ qH$zIJ%-JS>Ew1^~&H}X8;vJ`J=Ov}aM@w&joZ;!}=d#Wzp$P!C-d`~Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/chefhatsous.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/chefhatsous.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..55117186d0c9478400ffdff9d446f0136ff0aba3 GIT binary patch literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!3HFEH|A#nDaPU;cPEB*=VV?2Ip;iG978JR zyuIVdb;v=$<)Xs9`n%yLGbhd7Qr(%r<81k4Z|`c(qxWy0W&$cc@P5^*?YXbt+5K6& zO77=B{g6=kpJjipeowb`t0_@qTEf1BbAsFiHHRvPSqv{3Gm!;uy=As>uPM3z{l#zN zHkOF%roZHX20}ps*ZXqTWqWlCjxOKL6rRt0=O4c?vSw_i@%;S#M??7?myhUySVo9B ZKW=i*|97Zw+T^`p0Z&&ymvv4FO#p0oXJ7yT literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/chefhatsous.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/chefhatsous.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..127be36b05fe7623ca61f989ab75041d4986e16a GIT binary patch literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!3HFEH|A#nDaPU;cPEB*=VV?2IafVh978JR zyuD+{cgR4%C6K%Df7SX)msQLSMdvnmbj*mTT<^H(*UY-RQb5HA=7xsGU*G!uUi<#g ztCxG{&$$#ITKnXc{Qt5o|3AJzu-eeUO5rTS%LWtXCCrz2Ch&O}BMao&A1MCvd|Ph) zIg9HP|2A;W5Wputceu&I2x{pDz8``f!O&wshL@tTZ}!~vY@ocfLOR lTRB_Q??Q(1Ul3yqdc}3`AL>(7d&CM7@O1TaS?83{1ON+lZ5RLm literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/chefhatsous.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/chefhatsous.rsi/meta.json new file mode 100644 index 000000000000..8538d10db814 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/chefhatsous.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 64 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From 32255ccda4939130f9f530d6278a150c69e8ed6c Mon Sep 17 00:00:00 2001 From: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com> Date: Sat, 4 May 2024 12:50:47 -0400 Subject: [PATCH 13/14] Delete Resources/Textures/Clothing/Head/Hats/chefhathead.rsi/equipped-HELMET-hamster.png ChefHatHead is no longer HamsterWearable (It broke the textures) --- .../chefhathead.rsi/equipped-HELMET-hamster.png | Bin 325 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Resources/Textures/Clothing/Head/Hats/chefhathead.rsi/equipped-HELMET-hamster.png diff --git a/Resources/Textures/Clothing/Head/Hats/chefhathead.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/chefhathead.rsi/equipped-HELMET-hamster.png deleted file mode 100644 index 32e8e8de5ee84a8ffc06714dbeda1ed18f26d0f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 325 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!3HFEH|A#nDaPU;cPEB*=VV?2IsZLf978JR zyuD+XcgR76eeqjWGuDQ>Ctp12Ajp# zZnY(5tlfI^d{lPz^FP&{ma|*_JO4X=i}m|4hL=p4Y#!ns#tyq2W-(r3y~Hy?Z$er_ zNuvq#67D6kbq$v%>GwX~QPdmrZxQ3Keer7#$bDu6x UB08(tlKB?=UlIhe}&Fu zi$xpC-aY(pm;^IHQXy91EQTd~_6HXIW}G~K{kkbZr@p7&mQR-Zd^$b$PtWvw4WGA` rJkNfqw%+Eo{<1xq^{ZoGb|uv3`BlE`|I_>B6G+I@)z4*}Q$iB}ka33> From b92ec279567175037798df565f80da6461f86249 Mon Sep 17 00:00:00 2001 From: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com> Date: Sat, 4 May 2024 12:54:24 -0400 Subject: [PATCH 14/14] yml changes --- .../Entities/Clothing/Head/hats.yml | 26 +++++++++++++++++-- .../Loadouts/Jobs/Civilian/chef.yml | 23 +++++++++++++++- .../Prototypes/Loadouts/loadout_groups.yml | 1 + 3 files changed, 47 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index cb1d8fc1e2df..e96a4dacef9b 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -256,19 +256,41 @@ - HamsterWearable - WhitelistChameleon +- type: entity + parent: ClothingHeadHatChef + id: ClothingHeadHatSousChef + name: sous-chef's hat + description: "It's a hat used by chefs on the path to mastery. This one is quite tall." + components: + - type: Sprite + sprite: Clothing/Head/Hats/chefhatsous.rsi + - type: Clothing + sprite: Clothing/Head/Hats/chefhatsous.rsi + - type: Storage + grid: + - 0,0,0,3 + - type: entity parent: ClothingHeadHatChef id: ClothingHeadHatHeadChef name: head chef's hat - description: "It's a hat used by chefs who have truly mastered their craft. This one is very tall." + description: "It's a hat used by chefs who have truly mastered their craft. This one is shockingly tall." components: - type: Sprite sprite: Clothing/Head/Hats/chefhathead.rsi - type: Clothing sprite: Clothing/Head/Hats/chefhathead.rsi + clothingVisuals: + head: + - state: equipped-HELMET + offset: "0, 1.34375" - type: Storage grid: - - 0,0,0,3 + - 0,0,0,9 + - type: Tag + tags: + - ClothMade + - WhitelistChameleon - type: entity parent: ClothingHeadBase diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml index 81d15b93d1d9..d8714c1350e7 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml @@ -1,5 +1,5 @@ - type: loadoutEffectGroup - id: HeadChef + id: SousChef effects: - !type:JobRequirementLoadoutEffect requirement: @@ -7,6 +7,15 @@ role: JobChef time: 36000 #10 hrs +- type: loadoutEffectGroup + id: HeadChef + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobChef + time: 108000 #30 hrs + # Head - type: loadout id: ChefHead @@ -17,6 +26,18 @@ equipment: head: ClothingHeadHatChef +- type: loadout + id: ChefSousHat + equipment: ChefSousHat + effects: + - !type:GroupLoadoutEffect + proto: SousChef + +- type: startingGear + id: ChefSousHat + equipment: + head: ClothingHeadHatSousChef + - type: loadout id: ChefHeadHat equipment: ChefHeadHat diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 8f6fd0e5ae9b..5a345b4fe778 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -184,6 +184,7 @@ minLimit: 0 loadouts: - ChefHead + - ChefSousHat - ChefHeadHat - type: loadoutGroup