cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 14:31:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds some new tile types, grates. Fixes #3332 (#8263)

Browse Source 
This pr adds some assets that are not mapped in yet, but are to be used in future projects among other things.

Added a new type of linoleum, rubber carpets, dark/light metal grates. Added some proper footramp damaged states.
Makes blue/green (circuit/strata) tiles craftable somehow like requested here, though via autolathe instead.
Blown up footramps will no longer result in a 'Fix me!' icon appearing.
This commit is contained in:
fernerr
2020-02-17 20:42:05 +01:00
committed by GitHub
parent e9637672b1
commit 6dd1fbda22
12 changed files with 196 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/rods.dm
+2
View File
@@ -1,6 +1,8 @@
var/global/list/datum/stack_recipe/rod_recipes = list(
new /datum/stack_recipe("grille", /obj/structure/grille, 2, time = 10, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("floor-mounted catwalk", /obj/structure/lattice/catwalk/indoor, 4, time = 10, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("grate, dark", /obj/structure/lattice/catwalk/indoor/grate, 4, time = 10, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("grate, light", /obj/structure/lattice/catwalk/indoor/grate/light, 4, time = 10, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("mine track", /obj/structure/track, 3, time = 10, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("cane", /obj/item/cane, 1, time = 6),
new /datum/stack_recipe("crowbar", /obj/item/crowbar, 1, time = 6),
code/game/objects/items/stacks/tiles/tile_types.dm
+84 -2
View File
@@ -43,7 +43,7 @@
name = "wood floor tile"
singular_name = "wood floor tile"
desc = "An easy to fit wooden floor tile."
icon_state = "tile-wood"
icon_state = "tile_wood"
force = 1.0
throwforce = 1.0
throw_speed = 5
@@ -58,7 +58,7 @@
name = "carpet"
singular_name = "carpet"
desc = "A piece of carpet. It is the same size as a normal floor tile!"
icon_state = "tile-carpet"
icon_state = "tile_carpet"
force = 1.0
throwforce = 1.0
throw_speed = 5
@@ -66,6 +66,88 @@
flags = 0
drop_sound = 'sound/items/drop/clothing.ogg'
/obj/item/stack/tile/carpet_blue
name = "blue carpet"
singular_name = "carpet"
desc = "A piece of carpet. It is the same size as a normal floor tile!"
icon_state = "tile_carpet_blue"
force = 1.0
throwforce = 1.0
throw_speed = 5
throw_range = 20
flags = 0
drop_sound = 'sound/items/drop/clothing.ogg'
/obj/item/stack/tile/carpet_rubber
name = "rubber carpet"
singular_name = "carpet"
desc = "A piece of rubber carpet. It is the same size as a normal floor tile!"
icon_state = "tile_carpet_rubber"
force = 1.0
throwforce = 1.0
throw_speed = 5
throw_range = 20
flags = 0
drop_sound = 'sound/items/drop/clothing.ogg'
/obj/item/stack/tile/lino
name = "old linoleum"
singular_name = "linoleum"
desc = "A piece of linoleum. It is the same size as a normal floor tile!"
icon_state = "tile_linoleum"
force = 1.0
throwforce = 1.0
throw_speed = 5
throw_range = 20
flags = 0
drop_sound = 'sound/items/drop/clothing.ogg'
matter = list("plastic" = 937.5)
/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/clothing.ogg'
matter = list("plastic" = 937.5)
/*
* Circuits
*/
/obj/item/stack/tile/circuit_blue
name = "circuit tile"
singular_name = "circuit tile"
desc = "An advanced tile covered in various circuitry and wiring."
icon_state = "tile_bcircuit"
force = 6.0
matter = list(DEFAULT_WALL_MATERIAL = 937.5,"glass" = 937.5)
throwforce = 15.0
throw_speed = 5
throw_range = 20
flags = CONDUCT
/obj/item/stack/tile/circuit_green
name = "circuit tile"
singular_name = "circuit tile"
desc = "An advanced tile covered in various circuitry and wiring."
icon_state = "tile_gcircuit"
force = 6.0
matter = list(DEFAULT_WALL_MATERIAL = 937.5,"glass" = 937.5)
throwforce = 15.0
throw_speed = 5
throw_range = 20
flags = CONDUCT
/*
* Floors
*/
/obj/item/stack/tile/floor
name = "floor tile"
singular_name = "floor tile"