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 customskirt

Browse Source 
# Conflicts:
#	icons/obj/custom.dmi
#	modular_citadel/code/modules/custom_loadout/custom_items.dm
This commit is contained in:
Jay
2020-09-18 19:23:31 -05:00
parent 16e6d309b6 6956266013
commit a2ad87bebd
10 changed files with 55 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/custom_loadout/custom_items.dm
+1 -1
View File
@@ -565,4 +565,4 @@
icon_state = "halo"
item_state = "halo"
icon = 'icons/mob/clothing/custom_w.dmi'
mob_overlay_icon = 'icons/mob/clothing/custom_w.dmi'
mob_overlay_icon = 'icons/mob/clothing/custom_w.dmi'