diff --git a/code/game/turfs/flooring/flooring_decals.dm b/code/game/turfs/flooring/flooring_decals.dm index c87f9769d25..6b591024176 100644 --- a/code/game/turfs/flooring/flooring_decals.dm +++ b/code/game/turfs/flooring/flooring_decals.dm @@ -4,7 +4,7 @@ /obj/effect/floor_decal name = "floor decal" - icon = 'icons/turf/flooring/decals.dmi' + icon = 'icons/turf/decals/decals.dmi' layer = TURF_LAYER + 0.01 var/supplied_dir @@ -699,20 +699,14 @@ /obj/effect/floor_decal/sign/srg icon_state = "white_srg" -// the big SCC logo -/obj/effect/floor_decal/scc_full - name = "full SCC logo" - icon = 'icons/turf/flooring/scc_decal_preview.dmi' - icon_state = "scc_decal_preview" +// Big Floor Decals +/obj/effect/floor_decal/big + name = "big floor decal" - var/list/decals = list( - "0,0", "1,0", "2,0", "3,0", "4,0", - "0,1", "1,1", "2,1", "3,1", "4,1", - "0,2", "1,2", "2,2", "3,2","4,2", - "0,3", "2,3", "4,3" - ) + var/decal_path + var/list/decals -/obj/effect/floor_decal/scc_full/Initialize() +/obj/effect/floor_decal/big/Initialize() ..() for(var/coordinate in decals) var/list/split_coordinate = splittext(coordinate, ",") @@ -721,10 +715,46 @@ decal_turf = get_step(decal_turf, EAST) for(var/i = 1 to text2num(split_coordinate[2])) decal_turf = get_step(decal_turf, NORTH) - new /obj/effect/floor_decal/scc(decal_turf, null, null, FALSE, coordinate) + new decal_path(decal_turf, null, null, FALSE, coordinate) return INITIALIZE_HINT_QDEL +// SCC Preview +/obj/effect/floor_decal/big/scc_full + name = "full 5x4 SCC logo" + icon = 'icons/turf/decals/big/scc_5x4_preview.dmi' + icon_state = "scc_preview" + + decal_path = "/obj/effect/floor_decal/scc" + decals = list( + "0,0", "1,0", "2,0", "3,0", "4,0", + "0,1", "1,1", "2,1", "3,1", "4,1", + "0,2", "1,2", "2,2", "3,2", "4,2", + "0,3", "2,3", "4,3" + ) + +// SCC /obj/effect/floor_decal/scc - name = "\improper SCC logo" - icon = 'icons/turf/flooring/scc_decals.dmi' + name = "\improper 5x4 SCC logo" + icon = 'icons/turf/decals/big/scc_5x4.dmi' icon_state = "0,0" + +// Sol Preview +/obj/effect/floor_decal/big/sol_full + name = "full 5x5 Sol Alliance logo" + icon = 'icons/turf/decals/big/sol_5x5_preview.dmi' + icon_state = "sol_preview" + + decal_path = "/obj/effect/floor_decal/sol" + decals = list( + "0,0", "1,0", "2,0", "3,0", "4,0", + "0,1", "1,1", "2,1", "3,1", "4,1", + "0,2", "1,2", "2,2", "3,2", "4,2", + "0,3", "1,3", "2,3", "3,3", "4,3", + "0,4", "1,4", "2,4", "3,4", "4,4" + ) + +// Sol +/obj/effect/floor_decal/sol + name = "\improper 5x5 Sol Alliance logo" + icon = 'icons/turf/decals/big/sol_5x5.dmi' + icon_state = "0,0" \ No newline at end of file diff --git a/code/modules/maps/planet_types/barren.dm b/code/modules/maps/planet_types/barren.dm index b954cc02c67..3a939a90ea2 100644 --- a/code/modules/maps/planet_types/barren.dm +++ b/code/modules/maps/planet_types/barren.dm @@ -43,7 +43,7 @@ /turf/simulated/floor/exoplanet/barren/update_icon() overlays.Cut() if(prob(20)) - overlays += image('icons/turf/flooring/decals.dmi', "asteroid[rand(0,9)]") + overlays += image('icons/turf/decals/decals.dmi', "asteroid[rand(0,9)]") /turf/simulated/floor/exoplanet/barren/Initialize() . = ..() diff --git a/html/changelogs/sol_floor_decals.yml b/html/changelogs/sol_floor_decals.yml new file mode 100644 index 00000000000..d72704f7a3a --- /dev/null +++ b/html/changelogs/sol_floor_decals.yml @@ -0,0 +1,6 @@ +author: SleepyGemmy + +delete-after: True + +changes: + - rscadd: "Adds some Sol floor decals to the code." \ No newline at end of file diff --git a/icons/turf/flooring/scc_decals.dmi b/icons/turf/decals/big/scc_5x4.dmi similarity index 100% rename from icons/turf/flooring/scc_decals.dmi rename to icons/turf/decals/big/scc_5x4.dmi diff --git a/icons/turf/flooring/scc_decal_preview.dmi b/icons/turf/decals/big/scc_5x4_preview.dmi similarity index 75% rename from icons/turf/flooring/scc_decal_preview.dmi rename to icons/turf/decals/big/scc_5x4_preview.dmi index c2c0b6bb451..c721cb1094c 100644 Binary files a/icons/turf/flooring/scc_decal_preview.dmi and b/icons/turf/decals/big/scc_5x4_preview.dmi differ diff --git a/icons/turf/decals/big/sol_5x5.dmi b/icons/turf/decals/big/sol_5x5.dmi new file mode 100644 index 00000000000..c3738fb9a3c Binary files /dev/null and b/icons/turf/decals/big/sol_5x5.dmi differ diff --git a/icons/turf/decals/big/sol_5x5_preview.dmi b/icons/turf/decals/big/sol_5x5_preview.dmi new file mode 100644 index 00000000000..3ab25c0f86e Binary files /dev/null and b/icons/turf/decals/big/sol_5x5_preview.dmi differ diff --git a/icons/turf/flooring/decals.dmi b/icons/turf/decals/decals.dmi similarity index 100% rename from icons/turf/flooring/decals.dmi rename to icons/turf/decals/decals.dmi diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm index f1c1742dd31..cdc5e897074 100644 --- a/maps/aurora/aurora-6_surface.dmm +++ b/maps/aurora/aurora-6_surface.dmm @@ -3252,7 +3252,7 @@ /obj/effect/floor_decal/corner/blue{ dir = 10 }, -/obj/effect/floor_decal/scc_full, +/obj/effect/floor_decal/big/scc_full, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/fore) "cDq" = ( diff --git a/maps/event/idris_cruise/idris_cruise-1.dmm b/maps/event/idris_cruise/idris_cruise-1.dmm index c9a0047c2f4..6ec4c9ac42a 100644 --- a/maps/event/idris_cruise/idris_cruise-1.dmm +++ b/maps/event/idris_cruise/idris_cruise-1.dmm @@ -8704,7 +8704,7 @@ }, /area/cruise/central) "gML" = ( -/obj/effect/floor_decal/scc_full, +/obj/effect/floor_decal/big/scc_full, /turf/unsimulated/floor{ icon_state = "wood_cherry" }, diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm index 42bd594f892..4d4acc02809 100644 --- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm +++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm @@ -6941,7 +6941,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/scc_full, +/obj/effect/floor_decal/big/scc_full, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/central)