From eb8974f0bc1938250fa001abb81d80ac7166295a Mon Sep 17 00:00:00 2001 From: Dorragon <101672978+Dorragon@users.noreply.github.com> Date: Sat, 16 Sep 2023 09:26:04 +0300 Subject: [PATCH 1/2] Pride-o-mat and refill for it (#22) * Pride-o-mat and refill * Made BaseVendingMachineRestockDeltaV unspawnable * Update vending_machine_restock.yml Signed-off-by: Dorragon <101672978+Dorragon@users.noreply.github.com> --------- Signed-off-by: Dorragon <101672978+Dorragon@users.noreply.github.com> --- .../deltav/advertisements/vending/pride.yml | 3 ++ .../deltav/catalog/cargo/cargo-vending.ftl | 2 ++ .../catalog/fills/crates/vending-crates.ftl | 2 ++ .../DeltaV/Catalog/Cargo/cargo_vending.yml | 9 +++++ .../DeltaV/Catalog/Fills/Crates/vending.yml | 7 ++++ .../VendingMachines/Advertisements/pride.yml | 6 ++++ .../VendingMachines/Inventories/pride.yml | 20 +++++++++++ .../Service/vending_machine_restock.yml | 25 ++++++++++++++ .../Structures/Machines/vending_machines.yml | 24 ++++++++++++++ .../vending_machine_restock.rsi/base.png | Bin 0 -> 241 bytes .../vending_machine_restock.rsi/green_bit.png | Bin 0 -> 175 bytes .../inhand-left.png | Bin 0 -> 171 bytes .../inhand-right.png | Bin 0 -> 172 bytes .../vending_machine_restock.rsi/meta.json | 28 ++++++++++++++++ .../refill_pride.png | Bin 0 -> 796 bytes .../VendingMachines/pride.rsi/broken.png | Bin 0 -> 1719 bytes .../VendingMachines/pride.rsi/meta.json | 31 ++++++++++++++++++ .../pride.rsi/normal-unshaded.png | Bin 0 -> 912 bytes .../VendingMachines/pride.rsi/off.png | Bin 0 -> 1439 bytes .../VendingMachines/pride.rsi/panel.png | Bin 0 -> 190 bytes 20 files changed, 157 insertions(+) create mode 100644 Resources/Locale/en-US/deltav/advertisements/vending/pride.yml create mode 100644 Resources/Locale/en-US/deltav/catalog/cargo/cargo-vending.ftl create mode 100644 Resources/Locale/en-US/deltav/catalog/fills/crates/vending-crates.ftl create mode 100644 Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml create mode 100644 Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml create mode 100644 Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml create mode 100644 Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml create mode 100644 Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/base.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/green_bit.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/refill_pride.png create mode 100644 Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/broken.png create mode 100644 Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/normal-unshaded.png create mode 100644 Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/off.png create mode 100644 Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/panel.png diff --git a/Resources/Locale/en-US/deltav/advertisements/vending/pride.yml b/Resources/Locale/en-US/deltav/advertisements/vending/pride.yml new file mode 100644 index 00000000000..21817f49e2d --- /dev/null +++ b/Resources/Locale/en-US/deltav/advertisements/vending/pride.yml @@ -0,0 +1,3 @@ +advertisement-pride-1 = Be gay do crime! +advertisement-pride-2 = Full of colors! +advertisement-pride-3 = You are valid! \ No newline at end of file diff --git a/Resources/Locale/en-US/deltav/catalog/cargo/cargo-vending.ftl b/Resources/Locale/en-US/deltav/catalog/cargo/cargo-vending.ftl new file mode 100644 index 00000000000..9d7ece7aa5d --- /dev/null +++ b/Resources/Locale/en-US/deltav/catalog/cargo/cargo-vending.ftl @@ -0,0 +1,2 @@ +ent-CrateVendingMachineRestockPride = { ent-CrateVendingMachineRestockPrideFilled } + .desc = { ent-CrateVendingMachineRestockPrideFilled.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/deltav/catalog/fills/crates/vending-crates.ftl b/Resources/Locale/en-US/deltav/catalog/fills/crates/vending-crates.ftl new file mode 100644 index 00000000000..c85296a6497 --- /dev/null +++ b/Resources/Locale/en-US/deltav/catalog/fills/crates/vending-crates.ftl @@ -0,0 +1,2 @@ +ent-CrateVendingMachineRestockPrideFilled = Pride-O-Mat restock crate + .desc = Contains a restock box for the Pride-O-Mat. \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml new file mode 100644 index 00000000000..dffc6989b19 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml @@ -0,0 +1,9 @@ +- type: cargoProduct + id: CrateVendingMachineRestockPride + icon: + sprite: Objects/Specific/Service/vending_machine_restock.rsi + state: base + product: CrateVendingMachineRestockPrideFilled + cost: 1000 + category: Service + group: market \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml new file mode 100644 index 00000000000..985b0443e2b --- /dev/null +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml @@ -0,0 +1,7 @@ +- type: entity + id: CrateVendingMachineRestockPrideFilled + parent: CratePlastic + components: + - type: StorageFill + contents: + - id: VendingMachineRestockPride \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml new file mode 100644 index 00000000000..f24ff8fa512 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml @@ -0,0 +1,6 @@ +- type: advertisementsPack + id: PrideDrobeAds + advertisements: + - advertisement-pride-1 + - advertisement-pride-2 + - advertisement-pride-3 \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml new file mode 100644 index 00000000000..941c52a8356 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml @@ -0,0 +1,20 @@ +- type: vendingMachineInventory + id: PrideDrobeInventory + startingInventory: + ClothingNeckLGBTPin: 3 + ClothingNeckAromanticPin: 3 + ClothingNeckAsexualPin: 3 + ClothingNeckBisexualPin: 3 + ClothingNeckIntersexPin: 3 + ClothingNeckLesbianPin: 3 + ClothingNeckNonBinaryPin: 3 + ClothingNeckPansexualPin: 3 + ClothingNeckTransPin: 3 + PlushieSharkBlue: 2 + PlushieSharkPink: 2 + PlushieSharkGrey: 2 + ClothingNeckCloakTrans: 2 + ClothingHeadHatXmasCrown: 2 + BedsheetRainbow: 2 + ClothingUniformColorRainbow: 2 + ClothingUnderSocksCoder: 1 \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml new file mode 100644 index 00000000000..febf8d2765a --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml @@ -0,0 +1,25 @@ +- type: entity + parent: BaseVendingMachineRestock + id: BaseVendingMachineRestockDeltaV + name: vending machine restock box + description: A box for restocking vending machines with corporate goodies. + abstract: true + components: + - type: Sprite + sprite: DeltaV/Objects/Specific/Service/vending_machine_restock.rsi + +- type: entity + parent: BaseVendingMachineRestockDeltaV + id: VendingMachineRestockPride + name: Pride-O-Mat restock box + description: The station needs more plushie sharks and you know it. + components: + - type: VendingMachineRestock + canRestock: + - PrideDrobeInventory + - type: Sprite + layers: + - state: base + - state: green_bit + shader: unshaded + - state: refill_pride diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml new file mode 100644 index 00000000000..3956cb7cffd --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml @@ -0,0 +1,24 @@ +- type: entity + parent: VendingMachine + id: VendingMachinePride + name: Pride-O-Mat + description: A vending machine containing crimes. + components: + - type: VendingMachine + pack: PrideDrobeInventory + offState: off + brokenState: broken + normalState: normal-unshaded + - type: Advertise + pack: PrideDrobeAds + - type: Speech + - type: Sprite + sprite: DeltaV/Structures/Machines/VendingMachines/pride.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/base.png b/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..01a8c4ed215cd3473a68bc2ec243281307e9007f GIT binary patch literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvmUKs7M+SzC{oH>NS%G|&0G|+7 zAg$-6XJ&2Z>gDI@AM70%>K7Ur7Mm24oSBkSRNc}wZSJCl(b`Nvb&MrJe!&b5&u*jv zIoX~rjv*T7lM^Id8urRCaV0Qa-QBpr#KeSS8N-qLa$N!|=5Vq+eY$kv!4piz>3;3p z5%2HuUStv8(6l0=N8kkmvksG^2!}(>CW|W^S_`JKF(q|3izYDXC2Wvb*5D}oXv0YZ hRvxbag9(954EOhV{`}>#VlmKK22WQ%mvv4FO#tw0O9=n~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/green_bit.png b/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/green_bit.png new file mode 100644 index 0000000000000000000000000000000000000000..e362ff17152e40bd6447a9263d5ba02dccb23bb0 GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`?>!lvI6;*0X`wF zg=Hc~j~+EJ(w#nidPqpfA_j&A1_logkCc=Y2IH9w3~7#zj!>FVdQ&MBb@0Ew$F`Tzg` literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..0c543aa0751c12cf5969a8a87bb29d3128b02e16 GIT binary patch literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSEa{HEjtmSN`?>!lvI6;>0X`wF zK-$dOE+#p%Bi7au$YCrA@(X5gcy=QV$Z_y=aSX9Iotz-Sx`naN;mnIBl?j|e5l)jF zG&~eiOmy1iI2^=hICwO0Djj(7f!lvI6;>0X`wF zK-$dOE+#p%Bi7au$YCrA@(X5gcy=QV$Z_;^aSX9Iotz-SdWF45hhv*|L;|Oi!eoy| zffk1s858(i4|M4rXbWz*c#%=*0)ub_t6)N@gRp~&5l>?P`>tw121O2zD}D7H_ko5n Nc)I$ztaD0e0sv9>EsOvF literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/meta.json new file mode 100644 index 00000000000..b4d6a7706ca --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/meta.json @@ -0,0 +1,28 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Original source: https://github.com/tgstation/tgstation/blob/master/icons/obj/vending_restock.dmi @ commit 014c44ef6279beb02a5f3e76824439fa57181c22 - Additions and cleanup by @Vordenburg. Refill_pride made by Dorragon for Delta-V", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "green_bit" + }, + { + "name": "refill_pride" + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/refill_pride.png b/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/refill_pride.png new file mode 100644 index 0000000000000000000000000000000000000000..f31c671e49ff29e8505718c3e33ecb1b7e04b2ee GIT binary patch literal 796 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/panel.png b/Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/panel.png new file mode 100644 index 0000000000000000000000000000000000000000..0032751ff4ffedd3d0ecc00eaf4e0ab459929e9f GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJR!TD@E@bvU_NvA($#wnr(!Xc+! zxY-SW0LU@E^H5*bg578Khv|+_lg$sW*?jCvdBeJOdWZj3DYB`nt4B%rOPnz=`)6-p h#&6~hvQUMA!DX(Lkd@zrT|fshc)I$ztaD0e0svz&KxzO0 literal 0 HcmV?d00001 From 7d23332fefc57b03cf021477c10cfa32c47a430c Mon Sep 17 00:00:00 2001 From: Dvir Date: Wed, 6 Dec 2023 01:10:39 +0200 Subject: [PATCH 2/2] Fixing For Frontier --- .../catalog/fills/crates/vending-crates.ftl | 2 +- .../DeltaV/Catalog/Cargo/cargo_vending.yml | 4 ++-- .../DeltaV/Catalog/Fills/Crates/vending.yml | 5 +++-- .../Specific/Service/vending_machine_restock.yml | 15 +++------------ .../Structures/Machines/vending_machines.yml | 2 +- 5 files changed, 10 insertions(+), 18 deletions(-) diff --git a/Resources/Locale/en-US/deltav/catalog/fills/crates/vending-crates.ftl b/Resources/Locale/en-US/deltav/catalog/fills/crates/vending-crates.ftl index c85296a6497..98f3695dc14 100644 --- a/Resources/Locale/en-US/deltav/catalog/fills/crates/vending-crates.ftl +++ b/Resources/Locale/en-US/deltav/catalog/fills/crates/vending-crates.ftl @@ -1,2 +1,2 @@ ent-CrateVendingMachineRestockPrideFilled = Pride-O-Mat restock crate - .desc = Contains a restock box for the Pride-O-Mat. \ No newline at end of file + .desc = Contains two restock boxes for a Pride-O-Mat. \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml index dffc6989b19..70dfb3433b0 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml @@ -4,6 +4,6 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockPrideFilled - cost: 1000 + cost: 100 category: Service - group: market \ No newline at end of file + group: market diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml index 985b0443e2b..553074aa1f4 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml @@ -1,7 +1,8 @@ - type: entity id: CrateVendingMachineRestockPrideFilled - parent: CratePlastic + parent: CratePlasticBiodegradable components: - type: StorageFill contents: - - id: VendingMachineRestockPride \ No newline at end of file + - id: VendingMachineRestockPride + amount: 2 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml index febf8d2765a..427bd29de45 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml @@ -1,23 +1,14 @@ - type: entity - parent: BaseVendingMachineRestock - id: BaseVendingMachineRestockDeltaV - name: vending machine restock box - description: A box for restocking vending machines with corporate goodies. - abstract: true - components: - - type: Sprite - sprite: DeltaV/Objects/Specific/Service/vending_machine_restock.rsi - -- type: entity - parent: BaseVendingMachineRestockDeltaV + parent: SecuredVendingMachineRestock id: VendingMachineRestockPride name: Pride-O-Mat restock box - description: The station needs more plushie sharks and you know it. + description: The station needs more plushie sharks and you know it. A label reads THE BOX IS TAMPER PROOF AND WILL DESTROY IT'S CONTENT ON HARM. components: - type: VendingMachineRestock canRestock: - PrideDrobeInventory - type: Sprite + sprite: DeltaV/Objects/Specific/Service/vending_machine_restock.rsi layers: - state: base - state: green_bit diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml index 3956cb7cffd..ea8e5a9994f 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml @@ -21,4 +21,4 @@ map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] shader: unshaded - state: panel - map: ["enum.WiresVisualLayers.MaintenancePanel"] \ No newline at end of file + map: ["enum.WiresVisualLayers.MaintenancePanel"]