Aurora 2: The 3/4thening (#17186)

* after dark

* FIXES

* breakin

* butt

* Update code/game/objects/items/devices/floor_painter.dm

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>

* Update code/game/objects/items/devices/floor_painter.dm

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>

* Update code/game/objects/structures/lattice.dm

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>

* testing 1

* a

* FUCK THIS PRESET!!!

* allah

* OTEMACHI

* tis' done

* Project Exorcism : Sneed's Snairs (Formerly Chuck's)

* Update code/game/objects/structures/stool_bed_chair_nest/chairs.dm

* Update code/game/objects/structures/stool_bed_chair_nest/chairs.dm

* Update stools.dm

* Update code/game/objects/structures/stool_bed_chair_nest/stools.dm

* Update code/game/objects/structures/stool_bed_chair_nest/stools.dm

* Update stools.dm

* Update chairs.dm

* Update code/game/objects/structures/stool_bed_chair_nest/chairs.dm

* inhand fixes

* airlocks (matt has cooked)

fuck

* my cody plays the mamba

* fuck

* fixes layering issue

* airlocks and everything else Please fucking kill me

* underlays

* unfuck blending

* finished replacing old ass shit

* your ass is geass

* conflicts die now

* public fat'wa

* progress on walls and windows

* more mapping

* baltimore accents be like

* minor progress

* monitors

* fire alarms and apc adjustments

* apcs pixel adjustments, final airlock look

* also grilles

* shuttle wall start plus shuttle windows

* starting consoles

* table outlines

* I love broke ass sprites

* fixing the stupid ass exterior walls

* light fuckery

* terminal directionals, external airlocks, table fixes, blahblahblah

* fix 1

* fix 2

* some more fixes

* fix chairs

* basic untested railings and updating colors from atteria

* bridge and some fixes

* removing some artifacts on the new walls

* breaking wood tables and adding 4 wall materials

* fix

* compile & wood fixes

* make the horizon compile again

* railings, firedoors, ATMs, intercomms and tables again

* mapping begins also some tweaks to map view of icons

* full tile steel walls

* i sure hope nothing bad happens

* airlock updates (untested)

* reverts most wall machinery

* skull

* wall coloring

* makes the tg wood chill out

* work on airlocks

* hull consistency

* cause you live forever in the lights you make

* whoops can't show that in a christian manga

* terminals should be on walls and everything's hunky dory now

also i changed the wood stuff as per atteria's suggestion

* fixing airlocks

* fixes

* window resprite, coloring adjustments

* scc hull resprite

* new grilles, frame edits, and borosilicate

* greyscale wood palette improvement

* shuttle windows

* window frame fix

* apc update

* refit and reshaded fire alarms

* mapping icon fixes

* table fixes

* map fixes, platforms and stairs

* updates cutter, new walls and terminals

* mapping fixes

* fix preview

* preview fix stone

* stairs

* initial work for the map

* railing and windowpane fuckery

* new external airlocks

* a

* fix the maps in preparation

* wall object pixel offsets

* air alarms D1

* extinguisher cabinets

* APC DESTROYED MISSION ACCOMPLISHED GOOD WORK

* deck 3: floor decals, APCs, air alarms, fire extinguisher cabinets

* deck 3: fireaxe cabinet

* /shuttle_landmark/distress/blue, move base_turf from map to obj def

* intercom presets

* formatting

* deck 1: floor decals

* deck 2: named area fix (LMAO), signs to use single quotes

* deck 2: floor decals, APCs, air alarms, fire extinguisher cabinets, fireaxe cabinets

* Platforms and stairs!

* grates and bugfixes

* Angled ship walls + grate color fix

* corrects apc anim overlay

* deck 2 and away site fixes

# Conflicts:
#	maps/sccv_horizon/sccv_horizon-2_deck_2.dmm

* deck 2 missing grate

* warning stripes

* railings and ledges

* windows and fixtures

* windoorsagain

* airlocks pt1

* windows de-seamed and transparent

* airlocks and pixel offsets

* fixes for airlocks

* more airlock fixes

* presets for ringer, request console and newscaster

* 132

* asfsaf

* kitchen tiling

* thicker freezer tile bevels

* More angled walls

* New shutters and blast doors

* directional corrections

* ops railing fixes

* updated window map things and shutters

* value changes and blast door changes

* Ledges and platforms galore (D2/D3)

* all decks: fix door dirs

* all decks: newscasters, intercoms, requests consoles, ringer consoles

* helm light blue decals to dark blue

* supermatter door dir fix

* fix directional presets (dirs/offsets): newscaster, intercom, requests console, ringer console

* firedoor changes

* deck 3: overlapping wall mountables fixes

* map changes

* airlock changes

* map tweaks

* airlock & stair icons

* various mapping modifications

* Double airlocks + fixing denied states + fixing airlocks on all levels

* Rebase

* directional terminals buttons and lights again, platform tweaks

terminal north facing sprites, atm/food terminal directionals
proper door control and lightswitch directionals (presets still need to be set up, mapping)
re-adds new light tube sprites, again
new sprites for floor lights and the other stuff that got added
adjusted platforms to be recolorable, added light and dark versions, fixed some shading

* missing ERT outfit thingy fix

* floor lights fixed

* deck 3: various small fixes

* deck 1: various small fixes

* deck 2: various small fixes

* fixes

* d2 fixes & multitile door fix

* d2 fixes, remove unused airlock files, button icon fixes, window icon fixes

* make it actually compile, oops!

* make it actually compile, pt2

* CE office camera

* pew pew pew

* pew pew pew 2

* fixes

* deck 3: buttons fixes

* deck 3: button and other fixes

* deck 3: fixes and stuff

* D1 fixes & skrell airlocks

* minor D2 tweaks

* a lot of airlock-related fixes, glass tables, paint sprayer fixes, decal fixes, changelog

* maintenance hatch sprites

* fixing double doors

* flips multi-tiles, fixes multi-tiles, adds desk windoors

* new plastic flaps

* deck 2: a few buttons

* side + middle doors

* created paths for 3-tiles doors

* apply to map the 3 tiles airlocks

* some fixes, windoor alpha

* remove this random ass potted plant

* more map fixes

* holodeck disposal pipe fix

* secure airlock sprites

no code or obj definitions yet

* vault airlock

* vault door fixes

* scc window alpha

* adjusts double door glass, firedoor open state

* adjusts construction states for doors

* remove some defunct icons and fix anims

* assembly stuff

* pharma fixes

* vault door dir

* firedoor smart generation moved to its own proc

* lift doors, d1 fixes

* firedoor smart generation: adjacent wall check

* firedoor smart generation: adjacent firedoor check

* all decks: missing firedoor and other fixes

* deck 2: weird maint stairs fix

* oops

* diona airlock fix

* the shuttle wall gigadeath

* fixes

* some fixes for leftover map item paths, and double lattices

* new diona walls

* more fixes

* and more

* deck 1: fix out of bounds keys

* deck 3: fix out of bounds keys

* runtime 3: duplicate APCs fix

* all decks: make all 3 tile wide doors glass

---------

Co-authored-by: Wezzy <wowzewow@gmail.com>
Co-authored-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>
Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
Co-authored-by: kyres1 <noodle.buster31@gmail.com>
Co-authored-by: Matt Atlas <liermattia@gmail.com>
Co-authored-by: atteria <tarkona@protonmail.com>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Co-authored-by: DreamySkrell <107256943+DreamySkrell@users.noreply.github.com>
Co-authored-by: naut <nautilussplat@gmail.com>
Co-authored-by: naut <55491249+nauticall@users.noreply.github.com>

code/game/objects/items/devices/hacktool.dm

@@ -62,7 +62,7 @@
 		return FALSE
 	if(istype(target, /obj/machinery/door/airlock))
 		var/obj/machinery/door/airlock/door = target
-		if(door.hackProof)
+		if(door.hack_proof)
 			to_chat(user, SPAN_WARNING("Hacking [target] is beyond the capabilities of this device!"))
 			return FALSE
 	var/found = known_targets.Find(target)

code/game/objects/items/devices/paint_sprayer.dm

@@ -1,8 +1,13 @@
-/obj/item/device/floor_painter
+
+#define AIRLOCK_REGION_PAINT    "Paint"
+#define AIRLOCK_REGION_STRIPE   "Stripe"
+#define AIRLOCK_REGION_WINDOW   "Window"
+
+/obj/item/device/paint_sprayer
 	name = "paint gun"
 	desc = "A Hephaestus-made paint gun that uses microbes to replenish its paint storage. Very high-tech and fancy too!"
 	desc_info = "Use control-click on a coloured decal on a turf to copy its colour. You can also use shift-click on a turf with the paint gun in hand to clear all decals on it."
-	icon = 'icons/obj/item/tools/floor_painter.dmi'
+	icon = 'icons/obj/item/tools/paint_sprayer.dmi'
 	icon_state = "floor_painter"
 	item_state = "floor_painter"
 	contained_sprite = TRUE
@@ -12,11 +17,8 @@
 
 	var/list/decals = list(
 		"quarter-turf" =      list("path" = /obj/effect/floor_decal/corner, "precise" = 1, "coloured" = 1),
+		"wide quarter-turf" = list("path" = /obj/effect/floor_decal/corner_wide, "precise" = 1, "coloured" = 1),
 		"full quarter-turf" = list("path" = /obj/effect/floor_decal/corner_full, "precise" = 1, "coloured" = 1),
-		"light corner" = list("path" = /obj/effect/floor_decal/corner/light, "precise" = 1, "coloured" = 1),
-		"full light corner" = list("path" = /obj/effect/floor_decal/corner/light/full, "precise" = 1, "coloured" = 1),
-		"light, wide corner" = list("path" = /obj/effect/floor_decal/corner_wide/light, "precise" = 1, "coloured" = 1),
-		"full, light, wide corner" = list("path" = /obj/effect/floor_decal/corner_wide/light/full, "precise" = 1, "coloured" = 1),
 		"hazard stripes" =    list("path" = /obj/effect/floor_decal/industrial/warning),
 		"corner, hazard" =    list("path" = /obj/effect/floor_decal/industrial/warning/corner),
 		"hatched marking" =   list("path" = /obj/effect/floor_decal/industrial/hatch, "coloured" = 1),
@@ -70,8 +72,7 @@
 		"bulkhead black" = COLOR_WALL_GUNMETAL
 		)
 
-/obj/item/device/floor_painter/afterattack(var/atom/A, var/mob/user, proximity, params)
-
+/obj/item/device/paint_sprayer/afterattack(var/atom/A, var/mob/user, proximity, params)
 	if(!proximity)
 		return
 
@@ -99,13 +100,19 @@
 		B.update_icon()
 		return
 
-	var/turf/simulated/floor/F = A
-	if(!istype(F))
-		to_chat(user, "<span class='warning'>\The [src] can only be used on station flooring.</span>")
+	else if (istype(A, /obj/machinery/door/airlock))
+		return paint_airlock(A, user)
+
+	else if (istype(A, /turf/simulated/floor))
+		return paint_floor(A, user, params)
+
+/obj/item/device/paint_sprayer/proc/paint_floor(turf/simulated/floor/F, mob/user, params)
+	if(!F.flooring.can_paint)
+		to_chat(user, SPAN_WARNING("\The [src] cannot paint this type of flooring."))
 		return
 
-	if(!F.flooring || !F.flooring.can_paint || F.broken || F.burnt)
-		to_chat(user, "<span class='warning'>\The [src] cannot paint broken or missing tiles.</span>")
+	if(!F.flooring || F.broken || F.burnt)
+		to_chat(user, SPAN_WARNING("\The [src] cannot paint damaged or missing tiles."))
 		return
 
 	var/list/decal_data = decals[decal]
@@ -157,7 +164,7 @@
 	playsound(get_turf(src), 'sound/effects/spray3.ogg', 30, 1, -6)
 	new painting_decal(F, painting_dir, painting_colour)
 
-/obj/item/device/floor_painter/attack_self(var/mob/user)
+/obj/item/device/paint_sprayer/attack_self(var/mob/user)
 	var/choice = input("Do you wish to change the decal type, paint direction, or paint colour?") as null|anything in list("Decal","Direction", "Colour")
 	if(choice == "Decal")
 		choose_decal()
@@ -166,7 +173,7 @@
 	else if(choice == "Colour")
 		choose_colour()
 
-/obj/item/device/floor_painter/proc/change_colour(new_colour, mob/user)
+/obj/item/device/paint_sprayer/proc/change_colour(new_colour, mob/user)
 	if (new_colour)
 		paint_colour = new_colour
 		if (user)
@@ -181,7 +188,7 @@
 	if(ishuman(usr))
 		var/mob/living/carbon/human/H = usr
 		var/list/modifiers = params2list(params)
-		var/obj/item/device/floor_painter/paint_sprayer = H.get_active_hand()
+		var/obj/item/device/paint_sprayer/paint_sprayer = H.get_active_hand()
 		if(istype(paint_sprayer))
 			if(!istype(H.buckled_to))
 				H.face_atom(src)
@@ -191,21 +198,25 @@
 				return
 	. = ..()
 
-/obj/item/device/floor_painter/proc/pick_color(atom/A, mob/user)
+/obj/item/device/paint_sprayer/proc/pick_color(atom/A, mob/user)
 	if (!user.Adjacent(A) || user.incapacitated())
 		return FALSE
 	var/new_color
 	if (istype(A, /turf/simulated/floor))
 		new_color = pick_color_from_floor(A, user)
+	else if (istype(A, /obj/machinery/door/airlock))
+		new_color = pick_color_from_airlock(A, user)
 	if (!change_colour(new_color, user))
 		to_chat(user, SPAN_WARNING("\The [A] does not have a colour that you could pick from."))
 	return TRUE // There was an attempt to pick a color.
 
-/obj/item/device/floor_painter/proc/pick_color_from_floor(turf/simulated/floor/F, mob/user)
+/obj/item/device/paint_sprayer/proc/pick_color_from_floor(turf/simulated/floor/F, mob/user)
 	if (!F.decals || !F.decals.len)
 		return FALSE
 	var/list/available_colors = list()
-	for (var/image/I in F.decals)
+	for (var/img in F.decals)
+		/// This snowflake code is necessary because for some reason images added to the decals list at roundstart become appearances.
+		var/image/I = image(img)
 		available_colors |= isnull(I.color) ? COLOR_WHITE : I.color
 	var/picked_color = available_colors[1]
 	if (available_colors.len > 1)
@@ -214,7 +225,50 @@
 			return FALSE
 	return picked_color
 
-/obj/item/device/floor_painter/proc/remove_paint(atom/A, mob/user)
+/obj/item/device/paint_sprayer/proc/pick_color_from_airlock(obj/machinery/door/airlock/D, mob/user)
+	if (!D.paintable)
+		return FALSE
+	switch (select_airlock_region(D, user, "Where do you wish to pick the color from?"))
+		if (AIRLOCK_REGION_PAINT)
+			return D.door_color
+		if (AIRLOCK_REGION_STRIPE)
+			return D.stripe_color
+		if (AIRLOCK_REGION_WINDOW)
+			return D.window_color
+		else
+			return FALSE
+
+/obj/item/device/paint_sprayer/proc/paint_airlock(obj/machinery/door/airlock/D, mob/user)
+	if (!D.paintable)
+		to_chat(user, SPAN_WARNING("You can't paint this airlock type."))
+		return FALSE
+
+	switch (select_airlock_region(D, user, "What do you wish to paint?"))
+		if (AIRLOCK_REGION_PAINT)
+			D.paint_airlock(paint_colour)
+		if (AIRLOCK_REGION_STRIPE)
+			D.stripe_airlock(paint_colour)
+		if (AIRLOCK_REGION_WINDOW)
+			D.paint_window(paint_colour)
+		else
+			return FALSE
+	return TRUE
+
+/obj/item/device/paint_sprayer/proc/select_airlock_region(obj/machinery/door/airlock/D, mob/user, input_text)
+	var/choice
+	var/list/choices = list()
+	if (D.paintable & AIRLOCK_PAINTABLE_MAIN)
+		choices |= AIRLOCK_REGION_PAINT
+	if (D.paintable & AIRLOCK_PAINTABLE_STRIPE)
+		choices |= AIRLOCK_REGION_STRIPE
+	if (D.paintable & AIRLOCK_PAINTABLE_WINDOW)
+		choices |= AIRLOCK_REGION_WINDOW
+	choice = input(user, input_text) as null|anything in sortList(choices)
+	if (!user.use_check_and_message() || !D || !user.Adjacent(D))
+		return FALSE
+	return choice
+
+/obj/item/device/paint_sprayer/proc/remove_paint(atom/A, mob/user)
 	if(!user.Adjacent(A) || user.incapacitated())
 		return FALSE
 	if (istype(A, /turf/simulated/floor))
@@ -223,16 +277,23 @@
 			F.decals.len--
 			F.update_icon()
 			. = TRUE
+	else if (istype(A, /obj/machinery/door/airlock))
+		var/obj/machinery/door/airlock/D = A
+		if (D.paintable)
+			D.paint_airlock(null)
+			D.stripe_airlock(null)
+			D.paint_window(null)
+			. = TRUE
 	if (.)
 		add_fingerprint(user)
 		playsound(get_turf(src), 'sound/effects/spray3.ogg', 30, 1, -6)
 	return .
 
-/obj/item/device/floor_painter/examine(mob/user)
+/obj/item/device/paint_sprayer/examine(mob/user)
 	. = ..(user)
 	to_chat(user, "It is configured to produce the '[decal]' decal with a direction of '[paint_dir]' using [paint_colour] paint.")
 
-/obj/item/device/floor_painter/verb/choose_colour()
+/obj/item/device/paint_sprayer/verb/choose_colour()
 	set name = "Choose Colour"
 	set desc = "Choose a paintgun colour."
 	set category = "Object"
@@ -243,7 +304,7 @@
 	var/new_colour = input(usr, "Choose a colour.", "paintgun", paint_colour) as color|null
 	change_colour(new_colour, usr)
 
-/obj/item/device/floor_painter/verb/choose_preset_colour()
+/obj/item/device/paint_sprayer/verb/choose_preset_colour()
 	set name = "Choose Preset Colour"
 	set desc = "Choose a paintgun colour."
 	set category = "Object"
@@ -256,7 +317,7 @@
 		paint_colour = preset_colors[new_colour]
 		to_chat(usr, "<span class='notice'>You set \the [src] to paint with <font color='[paint_colour]'>a new colour</font>.</span>")
 
-/obj/item/device/floor_painter/verb/choose_decal()
+/obj/item/device/paint_sprayer/verb/choose_decal()
 	set name = "Choose Decal"
 	set desc = "Choose a paintgun decal."
 	set category = "Object"
@@ -270,7 +331,7 @@
 		decal = new_decal
 		to_chat(usr, "<span class='notice'>You set \the [src] decal to '[decal]'.</span>")
 
-/obj/item/device/floor_painter/verb/choose_direction()
+/obj/item/device/paint_sprayer/verb/choose_direction()
 	set name = "Choose Direction"
 	set desc = "Choose a paintgun direction."
 	set category = "Object"
@@ -283,3 +344,6 @@
 	if(new_dir && !isnull(paint_dirs[new_dir]))
 		paint_dir = new_dir
 		to_chat(usr, "<span class='notice'>You set \the [src] direction to '[paint_dir]'.</span>")
+
+#undef AIRLOCK_REGION_PAINT
+#undef AIRLOCK_REGION_STRIPE

code/game/objects/items/devices/radio/intercom.dm

@@ -1,8 +1,26 @@
+#define PRESET_NORTH \
+dir = NORTH; \
+pixel_y = 20;
+
+#define PRESET_SOUTH \
+dir = SOUTH; \
+pixel_y = -6;
+
+#define PRESET_WEST \
+dir = WEST; \
+pixel_x = -8;
+
+#define PRESET_EAST \
+dir = EAST; \
+pixel_x = 8;
+
+
 /obj/item/device/radio/intercom
 	name = "intercom (general)"
 	desc = "An intercom with buttons for transmitting, receiving, and for volume control."
 	desc_extended = "Has a touch display for inputting a frequency, with proper authentication. Used to communicate when you have lost your radio. \
 		Otherwise, you would likely just use a handheld shortwave radio instead."
+	icon = 'icons/obj/machinery/wall/terminals.dmi'
 	icon_state = "intercom"
 	layer = 2.99
 	anchored = TRUE
@@ -17,10 +35,34 @@
 	var/radio_sound = null
 	clickvol = 40
 
+/obj/item/device/radio/intercom/north
+	PRESET_NORTH
+
+/obj/item/device/radio/intercom/south
+	PRESET_SOUTH
+
+/obj/item/device/radio/intercom/west
+	PRESET_WEST
+
+/obj/item/device/radio/intercom/east
+	PRESET_EAST
+
 /obj/item/device/radio/intercom/ship
 	channels = list()
 	var/default_hailing = FALSE
 
+/obj/item/device/radio/intercom/ship/north
+	PRESET_NORTH
+
+/obj/item/device/radio/intercom/ship/south
+	PRESET_SOUTH
+
+/obj/item/device/radio/intercom/ship/west
+	PRESET_WEST
+
+/obj/item/device/radio/intercom/ship/east
+	PRESET_EAST
+
 /obj/item/device/radio/intercom/ship/Initialize()
 	if(!current_map.use_overmap)
 		return ..()
@@ -44,9 +86,34 @@
 /obj/item/device/radio/intercom/ship/hailing
 	default_hailing = TRUE
 
+/obj/item/device/radio/intercom/ship/north
+	PRESET_NORTH
+
+/obj/item/device/radio/intercom/ship/south
+	PRESET_SOUTH
+
+/obj/item/device/radio/intercom/ship/west
+	PRESET_WEST
+
+/obj/item/device/radio/intercom/ship/east
+	PRESET_EAST
+
+
 /obj/item/device/radio/intercom/custom
 	name = "intercom (custom)"
 
+/obj/item/device/radio/intercom/custom/north
+	PRESET_NORTH
+
+/obj/item/device/radio/intercom/custom/south
+	PRESET_SOUTH
+
+/obj/item/device/radio/intercom/custom/west
+	PRESET_WEST
+
+/obj/item/device/radio/intercom/custom/east
+	PRESET_EAST
+
 /obj/item/device/radio/intercom/custom/Initialize()
 	. = ..()
 	set_broadcasting(FALSE)
@@ -55,6 +122,18 @@
 /obj/item/device/radio/intercom/hailing
 	name = "intercom (hailing)"
 
+/obj/item/device/radio/intercom/hailing/north
+	PRESET_NORTH
+
+/obj/item/device/radio/intercom/hailing/south
+	PRESET_SOUTH
+
+/obj/item/device/radio/intercom/hailing/west
+	PRESET_WEST
+
+/obj/item/device/radio/intercom/hailing/east
+	PRESET_EAST
+
 /obj/item/device/radio/intercom/hailing/Initialize()
 	. = ..()
 	set_frequency(HAIL_FREQ)
@@ -62,10 +141,34 @@
 /obj/item/device/radio/intercom/interrogation
 	name = "intercom (interrogation)"
 
+/obj/item/device/radio/intercom/interrogation/north
+	PRESET_NORTH
+
+/obj/item/device/radio/intercom/interrogation/south
+	PRESET_SOUTH
+
+/obj/item/device/radio/intercom/interrogation/west
+	PRESET_WEST
+
+/obj/item/device/radio/intercom/interrogation/east
+	PRESET_EAST
+
 /obj/item/device/radio/intercom/interrogation/Initialize()
 	. = ..()
 	set_frequency(1449)
 
+/obj/item/device/radio/intercom/interrogation/broadcasting/north
+	PRESET_NORTH
+
+/obj/item/device/radio/intercom/interrogation/broadcasting/south
+	PRESET_SOUTH
+
+/obj/item/device/radio/intercom/interrogation/broadcasting/west
+	PRESET_WEST
+
+/obj/item/device/radio/intercom/interrogation/broadcasting/east
+	PRESET_EAST
+
 /obj/item/device/radio/intercom/interrogation/broadcasting/Initialize() // The detainee's side.
 	. = ..()
 	set_broadcasting(TRUE)
@@ -74,6 +177,18 @@
 /obj/item/device/radio/intercom/private
 	name = "intercom (private)"
 
+/obj/item/device/radio/intercom/private/north
+	PRESET_NORTH
+
+/obj/item/device/radio/intercom/private/south
+	PRESET_SOUTH
+
+/obj/item/device/radio/intercom/private/west
+	PRESET_WEST
+
+/obj/item/device/radio/intercom/private/east
+	PRESET_EAST
+
 /obj/item/device/radio/intercom/private/Initialize()
 	. = ..()
 	set_frequency(AI_FREQ)
@@ -81,6 +196,18 @@
 /obj/item/device/radio/intercom/specops
 	name = "intercom (spec ops)"
 
+/obj/item/device/radio/intercom/specops/north
+	PRESET_NORTH
+
+/obj/item/device/radio/intercom/specops/south
+	PRESET_SOUTH
+
+/obj/item/device/radio/intercom/specops/west
+	PRESET_WEST
+
+/obj/item/device/radio/intercom/specops/east
+	PRESET_EAST
+
 /obj/item/device/radio/intercom/specops/Initialize()
 	. = ..()
 	set_frequency(ERT_FREQ)
@@ -88,6 +215,18 @@
 /obj/item/device/radio/intercom/department
 	canhear_range = 5
 
+/obj/item/device/radio/intercom/department/north
+	PRESET_NORTH
+
+/obj/item/device/radio/intercom/department/south
+	PRESET_SOUTH
+
+/obj/item/device/radio/intercom/department/west
+	PRESET_WEST
+
+/obj/item/device/radio/intercom/department/east
+	PRESET_EAST
+
 /obj/item/device/radio/intercom/department/Initialize()
 	. = ..()
 	set_broadcasting(FALSE)
@@ -96,6 +235,18 @@
 /obj/item/device/radio/intercom/department/medbay
 	name = "intercom (medical)"
 
+/obj/item/device/radio/intercom/department/medbay/north
+	PRESET_NORTH
+
+/obj/item/device/radio/intercom/department/medbay/south
+	PRESET_SOUTH
+
+/obj/item/device/radio/intercom/department/medbay/west
+	PRESET_WEST
+
+/obj/item/device/radio/intercom/department/medbay/east
+	PRESET_EAST
+
 /obj/item/device/radio/intercom/department/medbay/Initialize()
 	. = ..()
 	set_frequency(MED_I_FREQ)
@@ -104,6 +255,18 @@
 /obj/item/device/radio/intercom/department/security
 	name = "intercom (security)"
 
+/obj/item/device/radio/intercom/department/security/north
+	PRESET_NORTH
+
+/obj/item/device/radio/intercom/department/security/south
+	PRESET_SOUTH
+
+/obj/item/device/radio/intercom/department/security/west
+	PRESET_WEST
+
+/obj/item/device/radio/intercom/department/security/east
+	PRESET_EAST
+
 /obj/item/device/radio/intercom/department/security/Initialize()
 	. = ..()
 	set_frequency(SEC_I_FREQ)
@@ -116,6 +279,18 @@
 	name = "intercom (entertainment)"
 	canhear_range = 4
 
+/obj/item/device/radio/intercom/entertainment/north
+	PRESET_NORTH
+
+/obj/item/device/radio/intercom/entertainment/south
+	PRESET_SOUTH
+
+/obj/item/device/radio/intercom/entertainment/west
+	PRESET_WEST
+
+/obj/item/device/radio/intercom/entertainment/east
+	PRESET_EAST
+
 /obj/item/device/radio/intercom/entertainment/Initialize()
 	. = ..()
 	set_frequency(ENT_FREQ)
@@ -145,6 +320,18 @@
 	subspace_transmission = TRUE
 	syndie = TRUE
 
+/obj/item/device/radio/intercom/syndicate/north
+	PRESET_NORTH
+
+/obj/item/device/radio/intercom/syndicate/south
+	PRESET_SOUTH
+
+/obj/item/device/radio/intercom/syndicate/west
+	PRESET_WEST
+
+/obj/item/device/radio/intercom/syndicate/east
+	PRESET_EAST
+
 /obj/item/device/radio/intercom/syndicate/Initialize()
 	. = ..()
 	set_frequency(SYND_FREQ)
@@ -156,6 +343,18 @@
 	subspace_transmission = TRUE
 	syndie = TRUE
 
+/obj/item/device/radio/intercom/raider/north
+	PRESET_NORTH
+
+/obj/item/device/radio/intercom/raider/south
+	PRESET_SOUTH
+
+/obj/item/device/radio/intercom/raider/west
+	PRESET_WEST
+
+/obj/item/device/radio/intercom/raider/east
+	PRESET_EAST
+
 /obj/item/device/radio/intercom/syndicate/Initialize()
 	. = ..()
 	set_frequency(RAID_FREQ)
@@ -221,6 +420,18 @@
 /obj/item/device/radio/intercom/locked
     var/locked_frequency
 
+/obj/item/device/radio/intercom/locked/north
+	PRESET_NORTH
+
+/obj/item/device/radio/intercom/locked/south
+	PRESET_SOUTH
+
+/obj/item/device/radio/intercom/locked/west
+	PRESET_WEST
+
+/obj/item/device/radio/intercom/locked/east
+	PRESET_EAST
+
 /obj/item/device/radio/intercom/locked/set_frequency(var/frequency)
 	if(frequency == locked_frequency)
 		..(locked_frequency)
@@ -243,3 +454,8 @@
 /obj/item/device/radio/intercom/locked/confessional/Initialize()
 	. = ..()
 	set_frequency(1480)
+
+#undef PRESET_NORTH
+#undef PRESET_SOUTH
+#undef PRESET_WEST
+#undef PRESET_EAST

code/game/objects/items/stacks/tiles/tile_types.dm

@@ -11,7 +11,7 @@
 /obj/item/stack/tile
 	name = "tile"
 	singular_name = "tile"
-	desc = "A non-descript floor tile"
+	desc = "A non-descript floor tile."
 	w_class = ITEMSIZE_NORMAL
 	max_amount = 60
 	recyclable = TRUE
@@ -45,20 +45,6 @@
 	drop_sound = 'sound/items/drop/herb.ogg'
 	pickup_sound = 'sound/items/pickup/herb.ogg'
 
-/obj/item/stack/tile/grass_alt
-	name = "grass tile"
-	singular_name = "grass floor tile"
-	desc = "A soft patch of grass."
-	icon_state = "tile_grass_alt"
-	force = 1.0
-	throwforce = 1.0
-	throw_speed = 5
-	throw_range = 20
-	flags = 0
-	origin_tech = list(TECH_BIO = 1)
-	drop_sound = 'sound/items/drop/herb.ogg'
-	pickup_sound = 'sound/items/pickup/herb.ogg'
-
 /*
  * Wood
  */
@@ -75,43 +61,40 @@
 	drop_sound = 'sound/items/drop/wooden.ogg'
 	pickup_sound = 'sound/items/pickup/wooden.ogg'
 
-/obj/item/stack/tile/wood/coloured
-	icon_state = "tile_woodcoloured"
-
-/obj/item/stack/tile/wood/coloured/birch
+/obj/item/stack/tile/wood/birch
 	name = "birch wood floor tile"
 	color = WOOD_COLOR_BIRCH
-	build_type = /obj/item/stack/tile/wood/coloured/birch
+	build_type = /obj/item/stack/tile/wood/birch
 
-/obj/item/stack/tile/wood/coloured/mahogany
+/obj/item/stack/tile/wood/mahogany
 	name = "mahogany wood floor tile"
 	color = WOOD_COLOR_RICH
-	build_type = /obj/item/stack/tile/wood/coloured/mahogany
+	build_type = /obj/item/stack/tile/wood/mahogany
 
-/obj/item/stack/tile/wood/coloured/maple
+/obj/item/stack/tile/wood/maple
 	name = "maple wood floor tile"
 	color = WOOD_COLOR_PALE
-	build_type = /obj/item/stack/tile/wood/coloured/maple
+	build_type = /obj/item/stack/tile/wood/maple
 
-/obj/item/stack/tile/wood/coloured/bamboo
+/obj/item/stack/tile/wood/bamboo
 	name = "bamboo wood floor tile"
 	color = WOOD_COLOR_PALE2
-	build_type = /obj/item/stack/tile/wood/coloured/bamboo
+	build_type = /obj/item/stack/tile/wood/bamboo
 
-/obj/item/stack/tile/wood/coloured/ebony
+/obj/item/stack/tile/wood/ebony
 	name = "ebony wood floor tile"
 	color = WOOD_COLOR_BLACK
-	build_type = /obj/item/stack/tile/wood/coloured/ebony
+	build_type = /obj/item/stack/tile/wood/ebony
 
-/obj/item/stack/tile/wood/coloured/walnut
+/obj/item/stack/tile/wood/walnut
 	name = "walnut wood floor tile"
 	color = WOOD_COLOR_CHOCOLATE
-	build_type = /obj/item/stack/tile/wood/coloured/walnut
+	build_type = /obj/item/stack/tile/wood/walnut
 
-/obj/item/stack/tile/wood/coloured/yew
+/obj/item/stack/tile/wood/yew
 	name = "yew wood floor tile"
 	color = WOOD_COLOR_YELLOW
-	build_type = /obj/item/stack/tile/wood/coloured/yew
+	build_type = /obj/item/stack/tile/wood/yew
 
 /*
  * Carpets
@@ -205,7 +188,7 @@
 	icon_state = "tile_carpetmagenta"
 
 /obj/item/stack/tile/lino
-	name = "old linoleum"
+	name = "linoleum"
 	singular_name = "linoleum"
 	desc = "A piece of linoleum. It is the same size as a normal floor tile!"
 	icon_state = "tile_linoleum"
@@ -218,19 +201,9 @@
 	pickup_sound = 'sound/items/pickup/cloth.ogg'
 	matter = list(MATERIAL_PLASTIC = TILE_MATERIAL_AMOUNT)
 
-/obj/item/stack/tile/lino_grey
-	name = "linoleum"
-	singular_name = "linoleum"
-	desc = "A piece of linoleum. It is the same size as a normal floor tile!"
-	icon_state = "tile_linoleum_grey"
-	force = 1.0
-	throwforce = 1.0
-	throw_speed = 5
-	throw_range = 20
-	flags = 0
-	drop_sound = 'sound/items/drop/cloth.ogg'
-	pickup_sound = 'sound/items/pickup/cloth.ogg'
-	matter = list(MATERIAL_PLASTIC = TILE_MATERIAL_AMOUNT)
+/obj/item/stack/tile/lino/diamond
+	name = "diamond linoleum"
+	icon_state = "tile_linoleum_diamond"
 
 /*
  * Circuits
@@ -281,7 +254,7 @@
 	amount = max_amount
 	update_icon()
 
-/obj/item/stack/tile/floor/full
+/obj/item/stack/tile/mono
 	name = "full steel tiles"
 	desc = "A set of full steel floor tiles."
 	singular_name = "full steel tile"
@@ -293,11 +266,9 @@
 	color = COLOR_RED_GRAY
 	icon_state = "tile_white"
 
-/obj/item/stack/tile/floor_steel
-	name = "steel floor tile"
-	singular_name = "steel floor tile"
-	icon_state = "tile_steel"
-	matter = list(MATERIAL_PLASTEEL = TILE_MATERIAL_AMOUNT)
+/obj/item/stack/tile/floor/rust
+	name = "rusted steel floor tile"
+	desc = "A set of steel floor tiles. Seems to be only good for recycling."
 
 /obj/item/stack/tile/floor_white
 	name = "white floor tile"
@@ -362,16 +333,11 @@
 	matter = list(MATERIAL_DIAMOND = TILE_MATERIAL_AMOUNT)
 
 /obj/item/stack/tile/marble
-	name = "light marble floor tile"
-	singular_name = "light marble floor tile"
+	name = "marble floor tile"
+	singular_name = "marble floor tile"
 	icon_state = "tile_lightmarble"
 	matter = list(MATERIAL_MARBLE = TILE_MATERIAL_AMOUNT)
 
-/obj/item/stack/tile/marble/dark
-	name = "dark marble floor tile"
-	singular_name = "dark marble floor tile"
-	icon_state = "tile_darkmarble"
-
 /*
  * Cyborg modules
  */