From: Alpaccalypse <21291379+Alpaccalypse@users.noreply.github.com> Date: Wed, 15 Jan 2025 18:20:01 +0000 (+0000) Subject: Smite vending machine (#34420) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=3cac75f117bf389a792f795f20963c6cad2b36ef;p=space-station-14.git Smite vending machine (#34420) * Added smite machine to YAML * Added smite ads and inventory * Added smite vendor sprites * Changed the description of the machine to not repeat and ad line. * Added newline to end of inventory .yml * Corrected erroneous edit. * Tweaked all sprites * Added tesla toy to contraband. Reduced number of drinks available * Reduced soda varieties but increased can numbers. * Removed tesla toy from contraband inventory * Removed speech component from vending machines that already inherit it * Moved Sprite component to top of list * Added Smite vendors to random spanwers * Alphabetised spawn prototypes, commented where name is unclear --- diff --git a/Resources/Locale/en-US/advertisements/vending/smite.ftl b/Resources/Locale/en-US/advertisements/vending/smite.ftl new file mode 100644 index 0000000000..e6214f4627 --- /dev/null +++ b/Resources/Locale/en-US/advertisements/vending/smite.ftl @@ -0,0 +1,12 @@ +advertisement-smite-1 = SMITE! Ban your thirst! +advertisement-smite-2 = An eldritch blast of lemon and lime! +advertisement-smite-3 = Over 1 million drinks sold! +advertisement-smite-4 = SMITE! Roll 2d8 for FLAVOR. +advertisement-smite-5 = SMITE! Let's get that paperwork done! +advertisement-smite-6 = The janitor has it in for you! +advertisement-smite-7 = SMITE! It won't get you hammered. +advertisement-smite-8 = It's lemon-lime time! +thankyou-smite-1 = Smite makes right! +thankyou-smite-2 = You DEFINITELY wanted lemon-lime! +thankyou-smite-3 = The office won't know what hit them. +thankyou-smite-4 = Banish your thirst. diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/smite.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/smite.yml new file mode 100644 index 0000000000..fc0b64b6ca --- /dev/null +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/smite.yml @@ -0,0 +1,13 @@ +- type: vendingMachineInventory + id: SmiteInventory + startingInventory: + DrinkLemonLimeCan: 4 + DrinkLemonLimeCranberryCan: 2 + DrinkColaCan: 2 + DrinkSolDryCan: 2 + contrabandInventory: + ToyHammer: 1 + DrinkStarkistCan: 2 + emaggedInventory: + DrinkNukieCan: 2 + DrinkChangelingStingCan: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml b/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml index 6967c97f5a..3422f564b0 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml @@ -88,6 +88,12 @@ prefix: advertisement-gibb- count: 8 +- type: localizedDataset + id: SmiteAds + values: + prefix: advertisement-smite- + count: 8 + - type: localizedDataset id: CondimentVendAds values: diff --git a/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml b/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml index 61ccc2b044..b63c22d06f 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml @@ -46,6 +46,12 @@ prefix: thankyou-gibb- count: 4 +- type: localizedDataset + id: SmiteGoodbyes + values: + prefix: thankyou-smite- + count: 4 + - type: localizedDataset id: DiscountDansGoodbyes values: diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml index d55a7916b4..746cbc7932 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml @@ -11,24 +11,25 @@ state: any - type: RandomSpawner prototypes: + - VendingMachineChang - VendingMachineCigs - VendingMachineCoffee - - VendingMachineCola - - VendingMachineColaRed - - VendingMachineColaBlack + - VendingMachineCola #Robust Sofdrinks + - VendingMachineColaBlack #Robust Sofdrinks [Black] + - VendingMachineColaRed #Space Cola - VendingMachineDiscount + - VendingMachineDonut + - VendingMachineDrGibb + - VendingMachinePwrGame + - VendingMachineShamblersJuice + - VendingMachineSmite - VendingMachineSnack - VendingMachineSnackBlue - VendingMachineSnackGreen - VendingMachineSnackOrange - VendingMachineSnackTeal - - VendingMachineSovietSoda - - VendingMachineChang - - VendingMachineDonut - - VendingMachineShamblersJuice - - VendingMachinePwrGame - - VendingMachineDrGibb - - VendingMachineSoda - - VendingMachineStarkist + - VendingMachineSoda #Robust Sofdrinks [Soda] + - VendingMachineSovietSoda #Boda - VendingMachineSpaceUp + - VendingMachineStarkist chance: 1 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/vendingdrinks.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/vendingdrinks.yml index a911b7ebfc..1c90664b3d 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/vendingdrinks.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/vendingdrinks.yml @@ -12,14 +12,15 @@ - type: RandomSpawner prototypes: - VendingMachineCoffee - - VendingMachineCola - - VendingMachineColaRed - - VendingMachineColaBlack - - VendingMachineSovietSoda - - VendingMachineShamblersJuice - - VendingMachinePwrGame + - VendingMachineCola #Robust Sofdrinks + - VendingMachineColaBlack #Robust Sofdrinks [Black] + - VendingMachineColaRed #Space Cola - VendingMachineDrGibb - - VendingMachineSoda - - VendingMachineStarkist + - VendingMachinePwrGame + - VendingMachineShamblersJuice + - VendingMachineSmite + - VendingMachineSoda #Robust Sofdrinks [Soda] + - VendingMachineSovietSoda #Boda - VendingMachineSpaceUp + - VendingMachineStarkist chance: 1 diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 92a88c6d06..41d5edf4d4 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -135,7 +135,6 @@ pack: CondimentVendAds - type: SpeakOnUIClosed pack: GenericVendGoodbyes - - type: Speech - type: Transform noRot: false @@ -154,7 +153,6 @@ pack: AmmoVendAds - type: SpeakOnUIClosed pack: GenericVendGoodbyes - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/ammo.rsi layers: @@ -183,7 +181,6 @@ pack: BoozeOMatAds - type: SpeakOnUIClosed pack: BoozeOMatGoodbyes - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/boozeomat.rsi layers: @@ -218,7 +215,6 @@ pack: BruiseOMatAds - type: SpeakOnUIClosed pack: BruiseOMatGoodbyes - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/bruiseomat.rsi layers: @@ -318,7 +314,6 @@ pack: CigaretteMachineAds - type: SpeakOnUIClosed pack: CigaretteMachineGoodbyes - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/cigs.rsi layers: @@ -346,7 +341,6 @@ pack: ClothesMateAds - type: SpeakOnUIClosed pack: GenericVendGoodbyes - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/clothing.rsi layers: @@ -378,7 +372,6 @@ pack: ClothesMateAds - type: SpeakOnUIClosed pack: GenericVendGoodbyes - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/winterdrobe.rsi layers: @@ -417,7 +410,6 @@ pack: HotDrinksMachineAds - type: SpeakOnUIClosed pack: HotDrinksMachineGoodbyes - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/coffee.rsi layers: @@ -457,7 +449,6 @@ pack: RobustSoftdrinksAds - type: SpeakOnUIClosed pack: RobustSoftdrinksGoodbyes - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/cola.rsi layers: @@ -601,7 +592,6 @@ initialStockQuality: 0.33 - type: Advertise pack: RobustSoftdrinksAds - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/shamblersjuice.rsi layers: @@ -638,7 +628,6 @@ pack: RobustSoftdrinksAds - type: SpeakOnUIClosed pack: GenericVendGoodbyes - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/pwrgame.rsi layers: @@ -675,7 +664,6 @@ pack: DrGibbAds - type: SpeakOnUIClosed pack: DrGibbGoodbyes - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/gib.rsi layers: @@ -691,6 +679,42 @@ energy: 1.6 color: "#D82929" +- type: entity + parent: VendingMachine + id: VendingMachineSmite + name: Smite Vendor + description: Popular with the administration. + components: + - type: Sprite + sprite: Structures/Machines/VendingMachines/smite.rsi + layers: + - state: "off" + map: [ "enum.VendingMachineVisualLayers.Base" ] + - state: "off" + map: [ "enum.VendingMachineVisualLayers.BaseUnshaded" ] + shader: unshaded + - state: panel + map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + - type: VendingMachine + pack: SmiteInventory + dispenseOnHitChance: 0.25 + dispenseOnHitThreshold: 2 + offState: off + brokenState: broken + normalState: normal-unshaded + ejectState: eject-unshaded + denyState: deny-unshaded + ejectDelay: 1.9 + initialStockQuality: 0.33 + - type: Advertise + pack: SmiteAds + - type: SpeakOnUIClosed + pack: SmiteGoodbyes + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#00E645" + - type: entity parent: VendingMachine id: VendingMachineDinnerware @@ -772,7 +796,6 @@ pack: DiscountDansAds - type: SpeakOnUIClosed pack: DiscountDansGoodbyes - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/discount.rsi layers: @@ -989,7 +1012,6 @@ pack: GetmoreChocolateCorpAds - type: SpeakOnUIClosed pack: GetmoreChocolateCorpGoodbyes - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/snack.rsi layers: @@ -1135,7 +1157,6 @@ pack: BodaAds - type: SpeakOnUIClosed pack: BodaGoodbyes - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/sovietsoda.rsi layers: @@ -1169,7 +1190,6 @@ pack: AutoDrobeAds - type: SpeakOnUIClosed pack: GenericVendGoodbyes - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/theater.rsi layers: @@ -1205,7 +1225,6 @@ pack: VendomatAds - type: SpeakOnUIClosed pack: GenericVendGoodbyes - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/vendomat.rsi layers: @@ -1238,7 +1257,6 @@ pack: VendomatAds - type: SpeakOnUIClosed pack: GenericVendGoodbyes - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/robotics.rsi layers: @@ -1337,7 +1355,6 @@ pack: ChangAds - type: SpeakOnUIClosed pack: ChangGoodbyes - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/changs.rsi layers: @@ -1403,7 +1420,6 @@ pack: DonutAds - type: SpeakOnUIClosed pack: DonutGoodbyes - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/donut.rsi layers: diff --git a/Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/broken.png new file mode 100644 index 0000000000..941a4688d4 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/deny-unshaded.png new file mode 100644 index 0000000000..0e184b422b Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/eject-unshaded.png new file mode 100644 index 0000000000..57ae39a2e9 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/meta.json new file mode 100644 index 0000000000..a294fc116f --- /dev/null +++ b/Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/meta.json @@ -0,0 +1,56 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by Alpaccalypse for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "normal-unshaded", + "delays": [ + [ + 2.5, + 0.1, + 3.4, + 0.1 + ] + ] + }, + { + "name": "broken" + }, + { + "name": "normal" + }, + { + "name": "deny-unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "eject-unshaded", + "delays": [ + [ + 0.5, + 0.1, + 1.0, + 0.1, + 0.1 + ] + ] + }, + { + "name": "off" + }, + { + "name": "panel" + } + ] +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/normal-unshaded.png new file mode 100644 index 0000000000..919e308cb7 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/normal.png b/Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/normal.png new file mode 100644 index 0000000000..8b0b3d4919 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/normal.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/off.png new file mode 100644 index 0000000000..069a743512 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/panel.png new file mode 100644 index 0000000000..9ef52cc2cb Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/panel.png differ