Skip to content

Commit

Permalink
Adds the CiviMed Vending Machine (new-frontiers-14#1637)
Browse files Browse the repository at this point in the history
* Adds the CiviMed Vending Machine

High priced medical supplies for long duration playerbase needs.

* Panel snuck aboard. Removes.

Panel snuck aboard. Removes.

* Fix

Possible case sensitivity.

* Update meta.json

case issue

* Fixes

Ongoing efforts to pin down github losing its mind.

* FIX!?

Ok github I want to go to bed so let's make a deal

* Update meta.json

* Weird idea of how to address the issue with the file casing

* Yup.

* Update vending_machines.yml

* Update vending_machine_restock.yml

* Update vending_machines.yml

* Update dungeon_items_general.yml

* Update dungeon_items_medical.yml

* Update Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml

Co-authored-by: Whatstone <[email protected]>

* Update Resources/Locale/en-US/_NF/advertisements/vending/civimed.ftl

Co-authored-by: Whatstone <[email protected]>

* Update Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml

Co-authored-by: Whatstone <[email protected]>

---------

Co-authored-by: Dvir <[email protected]>
Co-authored-by: Dvir <[email protected]>
Co-authored-by: Whatstone <[email protected]>
  • Loading branch information
4 people authored Jul 27, 2024
1 parent d727ba1 commit 1c236cb
Show file tree
Hide file tree
Showing 18 changed files with 150 additions and 6 deletions.
9 changes: 9 additions & 0 deletions Resources/Locale/en-US/_NF/advertisements/vending/civimed.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
advertisement-civimed-1 = MINERS, DON'T DIE!
advertisement-civimed-2 = You're better than dying in space! Stock up now!
advertisement-civimed-3 = We're not overcharging you, we just know what you're worth! Pay up!
advertisement-civimed-4 = Your money or your life! This is not legally a threat!
advertisement-civimed-5 = Nine out of ten corpses did NOT stock up on medicine! The last one was an idiot.
advertisement-civimed-6 = Packs laden with loot are often low on supplies.
advertisement-civimed-7 = Get gouged, not burned. Patch yourself up!
advertisement-civimed-8 = I'm not a doctor, but you could be! Self-medicate the pain away!
advertisement-civimed-9 = Focus groups show our products are MOSTLY SAFE for consumption!
11 changes: 11 additions & 0 deletions Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,14 @@
cost: 100 # Frontier
category: cargoproduct-category-name-fun
group: market

- type: cargoProduct
id: CrateVendingMachineRestockCiviMed
abstract: true
icon:
sprite: _NF/Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockCiviMedFilled
cost: 100 # Frontier
category: cargoproduct-category-name-medical
group: market
11 changes: 11 additions & 0 deletions Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,14 @@
contents:
- id: VendingMachineRestockPottedPlantVend
amount: 2

- type: entity
id: CrateVendingMachineRestockCiviMedVendFilled
parent: CratePlasticBiodegradable
name: CiviMed restock crate
description: Contains two restock boxes for the CiviMed vending machine.
components:
- type: StorageFill
contents:
- id: VendingMachineRestockCiviMedVend
amount: 2
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
- type: localizedDataset
id: CiviMedAds
values:
prefix: advertisement-civimed-
count: 9
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
- type: vendingMachineInventory
id: CiviMedVendInventory
startingInventory:
Brutepack: 20
Ointment: 20
Bloodpack: 20
Gauze: 20
Original file line number Diff line number Diff line change
Expand Up @@ -1047,6 +1047,7 @@
- VendingMachineRestockEngineering
- VendingMachineRestockGames
- VendingMachineRestockMedical
- VendingMachineRestockCiviMedVend
- VendingMachineRestockNutriMax
- VendingMachineRestockSalvageEquipment
- VendingMachineRestockSeeds
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,7 @@
prototypes:
- CrateVendingMachineRestockMedicalFilled
- CrateVendingMachineRestockChemVendFilled
- CrateVendingMachineRestockCiviMedVendFilled
chance: 1.0
offset: 0.0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -194,3 +194,20 @@
- state: green_bit
shader: unshaded
- state: refill_contravend

- type: entity
parent: SecuredVendingMachineRestock
id: VendingMachineRestockCiviMedVend
name: CiviMed restock box
description: A box containing medical supplies for the CiviMed vending machine. A label reads THE BOX IS TAMPER PROOF AND WILL DESTROY IT'S CONTENT ON HARM.
components:
- type: VendingMachineRestock
canRestock:
- CiviMedVendInventory
- type: Sprite
sprite: _NF/Objects/Specific/Service/vending_machine_restock.rsi
layers:
- state: base
- state: green_bit
shader: unshaded
- state: refill_civimed
Original file line number Diff line number Diff line change
Expand Up @@ -599,3 +599,34 @@
shader: unshaded
- state: panel
map: ["enum.WiresVisualLayers.MaintenancePanel"]

- type: entity
parent: [BaseStructureUnanchorable, BaseStructureIndestructible, VendingMachine]
id: VendingMachineCiviMedVend
name: CiviMedVend
description: CiviMed, distributing lifesaving meds harder than the rocks you break! Miners, DON'T DIE!
components:
- type: VendingMachine
pack: CiviMedVendInventory
offState: off
brokenState: broken
normalState: normal-unshaded
# ejectState: eject-unshaded No sprite, see chefvend/dinnerware/BODA/etc for expamples
- type: Advertise
pack: CiviMedAds
- type: Sprite
sprite: _NF/Structures/Machines/VendingMachines/civimed.rsi
layers:
- state: "off"
map: ["enum.VendingMachineVisualLayers.Base"]
- state: "off"
map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
shader: unshaded
- state: panel
map: ["enum.WiresVisualLayers.MaintenancePanel"]
- type: PointLight
radius: 1.5
energy: 1.6
color: "#4b93ad"
- type: MarketModifier
mod: 15
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,14 @@
{
"name": "refill_nfsdtec"
},
{
"name": "refill_nonlethal"
},
{
"name": "refill_contravend"
}
{
"name": "refill_nonlethal"
},
{
"name": "refill_contravend"
},
{
"name": "refill_civimed"
}
]
}
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,48 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Dusty Lens",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "normal-unshaded",
"delays": [
[
0.5,
0.5
]
]
},
{
"name": "broken"
},
{
"name": "deny-unshaded",
"delays": [
[
0.1,
0.1
]
]
},
{
"name": "off"
},
{
"name": "panel"
},
{
"name": "eject-unshaded",
"delays": [
[
0.1,
0.4,
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 1c236cb

Please sign in to comment.