final touchups

This commit is contained in:
Fox-McCloud
2016-03-11 21:13:38 -05:00
parent 798e81f7ee
commit b6a6b54ff8
7 changed files with 47 additions and 6 deletions
+10
View File
@@ -262,6 +262,16 @@
result_amount = 4
min_temp = 374
/datum/chemical_reaction/methamphetamine/on_reaction(var/datum/reagents/holder)
var/turf/T = get_turf(holder.my_atom)
T.visible_message("<span class='warning'>The solution generates a strong vapor!</span>")
for(var/mob/living/carbon/C in range(T, 1))
if(!(C.wear_mask && (C.internals != null || C.wear_mask.flags & BLOCK_GAS_SMOKE_EFFECT)))
C.emote("gasp")
C.losebreath++
C.reagents.add_reagent("toxin",10)
C.reagents.add_reagent("neurotoxin2",20)
/datum/chemical_reaction/saltpetre
name = "saltpetre"
id = "saltpetre"
+16 -3
View File
@@ -203,7 +203,7 @@ datum/reagent/fungus/reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
if(ranchance == 1)
M << "<span class='warning'>You feel very sick.</span>"
M.reagents.add_reagent("toxin", rand(1,5))
else if(ranchance <= 5 && ranchance != 1)
else if(ranchance <= 5)
M << "<span class='warning'>That tasted absolutely FOUL.</span>"
else M << "<span class='warning'>Yuck!</span>"
@@ -251,11 +251,13 @@ datum/reagent/msg/reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
description = "Some cheese. Pour it out to make it solid."
reagent_state = SOLID
color = "#FFFF00"
metabolization_rate = 0 //heheheh
/datum/reagent/cheese/on_mob_life(var/mob/living/M as mob)
if(prob(3))
M.reagents.add_reagent("cholesterol", rand(1,2)) //intentional no parent call, hehehe.
M.reagents.add_reagent("cholesterol", rand(1,2))
..()
datum/reagent/cheese/reaction_turf(var/turf/T, var/volume)
src = null
@@ -271,6 +273,10 @@ datum/reagent/cheese/reaction_turf(var/turf/T, var/volume)
result_amount = 1
mix_message = "The mixture curdles up."
/datum/chemical_reaction/cheese/on_reaction(var/datum/reagents/holder)
var/turf/T = get_turf(holder.my_atom)
T.visible_message("<span class='notice'>A faint cheesy smell drifts through the air...</span>")
/datum/reagent/fake_cheese
name = "Cheese substitute"
id = "fake_cheese"
@@ -291,10 +297,12 @@ datum/reagent/cheese/reaction_turf(var/turf/T, var/volume)
description = "Hell, I don't even know if this IS cheese. Whatever it is, it ain't normal. If you want to, pour it out to make it solid."
reagent_state = SOLID
color = "#50FF00"
metabolization_rate = 0 //heheheh
/datum/reagent/weird_cheese/on_mob_life(var/mob/living/M as mob)
if(prob(5))
M.reagents.add_reagent("cholesterol", rand(1,3)) //intentional no parent call, hehehe.
M.reagents.add_reagent("cholesterol", rand(1,3))
..()
datum/reagent/weird_cheese/reaction_turf(var/turf/T, var/volume)
src = null
@@ -309,6 +317,11 @@ datum/reagent/weird_cheese/reaction_turf(var/turf/T, var/volume)
required_reagents = list("green_vomit" = 1, "milk" = 1)
result_amount = 1
mix_message = "The disgusting mixture sloughs together horribly, emitting a foul stench."
mix_sound = 'sound/goonstation/misc/gurggle.ogg'
/datum/chemical_reaction/weird_cheese/on_reaction(var/datum/reagents/holder)
var/turf/T = get_turf(holder.my_atom)
T.visible_message("<span class='warning'>A horrible smell assaults your nose! What in space is it?</span>")
datum/reagent/beans
name = "Refried beans"
+1 -1
View File
@@ -292,7 +292,7 @@ datum/reagent/fartonium/on_mob_life(var/mob/living/M as mob)
if(holder.has_reagent("simethicone"))
if(prob(25))
M << "<span class='danger'>[pick("Oh god, something doesn't feel right!", "IT HURTS!", "FUCK!", "Something is seriously wrong!", "THE PAIN!", "You feel like you're gunna die!")]</span>"
M << "<span class='danger'>[pick("Oh god, something doesn't feel right!", "IT HURTS!", "FUCK!", "Something is seriously wrong!", "THE PAIN!", "You feel like you're gonna die!")]</span>"
M.adjustBruteLoss(1)
if(prob(10))
M.custom_emote(1,"strains, but nothing happens.")
+13
View File
@@ -216,6 +216,12 @@
mix_message = "The mixture gives off a faint scent of almonds."
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/cyanide/on_reaction(var/datum/reagents/holder)
var/turf/T = get_turf(holder.my_atom)
T.visible_message("<span class='warning'>The solution generates a strong vapor!</span>")
for(var/mob/living/carbon/C in range(T, 1))
if(!(C.wear_mask && (C.internals != null || C.wear_mask.flags & BLOCK_GAS_SMOKE_EFFECT)))
C.reagents.add_reagent("cyanide",7)
/datum/reagent/itching_powder
name = "Itching Powder"
@@ -632,6 +638,13 @@
min_temp = 374
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/sarin/on_reaction(var/datum/reagents/holder)
var/turf/T = get_turf(holder.my_atom)
T.visible_message("<span class='warning'>The solution generates a strong vapor!</span>")
for(var/mob/living/carbon/C in range(T, 2))
if(!(C.wear_mask && (C.internals != null || C.wear_mask.flags & BLOCK_GAS_SMOKE_EFFECT)))
C.reagents.add_reagent("sarin",4)
/datum/reagent/sarin/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
switch(current_cycle)
@@ -448,10 +448,13 @@
..()
return
/datum/reagent/sugar/overdose_start(var/mob/living/M as mob)
M << "<span class='danger'>You pass out from hyperglycemic shock!</span>"
M.emote("collapse")
..()
/datum/reagent/sugar/overdose_process(var/mob/living/M as mob)
if(volume > 200)
M << "<span class='danger'>You pass out from hyperglycemic shock!</span>"
M.emote("collapse")
M.Paralyse(3)
M.Weaken(4)
if(prob(8))