Merge pull request #789 from NicoDeLuna/milkman

I am the Milkman
Monkestation · Dec 24, 2023 · e33431f · e33431f
2 parents 6986d53 + ca7cdd7
commit e33431f
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 0 deletions.
diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm
@@ -60,6 +60,8 @@
 				/obj/item/clothing/under/costume/gi = 1,
 				/obj/item/clothing/neck/worldchampioncape = 1,
 				/obj/item/clothing/under/costume/worldchampiongi = 1,
+				/obj/item/clothing/head/milkmanhat = 2,
+				/obj/item/clothing/under/costume/milkman = 2,
 			),
 		),
 		list(

diff --git a/monkestation/code/modules/clothing/head/costume.dm b/monkestation/code/modules/clothing/head/costume.dm
@@ -39,6 +39,13 @@
 	icon_state = "knowingclownhat"
 	worn_y_offset = 6
 
+/obj/item/clothing/head/milkmanhat
+	name = "milkman hat"
+	desc = "Special delivery today!!!"
+	icon = 'monkestation/icons/obj/clothing/hats.dmi'
+	worn_icon = 'monkestation/icons/mob/clothing/head.dmi'
+	icon_state = "milkman_hat"
+
 /obj/item/clothing/head/guardmanhelmet
 	name = "guardman's helmet"
 	desc = "Keeps your brain intact when fighting heretics"

diff --git a/monkestation/code/modules/clothing/under/costume.dm b/monkestation/code/modules/clothing/under/costume.dm
@@ -54,6 +54,14 @@
 	icon_state = "streetmime"
 	can_adjust = FALSE
 
+/obj/item/clothing/under/costume/milkman
+	name = "milkman suit"
+	desc = "I am the Milkman. My milk is delicious!"
+	icon = 'monkestation/icons/obj/clothing/uniforms.dmi'
+	worn_icon = 'monkestation/icons/mob/clothing/uniform.dmi'
+	icon_state = "milkman"
+	can_adjust = FALSE
+
 /obj/item/clothing/under/costume/tragic
 	name = "tragic mime suit"
 	desc = "A skin-tight black suit for theatre actors. You feel the need to remind a doctor to eat food and sleep."

diff --git a/monkestation/icons/mob/clothing/head.dmi b/monkestation/icons/mob/clothing/head.dmi
diff --git a/monkestation/icons/mob/clothing/uniform.dmi b/monkestation/icons/mob/clothing/uniform.dmi
diff --git a/monkestation/icons/obj/clothing/hats.dmi b/monkestation/icons/obj/clothing/hats.dmi
diff --git a/monkestation/icons/obj/clothing/uniforms.dmi b/monkestation/icons/obj/clothing/uniforms.dmi