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

Vendor groups upgrade #853

Closed
wants to merge 30 commits into from
Closed
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
4 changes: 2 additions & 2 deletions code/__DEFINES/greyscale_guns.dm
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// bands
#define AMMO_BAND_COLOR_EXTENDED "#9C9A19"
#define AMMO_BAND_COLOR_AP "#1F951F"
#define AMMO_BAND_COLOR_HOLLOWPOINT "#a8ff9d"
#define AMMO_BAND_COLOR_INCENDIARY "#9C2219"
#define AMMO_BAND_COLOR_HOLLOWPOINT "#FF4837"
#define AMMO_BAND_COLOR_INCENDIARY "#D49622"
#define AMMO_BAND_COLOR_EXPLOSIVE "#3f1111"
#define AMMO_BAND_COLOR_SABOT "#663618"
#define AMMO_BAND_COLOR_IMPACT "#0052CC"
Expand Down
3 changes: 1 addition & 2 deletions code/_globalvars/lists/vending.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@
*/

GLOBAL_LIST_EMPTY(vending_records)
GLOBAL_LIST_EMPTY(vending_hidden_records)
GLOBAL_LIST_EMPTY(vending_coin_records)
GLOBAL_LIST_EMPTY(vending_inverse_records)
4 changes: 2 additions & 2 deletions code/datums/loadout/loadout_helper.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
//If we can find it for in a shared vendor, we buy it
for(var/type in (GLOB.loadout_linked_vendor[seller.faction] + GLOB.loadout_linked_vendor[user_job]))
for(var/datum/vending_product/item_datum AS in GLOB.vending_records[type])
if(item_datum.product_path == item_to_buy_type && item_datum.amount != 0)
if(item_datum.product_paths == item_to_buy_type && item_datum.amount != 0)
item_datum.amount--
return TRUE

Expand Down Expand Up @@ -111,7 +111,7 @@
/// Return TRUE if this handful should be buyable, aka if it's corresponding aka box is in a linked vendor
/proc/is_handful_buyable(ammo_type)
for(var/datum/vending_product/item_datum AS in GLOB.vending_records[/obj/machinery/vending/weapon])
var/product_path = item_datum.product_path
var/product_path = item_datum.product_paths
if(!ispath(product_path, /obj/item/ammo_magazine))
continue
var/obj/item/ammo_magazine/ammo = product_path
Expand Down
5 changes: 0 additions & 5 deletions code/datums/wires/vending.dm
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
var/list/status = list()
status += "The orange light is [V.seconds_electrified ? "on" : "off"]."
status += "The red light is [V.shoot_inventory ? "off" : "blinking"]."
status += "The green light is [V.extended_inventory ? "on" : "off"]."
status += "A [V.scan_id ? "purple" : "yellow"] light is on."
status += "The speaker light is [V.shut_up ? "off" : "on"]."
return status
Expand All @@ -39,8 +38,6 @@
switch(wire)
if(WIRE_THROW)
V.shoot_inventory = !V.shoot_inventory
if(WIRE_CONTRABAND)
V.extended_inventory = !V.extended_inventory
if(WIRE_SHOCK)
V.seconds_electrified = MACHINE_DEFAULT_ELECTRIFY_TIME
if(WIRE_IDSCAN)
Expand All @@ -54,8 +51,6 @@
switch(wire)
if(WIRE_THROW)
V.shoot_inventory = !mend
if(WIRE_CONTRABAND)
V.extended_inventory = FALSE
if(WIRE_SHOCK)
if(mend)
V.seconds_electrified = MACHINE_NOT_ELECTRIFIED
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/machinery/bots/roomba.dm
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
//Here we try to restock whatever we sucked up
for(var/type in GLOB.loadout_linked_vendor[VENDOR_FACTION_NEUTRAL])
for(var/datum/vending_product/item_to_restock AS in GLOB.vending_records[type])
if(sucker.type != item_to_restock.product_path)
if(sucker.type != item_to_restock.product_paths)
continue
if(item_to_restock.attempt_restock(sucker, null, FALSE))
return TRUE
Expand Down
Loading
Loading