diff --git a/GainStation13/code/modules/reagents/chemistry/reagents/dwarverndrinks.dm b/GainStation13/code/modules/reagents/chemistry/reagents/dwarverndrinks.dm index e69de29b..22afcd02 100644 --- a/GainStation13/code/modules/reagents/chemistry/reagents/dwarverndrinks.dm +++ b/GainStation13/code/modules/reagents/chemistry/reagents/dwarverndrinks.dm @@ -0,0 +1,28 @@ +///GS13 drinks! + +/datum/reagent/consumable/ethanol/oily_oafs + name = "Oily oafs" + description = "The oily oaf. while it isn't as strong as some of the other drinks on station, Its buttery aftertaste and affordability make it a staple of any good miner's diet." + color = "#ffc75f" + boozepwr = 30 + taste_description = "rich butter and red sugar" + //quality = DRINK_NICE we need to get drink quality implemented in our drink files -Eye + glass_icon_state = "oily_oafs" + glass_name = "oily oafs" + glass_desc = "The oily oaf. A dwarvern classic beloved by miners around the cosmos." + shot_glass_icon_state = "shotglassbrown" + pH = 4.5 + value = 0.1 + +/datum/reagent/consumable/ethanol/glyphid_slammer + name = "Glyphid slammer" + description = "A mixture of strong beer and energy drink. How it manages to be as strong as it is baffles scientists to this day" + color = "#FF8A33" + boozepwr = 60 + taste_description = "Cheap booze and adventure" + glass_icon_state = "glyphid_slammer" + glass_name = "Glyphid slammer" + glass_desc = "A bold mixture of cheap energy drink, and even cheaper ale. Beloved by partygoers and daredevils across the galaxy. Beloathed by bugpeople" + shot_glass_icon_state = "shotglassbrown" + pH = 4.5 + value = 0.1 \ No newline at end of file diff --git a/GainStation13/code/modules/reagents/chemistry/recipes/ROCKANDSTONEdrinks.dm b/GainStation13/code/modules/reagents/chemistry/recipes/ROCKANDSTONEdrinks.dm index e69de29b..97adc1f1 100644 --- a/GainStation13/code/modules/reagents/chemistry/recipes/ROCKANDSTONEdrinks.dm +++ b/GainStation13/code/modules/reagents/chemistry/recipes/ROCKANDSTONEdrinks.dm @@ -0,0 +1,17 @@ +//DRG drinks + + +/datum/chemical_reaction/oily_oafs + name = "Oily oafs" + id = /datum/reagent/consumable/ethanol/oily_oafs + results = list(/datum/reagent/consumable/ethanol/oily_oafs = 2) + required_reagents = list(/datum/reagent/consumable/ethanol/beer = 1, /datum/reagent/consumable/cream = 1) + +/datum/chemical_reaction/glyphid_slammer + name = "Glyphid slammer" + id = /datum/reagent/consumable/ethanol/glyphid_slammer + results = list(/datum/reagent/consumable/ethanol/glyphid_slammer = 2) + required_reagents = list(/datum/reagent/consumable/pwr_game = 1, /datum/reagent/consumable/ethanol/beer = 1) + + + diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 7c772c4e..a1a8c0d1 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -11,7 +11,7 @@ desc = "It's watching you suspiciously." /obj/structure/closet/crate/necropolis/tendril/PopulateContents() - var/loot = rand(1,33) + var/loot = rand(1,34) switch(loot) if(1) new /obj/item/shared_storage/red(src) @@ -91,6 +91,8 @@ new /obj/item/gun/energy/fatoray/cannon(src) if(33) new /obj/item/gun/magic/wand/food(src) + if(34) + new /obj/item/karl_pickaxe(src) // if(29) // new /obj/item/clothing/gloves/gauntlets(src) @@ -269,6 +271,26 @@ if(do_after(owner, 40, target = owner)) MM.mori() +//Karl's pickaxe +/obj/item/karl_pickaxe //GS13 addition! + name = "karl's pickaxe" + desc = "You can never dig too deep" + icon = 'icons/obj/mining.dmi' + icon_state = "karlpick" + flags_1 = CONDUCT_1 + slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK + force = 30 + throwforce = 20 + item_state = "pickaxe" + lefthand_file = 'icons/mob/inhands/equipment/mining_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/mining_righthand.dmi' + w_class = WEIGHT_CLASS_SMALL + materials = list(MAT_METAL=2000) + tool_behaviour = TOOL_MINING + toolspeed = 0.01 + usesound = list('sound/effects/picaxe1.ogg', 'sound/effects/picaxe2.ogg', 'sound/effects/picaxe3.ogg') + attack_verb = list("hit", "pierced", "sliced", "attacked", "rocked", "stoned", "power attacked") + //Wisp Lantern /obj/item/wisp_lantern name = "spooky lantern" diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index f2ea4106..046ec549 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/icons/obj/mining.dmi b/icons/obj/mining.dmi index 724b8a95..859e4ee2 100644 Binary files a/icons/obj/mining.dmi and b/icons/obj/mining.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 1ca4c7d9..26b69739 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -13,8 +13,6 @@ // END_PREFERENCES // BEGIN_INCLUDE -#include "dwarverndrinks.dm" -#include "ROCKANDSTONEdrinks.dm" #include "_maps\_basemap.dm" #include "_maps\map_files\generic\CentCom.dmm" #include "code\_compile_options.dm" @@ -3086,7 +3084,9 @@ #include "GainStation13\code\modules\food_and_drinks\drinks\drinks.dm" #include "GainStation13\code\modules\mob\living\emote.dm" #include "GainStation13\code\modules\reagents\chemistry\reagents\consumable_reagents.dm" +#include "GainStation13\code\modules\reagents\chemistry\reagents\dwarverndrinks.dm" #include "GainStation13\code\modules\reagents\chemistry\recipes\fatchem.dm" +#include "GainStation13\code\modules\reagents\chemistry\recipes\ROCKANDSTONEdrinks.dm" #include "GainStation13\code\modules\research\designs\nutri_designs.dm" #include "GainStation13\code\modules\vending\gatocola.dm" #include "GainStation13\code\modules\vending\GBBurrito.dm"