-
Notifications
You must be signed in to change notification settings - Fork 34
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "Revert "Pride-o-mat and refill for it (#22)""
This reverts commit baff326.
- Loading branch information
Showing
19 changed files
with
199 additions
and
0 deletions.
There are no files selected for viewing
2 changes: 2 additions & 0 deletions
2
Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-vending.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
ent-CrateVendingMachineRestockPride = { ent-CrateVendingMachineRestockPrideFilled } | ||
.desc = { ent-CrateVendingMachineRestockPrideFilled.desc } |
2 changes: 2 additions & 0 deletions
2
Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/vending-crates.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
ent-CrateVendingMachineRestockPrideFilled = Pride-O-Mat restock crate | ||
.desc = Contains a restock box for the Pride-O-Mat. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
- type: cargoProduct | ||
id: CrateVendingMachineRestockPride | ||
icon: | ||
sprite: Objects/Specific/Service/vending_machine_restock.rsi | ||
state: base | ||
product: CrateVendingMachineRestockPrideFilled | ||
cost: 1100 | ||
category: Service | ||
group: market |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
- type: entity | ||
id: CrateVendingMachineRestockPrideFilled | ||
parent: CratePlastic | ||
components: | ||
- type: StorageFill | ||
contents: | ||
- id: VendingMachineRestockPride |
12 changes: 12 additions & 0 deletions
12
Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
- type: messagePack | ||
id: PrideDrobeAds | ||
messages: | ||
- advertisement-pride-1 | ||
- advertisement-pride-2 | ||
- advertisement-pride-3 | ||
|
||
- type: messagePack | ||
id: PrideDrobeGoodbyes | ||
messages: | ||
- thankyou-pride-1 | ||
- thankyou-pride-2 |
29 changes: 29 additions & 0 deletions
29
Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
- 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 | ||
ClothingNeckCloakAro: 2 | ||
ClothingNeckCloakAce: 2 | ||
ClothingNeckCloakBi: 2 | ||
ClothingNeckCloakIntersex: 2 | ||
ClothingNeckCloakEnby: 2 | ||
ClothingNeckCloakPan: 2 | ||
ClothingNeckCloakGay: 2 | ||
ClothingNeckCloakLesbian: 2 | ||
ClothingHeadHatXmasCrown: 2 | ||
BedsheetRainbow: 2 | ||
ClothingUniformColorRainbow: 2 | ||
ClothingUnderSocksCoder: 1 | ||
ClothingUnderSocksBee: 1 |
25 changes: 25 additions & 0 deletions
25
Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
54 changes: 54 additions & 0 deletions
54
Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
- 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: SpeakOnUIClosed | ||
pack: PrideDrobeGoodbyes | ||
- 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"] | ||
|
||
- type: entity | ||
parent: VendingMachine | ||
id: VendingMachineCourierDrobe | ||
name: CourierDrobe | ||
description: Neither solar flares nor meteors nor plasma fire nor void of space stays these couriers from the swift completion of their appointed rounds. | ||
components: | ||
- type: VendingMachine | ||
pack: CourierDrobeInventory | ||
offState: off | ||
brokenState: broken | ||
normalState: normal-unshaded | ||
- type: Advertise | ||
pack: CourierDrobeAds | ||
- type: SpeakOnUIClosed | ||
pack: CourierDrobeGoodbyes | ||
- type: Sprite | ||
sprite: DeltaV/Structures/Machines/VendingMachines/courierdrobe.rsi | ||
layers: | ||
- state: "off" | ||
map: ["enum.VendingMachineVisualLayers.Base"] | ||
- state: "off" | ||
map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] | ||
shader: unshaded | ||
- state: panel | ||
map: ["enum.WiresVisualLayers.MaintenancePanel"] | ||
- type: AccessReader | ||
access: [["Mail"]] |
Binary file added
BIN
+241 Bytes
...s/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/base.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+175 Bytes
...tures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/green_bit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+171 Bytes
...res/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/inhand-left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+172 Bytes
...es/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 28 additions & 0 deletions
28
Resources/Textures/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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" | ||
} | ||
] | ||
} |
Binary file added
BIN
+796 Bytes
...es/DeltaV/Objects/Specific/Service/vending_machine_restock.rsi/refill_pride.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.68 KB
Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/broken.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 31 additions & 0 deletions
31
Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-4.0", | ||
"copyright": "The art belongs to Woods#1999 on discord", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "broken" | ||
}, | ||
{ | ||
"name": "off" | ||
}, | ||
{ | ||
"name": "panel" | ||
}, | ||
{ | ||
"name": "normal-unshaded", | ||
"delays": [ | ||
[ | ||
1.5, | ||
0.1, | ||
1.5, | ||
0.1 | ||
] | ||
] | ||
} | ||
] | ||
} |
Binary file added
BIN
+912 Bytes
...xtures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/normal-unshaded.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.41 KB
Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/off.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+190 Bytes
Resources/Textures/DeltaV/Structures/Machines/VendingMachines/pride.rsi/panel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.