cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-07-18 18:42:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/CHOMPstation/CHOMPstation into ErikTheDogEdits

Browse Source 
# Conflicts:
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
This commit is contained in:
Erik Darkpaws
2019-05-27 00:37:27 -07:00
parent 9f54b4de22 2d1e52c83f
commit d43bfdec28
13 changed files with 216 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
+76
View File
@@ -646,6 +646,8 @@
if(prob(60))
M.take_organ_damage(4 * removed, 0)
//TFF 25/5/19 - attempt to reduce message spam for Prommies and Spaceacillin
#define ANTIBIO_MESSAGE_DELAY 5*60*10
/datum/reagent/spaceacillin
name = "Spaceacillin"
id = "spaceacillin"
@@ -657,11 +659,19 @@
mrate_static = TRUE
overdose = REAGENTS_OVERDOSE
scannable = 1
<<<<<<< HEAD
//data = 0
=======
data = 0
var/delay = 0
>>>>>>> 2d1e52c83fa9d4bd4029e9061613bcb7722251ee
/datum/reagent/spaceacillin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
..()
if(!delay)
delay = world.time
if(alien == IS_SLIME)
<<<<<<< HEAD
// if(volume <= 0.1 && data != -1)
// data = -1
// else
@@ -675,6 +685,17 @@
to_chat(M, "<spam class='notice'>You regain focus...</span>")
if(dose <= metabolism)
to_chat(M, "<span class = 'warning'>Your senses feel unfocused, and divided.</span>")
=======
ingest_met = 0.25
if(volume <= 0.1 && data != -1 && world.time > delay + ANTIBIO_MESSAGE_DELAY)
delay = world.time
to_chat(M, "<span class='notice'>You regain focus...</span>")
else
delay = (5 MINUTES)
if(world.time > delay + ANTIBIO_MESSAGE_DELAY)
delay = world.time
to_chat(M, "<span class='warning'>Your senses feel unfocused, and divided.</span>")
>>>>>>> 2d1e52c83fa9d4bd4029e9061613bcb7722251ee
M.add_chemical_effect(CE_ANTIBIOTIC, dose >= overdose ? ANTIBIO_OD : ANTIBIO_NORM)
/datum/reagent/corophizine
@@ -847,6 +868,7 @@
#define ANTIDEPRESSANT_MESSAGE_DELAY 5*60*10
//TFF 25/5/19 - Revert an edit, restore message display with the med being processed faster
/datum/reagent/methylphenidate
name = "Methylphenidate"
id = "methylphenidate"
@@ -855,7 +877,9 @@
reagent_state = LIQUID
color = "#BF80BF"
metabolism = 0.01
ingest_met = 0.25
mrate_static = TRUE
<<<<<<< HEAD
// data = 0
// var/delay = 0
@@ -877,7 +901,22 @@
M << "<span class='warning'>You lose focus...</span>"
if(dose <= metabolism)
M << "<span class='notice'>Your mind feels focused and undivided.</span>"
=======
data = 0
/datum/reagent/methylphenidate/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(alien == IS_DIONA)
return
if(volume <= 0.1 && data != -1)
data = -1
M << "<span class='warning'>You lose focus...</span>"
else
if(world.time > data + ANTIDEPRESSANT_MESSAGE_DELAY)
data = world.time
M << "<span class='notice'>Your mind feels focused and undivided.</span>"
>>>>>>> 2d1e52c83fa9d4bd4029e9061613bcb7722251ee
//TFF 25/5/19 - Revert an edit, restore message display with the med being processed faster
/datum/reagent/citalopram
name = "Citalopram"
id = "citalopram"
@@ -886,7 +925,9 @@
reagent_state = LIQUID
color = "#FF80FF"
metabolism = 0.01
ingest_met = 0.25
mrate_static = TRUE
<<<<<<< HEAD
// data = 0
// var/delay = 0
@@ -908,7 +949,22 @@
to_chat(M, "<span class='warning'>Your mind feels a little less stable...</span>")
if(dose <= metabolism)
to_chat(M, "<span class='notice'>Your mind feels stable... a little stable.</span>")
=======
data = 0
/datum/reagent/citalopram/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(alien == IS_DIONA)
return
if(volume <= 0.1 && data != -1)
data = -1
to_chat(M, "<span class='warning'>Your mind feels a little less stable...</span>")
else
if(world.time > data + ANTIDEPRESSANT_MESSAGE_DELAY)
data = world.time
to_chat(M, "<span class='notice'>Your mind feels stable... a little stable.</span>")
>>>>>>> 2d1e52c83fa9d4bd4029e9061613bcb7722251ee
//TFF 25/5/19 - Revert an edit, restore message display with the med being processed faster
/datum/reagent/paroxetine
name = "Paroxetine"
id = "paroxetine"
@@ -917,13 +973,19 @@
reagent_state = LIQUID
color = "#FF80BF"
metabolism = 0.01
ingest_met = 0.25
mrate_static = TRUE
<<<<<<< HEAD
//data = 0
//var/delay = 0
=======
data = 0
>>>>>>> 2d1e52c83fa9d4bd4029e9061613bcb7722251ee
/datum/reagent/paroxetine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(alien == IS_DIONA)
return
<<<<<<< HEAD
// if(volume <= 0.1 && world.time > delay + ANTIDEPRESSANT_MESSAGE_DELAY)
// delay = world.time
// M << "<span class='warning'>Your mind feels much less stable...</span>"
@@ -945,6 +1007,19 @@
else
M << "<span class='warning'>Your mind breaks apart...</span>"
M.hallucination += 200
=======
if(volume <= 0.1 && data != -1)
data = -1
M << "<span class='warning'>Your mind feels much less stable...</span>"
else
if(world.time > data + ANTIDEPRESSANT_MESSAGE_DELAY)
data = world.time
if(prob(90))
M << "<span class='notice'>Your mind feels much more stable.</span>"
else
M << "<span class='warning'>Your mind breaks apart...</span>"
M.hallucination += 200
>>>>>>> 2d1e52c83fa9d4bd4029e9061613bcb7722251ee
/datum/reagent/qerr_quem
name = "Qerr-quem"
@@ -954,6 +1029,7 @@
reagent_state = LIQUID
color = "#e6efe3"
metabolism = 0.01
ingest_met = 0.25
mrate_static = TRUE
// data = 0
code/modules/reagents/reagent_containers/drinkingglass/metaglass.dm
+21 -7
View File
@@ -9,6 +9,12 @@
matter = list("glass" = 500)
icon = 'icons/obj/drinks.dmi'
/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint
name = "metamorphic pint glass"
desc = "This glass changes shape and form depending on the drink inside... fancy!"
icon_state = "pglass_empty"
volume = 60
/obj/item/weapon/reagent_containers/food/drinks/metaglass/on_reagent_change()
if (reagents.reagent_list.len > 0)
var/datum/reagent/R = reagents.get_master_reagent()
@@ -38,12 +44,17 @@
else
price_tag = null
else
icon_state = "glass_empty"
name = "metamorphic glass"
desc = "This glass changes shape and form depending on the drink inside... fancy!"
center_of_mass = list("x"=16, "y"=10)
return
if(type == /obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint)
icon_state = "pglass_empty"
name = "metamorphic pint glass"
desc = "This glass changes shape and form depending on the drink inside... fancy!"
center_of_mass = list("x"=16, "y"=10)
else
icon_state = "glass_empty"
name = "metamorphic glass"
desc = "This glass changes shape and form depending on the drink inside... fancy!"
center_of_mass = list("x"=16, "y"=10)
return
/*
Drinks Data
@@ -374,7 +385,7 @@ Drinks Data
glass_icon_state = "gintonicglass"
/datum/reagent/ethanol/goldschlager
glass_icon_state = "ginvodkaglass"
glass_icon_state = "goldschlagerglass"
glass_center_of_mass = list("x"=16, "y"=12)
/datum/reagent/ethanol/hippies_delight
@@ -569,3 +580,6 @@ Drinks Data
/datum/reagent/ethanol/hachi
glass_icon_state = "hachi"
/datum/reagent/ethanol/mojito
glass_icon_state = "mojito"