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

Merge remote-tracking branch 'citadel/master' into combat_rework_experimental

Browse Source
This commit is contained in:
silicons
2020-09-25 01:03:15 -07:00
parent 15d04caa43 d18e47d9e1
commit 57c4a3416a
24 changed files with 256 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/client/loadout/__donator.dm
+6
View File
@@ -511,6 +511,12 @@
path = /obj/item/bedsheet/cosmos
ckeywhitelist = list("grunnyyy")
/datum/gear/donator/customskirt
name = "custom atmos skirt"
slot = SLOT_IN_BACKPACK
path = /obj/item/clothing/under/custom/customskirt
ckeywhitelist = list("thakyz")
/datum/gear/donator/hisakaki
name = "halo"
slot = SLOT_HEAD
modular_citadel/code/modules/custom_loadout/custom_items.dm
+9 -1
View File
@@ -551,10 +551,18 @@
icon_state = "polyce"
poly_colors = list("#808080", "#8CC6FF", "#FF3535")
/obj/item/clothing/under/custom/customskirt
name = "unzipped atmos skirt"
desc = "atmos jumpsuit skirt with the top half zipped down and wrapped around the waist."
icon_state = "atmos_skirt"
item_state = "atmos_skirt"
icon = 'icons/obj/custom.dmi'
mob_overlay_icon = 'icons/mob/clothing/custom_w.dmi'
/obj/item/clothing/head/halo
name = "transdimensional halo"
desc = "An oddly shaped halo that magically hovers above the head."
icon_state = "halo"
item_state = "halo"
icon = 'icons/obj/custom.dmi'
icon = 'icons/mob/clothing/custom_w.dmi'
mob_overlay_icon = 'icons/mob/clothing/custom_w.dmi'