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

code/game/objects/structures/decor/decor.dm

@@ -0,0 +1,7 @@
+// The purpose of "Decor" structures is to look like pre-existing objects without having functionality
+
+/obj/structure/decor
+	name = "Non-existent Decor"
+	desc = "Yell at a coder!"
+	anchored = TRUE
+	density = TRUE

code/game/objects/structures/decor/machinery/telecomms.dm

@@ -0,0 +1,23 @@
+/obj/structure/decor/machinery/telecomms/processor
+	name = "Processor Unit"
+	icon = 'icons/obj/stationobjs.dmi'
+	icon_state = "processor"
+	desc = "This machine is used to process large quantities of information."
+
+/obj/structure/decor/machinery/telecomms/hub
+	name = "Telecommunication Hub"
+	icon = 'icons/obj/stationobjs.dmi'
+	icon_state = "hub"
+	desc = "A mighty piece of hardware used to send/receive massive amounts of data."
+
+/obj/structure/decor/machinery/telecomms/server
+	name = "Telecommunication Server"
+	icon = 'icons/obj/stationobjs.dmi'
+	icon_state = "comm_server"
+	desc = "A machine used to store data and network statistics."
+
+/obj/structure/decor/machinery/telecomms/relay
+	name = "Telecommunication Relay"
+	icon = 'icons/obj/stationobjs.dmi'
+	icon_state = "relay"
+	desc = "A mighty piece of hardware used to send massive amounts of data far away."