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

Revert "Refactors Markings, Adds Tail (some body and head) markings, Adds Alt heads, Secondary (F)Hair Themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more..."

Browse Source
This commit is contained in:
Fox McCloud
2016-08-08 23:26:51 -04:00
committed by GitHub
parent 1793c2fdf3
commit 607642d4ef
38 changed files with 592 additions and 1678 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/customitems/item_defines.dm
+5 -8
View File
@@ -47,8 +47,7 @@
to_chat(user, "<span class= 'notice'>[target] has no skin, how do you expect to tattoo them?</span>")
return
var/list/marking_styles = params2list(target.m_styles)
if(marking_styles["body"] != "None")
if(target.m_style != "None")
to_chat(user, "<span class= 'notice'>[target] already has body markings, any more would look silly!</span>")
return
@@ -62,12 +61,10 @@
user.visible_message("<span class='notice'>[user] finishes the [tattoo_name] on [target].</span>", "<span class='notice'>You finish the [tattoo_name].</span>")
if(!used) // No exploiting do_after to tattoo multiple folks.
var/list/marking_colours = params2list(target.m_colours)
marking_styles["body"] = tattoo_icon
marking_colours["body"] = "#[num2hex(tattoo_r,2)][num2hex(tattoo_g,2)][num2hex(tattoo_b,2)]"
target.m_styles = list2params(marking_styles)
target.m_colours = list2params(marking_colours)
target.m_style = tattoo_icon
target.r_markings = tattoo_r
target.g_markings = tattoo_g
target.b_markings = tattoo_b
target.update_markings()