From ee35265eb6847676eb44ab03c86df7d94b7fd29e Mon Sep 17 00:00:00 2001 From: lleftTheDragon <125433431+lleftTheDragon@users.noreply.github.com> Date: Fri, 15 Dec 2023 01:13:01 -0600 Subject: [PATCH 1/7] CLAOK TO BRRR --- .../Catalog/Fills/Crates/salvage.yml | 2 ++ .../Catalog/Fills/Lockers/cargo.yml | 4 ++++ .../Entities/Clothing/Neck/cloaks.yml | 9 +++++++++ .../Cloaks/salvage.rsi/equipped-NECK3.png | Bin 0 -> 1362 bytes .../Clothing/Neck/Cloaks/salvage.rsi/icon.png | Bin 0 -> 642 bytes .../Neck/Cloaks/salvage.rsi/meta.json | 18 ++++++++++++++++++ 6 files changed, 33 insertions(+) create mode 100644 Resources/Textures/Clothing/Neck/Cloaks/salvage.rsi/equipped-NECK3.png create mode 100644 Resources/Textures/Clothing/Neck/Cloaks/salvage.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Neck/Cloaks/salvage.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml index feae7a8942f..a7092797623 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml @@ -21,6 +21,8 @@ - id: ClothingBeltUtility - id: OreBag - id: ClothingBeltSalvageWebbing + - id: ClothingNeckSalvager + prob: 0.8 - type: entity id: CrateSalvageAssortedGoodies diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml index 293e746112a..f6c8a871f25 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml @@ -24,6 +24,8 @@ prob: 0.3 - id: Flare prob: 0.3 + - id: ClothingNeckSalvager + prob: 0.2 - type: entity id: LockerSalvageSpecialistFilled @@ -46,3 +48,5 @@ prob: 0.3 - id: Flare prob: 0.3 + - id: ClothingNeckSalvager + prob: 0.2 diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml index d5ee9c1f5ae..b03ef793548 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml @@ -115,6 +115,15 @@ - type: Sprite sprite: Clothing/Neck/Cloaks/trans.rsi +- type: entity + parent: ClothingNeckBase + id: ClothingNeckSalvager + name: salvager's cloak + description: Worn by dangerous people who've deconstructed stations with ease. + components: + - type: Sprite + sprite: Clothing/Neck/Cloaks/salvage.rsi + - type: entity parent: ClothingNeckBase id: ClothingNeckCloakGoliathCloak diff --git a/Resources/Textures/Clothing/Neck/Cloaks/salvage.rsi/equipped-NECK3.png b/Resources/Textures/Clothing/Neck/Cloaks/salvage.rsi/equipped-NECK3.png new file mode 100644 index 0000000000000000000000000000000000000000..7ed258232562ad9d19b71fdf988186eaa017b2d7 GIT binary patch literal 1362 zcmV-Y1+DstP)Px)3`s;mRCr$PT1`k5Q53#H1ts(YLJ&lYii(o5MTkFSgtf3BB!X;FDM3^S5p4_< zh1^60lF>%1MG6rTl#7z6@CRwp4;B^GB7!Io`T+|nc<~LK;dI}fx#x~EPakjY=HZ(& z_dDl1-#PP~dx}(nuc88vU!?@33Mg;}(h?|e0i;dPsRSx3D>G2c=;&zHePP$)R2kuz z_B8or!xj^u19PyjYc>a@*Ez=7y$jT*dE5M3m;HXA&fNUz|LsDAhyVg_Il51EUcTW2 z!4VG3ue&&5BLVnrZEfn$msdVMk-&oo{@kVORC{~7QKcpvF##1DSE<@P2RtXRiYM=Q z!NZZMl3m_+03W(_U5!0|Cw9OVJg$R)#`^7Qd1;l8k3>)c5IEs~oETBP1NX)FRssNy z;McBP;eo&jEFyw{@dZL~!{c>sV#$*C<|>5+}mS06ysWp8eQXRd=vo4PM)? zRK+8I3yv?rwi00KxPxz(W%*pU`jfFUOPmNIfD&-Lq0Tn}xdY9DSGz~LRQ-lYUm2tX3BHv8%Bo~D1Pv0%Y3V&-C4jy3;9TxyjurRBQUWAz`h)^>0(kIbC-K=z02JU7jQ8AjBrQw< z*sJWwXU~Ky;qc-PzXYy)YyD6DWG6|0l>m~UgiR^|*RlyC!1xprJOv~@3%FJSU?e4h zH$mxR$o3Q<{P8Cfs(f>4mJ;;tPj*s#(J#Ru0(#E3W|~fQ_cJ;@J0R5bvNHD!DaSg=9 zUY{00@Hi!QoecnHBm!_F4J+{1QPS5?F2U-y`YSRXJZxQtBb*3$c%e2!r^0+#f)7g2 z_>8LzrG)TN9lD1ykH6`N9w*f`Cx=AI6&Yc35P(BReMW#LMqq(>G+w{K+eTA786zyG&96)kaa9N z6Fm2}+=WAcj6a(ACo~ zPOR8aR{&Rn^ccz(n9FrKGvvXOPl+jj_W%x@3+V^_9^i?{Ne?j1=qB~pvnfI^1?mNf zDWI>r)0-BjmFwCMQi0wO8;-Y#OIvKnpTm4|YbNB+ec=-%QF>8IfUV9NC~+f_g!ea*RX(9GES^^L`M;FJ}Ux$aFT}lM*nSvy%(o3SI&K0C?Hy UZsPPx%JV``BR9Hu2WEfz;IKcKZj5=WGg@CoS^?zLH=IGI*BzuTx4agR^hHx=FV{?SN zL+aOlhUzun;CxaXLX-nQme<$UGyHyeouO^UDzHT`M<82Xl@Z3kDz3@U*x1NGtRska zKvIx1gRHI%*byKAatO!~AfJOQ1_6-ek1ro#n73{(^&9~5y_LQSgNCv^*bh=~TG8~}^&^H*;oGQcr=2JiUg z3|kjQGB8*jgo_($t24mT1;q}4`93?!8zseqECpE(128^v&X~GvD_EM4Bk+a*$N|V% z4&*bKWnV>n7`WeTVSv%-jvzJ^2s!}fdt}SkT@hi}Y?H^pscXUT{qhM0-y@S4f^^=% z9R~{uP$*Cw0w4#VTMi0ZcLxi22<$v?0vz1vj-ZMIKv4h-UKkAu0dxl-TMknPDkCTk z0jsac42G#Mz&=C{i9~@WcofY4P=^xyFm=bc=ThzfSR#zdu3}g=wGG7)*m41~I;w;K z$P!RGXr8i|;rjLK7>+c-w#-Kq&q}<`Y#CA{RukVCU!KX2|(t#xRBD6vM|)UlAoFltons zfYJdv02M$9hu Date: Mon, 1 Jan 2024 16:38:26 -0600 Subject: [PATCH 2/7] Correct cloak placement --- .../Prototypes/Entities/Clothing/Neck/cloaks.yml | 9 +++++++++ .../Neck/Cloaks/salvage.rsi/equipped-NECK.png} | Bin .../Clothing/Neck/Cloaks/salvage.rsi/icon.png | Bin .../Clothing/Neck/Cloaks/salvage.rsi/meta.json | 0 4 files changed, 9 insertions(+) rename Resources/Textures/{Clothing/Neck/Cloaks/salvage.rsi/equipped-NECK3.png => DeltaV/Clothing/Neck/Cloaks/salvage.rsi/equipped-NECK.png} (100%) rename Resources/Textures/{ => DeltaV}/Clothing/Neck/Cloaks/salvage.rsi/icon.png (100%) rename Resources/Textures/{ => DeltaV}/Clothing/Neck/Cloaks/salvage.rsi/meta.json (100%) diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml index b03ef793548..56d66f800e2 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml @@ -16,6 +16,15 @@ - type: Sprite sprite: Clothing/Neck/Cloaks/hos.rsi +- type: entity + parent: ClothingNeckBase + id: ClothingNeckSalvager + name: salvager's cloak + description: Worn by dangerous people who've deconstructed stations with ease. + components: + - type: Sprite + sprite: DeltaV/Clothing/Neck/Cloaks/salvage.rsi + - type: entity parent: ClothingNeckBase id: ClothingNeckCloakCe diff --git a/Resources/Textures/Clothing/Neck/Cloaks/salvage.rsi/equipped-NECK3.png b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/salvage.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/salvage.rsi/equipped-NECK3.png rename to Resources/Textures/DeltaV/Clothing/Neck/Cloaks/salvage.rsi/equipped-NECK.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/salvage.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/salvage.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/salvage.rsi/icon.png rename to Resources/Textures/DeltaV/Clothing/Neck/Cloaks/salvage.rsi/icon.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/salvage.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/salvage.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Neck/Cloaks/salvage.rsi/meta.json rename to Resources/Textures/DeltaV/Clothing/Neck/Cloaks/salvage.rsi/meta.json From 0f0fe2031f2f99a511193ceff17f302e81832864 Mon Sep 17 00:00:00 2001 From: lleftTheDragon <125433431+lleftTheDragon@users.noreply.github.com> Date: Mon, 1 Jan 2024 16:55:56 -0600 Subject: [PATCH 3/7] more corrections --- .../DeltaV/Entities/Clothing/Neck/cloaks.yml | 11 +++++++++++ .../Prototypes/Entities/Clothing/Neck/cloaks.yml | 8 -------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/cloaks.yml index cf39a506948..5ff195cfda8 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/cloaks.yml @@ -20,3 +20,14 @@ sprite: DeltaV/Clothing/Neck/Cloaks/boatcloak.rsi - type: Clothing sprite: DeltaV/Clothing/Neck/Cloaks/boatcloak.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckSalvager + name: salvager's cloak + description: Worn by dangerous people who've deconstructed stations with ease. + components: + - type: Sprite + sprite: DeltaV/Clothing/Neck/Cloaks/salvage.rsi + - type: Clothing + sprite: DeltaV/Clothing/Neck/Cloaks/salvage.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml index 56d66f800e2..ef64f667aee 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml @@ -16,14 +16,6 @@ - type: Sprite sprite: Clothing/Neck/Cloaks/hos.rsi -- type: entity - parent: ClothingNeckBase - id: ClothingNeckSalvager - name: salvager's cloak - description: Worn by dangerous people who've deconstructed stations with ease. - components: - - type: Sprite - sprite: DeltaV/Clothing/Neck/Cloaks/salvage.rsi - type: entity parent: ClothingNeckBase From 2394ab5ca73fca1f7c7c3340ed343dde214a0013 Mon Sep 17 00:00:00 2001 From: lleftTheDragon <125433431+lleftTheDragon@users.noreply.github.com> Date: Wed, 3 Jan 2024 01:12:30 -0600 Subject: [PATCH 4/7] removed unwanted code --- Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml index ef64f667aee..d5ee9c1f5ae 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml @@ -16,7 +16,6 @@ - type: Sprite sprite: Clothing/Neck/Cloaks/hos.rsi - - type: entity parent: ClothingNeckBase id: ClothingNeckCloakCe @@ -116,15 +115,6 @@ - type: Sprite sprite: Clothing/Neck/Cloaks/trans.rsi -- type: entity - parent: ClothingNeckBase - id: ClothingNeckSalvager - name: salvager's cloak - description: Worn by dangerous people who've deconstructed stations with ease. - components: - - type: Sprite - sprite: Clothing/Neck/Cloaks/salvage.rsi - - type: entity parent: ClothingNeckBase id: ClothingNeckCloakGoliathCloak From 065144fe3a7f8acd82fc463fc387bbb5fffdb3be Mon Sep 17 00:00:00 2001 From: lleftTheDragon <125433431+lleftTheDragon@users.noreply.github.com> Date: Mon, 8 Jan 2024 13:26:42 -0600 Subject: [PATCH 5/7] Update Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Signed-off-by: lleftTheDragon <125433431+lleftTheDragon@users.noreply.github.com> --- Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml index a295cb4c748..55ba4f3de29 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml @@ -50,5 +50,5 @@ prob: 0.3 - id: Flare prob: 0.3 - - id: ClothingNeckSalvager + - id: ClothingNeckSalvager # DeltaV - salvage cloak prob: 0.2 From b26309a87ec84e40e9611e9c150fbb4b43c84bb4 Mon Sep 17 00:00:00 2001 From: lleftTheDragon <125433431+lleftTheDragon@users.noreply.github.com> Date: Mon, 8 Jan 2024 13:26:59 -0600 Subject: [PATCH 6/7] Update Resources/Prototypes/Catalog/Fills/Crates/salvage.yml Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Signed-off-by: lleftTheDragon <125433431+lleftTheDragon@users.noreply.github.com> --- Resources/Prototypes/Catalog/Fills/Crates/salvage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml index a7092797623..502e0dc4a92 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml @@ -21,7 +21,7 @@ - id: ClothingBeltUtility - id: OreBag - id: ClothingBeltSalvageWebbing - - id: ClothingNeckSalvager + - id: ClothingNeckSalvager # DeltaV - salvage cloak prob: 0.8 - type: entity From 36aff5933c2cf95c33f486d1f45e8c5961a26119 Mon Sep 17 00:00:00 2001 From: lleftTheDragon <125433431+lleftTheDragon@users.noreply.github.com> Date: Mon, 8 Jan 2024 13:27:06 -0600 Subject: [PATCH 7/7] Update Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Signed-off-by: lleftTheDragon <125433431+lleftTheDragon@users.noreply.github.com> --- Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml index 55ba4f3de29..2a653538881 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml @@ -25,7 +25,7 @@ prob: 0.3 - id: Flare prob: 0.3 - - id: ClothingNeckSalvager + - id: ClothingNeckSalvager # DeltaV - salvage cloak prob: 0.2 - type: entity