shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490

Browse Source
This commit is contained in:
Ghommie
2019-12-24 00:07:32 +01:00
parent e74339ce8b 3f42677254
commit d571bbd292
82 changed files with 9095 additions and 3384 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/client/loadout/__donator.dm
+30
View File
@@ -458,3 +458,33 @@ datum/gear/darksabresheath
category = SLOT_NECK
path = /obj/item/clothing/neck/necklace/onion
ckeywhitelist = list("cdrcross")
/datum/gear/mikubikini
name = "starlight singer bikini"
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/mikubikini
ckeywhitelist = list("grandvegeta")
/datum/gear/mikujacket
name = "starlight singer jacket"
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/mikujacket
ckeywhitelist = list("grandvegeta")
/datum/gear/mikuhair
name = "starlight singer hair"
category = SLOT_W_UNIFORM
path = /obj/item/clothing/head/mikuhair
ckeywhitelist = list("grandvegeta")
/datum/gear/mikugloves
name = "starlight singer gloves"
category = SLOT_GLOVES
path = /obj/item/clothing/gloves/mikugloves
ckeywhitelist = list("grandvegeta")
/datum/gear/mikuleggings
name = "starlight singer leggings"
category = SLOT_SHOES
path = /obj/item/clothing/shoes/sneakers/mikuleggings
ckeywhitelist = list("grandvegeta")
modular_citadel/code/modules/custom_loadout/custom_items.dm
+46
View File
@@ -510,3 +510,49 @@
icon_state = "onion"
item_state = "onion"
alternate_worn_icon = 'icons/mob/custom_w.dmi'
/obj/item/clothing/under/mikubikini
name = "starlight singer bikini"
desc = " "
icon_state = "mikubikini"
item_state = "mikubikini"
icon = 'icons/obj/custom.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/suit/mikujacket
name = "starlight singer jacket"
desc = " "
icon_state = "mikujacket"
item_state = "mikujacket"
icon = 'icons/obj/custom.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/head/mikuhair
name = "starlight singer hair"
desc = " "
icon_state = "mikuhair"
item_state = "mikuhair"
icon = 'icons/obj/custom.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
flags_inv = HIDEHAIR
/obj/item/clothing/gloves/mikugloves
name = "starlight singer gloves"
desc = " "
icon_state = "mikugloves"
item_state = "mikugloves"
icon = 'icons/obj/custom.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/shoes/sneakers/mikuleggings
name = "starlight singer leggings"
desc = " "
icon_state = "mikuleggings"
item_state = "mikuleggings"
icon = 'icons/obj/custom.dmi'
alternate_worn_icon = 'icons/mob/custom_w.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION