From cee51cd79dc420bb0b97c68fa2567d77d9d0c577 Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Wed, 4 Apr 2018 12:50:02 -0500 Subject: [PATCH] should fix conflicts --- .../code/modules/client/loadout/uniform.dm | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index e0566aa854..a4b3e6c49e 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -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