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

Fix merge conflicts

Browse Source
This commit is contained in:
Arokha Sieyes
2018-07-21 11:34:54 -04:00
parent edf92c57f9
commit adbb5b86a5
3 changed files with 6 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/subtypes/standard.dm
+1 -8
View File
@@ -23,18 +23,11 @@
organ_rel_size = 70
base_miss_chance = 10
<<<<<<< HEAD
/obj/item/organ/external/chest/robotize(var/company, var/skip_prosthetics = 0, var/keep_organs = 0)
if(..() && robotic != ORGAN_NANOFORM) //VOREStation Edit
// Give them a new cell.
owner.internal_organs_by_name["cell"] = new /obj/item/organ/internal/cell(owner,1)
=======
/obj/item/organ/external/chest/robotize()
if(..())
if(..() && robotic != ORGAN_NANOFORM) //VOREStation Edit
// Give them fancy new organs.
owner.internal_organs_by_name[O_CELL] = new /obj/item/organ/internal/cell(owner,1)
owner.internal_organs_by_name[O_VOICE] = new /obj/item/organ/internal/voicebox/robot(owner, 1)
>>>>>>> 8f9e817... Language and Larynx Additions (#5402)
/obj/item/organ/external/chest/handle_germ_effects()
. = ..() //Should return an infection level