Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor

code/game/objects/items/stacks/telecrystal.dm

@@ -0,0 +1,20 @@
+/obj/item/stack/telecrystal
+	name = "telecrystal"
+	desc = "It seems to be pulsing with suspiciously enticing energies."
+	description_antag = "Telecrystals can be activated by utilizing them on devices with an actively running uplink. They will not activate on unactivated uplinks."
+	singular_name = "telecrystal"
+	icon = 'icons/obj/telescience.dmi'
+	icon_state = "telecrystal"
+	w_class = 1
+	max_amount = 50
+	flags = NOBLUDGEON
+	origin_tech = "materials=6;syndicate=1"
+
+/obj/item/stack/telecrystal/afterattack(var/obj/item/I as obj, mob/user as mob, proximity)
+	if(!proximity)
+		return
+	if(istype(I, /obj/item))
+		if(I.hidden_uplink && I.hidden_uplink.active) //No metagaming by using this on every PDA around just to see if it gets used up.
+			I.hidden_uplink.uses +=1
+			use(1)
+			user << "<span class='notice'>You slot the [src] into the [I] and charge its internal uplink.</span>"

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

@@ -1,48 +0,0 @@
-#define LIGHTFLOOR_ON 1
-#define LIGHTFLOOR_WHITE 2
-#define LIGHTFLOOR_RED 3
-#define LIGHTFLOOR_GREEN 4
-#define LIGHTFLOOR_YELLOW 5
-#define LIGHTFLOOR_BLUE 6
-#define LIGHTFLOOR_PURPLE 7
-
-/obj/item/stack/tile/light
-	name = "light tiles"
-	gender = PLURAL
-	singular_name = "light floor tile"
-	desc = "A floor tile, made out off glass. Use a multitool on it to change its color."
-	icon_state = "tile_light blue"
-	force = 3
-	throwforce = 5
-	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed")
-	var/on = 1
-	var/state = LIGHTFLOOR_ON
-
-/obj/item/stack/tile/light/proc/color_desc()
-	switch(state)
-		if(LIGHTFLOOR_ON) return "light blue"
-		if(LIGHTFLOOR_WHITE) return "white"
-		if(LIGHTFLOOR_RED) return "red"
-		if(LIGHTFLOOR_GREEN) return "green"
-		if(LIGHTFLOOR_YELLOW) return "yellow"
-		if(LIGHTFLOOR_BLUE) return "dark blue"
-		if(LIGHTFLOOR_PURPLE) return "purple"
-		else return "broken"
-
-/obj/item/stack/tile/light/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
-	..()
-	if(istype(O,/obj/item/weapon/crowbar))
-		new/obj/item/stack/sheet/metal(user.loc)
-		amount--
-		new/obj/item/stack/light_w(user.loc)
-		if(amount <= 0)
-			user.unEquip(src, 1)
-			del(src)
-	else if(istype(O,/obj/item/device/multitool))
-		state++
-		if(state>LIGHTFLOOR_PURPLE) state=LIGHTFLOOR_ON
-		icon_state="tile_"+color_desc()
-		user << "[src] is now "+color_desc()
-
-	return ..()
-	

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

@@ -1,25 +0,0 @@
-/obj/item/stack/tile/plasteel
-	name = "floor tiles"
-	gender = PLURAL
-	singular_name = "floor tile"
-	desc = "Those could work as a pretty decent throwing weapon"
-	icon_state = "tile"
-	force = 6
-	materials = list(MAT_METAL=500)
-	throwforce = 10
-	throw_speed = 3
-	throw_range = 7
-
-/obj/item/stack/tile/plasteel/New(var/loc, var/amount=null)
-	..()
-	src.pixel_x = rand(1, 14)
-	src.pixel_y = rand(1, 14)
-	return
-
-/obj/item/stack/tile/plasteel/proc/build(turf/S as turf)
-	if (istype(S,/turf/space))
-		S.ChangeTurf(/turf/simulated/floor/plating/airless)
-	else
-		S.ChangeTurf(/turf/simulated/floor/plating)
-	return
-	

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

@@ -3,6 +3,11 @@
  *		Grass
  *		Wood
  *		Carpet
+ *		Plasteel
+ *		Light
+ *		Fakespace
+ *		High-traction
+ \\ If you don't update the contains list, I'm going to shank you
  */
 /obj/item/stack/tile
 	name = "broken tile"
@@ -18,6 +23,8 @@
 	throw_range = 20
 	max_amount = 60
 	flags = CONDUCT
+	var/turf_type = null
+	var/mineralType = null
 
 /*
  * Grass
@@ -29,6 +36,7 @@
 	desc = "A patch of grass like they often use on golf courses"
 	icon_state = "tile_grass"
 	origin_tech = "biotech=1"
+	turf_type = /turf/simulated/floor/grass
 
 /*
  * Wood
@@ -39,6 +47,7 @@
 	singular_name = "wood floor tile"
 	desc = "an easy to fit wood floor tile"
 	icon_state = "tile-wood"
+	turf_type = /turf/simulated/floor/wood
 
 /*
  * Carpets
@@ -48,3 +57,62 @@
 	singular_name = "carpet"
 	desc = "A piece of carpet. It is the same size as a floor tile"
 	icon_state = "tile-carpet"
+	turf_type = /turf/simulated/floor/carpet
+
+/*
+ * Plasteel
+ */
+/obj/item/stack/tile/plasteel
+	name = "floor tiles"
+	gender = PLURAL
+	singular_name = "floor tile"
+	desc = "Those could work as a pretty decent throwing weapon."
+	icon_state = "tile"
+	force = 6
+	materials = list(MAT_METAL=500)
+	throwforce = 10
+	throw_speed = 3
+	throw_range = 7
+	flags = CONDUCT
+	turf_type = /turf/simulated/floor/plasteel
+	mineralType = "metal"
+
+/*
+ * Light
+ */
+/obj/item/stack/tile/light
+	name = "light tiles"
+	gender = PLURAL
+	singular_name = "light floor tile"
+	desc = "A floor tile, made out off glass. Use a multitool on it to change its color."
+	icon_state = "tile_light blue"
+	force = 3
+	throwforce = 5
+	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed")
+	turf_type = /turf/simulated/floor/light
+
+/*
+ * Fakespace
+ */
+/obj/item/stack/tile/fakespace
+	name = "astral carpet"
+	singular_name = "astral carpet"
+	desc = "A piece of carpet with a convincing star pattern."
+	icon_state = "tile_space"
+	turf_type = /turf/simulated/floor/fakespace
+
+/obj/item/stack/tile/fakespace/loaded
+	amount = 30
+
+//High-traction
+/obj/item/stack/tile/noslip
+	name = "high-traction floor tile"
+	singular_name = "high-traction floor tile"
+	desc = "A high-traction floor tile. It feels rubbery in your hand."
+	icon_state = "tile_noslip"
+	turf_type = /turf/simulated/floor/noslip
+	origin_tech = "materials=3"
+
+/obj/item/stack/tile/noslip/loaded
+	amount = 20
+