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

_maps/map_files/LayeniaStation/LayeniaStation.dmm

@@ -7640,7 +7640,7 @@
 "vNP" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer3{name = "air supply pipe"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{name = "scrubbers pipe"},/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plasteel{icon_plating = "floor"; icon_state = "floor_whole"},/area/security/brig)
 "vNT" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{dir = 1; name = "scrubbers pipe"},/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{dir = 6; name = "air supply pipe"},/obj/structure/cable{icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 6},/turf/open/floor/plasteel/white,/area/science/research)
 "vOa" = (/turf/open/floor/plasteel/white/corner{dir = 8},/area/hallway/secondary/exit)
-"vOe" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 8},/obj/machinery/light{pixel_y = -1},/obj/structure/table,/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/dark,/area/ai_monitored/turret_protected/aisat_interior)
+"vOe" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 8},/obj/machinery/light{pixel_y = -1},/obj/structure/table,/obj/effect/turf_decal/tile/blue,/obj/item/toy/talking/drone,/turf/open/floor/plasteel/dark,/area/ai_monitored/turret_protected/aisat_interior)
 "vOs" = (/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/turf/open/floor/wood,/area/maintenance/port/aft)
 "vOu" = (/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 4},/obj/machinery/door/airlock/external{name = "Cargo Escape Airlock"},/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel/dark,/area/hallway/secondary/exit)
 "vOv" = (/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{name = "scrubbers pipe"},/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{name = "air supply pipe"},/turf/open/floor/plasteel,/area/quartermaster/miningdock)

code/game/objects/items/toys.dm

@@ -602,6 +602,17 @@
 	chattering = TRUE
 	phomeme = "griffin"
 
+/obj/item/toy/talking/drone
+	name = "drone action figure"
+	desc = "An action figure modeled after what seems to be a regular station drone."
+	icon_state = "drone"
+	messages = list("Beep boop.", "You might not understand a drone, but that's fine, what's important is that you understand yourself.", "Remember, not everything needs high pressure or high volume to work efficiently.", "01011001 01101111 01110101 00100000 01100001 01110010 01100101 00100000 01101100 01101111 01110110 01100101 01100100 00101110", "Pause, breathe. Rememeber to treat yourself to something nice, you deserve it.", "Don't aim to be perfect. Nobody is perfect. Instead, try to be whole.", "You yourself, as much as anybody in the entire universe, deserve your love and affection.", "Enjoy every happy moment of your life as if it were the last.", "If you do not respect your own wishes, no one else will.", "Be faithful to that which exists within yourself.", "Yes, you can do it.", "Embrace your values, talents and strengths.")
+	phomeme = "drone"
+
+/obj/item/toy/talking/drone/Initialize()
+	if(prob(5))
+		name = "drone (760) action figure"
+		desc = "An action figure modeled after 'drone (760)', it seems to be a bit dusty."
 /*
 || A Deck of Cards for playing various games of chance ||
 */

code/modules/vending/wardrobes.dm

@@ -57,6 +57,7 @@
 					/obj/item/clothing/under/rank/medical/emt = 5,
 					/obj/item/clothing/under/rank/medical/emt/skirt = 5,
 					/obj/item/clothing/under/rank/medical = 5,
+					/obj/item/clothing/under/sexynursesuit = 5,
 					/obj/item/clothing/suit/toggle/labcoat = 5,
 					/obj/item/clothing/suit/toggle/labcoat/emt = 5,
 					/obj/item/clothing/shoes/sneakers/white = 5,

hyperstation/code/obj/kinkyclothes.dm

@@ -85,4 +85,14 @@ obj/item/clothing/neck/stole/black
 	alternate_worn_icon = 'hyperstation/icons/mobs/suits.dmi'
 	item_state = "r_suit"
 	can_adjust = FALSE
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
+
+/obj/item/clothing/under/sexynursesuit
+	name = "Sexy nurse outfit"
+	desc = "A very revealing nurse's outfit. Not very sanitary. Does it even count as clothing?"
+	icon = 'hyperstation/icons/obj/clothing/suits.dmi'
+	icon_state = "sexynursesuit"
+	alternate_worn_icon = 'hyperstation/icons/mobs/suits.dmi'
+	item_state = "r_suit"
+	can_adjust = FALSE
 	mutantrace_variation = NO_MUTANTRACE_VARIATION

modular_citadel/code/game/machinery/vending.dm

@@ -24,7 +24,7 @@
 					/obj/item/storage/hypospraykit/o2 = 2,
 					/obj/item/storage/hypospraykit/brute = 2,
 					/obj/item/storage/hypospraykit/enlarge = 2,
-					/obj/item/reagent_containers/glass/bottle/vial/small = 5)
+					/obj/item/reagent_containers/glass/bottle/vial/small = 5 )
 
 /obj/machinery/vending/wardrobe/chap_wardrobe
 	premium = list(/obj/item/toy/plush/plushvar = 1,

modular_citadel/code/modules/research/designs/autoylathe_designs.dm

@@ -179,6 +179,12 @@
 	materials = list(MAT_PLASTIC = 250, MAT_METAL = 50)
 	build_path = /obj/item/toy/talking/griffin
 
+/datum/design/autoylathe/talking/drone
+	name = "Drone Action Figure"
+	id = "droneactionfig"
+	materials = list(MAT_PLASTIC = 250, MAT_METAL = 50)
+	build_path = /obj/item/toy/talking/drone
+
 /datum/design/autoylathe/cards
 	name = "Deck of Cards"
 	id = "carddeck"