Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions code/game/mecha/mech_bay.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/turf/simulated/floor/mech_bay_recharge_floor
name = "mech bay recharge station"
desc = "A spot to recharge a mecha's power cell."
icon = 'icons/mecha/mech_bay.dmi'
icon_state = "recharge_floor"

Expand Down
24 changes: 12 additions & 12 deletions code/game/objects/items/stacks/tiles/tile_mineral.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/item/stack/tile/mineral/plasma
name = "plasma tile"
singular_name = "plasma floor tile"
desc = "A tile made out of highly flammable plasma. This can only end well."
desc = "Flooring constructed from pure plasma crystal. There is absolutely nothing that can go wrong."
icon_state = "tile_plasma"
origin_tech = "plasmatech=1"
turf_type = /turf/simulated/floor/mineral/plasma
Expand All @@ -21,7 +21,7 @@
/obj/item/stack/tile/mineral/uranium
name = "uranium tile"
singular_name = "uranium floor tile"
desc = "A tile made out of uranium. You feel a bit woozy."
desc = "Flooring made from uranium. It's radioactive, IT'S RADIOACTIVE!"
icon_state = "tile_uranium"
turf_type = /turf/simulated/floor/mineral/uranium
mineralType = "uranium"
Expand All @@ -34,7 +34,7 @@ GLOBAL_LIST_INIT(gold_tile_recipes, list ( \
/obj/item/stack/tile/mineral/gold
name = "gold tile"
singular_name = "gold floor tile"
desc = "A tile made out of gold, the swag seems strong here."
desc = "Flooring made of solid gold. It's only a matter of time before someone tries to steal it."
icon_state = "tile_gold"
turf_type = /turf/simulated/floor/mineral/gold
mineralType = "gold"
Expand Down Expand Up @@ -63,7 +63,7 @@ GLOBAL_LIST_INIT(silver_tile_recipes, list ( \
/obj/item/stack/tile/mineral/silver
name = "silver tile"
singular_name = "silver floor tile"
desc = "A tile made out of silver, the light shining from it is blinding."
desc = "Flooring made of solid silver. Not quite as valuable as gold, but still very snobby to use."
icon_state = "tile_silver"
turf_type = /turf/simulated/floor/mineral/silver
mineralType = "silver"
Expand All @@ -88,7 +88,7 @@ GLOBAL_LIST_INIT(silverfancy_tile_recipes, list ( \
/obj/item/stack/tile/mineral/diamond
name = "diamond tile"
singular_name = "diamond floor tile"
desc = "A tile made out of diamond. Wow, just, wow."
desc = "Flooring made out of pure diamond. Considering the large variety of industrial and scientific uses for diamond, this seems extremely wasteful."
icon_state = "tile_diamond"
origin_tech = "materials=2"
turf_type = /turf/simulated/floor/mineral/diamond
Expand All @@ -98,7 +98,7 @@ GLOBAL_LIST_INIT(silverfancy_tile_recipes, list ( \
/obj/item/stack/tile/mineral/bananium
name = "bananium tile"
singular_name = "bananium floor tile"
desc = "A tile made out of bananium, HOOOOOOOOONK!"
desc = "Flooring constructed from pure bananium crystal. It squeaks with every step taken on it. Pressing into it causes it to HONK!"
icon_state = "tile_bananium"
turf_type = /turf/simulated/floor/mineral/bananium
mineralType = "bananium"
Expand All @@ -107,16 +107,16 @@ GLOBAL_LIST_INIT(silverfancy_tile_recipes, list ( \
/obj/item/stack/tile/mineral/tranquillite
name = "silent tile"
singular_name = "silent floor tile"
desc = "A tile made out of tranquillite, SHHHHHHHHH!"
desc = "Flooring constructed from pure tranquilite crystal. No matter how hard it is stamped on, no sound is produced."
icon_state = "tile_tranquillite"
turf_type = /turf/simulated/floor/mineral/tranquillite
mineralType = "tranquillite"
materials = list(MAT_TRANQUILLITE=500)

/obj/item/stack/tile/mineral/abductor
name = "alien floor tile"
desc = "Did we learn the secrets of building floors from an advanced alien civilization like this one?"
singular_name = "alien floor tile"
desc = "A tile made out of alien alloy."
icon = 'icons/obj/abductor.dmi'
icon_state = "tile_abductor"
origin_tech = "materials=6;abductor=1"
Expand All @@ -126,7 +126,7 @@ GLOBAL_LIST_INIT(silverfancy_tile_recipes, list ( \
/obj/item/stack/tile/mineral/titanium
name = "titanium tile"
singular_name = "titanium floor tile"
desc = "A tile made of titanium, used for shuttles."
desc = "Lightweight flooring made out of titanium, often used in spacecraft construction."
icon_state = "tile_shuttle"
turf_type = /turf/simulated/floor/mineral/titanium
mineralType = "titanium"
Expand All @@ -137,9 +137,9 @@ GLOBAL_LIST_INIT(silverfancy_tile_recipes, list ( \
icon_state = "tile_plasma"

/obj/item/stack/tile/mineral/plastitanium
name = "plas-titanium tile"
singular_name = "plas-titanium floor tile"
desc = "A tile made of plas-titanium, used for very evil shuttles."
name = "plastitanium tile"
singular_name = "plastitanium floor tile"
desc = "Evil-looking flooring made out of plastitanium. Often used for constructing military-grade spacecraft."
icon_state = "tile_darkshuttle"
turf_type = /turf/simulated/floor/mineral/plastitanium
mineralType = "plastitanium"
Expand Down
27 changes: 20 additions & 7 deletions code/game/objects/items/stacks/tiles/tile_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
/obj/item/stack/tile/carpet
name = "carpet"
singular_name = "carpet"
desc = "A piece of carpet. It is the same size as a floor tile."
desc = "Textile flooring often used to try and add more class to a room."
icon_state = "tile-carpet"
turf_type = /turf/simulated/floor/carpet
resistance_flags = FLAMMABLE
Expand All @@ -127,6 +127,7 @@

/obj/item/stack/tile/carpet/black
name = "black carpet"
desc = "Elegant black textile flooring with a gold trim around the edges."
icon_state = "tile-carpet-black"
turf_type = /turf/simulated/floor/carpet/black
table_type = /obj/structure/table/wood/fancy/black
Expand All @@ -136,6 +137,7 @@

/obj/item/stack/tile/carpet/blue
name = "blue carpet"
desc = "Blue textile flooring with a repeating white diamond pattern, and a thick white border around the edges."
icon_state = "tile-carpet-blue"
turf_type = /turf/simulated/floor/carpet/blue
table_type = /obj/structure/table/wood/fancy/blue
Expand All @@ -145,6 +147,7 @@

/obj/item/stack/tile/carpet/cyan
name = "cyan carpet"
desc = "Cyan textile flooring with a thick white border and inwards-facing tassels around the edges."
icon_state = "tile-carpet-cyan"
turf_type = /turf/simulated/floor/carpet/cyan
table_type = /obj/structure/table/wood/fancy/cyan
Expand All @@ -154,6 +157,7 @@

/obj/item/stack/tile/carpet/green
name = "green carpet"
desc = "Dark green textile flooring with intricate repeating patterns and edges woven with gold colored thread."
icon_state = "tile-carpet-green"
turf_type = /turf/simulated/floor/carpet/green
table_type = /obj/structure/table/wood/fancy/green
Expand All @@ -163,6 +167,7 @@

/obj/item/stack/tile/carpet/orange
name = "orange carpet"
desc = "Orange textile flooring with a repeating gold diamond pattern, and a thick gold border around the edges."
icon_state = "tile-carpet-orange"
turf_type = /turf/simulated/floor/carpet/orange
table_type = /obj/structure/table/wood/fancy/orange
Expand All @@ -172,6 +177,7 @@

/obj/item/stack/tile/carpet/purple
name = "purple carpet"
desc = "Regal purple textile flooring with a repeating white diamond pattern, and a thick white border around the edges."
icon_state = "tile-carpet-purple"
turf_type = /turf/simulated/floor/carpet/purple
table_type = /obj/structure/table/wood/fancy/purple
Expand All @@ -181,6 +187,7 @@

/obj/item/stack/tile/carpet/red
name = "red carpet"
desc = "Crimson textile flooring with a repeating white diamond pattern, and a thick white border around the edges."
icon_state = "tile-carpet-red"
turf_type = /turf/simulated/floor/carpet/red
table_type = /obj/structure/table/wood/fancy/red
Expand All @@ -190,6 +197,7 @@

/obj/item/stack/tile/carpet/royalblack
name = "royal black carpet"
desc = "Jet-black textile flooring with a repeating gold diamond pattern, and a thick gold border around the edges."
icon_state = "tile-carpet-royalblack"
turf_type = /turf/simulated/floor/carpet/royalblack
table_type = /obj/structure/table/wood/fancy/royalblack
Expand All @@ -201,6 +209,7 @@

/obj/item/stack/tile/carpet/royalblue
name = "royal blue carpet"
desc = "Royal blue textile flooring with a repeating gold diamond pattern, and a thick gold border around the edges."
icon_state = "tile-carpet-royalblue"
turf_type = /turf/simulated/floor/carpet/royalblue
table_type = /obj/structure/table/wood/fancy/royalblue
Expand All @@ -213,6 +222,7 @@

/obj/item/stack/tile/carpet/grimey
name = "cheap carpet"
desc = "Cheap nasty textile flooring. Close inspection shows that this carpet is full of dirt, grease, and who knows what else. Not something you want to lie down on."
icon_state = "tile-carpet-grimey"
turf_type = /turf/simulated/floor/carpet/grimey
/obj/item/stack/tile/carpet/grimey/ten
Expand All @@ -223,10 +233,10 @@

//Plasteel
/obj/item/stack/tile/plasteel
name = "floor tiles"
name = "steel floor tiles"
gender = PLURAL
singular_name = "floor tile"
desc = "Those could work as a pretty decent throwing weapon."
desc = "Mass-produced steel flooring. Cheap, robust, easy to clean, and it can be found all across the Orion arm in one form or another."
force = 6
materials = list(MAT_METAL=500)
throwforce = 10
Expand All @@ -238,6 +248,11 @@
resistance_flags = FIRE_PROOF
merge_type = /obj/item/stack/tile/plasteel

/obj/item/stack/tile/plasteel/examine(mob/user)
. = ..()
if(!is_cyborg)
. += SPAN_NOTICE("These could work as a pretty decent throwing weapon.")

/obj/item/stack/tile/plasteel/cyborg
energy_type = /datum/robot_storage/energy/metal_tile
is_cyborg = TRUE
Expand All @@ -247,7 +262,7 @@
name = "light tiles"
gender = PLURAL
singular_name = "light floor tile"
desc = "A floor tile made of glass, with an integrated light. Use a multitool on it to change its color."
desc = "Highly advanced technology that combines the functions of walking surface and area lighting. What will science think of next?"
icon_state = "tile_white"
force = 3
throwforce = 5
Expand Down Expand Up @@ -326,6 +341,7 @@

/obj/item/stack/tile/catwalk
name = "catwalk tiles"
desc = "Flooring made of a metal grid with large holes for easier inspection of cable and pipe installations."
gender = PLURAL
singular_name = "catwalk tile"
desc = "A catwalk tile. Not rated for space usage."
Expand All @@ -344,23 +360,20 @@
/obj/item/stack/tile/catwalk/grey
name = "grey catwalk tiles"
singular_name = "grey catwalk tile"
desc = "A grey catwalk tile. Not rated for space usage."
icon_state = "tile_catwalk_grey"
turf_type = /turf/simulated/floor/catwalk/grey
merge_type = /obj/item/stack/tile/catwalk/grey

/obj/item/stack/tile/catwalk/black
name = "black catwalk tiles"
singular_name = "black catwalk tile"
desc = "A black catwalk tile. Not rated for space usage."
icon_state = "tile_catwalk_black"
turf_type = /turf/simulated/floor/catwalk/black
merge_type = /obj/item/stack/tile/catwalk/black

/obj/item/stack/tile/catwalk/white
name = "white catwalk tiles"
singular_name = "white catwalk tile"
desc = "A white catwalk tile. Not rated for space usage."
icon_state = "tile_catwalk_white"
turf_type = /turf/simulated/floor/catwalk/white
merge_type = /obj/item/stack/tile/catwalk/white
Expand Down
4 changes: 3 additions & 1 deletion code/game/turfs/simulated/floor/asteroid_floors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
/turf/simulated/floor/plating/asteroid
gender = PLURAL
name = "asteroid sand"
desc = "Dusty space rock with a consistency similar to terrestrial sandstone."
baseturf = /turf/simulated/floor/plating/asteroid
icon_state = "asteroid"
icon_plating = "asteroid"
Expand Down Expand Up @@ -110,6 +111,7 @@

/turf/simulated/floor/plating/asteroid/basalt
name = "volcanic floor"
desc = "A thick layer of volcanic rock, specificially basalt."
baseturf = /turf/simulated/floor/plating/asteroid/basalt
icon_state = "basalt"
icon_plating = "basalt"
Expand Down Expand Up @@ -216,7 +218,7 @@

/turf/simulated/floor/plating/asteroid/snow
name = "snow"
desc = "Looks cold."
desc = "A cold layer of accumulated ice crystals with a consistency ranging between fluffy powder and heavy sand. As more and more snow falls, the bottom layers will eventually be compacted into solid ice."
icon = 'icons/turf/snow.dmi'
baseturf = /turf/simulated/floor/plating/asteroid/snow
icon_state = "snow"
Expand Down
2 changes: 1 addition & 1 deletion code/game/turfs/simulated/floor/chasm.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/turf/simulated/floor/chasm
name = "chasm"
desc = "Watch your step."
desc = "A hole in the ground that's so deep that you can't see the bottom. Watch your step."
baseturf = /turf/simulated/floor/chasm
icon = 'icons/turf/floors/Chasms.dmi'
icon_state = "chasms-255"
Expand Down
Loading
Loading