diff --git a/code/modules/client/preference_setup/loadout/items/xeno/diona.dm b/code/modules/client/preference_setup/loadout/items/xeno/diona.dm index a27c2b31f51..8c2844bf491 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/diona.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/diona.dm @@ -547,3 +547,9 @@ ABSTRACT_TYPE(/datum/gear/accessory/diona) diona_passport["union of gla'orr passport"] = /obj/item/clothing/accessory/badge/passport/dionaunion diona_passport["eternal republic of the ekane passport"] = /obj/item/clothing/accessory/badge/passport/eternalrepublic gear_tweaks += new /datum/gear_tweak/path(diona_passport) + +/datum/gear/diet_diesel + display_name = "diet diesel jar" + path = /obj/item/reagent_containers/food/condiment/diet_diesel + whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) + sort_category = "Xenowear - Diona" diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm index 36a97d11d10..631eb9345f9 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm @@ -727,7 +727,7 @@ /singleton/reagent/drugs/dionae_stimulant name = "Diesel" - description = "Fondly dubbed Diesel by the dionae of the Narrows where it is served in the ship's cafeteria, this viscous sludge is the byproduct of refining radioactive materialls and provides an invigorating kick to a dionae's workday." + description = "Fondly dubbed Diesel by the dionae of the Narrows where it is served in the ship's cafeteria, this viscous sludge is the byproduct of refining radioactive materials and provides an invigorating kick to a dionae's workday." color = "#465044" taste_description = "gritty corium" reagent_state = SOLID @@ -745,6 +745,7 @@ /singleton/reagent/drugs/dionae_stimulant/affect_blood(mob/living/carbon/M, alien, removed, datum/reagents/holder) M.apply_damage(10, DAMAGE_RADIATION, damage_flags = DAMAGE_FLAG_DISPERSED) + M.apply_damage(10, DAMAGE_TOXIN, damage_flags = DAMAGE_FLAG_DISPERSED) if(alien == IS_DIONA) if(prob(5)) to_chat(M, SPAN_GOOD(pick("A bubbling sensation is felt by your nymphs.", "A nymph comments that this is the most energetic it has ever been!", "A warm energy builds within your central structure.", "Your nymphs can't stay still!"))) @@ -772,5 +773,22 @@ M.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/dionae_stimulant) . = ..() +/singleton/reagent/drugs/dionae_stimulant/diet + name = "diet Diesel" + description = "Diesel produced straight from the Narrows that has been made \"diet\" or decontaminated of radiation, making it safe for distribution around the Orion Spur." + +/singleton/reagent/drugs/dionae_stimulant/diet/initial_effect(mob/living/carbon/M, alien, datum/reagents/holder) + return + +/singleton/reagent/drugs/dionae_stimulant/diet/affect_blood(mob/living/carbon/M, alien, removed, datum/reagents/holder) + M.apply_damage(5, DAMAGE_TOXIN, damage_flags = DAMAGE_FLAG_DISPERSED) //Less toxic than regular Diesel due to the lack of radioactivity, but still toxic + if(alien == IS_DIONA) + if(prob(5)) + to_chat(M, SPAN_GOOD(pick("A bubbling sensation is felt by your nymphs.", "A nymph comments that this is the most energetic it has ever been!", "A warm energy builds within your central structure.", "Your nymphs can't stay still!"))) + M.emote(pick("chirp", "twitch", "shiver")) + +/singleton/reagent/drugs/dionae_stimulant/diet/final_effect(mob/living/carbon/M, alien, removed, datum/reagents/holder) + return + #undef DRUG_MESSAGE_DELAY diff --git a/code/modules/reagents/reagent_containers/food/condiment.dm b/code/modules/reagents/reagent_containers/food/condiment.dm index 3a374d32ebc..f0245742957 100644 --- a/code/modules/reagents/reagent_containers/food/condiment.dm +++ b/code/modules/reagents/reagent_containers/food/condiment.dm @@ -459,3 +459,10 @@ icon_state = "wuluextract" fixed_state = TRUE reagents_to_add = list(/singleton/reagent/wulumunusha = 30) + +/obj/item/reagent_containers/food/condiment/diet_diesel + name = "diet diesel bottle" + desc = "A Hephaestus-trademarked jar, containing some kind of unpleasant-smelling gray sludge. The label says it's for Diona-based consumption only." + icon_state = "dietdiesel" + fixed_state = TRUE + reagents_to_add = list(/singleton/reagent/drugs/dionae_stimulant/diet = 30) diff --git a/html/changelogs/SimpleMaroon-decafdiesel.yml b/html/changelogs/SimpleMaroon-decafdiesel.yml new file mode 100644 index 00000000000..d36495f5e9c --- /dev/null +++ b/html/changelogs/SimpleMaroon-decafdiesel.yml @@ -0,0 +1,60 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: SimpleMaroon + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added 'diet Diesel' to the Diona - Xenowear loadout. It's like the Diesel you know and love without all that dangerous radiation!" + - qol: "Regular and diet Diesel now both inflict toxin damage, with diet Diesel inflicting less." + - spellcheck: "Correct a typo in the description for standard Diesel." diff --git a/icons/obj/item/reagent_containers/food/condiment.dmi b/icons/obj/item/reagent_containers/food/condiment.dmi index cc9b6387d86..b7942218663 100644 Binary files a/icons/obj/item/reagent_containers/food/condiment.dmi and b/icons/obj/item/reagent_containers/food/condiment.dmi differ