Merge remote-tracking branch 'upstream/master' into hopefullythefinalhardsync

2018-07-05 00:17:44 -04:00
parent cc628a905e e92379e360
commit ac6fddcfb3
18 changed files with 99 additions and 25 deletions
@@ -30,4 +30,16 @@
 	icon_state = "tssuit"
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
 	item_state = "r_suit"
-	can_adjust = FALSE
+	can_adjust = FALSE
+	
+/obj/item/clothing/under/rank/captain/femformal
+	name ="captain's female formal outfit"
+	desc = ""
+	icon = 'modular_citadel/icons/obj/clothing/cit_clothes.dmi'
+	icon_state = "lewdcap"
+	icon_override = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
+	item_state = "lewdcap"
+	item_color = "lewdcap"
+	can_adjust = FALSE
+	sensor_mode = SENSOR_COORDS  //it's still a captain's suit nerd
+	random_sensor = FALSE