mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-21 11:07:12 +01:00
more fixes
This commit is contained in:
Fox-McCloud
@@ -282,6 +282,14 @@
|
||||
nutriment_factor = 5 * REAGENTS_METABOLISM
|
||||
color = "#302000" // rgb: 48, 32, 0
|
||||
|
||||
/datum/reagent/consumable/vanilla
|
||||
name = "Vanilla Powder"
|
||||
id = "vanilla"
|
||||
description = "A fatty, bitter paste made from vanilla pods."
|
||||
reagent_state = SOLID
|
||||
nutriment_factor = 5 * REAGENTS_METABOLISM
|
||||
color = "#FFFACD"
|
||||
|
||||
/datum/reagent/consumable/hot_coco
|
||||
name = "Hot Chocolate"
|
||||
id = "hot_coco"
|
||||
|
||||
@@ -878,38 +878,10 @@
|
||||
..()
|
||||
|
||||
/datum/reagent/medicine/omnizine_diluted/overdose_process(mob/living/M, severity)
|
||||
var/effect = ..()
|
||||
if(severity == 1) //lesser
|
||||
M.stuttering += 1
|
||||
if(effect <= 1)
|
||||
M.visible_message("<span class='warning'>[M] suddenly cluches their gut!</span>")
|
||||
M.emote("scream")
|
||||
M.Stun(4)
|
||||
M.Weaken(4)
|
||||
else if(effect <= 3)
|
||||
M.visible_message("<span class='warning'>[M] completely spaces out for a moment.</span>")
|
||||
M.AdjustConfused(15)
|
||||
else if(effect <= 5)
|
||||
M.visible_message("<span class='warning'>[M] stumbles and staggers.</span>")
|
||||
M.Dizzy(5)
|
||||
M.Weaken(3)
|
||||
else if(effect <= 7)
|
||||
M.visible_message("<span class='warning'>[M] shakes uncontrollably.</span>")
|
||||
M.Jitter(30)
|
||||
else if(severity == 2) // greater
|
||||
if(effect <= 2)
|
||||
M.visible_message("<span class='warning'>[M] suddenly cluches their gut!</span>")
|
||||
M.emote("scream")
|
||||
M.Stun(7)
|
||||
M.Weaken(7)
|
||||
else if(effect <= 5)
|
||||
M.visible_message("<span class='warning'>[M] jerks bolt upright, then collapses!</span>")
|
||||
M.Paralyse(5)
|
||||
M.Weaken(4)
|
||||
else if(effect <= 8)
|
||||
M.visible_message("<span class='warning'>[M] stumbles and staggers.</span>")
|
||||
M.Dizzy(5)
|
||||
M.Weaken(3)
|
||||
M.adjustToxLoss(1.5*REAGENTS_EFFECT_MULTIPLIER)
|
||||
M.adjustOxyLoss(1.5*REAGENTS_EFFECT_MULTIPLIER)
|
||||
M.adjustBruteLoss(1.5*REAGENTS_EFFECT_MULTIPLIER)
|
||||
M.adjustFireLoss(1.5*REAGENTS_EFFECT_MULTIPLIER)
|
||||
|
||||
//virus-specific symptom reagents
|
||||
|
||||
@@ -974,4 +946,61 @@
|
||||
|
||||
/datum/reagent/medicine/liquid_solder/on_mob_life(mob/living/M)
|
||||
M.adjustBrainLoss(-3)
|
||||
..()
|
||||
..()
|
||||
|
||||
|
||||
|
||||
//Trek-Chems. DO NOT USE THES OUTSIDE OF BOTANY OR FOR VERY SPECIFIC PURPOSES. NEVER GIVE A RECIPE UNDER ANY CIRCUMSTANCES//
|
||||
/datum/reagent/medicine/bicaridine
|
||||
name = "Bicaridine"
|
||||
id = "bicaridine"
|
||||
description = "Restores bruising. Overdose causes it instead."
|
||||
reagent_state = LIQUID
|
||||
color = "#C8A5DC"
|
||||
overdose_threshold = 30
|
||||
|
||||
/datum/reagent/medicine/bicaridine/on_mob_life(mob/living/M)
|
||||
M.adjustBruteLoss(-2*REAGENTS_EFFECT_MULTIPLIER)
|
||||
..()
|
||||
|
||||
/datum/reagent/medicine/bicaridine/overdose_process(mob/living/M)
|
||||
M.adjustBruteLoss(4*REAGENTS_EFFECT_MULTIPLIER)
|
||||
|
||||
/datum/reagent/medicine/kelotane
|
||||
name = "Kelotane"
|
||||
id = "kelotane"
|
||||
description = "Restores fire damage. Overdose causes it instead."
|
||||
reagent_state = LIQUID
|
||||
color = "#C8A5DC"
|
||||
overdose_threshold = 30
|
||||
|
||||
/datum/reagent/medicine/kelotane/on_mob_life(mob/living/M)
|
||||
M.adjustFireLoss(-2*REAGENTS_EFFECT_MULTIPLIER)
|
||||
..()
|
||||
|
||||
/datum/reagent/medicine/kelotane/overdose_process(mob/living/M)
|
||||
M.adjustFireLoss(4*REAGENTS_EFFECT_MULTIPLIER)
|
||||
|
||||
|
||||
/datum/reagent/medicine/earthsblood //Created by ambrosia gaia plants
|
||||
name = "Earthsblood"
|
||||
id = "earthsblood"
|
||||
description = "Ichor from an extremely powerful plant. Great for restoring wounds, but it's a little heavy on the brain."
|
||||
color = "#FFAF00"
|
||||
overdose_threshold = 25
|
||||
|
||||
/datum/reagent/medicine/earthsblood/on_mob_life(mob/living/M)
|
||||
M.adjustBruteLoss(-3 * REAGENTS_EFFECT_MULTIPLIER)
|
||||
M.adjustFireLoss(-3 * REAGENTS_EFFECT_MULTIPLIER)
|
||||
M.adjustOxyLoss(-15 * REAGENTS_EFFECT_MULTIPLIER)
|
||||
M.adjustToxLoss(-3 * REAGENTS_EFFECT_MULTIPLIER)
|
||||
M.adjustBrainLoss(2 * REAGENTS_EFFECT_MULTIPLIER) //This does, after all, come from ambrosia, and the most powerful ambrosia in existence, at that!
|
||||
M.adjustCloneLoss(-1 * REAGENTS_EFFECT_MULTIPLIER)
|
||||
M.adjustStaminaLoss(-30 * REAGENTS_EFFECT_MULTIPLIER)
|
||||
M.SetJitter(min(max(0, M.jitteriness + 3), 30))
|
||||
M.SetDruggy(min(max(0, M.druggy + 10), 15)) //See above
|
||||
..()
|
||||
|
||||
/datum/reagent/medicine/earthsblood/overdose_process(mob/living/M)
|
||||
M.SetHallucinate(min(max(0, M.hallucination + 10), 50))
|
||||
M.adjustToxLoss(5 * REAGENTS_EFFECT_MULTIPLIER)
|
||||
@@ -415,6 +415,37 @@
|
||||
M.say(pick("Bzzz...","BZZ BZZ","Bzzzzzzzzzzz..."))
|
||||
..()
|
||||
|
||||
/datum/reagent/growthserum
|
||||
name = "Growth serum"
|
||||
id = "growthserum"
|
||||
description = "A commercial chemical designed to help older men in the bedroom." //not really it just makes you a giant
|
||||
color = "#ff0000"//strong red. rgb 255, 0, 0
|
||||
var/current_size = 1
|
||||
|
||||
/datum/reagent/growthserum/on_mob_life(mob/living/carbon/H)
|
||||
var/newsize = current_size
|
||||
switch(volume)
|
||||
if(0 to 19)
|
||||
newsize = 1.25
|
||||
if(20 to 49)
|
||||
newsize = 1.5
|
||||
if(50 to 99)
|
||||
newsize = 2
|
||||
if(100 to 199)
|
||||
newsize = 2.5
|
||||
if(200 to INFINITY)
|
||||
newsize = 3.5
|
||||
|
||||
H.resize = newsize/current_size
|
||||
current_size = newsize
|
||||
H.update_transform()
|
||||
..()
|
||||
|
||||
/datum/reagent/growthserum/on_mob_delete(mob/living/M)
|
||||
M.resize = 1/current_size
|
||||
M.update_transform()
|
||||
..()
|
||||
|
||||
/datum/reagent/toxin/coffeepowder
|
||||
name = "Coffee Grounds"
|
||||
id = "coffeepowder"
|
||||
|
||||
@@ -944,6 +944,26 @@
|
||||
D.adjustHealth(100)
|
||||
..()
|
||||
|
||||
/datum/reagent/pestkiller // To-Do; make this more realistic.
|
||||
name = "Pest Killer"
|
||||
id = "pestkiller"
|
||||
description = "A harmful toxic mixture to kill pests. Do not ingest!"
|
||||
color = "#4B004B" // rgb: 75, 0, 75
|
||||
|
||||
/datum/reagent/pestkiller/on_mob_life(mob/living/M)
|
||||
M.adjustToxLoss(1)
|
||||
..()
|
||||
|
||||
/datum/reagent/pestkiller/reaction_mob(mob/living/M, method=TOUCH, volume)
|
||||
if(iscarbon(M))
|
||||
var/mob/living/carbon/C = M
|
||||
if(!C.wear_mask) // If not wearing a mask
|
||||
C.adjustToxLoss(2)
|
||||
if(ishuman(M))
|
||||
var/mob/living/carbon/human/H = M
|
||||
if(H.get_species() == "Kidan") //RIP
|
||||
H.adjustToxLoss(20)
|
||||
|
||||
/datum/reagent/capulettium
|
||||
name = "Capulettium"
|
||||
id = "capulettium"
|
||||
|
||||
@@ -101,6 +101,14 @@
|
||||
result_amount = 3
|
||||
mix_message = "The mixture gives off a harsh odor"
|
||||
|
||||
/datum/chemical_reaction/pestkiller // To-Do make this more realistic
|
||||
name = "Pest Killer"
|
||||
id = "pestkiller"
|
||||
result = "pestkiller"
|
||||
required_reagents = list("toxin" = 1, "ethanol" = 4)
|
||||
result_amount = 5
|
||||
mix_message = "The mixture gives off a harsh odor"
|
||||
|
||||
/datum/chemical_reaction/capulettium
|
||||
name = "capulettium"
|
||||
id = "capulettium"
|
||||
|
||||
@@ -127,7 +127,7 @@
|
||||
/obj/item/weapon/reagent_containers/spray/waterflower
|
||||
name = "water flower"
|
||||
desc = "A seemingly innocent sunflower...with a twist."
|
||||
icon = 'icons/obj/harvest.dmi'
|
||||
icon = 'icons/obj/hydroponics/harvest.dmi'
|
||||
icon_state = "sunflower"
|
||||
item_state = "sunflower"
|
||||
amount_per_transfer_from_this = 1
|
||||
|
||||
Reference in New Issue
Block a user