From aa2b320688708bd008ee3065cc201427152e6063 Mon Sep 17 00:00:00 2001 From: "Wowzewow (Wezzy)" <42310821+alsoandanswer@users.noreply.github.com> Date: Wed, 27 May 2020 17:37:05 +0800 Subject: [PATCH] Adds some Diona markings (#8943) --- .../abstract/new_player/sprite_accessories.dm | 53 +++++++++++++++++- html/changelogs/wezzy_diona_markings.yml | 41 ++++++++++++++ icons/mob/human_races/markings_diona.dmi | Bin 1160 -> 2475 bytes 3 files changed, 92 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/wezzy_diona_markings.yml diff --git a/code/modules/mob/abstract/new_player/sprite_accessories.dm b/code/modules/mob/abstract/new_player/sprite_accessories.dm index 459796e8e9d..b593b5041b8 100644 --- a/code/modules/mob/abstract/new_player/sprite_accessories.dm +++ b/code/modules/mob/abstract/new_player/sprite_accessories.dm @@ -2766,7 +2766,7 @@ Follow by example and make good judgement based on length which list to include */ /datum/sprite_accessory/marking icon = 'icons/mob/human_races/markings.dmi' - do_colouration = 1 //Almost all of them have it, COLOR_ADD + do_colouration = TRUE //Almost all of them have it, COLOR_ADD species_allowed = list() @@ -2917,7 +2917,7 @@ Follow by example and make good judgement based on length which list to include icon_state = "skr_tears" body_parts = list(BP_HEAD) species_allowed = list("Skrell") - do_colouration = 0 + do_colouration = FALSE skr_arms name = "Skrell Arms" @@ -2932,6 +2932,55 @@ Follow by example and make good judgement based on length which list to include body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_CHEST,BP_GROIN,BP_HEAD) species_allowed = list("Diona") + diona_thorns_head + name = "Diona Thorns (Head)" + icon = 'icons/mob/human_races/markings_diona.dmi' + icon_state = "diona_thorns" + body_parts = list(BP_HEAD) + species_allowed = list("Diona") + + diona_thorns_torso + name = "Diona Thorns (Torso)" + icon = 'icons/mob/human_races/markings_diona.dmi' + icon_state = "diona_thorns" + body_parts = list(BP_CHEST) + species_allowed = list("Diona") + + diona_flowers_head + name = "Diona Flowers (Head)" + icon = 'icons/mob/human_races/markings_diona.dmi' + icon_state = "diona_flowers" + body_parts = list(BP_HEAD) + species_allowed = list("Diona") + + diona_flowers_torso + name = "Diona Flowers (Torso)" + icon = 'icons/mob/human_races/markings_diona.dmi' + icon_state = "diona_flowers" + body_parts = list(BP_CHEST) + species_allowed = list("Diona") + + diona_moss + name = "Diona Moss" + icon = 'icons/mob/human_races/markings_diona.dmi' + icon_state = "diona_moss" + body_parts = list(BP_CHEST) + species_allowed = list("Diona") + + diona_mushroom + name = "Diona Mushroom" + icon = 'icons/mob/human_races/markings_diona.dmi' + icon_state = "diona_mushroom" + body_parts = list(BP_HEAD) + species_allowed = list("Diona") + + diona_antennae + name = "Diona Antennae" + icon = 'icons/mob/human_races/markings_diona.dmi' + icon_state = "diona_antennae" + body_parts = list(BP_HEAD) + species_allowed = list("Diona") + bishop_lights name = "Lights Colour" icon = 'icons/mob/human_races/markings_bishop.dmi' diff --git a/html/changelogs/wezzy_diona_markings.yml b/html/changelogs/wezzy_diona_markings.yml new file mode 100644 index 00000000000..ad0bc7a796a --- /dev/null +++ b/html/changelogs/wezzy_diona_markings.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Wowzewow (Wezzy), TheDilShawn + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds more Diona marking customization options. Sprites courtesy of TheDilShawn." diff --git a/icons/mob/human_races/markings_diona.dmi b/icons/mob/human_races/markings_diona.dmi index ee1fcd6bbcc3137c5ad1a4e1b0c09185adb33e94..5782e6e0ab9fc9b5629510c1ea44705c1d5e3653 100644 GIT binary patch literal 2475 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 aa_Rx-^}3oGic)FzSKQ1LVNz%0cK=VTf2tn< literal 1160 zcmV;31b6$1P)URtzAk&$k1HD2&}}0Bm!Ba*RRvA?V#;F(1$drc8|8}2iH7%yCLU9 ztGm0~@np>_1&O6xFV;j%QIFpV)Ev#4r&C(eF00VqUL_t(& zf$f@0a@-&gKtYA4ly}OhwJgP-o5Bs}E3Qp{55R-Ks*~QIo61dM^{z8!WI^zpVum+ALjY$USuUmPw&^Y zckEUr6H}w!vy!?&LB%6IDJ{Oo_ep(%!&G4-2V-rrofk{fU{LZW7T}AVjfnCPQ5wtd zp@Hsp)%#-r3>C~#u7;A>Z^l7>x`L^9uI=S4`U-{e^8>k#hqlrS8by6A@e#=URgBTX zzrnx>+sj`~xy|G+n0f=}{v@#Kc!JdUE>VSH9tvsS^WeX}(UAMfvh?8QnR_1zHDDeT zO>bWU=RqOL(^^B&J0YIS2#8GVf2I_4>z#tx7e<@FVOufMIh$=TPqGC!2Vs`Wi7mKc z_3$77-}yU4AT=B%iM*O<801ZIG=e zdtVP^p;y3IPm1oXWmxcMZ+nS2bw?Mk~7es#Oz`c`%F2U8w%p2)JqNUO@wik5976 z;*(6W_#~GsKFOsJpJWP-`(NButi&f9I82lHWDkr_3h_!BAwJnBh))8h?*I|IUPn8} zdoJ?VTtVNLsPU1l+Ic}x=9v4_o4Z8;J-AVt#wQ0b^rIa?%W_ zIkyio1NcWmuszL#=e*^A#&J%k!0