mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-20 03:19:58 +01:00
Repaths obj/machinery to obj/structure/machinery. **Note for reviewers:** the only meaningful changed code exists within **code/game/objects/structures.dm** and **code/game/objects/structures/_machinery.dm**, largely concerning damage procs. With the exception of moving airlock defines to their own file, ALL OTHER CHANGES ARE STRICTLY PATH CHANGES. Objects, _categorically_, are largely divided between those you can hold in your hand/inventory and those you can't. Machinery objects are already subtypes of Structures behaviorally, this PR just makes their pathing reflect that, and allows for future work (tool actions, more health/destruction functionality) to be developed without unnecessary code duplication. I have tested this PR by loading up the Horizon and dismantling various machines and structures with tools, shooting guns of various types throughout the ship, and detonating a bunch of explosions throughout the ship.
226 lines
11 KiB
Plaintext
226 lines
11 KiB
Plaintext
/**
|
|
* Idris Re-Fresh
|
|
* Low Supply
|
|
* Konyang
|
|
* Horizon
|
|
* Zo'ra Soda
|
|
* Low Supply
|
|
* BODA (Soviet Soda)
|
|
*/
|
|
|
|
/obj/structure/machinery/vending/cola
|
|
name = "Idris Re-Fresh"
|
|
desc = "A soft drink vendor provided by an Idris subsidiary."
|
|
icon_state = "cola_machine"
|
|
icon_vend = "cola_machine-vend"
|
|
icon_deny = "cola_machine-deny"
|
|
icon_screen = "cola_machine-screen"
|
|
light_mask = "cola_machine-lightmask"
|
|
product_slogans = "Idris Re-Fresh: the more expensive the place, the more of us you'll seee!"
|
|
product_ads = "Refreshing!;Hope you're thirsty!;Thirsty? Why not cola?;Please, have a drink!;Drink up!;The best drinks in space."
|
|
vend_id = "cola"
|
|
products = list(
|
|
/obj/item/reagent_containers/food/drinks/cans/cola = 10,
|
|
/obj/item/reagent_containers/food/drinks/cans/diet_cola = 10,
|
|
/obj/item/reagent_containers/food/drinks/cans/space_mountain_wind = 10,
|
|
/obj/item/reagent_containers/food/drinks/cans/dr_gibb = 10,
|
|
/obj/item/reagent_containers/food/drinks/cans/root_beer = 10,
|
|
/obj/item/reagent_containers/food/drinks/cans/starkist = 10,
|
|
/obj/item/reagent_containers/food/drinks/waterbottle = 10,
|
|
/obj/item/reagent_containers/food/drinks/cans/dyn = 10,
|
|
/obj/item/reagent_containers/food/drinks/cans/space_up = 10,
|
|
/obj/item/reagent_containers/food/drinks/cans/iced_tea = 10,
|
|
/obj/item/reagent_containers/food/drinks/cans/grape_juice = 10,
|
|
/obj/item/reagent_containers/food/drinks/cans/peach_soda = 10,
|
|
/obj/item/reagent_containers/food/drinks/cans/beetle_milk = 10,
|
|
/obj/item/reagent_containers/food/drinks/cans/hrozamal_soda = 10,
|
|
/obj/item/reagent_containers/food/drinks/carton/small/milk = 10,
|
|
/obj/item/reagent_containers/food/drinks/carton/small/milk/choco = 10,
|
|
/obj/item/reagent_containers/food/drinks/carton/small/milk/strawberry = 10,
|
|
/obj/item/reagent_containers/food/drinks/cans/melon_soda = 10,
|
|
/obj/item/reagent_containers/food/drinks/zobo = 10
|
|
)
|
|
contraband = list(
|
|
/obj/item/reagent_containers/food/drinks/cans/thirteenloko = 5,
|
|
/obj/item/reagent_containers/food/drinks/cans/koispunch = 3
|
|
)
|
|
premium = list(
|
|
/obj/item/reagent_containers/food/drinks/bottle/cola = 2,
|
|
/obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind = 2,
|
|
/obj/item/reagent_containers/food/drinks/bottle/space_up = 2
|
|
)
|
|
prices = list(
|
|
/obj/item/reagent_containers/food/drinks/cans/cola = 1.50,
|
|
/obj/item/reagent_containers/food/drinks/cans/diet_cola = 1.50,
|
|
/obj/item/reagent_containers/food/drinks/cans/space_mountain_wind = 1.50,
|
|
/obj/item/reagent_containers/food/drinks/cans/dr_gibb = 1.50,
|
|
/obj/item/reagent_containers/food/drinks/cans/root_beer = 1.50,
|
|
/obj/item/reagent_containers/food/drinks/cans/starkist = 1.50,
|
|
/obj/item/reagent_containers/food/drinks/waterbottle = 1.25,
|
|
/obj/item/reagent_containers/food/drinks/cans/dyn = 1.80,
|
|
/obj/item/reagent_containers/food/drinks/cans/space_up = 1.50,
|
|
/obj/item/reagent_containers/food/drinks/cans/iced_tea = 1.40,
|
|
/obj/item/reagent_containers/food/drinks/cans/grape_juice = 1.75,
|
|
/obj/item/reagent_containers/food/drinks/cans/peach_soda = 1.75,
|
|
/obj/item/reagent_containers/food/drinks/cans/koispunch = 5.00,
|
|
/obj/item/reagent_containers/food/drinks/cans/beetle_milk = 2.25,
|
|
/obj/item/reagent_containers/food/drinks/cans/hrozamal_soda = 3.00,
|
|
/obj/item/reagent_containers/food/drinks/carton/small/milk = 1.80,
|
|
/obj/item/reagent_containers/food/drinks/carton/small/milk/choco = 1.80,
|
|
/obj/item/reagent_containers/food/drinks/carton/small/milk/strawberry = 1.80,
|
|
/obj/item/reagent_containers/food/drinks/cans/melon_soda = 1.75,
|
|
/obj/item/reagent_containers/food/drinks/zobo = 1.75
|
|
)
|
|
idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
|
|
vending_sound = 'sound/machines/vending/vending_cans.ogg'
|
|
temperature_setting = -1
|
|
light_color = COLOR_GUNMETAL
|
|
|
|
/obj/structure/machinery/vending/cola/low_supply
|
|
products = list(
|
|
/obj/item/reagent_containers/food/drinks/cans/diet_cola = 1,
|
|
/obj/item/reagent_containers/food/drinks/cans/space_mountain_wind = 2,
|
|
/obj/item/reagent_containers/food/drinks/cans/dr_gibb = 1,
|
|
/obj/item/reagent_containers/food/drinks/cans/root_beer = 2,
|
|
/obj/item/reagent_containers/food/drinks/cans/starkist = 1,
|
|
/obj/item/reagent_containers/food/drinks/waterbottle = 4,
|
|
/obj/item/reagent_containers/food/drinks/cans/dyn = 1,
|
|
/obj/item/reagent_containers/food/drinks/cans/space_up = 2,
|
|
/obj/item/reagent_containers/food/drinks/cans/beetle_milk = 8,
|
|
/obj/item/reagent_containers/food/drinks/cans/hrozamal_soda = 2
|
|
)
|
|
|
|
/obj/structure/machinery/vending/cola/konyang
|
|
products = list(
|
|
/obj/item/reagent_containers/food/drinks/cans/cola = 10,
|
|
/obj/item/reagent_containers/food/drinks/cans/diet_cola = 10,
|
|
/obj/item/reagent_containers/food/drinks/cans/space_mountain_wind = 10,
|
|
/obj/item/reagent_containers/food/drinks/cans/starkist = 10,
|
|
/obj/item/reagent_containers/food/drinks/waterbottle = 10,
|
|
/obj/item/reagent_containers/food/drinks/cans/dyn = 5,
|
|
/obj/item/reagent_containers/food/drinks/cans/space_up = 10,
|
|
/obj/item/reagent_containers/food/drinks/cans/iced_tea = 10,
|
|
/obj/item/reagent_containers/food/drinks/cans/grape_juice = 10,
|
|
/obj/item/reagent_containers/food/drinks/cans/peach_soda = 10,
|
|
/obj/item/reagent_containers/food/drinks/cans/beetle_milk = 5,
|
|
/obj/item/reagent_containers/food/drinks/carton/small/milk = 10,
|
|
/obj/item/reagent_containers/food/drinks/carton/small/milk/choco = 10,
|
|
/obj/item/reagent_containers/food/drinks/carton/small/milk/strawberry = 10,
|
|
/obj/item/reagent_containers/food/drinks/cans/melon_soda = 10
|
|
)
|
|
|
|
// Reduced list of products as most are in the commissary
|
|
/obj/structure/machinery/vending/cola/horizon
|
|
products = list(
|
|
/obj/item/reagent_containers/food/drinks/cans/cola = 10,
|
|
/obj/item/reagent_containers/food/drinks/cans/diet_cola = 10,
|
|
/obj/item/reagent_containers/food/drinks/waterbottle = 10,
|
|
/obj/item/reagent_containers/food/drinks/carton/small/milk = 10,
|
|
/obj/item/reagent_containers/food/drinks/carton/small/milk/choco = 10,
|
|
/obj/item/reagent_containers/food/drinks/carton/small/milk/strawberry = 10,
|
|
/obj/item/reagent_containers/food/drinks/zobo = 10
|
|
)
|
|
contraband = list(
|
|
/obj/item/reagent_containers/food/drinks/cans/thirteenloko = 5,
|
|
/obj/item/reagent_containers/food/drinks/cans/koispunch = 3
|
|
)
|
|
premium = list(
|
|
/obj/item/reagent_containers/food/drinks/bottle/cola = 2,
|
|
/obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind = 2,
|
|
/obj/item/reagent_containers/food/drinks/bottle/space_up = 2
|
|
)
|
|
|
|
/obj/item/vending_refill/cola
|
|
name = "cola resupply canister"
|
|
vend_id = "cola"
|
|
charges = 50
|
|
|
|
|
|
/obj/structure/machinery/vending/zora
|
|
name = "Zo'ra Soda"
|
|
desc = "An energy drink vendor provided by the Getmore Corporation in partnership with the brood of Ta'Akaix'Xakt'yagz'isk Zo'ra."
|
|
icon_state = "zoda"
|
|
icon_vend = "zoda-vend"
|
|
product_slogans = "Safe for consumption by all species!;Made by hard-working bound drones!;The most refreshing energy drink around!;A product of two thousand years!"
|
|
product_ads = "Tired? Try some Zo'ra Soda!;Thirsty? Why not Zo'ra Soda?;Bored? Have some Zo'ra Soda!;Zo'ra Soda. Drink up!;ZZZOOO'RRRAAA SSSOOODDDAAA!"
|
|
vend_id = "zora"
|
|
products = list(
|
|
/obj/item/reagent_containers/food/drinks/cans/zorasoda/cherry = 5,
|
|
/obj/item/reagent_containers/food/drinks/cans/zorasoda/phoron = 5,
|
|
/obj/item/reagent_containers/food/drinks/cans/zorasoda/klax = 5,
|
|
/obj/item/reagent_containers/food/drinks/cans/zorasoda/cthur = 5,
|
|
/obj/item/reagent_containers/food/drinks/cans/zorasoda/venomgrass = 5,
|
|
/obj/item/reagent_containers/food/drinks/cans/zorasoda/kois = 5,
|
|
/obj/item/reagent_containers/food/drinks/cans/zorasoda/drone = 5,
|
|
/obj/item/reagent_containers/food/drinks/cans/zorasoda/mixedberry = 5,
|
|
/obj/item/reagent_containers/food/drinks/cans/zorasoda/lemonlime = 5,
|
|
/obj/item/reagent_containers/food/drinks/cans/zorasoda/xuizi = 5,
|
|
/obj/item/reagent_containers/food/drinks/cans/zorasoda/dyn = 5,
|
|
/obj/item/reagent_containers/food/drinks/cans/zorasoda/buzz = 5,
|
|
/obj/item/reagent_containers/food/drinks/waterbottle/sedantis_water = 5
|
|
)
|
|
contraband = list(
|
|
/obj/item/reagent_containers/food/drinks/cans/zorasoda/hozm = 5
|
|
)
|
|
premium = list(
|
|
/obj/item/reagent_containers/food/drinks/cans/zorasoda/jelly = 3
|
|
)
|
|
prices = list(
|
|
/obj/item/reagent_containers/food/drinks/cans/zorasoda/cherry = 2.50,
|
|
/obj/item/reagent_containers/food/drinks/cans/zorasoda/phoron = 2.50,
|
|
/obj/item/reagent_containers/food/drinks/cans/zorasoda/klax = 2.50,
|
|
/obj/item/reagent_containers/food/drinks/cans/zorasoda/cthur = 2.50,
|
|
/obj/item/reagent_containers/food/drinks/cans/zorasoda/venomgrass = 2.50,
|
|
/obj/item/reagent_containers/food/drinks/cans/zorasoda/kois = 2.50,
|
|
/obj/item/reagent_containers/food/drinks/cans/zorasoda/drone = 2.50,
|
|
/obj/item/reagent_containers/food/drinks/cans/zorasoda/mixedberry = 2.50,
|
|
/obj/item/reagent_containers/food/drinks/cans/zorasoda/lemonlime = 2.50,
|
|
/obj/item/reagent_containers/food/drinks/cans/zorasoda/xuizi = 2.50,
|
|
/obj/item/reagent_containers/food/drinks/cans/zorasoda/dyn = 2.50,
|
|
/obj/item/reagent_containers/food/drinks/cans/zorasoda/buzz = 2.50,
|
|
/obj/item/reagent_containers/food/drinks/waterbottle/sedantis_water = 3.50
|
|
)
|
|
idle_power_usage = 211
|
|
temperature_setting = -1
|
|
light_color = COLOR_CULT_REINFORCED
|
|
|
|
/obj/structure/machinery/vending/zora/low_supply
|
|
products = list(
|
|
/obj/item/reagent_containers/food/drinks/cans/zorasoda/cherry = 2,
|
|
/obj/item/reagent_containers/food/drinks/cans/zorasoda/phoron = 3,
|
|
/obj/item/reagent_containers/food/drinks/cans/zorasoda/venomgrass = 2,
|
|
/obj/item/reagent_containers/food/drinks/cans/zorasoda/kois = 1,
|
|
/obj/item/reagent_containers/food/drinks/cans/zorasoda/drone = 5,
|
|
/obj/item/reagent_containers/food/drinks/cans/zorasoda/xuizi = 3,
|
|
/obj/item/reagent_containers/food/drinks/cans/zorasoda/dyn = 1
|
|
)
|
|
|
|
/obj/item/vending_refill/zora
|
|
name = "Zo'ra Soda resupply canister"
|
|
vend_id = "zora"
|
|
charges = 40
|
|
|
|
|
|
/obj/structure/machinery/vending/sovietsoda
|
|
name = "BODA"
|
|
desc = "An old sweet water vending machine, how did this end up here?"
|
|
icon_state = "sovietsoda"
|
|
icon_vend = "sovietsoda-vend"
|
|
vend_id = "cola"
|
|
product_ads = "For Tsar and Country.;Have you fulfilled your nutrition quota today?;Very nice!;We are simple people, for this is all we eat.;If there is a person, there is a problem. If there is no person, then there is no problem."
|
|
products = list(
|
|
/obj/item/reagent_containers/food/drinks/drinkingglass/soda = 30
|
|
)
|
|
//would a soviet vending machine really have a premium item? hmmm.
|
|
premium = list(
|
|
/obj/item/reagent_containers/food/drinks/bottle/vodka = 5
|
|
)
|
|
contraband = list(
|
|
/obj/item/reagent_containers/food/drinks/drinkingglass/cola = 20
|
|
)
|
|
idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
|
|
random_itemcount = 0
|
|
temperature_setting = -1
|
|
vending_sound = 'sound/machines/vending/vending_cans.ogg'
|
|
light_color = COLOR_RED
|