diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index 6a0f2d475e5..a9221ed8440 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -96,6 +96,7 @@ dat += "Left 4 Zed (20) | x5
" dat += "Robust Harvest (25) | x5
" dat += "Leather
" + dat += "Wallet (200)
" dat += "Botanical gloves (350)
" dat += "Utility belt (400)
" //dat += "Other
" diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm index dae8422a5db..26bb307ea34 100644 --- a/code/modules/chemical/Chemistry-Tools.dm +++ b/code/modules/chemical/Chemistry-Tools.dm @@ -3673,7 +3673,7 @@ desc = "A drink that is guaranteed to knock you silly." if("hippiesdelight") icon_state = "hippiesdelightglass" - name = "Hippiesdelight" + name = "Hippie's Delight" desc = "A drink enjoyed by people during the 1960's." if("bananahonk") icon_state = "bananahonkglass" @@ -3711,6 +3711,22 @@ icon_state = "driestmartiniglass" name = "Driest Martini" desc = "Only for the experienced. You think you see sand floating in the glass." + if("ice") + icon_state = "iceglass" + name = "Glass of ice" + desc = "Generally, you're supposed to put something else in there too..." + if("icecoffee") + icon_state = "icedcoffeeglass" + name = "Iced Coffee" + desc = "A drink to perk you up and refresh you!" + if("coffee") + icon_state = "glass_brown" + name = "Glass of coffee" + desc = "Don't drop it, or you'll send scalding liquid and glass shards everywhere." + if("bilk") + icon_state = "glass_brown" + name = "Glass of bilk" + desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis." else icon_state ="glass_brown" name = "Glass of ..what?" diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index e4652f8b620..730ebee281d 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi index 46d59db1536..8eab299d9a9 100644 Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ