Skip to content

Commit

Permalink
Напитки с парадиза (#467)
Browse files Browse the repository at this point in the history
## About The Pull Request
Портирует некоторые напитки с парадиза и переносит напитки из отдельного
модуля в модуль еды

## Why It's Good For The Game
Бухло это всегда вкусно и весело

## Изображения изменений

![image](https://github.com/user-attachments/assets/3c42486e-3dbe-4042-8804-37cde0d362e1)

![image](https://github.com/user-attachments/assets/db2a313f-36c4-4fcf-9e14-f661651e0919)
  • Loading branch information
Chorden523 committed Aug 24, 2024
1 parent 5e50d8f commit 83bf9b8
Show file tree
Hide file tree
Showing 10 changed files with 533 additions and 37 deletions.
4 changes: 0 additions & 4 deletions modular_bandastation/drinks/_drinks.dm

This file was deleted.

3 changes: 0 additions & 3 deletions modular_bandastation/drinks/_drinks.dme

This file was deleted.

25 changes: 0 additions & 25 deletions modular_bandastation/drinks/code/drinks.dm

This file was deleted.

Binary file removed modular_bandastation/drinks/icons/drinks.dmi
Binary file not shown.
1 change: 0 additions & 1 deletion modular_bandastation/modular_bandastation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
#include "whitelist220/_whitelist220.dme"
#include "world_topics/_world_topics.dme"
#include "preferences/_preferences.dme"
#include "drinks/_drinks.dme"
#include "jukebox/_jukebox.dme"
#include "objects/_objects.dme"
#include "hair/_hair.dme"
11 changes: 7 additions & 4 deletions modular_bandastation/objects/_objects.dme
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
#include "_objects.dm"

#include "code/wallets.dm"
#include "code/hampters.dm"
#include "code/papershredder.dm"
#include "code/material_pouch.dm"

#include "code/structures/posters.dm"
#include "code/papershredder.dm"
#include "code/wallets.dm"

#include "code/clothing/head/hat.dm"
#include "code/clothing/head/soft_caps.dm"
Expand All @@ -14,6 +12,11 @@
#include "code/clothing/suits/wintercoats.dm"
#include "code/clothing/under/jobs/rnd.dm"

#include "code/consumables/drinks.dm"
#include "code/consumables/customer_data.dm"

#include "code/structures/posters.dm"

#include "code/vending/vending.dm"

#include "code/weapons/ranged/awaymission_gun.dm"
39 changes: 39 additions & 0 deletions modular_bandastation/objects/code/consumables/customer_data.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/datum/customer_data/american/New()
orderable_objects[VENUE_BAR] |= list(
/datum/reagent/consumable/ethanol/soundhand = 5,
/datum/reagent/consumable/ethanol/silverhand = 6,
)
. = ..()

/datum/customer_data/british/gent/New()
orderable_objects[VENUE_BAR] |= list(
/datum/reagent/consumable/ethanol/pegu_club = 5,
/datum/reagent/consumable/ethanol/oldfashion = 6,
)
. = ..()

/datum/customer_data/british/New()
orderable_objects[VENUE_BAR] |= list(
/datum/reagent/consumable/ethanol/brandy_crusta = 6,
)
. = ..()

/datum/customer_data/french/New()
orderable_objects[VENUE_BAR] |= list(
/datum/reagent/consumable/ethanol/vampiro = 4,
)
. = ..()

/datum/customer_data/japanese/New()
orderable_objects[VENUE_BAR] |= list(
/datum/reagent/consumable/ethanol/rainbow_sky = 2,
/datum/reagent/consumable/ethanol/innocent_erp = 4,
)
. = ..()

/datum/customer_data/mexican/New()
orderable_objects[VENUE_BAR] |= list(
/datum/reagent/consumable/ethanol/black_blood = 5,
)
. = ..()

Loading

0 comments on commit 83bf9b8

Please sign in to comment.