diff --git a/code/game/objects/effects/decals/vgdecals.dm b/code/game/objects/effects/decals/vgdecals.dm new file mode 100644 index 0000000000..93db0075c8 --- /dev/null +++ b/code/game/objects/effects/decals/vgdecals.dm @@ -0,0 +1,119 @@ +// Full credit goes to VG station for these assets. https://github.com/vgstation-coders/vgstation13 +// All items in this .dm and the associated .dmi were made by VG station and all credit should go to them. + +// -<| IMPORTANT MAPPER NOTE |>- +// Change the 'color' variable on any white sprite to simply recolour it! + +/obj/effect/turf_decal/vg_decals + icon = 'icons/turf/vgstation_decals.dmi' + icon_state = "no" + +// NUMBERS START + +/obj/effect/turf_decal/vg_decals/numbers + icon_state = "no" + +/obj/effect/turf_decal/vg_decals/numbers/one + icon_state = "1" + +/obj/effect/turf_decal/vg_decals/numbers/two + icon_state = "2" + +/obj/effect/turf_decal/vg_decals/numbers/three + icon_state = "3" + +/obj/effect/turf_decal/vg_decals/numbers/four + icon_state = "4" + +/obj/effect/turf_decal/vg_decals/numbers/five + icon_state = "5" + +/obj/effect/turf_decal/vg_decals/numbers/six + icon_state = "6" + +/obj/effect/turf_decal/vg_decals/numbers/seven + icon_state = "7" + +/obj/effect/turf_decal/vg_decals/numbers/eight + icon_state = "8" + +/obj/effect/turf_decal/vg_decals/numbers/nine + icon_state = "9" + +/obj/effect/turf_decal/vg_decals/numbers/zero + icon_state = "0" + +// NUMBERS END + +// ATMOS START + +/obj/effect/turf_decal/vg_decals/atmos + icon_state = "no" + +/obj/effect/turf_decal/vg_decals/atmos/oxygen + icon_state = "oxygen" + +/obj/effect/turf_decal/vg_decals/atmos/carbon_dioxide + icon_state = "carbon_dioxide" + +/obj/effect/turf_decal/vg_decals/atmos/nitrogen + icon_state = "nitrogen" + +/obj/effect/turf_decal/vg_decals/atmos/air + icon_state = "air" + +/obj/effect/turf_decal/vg_decals/atmos/nitrous_oxide + icon_state = "nitrous_oxide" + +/obj/effect/turf_decal/vg_decals/atmos/plasma + icon_state = "plasma" + +/obj/effect/turf_decal/vg_decals/atmos/mix + icon_state = "mix" + +// ATMOS END + +// DEPARTMENT START + +/obj/effect/turf_decal/vg_decals/department/hop + icon_state = "hop" + +/obj/effect/turf_decal/vg_decals/department/bar + icon_state = "bar" + +/obj/effect/turf_decal/vg_decals/department/cargo + icon_state = "cargo" + +/obj/effect/turf_decal/vg_decals/department/med + icon_state = "med" + +/obj/effect/turf_decal/vg_decals/department/sci + icon_state = "sci" + +/obj/effect/turf_decal/vg_decals/department/sec + icon_state = "sec" + +/obj/effect/turf_decal/vg_decals/department/mining + icon_state = "mine" + +/obj/effect/turf_decal/vg_decals/department/zoo + icon_state = "zoo" + +// DEPARTMENT END + +// MISC START + +/obj/effect/turf_decal/vg_decals/no + icon = 'icons/turf/vgstation_decals.dmi' + icon_state = "no" + +/obj/effect/turf_decal/vg_decals/radiation_huge + icon_state = "radiation_huge" + +/obj/effect/turf_decal/vg_decals/radiation + icon_state = "radiation" + +/obj/effect/turf_decal/vg_decals/radiation_custom + icon_state = "radiation-w" + +// MISC END diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 51f5349f81..b0aad8b498 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -368,6 +368,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \ new/datum/stack_recipe("towel", /obj/item/reagent_containers/rag/towel, 3), \ new/datum/stack_recipe("bedsheet", /obj/item/bedsheet, 3), \ new/datum/stack_recipe("empty sandbag", /obj/item/emptysandbag, 4), \ + new/datum/stack_recipe("padded floor tile", /obj/item/stack/tile/padded, 1, 4, 20), \ null, \ new/datum/stack_recipe("fingerless gloves", /obj/item/clothing/gloves/fingerless, 1),\ new/datum/stack_recipe("white gloves", /obj/item/clothing/gloves/color/white, 1),\ diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 2e537d3eff..ff81b4340a 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -142,6 +142,14 @@ turf_type = /turf/open/floor/wood resistance_flags = FLAMMABLE +//Cloth Floors + +/obj/item/stack/tile/padded + name = "padded floor tile" + desc = "These are soft and cushy, they'd make good pillows. They look very comfortable, although what they're used for is discomforting." + icon_state = "tile_padded" + turf_type = /turf/open/floor/padded + //Basalt /obj/item/stack/tile/basalt name = "basalt tile" diff --git a/code/game/objects/structures/signs/signs_departments.dm b/code/game/objects/structures/signs/signs_departments.dm index 12932bbab6..b4fd823e76 100644 --- a/code/game/objects/structures/signs/signs_departments.dm +++ b/code/game/objects/structures/signs/signs_departments.dm @@ -60,6 +60,11 @@ desc = "A sign labelling a restroom." icon_state = "restroom" +/obj/structure/sign/departments/showers + name ="\improper SHOWER" + desc = "A sign labelling showers." + icon_state = "showerroom" + /obj/structure/sign/departments/medbay name = "\improper MEDBAY" desc = "The Intergalactic symbol of Medical institutions. You'll probably get help here." diff --git a/code/game/objects/structures/signs/signs_maps.dm b/code/game/objects/structures/signs/signs_maps.dm index 1e3bfd6d36..ee29ef7443 100644 --- a/code/game/objects/structures/signs/signs_maps.dm +++ b/code/game/objects/structures/signs/signs_maps.dm @@ -55,3 +55,18 @@ name = "cafe" desc = "A direction sign, pointing out which way the Cafe is." icon_state = "direction_cafe" + +obj/structure/sign/directions/rooms + name = "room" + desc = "Room numbers, helps others find you!" + icon_state = "roomnum" + +obj/structure/sign/directions/dorms + name = "dorm" + desc = "Dorm numbers, help others find you, or you find others." + icon_state = "dormnum" + +obj/structure/sign/directions/cells + name = "room" + desc = "So the less fortunate amongst us know where they'll be staying." + icon_state = "cellnum" diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm index f75772a230..f6e70f8ef5 100644 --- a/code/game/turfs/simulated/floor/misc_floor.dm +++ b/code/game/turfs/simulated/floor/misc_floor.dm @@ -260,3 +260,10 @@ icon = 'icons/obj/clockwork_objects.dmi' icon_state = "clockwork_floor" floor_tile = /obj/item/stack/tile/bronze + +/turf/open/floor/padded + name = "padded floor" + desc = "Keeps crazy people from hurting themselves. It's soft, plush, and very nice to get shoved agaisnt." + icon = 'icons/turf/floors.dmi' + icon_state = "floor_padded" + floor_tile = /obj/item/stack/tile/padded diff --git a/code/game/turfs/simulated/floor/plasteel_floor.dm b/code/game/turfs/simulated/floor/plasteel_floor.dm index a3a92e7898..af48160ef1 100644 --- a/code/game/turfs/simulated/floor/plasteel_floor.dm +++ b/code/game/turfs/simulated/floor/plasteel_floor.dm @@ -68,6 +68,9 @@ /turf/open/floor/plasteel/chapel icon_state = "chapel" +/turf/open/floor/plasteel/chapel_floor + icon_state = "chapel_alt" + /turf/open/floor/plasteel/showroomfloor icon_state = "showroomfloor" diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi index 3d382d25b3..7ed9244ea4 100644 Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ diff --git a/icons/obj/tiles.dmi b/icons/obj/tiles.dmi index 2de24e2499..09568ebea1 100644 Binary files a/icons/obj/tiles.dmi and b/icons/obj/tiles.dmi differ diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi index 87d5e88cc9..c8675209c4 100644 Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ diff --git a/icons/turf/vgstation_decals.dmi b/icons/turf/vgstation_decals.dmi new file mode 100644 index 0000000000..4f9d52c0cd Binary files /dev/null and b/icons/turf/vgstation_decals.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 8187a4db16..11e0946291 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -847,6 +847,7 @@ #include "code\game\objects\effects\decals\decal.dm" #include "code\game\objects\effects\decals\misc.dm" #include "code\game\objects\effects\decals\remains.dm" +#include "code\game\objects\effects\decals\vgdecals.dm" #include "code\game\objects\effects\decals\cleanable\aliens.dm" #include "code\game\objects\effects\decals\cleanable\gibs.dm" #include "code\game\objects\effects\decals\cleanable\humans.dm"