From 4d9c89bdc0a6c8e2ce40cf394fb54afbb0d726ee Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Fri, 6 Mar 2020 23:48:32 -0500 Subject: [PATCH] menthol --- code/game/machinery/vending.dm | 6 ++--- code/game/objects/items/weapons/cigs.dm | 3 +++ .../objects/items/weapons/storage/fancy.dm | 1 + .../reagents/chemistry/reagents/medicine.dm | 23 +++++++++++++++++-- 4 files changed, 28 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 00d9f94a356..925f983222e 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -1116,10 +1116,10 @@ product_ads = "Probably not bad for you!;Don't believe the scientists!;It's good for you!;Don't quit, buy more!;Smoke!;Nicotine heaven.;Best cigarettes since 2150.;Award-winning cigs." vend_delay = 34 icon_state = "cigs" - products = list(/obj/item/storage/fancy/cigarettes = 5,/obj/item/storage/fancy/cigarettes/cigpack_uplift = 3,/obj/item/storage/fancy/cigarettes/cigpack_robust = 2,/obj/item/storage/fancy/cigarettes/cigpack_carp = 3,/obj/item/storage/fancy/cigarettes/cigpack_midori = 1,/obj/item/storage/fancy/cigarettes/cigpack_random = 2, /obj/item/reagent_containers/food/pill/patch/nicotine = 10, /obj/item/storage/box/matches = 10,/obj/item/lighter/random = 4,/obj/item/storage/fancy/rollingpapers = 5) + products = list(/obj/item/storage/fancy/cigarettes/cigpack_robust = 12, /obj/item/storage/fancy/cigarettes/cigpack_uplift = 6, /obj/item/storage/fancy/cigarettes/cigpack_random = 6, /obj/item/reagent_containers/food/pill/patch/nicotine = 10, /obj/item/storage/box/matches = 10,/obj/item/lighter/random = 4,/obj/item/storage/fancy/rollingpapers = 5) contraband = list(/obj/item/lighter/zippo = 4) - premium = list(/obj/item/clothing/mask/cigarette/cigar/havana = 2,/obj/item/storage/fancy/cigarettes/cigpack_robustgold = 1) - prices = list(/obj/item/storage/fancy/cigarettes = 60,/obj/item/storage/fancy/cigarettes/cigpack_uplift = 60,/obj/item/storage/fancy/cigarettes/cigpack_robust = 60,/obj/item/storage/fancy/cigarettes/cigpack_carp = 60,/obj/item/storage/fancy/cigarettes/cigpack_midori = 60,/obj/item/storage/fancy/cigarettes/cigpack_random = 150, /obj/item/reagent_containers/food/pill/patch/nicotine = 15, /obj/item/storage/box/matches = 10,/obj/item/lighter/random = 60, /obj/item/storage/fancy/rollingpapers = 20) + premium = list(/obj/item/clothing/mask/cigarette/cigar/havana = 2, /obj/item/storage/fancy/cigarettes/cigpack_robustgold = 1) + prices = list(/obj/item/storage/fancy/cigarettes/cigpack_robust = 60, /obj/item/storage/fancy/cigarettes/cigpack_uplift = 80, /obj/item/storage/fancy/cigarettes/cigpack_random = 120, /obj/item/reagent_containers/food/pill/patch/nicotine = 70, /obj/item/storage/box/matches = 10,/obj/item/lighter/random = 60, /obj/item/storage/fancy/rollingpapers = 20) refill_canister = /obj/item/vending_refill/cigarette /obj/machinery/vending/cigarette/free diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm index f067a9f9e65..30904c4aa71 100644 --- a/code/game/objects/items/weapons/cigs.dm +++ b/code/game/objects/items/weapons/cigs.dm @@ -218,6 +218,9 @@ LIGHTERS ARE IN LIGHTERS.DM qdel(src) +/obj/item/clothing/mask/cigarette/menthol + list_reagents = list("nicotine" = 40, "menthol" = 20) + /obj/item/clothing/mask/cigarette/random /obj/item/clothing/mask/cigarette/random/New() diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 58864d9e489..4d2b1bd9c44 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -252,6 +252,7 @@ desc = "Your favorite brand, now menthol flavored." icon_state = "upliftpacket" item_state = "cigpacket" + cigarette_type = /obj/item/clothing/mask/cigarette/menthol /obj/item/storage/fancy/cigarettes/cigpack_robust name = "\improper Robust packet" diff --git a/code/modules/reagents/chemistry/reagents/medicine.dm b/code/modules/reagents/chemistry/reagents/medicine.dm index c297716c1a7..f77732087b8 100644 --- a/code/modules/reagents/chemistry/reagents/medicine.dm +++ b/code/modules/reagents/chemistry/reagents/medicine.dm @@ -405,7 +405,7 @@ id = "sal_acid" description = "This is a is a standard salicylate pain reliever and fever reducer." reagent_state = LIQUID - color = "#B3B3B3" + color = "#B54848" metabolization_rate = 0.1 shock_reduction = 25 overdose_threshold = 25 @@ -415,7 +415,26 @@ /datum/reagent/medicine/sal_acid/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE if(prob(55)) - update_flags |= M.adjustBruteLoss(-2*REAGENTS_EFFECT_MULTIPLIER, FALSE) + update_flags |= M.adjustBruteLoss(-2 * REAGENTS_EFFECT_MULTIPLIER, FALSE) + if(M.bodytemperature > 310.15) + M.bodytemperature = max(310.15, M.bodytemperature - 10) + return ..() | update_flags + +/datum/reagent/medicine/menthol + name = "Menthol" + id = "menthol" + description = "Menthol relieves burns and aches while providing a cooling sensation." + reagent_state = LIQUID + color = "#F0F9CA" + metabolization_rate = 0.1 + taste_description = "soothing" + +/datum/reagent/medicine/menthol/on_mob_life(mob/living/M) + var/update_flags = STATUS_UPDATE_NONE + if(prob(55)) + update_flags |= M.adjustFireLoss(-2 * REAGENTS_EFFECT_MULTIPLIER, FALSE) + if(M.bodytemperature > 280) + M.bodytemperature = max(280, M.bodytemperature - 10) return ..() | update_flags /datum/reagent/medicine/salbutamol