Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pride o mat #659

Merged
merged 2 commits into from
Dec 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
advertisement-pride-1 = Be gay do crime!
advertisement-pride-2 = Full of colors!
advertisement-pride-3 = You are valid!
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/deltav/catalog/cargo/cargo-vending.ftl
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 two restock boxes for a 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: 100
category: Service
group: market
8 changes: 8 additions & 0 deletions Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
- type: entity
id: CrateVendingMachineRestockPrideFilled
parent: CratePlasticBiodegradable
components:
- type: StorageFill
contents:
- id: VendingMachineRestockPride
amount: 2
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- type: advertisementsPack
id: PrideDrobeAds
advertisements:
- advertisement-pride-1
- advertisement-pride-2
- advertisement-pride-3
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
- type: entity
parent: SecuredVendingMachineRestock
id: VendingMachineRestockPride
name: Pride-O-Mat restock box
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
shader: unshaded
- state: refill_pride
Original file line number Diff line number Diff line change
@@ -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"]
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.
Loading