From 21efeb0588e28a58e848d610e8e7905bc301468a Mon Sep 17 00:00:00 2001
From: Casper3667 <CasperMC@hotmail.dk>
Date: Wed, 29 Sep 2021 07:03:57 +0200
Subject: [PATCH] Latejoin cryo changes (#12539)

---
 code/controllers/subsystems/job.dm            |   6 ++--
 code/game/machinery/megavend.dm               |  27 ++++++++++++++++--
 .../modules/client/preferences_spawnpoints.dm |   2 +-
 html/changelogs/CryoChange.yml                |   8 ++++++
 icons/obj/stationobjs.dmi                     | Bin 98727 -> 99914 bytes
 maps/aurora/aurora-4_mainlevel.dmm            |   8 ++++--
 maps/aurora/aurora-6_surface.dmm              |   6 ++--
 7 files changed, 45 insertions(+), 12 deletions(-)
 create mode 100644 html/changelogs/CryoChange.yml

diff --git a/code/controllers/subsystems/job.dm b/code/controllers/subsystems/job.dm
index d6e8b68dc65..bb13ffbc47f 100644
--- a/code/controllers/subsystems/job.dm
+++ b/code/controllers/subsystems/job.dm
@@ -423,7 +423,7 @@
 				break
 
 	Debug("ER/([H]): Completed.")
-
+	H.megavend = 1
 	return H
 
 /mob/living/carbon/human
@@ -500,7 +500,7 @@
 			Debug("EP/([H]): Abort, H is AI.")
 			return EquipRank(H, rank, 1)
 
-	if(!current_map.command_spawn_enabled || spawning_at != "Arrivals Shuttle")
+	if(!current_map.command_spawn_enabled || spawning_at != "Arrivals Shuttle" && spawning_at != "Cryogenic Storage")
 		return EquipRank(H, rank, 1)
 
 	H.centcomm_despawn_timer = addtimer(CALLBACK(H, /mob/living/.proc/centcomm_timeout), 10 MINUTES, TIMER_STOPPABLE)
@@ -509,7 +509,7 @@
 
 	H.job = rank
 
-	if(spawning_at != "Arrivals Shuttle" || job.latejoin_at_spawnpoints)
+	if(spawning_at != "Arrivals Shuttle" && spawning_at != "Cryogenic Storage" || job.latejoin_at_spawnpoints)
 		return EquipRank(H, rank, 1)
 
 	var/list/spawn_in_storage = list()
diff --git a/code/game/machinery/megavend.dm b/code/game/machinery/megavend.dm
index b67884b5414..ad49edc83a4 100644
--- a/code/game/machinery/megavend.dm
+++ b/code/game/machinery/megavend.dm
@@ -12,10 +12,11 @@
 	var/last_reply = 0
 	var/last_slogan = 0 //When did we last pitch?
 	var/slogan_delay = 6000 //How long until we can pitch again?
+	var/change_message = "You feel a pleasant breeze as the autolocker whisks away all of your clothes, packing them neatly in a box."
 
 	// Stuff relating vocalizations
 	var/list/slogan_list = list("Don't deploy just yet! Grab your gear!","Forgetting something?","Don't hop on in your skivvies, mate!","It's not Casual Friday, y'know?","Heaven's above, put some clothes on!")
-	var/shut_up = 0 //Stop spouting those godawful pitches!
+	var/shut_up = FALSE //Stop spouting those godawful pitches!
 
 /obj/machinery/megavendor/machinery_process()
 	if(((src.last_slogan + src.slogan_delay) <= world.time) && (src.slogan_list.len > 0) && (!src.shut_up) && prob(5))
@@ -47,10 +48,9 @@
 			continue
 		H.drop_from_inventory(W,gearbox)
 
-	to_chat(H,"<span class='notice'>You feel a pleasant breeze as the autolocker whisks away all of your clothes, packing them neatly in a box.</span>")
+	to_chat(H, SPAN_NOTICE(change_message))
 
 	SSjobs.EquipRank(H, H.job, 1, 1) //Equip 'em
-	H.megavend = 1
 
 	//Give them the box
 	if(istype(H.back,/obj/item/storage/backpack))
@@ -61,3 +61,24 @@
 		H.put_in_any_hand_if_possible(gearbox)
 
 	return
+
+/obj/machinery/megavendor/vendor
+	name = "\improper NanoTrasen AutoDrobe Vendor"
+	desc = "A NanoTrasen AutoDrobe machine to help through the trouble of getting dressed for work in the spur of a moment!"
+	icon_state = "clothing"
+	shut_up = TRUE
+	density = 1
+	change_message = "The autolocker issues your equipment and you quickly get changed."
+
+/obj/machinery/megavendor/vendor/Crossed(O)
+	return
+
+/obj/machinery/megavendor/vendor/attack_hand(mob/user)
+	..()
+	if(ishuman(user) && Adjacent(user))
+		var/mob/living/carbon/human/H = user
+		if(!H.megavend)
+			playsound(src,'sound/effects/sparks4.ogg',50,1)
+			megavend(H)
+		else
+			to_chat(user, "\The [src]'s screen lights up a brief message: 'Equipment already claimed. Have a nice day!'")
\ No newline at end of file
diff --git a/code/modules/client/preferences_spawnpoints.dm b/code/modules/client/preferences_spawnpoints.dm
index c2a23acc1de..1d680264d44 100644
--- a/code/modules/client/preferences_spawnpoints.dm
+++ b/code/modules/client/preferences_spawnpoints.dm
@@ -46,7 +46,7 @@
 		if(!C.occupant)
 			C.set_occupant(victim, 1)
 			victim.Sleeping(3)
-			to_chat(victim, SPAN_NOTICE("You are slowly waking up from the cryostasis aboard [current_map.full_name]. It might take a few seconds."))
+			to_chat(victim, SPAN_NOTICE("You are slowly waking up from the cryostasis aboard [current_map.full_name]. It might take a few seconds.\nYour workplace attire is waiting for you at the nearest autodrobe vendor."))
 			return
 
 /datum/spawnpoint/cyborg
diff --git a/html/changelogs/CryoChange.yml b/html/changelogs/CryoChange.yml
new file mode 100644
index 00000000000..1f36364c3ee
--- /dev/null
+++ b/html/changelogs/CryoChange.yml
@@ -0,0 +1,8 @@
+author: TheGreyWolf
+
+delete-after: True
+
+changes:
+  - rscadd: "Cryo latejoins have been changed to need to get their equipment from an AutoDrobe Vendor, much like when boarding the shuttle."
+  - maptweak: "AutoDrobe Vendors can be found within command cryo, main level cryo & surface cryo."
+  - bugfix: "Visitors who ready up at roundstart no longer get some of their equipment dupicated upon boarding the shuttle."
diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi
index dbb0d7be5cd310a27fc32fcfe4727153f845ff63..d17b9ea4ce33f7c3606a17907c5bc8e0996b9027 100644
GIT binary patch
delta 5382
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
Xx5G@7^7eN;z#Zl$mWcB6Zqfe%xGa%E

delta 4185
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

diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm
index 1b2399074f1..86a1eae5b20 100644
--- a/maps/aurora/aurora-4_mainlevel.dmm
+++ b/maps/aurora/aurora-4_mainlevel.dmm
@@ -31584,8 +31584,8 @@
 /turf/simulated/floor/plating,
 /area/bridge)
 "bcG" = (
-/obj/structure/closet/secure_closet/personal/cabinet,
 /obj/machinery/firealarm/west,
+/obj/machinery/megavendor/vendor,
 /turf/simulated/floor/carpet/blue,
 /area/crew_quarters/heads/cryo)
 "bcH" = (
@@ -71213,6 +71213,10 @@
 /obj/machinery/appliance/cooker/stove,
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/kitchen)
+"xUe" = (
+/obj/machinery/megavendor/vendor,
+/turf/simulated/floor/tiled/white,
+/area/crew_quarters/sleep/main)
 "xVv" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
@@ -103405,7 +103409,7 @@ pju
 bDF
 bEG
 bFy
-snu
+xUe
 bBP
 bIo
 bJi
diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm
index cb5cda89271..f5a56d4c650 100644
--- a/maps/aurora/aurora-6_surface.dmm
+++ b/maps/aurora/aurora-6_surface.dmm
@@ -9375,8 +9375,9 @@
 /turf/simulated/floor/plating,
 /area/hallway/secondary/entry/emergency)
 "ipR" = (
-/obj/structure/closet/wardrobe/pjs,
 /obj/machinery/firealarm/north,
+/obj/structure/closet/emcloset,
+/obj/item/storage/toolbox/emergency,
 /turf/simulated/floor/tiled,
 /area/hallway/secondary/entry/central)
 "iqa" = (
@@ -20415,14 +20416,13 @@
 	dir = 4;
 	icon_state = "tube1"
 	},
-/obj/item/storage/toolbox/emergency,
-/obj/structure/closet/emcloset,
 /obj/item/device/radio/intercom{
 	dir = 4;
 	name = "Station Intercom (General)";
 	pixel_x = 27
 	},
 /obj/effect/floor_decal/corner/grey/diagonal,
+/obj/machinery/megavendor/vendor,
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/sleep/cryo)
 "seu" = (