adds lederhosen and german folk hat (wee hoo) (#4572)

* adds lederhosen and german folk hat

wee hoo

* solves conflicts

* fixes error

* adds descriptions

code/modules/vending/autodrobe.dm

@@ -33,6 +33,8 @@
 					/obj/item/clothing/head/that = 1,
 					/obj/item/clothing/under/kilt = 1,
 					/obj/item/clothing/head/beret = 1,
+					/obj/item/clothing/under/yogs/lederhosen = 1, //yogs
+					/obj/item/clothing/head/yogs/folkhat = 1, //yogs
 					/obj/item/clothing/accessory/waistcoat = 1,
 					/obj/item/clothing/glasses/monocle =1,
 					/obj/item/clothing/head/bowler = 1,

yogstation.dme

@@ -2974,6 +2974,7 @@
 #include "yogstation\code\modules\clothing\chameleon.dm"
 #include "yogstation\code\modules\clothing\clothing.dm"
 #include "yogstation\code\modules\clothing\donator.dm"
+#include "yogstation\code\modules\clothing\head.dm"
 #include "yogstation\code\modules\clothing\mask.dm"
 #include "yogstation\code\modules\clothing\shoe.dm"
 #include "yogstation\code\modules\clothing\under.dm"

yogstation/code/modules/clothing/head.dm

@@ -0,0 +1,5 @@
+/obj/item/clothing/head/yogs/folkhat
+	name = "german folk hat"
+	desc = "Wee hoo."
+	icon_state = "folkhat"
+	item_state = "folkhat"

yogstation/code/modules/clothing/under.dm

@@ -36,4 +36,12 @@
 	icon_state = "soviet_dress_uniform"
 	item_state = "soviet_dress_uniform"
 	item_color = "soviet_dress_uniform"
-	can_adjust = FALSE
+	can_adjust = FALSE
+
+/obj/item/clothing/under/yogs/lederhosen
+	name = "lederhosen"
+	desc = "<i>'Nothing like wearing a lederhosen for another hard day at work on a space station.'</i>"
+	icon_state = "lederhosen"
+	item_state = "lederhosen"
+	item_color = "lederhosen"
+	can_adjust = FALSE