Merge conflicts pls go

This commit is contained in:
PatchouliKnowledge
2015-08-05 01:08:52 +03:00
parent 056c018b80
commit de8c10e6c7
2 changed files with 6 additions and 6 deletions
+2 -2
View File
@@ -12,7 +12,7 @@
disease_flags = CAN_CARRY|CAN_RESIST
spread_flags = NON_CONTAGIOUS
visibility_flags = HIDDEN_PANDEMIC
required_organs = list(/obj/item/organ/appendix)
required_organs = list(/obj/item/organ/internal/appendix)
/datum/disease/appendicitis/stage_act()
..()
@@ -21,7 +21,7 @@
if(prob(5))
affected_mob.emote("cough")
if(2)
var/obj/item/organ/appendix/A = affected_mob.getorgan(/obj/item/organ/appendix)
var/obj/item/organ/internal/appendix/A = affected_mob.getorgan(/obj/item/organ/internal/appendix)
if(A)
A.inflamed = 1
A.update_icon()