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

Cleanup

Browse Source
This commit is contained in:
Fermi
2019-06-15 18:04:06 +01:00
parent 79d176336c
commit be36a8bb33
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/mood.dm
+3 -3
View File
@@ -187,15 +187,15 @@
switch(sanity) switch(sanity)
if(SANITY_INSANE to SANITY_CRAZY) if(SANITY_INSANE to SANITY_CRAZY)
setInsanityEffect(MAJOR_INSANITY_PEN) setInsanityEffect(MAJOR_INSANITY_PEN)
master.add_movespeed_modifier(MOVESPEED_ID_SANITY, TRUE, 100, override=TRUE, multiplicative_slowdown=1.5, movetypes=(~FLYING)) master.add_movespeed_modifier(MOVESPEED_ID_SANITY, TRUE, 100, override=TRUE, multiplicative_slowdown=1.5) //Did we change something ? movetypes is runtiming, movetypes=(~FLYING))
sanity_level = 6 sanity_level = 6
if(SANITY_CRAZY to SANITY_UNSTABLE) if(SANITY_CRAZY to SANITY_UNSTABLE)
setInsanityEffect(MINOR_INSANITY_PEN) setInsanityEffect(MINOR_INSANITY_PEN)
master.add_movespeed_modifier(MOVESPEED_ID_SANITY, TRUE, 100, override=TRUE, multiplicative_slowdown=1, movetypes=(~FLYING)) master.add_movespeed_modifier(MOVESPEED_ID_SANITY, TRUE, 100, override=TRUE, multiplicative_slowdown=1)//, movetypes=(~FLYING))
sanity_level = 5 sanity_level = 5
if(SANITY_UNSTABLE to SANITY_DISTURBED) if(SANITY_UNSTABLE to SANITY_DISTURBED)
setInsanityEffect(0) setInsanityEffect(0)
master.add_movespeed_modifier(MOVESPEED_ID_SANITY, TRUE, 100, override=TRUE, multiplicative_slowdown=0.5, movetypes=(~FLYING)) master.add_movespeed_modifier(MOVESPEED_ID_SANITY, TRUE, 100, override=TRUE, multiplicative_slowdown=0.5)//, movetypes=(~FLYING))
sanity_level = 4 sanity_level = 4
if(SANITY_DISTURBED to SANITY_NEUTRAL) if(SANITY_DISTURBED to SANITY_NEUTRAL)
setInsanityEffect(0) setInsanityEffect(0)
code/modules/reagents/chemistry/holder.dm
+1
View File
@@ -793,6 +793,7 @@
/datum/reagents/proc/adjust_thermal_energy(J, min_temp = 2.7, max_temp = 1000) /datum/reagents/proc/adjust_thermal_energy(J, min_temp = 2.7, max_temp = 1000)
var/S = specific_heat() var/S = specific_heat()
chem_temp = CLAMP(chem_temp + (J / (S * total_volume)), min_temp, max_temp) chem_temp = CLAMP(chem_temp + (J / (S * total_volume)), min_temp, max_temp)
my_atom.temp_check()
/datum/reagents/proc/add_reagent(reagent, amount, list/data=null, reagtemp = 300, other_purity = 1, other_pH, no_react = 0) /datum/reagents/proc/add_reagent(reagent, amount, list/data=null, reagtemp = 300, other_purity = 1, other_pH, no_react = 0)
code/modules/reagents/reagent_containers.dm
+3 -3
View File
@@ -142,10 +142,10 @@
//melts plastic beakers //melts plastic beakers
/obj/item/reagent_containers/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) /obj/item/reagent_containers/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
reagents.expose_temperature(exposed_temperature) reagents.expose_temperature(exposed_temperature)
message_admins("Heating beaker") temp_check()
message_admins("temperature [reagents.chem_temp]")
/obj/item/reagent_containers/proc/temp_check()
if(beaker_weakness_bitflag & TEMP_WEAK) if(beaker_weakness_bitflag & TEMP_WEAK)
message_admins("Beaker weak to heat")
if(reagents.chem_temp >= 444)//assuming polypropylene if(reagents.chem_temp >= 444)//assuming polypropylene
var/list/seen = viewers(5, get_turf(src)) var/list/seen = viewers(5, get_turf(src))
var/iconhtml = icon2html(src, seen) var/iconhtml = icon2html(src, seen)
modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
-1
View File
@@ -397,7 +397,6 @@
catto.name = H.name catto.name = H.name
catto.desc = "A cute catto! They remind you of [H] somehow." catto.desc = "A cute catto! They remind you of [H] somehow."
catto.color = "#[H.dna.features["mcolor"]]" catto.color = "#[H.dna.features["mcolor"]]"
//H.moveToNullspace()
H.forceMove(catto) H.forceMove(catto)
log_game("FERMICHEM: [H] ckey: [H.key] has been made into a cute catto.") log_game("FERMICHEM: [H] ckey: [H.key] has been made into a cute catto.")
//Just to deal with rascally ghosts //Just to deal with rascally ghosts