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

should fix conflicts

Browse Source
This commit is contained in:
loginsandylogout
2018-04-04 12:50:02 -05:00
committed by GitHub
parent 2d038f3f94
commit cee51cd79d
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
modular_citadel/code/modules/client/loadout/uniform.dm
View File

@@ -141,6 +141,7 @@
category = slot_w_uniform
path = /obj/item/clothing/under/syndicate/cosmetic
<<<<<<< LOADOUT
/datum/gear/strppink
name = "Pink stripper outfit"
category = slot_w_uniform
@@ -175,6 +176,26 @@
path = /obj/item/clothing/under/polychromic/shirt
cost = 3
=======
/datum/gear/polykilt
name = "Polychromic Kilt"
category = slot_w_uniform
path = /obj/item/clothing/under/polychromic/kilt
cost = 3
/datum/gear/polyshorts
name = "Polychromic Shorts"
category = slot_w_uniform
path = /obj/item/clothing/under/polychromic/shorts
cost = 3
/datum/gear/polyshortpants
name = "Polychromic Athletic Shorts"
category = slot_w_uniform
path = /obj/item/clothing/under/polychromic/shortpants
cost = 2
>>>>>>> master
// Trekie things
//TOS
/datum/gear/trekcmdtos