diff --git a/code/game/objects/structures/signs_vr.dm b/code/game/objects/structures/signs_vr.dm index d786560142c..f9390371600 100644 --- a/code/game/objects/structures/signs_vr.dm +++ b/code/game/objects/structures/signs_vr.dm @@ -8,4 +8,58 @@ name = "decorative fire axe cabinet" desc = "A fancy decorative indent in the wall, with an axe inside. The axe is actually a part of the indent and cannot be removed. A nostalgic reminder of older times of firefighting." icon_state = "fireaxe1000" - icon = 'icons/obj/closet.dmi' \ No newline at end of file + icon = 'icons/obj/closet.dmi' + +//Small Signs for detailing +/obj/structure/sign/small/fire/small + icon = 'icons/obj/decals.dmi' + name = "\improper DANGER: FIRE" + desc = "A warning sign which reads 'DANGER: FIRE'." + icon_state = "fire_small" + +/obj/structure/sign/small/nosmoking + name = "\improper NO SMOKING" + desc = "A warning sign which reads 'NO SMOKING'." + icon_state = "nosmoking_small" + +/obj/structure/sign/small/nosmoking + name = "\improper DESIGNATED SMOKING AREA" + desc = "A warning sign which reads 'DESIGNATED SMOKING AREA'." + icon_state = "smoking_small" + +/obj/structure/sign/small/warning + name = "\improper WARNING" + desc = "" //Null description + icon_state = "warning_small" + +/obj/structure/sign/small/warning/high_voltage + name = "\improper HIGH VOLTAGE" + icon_state = "shock_small" + +/obj/structure/sign/small/warning/radioactive + name = "\improper RADIOACTIVE AREA" + icon_state = "radiation_small" + +/obj/structure/sign/small/warning/caution + name = "\improper CAUTION" + icon_state = "caution_small" + +/obj/structure/sign/small/warning/server_room + name = "\improper SERVER ROOM" + icon_state = "server_small" + +/obj/structure/sign/small/warning/secure_area + name = "\improper SECURE AREA" + icon_state = "securearea_small" + +/obj/structure/sign/small/warning/vacuum + name = "\improper HARD VACUUM AHEAD" + icon_state = "space_small" + +/obj/structure/sign/small/warning/pods + name = "\improper ESCAPE PODS" + icon_state = "pods" + +/obj/structure/sign/small/warning/emerg_only + name = "\improper EMERGENCY USE ONLY" + icon_state = "emerg_small" \ No newline at end of file diff --git a/code/game/turfs/flooring/flooring_decals.dm b/code/game/turfs/flooring/flooring_decals.dm index b420e9e73ef..fd3cfcf1d44 100644 --- a/code/game/turfs/flooring/flooring_decals.dm +++ b/code/game/turfs/flooring/flooring_decals.dm @@ -518,21 +518,23 @@ var/list/floor_decals = list() /obj/effect/floor_decal/spline/plain name = "spline - plain" icon_state = "spline_plain" +/obj/effect/floor_decal/spline/plain/corner + icon_state = "spline_plain_corner" +/obj/effect/floor_decal/spline/plain/cee + icon_state = "spline_plain_cee" +/obj/effect/floor_decal/spline/plain/three_quarters + icon_state = "spline_plain_full" /obj/effect/floor_decal/spline/fancy name = "spline - fancy" icon_state = "spline_fancy" - /obj/effect/floor_decal/spline/fancy/wood name = "spline - wood" color = "#CB9E04" - /obj/effect/floor_decal/spline/fancy/wood/corner icon_state = "spline_fancy_corner" - /obj/effect/floor_decal/spline/fancy/wood/cee icon_state = "spline_fancy_cee" - /obj/effect/floor_decal/spline/fancy/wood/three_quarters icon_state = "spline_fancy_full" @@ -593,6 +595,10 @@ var/list/floor_decals = list() name = "grey outline" color = "#808080" +/obj/effect/floor_decal/industrial/outline/red + name = "red outline" + color = COLOR_RED + /obj/effect/floor_decal/industrial/loading name = "loading area" icon_state = "loadingarea" diff --git a/code/game/turfs/flooring/flooring_decals_vr.dm b/code/game/turfs/flooring/flooring_decals_vr.dm index 80b26db2e5d..c7518960110 100644 --- a/code/game/turfs/flooring/flooring_decals_vr.dm +++ b/code/game/turfs/flooring/flooring_decals_vr.dm @@ -8,9 +8,6 @@ icon = 'icons/turf/stomach_vr.dmi' icon_state = "c_flesh_floor_edges" -/obj/effect/floor_decal/industrial/outline/red - name = "red outline" - color = COLOR_RED /obj/effect/floor_decal/borderfloor/shifted icon_state = "borderfloor_shifted" @@ -232,3 +229,238 @@ icon_state = "mss_green_corner" /obj/effect/floor_decal/milspec_sterile/green/half icon_state = "mss_green_side" + +//Shuttle Floor Decals +/obj/effect/floor_decal/shuttle + name = "partial outline" + icon_state = "semi_outline" +/obj/effect/floor_decal/shuttle/yellow + color = "#CFCF55" +/obj/effect/floor_decal/shuttle/grey + color = "#545253" +/obj/effect/floor_decal/shuttle/blue + color = "#00B8B2" + +/obj/effect/floor_decal/shuttle/handicap + name = "handicap marker" + icon_state = "handicap" +/obj/effect/floor_decal/shuttle/handicap/yellow + color = "#CFCF55" +/obj/effect/floor_decal/shuttle/handicap/grey + color = "#545253" + +/obj/effect/floor_decal/shuttle/loading + name = "loading/unloading marker" + icon_state = "exit_and_entrance" +/obj/effect/floor_decal/shuttle/loading/yellow + color = "#CFCF55" +/obj/effect/floor_decal/shuttle/loading/grey + color = "#545253" +/obj/effect/floor_decal/shuttle/loading/red + color = "#a70000" + +/obj/effect/floor_decal/shuttle/full_2 + name = "hatched marker" + icon_state = "full_2" +/obj/effect/floor_decal/shuttle/full_2/yellow + color = "#CFCF55" +/obj/effect/floor_decal/shuttle/full_2/grey + color = "#545253" +/obj/effect/floor_decal/shuttle/full_2/blue + color = "#00B8B2" + +//Industrial Floor Decals +/obj/effect/floor_decal/industrial/warning + name = "hazard stripes" + icon_state = "warning" +/obj/effect/floor_decal/industrial/warning/corner + icon_state = "warningcorner" +/obj/effect/floor_decal/industrial/warning/full + icon_state = "warningfull" +/obj/effect/floor_decal/industrial/warning/cee + icon_state = "warningcee" +/obj/effect/floor_decal/industrial/warning/tile + icon_state = "warningtile" + +/obj/effect/floor_decal/industrial/warning/dust + icon_state = "warning_dust" +/obj/effect/floor_decal/industrial/warning/dust/corner + icon_state = "warningcorner_dust" +/obj/effect/floor_decal/industrial/warning/dust/full + icon_state = "warningfull_dust" +/obj/effect/floor_decal/industrial/warning/dust/cee + icon_state = "warningcee_dust" +/obj/effect/floor_decal/industrial/warning/dust/tile + icon_state = "warningtile_dust" + +/obj/effect/floor_decal/industrial/danger + name = "danger stripes" + icon_state = "danger" +/obj/effect/floor_decal/industrial/danger/corner + icon_state = "dangercorner" +/obj/effect/floor_decal/industrial/danger/full + icon_state = "dangerfull" +/obj/effect/floor_decal/industrial/danger/cee + icon_state = "dangercee" + +/obj/effect/floor_decal/industrial/hatch + name = "hatched marking" + icon_state = "delivery" +/obj/effect/floor_decal/industrial/hatch/blue + color = "#00B8B2" +/obj/effect/floor_decal/industrial/hatch/yellow + color = "#CFCF55" +/obj/effect/floor_decal/industrial/hatch/grey + color = "#545253" +/obj/effect/floor_decal/industrial/hatch/red + color = "#a70000" + +/obj/effect/floor_decal/industrial/rad_floor + name = "radiation marking" + icon_state = "rad_floor" +/obj/effect/floor_decal/industrial/rad_floor/blue + color = "#00B8B2" +/obj/effect/floor_decal/industrial/rad_floor/yellow + color = "#CFCF55" +/obj/effect/floor_decal/industrial/rad_floor/grey + color = "#545253" +/obj/effect/floor_decal/industrial/rad_floor/red + color = "#a70000" + +/obj/effect/floor_decal/industrial/outline + name = "white outline" + icon_state = "outline" +/obj/effect/floor_decal/industrial/outline/blue + name = "blue outline" + color = "#00B8B2" +/obj/effect/floor_decal/industrial/outline/yellow + name = "yellow outline" + color = "#CFCF55" +/obj/effect/floor_decal/industrial/outline/grey + name = "grey outline" + color = "#545253" +/obj/effect/floor_decal/industrial/outline/red + name = "red outline" + color = "#a70000" + +/obj/effect/floor_decal/industrial/outline/cut_corners + name = "white cut outline" + icon_state = "cut_corners" +/obj/effect/floor_decal/industrial/outline/cut_corners/blue + name = "blue cut outline" + color = "#00B8B2" +/obj/effect/floor_decal/industrial/outline/cut_corners/yellow + name = "yellow cut outline" + color = "#CFCF55" +/obj/effect/floor_decal/industrial/outline/cut_corners/grey + name = "grey cut outline" + color = "#545253" +/obj/effect/floor_decal/industrial/outline/cut_corners/red + name = "red cut outline" + color = "#a70000" + +/obj/effect/floor_decal/industrial/loading + name = "loading area" + icon_state = "loading" + color = "#CFCF55" +/obj/effect/floor_decal/industrial/loading/white + color = null +/obj/effect/floor_decal/industrial/loading/blue + color = "#00B8B2" +/obj/effect/floor_decal/industrial/loading/grey + color = "#545253" +/obj/effect/floor_decal/industrial/loading/red + color = "#a70000" + +/obj/effect/floor_decal/industrial/arrows + name = "tri-arrows" + icon_state = "tri-arrows" +/obj/effect/floor_decal/industrial/arrows/yellow + color = "#CFCF55" +/obj/effect/floor_decal/industrial/arrows/blue + color = "#00B8B2" +/obj/effect/floor_decal/industrial/arrows/grey + color = "#545253" +/obj/effect/floor_decal/industrial/arrows/red + color = "#a70000" + +/obj/effect/floor_decal/industrial/caution + name = "caution" + icon_state = "caution" +/obj/effect/floor_decal/industrial/caution/yellow + color = "#CFCF55" +/obj/effect/floor_decal/industrial/caution/blue + color = "#00B8B2" +/obj/effect/floor_decal/industrial/caution/grey + color = "#545253" +/obj/effect/floor_decal/industrial/caution/red + color = "#a70000" + +/obj/effect/floor_decal/industrial/stand_clear + name = "stand clear" + icon_state = "stand_clear" +/obj/effect/floor_decal/industrial/stand_clear/yellow + color = "#CFCF55" +/obj/effect/floor_decal/industrial/stand_clear/blue + color = "#00B8B2" +/obj/effect/floor_decal/industrial/stand_clear/grey + color = "#545253" +/obj/effect/floor_decal/industrial/stand_clear/red + color = "#a70000" + +/obj/effect/floor_decal/industrial/bot_outline + name = "bot outline" + icon_state = "bot_outline" +/obj/effect/floor_decal/industrial/bot_outline/yellow + color = "#CFCF55" +/obj/effect/floor_decal/industrial/bot_outline/blue + color = "#00B8B2" +/obj/effect/floor_decal/industrial/bot_outline/grey + color = "#545253" +/obj/effect/floor_decal/industrial/bot_outline/red + color = "#a70000" + +/obj/effect/floor_decal/industrial/bot_outline/corner + icon_state = "bot_corners" +/obj/effect/floor_decal/industrial/bot_outline/corner/yellow + color = "#CFCF55" +/obj/effect/floor_decal/industrial/bot_outline/corner/blue + color = "#00B8B2" +/obj/effect/floor_decal/industrial/bot_outline/corner/grey + color = "#545253" +/obj/effect/floor_decal/industrial/bot_outline/corner/red + color = "#a70000" + +//Colored Warning Stripes +/obj/effect/floor_decal/industrial/warning/color + icon_state = "warning_color" +/obj/effect/floor_decal/industrial/warning/color/corner + icon_state = "warningcorner_color" +/obj/effect/floor_decal/industrial/warning/color/full + icon_state = "warningfull_color" +/obj/effect/floor_decal/industrial/warning/color/cee + icon_state = "warningcee_color" +/obj/effect/floor_decal/industrial/warning/color/tile + icon_state = "warningtile_color" + +/obj/effect/floor_decal/industrial/warning/color/yellow + color = "#CFCF55" +/obj/effect/floor_decal/industrial/warning/color/corner/yellow + color = "#CFCF55" +/obj/effect/floor_decal/industrial/warning/color/full/yellow + color = "#CFCF55" +/obj/effect/floor_decal/industrial/warning/color/cee/yellow + color = "#CFCF55" +/obj/effect/floor_decal/industrial/warning/color/tile/yellow + color = "#CFCF55" + +/obj/effect/floor_decal/industrial/warning/color/red + color = "#a70000" +/obj/effect/floor_decal/industrial/warning/color/corner/red + color = "#a70000" +/obj/effect/floor_decal/industrial/warning/color/full/red + color = "#a70000" +/obj/effect/floor_decal/industrial/warning/color/cee/red + color = "#a70000" +/obj/effect/floor_decal/industrial/warning/color/tile/red + color = "#a70000" \ No newline at end of file diff --git a/icons/obj/decal_warning_stripes.dmi b/icons/obj/decal_warning_stripes.dmi deleted file mode 100644 index a0cf5e32447..00000000000 Binary files a/icons/obj/decal_warning_stripes.dmi and /dev/null differ diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi index df626a05ba4..c9c357fe040 100644 Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ diff --git a/icons/turf/flooring/decals.dmi b/icons/turf/flooring/decals.dmi index c98b77736cf..261235765e8 100644 Binary files a/icons/turf/flooring/decals.dmi and b/icons/turf/flooring/decals.dmi differ diff --git a/icons/turf/flooring/decals_old.dmi b/icons/turf/flooring/decals_old.dmi deleted file mode 100644 index c3441b57147..00000000000 Binary files a/icons/turf/flooring/decals_old.dmi and /dev/null differ diff --git a/icons/turf/flooring/decals_vr.dmi b/icons/turf/flooring/decals_vr.dmi index af18f8d6c5e..37573c591b6 100644 Binary files a/icons/turf/flooring/decals_vr.dmi and b/icons/turf/flooring/decals_vr.dmi differ