diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index a430a7e21b0..4d1ae80ccbc 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -392,8 +392,7 @@ var/list/uplink_items = list() /datum/uplink_item/stealthy_weapons/sleepy_pen name = "Sleepy Pen" - desc = "A syringe disguised as a functional pen, filled with a potent mix of drugs, including a strong anaesthetic and a chemical that is capable of blocking the movement of the vocal chords. \ - The pen holds one dose of the mixture. The pen can be refilled." + desc = "A syringe disguised as a functional pen. It's filled with a potent anaesthetic. \The pen holds two doses of the mixture. The pen can be refilled." item = /obj/item/weapon/pen/sleepy cost = 8 excludefrom = list("nuclear emergency") diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 290e6a428c1..149b19307a6 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -73,12 +73,10 @@ if(..()) if(reagents.total_volume) if(M.reagents) - reagents.trans_to(M, 55) + reagents.trans_to(M, 50) /obj/item/weapon/pen/sleepy/New() - create_reagents(55) - reagents.add_reagent("stoxin", 30) - reagents.add_reagent("mutetoxin", 15) - reagents.add_reagent("tirizene", 10) + create_reagents(100) + reagents.add_reagent("ketamine", 100) ..() diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index d6264ba0392..e08f7203444 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -662,7 +662,8 @@ datum on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom - M.adjustBrainLoss(0.7) + if(prob(70)) + M.adjustBrainLoss(1) ..() return @@ -1825,18 +1826,6 @@ datum M.status_flags &= ~FAKEDEATH ..()8*/ - mutetoxin - name = "Mute Toxin" - id = "mutetoxin" - description = "A toxin that temporarily paralyzes the vocal cords." - reagent_state = LIQUID - color = "#F0F8FF" // rgb: 240, 248, 255 - - on_mob_life(var/mob/living/M) - if(!M) M = holder.my_atom - M.silent += REM + 1 - ..() - staminatoxin name = "Tirizene" id = "tirizene" diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 8b70470778b..2bd3ec01812 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -128,6 +128,7 @@ datum result = "space_drugs" required_reagents = list("mercury" = 1, "sugar" = 1, "lithium" = 1) result_amount = 3 + mix_message = "Slightly dizzying fumes drift from the solution." lube name = "Space Lube" @@ -384,13 +385,6 @@ datum required_reagents = list("carpotoxin" = 5, "stoxin" = 5, "copper" = 5) result_amount = 2 - mutetoxin - name = "Mute toxin" - id = "mutetoxin" - result = "mutetoxin" - required_reagents = list("uranium" = 2, "water" = 1, "carbon" = 1) - result_amount = 2 - rezadone name = "Rezadone" id = "rezadone" diff --git a/code/modules/reagents/newchem/medicine.dm b/code/modules/reagents/newchem/medicine.dm index 25dff0db85f..be4ef97cf9e 100644 --- a/code/modules/reagents/newchem/medicine.dm +++ b/code/modules/reagents/newchem/medicine.dm @@ -66,6 +66,7 @@ datum/reagent/salglu_solution description = "Has a 33% chance per metabolism cycle to heal brute and burn damage." reagent_state = LIQUID color = "#C8A5DC" + metabolization_rate = 0.15 datum/reagent/salglu_solution/on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom @@ -799,8 +800,8 @@ datum/reagent/stimulants/on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom M.adjustOxyLoss(-5*REM) M.adjustToxLoss(-5*REM) - M.adjustBruteLoss(-5*REM) - M.adjustFireLoss(-5*REM) + M.adjustBruteLoss(-10*REM) + M.adjustFireLoss(-10*REM) M.setStaminaLoss(0) var/status = CANSTUN | CANWEAKEN | CANPARALYSE M.status_flags &= ~status @@ -810,8 +811,8 @@ datum/reagent/stimulants/reagent_deleted(var/mob/living/M as mob) if(!M) M = holder.my_atom M.status_flags |= CANSTUN | CANWEAKEN | CANPARALYSE M.adjustBruteLoss(12) - M.adjustToxLoss(12) - M.Stun(3) + M.adjustToxLoss(24) + M.Stun(4) ..() return diff --git a/code/modules/reagents/newchem/toxins.dm b/code/modules/reagents/newchem/toxins.dm index 3daf0372372..23a793d4e28 100644 --- a/code/modules/reagents/newchem/toxins.dm +++ b/code/modules/reagents/newchem/toxins.dm @@ -354,6 +354,26 @@ datum/reagent/sodium_thiopental/on_mob_life(var/mob/living/M as mob) ..() return +datum/reagent/ketamine + name = "Ketamine" + id = "ketamine" + description = "A potent veterinary tranquilizer." + reagent_state = LIQUID + color = "#646EA0" + metabolization_rate = 0.8 + +datum/reagent/ketamine/on_mob_life(var/mob/living/M as mob) + if(!M) M = holder.my_atom + if(current_cycle <= 10) + if(prob(20)) + M.emote("yawn") + if(current_cycle == 6) + M.eye_blurry = max(M.eye_blurry, 5) + if(current_cycle >= 10) + M.Paralyse(10) + ..() + return + datum/reagent/sulfonal name = "Sulfonal" id = "sulfonal" @@ -560,4 +580,49 @@ datum/reagent/atrazine/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volu result = "atrazine" required_reagents = list("chlorine" = 1, "hydrogen" = 1, "nitrogen" = 1) result_amount = 3 - mix_message = "The mixture gives off a harsh odor" \ No newline at end of file + mix_message = "The mixture gives off a harsh odor" + +datum/reagent/capulettium + name = "Capulettium" + id = "capulettium" + description = "A rare drug that causes the user to appear dead for some time." + reagent_state = LIQUID + color = "#60A584" + +/datum/chemical_reaction/capulettium + name = "capulettium" + id = "capulettium" + result = "capulettium" + required_reagents = list("neurotoxin2" = 1, "chlorine" = 1, "hydrogen" = 1) + result_amount = 1 + mix_message = "The smell of death wafts up from the solution." + +datum/reagent/capulettium/on_mob_life(var/mob/living/M as mob) + if(!M) M = holder.my_atom + M.eye_blurry = max(M.eye_blurry, 2) + if(current_cycle == 12) + M.emote("deathgasp") + M.Paralyse(10) + ..() + return + +datum/reagent/capulettium_plus + name = "Capulettium Plus" + id = "capulettium_plus" + description = "A rare and expensive drug that causes the user to appear dead for some time while they retain consciousness and vision." + reagent_state = LIQUID + color = "#60A584" + +/datum/chemical_reaction/capulettium_plus + name = "capulettium_plus" + id = "capulettium_plus" + result = "capulettium_plus" + required_reagents = list("capulettium" = 1, "ephedrine" = 1, "methamphetamine" = 1) + result_amount = 3 + mix_message = "The solution begins to slosh about violently by itself." + +datum/reagent/capulettium_plus/on_mob_life(var/mob/living/M as mob) + if(!M) M = holder.my_atom + M.silent += REM + 1 + ..() + return diff --git a/code/setup.dm b/code/setup.dm index 9f6992e63d2..f841b9f6ab4 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -802,7 +802,7 @@ var/list/be_special_flags = list( //feel free to add shit to lists below var/list/tachycardics = list("coffee", "inaprovaline", "hyperzine", "nitroglycerin", "thirteenloko", "nicotine") //increase heart rate var/list/bradycardics = list("neurotoxin", "cryoxadone", "clonexadone", "space_drugs", "stoxin") //decrease heart rate -var/list/heartstopper = list("zombie_powder") //this stops the heart +var/list/heartstopper = list("zombie_powder", "capulettium", "capulettium_plus") //this stops the heart var/list/cheartstopper = list() //this stops the heart when overdose is met -- c = conditional //proc/get_pulse methods