cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 18:44:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes merge conflict

Browse Source 
Signed-off-by: HugoLuman <qaggeler@uci.edu>
This commit is contained in:
HugoLuman
2016-04-12 19:26:34 -07:00
parent 71ad25c01c
commit b95cdecb89
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/organs/subtypes/drask.dm
-4
View File
@@ -3,11 +3,7 @@
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"