From 25647c5fb865ed68583af9947fda34e816178ef5 Mon Sep 17 00:00:00 2001 From: Dorragon Date: Thu, 14 Sep 2023 04:35:04 +0300 Subject: [PATCH 1/3] Everything everywhere all at once --- .../prototypes/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 +++++++ .../Specific/Service/vending_machine_restock.yml | 15 +++++++++++++++ .../vending_machine_restock.rsi/meta.json | 5 ++++- .../vending_machine_restock.rsi/refill_pride.png | Bin 0 -> 796 bytes 7 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 Resources/Locale/en-US/delta-v/prototypes/catalog/cargo/cargo-vending.ftl create mode 100644 Resources/Locale/en-US/delta-v/prototypes/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/Entities/Objects/Specific/Service/vending_machine_restock.yml create mode 100644 Resources/Textures/Objects/Specific/Service/vending_machine_restock.rsi/refill_pride.png diff --git a/Resources/Locale/en-US/delta-v/prototypes/catalog/cargo/cargo-vending.ftl b/Resources/Locale/en-US/delta-v/prototypes/catalog/cargo/cargo-vending.ftl new file mode 100644 index 0000000000..9d7ece7aa5 --- /dev/null +++ b/Resources/Locale/en-US/delta-v/prototypes/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/delta-v/prototypes/catalog/fills/crates/vending-crates.ftl b/Resources/Locale/en-US/delta-v/prototypes/catalog/fills/crates/vending-crates.ftl new file mode 100644 index 0000000000..c85296a649 --- /dev/null +++ b/Resources/Locale/en-US/delta-v/prototypes/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 0000000000..83d21bdfa3 --- /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: 900 + 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 0000000000..985b0443e2 --- /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/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 0000000000..91492b8156 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml @@ -0,0 +1,15 @@ +- type: entity + parent: BaseVendingMachineRestock + 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 \ No newline at end of file diff --git a/Resources/Textures/Objects/Specific/Service/vending_machine_restock.rsi/meta.json b/Resources/Textures/Objects/Specific/Service/vending_machine_restock.rsi/meta.json index 86e7d78e36..b9d5fdc0e7 100644 --- a/Resources/Textures/Objects/Specific/Service/vending_machine_restock.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Service/vending_machine_restock.rsi/meta.json @@ -1,7 +1,7 @@ { "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_honk made by brainfood1183 (github) for ss14. Refill_robotics made by potato1234x (github) for ss14.", + "copyright": "Original source: https://github.com/tgstation/tgstation/blob/master/icons/obj/vending_restock.dmi @ commit 014c44ef6279beb02a5f3e76824439fa57181c22 - Additions and cleanup by @Vordenburg. Refill_honk made by brainfood1183 (github) for ss14. Refill_robotics made by potato1234x (github) for ss14. Refill_pride made by Dorragon for Delta-V", "size": { "x": 32, "y": 32 @@ -98,6 +98,9 @@ }, { "name": "refill_tanks" + }, + { + "name": "refill_pride" } ] } diff --git a/Resources/Textures/Objects/Specific/Service/vending_machine_restock.rsi/refill_pride.png b/Resources/Textures/Objects/Specific/Service/vending_machine_restock.rsi/refill_pride.png new file mode 100644 index 0000000000000000000000000000000000000000..f31c671e49ff29e8505718c3e33ecb1b7e04b2ee GIT binary patch literal 796 zcmV+%1LOROP)WU>iK9A*+E*a|il0SnQ_ zt?(acE7&Rsf+C36*}F9o#`}^$f+TNvb3e{|=W^!^I0I=tW3|jeCYv*ZexJ4yUe(&( z>7WM~MvLf{v9L5BqUrj1#G&egSM_Rsui@&7#Vs8i?ZVT#VdjKo8UkB6L-C$)zn+T3 zginM$rVJ>2tMq7v-xMb+{H53o1?Rx2dTPl!j@GfBGBd*C!XuezUf?=g^KVK{GvA^YYud;$^zOjrO-+j) zz|}4cJR1=+QkGn@orwf|TtIgi`tG4~t&&ysobx9LZObpZgTo^jll#5ve-c_~5+Z^@ znE(I)32;bRa{vGf5&!@T5&_cPe*6Fc0aZyvK~z{rV_+BsqaiRF0;3@?z#+g$P5WmH z2>dtu`gJ`0S+X*kH|Aj=E?P9Zv!@w${$$$sV>yaf=c=8dW!4S~@R7!85p a8v+0{#(`0aE>brD0000 Date: Thu, 21 Sep 2023 03:20:13 +0300 Subject: [PATCH 2/3] Redid things to not touch upstream files, upped the price a little --- .../DeltaV/Catalog/Cargo/cargo_vending.yml | 2 +- .../Service/vending_machine_restock.yml | 10 +++++++ .../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 .../vending_machine_restock.rsi/meta.json | 5 +--- 9 files changed, 40 insertions(+), 5 deletions(-) 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 rename Resources/Textures/{ => DeltaV}/Objects/Specific/Service/vending_machine_restock.rsi/refill_pride.png (100%) diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml index 83d21bdfa3..dffc6989b1 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: 900 + cost: 1000 category: Service group: market \ 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 index 91492b8156..9d5e6ad7dc 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,5 +1,15 @@ - type: entity parent: BaseVendingMachineRestock + id: BaseVendingMachineRestockDeltaV + name: vending machine restock box + description: A box for restocking vending machines with corporate goodies. + noSpawn: 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. 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 0000000000..b4d6a7706c --- /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/Objects/Specific/Service/vending_machine_restock.rsi/refill_pride.png b/Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/refill_pride.png similarity index 100% rename from Resources/Textures/Objects/Specific/Service/vending_machine_restock.rsi/refill_pride.png rename to Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/refill_pride.png diff --git a/Resources/Textures/Objects/Specific/Service/vending_machine_restock.rsi/meta.json b/Resources/Textures/Objects/Specific/Service/vending_machine_restock.rsi/meta.json index b9d5fdc0e7..86e7d78e36 100644 --- a/Resources/Textures/Objects/Specific/Service/vending_machine_restock.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Service/vending_machine_restock.rsi/meta.json @@ -1,7 +1,7 @@ { "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_honk made by brainfood1183 (github) for ss14. Refill_robotics made by potato1234x (github) for ss14. Refill_pride made by Dorragon for Delta-V", + "copyright": "Original source: https://github.com/tgstation/tgstation/blob/master/icons/obj/vending_restock.dmi @ commit 014c44ef6279beb02a5f3e76824439fa57181c22 - Additions and cleanup by @Vordenburg. Refill_honk made by brainfood1183 (github) for ss14. Refill_robotics made by potato1234x (github) for ss14.", "size": { "x": 32, "y": 32 @@ -98,9 +98,6 @@ }, { "name": "refill_tanks" - }, - { - "name": "refill_pride" } ] } From 92ae77467515f075dc1a0b2cb9982446b4a61253 Mon Sep 17 00:00:00 2001 From: Dorragon <101672978+Dorragon@users.noreply.github.com> Date: Thu, 21 Sep 2023 21:49:20 +0300 Subject: [PATCH 3/3] Im stupid and forgot to do make it abstract again --- .../Objects/Specific/Service/vending_machine_restock.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 9d5e6ad7dc..febf8d2765 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 @@ -3,7 +3,7 @@ id: BaseVendingMachineRestockDeltaV name: vending machine restock box description: A box for restocking vending machines with corporate goodies. - noSpawn: true + abstract: true components: - type: Sprite sprite: DeltaV/Objects/Specific/Service/vending_machine_restock.rsi @@ -22,4 +22,4 @@ - state: base - state: green_bit shader: unshaded - - state: refill_pride \ No newline at end of file + - state: refill_pride