shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Jfc that's a lot of work!

Browse Source
This commit is contained in:
Ghommie
2019-12-23 04:24:13 +01:00
parent c87bdef944
commit e74339ce8b
217 changed files with 1329 additions and 1288 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/designs/biogenerator_designs.dm
+3 -3
View File
@@ -7,7 +7,7 @@
id = "milk"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 20)
make_reagents = list("milk" = 10)
make_reagents = list(/datum/reagent/consumable/milk = 10)
category = list("initial","Food")
/datum/design/cream
@@ -15,7 +15,7 @@
id = "cream"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 30)
make_reagents = list("cream" = 10)
make_reagents = list(/datum/reagent/consumable/cream = 10)
category = list("initial","Food")
/datum/design/milk_carton
@@ -39,7 +39,7 @@
id = "black_pepper"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 25)
make_reagents = list("blackpepper" = 10)
make_reagents = list(/datum/reagent/consumable/blackpepper = 10)
category = list("initial","Food")
/datum/design/pepper_mill
code/modules/research/experimentor.dm
+8 -6
View File
@@ -271,7 +271,7 @@
if(!T.density)
if(prob(EFFECT_PROB_VERYHIGH) && !(locate(/obj/effect/decal/cleanable/greenglow) in T))
var/obj/effect/decal/cleanable/reagentdecal = new/obj/effect/decal/cleanable/greenglow(T)
reagentdecal.reagents.add_reagent("radium", 7)
reagentdecal.reagents.add_reagent(/datum/reagent/radium, 7)
else if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
var/savedName = "[exp_on]"
ejectItem(TRUE)
@@ -291,7 +291,9 @@
new /obj/item/stack/sheet/mineral/plasma(get_turf(pick(oview(1,src))))
else if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
visible_message("<span class='danger'>[src] destroys [exp_on], leaking dangerous gas!</span>")
chosenchem = pick("carbon","radium","toxin","condensedcapsaicin","mushroomhallucinogen","space_drugs","ethanol","beepskysmash")
chosenchem = pick(/datum/reagent/carbon,/datum/reagent/radium,/datum/reagent/toxin,
/datum/reagent/consumable/condensedcapsaicin,/datum/reagent/drug/mushroomhallucinogen,
/datum/reagent/drug/space_drugs,/datum/reagent/consumable/ethanol,/datum/reagent/consumable/ethanol/beepsky_smash)
var/datum/reagents/R = new/datum/reagents(50)
R.my_atom = src
R.add_reagent(chosenchem , 50)
@@ -304,7 +306,7 @@
ejectItem(TRUE)
else if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
visible_message("<span class='danger'>[src]'s chemical chamber has sprung a leak!</span>")
chosenchem = pick("mutationtoxin","nanomachines","sacid")
chosenchem = pick(/datum/reagent/mutationtoxin,/datum/reagent/nanomachines,/datum/reagent/toxin/acid)
var/datum/reagents/R = new/datum/reagents(50)
R.my_atom = src
R.add_reagent(chosenchem , 50)
@@ -331,7 +333,7 @@
visible_message("<span class='warning'>[src]'s emergency coolant system gives off a small ding!</span>")
playsound(src, 'sound/machines/ding.ogg', 50, 1)
var/obj/item/reagent_containers/food/drinks/coffee/C = new /obj/item/reagent_containers/food/drinks/coffee(get_turf(pick(oview(1,src))))
chosenchem = pick("plasma","capsaicin","ethanol")
chosenchem = pick(/datum/reagent/toxin/plasma,/datum/reagent/consumable/capsaicin,/datum/reagent/consumable/ethanol)
C.reagents.remove_any(25)
C.reagents.add_reagent(chosenchem , 50)
C.name = "Cup of Suspicious Liquid"
@@ -380,7 +382,7 @@
visible_message("<span class='warning'>[src]'s emergency coolant system gives off a small ding!</span>")
var/obj/item/reagent_containers/food/drinks/coffee/C = new /obj/item/reagent_containers/food/drinks/coffee(get_turf(pick(oview(1,src))))
playsound(src, 'sound/machines/ding.ogg', 50, 1) //Ding! Your death coffee is ready!
chosenchem = pick("uranium","frostoil","ephedrine")
chosenchem = pick(/datum/reagent/uranium,/datum/reagent/consumable/frostoil,/datum/reagent/medicine/ephedrine)
C.reagents.remove_any(25)
C.reagents.add_reagent(chosenchem , 50)
C.name = "Cup of Suspicious Liquid"
@@ -390,7 +392,7 @@
visible_message("<span class='danger'>[src] malfunctions, shattering [exp_on] and releasing a dangerous cloud of coolant!</span>")
var/datum/reagents/R = new/datum/reagents(50)
R.my_atom = src
R.add_reagent("frostoil" , 50)
R.add_reagent(/datum/reagent/consumable/frostoil, 50)
investigate_log("Experimentor has released frostoil gas.", INVESTIGATE_EXPERIMENTOR)
var/datum/effect_system/smoke_spread/chem/smoke = new
smoke.set_up(R, 0, src, silent = TRUE)
code/modules/research/machinery/_production.dm
+1 -1
View File
@@ -222,7 +222,7 @@
l += "<h3>Chemical Storage:</h3>"
for(var/datum/reagent/R in reagents.reagent_list)
l += "[R.name]: [R.volume]"
l += "<A href='?src=[REF(src)];dispose=[R.id]'>Purge</A>"
l += "<A href='?src=[REF(src)];dispose=[R.type]'>Purge</A>"
l += "</div>"
return l
code/modules/research/nanites/nanite_programs/buffing.dm
+1 -1
View File
@@ -35,7 +35,7 @@
host_mob.adjustStaminaLoss(-10) //stimulants give stamina heal now
host_mob.lying = 0
host_mob.update_canmove()
host_mob.reagents.add_reagent("stimulants", 1.5)
host_mob.reagents.add_reagent(/datum/reagent/medicine/stimulants, 1.5)
/datum/nanite_program/hardening
name = "Dermal Hardening"
code/modules/research/nanites/nanite_programs/healing.dm
+2 -2
View File
@@ -64,7 +64,7 @@
if(R.id == "nanite_b_gone")
host_mob.adjustToxLoss(4)
continue
host_mob.reagents.remove_reagent(R.id,1)
host_mob.reagents.remove_reagent(R.type,1)
/datum/nanite_program/brain_heal
name = "Neural Regeneration"
@@ -164,7 +164,7 @@
/datum/nanite_program/purging_advanced/active_effect()
host_mob.adjustToxLoss(-1, forced = TRUE)
for(var/datum/reagent/toxin/R in host_mob.reagents.reagent_list)
host_mob.reagents.remove_reagent(R.id,1)
host_mob.reagents.remove_reagent(R.type,1)
/datum/nanite_program/regenerative_advanced
name = "Bio-Reconstruction"
code/modules/research/rdconsole.dm
+2 -2
View File
@@ -394,7 +394,7 @@ Nothing else in the console has ID requirements.
l += "<h3>Chemical Storage:</h3>"
for(var/datum/reagent/R in linked_lathe.reagents.reagent_list)
l += "[R.name]: [R.volume]"
l += "<A href='?src=[REF(src)];disposeP=[R.id]'>Purge</A>"
l += "<A href='?src=[REF(src)];disposeP=[R]'>Purge</A>"
l += "</div>"
return l
@@ -497,7 +497,7 @@ Nothing else in the console has ID requirements.
l += "<h3>Chemical Storage:</h3>"
for(var/datum/reagent/R in linked_imprinter.reagents.reagent_list)
l += "[R.name]: [R.volume]"
l += "<A href='?src=[REF(src)];disposeI=[R.id]'>Purge</A>"
l += "<A href='?src=[REF(src)];disposeI=[R]'>Purge</A>"
return l
/obj/machinery/computer/rdconsole/proc/ui_circuit_materials() //Legacy code!
code/modules/research/xenobiology/crossbreeding/__corecross.dm
+7 -7
View File
@@ -114,19 +114,19 @@ To add a crossbreed:
name = "blood extract"
desc = "A sphere of liquid blood, somehow managing to stay together."
color = "#FF0000"
list_reagents = list("blood" = 50)
list_reagents = list(/datum/reagent/blood = 50)
/obj/item/slimecrossbeaker/pax //5u synthpax.
name = "peace-inducing extract"
desc = "A small blob of synthetic pax."
color = "#FFCCCC"
list_reagents = list("synthpax" = 5)
list_reagents = list(/datum/reagent/pax/peaceborg = 5)
/obj/item/slimecrossbeaker/omnizine //15u omnizine.
name = "healing extract"
desc = "A gelatinous extract of pure omnizine."
color = "#FF00FF"
list_reagents = list("omnizine" = 15)
list_reagents = list(/datum/reagent/medicine/omnizine = 15)
/obj/item/slimecrossbeaker/autoinjector //As with the above, but automatically injects whomever it is used on with contents.
var/ignore_flags = FALSE
@@ -160,7 +160,7 @@ To add a crossbreed:
name = "mending solution"
desc = "A strange glob of sweet-smelling semifluid, which seems to stick to skin rather easily."
color = "#FF00FF"
list_reagents = list("regen_jelly" = 20)
list_reagents = list(/datum/reagent/medicine/regen_jelly = 20)
/obj/item/slimecrossbeaker/autoinjector/slimejelly //Primarily for slimepeople, but you do you.
self_use_only = TRUE
@@ -168,13 +168,13 @@ To add a crossbreed:
name = "slime jelly bubble"
desc = "A sphere of slime jelly. It seems to stick to your skin, but avoids other surfaces."
color = "#00FF00"
list_reagents = list("slimejelly" = 50)
list_reagents = list(/datum/reagent/toxin/slimejelly = 50)
/obj/item/slimecrossbeaker/autoinjector/peaceandlove
name = "peaceful distillation"
desc = "A light pink gooey sphere. Simply touching it makes you a little dizzy."
color = "#DDAAAA"
list_reagents = list("synthpax" = 10, "space_drugs" = 15) //Peace, dudes
list_reagents = list(/datum/reagent/pax/peaceborg = 10, /datum/reagent/drug/space_drugs = 15) //Peace, dudes
/obj/item/slimecrossbeaker/autoinjector/peaceandlove/Initialize()
. = ..()
@@ -184,4 +184,4 @@ To add a crossbreed:
name = "invigorating gel"
desc = "A bubbling purple mixture, designed to heal and boost movement."
color = "#FF00FF"
list_reagents = list("regen_jelly" = 30, "methamphetamine" = 9)
list_reagents = list(/datum/reagent/medicine/regen_jelly = 30, /datum/reagent/drug/methamphetamine = 9)
code/modules/research/xenobiology/crossbreeding/_status_effects.dm
+2 -2
View File
@@ -910,9 +910,9 @@ datum/status_effect/stabilized/blue/on_remove()
/datum/status_effect/stabilized/lightpink/tick()
owner.adjustStaminaLoss(-4.5)
for(var/mob/living/carbon/human/H in range(1, get_turf(owner)))
if(H != owner && H.stat != DEAD && H.health <= 0 && !H.reagents.has_reagent("epinephrine"))
if(H != owner && H.stat != DEAD && H.health <= 0 && !H.reagents.has_reagent(/datum/reagent/medicine/epinephrine))
to_chat(owner, "[linked_extract] pulses in sync with [H]'s heartbeat, trying to keep [H.p_them()] alive.")
H.reagents.add_reagent("epinephrine",5)
H.reagents.add_reagent(/datum/reagent/medicine/epinephrine,5)
return ..()
/datum/status_effect/stabilized/lightpink/on_remove()
code/modules/research/xenobiology/crossbreeding/burning.dm
+7 -7
View File
@@ -14,10 +14,10 @@ Burning extracts:
create_reagents(10, INJECTABLE | DRAWABLE)
/obj/item/slimecross/burning/attack_self(mob/user)
if(!reagents.has_reagent("plasma",10))
if(!reagents.has_reagent(/datum/reagent/toxin/plasma,10))
to_chat(user, "<span class='warning'>This extract needs to be full of plasma to activate!</span>")
return
reagents.remove_reagent("plasma",10)
reagents.remove_reagent(/datum/reagent/toxin/plasma,10)
to_chat(user, "<span class='notice'>You squeeze the extract, and it absorbs the plasma!</span>")
playsound(src, 'sound/effects/bubbles.ogg', 50, 1)
playsound(src, 'sound/magic/fireball.ogg', 50, 1)
@@ -44,7 +44,7 @@ Burning extracts:
/obj/item/slimecross/burning/orange/do_effect(mob/user)
user.visible_message("<span class='danger'>[src] boils over with a caustic gas!</span>")
var/datum/reagents/R = new/datum/reagents(100)
R.add_reagent("condensedcapsaicin", 100)
R.add_reagent(/datum/reagent/consumable/condensedcapsaicin, 100)
var/datum/effect_system/smoke_spread/chem/smoke = new
smoke.set_up(R, 7, get_turf(user))
@@ -113,8 +113,8 @@ Burning extracts:
/obj/item/slimecross/burning/darkblue/do_effect(mob/user)
user.visible_message("<span class='danger'>[src] releases a burst of chilling smoke!</span>")
var/datum/reagents/R = new/datum/reagents(100)
R.add_reagent("frostoil", 40)
user.reagents.add_reagent("cryoxadone",10)
R.add_reagent(/datum/reagent/consumable/frostoil, 40)
user.reagents.add_reagent(/datum/reagent/medicine/cryoxadone,10)
var/datum/effect_system/smoke_spread/chem/smoke = new
smoke.set_up(R, 7, get_turf(user))
smoke.start()
@@ -131,7 +131,7 @@ Burning extracts:
for(var/i = 0, i < amount, i++)
var/path = get_random_food()
var/obj/item/O = new path(pick(turfs))
O.reagents.add_reagent("slimejelly",5) //Oh god it burns
O.reagents.add_reagent(/datum/reagent/toxin/slimejelly, 5) //Oh god it burns
if(prob(50))
O.desc += " It smells strange..."
user.visible_message("<span class='danger'>[src] produces a few pieces of food!</span>")
@@ -268,7 +268,7 @@ Burning extracts:
/obj/item/slimecross/burning/lightpink/do_effect(mob/user)
user.visible_message("<span class='danger'>[src] lets off a hypnotizing pink glow!</span>")
for(var/mob/living/carbon/C in view(7, get_turf(user)))
C.reagents.add_reagent("pax",5)
C.reagents.add_reagent(/datum/reagent/pax, 5)
..()
/obj/item/slimecross/burning/adamantine
code/modules/research/xenobiology/crossbreeding/charged.dm
+2 -2
View File
@@ -15,10 +15,10 @@ Charged extracts:
create_reagents(10, INJECTABLE | DRAWABLE)
/obj/item/slimecross/charged/attack_self(mob/user)
if(!reagents.has_reagent("plasma",10))
if(!reagents.has_reagent(/datum/reagent/toxin/plasma,10))
to_chat(user, "<span class='warning'>This extract needs to be full of plasma to activate!</span>")
return
reagents.remove_reagent("plasma",10)
reagents.remove_reagent(/datum/reagent/toxin/plasma,10)
to_chat(user, "<span class='notice'>You squeeze the extract, and it absorbs the plasma!</span>")
playsound(src, 'sound/effects/bubbles.ogg', 50, 1)
playsound(src, 'sound/effects/light_flicker.ogg', 50, 1)
code/modules/research/xenobiology/crossbreeding/chilling.dm
+3 -3
View File
@@ -14,10 +14,10 @@ Chilling extracts:
create_reagents(10, INJECTABLE | DRAWABLE)
/obj/item/slimecross/chilling/attack_self(mob/user)
if(!reagents.has_reagent("plasma",10))
if(!reagents.has_reagent(/datum/reagent/toxin/plasma,10))
to_chat(user, "<span class='warning'>This extract needs to be full of plasma to activate!</span>")
return
reagents.remove_reagent("plasma",10)
reagents.remove_reagent(/datum/reagent/toxin/plasma,10)
to_chat(user, "<span class='notice'>You squeeze the extract, and it absorbs the plasma!</span>")
playsound(src, 'sound/effects/bubbles.ogg', 50, 1)
playsound(src, 'sound/effects/glassbr1.ogg', 50, 1)
@@ -56,7 +56,7 @@ Chilling extracts:
return
user.visible_message("<span class='notice'>[src] shatters, and a healing aura fills the room briefly.</span>")
for(var/mob/living/carbon/C in A)
C.reagents.add_reagent("regen_jelly",10)
C.reagents.add_reagent(/datum/reagent/medicine/regen_jelly,10)
..()
/obj/item/slimecross/chilling/blue
code/modules/research/xenobiology/crossbreeding/consuming.dm
+3 -3
View File
@@ -20,7 +20,7 @@ Consuming extracts:
if(last_produced + cooldown > world.time)
to_chat(user, "<span class='warning'>[src] is still digesting after its last meal!<span>")
return
var/datum/reagent/N = O.reagents.has_reagent("nutriment")
var/datum/reagent/N = O.reagents.has_reagent(/datum/reagent/consumable/nutriment)
if(N)
nutriment_eaten += N.volume
to_chat(user, "<span class='notice'>[src] opens up and swallows [O] whole!</span>")
@@ -73,7 +73,7 @@ Consuming extracts:
to_chat(M, "Tastes like [taste].")
playsound(get_turf(M), 'sound/items/eatfood.ogg', 20, 1)
if(nutrition)
M.reagents.add_reagent("nutriment",nutrition)
M.reagents.add_reagent(/datum/reagent/consumable/nutriment,nutrition)
do_effect(M, user)
qdel(src)
return
@@ -199,7 +199,7 @@ Consuming extracts:
nutrition = 0 //We don't want normal nutriment
/obj/item/slime_cookie/silver/do_effect(mob/living/M, mob/user)
M.reagents.add_reagent("stabilizednutriment",10)
M.reagents.add_reagent(/datum/reagent/consumable/nutriment/stabilized, 10)
/obj/item/slimecross/consuming/bluespace
colour = "bluespace"
code/modules/research/xenobiology/crossbreeding/industrial.dm
+4 -4
View File
@@ -30,13 +30,13 @@ Industrial extracts:
/obj/item/slimecross/industrial/process()
var/IsWorking = FALSE
if(reagents.has_reagent("plasma",amount = 2) && plasmarequired > 1) //Can absorb as much as 2
if(reagents.has_reagent(/datum/reagent/toxin/plasma,amount = 2) && plasmarequired > 1) //Can absorb as much as 2
IsWorking = TRUE
reagents.remove_reagent("plasma",2)
reagents.remove_reagent(/datum/reagent/toxin/plasma,2)
plasmaabsorbed += 2
else if(reagents.has_reagent("plasma",amount = 1)) //Can absorb as little as 1
else if(reagents.has_reagent(/datum/reagent/toxin/plasma,amount = 1)) //Can absorb as little as 1
IsWorking = TRUE
reagents.remove_reagent("plasma",1)
reagents.remove_reagent(/datum/reagent/toxin/plasma,1)
plasmaabsorbed += 1
if(plasmaabsorbed >= plasmarequired)
code/modules/research/xenobiology/crossbreeding/regenerative.dm
+4 -4
View File
@@ -51,7 +51,7 @@ Regenerative extracts:
colour = "purple"
/obj/item/slimecross/regenerative/purple/core_effect(mob/living/target, mob/user)
target.reagents.add_reagent("regen_jelly",10)
target.reagents.add_reagent(/datum/reagent/medicine/regen_jelly,10)
/obj/item/slimecross/regenerative/blue
colour = "blue"
@@ -174,7 +174,7 @@ Regenerative extracts:
/obj/item/slimecross/regenerative/red/core_effect(mob/living/target, mob/user)
to_chat(target, "<span class='notice'>You feel... <i>faster.</i></span>")
target.reagents.add_reagent("ephedrine",3)
target.reagents.add_reagent(/datum/reagent/medicine/ephedrine,3)
/obj/item/slimecross/regenerative/green
colour = "green"
@@ -185,7 +185,7 @@ Regenerative extracts:
var/mob/living/simple_animal/slime/S = target
S.random_colour()
if(isjellyperson(target))
target.reagents.add_reagent("slime_toxin",5)
target.reagents.add_reagent(/datum/reagent/slime_toxin,5)
/obj/item/slimecross/regenerative/pink
@@ -193,7 +193,7 @@ Regenerative extracts:
/obj/item/slimecross/regenerative/pink/core_effect(mob/living/target, mob/user)
to_chat(target, "<span class='notice'>You feel more calm.</span>")
target.reagents.add_reagent("krokodil",4)
target.reagents.add_reagent(/datum/reagent/drug/krokodil,4)
/obj/item/slimecross/regenerative/gold
colour = "gold"
code/modules/research/xenobiology/crossbreeding/selfsustaining.dm
+3 -3
View File
@@ -38,10 +38,10 @@ Self-sustaining extracts:
return
if(reagentselect == "lesser plasma")
amount = 4
reagentselect = "plasma"
reagentselect = /datum/reagent/toxin/plasma
if(reagentselect == "holy water and uranium")
reagentselect = "holywater"
secondary = "uranium"
reagentselect = /datum/reagent/water/holywater
secondary = /datum/reagent/uranium
extract.forceMove(user.drop_location())
qdel(src)
user.put_in_active_hand(extract)
code/modules/research/xenobiology/xenobiology.dm
+25 -25
View File
@@ -193,7 +193,7 @@
if(SLIME_ACTIVATE_MAJOR)
to_chat(user, "<span class='notice'>You activate [src], and it releases regenerative chemicals!</span>")
user.reagents.add_reagent("regen_jelly",10)
user.reagents.add_reagent(/datum/reagent/medicine/regen_jelly,10)
return 600
/obj/item/slime_extract/darkpurple
@@ -229,13 +229,13 @@
switch(activation_type)
if(SLIME_ACTIVATE_MINOR)
to_chat(user, "<span class='notice'>You activate [src]. You start feeling hot!</span>")
user.reagents.add_reagent("capsaicin",10)
user.reagents.add_reagent(/datum/reagent/consumable/capsaicin,10)
return 150
if(SLIME_ACTIVATE_MAJOR)
user.reagents.add_reagent("phosphorus",5)//
user.reagents.add_reagent("potassium",5) // = smoke, along with any reagents inside mr. slime
user.reagents.add_reagent("sugar",5) //
user.reagents.add_reagent(/datum/reagent/phosphorus,5)
user.reagents.add_reagent(/datum/reagent/potassium,5) // = smoke, along with any reagents inside mr. slime
user.reagents.add_reagent(/datum/reagent/consumable/sugar,5)
to_chat(user, "<span class='warning'>You activate [src], and a cloud of smoke bursts out of your skin!</span>")
return 450
@@ -272,7 +272,7 @@
switch(activation_type)
if(SLIME_ACTIVATE_MINOR)
to_chat(user, "<span class='notice'>You activate [src]. You start feeling fast!</span>")
user.reagents.add_reagent("ephedrine",5)
user.reagents.add_reagent(/datum/reagent/medicine/ephedrine,5)
return 450
if(SLIME_ACTIVATE_MAJOR)
@@ -286,15 +286,15 @@
name = "blue slime extract"
icon_state = "blue slime extract"
effectmod = "stabilized"
activate_reagents = list("blood","plasma","water")
activate_reagents = list(/datum/reagent/blood, /datum/reagent/toxin/plasma, /datum/reagent/water)
/obj/item/slime_extract/blue/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
switch(activation_type)
if(SLIME_ACTIVATE_MINOR)
to_chat(user, "<span class='notice'>You activate [src]. Your genome feels more stable!</span>")
user.adjustCloneLoss(-15)
user.reagents.add_reagent("mutadone", 10)
user.reagents.add_reagent("potass_iodide", 10)
user.reagents.add_reagent(/datum/reagent/medicine/mutadone, 10)
user.reagents.add_reagent(/datum/reagent/medicine/potass_iodide, 10)
return 250
if(SLIME_ACTIVATE_MAJOR)
@@ -310,7 +310,7 @@
name = "dark blue slime extract"
icon_state = "dark blue slime extract"
effectmod = "chilling"
activate_reagents = list("plasma","water")
activate_reagents = list(/datum/reagent/toxin/plasma, /datum/reagent/water)
/obj/item/slime_extract/darkblue/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
switch(activation_type)
@@ -318,8 +318,8 @@
to_chat(user, "<span class='notice'>You activate [src]. You start feeling colder!</span>")
user.ExtinguishMob()
user.adjust_fire_stacks(-20)
user.reagents.add_reagent("frostoil",4)
user.reagents.add_reagent("cryoxadone",5)
user.reagents.add_reagent(/datum/reagent/consumable/frostoil,4)
user.reagents.add_reagent(/datum/reagent/medicine/cryoxadone,5)
return 100
if(SLIME_ACTIVATE_MAJOR)
@@ -333,7 +333,7 @@
name = "pink slime extract"
icon_state = "pink slime extract"
effectmod = "gentle"
activate_reagents = list("blood","plasma")
activate_reagents = list(/datum/reagent/blood, /datum/reagent/toxin/plasma)
/obj/item/slime_extract/pink/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
switch(activation_type)
@@ -354,14 +354,14 @@
user.visible_message("<span class='warning'>[user]'s skin starts flashing hypnotically...</span>", "<span class='notice'>Your skin starts forming odd patterns, pacifying creatures around you.</span>")
for(var/mob/living/carbon/C in viewers(user, null))
if(C != user)
C.reagents.add_reagent("pax",2)
C.reagents.add_reagent(/datum/reagent/pax,2)
return 600
/obj/item/slime_extract/green
name = "green slime extract"
icon_state = "green slime extract"
effectmod = "mutative"
activate_reagents = list("blood","plasma","radium")
activate_reagents = list(/datum/reagent/blood, /datum/reagent/toxin/plasma, /datum/reagent/radium)
/obj/item/slime_extract/green/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
switch(activation_type)
@@ -385,7 +385,7 @@
name = "light pink slime extract"
icon_state = "light pink slime extract"
effectmod = "loyal"
activate_reagents = list("plasma")
activate_reagents = list(/datum/reagent/toxin/plasma)
/obj/item/slime_extract/lightpink/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
switch(activation_type)
@@ -409,7 +409,7 @@
name = "black slime extract"
icon_state = "black slime extract"
effectmod = "transformative"
activate_reagents = list("plasma")
activate_reagents = list(/datum/reagent/toxin/plasma)
/obj/item/slime_extract/black/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
switch(activation_type)
@@ -430,7 +430,7 @@
name = "oil slime extract"
icon_state = "oil slime extract"
effectmod = "detonating"
activate_reagents = list("blood","plasma")
activate_reagents = list(/datum/reagent/blood, /datum/reagent/toxin/plasma)
/obj/item/slime_extract/oil/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
switch(activation_type)
@@ -453,7 +453,7 @@
name = "adamantine slime extract"
icon_state = "adamantine slime extract"
effectmod = "crystalline"
activate_reagents = list("plasma")
activate_reagents = list(/datum/reagent/toxin/plasma)
/obj/item/slime_extract/adamantine/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
switch(activation_type)
@@ -482,7 +482,7 @@
name = "bluespace slime extract"
icon_state = "bluespace slime extract"
effectmod = "warping"
activate_reagents = list("blood","plasma")
activate_reagents = list(/datum/reagent/blood, /datum/reagent/toxin/plasma)
var/teleport_ready = FALSE
var/teleport_x = 0
var/teleport_y = 0
@@ -518,7 +518,7 @@
name = "pyrite slime extract"
icon_state = "pyrite slime extract"
effectmod = "prismatic"
activate_reagents = list("blood","plasma")
activate_reagents = list(/datum/reagent/blood, /datum/reagent/toxin/plasma)
/obj/item/slime_extract/pyrite/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
switch(activation_type)
@@ -545,12 +545,12 @@
name = "cerulean slime extract"
icon_state = "cerulean slime extract"
effectmod = "recurring"
activate_reagents = list("blood","plasma")
activate_reagents = list(/datum/reagent/blood, /datum/reagent/toxin/plasma)
/obj/item/slime_extract/cerulean/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
switch(activation_type)
if(SLIME_ACTIVATE_MINOR)
user.reagents.add_reagent("salbutamol",15)
user.reagents.add_reagent(/datum/reagent/medicine/salbutamol,15)
to_chat(user, "<span class='notice'>You feel like you don't need to breathe!</span>")
return 150
@@ -565,7 +565,7 @@
name = "sepia slime extract"
icon_state = "sepia slime extract"
effectmod = "lengthened"
activate_reagents = list("blood","plasma","water")
activate_reagents = list(/datum/reagent/blood, /datum/reagent/toxin/plasma, /datum/reagent/water)
/obj/item/slime_extract/sepia/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
switch(activation_type)
@@ -587,7 +587,7 @@
name = "rainbow slime extract"
icon_state = "rainbow slime extract"
effectmod = "hyperchromatic"
activate_reagents = list("blood","plasma","lesser plasma","slimejelly","holy water and uranium") //Curse this snowflake reagent list.
activate_reagents = list(/datum/reagent/blood, /datum/reagent/toxin/plasma,"lesser plasma", /datum/reagent/toxin/slimejelly,"holy water and uranium") //Curse this snowflake reagent list.
/obj/item/slime_extract/rainbow/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
switch(activation_type)