Merge pull request #1429 from ProbablyCarl/Gateway&MapFixups

Gateway & Map Sanitization

code/game/machinery/announcement_system.dm

@@ -22,6 +22,7 @@ GLOBAL_LIST_EMPTY(announcement_systems)
 	var/newhead = "%PERSON, %DISP_RANK (%RANK), is the department head."
 	var/newheadToggle = TRUE
 	var/cryostorage = "%PERSON, %RANK, has been moved into cryogenic storage." // this shouldnt be changed
+	var/transit = "%PERSON, %RANK, has departed via the gateway."
 
 	var/greenlight = "Light_Green"
 	var/pinklight = "Light_Pink"
@@ -94,6 +95,10 @@ GLOBAL_LIST_EMPTY(announcement_systems)
 	else if(message_type == "CRYOSTORAGE")
 		message = CompileText(cryostorage, user, rank, displayed_rank)
 	//END EDIT
+
+	else if(message_type == "TRANSIT")
+		message = CompileText(transit, user, rank, displayed_rank)
+
 	else if(message_type == "ARRIVALS_BROKEN")
 		message = "The arrivals shuttle has been damaged. Docking for repairs..."
 

code/modules/paperwork/paper_premade.dm

@@ -48,12 +48,15 @@
 	name = "paper- 'Chemical Information'"
 	info = "Known Onboard Toxins:<BR>\n\tGrade A Semi-Liquid Plasma:<BR>\n\t\tHighly poisonous. You cannot sustain concentrations above 15 units.<BR>\n\t\tA gas mask fails to filter plasma after 50 units.<BR>\n\t\tWill attempt to diffuse like a gas.<BR>\n\t\tFiltered by scrubbers.<BR>\n\t\tThere is a bottled version which is very different<BR>\n\t\t\tfrom the version found in canisters!<BR>\n<BR>\n\t\tWARNING: Highly Flammable. Keep away from heat sources<BR>\n\t\texcept in an enclosed fire area!<BR>\n\t\tWARNING: It is a crime to use this without authorization.<BR>\nKnown Onboard Anti-Toxin:<BR>\n\tAnti-Toxin Type 01P: Works against Grade A Plasma.<BR>\n\t\tBest if injected directly into bloodstream.<BR>\n\t\tA full injection is in every regular Med-Kit.<BR>\n\t\tSpecial toxin Kits hold around 7.<BR>\n<BR>\nKnown Onboard Chemicals (other):<BR>\n\tRejuvenation T#001:<BR>\n\t\tEven 1 unit injected directly into the bloodstream<BR>\n\t\t\twill cure unconscious and sleep toxins.<BR>\n\t\tIf administered to a dying patient it will prevent<BR>\n\t\t\tfurther damage for about units*3 seconds.<BR>\n\t\t\tit will not cure them or allow them to be cured.<BR>\n\t\tIt can be administered to a non-dying patient<BR>\n\t\t\tbut the chemicals disappear just as fast.<BR>\n\tMorphine T#054:<BR>\n\t\t5 units will induce precisely 1 minute of sleep.<BR>\n\t\t\tThe effect are cumulative.<BR>\n\t\tWARNING: It is a crime to use this without authorization"
 
-
-	/*
-	*	Stations
-	*/
+//replacing that stupid paper that caused issues because WHY WOULD IT NOT
+/obj/item/paper/fluff/candle
+	name = "paper- 'Candle'"
+	info = "Charlie, remember to reconnect the gas mix monitor if it's having issues, by the way, if the heat gets too high, don't be afraid to space this part of engineering and use a voidsuit or a hardsuit. There's one in the crates... <br> And remember. When the candle is lit... The burn is good."
 
 
+/*
+*	Stations
+*/
 ///////////	CentCom
 
 /obj/item/paper/fluff/stations/centcom/disk_memo

modular_citadel/code/game/machinery/cryopod.dm

@@ -28,6 +28,11 @@
 	var/storage_name = "Cryogenic Oversight Control"
 	var/allow_items = TRUE
 
+/obj/machinery/computer/cryopod/gate
+	name = "transit oversight console"
+	desc = "An interface between crew and the short-range transit storage systems."
+	storage_name = "Transit Oversight Control"
+
 /obj/machinery/computer/cryopod/ui_interact(mob/user = usr)
 	. = ..()
 
@@ -140,7 +145,9 @@
 	var/obj/machinery/computer/cryopod/control_computer
 	var/last_no_computer_message = 0
 
-	var/alert_comms = TRUE	//If we alert crew who cryo'd
+	var/alert_comms = TRUE//If we alert crew who cryo'd
+
+	var/transit_alert_comms = FALSE//Used only by the gateway.
 
 	// These items are preserved when the process() despawn proc occurs.
 	var/list/preserve_items = list(
@@ -178,6 +185,36 @@
 		/obj/item/gun/energy/laser/cyborg
 	)
 
+/*
+//START OF GATE\\
+//This is simply an alternative method of leaving the round. Still uses the same cryo-console.\\
+//Instead of freezing yourself, you may simply just leave the station.\\
+//Short range teleport gang.\\
+*/
+/obj/machinery/cryopod/gate
+	name = "short-range gateway"
+	desc = "A gateway that leads to a nearby location. You may use this to depart."//Not arrive, because we have the shuttle. Or something. I 'unno. It's jank.
+	icon = 'icons/obj/machines/teleporter.dmi'
+	icon_state = "tele0"
+
+	alert_comms = FALSE
+	transit_alert_comms = TRUE
+
+	time_till_despawn = 60 //1 second.
+
+	on_store_message = "has departed via the short-range gateway."
+	on_store_name = "Transit Oversight"
+
+/obj/machinery/cryopod/gate/open_machine()
+	..()
+	icon_state = "tele0"
+
+/obj/machinery/cryopod/gate/close_machine(mob/user)
+	..()
+	icon_state = "tele1"
+
+//END OF GATE
+
 /obj/machinery/cryopod/Initialize()
 	. = ..()
 	update_icon()
@@ -306,6 +343,11 @@
 		announcer.announce("CRYOSTORAGE", mob_occupant.real_name, announce_rank, announce_job_title, list())
 		visible_message("<span class='notice'>\The [src] hums and hisses as it moves [mob_occupant.real_name] into storage.</span>")
 
+	if(GLOB.announcement_systems.len && transit_alert_comms)
+		var/obj/machinery/announcement_system/announcer = pick(GLOB.announcement_systems)
+		announcer.announce("TRANSIT", mob_occupant.real_name, announce_rank, announce_job_title, list())
+		visible_message("<span class='notice'>\The [src] buzzes as it moves [mob_occupant.real_name] elsewhere.</span>")
+
 	if(iscyborg(mob_occupant))
 		var/mob/living/silicon/robot/R = occupant
 		if(!istype(R)) return ..()
@@ -397,9 +439,9 @@
 		return
 
 	if(target == user)
-		visible_message("[user] starts climbing into the cryo pod.")
+		visible_message("[user] starts climbing into \the [src].")
 	else
-		visible_message("[user] starts putting [target] into the cryo pod.")
+		visible_message("[user] starts putting [target] into \the [src].")
 
 	if(occupant)
 		to_chat(user, "<span class='boldnotice'>\The [src] is in use.</span>")
@@ -445,4 +487,4 @@
 
 /obj/machinery/cryopod/syndicate/close_machine(mob/user)
 	..()
-	icon_state = "sleeper_s"
+	icon_state = "sleeper_s"