From 21b34d387697fb539efbd0c45ce21c34a50351bf Mon Sep 17 00:00:00 2001 From: Salvantrix <149609610+Salvantrix@users.noreply.github.com> Date: Tue, 11 Jun 2024 18:55:52 -0400 Subject: [PATCH 1/5] YarrrDrobe Adds the new pirate drobe vending machine for all your pirate wears n such. --- .../advertisements/vending/yarrrdrobe.ftl | 5 +++ .../Advertisements/yarrrdrobe.yml | 8 ++++ .../Inventories/nfsddrobe - Copy.yml | 41 ++++++++++++++++++ .../Inventories/yarrrdrobe.yml | 41 ++++++++++++++++++ .../Structures/Machines/vending_machines.yml | 24 ++++++++++ .../VendingMachines/yarrrdrobe.rsi/broken.png | Bin 0 -> 1430 bytes .../VendingMachines/yarrrdrobe.rsi/meta.json | 33 ++++++++++++++ .../yarrrdrobe.rsi/normal-unshaded.png | Bin 0 -> 922 bytes .../VendingMachines/yarrrdrobe.rsi/off.png | Bin 0 -> 1032 bytes .../VendingMachines/yarrrdrobe.rsi/panel.png | Bin 0 -> 203 bytes 10 files changed, 152 insertions(+) create mode 100644 Resources/Locale/en-US/advertisements/vending/yarrrdrobe.ftl create mode 100644 Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/yarrrdrobe.yml create mode 100644 Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsddrobe - Copy.yml create mode 100644 Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/yarrrdrobe.yml create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/yarrrdrobe.rsi/broken.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/yarrrdrobe.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/yarrrdrobe.rsi/normal-unshaded.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/yarrrdrobe.rsi/off.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/yarrrdrobe.rsi/panel.png diff --git a/Resources/Locale/en-US/advertisements/vending/yarrrdrobe.ftl b/Resources/Locale/en-US/advertisements/vending/yarrrdrobe.ftl new file mode 100644 index 00000000000..8ac3932bbe1 --- /dev/null +++ b/Resources/Locale/en-US/advertisements/vending/yarrrdrobe.ftl @@ -0,0 +1,5 @@ +advertisement-yarrrdrobe-1 = Looking To 'Cop' A Fresh Look? +advertisement-yarrrdrobe-2 = From Boots to Caps, We Got Your Back +advertisement-yarrrdrobe-3 = Enforce Fashion With Arresting Attire +advertisement-yarrrdrobe-4 = Serve Justice, Look Fabulous! +advertisement-yarrrdrobe-5 = Now you can wear your brown pants too diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/yarrrdrobe.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/yarrrdrobe.yml new file mode 100644 index 00000000000..7591500c3e3 --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/yarrrdrobe.yml @@ -0,0 +1,8 @@ +- type: messagePack + id: YarrrDrobeAds + messages: + - advertisement-yarrrdrobe-1 + - advertisement-yarrrdrobe-2 + - advertisement-yarrrdrobe-3 + - advertisement-yarrrdrobe-4 + - advertisement-yarrrdrobe-5 diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsddrobe - Copy.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsddrobe - Copy.yml new file mode 100644 index 00000000000..409f7771ec5 --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsddrobe - Copy.yml @@ -0,0 +1,41 @@ +- type: vendingMachineInventory + id: YarrrDrobeInventory + startingInventory: + ClothingBackpackNfsdBrown: 6 + ClothingBackpackSatchelNfsdBrown: 6 + ClothingBackpackDuffelNfsdBrown: 6 + ClothingBackpackMessengerNfsdBrown: 6 + ClothingBackpackNfsdCream: 2 + ClothingBackpackSatchelNfsdCream: 2 + ClothingBackpackDuffelNfsdCream: 2 + ClothingBackpackMessengerNfsdCream: 2 + ClothingHeadHatNfsdBeretGreen: 6 + ClothingHeadHatNfsdBeretBrown: 6 + ClothingHeadHatNfsdBeretCream: 6 + ClothingHeadHatNfsdCampaign: 6 + ClothingHandsGlovesCombatNfsdBrown: 6 + ClothingHandsGlovesCombatNfsdCream: 6 + ClothingUniformJumpskirtNfsd: 6 + ClothingUniformJumpskirtNfsdShort: 6 + ClothingUniformJumpsuitNfsd: 6 + ClothingUniformJumpsuitNfsdShort: 6 + ClothingUniformJumpsuitNfsdTacBlack: 6 + ClothingUniformJumpsuitNfsdTacGray: 6 + ClothingUniformJumpsuitNfsdTacCamo: 6 + ClothingUniformJumpsuitNfsdTacCream: 6 + ClothingHeadsetNfsdGreenCommon: 6 # Frontier - Ask SR or Sheriff for keys + ClothingHeadsetNfsdBrownCommon: 6 # Frontier - Ask SR or Sheriff for keys + ClothingHeadsetNfsdCreamCommon: 6 # Frontier - Ask SR or Sheriff for keys + ClothingHeadHelmetNfsd: 6 # Frontier + ClothingOuterArmorNfsd: 6 + ClothingOuterCoatNfsdBomber: 6 + ClothingOuterCoatNfsdLongCoat: 6 + ClothingOuterCoatNfsdFormal: 6 + ClothingMaskGasNfsd: 8 + NfsdWhistle: 3 + ClothingEyesBlindfold: 3 + ClothingShoesBootsNfsdBrown: 6 + ClothingShoesBootsNfsdCream: 6 + ClothingShoesBootsMagNfsd: 3 + contrabandInventory: + ClothingUniformJumpskirtOfLife: 3 diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/yarrrdrobe.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/yarrrdrobe.yml new file mode 100644 index 00000000000..409f7771ec5 --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/yarrrdrobe.yml @@ -0,0 +1,41 @@ +- type: vendingMachineInventory + id: YarrrDrobeInventory + startingInventory: + ClothingBackpackNfsdBrown: 6 + ClothingBackpackSatchelNfsdBrown: 6 + ClothingBackpackDuffelNfsdBrown: 6 + ClothingBackpackMessengerNfsdBrown: 6 + ClothingBackpackNfsdCream: 2 + ClothingBackpackSatchelNfsdCream: 2 + ClothingBackpackDuffelNfsdCream: 2 + ClothingBackpackMessengerNfsdCream: 2 + ClothingHeadHatNfsdBeretGreen: 6 + ClothingHeadHatNfsdBeretBrown: 6 + ClothingHeadHatNfsdBeretCream: 6 + ClothingHeadHatNfsdCampaign: 6 + ClothingHandsGlovesCombatNfsdBrown: 6 + ClothingHandsGlovesCombatNfsdCream: 6 + ClothingUniformJumpskirtNfsd: 6 + ClothingUniformJumpskirtNfsdShort: 6 + ClothingUniformJumpsuitNfsd: 6 + ClothingUniformJumpsuitNfsdShort: 6 + ClothingUniformJumpsuitNfsdTacBlack: 6 + ClothingUniformJumpsuitNfsdTacGray: 6 + ClothingUniformJumpsuitNfsdTacCamo: 6 + ClothingUniformJumpsuitNfsdTacCream: 6 + ClothingHeadsetNfsdGreenCommon: 6 # Frontier - Ask SR or Sheriff for keys + ClothingHeadsetNfsdBrownCommon: 6 # Frontier - Ask SR or Sheriff for keys + ClothingHeadsetNfsdCreamCommon: 6 # Frontier - Ask SR or Sheriff for keys + ClothingHeadHelmetNfsd: 6 # Frontier + ClothingOuterArmorNfsd: 6 + ClothingOuterCoatNfsdBomber: 6 + ClothingOuterCoatNfsdLongCoat: 6 + ClothingOuterCoatNfsdFormal: 6 + ClothingMaskGasNfsd: 8 + NfsdWhistle: 3 + ClothingEyesBlindfold: 3 + ClothingShoesBootsNfsdBrown: 6 + ClothingShoesBootsNfsdCream: 6 + ClothingShoesBootsMagNfsd: 3 + contrabandInventory: + ClothingUniformJumpskirtOfLife: 3 diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml index 1d4f7bea910..5a5170bc390 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml @@ -379,6 +379,30 @@ - type: AccessReader access: [["Security"]] +- type: entity + parent: [BaseStructureUnanchorable, VendingMachine] + id: VendingMachineYarrrDrobe + name: YarrrDrobe + description: A vending machine for skallywags and booty lovers! + components: + - type: VendingMachine + pack: YarrrDrobeInventory + offState: off + brokenState: broken + normalState: normal-unshaded + - type: Advertise + pack: YarrrDrobeAds + - type: Sprite + sprite: _NF/Structures/Machines/VendingMachines/yarrrdrobe.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: entity parent: [BaseStructureUnanchorable, VendingMachine] id: VendingMachineNfsdTech diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/yarrrdrobe.rsi/broken.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/yarrrdrobe.rsi/broken.png new file mode 100644 index 0000000000000000000000000000000000000000..310a4dc18577c48cde43c409a5fe032ea8b2ed80 GIT binary patch literal 1430 zcmV;H1!?+;P)Px)Hc3Q5R9J=0m&QmJsMIdX z5~+ks`-*tIH(8UyI^@2}Jd;Q^o}=o&M-;bH+h69Pqz5s4_w z&gBDBg#)9HS-xCl&9wc*GpiQy;TUQ(%GhXu`@YLa!}yC zA}qEJplvUu65Rb~m8#PuEChcPHi)Sa%0~4`QwR$|ScD(_3W_y{TEk_wXgqOFk0=0+ z?MgKF?H$K%xYR2f++8$rTo*-_7#fHI5Fd&$w^VBRu_!MlVkojiy|O{UY-yum)fvyG zs8|m7AI|aTd}(VU3=u{MiR9oQMZ1RMx&YV>hthflMV2tkx<9^Lt+P9>P_LLQ7#09p zauA4+jBi7&)me@N?lrgsmTj}LT%uH7r@T?+=-v!R_h#6ajPU;1w^%YvmJE~g=gxBe z+*y_klaQhk9UP`sx7n2*C8Vg7H>#A%>#Qu7uxvXJKp+F2=TTl;Ap^t<}zV)F*C#AQ6s3j`3z%kfm+Vq$`9HVe%r zAAaR=;lU69j@!g`oInNw0mwoii5A#maRo`1yWVS>2EfOke#7^_&G|7!Q79HyAQWQq zg2bi0tlc&$y|=ZM~(paASQD;e~rVJ9H7O3 zWjFd`K#?StYM#%4rfDn|3jX_4I_)QKTRV9ha3=#1MedJ*b<05t%UuhumP%Z^dX<+a zCVIx}x=t#cM$rWWYr*wk_HfJ9+vviDVK@)BI9&+T*cjVnB3gpwm+6bl0=4 zZ}xkqCSdCf1OjjoL=+k5ouun}mmb={Qt33huD7~?76ZS0SLVWlAtH*5+Yf+2;i9kB zdg7XgMp>?Jp5N^@>#TDd z#A2bqVxjQ-G@wXQj|NidG>e4-lewJVa&1Q1;+)LoFe(No4jlvF`qT}dfxa|gI}W0w z3udOLk!0E5;gjm`G#VHc!%y6{|D=Hy1CY<>(PwosnGCjVW7{@PqruGdbdPUTDl9Lr z^sM(Z4FrCUU(XIVW9k6+%E74nwf%94YR%+keq(D_vZ$=E)^QHKeex9Z3k!WE&5Vul z!?hoQwg!~Iae)Bp4I9(#jh{JlW=qMhT)EQqY}pNJRv%X~)05E>Dy5~?VKl$6KxS-= zTQ_fR2|#9Stc$U}8Bl3-eG6{ind0`HsVyZBGRtmY)~!AOL=+;5%>FojH&}Kf(C(NBI{F-I=P}&)*)aneX(Vlt#OZykiBAUka^5jzh000hU kSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$g8ez3{r~^~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/yarrrdrobe.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/VendingMachines/yarrrdrobe.rsi/meta.json new file mode 100644 index 00000000000..800ed2e7df5 --- /dev/null +++ b/Resources/Textures/_NF/Structures/Machines/VendingMachines/yarrrdrobe.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by Gentlebutter for Frontier Station.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "broken" + }, + { + "name": "off" + }, + { + "name": "panel" + }, + { + "name": "normal-unshaded", + "delays": [ + [ + 1.0, + 0.1, + 1.0, + 0.1, + 1.0, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/yarrrdrobe.rsi/normal-unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/yarrrdrobe.rsi/normal-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..ce82e9036cdf4bf4629384adac06bbbe25f1447d GIT binary patch literal 922 zcmV;L17-Y)P)Px&I!Q!9RCt{2noDRCQ51&1B%NqYx=;}XaU(t#Dxy|JK>{kSR1_Z&(KbGcE`%Z! z5k*B131YSQK&23$Ac_k?#RqDAETl@sMJolnQ9)3m*e11UlIvn<%+QH5scCA*^Ff&V z_%r{><;-QmJs=2zAP7P}D43vNepY|Jf(b?RFIP~R)vr`gUM&9}(@SRUBKlu7Yv+s0 zN{~7mQ22pTz^{*amOeK9Ug}Cf(E*;S$F9wwRsgeru{L}L%HM4nfghLzj01-2pHyQ& z^)hb^C?@?5vL0N^!Sy#kz8L-`mI0LNmzXxyFsy!T4Ys#EzYI_|e&L4pw&(b|TQd4W zWk7%XTR#H#1B&5#0NxQ(a_SP%cX|Nda;Iot=x=}P49FsSFT#-rZibb(`5a3y#^)uT zOtX7Q8vmSm25rGIppO)856B|?&`m6n=1V+DcM875lf)8f!Vi1jreJ$OAF=CidjV?0 z4U}mf)44LuLv6UhFt!=gEl{7J*M?OL?E2e&1gdKm;T+6M?dS_eKl|Iu zfL09u#&YU9fv)@l_~-ovK@bE%5ClOG1VI1>{(N4+WChEz`pXndE|!0f=~J_I5&gHA zwev;l11uwu`T+eR^#Km856J6eXydNdoO7Z5aYKKwoDA7sfXc{3Qt76g^C@MVb6kCZ zFa3rKi~Zc#aUFnz_wQ!rUWXzaos%GVcy?yYaT#zjEJ!9wET7uQr0GP3Q z6g6K%T-oy~qjy{e0K{4%ELivxZzRg0y$4tqAHvBy?X183op?*cpmkgZ0NgwipK000hUSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$g2|Ddng9R* literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/yarrrdrobe.rsi/off.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/yarrrdrobe.rsi/off.png new file mode 100644 index 0000000000000000000000000000000000000000..3e627a0ca7565cd931487c5decc50e458dedd28b GIT binary patch literal 1032 zcmV+j1o!)iP)Px&s7XXYR9J=WmrZXQRTPFF&z-pw$4oytpu_%k*9kWFq|a-U$sV7!ZJLrl3&qG((F9IGJ8@<-g{$gh zMpD?W;`g$H=lNVn54K+qflC=)1Q41)XaX&vA+**JJhBqZOl1HlJlSVtc!-Ks#jjwEk8C7p!*|i|i+_`ZqyB0iso0w(S(6j{kLK$5*Fr-A9CW$`J z8d(DgG=$I@Pp8>a4h_!(K-C-UA08tOJs<GX%nR5~jedwE;3~!L&OYhU zG?k+&S6-b4puD%o;__SMzPJm(Cm($Xz^6BF0dW0;YvkANF*Y#~_$TBc$4AGwO2sGO z`#zO}1J)kzwkAqeu=d{UOWe-g;Qi~LarN@W*5u7w+|J#g@Yg@&N>+zIC5zWH2EOk{ z66k3R09P+eG>3W(Lj1lfFQY)GFboqw`1PDG8c@eCdat*pb(JU*vxbJ z^9C>iz{QCss?k{=rxK95jxJ8fhLeYJ=RpA=AQSfMP(aKe_2{10R{^2wkpbPwyX`i@ z3M^#mgDYT41BecagYFve1|bkff&app0%r=GDG*nI$V>V}foH?=;u6b?OTpNb#`AST zrBvT`+!6Qm%3aIf@0fShbJRew*!r3c--i9LwY3%ahha*iZw*9V$8XM#HdD!AeyKcr z5r(ml(WyE%>&2sZ*YS`cJKln8Z@)undwZay)7dO{zxf(yD-eBzkpyaWg;2dqD=RCp zlCQ3=c8pzB$8iVvBX@`@X=IafafJHa@{x`I32fOAz4Wz?%T-76Kc<$J#kxmZv z#QiVvFZ}@e))pRA{{R304rN$LW=%~1DgXcg2mk;800000(o>TF0000TD@E@bvU_ zNvA($#wnr(!Xc+!xY-SW0LU@E^H5*bg578Khv|+_lg$sW*?jCvdBeJOdWZj3DYB`n tt4B%rOPnz=`)6-p#&6~hvQUMA!DX(L(7L;d?|=?s@O1TaS?83{1OWbLM9TmG literal 0 HcmV?d00001 From 89c17ff4a745232d056b58ce266fa353fabaf19b Mon Sep 17 00:00:00 2001 From: Salvantrix <149609610+Salvantrix@users.noreply.github.com> Date: Tue, 11 Jun 2024 19:00:29 -0400 Subject: [PATCH 2/5] Test Fix AAAAAAAA --- .../Inventories/nfsddrobe - Copy.yml | 41 ------------------- 1 file changed, 41 deletions(-) delete mode 100644 Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsddrobe - Copy.yml diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsddrobe - Copy.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsddrobe - Copy.yml deleted file mode 100644 index 409f7771ec5..00000000000 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsddrobe - Copy.yml +++ /dev/null @@ -1,41 +0,0 @@ -- type: vendingMachineInventory - id: YarrrDrobeInventory - startingInventory: - ClothingBackpackNfsdBrown: 6 - ClothingBackpackSatchelNfsdBrown: 6 - ClothingBackpackDuffelNfsdBrown: 6 - ClothingBackpackMessengerNfsdBrown: 6 - ClothingBackpackNfsdCream: 2 - ClothingBackpackSatchelNfsdCream: 2 - ClothingBackpackDuffelNfsdCream: 2 - ClothingBackpackMessengerNfsdCream: 2 - ClothingHeadHatNfsdBeretGreen: 6 - ClothingHeadHatNfsdBeretBrown: 6 - ClothingHeadHatNfsdBeretCream: 6 - ClothingHeadHatNfsdCampaign: 6 - ClothingHandsGlovesCombatNfsdBrown: 6 - ClothingHandsGlovesCombatNfsdCream: 6 - ClothingUniformJumpskirtNfsd: 6 - ClothingUniformJumpskirtNfsdShort: 6 - ClothingUniformJumpsuitNfsd: 6 - ClothingUniformJumpsuitNfsdShort: 6 - ClothingUniformJumpsuitNfsdTacBlack: 6 - ClothingUniformJumpsuitNfsdTacGray: 6 - ClothingUniformJumpsuitNfsdTacCamo: 6 - ClothingUniformJumpsuitNfsdTacCream: 6 - ClothingHeadsetNfsdGreenCommon: 6 # Frontier - Ask SR or Sheriff for keys - ClothingHeadsetNfsdBrownCommon: 6 # Frontier - Ask SR or Sheriff for keys - ClothingHeadsetNfsdCreamCommon: 6 # Frontier - Ask SR or Sheriff for keys - ClothingHeadHelmetNfsd: 6 # Frontier - ClothingOuterArmorNfsd: 6 - ClothingOuterCoatNfsdBomber: 6 - ClothingOuterCoatNfsdLongCoat: 6 - ClothingOuterCoatNfsdFormal: 6 - ClothingMaskGasNfsd: 8 - NfsdWhistle: 3 - ClothingEyesBlindfold: 3 - ClothingShoesBootsNfsdBrown: 6 - ClothingShoesBootsNfsdCream: 6 - ClothingShoesBootsMagNfsd: 3 - contrabandInventory: - ClothingUniformJumpskirtOfLife: 3 From 5a9d4e73a93e57d385a7d987fc2c448922016263 Mon Sep 17 00:00:00 2001 From: Salvantrix <149609610+Salvantrix@users.noreply.github.com> Date: Tue, 11 Jun 2024 19:01:38 -0400 Subject: [PATCH 3/5] Screams in yml test --- .../VendingMachines/cuddlycritter.rsi/meta.json | 2 +- .../Machines/VendingMachines/yarrrdrobe.rsi/meta.json | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/meta.json index f634aaed47e..046e6c2a2c0 100644 --- a/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Machines/VendingMachines/cuddlycritter.rsi/meta.json @@ -28,4 +28,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/yarrrdrobe.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/VendingMachines/yarrrdrobe.rsi/meta.json index 800ed2e7df5..3c13edb12ce 100644 --- a/Resources/Textures/_NF/Structures/Machines/VendingMachines/yarrrdrobe.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Machines/VendingMachines/yarrrdrobe.rsi/meta.json @@ -20,12 +20,10 @@ "name": "normal-unshaded", "delays": [ [ - 1.0, - 0.1, - 1.0, - 0.1, - 1.0, - 0.1 + 1.5, + 0.1, + 1.5, + 0.1 ] ] } From 9ff21bb49627d29a1aaa2cabf3b4908a4ccdb345 Mon Sep 17 00:00:00 2001 From: Salvantrix <149609610+Salvantrix@users.noreply.github.com> Date: Tue, 11 Jun 2024 19:14:06 -0400 Subject: [PATCH 4/5] Complete. It should work as intended. --- .../advertisements/vending/yarrrdrobe.ftl | 10 ++-- .../Service/vending_machine_restock.yml | 1 + .../Inventories/yarrrdrobe.yml | 52 ++++++------------- 3 files changed, 21 insertions(+), 42 deletions(-) diff --git a/Resources/Locale/en-US/advertisements/vending/yarrrdrobe.ftl b/Resources/Locale/en-US/advertisements/vending/yarrrdrobe.ftl index 8ac3932bbe1..d484c8f3050 100644 --- a/Resources/Locale/en-US/advertisements/vending/yarrrdrobe.ftl +++ b/Resources/Locale/en-US/advertisements/vending/yarrrdrobe.ftl @@ -1,5 +1,5 @@ -advertisement-yarrrdrobe-1 = Looking To 'Cop' A Fresh Look? -advertisement-yarrrdrobe-2 = From Boots to Caps, We Got Your Back -advertisement-yarrrdrobe-3 = Enforce Fashion With Arresting Attire -advertisement-yarrrdrobe-4 = Serve Justice, Look Fabulous! -advertisement-yarrrdrobe-5 = Now you can wear your brown pants too +advertisement-yarrrdrobe-1 = Eye patches 50% off. +advertisement-yarrrdrobe-2 = Plunder some booty while you dress as a beauty! +advertisement-yarrrdrobe-3 = Who needs an extra leg anyways? +advertisement-yarrrdrobe-4 = Come get yer supplies while you last! +advertisement-yarrrdrobe-5 = Oi! Land lubber get o'er here and plunder me! diff --git a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml index 50b8cfa4dda..3bdc578809b 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml @@ -143,6 +143,7 @@ - BoxingDrobeInventory # - PietyVendInventory # Dont enable, infinite demon dogs issue - NfsdDrobeInventory # Frontier + - YarrrDrobeInventory - type: Sprite layers: - state: base diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/yarrrdrobe.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/yarrrdrobe.yml index 409f7771ec5..1114944746a 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/yarrrdrobe.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/yarrrdrobe.yml @@ -1,41 +1,19 @@ - type: vendingMachineInventory id: YarrrDrobeInventory startingInventory: - ClothingBackpackNfsdBrown: 6 - ClothingBackpackSatchelNfsdBrown: 6 - ClothingBackpackDuffelNfsdBrown: 6 - ClothingBackpackMessengerNfsdBrown: 6 - ClothingBackpackNfsdCream: 2 - ClothingBackpackSatchelNfsdCream: 2 - ClothingBackpackDuffelNfsdCream: 2 - ClothingBackpackMessengerNfsdCream: 2 - ClothingHeadHatNfsdBeretGreen: 6 - ClothingHeadHatNfsdBeretBrown: 6 - ClothingHeadHatNfsdBeretCream: 6 - ClothingHeadHatNfsdCampaign: 6 - ClothingHandsGlovesCombatNfsdBrown: 6 - ClothingHandsGlovesCombatNfsdCream: 6 - ClothingUniformJumpskirtNfsd: 6 - ClothingUniformJumpskirtNfsdShort: 6 - ClothingUniformJumpsuitNfsd: 6 - ClothingUniformJumpsuitNfsdShort: 6 - ClothingUniformJumpsuitNfsdTacBlack: 6 - ClothingUniformJumpsuitNfsdTacGray: 6 - ClothingUniformJumpsuitNfsdTacCamo: 6 - ClothingUniformJumpsuitNfsdTacCream: 6 - ClothingHeadsetNfsdGreenCommon: 6 # Frontier - Ask SR or Sheriff for keys - ClothingHeadsetNfsdBrownCommon: 6 # Frontier - Ask SR or Sheriff for keys - ClothingHeadsetNfsdCreamCommon: 6 # Frontier - Ask SR or Sheriff for keys - ClothingHeadHelmetNfsd: 6 # Frontier - ClothingOuterArmorNfsd: 6 - ClothingOuterCoatNfsdBomber: 6 - ClothingOuterCoatNfsdLongCoat: 6 - ClothingOuterCoatNfsdFormal: 6 - ClothingMaskGasNfsd: 8 - NfsdWhistle: 3 - ClothingEyesBlindfold: 3 - ClothingShoesBootsNfsdBrown: 6 - ClothingShoesBootsNfsdCream: 6 - ClothingShoesBootsMagNfsd: 3 + ClothingNeckCloakPirateCap: 4 + ClothingNeckCloakPirateParrot: 4 + ClothingShoesBootsMagPirateFilled: 4 + ClothingHeadHatPirate: 4 + ClothingHeadHatPirateTricord: 4 + ClothingHeadHatPirates: 4 + ClothingHeadHatPirateLuffy: 4 + ClothingUniformJumpsuitPirateSlops: 4 + ClothingUniformJumpsuitPirateLuffy: 4 + ClothingUniformJumpsuitPirate: 4 + ClothingOuterCoatPirate: 4 + ClothingShoesBootsPirate: 4 + ClothingShoesBootsPirateLuffy: 4 + PirateHandyFlag: 4 contrabandInventory: - ClothingUniformJumpskirtOfLife: 3 + ClothingOuterCoatPirateCaptain: 1 From 1491f4ff5cb615754f60686c245b4f34c174b7d3 Mon Sep 17 00:00:00 2001 From: Salvantrix <149609610+Salvantrix@users.noreply.github.com> Date: Thu, 13 Jun 2024 08:59:36 -0400 Subject: [PATCH 5/5] Update Resources/Locale/en-US/advertisements/vending/yarrrdrobe.ftl Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> --- Resources/Locale/en-US/advertisements/vending/yarrrdrobe.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/advertisements/vending/yarrrdrobe.ftl b/Resources/Locale/en-US/advertisements/vending/yarrrdrobe.ftl index d484c8f3050..c5a5928f25f 100644 --- a/Resources/Locale/en-US/advertisements/vending/yarrrdrobe.ftl +++ b/Resources/Locale/en-US/advertisements/vending/yarrrdrobe.ftl @@ -2,4 +2,4 @@ advertisement-yarrrdrobe-1 = Eye patches 50% off. advertisement-yarrrdrobe-2 = Plunder some booty while you dress as a beauty! advertisement-yarrrdrobe-3 = Who needs an extra leg anyways? advertisement-yarrrdrobe-4 = Come get yer supplies while you last! -advertisement-yarrrdrobe-5 = Oi! Land lubber get o'er here and plunder me! +advertisement-yarrrdrobe-5 = Oi, landlubber! Get o'er here and plunder me!