From 6cbaf06cc5861da877cbd7901fdbfb97d8f837e7 Mon Sep 17 00:00:00 2001 From: Radezolid Date: Thu, 2 Jan 2025 18:48:32 -0300 Subject: [PATCH 1/8] Add belt + sprites --- .../_DV/Entities/Clothing/Belt/belts.yml | 20 ++++++++++++++ .../Belt/secretary.rsi/equipped-BELT.png | Bin 0 -> 411 bytes .../_DV/Clothing/Belt/secretary.rsi/icon.png | Bin 0 -> 472 bytes .../Belt/secretary.rsi/inhand-left.png | Bin 0 -> 409 bytes .../Belt/secretary.rsi/inhand-right.png | Bin 0 -> 420 bytes .../_DV/Clothing/Belt/secretary.rsi/meta.json | 26 ++++++++++++++++++ 6 files changed, 46 insertions(+) create mode 100644 Resources/Textures/_DV/Clothing/Belt/secretary.rsi/equipped-BELT.png create mode 100644 Resources/Textures/_DV/Clothing/Belt/secretary.rsi/icon.png create mode 100644 Resources/Textures/_DV/Clothing/Belt/secretary.rsi/inhand-left.png create mode 100644 Resources/Textures/_DV/Clothing/Belt/secretary.rsi/inhand-right.png create mode 100644 Resources/Textures/_DV/Clothing/Belt/secretary.rsi/meta.json diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml index 49aef663c67..8287a63e059 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml @@ -84,3 +84,23 @@ sprite: _DV/Clothing/Belt/foamsheath.rsi - type: Clothing sprite: _DV/Clothing/Belt/foamsheath.rsi + +- type: entity + parent: ClothingBeltStorageBase + id: ClothingBeltSecretary + name: secretary belt + description: For all your tactical paperwork or drinks needs. + components: + - type: Sprite + sprite: _DV/Clothing/Belt/secretary.rsi + - type: Clothing + sprite: _DV/Clothing/Belt/secretary.rsi + - type: Storage + whitelist: + tags: + - Folder + - Document + - Flashlight + - Radio + components: + - FitsInDispenser diff --git a/Resources/Textures/_DV/Clothing/Belt/secretary.rsi/equipped-BELT.png b/Resources/Textures/_DV/Clothing/Belt/secretary.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..25fbb264aeb7336e358992560e854921861c8a4a GIT binary patch literal 411 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU`+CKaSW-L^Y)fucC&*B`-lDR zx}C1GE-Wl~IYV_vi`f4E>K!GVkus|%EHp7uXkDTwXCRbsQekZUxM}5ewnr0 zhXXdHT%D19`nVc<>f{4X^}V|<@IBkk_hri)d5h(qVR`$a-oIN`?X&t{gRfRE7kku6 zHQRdo2F-hN*G)c4+RRjBjXF91z6#LRivjl-PaJElx!tsA2{6zZJYD@<);T3K0RU{o BzTN-; literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Clothing/Belt/secretary.rsi/icon.png b/Resources/Textures/_DV/Clothing/Belt/secretary.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..dfdda3aa3c76d237adca880f57e496619c5b958a GIT binary patch literal 472 zcmV;}0Vn>6P)NklC|-yw=Nf*?3rQ%dPNqQ37R=}IY2p0%sQzM77@3Gs5jXIYvwJ@oRf zVLT=0oC;GrfKo~aw=peSu-aHFtk_qClgSRUR_u1=XDb63AprR)T$dwf9;0sZ^8jY}+LwY&dN^FBJz%Qj((Cnd zu6)jJ&3Njb)HWzAsqgzDj9gl_V6oOXRyJIYMILI@O&E0(9Ba=T4u|>oCf#eD9ROfH zpNlYZku#4?3X8SQMK>vor!M2E%VM1kxwpz5o4f5J0Ab|*?i~n%04b#a2)QY|N~RSp zTk!O7pSP(FDu>WK$tKA6bpxf8KDee-zk*QFf^+cQtd4nu1`Qhg348zxlD6Le3cpYQ O000028>2Qj1I~z`3CIz`N~I9ujv>Xx$wzYfS}MG3x=Hj!pswqp>)*I#*O{ zdVnUY^Dko91GMBlpt#m#b_BfFiItW7y0reLoe%&30000006-Pfq0JQ6iuz!r*R>mB zSTLCjXe!SEa=YzP=4l*y-AJBZv(eFX7>AelQ>7hfd;)$Oe0(0V-&x{9|Gs+s#wXxf z1$ZCHVw3IuV&kJ(Qhg@Zis9%b8Z$`M1Xz8?bE|(n0<**g@BjA0i1Lk-_k$`Le`j6l z0U{!k{yOZBL7v}EQTax=RpXoBE%NHyA6xYf1~kDJH;ZoD2`HX800000NkvXXu0mjf D-`KVp literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Clothing/Belt/secretary.rsi/inhand-right.png b/Resources/Textures/_DV/Clothing/Belt/secretary.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..9edc1c3004447f4adb084fa71e7543111f02bf10 GIT binary patch literal 420 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9fS(aSW-L^Y+&M>_ZMB>>u9W zo$AEBG@0GJP{ShB%0hh3?l1d!Ey|0yQzqp7WbR6E*crp_Y4GpBoXYhsKk5!B%Gng1 z-);Uw&cOu^?w&bjRNg(DDEicL zWRuv9yr=6zl(%_>IBa3d2wKUQdo3w5mU*i7hW%<2S=K)Ghr7b1)=c(Pd1wA2)3C}t z)Bji7?9w-oz4hU5uoT0On&QO0oF11h&B<={Hgh*|QGf8X^7`ue>G#%{FU)KFTD$nU zi+VyR!{?msuT^w?O?MQmR$oxedm$(GfBOp-8{3RMZr0~mKL*Zx!Lp|7*=D!YeJ)0v z7flcBY`A%&4WwbOswq#Y=cH+mZth#fwq@?ESJjLvN`Dyt1(cZD@deBThCYL*tDnm{ Hr-UW|iKVu7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Clothing/Belt/secretary.rsi/meta.json b/Resources/Textures/_DV/Clothing/Belt/secretary.rsi/meta.json new file mode 100644 index 00000000000..616632d7fad --- /dev/null +++ b/Resources/Textures/_DV/Clothing/Belt/secretary.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Modified version of ceremonial belt (Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62) by Radezolid.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From 9cc560a41161751ceb09d919a52aabd325d58ccb Mon Sep 17 00:00:00 2001 From: Radezolid Date: Thu, 2 Jan 2025 19:32:21 -0300 Subject: [PATCH 2/8] Added filled version --- .../_DV/Catalog/Fills/Items/Belts/belts.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Items/Belts/belts.yml b/Resources/Prototypes/_DV/Catalog/Fills/Items/Belts/belts.yml index cbdee1d05fa..f67795a4ef8 100644 --- a/Resources/Prototypes/_DV/Catalog/Fills/Items/Belts/belts.yml +++ b/Resources/Prototypes/_DV/Catalog/Fills/Items/Belts/belts.yml @@ -42,3 +42,14 @@ containers: item: - RealFoamSabre + +- type: entity + parent: ClothingBeltSecretary + id: ClothingBeltSecretaryFilled + suffix: Filled + components: + - type: StorageFill + contents: + - id: BoxFolderBase + - id: BoxFolderBlack + - id: DrinkVacuumFlask From 9ce95ecf7e2daed16372eb97439f741fe41be314 Mon Sep 17 00:00:00 2001 From: Radezolid Date: Thu, 2 Jan 2025 19:35:54 -0300 Subject: [PATCH 3/8] Renamed --- .../Prototypes/_DV/Catalog/Fills/Items/Belts/belts.yml | 4 ++-- Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Items/Belts/belts.yml b/Resources/Prototypes/_DV/Catalog/Fills/Items/Belts/belts.yml index f67795a4ef8..5c574d97bdb 100644 --- a/Resources/Prototypes/_DV/Catalog/Fills/Items/Belts/belts.yml +++ b/Resources/Prototypes/_DV/Catalog/Fills/Items/Belts/belts.yml @@ -44,8 +44,8 @@ - RealFoamSabre - type: entity - parent: ClothingBeltSecretary - id: ClothingBeltSecretaryFilled + parent: ClothingBeltPaperwork + id: ClothingBeltPaperworkFilled suffix: Filled components: - type: StorageFill diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml index 8287a63e059..d5b8c912ed1 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml @@ -87,9 +87,9 @@ - type: entity parent: ClothingBeltStorageBase - id: ClothingBeltSecretary - name: secretary belt - description: For all your tactical paperwork or drinks needs. + id: ClothingBeltPaperwork + name: paperwork belt + description: For all your tactical paperwork needs on the field. components: - type: Sprite sprite: _DV/Clothing/Belt/secretary.rsi From 5b2a569499984007d2407ae9b79ea219616a2647 Mon Sep 17 00:00:00 2001 From: Radezolid Date: Thu, 2 Jan 2025 19:42:04 -0300 Subject: [PATCH 4/8] Add a clipboard + give the belt to the administrative assistant --- Resources/Prototypes/_DV/Catalog/Fills/Items/Belts/belts.yml | 1 + .../_DV/Roles/Jobs/Command/administrative_assistant.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Items/Belts/belts.yml b/Resources/Prototypes/_DV/Catalog/Fills/Items/Belts/belts.yml index 5c574d97bdb..145ef066848 100644 --- a/Resources/Prototypes/_DV/Catalog/Fills/Items/Belts/belts.yml +++ b/Resources/Prototypes/_DV/Catalog/Fills/Items/Belts/belts.yml @@ -52,4 +52,5 @@ contents: - id: BoxFolderBase - id: BoxFolderBlack + - id: BoxFolderClipboard - id: DrinkVacuumFlask diff --git a/Resources/Prototypes/_DV/Roles/Jobs/Command/administrative_assistant.yml b/Resources/Prototypes/_DV/Roles/Jobs/Command/administrative_assistant.yml index c274906aea1..f92e3094bf7 100644 --- a/Resources/Prototypes/_DV/Roles/Jobs/Command/administrative_assistant.yml +++ b/Resources/Prototypes/_DV/Roles/Jobs/Command/administrative_assistant.yml @@ -24,7 +24,7 @@ id: AdminAssistantGear equipment: eyes: ClothingEyesHudCommand - belt: BoxFolderClipboard + belt: ClothingBeltPaperworkFilled id: AdminAssistantPDA pocket1: RubberStampAdminAssistant pocket2: AccessConfigurator # To assist with secure closets access configurations / airlock configs should a head need it. From ec531189804b0b6487f232ed48ac915655b5edd7 Mon Sep 17 00:00:00 2001 From: Radezolid Date: Thu, 2 Jan 2025 19:54:19 -0300 Subject: [PATCH 5/8] Added to the uniform printer --- .../Prototypes/Entities/Structures/Machines/lathe.yml | 1 + Resources/Prototypes/_DV/Recipes/Lathes/clothing.yml | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 7d8290dc6a2..9558fcd04d6 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -1194,6 +1194,7 @@ - ClothingUniformJumpskirtWardenBlue # DeltaV - alternate sec uniforms - ClothingUniformJumpsuitWardenGrey # DeltaV - alternate sec uniforms - ClothingUniformJumpskirtWardenGrey # DeltaV - alternate sec uniforms + - ClothingBeltPaperwork # DeltaV - Added the paperwork belt - ClothingHeadHatParamedicsoft # Winter outfits - ClothingOuterWinterCap diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/clothing.yml b/Resources/Prototypes/_DV/Recipes/Lathes/clothing.yml index ddb590769b3..ccc4d125e35 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/clothing.yml @@ -177,3 +177,12 @@ parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpskirtHoPFormal result: ClothingUniformJumpskirtHoPFormal + +# Utilty + +- type: latheRecipe + id: ClothingBeltPaperwork + result: ClothingBeltPaperwork + materials: + Cloth: 200 + Durathread: 100 From a810ae30ddf63bc0c1d3a43f89cbf8bde8b760e5 Mon Sep 17 00:00:00 2001 From: Radezolid Date: Thu, 2 Jan 2025 21:08:41 -0300 Subject: [PATCH 6/8] Rename the RSI + 3 pixels fix --- .../_DV/Entities/Clothing/Belt/belts.yml | 4 ++-- .../Clothing/Belt/paperwork.rsi/equipped-BELT.png | Bin 0 -> 416 bytes .../{secretary.rsi => paperwork.rsi}/icon.png | Bin .../inhand-left.png | Bin .../inhand-right.png | Bin .../{secretary.rsi => paperwork.rsi}/meta.json | 0 6 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/_DV/Clothing/Belt/paperwork.rsi/equipped-BELT.png rename Resources/Textures/_DV/Clothing/Belt/{secretary.rsi => paperwork.rsi}/icon.png (100%) rename Resources/Textures/_DV/Clothing/Belt/{secretary.rsi => paperwork.rsi}/inhand-left.png (100%) rename Resources/Textures/_DV/Clothing/Belt/{secretary.rsi => paperwork.rsi}/inhand-right.png (100%) rename Resources/Textures/_DV/Clothing/Belt/{secretary.rsi => paperwork.rsi}/meta.json (100%) diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml index d5b8c912ed1..82080c9c11f 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml @@ -92,9 +92,9 @@ description: For all your tactical paperwork needs on the field. components: - type: Sprite - sprite: _DV/Clothing/Belt/secretary.rsi + sprite: _DV/Clothing/Belt/paperwork.rsi - type: Clothing - sprite: _DV/Clothing/Belt/secretary.rsi + sprite: _DV/Clothing/Belt/paperwork.rsi - type: Storage whitelist: tags: diff --git a/Resources/Textures/_DV/Clothing/Belt/paperwork.rsi/equipped-BELT.png b/Resources/Textures/_DV/Clothing/Belt/paperwork.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..6ea9930c846375d1a570877c94662ced546a3f69 GIT binary patch literal 416 zcmV;R0bl-!P);v1ql>td7XSZ0K$I@x;%EX6rKLhBNW2bdFp06{Oyc7AGu<8G zy~pD+-ID+S00000a9f{@LU5&*T_2c3I0000< KMNUMnLSTYb>cZau literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Clothing/Belt/secretary.rsi/icon.png b/Resources/Textures/_DV/Clothing/Belt/paperwork.rsi/icon.png similarity index 100% rename from Resources/Textures/_DV/Clothing/Belt/secretary.rsi/icon.png rename to Resources/Textures/_DV/Clothing/Belt/paperwork.rsi/icon.png diff --git a/Resources/Textures/_DV/Clothing/Belt/secretary.rsi/inhand-left.png b/Resources/Textures/_DV/Clothing/Belt/paperwork.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_DV/Clothing/Belt/secretary.rsi/inhand-left.png rename to Resources/Textures/_DV/Clothing/Belt/paperwork.rsi/inhand-left.png diff --git a/Resources/Textures/_DV/Clothing/Belt/secretary.rsi/inhand-right.png b/Resources/Textures/_DV/Clothing/Belt/paperwork.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_DV/Clothing/Belt/secretary.rsi/inhand-right.png rename to Resources/Textures/_DV/Clothing/Belt/paperwork.rsi/inhand-right.png diff --git a/Resources/Textures/_DV/Clothing/Belt/secretary.rsi/meta.json b/Resources/Textures/_DV/Clothing/Belt/paperwork.rsi/meta.json similarity index 100% rename from Resources/Textures/_DV/Clothing/Belt/secretary.rsi/meta.json rename to Resources/Textures/_DV/Clothing/Belt/paperwork.rsi/meta.json From ddbb5518e1618ae962f2cd1a156e416d14547be4 Mon Sep 17 00:00:00 2001 From: Radezolid Date: Thu, 2 Jan 2025 21:21:25 -0300 Subject: [PATCH 7/8] Shoo --- .../Clothing/Belt/secretary.rsi/equipped-BELT.png | Bin 411 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Resources/Textures/_DV/Clothing/Belt/secretary.rsi/equipped-BELT.png diff --git a/Resources/Textures/_DV/Clothing/Belt/secretary.rsi/equipped-BELT.png b/Resources/Textures/_DV/Clothing/Belt/secretary.rsi/equipped-BELT.png deleted file mode 100644 index 25fbb264aeb7336e358992560e854921861c8a4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 411 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU`+CKaSW-L^Y)fucC&*B`-lDR zx}C1GE-Wl~IYV_vi`f4E>K!GVkus|%EHp7uXkDTwXCRbsQekZUxM}5ewnr0 zhXXdHT%D19`nVc<>f{4X^}V|<@IBkk_hri)d5h(qVR`$a-oIN`?X&t{gRfRE7kku6 zHQRdo2F-hN*G)c4+RRjBjXF91z6#LRivjl-PaJElx!tsA2{6zZJYD@<);T3K0RU{o BzTN-; From 53fc3d64106ea81407c80af607907957407def27 Mon Sep 17 00:00:00 2001 From: Radezolid Date: Thu, 2 Jan 2025 22:54:43 -0300 Subject: [PATCH 8/8] Indentation --- .../Prototypes/_DV/Catalog/Fills/Items/Belts/belts.yml | 8 ++++---- .../Prototypes/_DV/Entities/Clothing/Belt/belts.yml | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Items/Belts/belts.yml b/Resources/Prototypes/_DV/Catalog/Fills/Items/Belts/belts.yml index 145ef066848..08e163cab9d 100644 --- a/Resources/Prototypes/_DV/Catalog/Fills/Items/Belts/belts.yml +++ b/Resources/Prototypes/_DV/Catalog/Fills/Items/Belts/belts.yml @@ -50,7 +50,7 @@ components: - type: StorageFill contents: - - id: BoxFolderBase - - id: BoxFolderBlack - - id: BoxFolderClipboard - - id: DrinkVacuumFlask + - id: BoxFolderBase + - id: BoxFolderBlack + - id: BoxFolderClipboard + - id: DrinkVacuumFlask diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml index 82080c9c11f..82e8c4b38b2 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/Belt/belts.yml @@ -98,9 +98,9 @@ - type: Storage whitelist: tags: - - Folder - - Document - - Flashlight - - Radio + - Folder + - Document + - Flashlight + - Radio components: - - FitsInDispenser + - FitsInDispenser