diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index 95245be037e..cfec8f3296e 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
" @@ -184,6 +185,8 @@ new/obj/item/nutrient/rh(src.loc) new/obj/item/nutrient/rh(src.loc) new/obj/item/nutrient/rh(src.loc) + if("wallet") + new/obj/item/weapon/storage/wallet(src.loc) if("gloves") new/obj/item/clothing/gloves/botanic_leather(src.loc) if("tbelt") diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm index 775aee9e8b5..96522821598 100644 --- a/code/modules/chemical/Chemistry-Tools.dm +++ b/code/modules/chemical/Chemistry-Tools.dm @@ -3416,7 +3416,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" @@ -3454,6 +3454,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/doors/windoor.dmi b/icons/obj/doors/windoor.dmi index 53d2c2cafdb..24796270c1d 100644 Binary files a/icons/obj/doors/windoor.dmi and b/icons/obj/doors/windoor.dmi differ diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 4f1f4d87df5..fb84d5fd442 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 ce4fb2f5e22..8eab299d9a9 100644 Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ