mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-24 04:27:35 +01:00
more tweaks and additions
This commit is contained in:
@@ -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)
|
||||
..()
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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"
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user