From 96cb19801df7a25e54f0615da2df55f587ab2c80 Mon Sep 17 00:00:00 2001 From: Gandalf Date: Tue, 14 Sep 2021 00:00:44 +0100 Subject: [PATCH] EEE forgot a PLOR --- .../OceanRuins/ocean_listening_outpost.dmm | 6 ++-- .../OceanRuins/ocean_mining_above.dmm | 6 ++-- .../Deltastation/DeltaStation2_skyrat.dmm | 2 +- .../IceBoxStation/IceBoxStation_skyrat.dmm | 2 +- .../IcemoonUnderground_Above_skyrat.dmm | 6 ++-- .../KiloStation/KiloStation_skyrat.dmm | 2 +- .../MetaStation/MetaStation_skyrat.dmm | 6 ++-- _maps/map_files/Mining/Icemoon.dmm | 6 ++-- _maps/map_files/Mining/Rockplanet.dmm | 4 +-- _maps/map_files/Mining/TidalLock.dmm | 6 ++-- _maps/map_files/NSSJourney/NSSJourney.dmm | 2 +- .../WaterKiloStation/WaterKiloStation.dmm | 2 +- _maps/map_files/generic/CentCom_skyrat.dmm | 2 +- .../tramstation/tramstation_skyrat.dmm | 8 ++--- code/_globalvars/lists/maintenance_loot.dm | 2 +- code/game/objects/effects/landmarks.dm | 2 +- .../game/objects/effects/spawners/lootdrop.dm | 4 +-- code/game/objects/items/storage/sixpack.dm | 4 +-- .../crates_lockers/closets/secure/bar.dm | 2 +- .../crates_lockers/closets/secure/freezer.dm | 2 +- code/modules/food_and_drinks/drinks/drinks.dm | 28 ++------------- .../food_and_drinks/drinks/drinks/bottle.dm | 35 ++++++++++++++++--- code/modules/vending/boozeomat.dm | 2 +- .../code/_globalvars/maint_loot_trash.dm | 2 +- .../maps/shuttles/tradership_faction.dmm | 2 +- .../RandomRuins/SpaceRuins/interdynefob.dmm | 4 +-- 26 files changed, 76 insertions(+), 73 deletions(-) diff --git a/_maps/RandomRuins/OceanRuins/ocean_listening_outpost.dmm b/_maps/RandomRuins/OceanRuins/ocean_listening_outpost.dmm index d433e03f26e..4f0def21571 100644 --- a/_maps/RandomRuins/OceanRuins/ocean_listening_outpost.dmm +++ b/_maps/RandomRuins/OceanRuins/ocean_listening_outpost.dmm @@ -863,15 +863,15 @@ /area/ruin/ocean/listening_outpost) "Lg" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/food/drinks/bottle/beer{ pixel_x = -4; pixel_y = 14 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/food/drinks/bottle/beer{ pixel_x = 3; pixel_y = 11 }, -/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/bottle/beer, /turf/open/floor/wood, /area/ruin/ocean/listening_outpost) "LE" = ( diff --git a/_maps/RandomRuins/OceanRuins/ocean_mining_above.dmm b/_maps/RandomRuins/OceanRuins/ocean_mining_above.dmm index e60772af826..1213b797ee8 100644 --- a/_maps/RandomRuins/OceanRuins/ocean_mining_above.dmm +++ b/_maps/RandomRuins/OceanRuins/ocean_mining_above.dmm @@ -383,15 +383,15 @@ /area/ruin/ocean/mining_site) "Nv" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/food/drinks/bottle/beer{ pixel_x = 7; pixel_y = 5 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/food/drinks/bottle/beer{ pixel_x = 5; pixel_y = -2 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/food/drinks/bottle/beer{ pixel_x = -1; pixel_y = 9 }, diff --git a/_maps/map_files/Deltastation/DeltaStation2_skyrat.dmm b/_maps/map_files/Deltastation/DeltaStation2_skyrat.dmm index 5dc7a0d3ab0..99264ac89ec 100644 --- a/_maps/map_files/Deltastation/DeltaStation2_skyrat.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2_skyrat.dmm @@ -43164,7 +43164,7 @@ pixel_x = -6; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/food/drinks/bottle/beer{ desc = "Whatever it is, it reeks of foul, putrid froth."; list_reagents = list(/datum/reagent/consumable/ethanol/bacchus_blessing = 15); name = "Delta-Down"; diff --git a/_maps/map_files/IceBoxStation/IceBoxStation_skyrat.dmm b/_maps/map_files/IceBoxStation/IceBoxStation_skyrat.dmm index bbacaea452b..398b00c58f1 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation_skyrat.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation_skyrat.dmm @@ -46626,7 +46626,7 @@ /area/engineering/main) "rmX" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/bottle/beer, /turf/open/floor/plating, /area/maintenance/starboard/aft) "rmZ" = ( diff --git a/_maps/map_files/IceBoxStation/IcemoonUnderground_Above_skyrat.dmm b/_maps/map_files/IceBoxStation/IcemoonUnderground_Above_skyrat.dmm index 823190c265c..2dc91339f88 100644 --- a/_maps/map_files/IceBoxStation/IcemoonUnderground_Above_skyrat.dmm +++ b/_maps/map_files/IceBoxStation/IcemoonUnderground_Above_skyrat.dmm @@ -1630,15 +1630,15 @@ /area/mine/living_quarters) "fD" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/food/drinks/bottle/beer{ pixel_x = 7; pixel_y = 5 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/food/drinks/bottle/beer{ pixel_x = -1; pixel_y = 9 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/food/drinks/bottle/beer{ pixel_x = -8 }, /obj/effect/turf_decal/tile/bar, diff --git a/_maps/map_files/KiloStation/KiloStation_skyrat.dmm b/_maps/map_files/KiloStation/KiloStation_skyrat.dmm index 90002cef394..ebbe0554b9a 100644 --- a/_maps/map_files/KiloStation/KiloStation_skyrat.dmm +++ b/_maps/map_files/KiloStation/KiloStation_skyrat.dmm @@ -74321,7 +74321,7 @@ pixel_x = -6; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/food/drinks/bottle/beer{ desc = "A station exclusive. Consumption may result in seizures, blindness, drunkenness, or even death."; list_reagents = list(/datum/reagent/consumable/ethanol/thirteenloko = 30); name = "Kilo-Kocktail"; diff --git a/_maps/map_files/MetaStation/MetaStation_skyrat.dmm b/_maps/map_files/MetaStation/MetaStation_skyrat.dmm index 6f380d26d9d..00dc0763d7c 100644 --- a/_maps/map_files/MetaStation/MetaStation_skyrat.dmm +++ b/_maps/map_files/MetaStation/MetaStation_skyrat.dmm @@ -1951,7 +1951,7 @@ "apg" = ( /obj/structure/closet, /obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/food/drinks/bottle/beer{ desc = "Takes you to a whole new level of thinking."; name = "Meta-Cider" }, @@ -12006,7 +12006,7 @@ /turf/open/floor/wood, /area/maintenance/port/aft) "cnj" = ( -/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/bottle/beer, /obj/structure/table/wood, /turf/open/floor/wood, /area/maintenance/port/aft) @@ -44220,7 +44220,7 @@ /obj/item/poster/random_contraband, /obj/item/poster/random_contraband, /obj/item/poster/random_contraband, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/food/drinks/bottle/beer{ pixel_x = -3; pixel_y = 2 }, diff --git a/_maps/map_files/Mining/Icemoon.dmm b/_maps/map_files/Mining/Icemoon.dmm index 54fe81304ce..35ea18c648f 100644 --- a/_maps/map_files/Mining/Icemoon.dmm +++ b/_maps/map_files/Mining/Icemoon.dmm @@ -1929,15 +1929,15 @@ /area/mine/living_quarters) "fD" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/food/drinks/bottle/beer{ pixel_x = 7; pixel_y = 5 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/food/drinks/bottle/beer{ pixel_x = -1; pixel_y = 9 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/food/drinks/bottle/beer{ pixel_x = -8 }, /obj/effect/turf_decal/tile/bar, diff --git a/_maps/map_files/Mining/Rockplanet.dmm b/_maps/map_files/Mining/Rockplanet.dmm index 5dfc0d9d92a..693e61f063d 100644 --- a/_maps/map_files/Mining/Rockplanet.dmm +++ b/_maps/map_files/Mining/Rockplanet.dmm @@ -6060,11 +6060,11 @@ }, /obj/item/storage/box/donkpockets, /obj/item/storage/box/donkpockets, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/food/drinks/bottle/beer{ pixel_x = 7; pixel_y = 5 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/food/drinks/bottle/beer{ pixel_x = 7; pixel_y = 5 }, diff --git a/_maps/map_files/Mining/TidalLock.dmm b/_maps/map_files/Mining/TidalLock.dmm index 43ce8043b7a..c5e664582f8 100644 --- a/_maps/map_files/Mining/TidalLock.dmm +++ b/_maps/map_files/Mining/TidalLock.dmm @@ -3430,15 +3430,15 @@ /area/mine/laborcamp) "YP" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/food/drinks/bottle/beer{ pixel_x = 7; pixel_y = 5 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/food/drinks/bottle/beer{ pixel_x = -1; pixel_y = 9 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/food/drinks/bottle/beer{ pixel_x = -8 }, /obj/effect/turf_decal/tile/bar, diff --git a/_maps/map_files/NSSJourney/NSSJourney.dmm b/_maps/map_files/NSSJourney/NSSJourney.dmm index 9118a40dd7b..6931afb0687 100644 --- a/_maps/map_files/NSSJourney/NSSJourney.dmm +++ b/_maps/map_files/NSSJourney/NSSJourney.dmm @@ -51196,7 +51196,7 @@ /area/security/prison) "rmX" = ( /obj/structure/table, -/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/bottle/beer, /turf/open/floor/plating, /area/maintenance/starboard/aft) "roJ" = ( diff --git a/_maps/map_files/WaterKiloStation/WaterKiloStation.dmm b/_maps/map_files/WaterKiloStation/WaterKiloStation.dmm index aa4fde4c8ff..2a18f2a7fdd 100644 --- a/_maps/map_files/WaterKiloStation/WaterKiloStation.dmm +++ b/_maps/map_files/WaterKiloStation/WaterKiloStation.dmm @@ -80355,7 +80355,7 @@ pixel_x = -6; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/food/drinks/bottle/beer{ desc = "A station exclusive. Consumption may result in seizures, blindness, drunkenness, or even death."; list_reagents = list(/datum/reagent/consumable/ethanol/thirteenloko = 30); name = "Kilo-Kocktail"; diff --git a/_maps/map_files/generic/CentCom_skyrat.dmm b/_maps/map_files/generic/CentCom_skyrat.dmm index 86126be7243..76374f48d6b 100644 --- a/_maps/map_files/generic/CentCom_skyrat.dmm +++ b/_maps/map_files/generic/CentCom_skyrat.dmm @@ -4049,7 +4049,7 @@ /area/centcom/control) "ary" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/food/drinks/bottle/beer{ pixel_x = 5; pixel_y = -2 }, diff --git a/_maps/map_files/tramstation/tramstation_skyrat.dmm b/_maps/map_files/tramstation/tramstation_skyrat.dmm index 3a5997191b0..9698ba019da 100644 --- a/_maps/map_files/tramstation/tramstation_skyrat.dmm +++ b/_maps/map_files/tramstation/tramstation_skyrat.dmm @@ -28525,7 +28525,7 @@ "hcz" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/table, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/food/drinks/bottle/beer{ pixel_x = -8 }, /turf/open/floor/plating/airless, @@ -37335,15 +37335,15 @@ dir = 1 }, /obj/structure/table, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/food/drinks/bottle/beer{ pixel_x = 7; pixel_y = 5 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/food/drinks/bottle/beer{ pixel_x = -1; pixel_y = 9 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/food/drinks/bottle/beer{ pixel_x = -8 }, /turf/open/floor/iron, diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index e607a4dd257..665f07fd524 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -136,7 +136,7 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items ) = 1, list(//food - /obj/item/reagent_containers/food/drinks/beer = 1, + /obj/item/reagent_containers/food/drinks/bottle/beer = 1, /obj/item/reagent_containers/food/drinks/coffee = 1, ) = 1, diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 3beb41e0672..fd2c217f668 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -485,7 +485,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player) break if(dense_object) continue - new /obj/item/reagent_containers/food/drinks/beer/almost_empty(turf_to_spawn_on) + new /obj/item/reagent_containers/food/drinks/bottle/beer/almost_empty(turf_to_spawn_on) ///Spawns the mob with some drugginess/drunkeness, and some disgust. /obj/effect/landmark/start/hangover/proc/make_hungover(mob/hangover_mob) diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index af2d7b93348..7ce366ae75a 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -119,7 +119,7 @@ /obj/item/storage/pill_bottle/happy = 1, /obj/item/storage/pill_bottle/lsd = 1, /obj/item/storage/pill_bottle/psicodine = 1, - /obj/item/reagent_containers/food/drinks/beer = 4, + /obj/item/reagent_containers/food/drinks/bottle/beer = 4, /obj/item/reagent_containers/food/drinks/bottle/whiskey = 1, /obj/item/paper/fluff/jobs/prisoner/letter = 1, /obj/item/grenade/smokebomb = 1, @@ -188,7 +188,7 @@ /obj/item/reagent_containers/food/drinks/soda_cans/grey_bull = 15, /obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy = 10, /obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 10, - /obj/item/reagent_containers/food/drinks/beer/light = 10, + /obj/item/reagent_containers/food/drinks/bottle/beer/light = 10, /obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 5, /obj/item/reagent_containers/food/drinks/soda_cans/pwr_game = 5, /obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb = 5, diff --git a/code/game/objects/items/storage/sixpack.dm b/code/game/objects/items/storage/sixpack.dm index 4190c089807..e485a2c4afd 100644 --- a/code/game/objects/items/storage/sixpack.dm +++ b/code/game/objects/items/storage/sixpack.dm @@ -29,7 +29,7 @@ STR.max_items = 6 STR.set_holdable(list( /obj/item/reagent_containers/food/drinks/soda_cans, - /obj/item/reagent_containers/food/drinks/beer, + /obj/item/reagent_containers/food/drinks/bottle/beer, /obj/item/reagent_containers/food/drinks/ale, /obj/item/reagent_containers/food/drinks/waterbottle )) @@ -48,4 +48,4 @@ /obj/item/storage/cans/sixbeer/PopulateContents() for(var/i in 1 to 6) - new /obj/item/reagent_containers/food/drinks/beer(src) + new /obj/item/reagent_containers/food/drinks/bottle/beer(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm index 717c9e8d6ba..c90cf4e5a70 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm @@ -12,7 +12,7 @@ /obj/structure/closet/secure_closet/bar/PopulateContents() ..() for(var/i in 1 to 10) - new /obj/item/reagent_containers/food/drinks/beer( src ) + new /obj/item/reagent_containers/food/drinks/bottle/beer( src ) new /obj/item/etherealballdeployer(src) new /obj/item/roulette_wheel_beacon(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm index 0db4c86b9f9..fe2d6854060 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -74,7 +74,7 @@ /obj/structure/closet/secure_closet/freezer/gulag_fridge/PopulateContents() ..() for(var/i in 1 to 3) - new /obj/item/reagent_containers/food/drinks/beer/light(src) + new /obj/item/reagent_containers/food/drinks/bottle/beer/light(src) /obj/structure/closet/secure_closet/freezer/fridge name = "refrigerator" diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index 68707677202..2edb66a44b3 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -429,30 +429,6 @@ desc += span_notice("The writing reads '[random_reagent.name]'.") update_appearance() -/obj/item/reagent_containers/food/drinks/beer - name = "space beer" - desc = "Beer. In space." - icon_state = "beer" - list_reagents = list(/datum/reagent/consumable/ethanol/beer = 30) - foodtype = GRAIN | ALCOHOL - custom_price = PAYCHECK_EASY - -/obj/item/reagent_containers/food/drinks/beer/almost_empty - list_reagents = list(/datum/reagent/consumable/ethanol/beer = 1) - -/obj/item/reagent_containers/food/drinks/beer/light - name = "Carp Lite" - desc = "Brewed with \"Pure Ice Asteroid Spring Water\"." - list_reagents = list(/datum/reagent/consumable/ethanol/beer/light = 30) - -/obj/item/reagent_containers/food/drinks/ale - name = "Magm-Ale" - desc = "A true dorf's drink of choice." - icon_state = "alebottle" - inhand_icon_state = "beer" - list_reagents = list(/datum/reagent/consumable/ethanol/ale = 30) - foodtype = GRAIN | ALCOHOL - custom_price = PAYCHECK_EASY /obj/item/reagent_containers/food/drinks/sillycup name = "paper cup" @@ -616,7 +592,7 @@ icon_state = "shaker" custom_materials = list(/datum/material/iron=1500) amount_per_transfer_from_this = 10 - volume = 120 //SKYRAT EDIT: Original value: (100) + volume = 100 isGlass = FALSE /obj/item/reagent_containers/food/drinks/flask @@ -696,7 +672,7 @@ playsound(M,'sound/weapons/pierce.ogg', rand(10,50), TRUE) var/obj/item/trash/can/crushed_can = new /obj/item/trash/can(M.loc) crushed_can.icon_state = icon_state - qdel(src) + qdel(src) return TRUE . = ..() diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index c34f18bb563..964b45ef927 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -15,7 +15,7 @@ volume = 100 force = 15 //Smashing bottles over someone's head hurts. throwforce = 15 - inhand_icon_state = "broken_beer" //Generic held-item sprite until unique ones are made. + inhand_icon_state = "beer" //Generic held-item sprite until unique ones are made. lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi' righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi' isGlass = TRUE @@ -108,8 +108,7 @@ if(affecting == BODY_ZONE_HEAD && istype(target, /mob/living/carbon/)) head_attack_message = " on the head" if(armor_duration) - //living_target.apply_effect(min(armor_duration, 200) , EFFECT_KNOCKDOWN) - living_target.StaminaKnockdown(20, TRUE) //SKYRAT EDIT CHANGE - ORIGINAL ABOVE + living_target.apply_effect(min(armor_duration, 200) , EFFECT_KNOCKDOWN) //Display an attack message. if(target != user) @@ -141,7 +140,9 @@ throw_speed = 3 throw_range = 5 w_class = WEIGHT_CLASS_TINY - inhand_icon_state = "beer" + inhand_icon_state = "broken_beer" + lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi' + righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi' hitsound = 'sound/weapons/bladeslice.ogg' attack_verb_continuous = list("stabs", "slashes", "attacks") attack_verb_simple = list("stab", "slash", "attack") @@ -152,6 +153,32 @@ . = ..() AddComponent(/datum/component/butchering, 200, 55) +/obj/item/reagent_containers/food/drinks/bottle/beer + name = "space beer" + desc = "Beer. In space." + icon_state = "beer" + volume = 30 + list_reagents = list(/datum/reagent/consumable/ethanol/beer = 30) + foodtype = GRAIN | ALCOHOL + custom_price = PAYCHECK_EASY + +/obj/item/reagent_containers/food/drinks/bottle/beer/almost_empty + list_reagents = list(/datum/reagent/consumable/ethanol/beer = 1) + +/obj/item/reagent_containers/food/drinks/bottle/beer/light + name = "Carp Lite" + desc = "Brewed with \"Pure Ice Asteroid Spring Water\"." + list_reagents = list(/datum/reagent/consumable/ethanol/beer/light = 30) + +/obj/item/reagent_containers/food/drinks/bottle/ale + name = "Magm-Ale" + desc = "A true dorf's drink of choice." + icon_state = "alebottle" + volume = 30 + list_reagents = list(/datum/reagent/consumable/ethanol/ale = 30) + foodtype = GRAIN | ALCOHOL + custom_price = PAYCHECK_EASY + /obj/item/reagent_containers/food/drinks/bottle/gin name = "Griffeater gin" desc = "A bottle of high quality gin, produced in the New London Space Station." diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm index 9304e77515b..153f58c4c5c 100644 --- a/code/modules/vending/boozeomat.dm +++ b/code/modules/vending/boozeomat.dm @@ -18,7 +18,7 @@ /obj/item/reagent_containers/food/drinks/bottle/grenadine = 4, /obj/item/reagent_containers/food/drinks/bottle/menthol = 4, /obj/item/reagent_containers/food/drinks/ale = 6, - /obj/item/reagent_containers/food/drinks/beer = 6, + /obj/item/reagent_containers/food/drinks/bottle/beer = 6, /obj/item/reagent_containers/food/drinks/bottle/maltliquor = 6, /obj/item/reagent_containers/food/drinks/bottle/gin = 5, /obj/item/reagent_containers/food/drinks/bottle/whiskey = 5, diff --git a/modular_skyrat/master_files/code/_globalvars/maint_loot_trash.dm b/modular_skyrat/master_files/code/_globalvars/maint_loot_trash.dm index aae7393e783..ef61ec0dd42 100644 --- a/modular_skyrat/master_files/code/_globalvars/maint_loot_trash.dm +++ b/modular_skyrat/master_files/code/_globalvars/maint_loot_trash.dm @@ -149,7 +149,7 @@ GLOBAL_LIST_INIT(trash_loot, list(//junk: useless, very easy to get, or ghetto c /obj/item/radio = 200, /obj/item/razor = 75, /obj/item/reagent_containers/food/condiment/mayonnaise = 75, - /obj/item/reagent_containers/food/drinks/beer = 50, + /obj/item/reagent_containers/food/drinks/bottle/beer = 50, /obj/item/reagent_containers/food/drinks/bottle/lizardwine = 25, /obj/item/reagent_containers/food/drinks/bottle/moonshine = 75, /obj/item/reagent_containers/food/drinks/bottle/kong = 200, diff --git a/modular_skyrat/modules/faction/maps/shuttles/tradership_faction.dmm b/modular_skyrat/modules/faction/maps/shuttles/tradership_faction.dmm index 00694f8f34a..8f3039b5902 100644 --- a/modular_skyrat/modules/faction/maps/shuttles/tradership_faction.dmm +++ b/modular_skyrat/modules/faction/maps/shuttles/tradership_faction.dmm @@ -1426,7 +1426,7 @@ pixel_x = -11; pixel_y = 3 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/food/drinks/bottle/beer{ pixel_x = 6; pixel_y = 14 }, diff --git a/modular_skyrat/modules/mapping/_maps/RandomRuins/SpaceRuins/interdynefob.dmm b/modular_skyrat/modules/mapping/_maps/RandomRuins/SpaceRuins/interdynefob.dmm index 93924d9b78b..2d9ee65831b 100644 --- a/modular_skyrat/modules/mapping/_maps/RandomRuins/SpaceRuins/interdynefob.dmm +++ b/modular_skyrat/modules/mapping/_maps/RandomRuins/SpaceRuins/interdynefob.dmm @@ -3372,11 +3372,11 @@ /area/ruin/space/has_grav/skyrat/interdynefob/research) "ma" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/food/drinks/bottle/beer{ pixel_x = -6; pixel_y = 6 }, -/obj/item/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/food/drinks/bottle/beer{ pixel_x = -2; pixel_y = 3 },