cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-27 18:42:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10673 from Baystation12/master

Browse Source 
Dev-freeze
This commit is contained in:
PsiOmegaDelta
2015-08-16 10:30:13 +02:00
parent 114f5e9b26 311dbcb0f0
commit 7b5b7162d0
3 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/ATMOSPHERICS/components/unary/cold_sink.dm
View File

@@ -43,6 +43,13 @@
node = target node = target
break break
//copied from pipe construction code since heaters/freezers don't use fittings and weren't doing this check - this all really really needs to be refactored someday.
//check that there are no incompatible pipes/machinery in our own location
for(var/obj/machinery/atmospherics/M in src.loc)
if(M != src && (M.initialize_directions & node_connect) && M.check_connect_types(M,src)) // matches at least one direction on either type of pipe & same connection type
node = null
break
update_icon() update_icon()
/obj/machinery/atmospherics/unary/freezer/update_icon() /obj/machinery/atmospherics/unary/freezer/update_icon()

8
code/ATMOSPHERICS/components/unary/heat_source.dm
View File

@@ -39,11 +39,19 @@
var/node_connect = dir var/node_connect = dir
//check that there is something to connect to
for(var/obj/machinery/atmospherics/target in get_step(src, node_connect)) for(var/obj/machinery/atmospherics/target in get_step(src, node_connect))
if(target.initialize_directions & get_dir(target, src)) if(target.initialize_directions & get_dir(target, src))
node = target node = target
break break
//copied from pipe construction code since heaters/freezers don't use fittings and weren't doing this check - this all really really needs to be refactored someday.
//check that there are no incompatible pipes/machinery in our own location
for(var/obj/machinery/atmospherics/M in src.loc)
if(M != src && (M.initialize_directions & node_connect) && M.check_connect_types(M,src)) // matches at least one direction on either type of pipe & same connection type
node = null
break
update_icon() update_icon()

2
code/modules/reagents/Chemistry-Reagents.dm
View File

@@ -51,7 +51,7 @@
return return
if(!affects_dead && M.stat == DEAD) if(!affects_dead && M.stat == DEAD)
return return
if(overdose && (dose > overdose) && (location == CHEM_BLOOD)) if(overdose && (dose > overdose) && (location != CHEM_TOUCH))
overdose(M, alien) overdose(M, alien)
var/removed = metabolism var/removed = metabolism
if(ingest_met && (location == CHEM_INGEST)) if(ingest_met && (location == CHEM_INGEST))