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

Fixes most of the issues

Browse Source
This commit is contained in:
Unknown
2019-03-27 00:38:44 -04:00
parent 86174593bf
commit 03dcb65c01
17 changed files with 57 additions and 694 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/organ.dm
-5
View File
@@ -335,13 +335,8 @@ var/list/organ_cache = list()
var/obj/item/organ/external/affected = owner.get_organ(parent_organ)
if(affected) affected.internal_organs -= src
<<<<<<< HEAD
loc = owner.drop_location()
processing_objects |= src
=======
loc = get_turf(owner)
START_PROCESSING(SSobj, src)
>>>>>>> 2c4b5af... Merge pull request #5677 from kevinz000/PS_PORT_SCHEDULER
rejecting = null
var/datum/reagent/blood/organ_blood = locate(/datum/reagent/blood) in reagents.reagent_list
if(!organ_blood || !organ_blood.data["blood_DNA"])