Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master

code/modules/mob/dead/new_player/sprite_accessories/undershirt.dm

@@ -348,6 +348,12 @@
 	name = "Cowboy Shirt Shortsleeved Red"
 	icon_state = "cowboyshirt_reds"
 
+/datum/sprite_accessory/underwear/top/bra_binder
+	name = "Bra (binder)"
+	icon_state = "bra_binder"
+	has_color = TRUE
 
-
-
+/datum/sprite_accessory/underwear/top/bra_binder_strapless
+	name = "Bra (binder, strapless)"
+	icon_state = "bra_binder_strapless"
+	has_color = TRUE

code/modules/mob/living/carbon/human/species_types/ethereal.dm

@@ -14,7 +14,7 @@
 	brutemod = 1.25 //They're weak to punches
 	attack_type = BURN //burn bish
 	damage_overlay_type = "" //We are too cool for regular damage overlays
-	species_traits = list(MUTCOLORS, NO_UNDERWEAR, HAIR, HAS_FLESH, HAS_BONE) // i mean i guess they have blood so they can have wounds too
+	species_traits = list(MUTCOLORS, HAIR, HAS_FLESH, HAS_BONE) // i mean i guess they have blood so they can have wounds too
 	species_language_holder = /datum/language_holder/ethereal
 	inherent_traits = list(TRAIT_NOHUNGER)
 	sexes = FALSE

code/modules/research/nanites/nanite_cloud_controller.dm

@@ -36,8 +36,9 @@
 /obj/machinery/computer/nanite_cloud_controller/proc/eject(mob/living/user)
 	if(!disk)
 		return
-	if(!istype(user) || !Adjacent(user))// ||!user.put_in_active_hand(disk))
-		disk.forceMove(drop_location())
+	disk.forceMove(drop_location())
+	if(istype(user) && user.Adjacent(src))
+		user.put_in_active_hand(disk)
 	disk = null
 
 /obj/machinery/computer/nanite_cloud_controller/proc/get_backup(cloud_id)

code/modules/research/nanites/nanite_program_hub.dm

@@ -53,8 +53,9 @@
 /obj/machinery/nanite_program_hub/proc/eject(mob/living/user)
 	if(!disk)
 		return
-	if(!istype(user) || !Adjacent(user))// || !user.put_in_active_hand(disk))
-		disk.forceMove(drop_location())
+	disk.forceMove(drop_location())
+	if(istype(user) && Adjacent(user))
+		user.put_in_active_hand(disk)
 	disk = null
 
 /obj/machinery/nanite_program_hub/AltClick(mob/user)

code/modules/research/nanites/nanite_programmer.dm

@@ -39,8 +39,9 @@
 /obj/machinery/nanite_programmer/proc/eject(mob/living/user)
 	if(!disk)
 		return
-	if(!istype(user) || !Adjacent(user))// || !user.put_in_active_hand(disk))
-		disk.forceMove(drop_location())
+	disk.forceMove(drop_location())
+	if(istype(user) && user.Adjacent(src))
+		user.put_in_active_hand(disk)
 	disk = null
 	program = null