mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-31 00:49:06 +01:00
BatrachophrenoandGitHub
4ecb0bc21c
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.
46 lines
1.4 KiB
Plaintext
46 lines
1.4 KiB
Plaintext
/**
|
|
* Omni-Restocker
|
|
*/
|
|
|
|
|
|
/obj/structure/machinery/vending/vendors
|
|
name = "Omni-Restocker"
|
|
desc = "The mother of all vendors, from which vending itself comes!"
|
|
icon_state = "engivend"
|
|
icon_vend = "engivend-vend"
|
|
vend_id = "admin"
|
|
req_access = list(ACCESS_JANITOR)
|
|
products = list(
|
|
/obj/item/vending_refill/booze = 2,
|
|
/obj/item/vending_refill/tools = 2,
|
|
/obj/item/vending_refill/coffee = 2,
|
|
/obj/item/vending_refill/snack = 2,
|
|
/obj/item/vending_refill/cola = 2,
|
|
/obj/item/vending_refill/zora = 2,
|
|
/obj/item/vending_refill/frontiervend = 2,
|
|
/obj/item/vending_refill/smokes = 2,
|
|
/obj/item/vending_refill/meds = 2,
|
|
/obj/item/vending_refill/robust = 2,
|
|
/obj/item/vending_refill/hydro = 2,
|
|
/obj/item/vending_refill/cutlery = 2,
|
|
/obj/item/vending_refill/robo = 2,
|
|
/obj/item/vending_refill/battlemonsters = 2,
|
|
/obj/item/vending_refill/encryption = 2
|
|
)
|
|
random_itemcount = 0
|
|
light_color = COLOR_GOLD
|
|
light_mask = "engivend-light-mask"
|
|
|
|
/obj/structure/machinery/vending/vendors/low_supply
|
|
products = list(
|
|
/obj/item/vending_refill/tools = 1,
|
|
/obj/item/vending_refill/coffee = 1,
|
|
/obj/item/vending_refill/meds = 1,
|
|
/obj/item/vending_refill/robust = 1,
|
|
/obj/item/vending_refill/hydro = 1,
|
|
/obj/item/vending_refill/cutlery = 1,
|
|
/obj/item/vending_refill/robo = 1,
|
|
/obj/item/vending_refill/battlemonsters = 1,
|
|
/obj/item/vending_refill/encryption = 1
|
|
)
|