diff --git a/GainStation13/code/modules/food_and_drinks/bigbottle.dm b/GainStation13/code/modules/food_and_drinks/bigbottle.dm new file mode 100644 index 0000000000..1cb09e428a --- /dev/null +++ b/GainStation13/code/modules/food_and_drinks/bigbottle.dm @@ -0,0 +1,35 @@ +//////////////////////////////////////////////////////////////////////////////// +/// GS13 - big bottles +//////////////////////////////////////////////////////////////////////////////// + +//unfortunately I wasn't able to code in a fancy overlay that changes depending on bottle's contents volume +//however if anyone would like to give it a go, the sprites for it are already there, in the .dmi + +/obj/item/reagent_containers/food/drinks/bigbottle + name = "Bottle" + desc = "You shouldn't see this." + icon = 'GainStation13/icons/obj/food/bigbottle.dmi' + icon_state = "bigbottle" + list_reagents = list(/datum/reagent/consumable/space_cola = 25) + foodtype = SUGAR + +/obj/item/reagent_containers/food/drinks/bigbottle/starkist + name = "StarKist Bottle" + desc = "A big bottle of Sunkist - for all your chuggin' needs." + icon_state = "bigbottle_fan" + list_reagents = list(/datum/reagent/consumable/space_cola = 40, /datum/reagent/consumable/orangejuice = 40) + foodtype = SUGAR + +/obj/item/reagent_containers/food/drinks/bigbottle/cola + name = "GT-Cola Bottle" + desc = "A big bottle of GT-Cola - for all your chuggin' needs." + icon_state = "bigbottle_cola" + list_reagents = list(/datum/reagent/consumable/space_cola = 80) + foodtype = SUGAR + +/obj/item/reagent_containers/food/drinks/bigbottle/spaceup + name = "Space-Up! Bottle" + desc = "A big bottle of Space-Up! - for all your chuggin' needs." + icon_state = "bigbottle_spr" + list_reagents = list(/datum/reagent/consumable/space_up = 80) + foodtype = SUGAR diff --git a/GainStation13/code/modules/vending/gatocola.dm b/GainStation13/code/modules/vending/gatocola.dm index 85749926df..9d20200bd3 100644 --- a/GainStation13/code/modules/vending/gatocola.dm +++ b/GainStation13/code/modules/vending/gatocola.dm @@ -6,12 +6,14 @@ product_slogans = "Meow~, time for some cola!" vend_reply = "Meow~ Meow~" products = list( - /obj/item/reagent_containers/food/drinks/beer = 10, /obj/item/reagent_containers/food/drinks/soda_cans/cola = 10, /obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb = 10, /obj/item/reagent_containers/food/drinks/soda_cans/starkist = 10, /obj/item/reagent_containers/food/drinks/soda_cans/space_up = 10, /obj/item/reagent_containers/food/drinks/soda_cans/pwr_game = 10, + /obj/item/reagent_containers/food/drinks/bigbottle/starkist = 6, + /obj/item/reagent_containers/food/drinks/bigbottle/cola = 6, + /obj/item/reagent_containers/food/drinks/bigbottle/spaceup = 6, ) contraband = list( /obj/item/organ/ears/cat = 2, diff --git a/GainStation13/code/modules/vending/mealdor.dm b/GainStation13/code/modules/vending/mealdor.dm index a20b6a87b5..438ad8d62d 100644 --- a/GainStation13/code/modules/vending/mealdor.dm +++ b/GainStation13/code/modules/vending/mealdor.dm @@ -5,6 +5,7 @@ icon_state = "mealdor" product_slogans = "Are you hungry? Eat some of my food!;Be sure to eat one of our tasty treats!;Was that your stomach? Go ahead, get some food!" vend_reply = "Enjoy your meal." + free = TRUE products = list( /obj/item/reagent_containers/food/snacks/fries = 4, diff --git a/GainStation13/code/structures/chair.dm b/GainStation13/code/structures/chair.dm index ad7f4f1fef..4a27a016c1 100644 --- a/GainStation13/code/structures/chair.dm +++ b/GainStation13/code/structures/chair.dm @@ -55,3 +55,18 @@ desc = "Some nice metal shelves." icon = 'hyperstation/icons/obj/objects.dmi' icon_state = "shelf" + +/obj/structure/chair/beanbag + name = "beanbag chair" + desc = "A comfy beanbag chair. Almost as soft as your fat ass." + icon = 'GainStation13/icons/obj/chairs.dmi' + icon_state = "beanbag" + color = "#ffffff" + anchored = FALSE + buildstackamount = 5 + item_chair = null + +/obj/structure/chair/beanbag/gato + name = "GATO beanbag chair" + desc = "A comfy beanbag chair. This one seems to a super duper cutesy GATO mascot." + icon_state = "beanbag_gato" diff --git a/GainStation13/icons/obj/chairs.dmi b/GainStation13/icons/obj/chairs.dmi index 0cca2a6a5a..4519c2ea03 100644 Binary files a/GainStation13/icons/obj/chairs.dmi and b/GainStation13/icons/obj/chairs.dmi differ diff --git a/GainStation13/icons/obj/food/bigbottle.dmi b/GainStation13/icons/obj/food/bigbottle.dmi new file mode 100644 index 0000000000..4c6dea7867 Binary files /dev/null and b/GainStation13/icons/obj/food/bigbottle.dmi differ diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm index 129e1cb8be..aa85db6c47 100644 --- a/code/game/objects/items/RCD.dm +++ b/code/game/objects/items/RCD.dm @@ -164,7 +164,7 @@ RLD lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' custom_price = PRICE_ABOVE_EXPENSIVE - custom_premium_price = PRICE_ALMOST_ONE_GRAND + custom_premium_price = PRICE_ABOVE_EXPENSIVE //GS13 tweak max_matter = 160 item_flags = NO_MAT_REDEMPTION | NOBLUDGEON has_ammobar = TRUE diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index 1837504e99..96dc79c6f0 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -11,7 +11,7 @@ resistance_flags = NONE var/can_be_cut = 1 custom_price = PRICE_EXPENSIVE - custom_premium_price = PRICE_ALMOST_ONE_GRAND + custom_premium_price = PRICE_ABOVE_EXPENSIVE //GS13 tweak /obj/item/toy/sprayoncan name = "spray-on insulation applicator" diff --git a/tgstation.dme b/tgstation.dme index 05eb38ec55..4fb01f8be4 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3977,9 +3977,9 @@ #include "GainStation13\code\machinery\feeding_tube.dm" #include "GainStation13\code\machinery\feeding_tube_industrial.dm" #include "GainStation13\code\machinery\gym.dm" -#include "GainStation13\code\machinery\doors\airlock_types.dm" #include "GainStation13\code\machinery\powered_quantum_pad.dm" #include "GainStation13\code\machinery\supply_teleporter.dm" +#include "GainStation13\code\machinery\doors\airlock_types.dm" #include "GainStation13\code\mechanics\calorite.dm" #include "GainStation13\code\mechanics\fatness.dm" #include "GainStation13\code\mechanics\fatrousal.dm" @@ -4013,6 +4013,7 @@ #include "GainStation13\code\modules\clothing\under\jobs\clothing.dm" #include "GainStation13\code\modules\clothing\under\jobs\modcivilian.dm" #include "GainStation13\code\modules\events\vent_clog.dm\vent_clog.dm" +#include "GainStation13\code\modules\food_and_drinks\bigbottle.dm" #include "GainStation13\code\modules\food_and_drinks\drinks.dm" #include "GainStation13\code\modules\food_and_drinks\food.dm" #include "GainStation13\code\modules\food_and_drinks\recipes_bigpizza.dm"