Merge branch 'Paradise-drask' of https://github.com/QuinnAggeler/Paradise into Paradise-drask

# Conflicts:
#	code/modules/mob/living/carbon/human/species/drask.dm
#	code/modules/surgery/organs/subtypes/drask.dm

code/modules/mob/living/carbon/human/species/drask.dm

@@ -66,8 +66,6 @@
 			if(prob(20))
 				H.to_chat("<span class='warning'>You feel your face burning and a searing heat in your lungs!</span>")
 
-
-
 		switch(breath.temperature)
 			if(-INFINITY to 120)
 				H.adjustFireLoss(cold_env_multiplier*COLD_GAS_DAMAGE_LEVEL_3)

code/modules/surgery/organs/subtypes/drask.dm

@@ -3,7 +3,11 @@
 	name = "drask organ"
 	icon = 'icons/obj/surgery_drask.dmi'
 	icon_state = "innards"
+<<<<<<< HEAD
 	desc = "A greenish, slightly translucent organ. It is extremely cold."
+=======
+	desc = "A greenish, slightly translucent organ. /red It is extremely cold."
+>>>>>>> 46bd72ac5e61af45f173d2c705563ed10b898819
 
 /obj/item/organ/internal/heart/drask
 	name = "drask heart"