Skip to content

Commit

Permalink
Revert "Revert "Pride-o-mat and refill for it (#22)""
Browse files Browse the repository at this point in the history
This reverts commit baff326.
  • Loading branch information
Spatison committed Oct 11, 2024
1 parent 74cbc04 commit f59e00a
Show file tree
Hide file tree
Showing 19 changed files with 199 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-CrateVendingMachineRestockPride = { ent-CrateVendingMachineRestockPrideFilled }
.desc = { ent-CrateVendingMachineRestockPrideFilled.desc }
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.
9 changes: 9 additions & 0 deletions Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml
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
7 changes: 7 additions & 0 deletions Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml
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
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
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
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
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"]]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
]
]
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit f59e00a

Please sign in to comment.