clothig fixes

Dripstation-Dev · Jul 18, 2024 · edb391d · edb391d
1 parent fc500c1
commit edb391d
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 6 deletions.
diff --git a/modular_dripstation/code/modules/clothing/department/civilian.dm b/modular_dripstation/code/modules/clothing/department/civilian.dm
@@ -0,0 +1,32 @@
+/obj/item/clothing/under/maid
+	name = "maid costume"
+	desc = "Maid in USSP."
+	icon = 'modular_dripstation/icons/obj/clothing/uniform/civilian/civilian.dmi'	
+	worn_icon = 'modular_dripstation/icons/mob/clothing/uniform/civilian/civilian.dmi'
+
+/obj/item/clothing/under/rank/civilian/janitor/maid
+	desc = "Special maid uniform for space housekeeping."
+	icon = 'modular_dripstation/icons/obj/clothing/uniform/civilian/civilian.dmi'	
+	worn_icon = 'modular_dripstation/icons/mob/clothing/uniform/civilian/civilian.dmi'
+
+/obj/item/clothing/under/janimaid
+	icon = 'modular_dripstation/icons/obj/clothing/uniform/civilian/civilian.dmi'	
+	worn_icon = 'modular_dripstation/icons/mob/clothing/uniform/civilian/civilian.dmi'
+
+/obj/item/clothing/under/lewdmaid
+	name = "maid uniform"
+	desc = "Cosplay maid uniform for your roleplay."
+	icon_state = "maid_lewd"
+	item_state = "maid_lewd"
+	body_parts_covered = CHEST|GROIN|FEET|LEGS
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+
+/obj/item/clothing/under/wench
+	name = "wench uniform"
+	desc = "Wench uniform for regular duty."
+	icon_state = "wench"
+	item_state = "wench"
+	body_parts_covered = CHEST|GROIN|FEET|LEGS
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
diff --git a/modular_dripstation/code/modules/clothing/department/service.dm b/modular_dripstation/code/modules/clothing/department/service.dm
@@ -72,6 +72,7 @@
 
 /obj/item/clothing/under/sexymime
 	can_adjust = FALSE
+	icon_state = "sexymime"
 	icon = 'modular_dripstation/icons/obj/clothing/uniform/service/mime.dmi'
 	worn_icon = 'modular_dripstation/icons/mob/clothing/uniform/service/mime.dmi'
 
@@ -80,8 +81,8 @@
 	icon = 'modular_dripstation/icons/obj/clothing/uniform/service/mime.dmi'
 	worn_icon = 'modular_dripstation/icons/mob/clothing/uniform/service/mime.dmi'
 	can_adjust = FALSE
-	mutantrace_variation = DIGITIGRADE_VARIATION
-	fitted = NO_FEMALE_UNIFORM
+	mutantrace_variation = NONE
+	fitted = FEMALE_UNIFORM_TOP
 
 
 /obj/machinery/vending/autodrobe

diff --git a/modular_dripstation/code/modules/clothing/suit.dm b/modular_dripstation/code/modules/clothing/suit.dm
@@ -111,10 +111,6 @@
 	icon_state = "jwig"
 	item_state = "pwig"
 
-/obj/item/clothing/under/maid
-	name = "maid costume"
-	desc = "Maid in USSP."
-
 /obj/item/clothing/suit/maiddress
 	name = "maid dress"
 	desc = "Classic maid dress for working woman."

diff --git a/modular_dripstation/icons/mob/clothing/uniform/service/mime.dmi b/modular_dripstation/icons/mob/clothing/uniform/service/mime.dmi
diff --git a/modular_dripstation/icons/obj/clothing/uniform/service/mime.dmi b/modular_dripstation/icons/obj/clothing/uniform/service/mime.dmi
diff --git a/modular_dripstation/includes.dm b/modular_dripstation/includes.dm
@@ -199,6 +199,7 @@
 #include "code\modules\clothing\bagsholding.dm"
 #include "code\modules\clothing\belt.dm"
 #include "code\modules\clothing\combatrig.dm"
+#include "code\modules\clothing\department\civilian.dm"
 #include "code\modules\clothing\department\command.dm"
 #include "code\modules\clothing\department\corporate.dm"
 #include "code\modules\clothing\department\engineering.dm"