Merge pull request #5859 from Heroman3003/fixes

Some post-release fixes

code/game/gamemodes/gameticker.dm

@@ -304,7 +304,7 @@ var/global/datum/controller/gameticker/ticker
 				if(!player_is_antag(player.mind, only_offstation_roles = 1))
 					job_master.EquipRank(player, player.mind.assigned_role, 0)
 					UpdateFactionList(player)
-					equip_custom_items(player)
+					//equip_custom_items(player)	//VOREStation Removal
 					//player.apply_traits() //VOREStation Removal
 		if(captainless)
 			for(var/mob/M in player_list)

code/modules/admin/verbs/randomverbs.dm

@@ -491,7 +491,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	if(equipment)
 		if(charjob)
 			job_master.EquipRank(new_character, charjob, 1)
-		equip_custom_items(new_character)
+		//equip_custom_items(new_character)	//VOREStation Removal
 
 	//If desired, add records.
 	if(records)

code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm

@@ -1,12 +1,11 @@
 /datum/gear/fluff
-	path = /obj/item/
+	path = /obj/item
 	sort_category = "Fluff Items"
 	display_name = "If this item can be chosen or seen, ping a coder immediately!"
 	ckeywhitelist = list("This entry should never be choosable with this variable set.") //If it does, then that means somebody fucked up the whitelist system pretty hard
 	character_name = list("This entry should never be choosable with this variable set.")
-	allowed_roles = list()
 	cost = 0
-/* 
+/*
 /datum/gear/fluff/testhorn
 	path = /obj/item/weapon/bikehorn
 	display_name = "Airhorn - Example Item"
@@ -210,7 +209,7 @@
 	display_name = "Verd's Medal"
 	ckeywhitelist = list("epigraphzero")
 	character_name = list("Verd Woodrow")
-	
+
 //  F CKEYS
 
 //  G CKEYS

code/modules/mob/new_player/new_player.dm

@@ -387,7 +387,7 @@
 		return
 
 	// Equip our custom items only AFTER deploying to spawn points eh?
-	equip_custom_items(character)
+	//equip_custom_items(character)	//VOREStation Removal
 
 	//character.apply_traits() //VOREStation Removal
 

maps/tether/tether-05-station1.dmm

@@ -6871,6 +6871,13 @@
 	},
 /turf/simulated/floor/tiled,
 /area/engineering/hallway)
+"amo" = (
+/obj/machinery/door/window/northright{
+	name = "Cafe";
+	req_one_access = list(25)
+	},
+/turf/simulated/floor/wood,
+/area/hallway/station/atrium)
 "amp" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
@@ -6924,8 +6931,10 @@
 /area/engineering/hallway)
 "amt" = (
 /obj/machinery/door/window{
+	dir = 1;
 	icon_state = "left";
-	dir = 1
+	name = "Cafe";
+	req_one_access = list(25)
 	},
 /turf/simulated/floor/wood,
 /area/hallway/station/atrium)
@@ -6955,10 +6964,6 @@
 	},
 /turf/simulated/floor/water/pool,
 /area/hallway/station/atrium)
-"amy" = (
-/obj/machinery/door/window/northright,
-/turf/simulated/floor/wood,
-/area/hallway/station/atrium)
 "amz" = (
 /obj/structure/table/woodentable,
 /obj/item/weapon/reagent_containers/food/snacks/donut/chaos,
@@ -34018,7 +34023,7 @@ afc
 agD
 agx
 acm
-amy
+amo
 acH
 acH
 acH

maps/tether/tether-06-station2.dmm

@@ -13428,11 +13428,15 @@
 /obj/effect/floor_decal/corner/paleblue/border{
 	dir = 1
 	},
+/obj/effect/floor_decal/industrial/warning{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/resleeving)
 "tX" = (
 /obj/machinery/atmospherics/unary/cryo_cell,
-/turf/simulated/floor/tiled/white,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/turf/simulated/floor/tiled,
 /area/medical/resleeving)
 "tY" = (
 /obj/structure/table/glass,
@@ -13447,6 +13451,9 @@
 /obj/effect/floor_decal/corner/paleblue/border{
 	dir = 1
 	},
+/obj/effect/floor_decal/industrial/warning{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/resleeving)
 "tZ" = (
@@ -14107,6 +14114,10 @@
 	icon_state = "intact-scrubbers";
 	dir = 4
 	},
+/obj/effect/floor_decal/industrial/warning/corner{
+	icon_state = "warningcorner";
+	dir = 4
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/resleeving)
 "vg" = (
@@ -14122,6 +14133,9 @@
 	dir = 5;
 	icon_state = "intact"
 	},
+/obj/effect/floor_decal/industrial/warning{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/resleeving)
 "vh" = (
@@ -20469,6 +20483,23 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/ward)
+"Fj" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	icon_state = "intact-scrubbers";
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+	icon_state = "intact";
+	dir = 4
+	},
+/obj/effect/floor_decal/industrial/warning/corner{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/white,
+/area/medical/resleeving)
 "Fq" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
@@ -33718,7 +33749,7 @@ so
 ti
 tu
 tY
-vh
+Fj
 wi
 wI
 xf

maps/tether/tether-07-station3.dmm

@@ -19016,6 +19016,11 @@
 /obj/effect/floor_decal/corner/paleblue/border{
 	dir = 8
 	},
+/obj/structure/extinguisher_cabinet{
+	dir = 4;
+	icon_state = "extinguisher_closed";
+	pixel_x = -30
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/chemistry)
 "Dn" = (