cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 07:08:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Takes some lessons from Jimmy Neutron (#1269)

Browse Source 
* sodium chloride is now called salt (#54328)

* Takes some lessons from Jimmy Neutron

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
This commit is contained in:
SkyratBot
2020-10-12 23:18:45 +02:00
committed by GitHub
co-authored by Qustinnus
parent a80e881cfd
commit b0215f179a
25 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/reagents/food_reagents.dm
+2 -2
View File
@@ -347,7 +347,7 @@
M.visible_message("<span class='warning'>[M] [pick("dry heaves!","coughs!","splutters!")]</span>")
..()
/datum/reagent/consumable/sodiumchloride
/datum/reagent/consumable/salt
name = "Table Salt"
description = "A salt made of sodium chloride. Commonly used to season food."
reagent_state = SOLID
@@ -355,7 +355,7 @@
taste_description = "salt"
penetrates_skin = NONE
/datum/reagent/consumable/sodiumchloride/expose_turf(turf/exposed_turf, reac_volume) //Creates an umbra-blocking salt pile
/datum/reagent/consumable/salt/expose_turf(turf/exposed_turf, reac_volume) //Creates an umbra-blocking salt pile
. = ..()
if(!istype(exposed_turf) || (reac_volume < 1))
return
code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+1 -1
View File
@@ -302,7 +302,7 @@
/datum/reagent/medicine/salglu_solution/overdose_process(mob/living/M)
if(prob(3))
to_chat(M, "<span class='warning'>You feel salty.</span>")
holder.add_reagent(/datum/reagent/consumable/sodiumchloride, 1)
holder.add_reagent(/datum/reagent/consumable/salt, 1)
holder.remove_reagent(/datum/reagent/medicine/salglu_solution, 0.5)
else if(prob(3))
to_chat(M, "<span class='warning'>You feel sweet.</span>")
code/modules/reagents/chemistry/recipes/cat2_medicines.dm
+1 -1
View File
@@ -52,7 +52,7 @@
/datum/chemical_reaction/multiver
results = list(/datum/reagent/medicine/c2/multiver = 2)
required_reagents = list(/datum/reagent/ash = 1, /datum/reagent/consumable/sodiumchloride = 1)
required_reagents = list(/datum/reagent/ash = 1, /datum/reagent/consumable/salt = 1)
mix_message = "The mixture yields a fine black powder."
required_temp = 380
code/modules/reagents/chemistry/recipes/medicine.dm
+2 -2
View File
@@ -28,7 +28,7 @@
/datum/chemical_reaction/salglu_solution
results = list(/datum/reagent/medicine/salglu_solution = 3)
required_reagents = list(/datum/reagent/consumable/sodiumchloride = 1, /datum/reagent/water = 1, /datum/reagent/consumable/sugar = 1)
required_reagents = list(/datum/reagent/consumable/salt = 1, /datum/reagent/water = 1, /datum/reagent/consumable/sugar = 1)
/datum/chemical_reaction/mine_salve
results = list(/datum/reagent/medicine/mine_salve = 3)
@@ -151,7 +151,7 @@
/datum/chemical_reaction/granibitaluri
results = list(/datum/reagent/medicine/granibitaluri = 3)
required_reagents = list(/datum/reagent/consumable/sodiumchloride = 1, /datum/reagent/carbon = 1, /datum/reagent/toxin/acid = 1)
required_reagents = list(/datum/reagent/consumable/salt = 1, /datum/reagent/carbon = 1, /datum/reagent/toxin/acid = 1)
required_catalysts = list(/datum/reagent/iron = 5)
///medical stacks
code/modules/reagents/chemistry/recipes/others.dm
+1 -1
View File
@@ -28,7 +28,7 @@
required_reagents = list(/datum/reagent/consumable/cornoil = 3, /datum/reagent/toxin/acid = 1)
/datum/chemical_reaction/sodiumchloride
results = list(/datum/reagent/consumable/sodiumchloride = 3)
results = list(/datum/reagent/consumable/salt = 3)
required_reagents = list(/datum/reagent/water = 1, /datum/reagent/sodium = 1, /datum/reagent/chlorine = 1)
/datum/chemical_reaction/stable_plasma