Merge pull request #7597 from Invader4352/InvaderBranch

Everything is finally done regarding my personal items, i sprited and…
This commit is contained in:
LetterJay
2018-09-27 20:21:40 -05:00
committed by GitHub
7 changed files with 52 additions and 3 deletions

View File

@@ -1516,3 +1516,18 @@
/datum/sprite_accessory/moth_wings/snow
name = "Snow"
icon_state = "snow"
//Lunasune
/datum/sprite_accessory/mam_ears/lunasune
name = "lunasune"
icon_state = "lunasune"
hasinner = 1
extra = TRUE
extra_color_src = MUTCOLORS2
ckeys_allowed = list("invader4352")
/datum/sprite_accessory/mam_tails/lunasune
name = "lunasune"
icon_state = "lunasune"
extra = TRUE
ckeys_allowed = list("invader4352")

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

View File

@@ -326,3 +326,9 @@ datum/gear/darksabresheath
category = SLOT_IN_BACKPACK
path = /obj/item/toy/gun/m41
ckeywhitelist = list("thalverscholen")
/datum/gear/Divine_robes
name = "Divine robes"
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/lunasune
ckeywhitelist = list("invader4352")

View File

@@ -397,3 +397,11 @@
desc = "Comfy Lucky Jackboots with the word Luck on them."
item_state = "luckyjack"
icon_state = "luckyjack"
/obj/item/clothing/under/lunasune
name = "Divine Robes"
icon = 'icons/obj/custom.dmi'
icon_override = 'icons/mob/custom_w.dmi'
desc = "Heavenly robes of the kitsune Luna Pumpkin,you can feel radiance coming from them."
item_state = "Divine_robes"
icon_state = "Divine_robes"

View File

@@ -426,7 +426,7 @@
/datum/sprite_accessory/mam_tails
icon = 'modular_citadel/icons/mob/mam_bodyparts.dmi'
/datum/sprite_accessory/mam_tails/none
name = "None"
@@ -1432,7 +1432,27 @@ datum/sprite_accessory/mam_tails/tentacle
extra2 = FALSE
ckeys_allowed = list("poojawa")
//Lunasune
/datum/sprite_accessory/mam_ears/lunasune
name = "lunasune"
icon_state = "lunasune"
hasinner = 1
extra = TRUE
extra_color_src = MUTCOLORS2
ckeys_allowed = list("invader4352")
/datum/sprite_accessory/mam_tails/lunasune
name = "lunasune"
icon_state = "lunasune"
extra = TRUE
ckeys_allowed = list("invader4352")
/datum/sprite_accessory/mam_tails_animated/lunasune
name = "lunasune"
icon_state = "lunasune"
extra = TRUE
/*************** VIRGO PORTED HAIRS ****************************/
#define VHAIR(_name, new_state) /datum/sprite_accessory/hair/##new_state/icon_state=#new_state;/datum/sprite_accessory/hair/##new_state/name = "Virgo - " + #_name
//VIRGO PORTED HAIRS
@@ -1591,7 +1611,7 @@ VHAIR(Short Hair 4 alt, hair_shorthair4_s)
VHAIR(Tressshoulder, hair_tressshoulder_s)
//END
#undef VHAIR
#define VFACE(_name, new_state) /datum/sprite_accessory/facial_hair/##new_state/icon_state=#new_state;;/datum/sprite_accessory/facial_hair/##new_state/name="Virgo" + #_name
VFACE(Watson, facial_watson_s)
VFACE(Chaplin, facial_chaplin_s)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 67 KiB

After

Width:  |  Height:  |  Size: 68 KiB