From a2d72d2237e6610620e112765e14ab91fa1d867b Mon Sep 17 00:00:00 2001 From: courierbravo Date: Mon, 15 Jul 2024 19:10:11 -0700 Subject: [PATCH] floor decals --- .../flooring/flooring_decals_industrial.dm | 430 +++++++++++++++++- html/changelogs/CourierBravo - helpersmk2.yml | 5 +- 2 files changed, 429 insertions(+), 6 deletions(-) diff --git a/code/game/turfs/flooring/flooring_decals_industrial.dm b/code/game/turfs/flooring/flooring_decals_industrial.dm index 6dee0c15e03..1d9b600bde6 100644 --- a/code/game/turfs/flooring/flooring_decals_industrial.dm +++ b/code/game/turfs/flooring/flooring_decals_industrial.dm @@ -28,60 +28,236 @@ name = "hatched marking" icon_state = "delivery" +/obj/effect/floor_decal/industrial/hatch/blue + name = "cyan hatched marking" + color = "#b6efe1" + /obj/effect/floor_decal/industrial/hatch/yellow + name = "yellow hatched marking" color = COLOR_YELLOW_KHAKI /obj/effect/floor_decal/industrial/hatch/grey + name = "grey hatched marking" color = COLOR_GRAY /obj/effect/floor_decal/industrial/hatch/red + name = "red hatched marking" color = COLOR_CRIMSON +/obj/effect/floor_decal/industrial/hatch/custodial + name = "custodial purple hatched marking" + color = COLOR_PURPLE_GRAY + +/obj/effect/floor_decal/industrial/hatch/medical + name = "medical lime hatched marking" + color = COLOR_PALE_GREEN_GRAY + +/obj/effect/floor_decal/industrial/hatch/medical/dark_green + name = "medical dark green hatched marking" + color = COLOR_DARK_GREEN_GRAY + +/obj/effect/floor_decal/industrial/hatch/engineering + name = "engineering yellow hatched marking" + color = COLOR_YELLOW_ENGI + +/obj/effect/floor_decal/industrial/hatch/service + name = "service green hatched marking" + color = COLOR_GREEN_GRAY + +/obj/effect/floor_decal/industrial/hatch/research + name = "research mauve hatched marking" + color = COLOR_PALE_PURPLE_GRAY + +/obj/effect/floor_decal/industrial/hatch/security + name = "security blue hatched marking" + color = COLOR_BLUE_GRAY + +/obj/effect/floor_decal/industrial/hatch/emergency_closet + name = "emergency closet blue hatched marking" + color = COLOR_BABY_BLUE + +/obj/effect/floor_decal/industrial/hatch/firefighting_closet + name = "firefighting red hatched marking" + color = COLOR_RED_LIGHT + // ------------------------ hatching stripes small /obj/effect/floor_decal/industrial/hatch_small name = "hatched marking small" icon_state = "delivery_small" +/obj/effect/floor_decal/industrial/hatch_small/blue + name = "cyan hatched marking small" + color = "#b6efe1" + /obj/effect/floor_decal/industrial/hatch_small/yellow + name = "yellow hatched marking small" color = COLOR_YELLOW_KHAKI /obj/effect/floor_decal/industrial/hatch_small/grey + name = "grey hatched marking small" color = COLOR_GRAY /obj/effect/floor_decal/industrial/hatch_small/red + name = "red hatched marking small" color = COLOR_CRIMSON +/obj/effect/floor_decal/industrial/hatch_small/custodial + name = "custodial purple hatched marking small" + color = COLOR_PURPLE_GRAY + +/obj/effect/floor_decal/industrial/hatch_small/medical + name = "medical lime hatched marking small" + color = COLOR_PALE_GREEN_GRAY + +/obj/effect/floor_decal/industrial/hatch_small/medical/dark_green + name = "medical dark green hatched marking small" + color = COLOR_DARK_GREEN_GRAY + +/obj/effect/floor_decal/industrial/hatch_small/engineering + name = "engineering yellow hatched marking small" + color = COLOR_YELLOW_ENGI + +/obj/effect/floor_decal/industrial/hatch_small/service + name = "service green hatched marking small" + color = COLOR_GREEN_GRAY + +/obj/effect/floor_decal/industrial/hatch_small/research + name = "research mauve hatched marking small" + color = COLOR_PALE_PURPLE_GRAY + +/obj/effect/floor_decal/industrial/hatch_small/security + name = "security blue hatched marking small" + color = COLOR_BLUE_GRAY + +/obj/effect/floor_decal/industrial/hatch_small/emergency_closet + name = "emergency closet blue hatched marking small" + color = COLOR_BABY_BLUE + +/obj/effect/floor_decal/industrial/hatch_small/firefighting_closet + name = "firefighting red hatched marking small" + color = COLOR_RED_LIGHT + + + // ------------------------ hatching stripes tiny /obj/effect/floor_decal/industrial/hatch_tiny name = "hatched marking tiny" icon_state = "delivery_tiny" +/obj/effect/floor_decal/industrial/hatch_tiny/blue + name = "cyan hatched marking tiny" + color = "#b6efe1" + /obj/effect/floor_decal/industrial/hatch_tiny/yellow + name = "yellow hatched marking tiny" color = COLOR_YELLOW_KHAKI /obj/effect/floor_decal/industrial/hatch_tiny/grey + name = "grey hatched marking tiny" color = COLOR_GRAY /obj/effect/floor_decal/industrial/hatch_tiny/red + name = "red hatched marking tiny" color = COLOR_CRIMSON +/obj/effect/floor_decal/industrial/hatch_tiny/custodial + name = "custodial purple hatched marking tiny" + color = COLOR_PURPLE_GRAY + +/obj/effect/floor_decal/industrial/hatch_tiny/medical + name = "medical lime hatched marking tiny" + color = COLOR_PALE_GREEN_GRAY + +/obj/effect/floor_decal/industrial/hatch_tiny/medical/dark_green + name = "medical dark green hatched marking tiny" + color = COLOR_DARK_GREEN_GRAY + +/obj/effect/floor_decal/industrial/hatch_tiny/engineering + name = "engineering yellow hatched marking tiny" + color = COLOR_YELLOW_ENGI + +/obj/effect/floor_decal/industrial/hatch_tiny/service + name = "service green hatched marking tiny" + color = COLOR_GREEN_GRAY + +/obj/effect/floor_decal/industrial/hatch_tiny/research + name = "research mauve hatched marking tiny" + color = COLOR_PALE_PURPLE_GRAY + +/obj/effect/floor_decal/industrial/hatch_tiny/security + name = "security blue hatched marking tiny" + color = COLOR_BLUE_GRAY + +/obj/effect/floor_decal/industrial/hatch_tiny/emergency_closet + name = "emergency closet blue hatched marking tiny" + color = COLOR_BABY_BLUE + +/obj/effect/floor_decal/industrial/hatch_tiny/firefighting_closet + name = "firefighting red hatched marking tiny" + color = COLOR_RED_LIGHT + // ------------------------ hatching stripes door /obj/effect/floor_decal/industrial/hatch_door name = "hatched marking door" icon_state = "delivery_door" +/obj/effect/floor_decal/industrial/hatch_door/blue + name = "cyan hatched marking door" + color = "#b6efe1" + /obj/effect/floor_decal/industrial/hatch_door/yellow + name = "yellow hatched marking door" color = COLOR_YELLOW_KHAKI /obj/effect/floor_decal/industrial/hatch_door/grey + name = "grey hatched marking door" color = COLOR_GRAY /obj/effect/floor_decal/industrial/hatch_door/red + name = "red hatched marking door" color = COLOR_CRIMSON +/obj/effect/floor_decal/industrial/hatch_door/custodial + name = "custodial purple hatched marking door" + color = COLOR_PURPLE_GRAY + +/obj/effect/floor_decal/industrial/hatch_door/medical + name = "medical lime hatched marking door" + color = COLOR_PALE_GREEN_GRAY + +/obj/effect/floor_decal/industrial/hatch_door/medical/dark_green + name = "medical dark green hatched marking door" + color = COLOR_DARK_GREEN_GRAY + +/obj/effect/floor_decal/industrial/hatch_door/engineering + name = "engineering yellow hatched marking door" + color = COLOR_YELLOW_ENGI + +/obj/effect/floor_decal/industrial/hatch_door/service + name = "service green hatched marking door" + color = COLOR_GREEN_GRAY + +/obj/effect/floor_decal/industrial/hatch_door/research + name = "research mauve hatched marking door" + color = COLOR_PALE_PURPLE_GRAY + +/obj/effect/floor_decal/industrial/hatch_door/security + name = "security blue hatched marking door" + color = COLOR_BLUE_GRAY + +/obj/effect/floor_decal/industrial/hatch_door/emergency_closet + name = "emergency closet blue hatched marking door" + color = COLOR_BABY_BLUE + +/obj/effect/floor_decal/industrial/hatch_door/firefighting_closet + name = "firefighting red hatched marking door" + color = COLOR_RED_LIGHT + + + // ------------------------ outline main /obj/effect/floor_decal/industrial/outline @@ -118,7 +294,7 @@ /obj/effect/floor_decal/industrial/outline/engineering name = "engineering yellow outline" - color = COLOR_BROWN + color = COLOR_YELLOW_ENGI /obj/effect/floor_decal/industrial/outline/service name = "service green outline" @@ -146,24 +322,68 @@ name = "white outline" icon_state = "outline_corner" +/obj/effect/floor_decal/industrial/outline_corner/blue + name = "cyan outline corner" + color = "#b6efe1" + /obj/effect/floor_decal/industrial/outline_corner/yellow - name = "yellow outline" + name = "yellow outline corner" color = COLOR_YELLOW_KHAKI /obj/effect/floor_decal/industrial/outline_corner/grey - name = "grey outline" + name = "grey outline corner" color = COLOR_GRAY /obj/effect/floor_decal/industrial/outline_corner/red - name = "red outline" + name = "red outline corner" color = COLOR_CRIMSON +/obj/effect/floor_decal/industrial/outline_corner/custodial + name = "custodial purple outline corner" + color = COLOR_PURPLE_GRAY + +/obj/effect/floor_decal/industrial/outline_corner/medical + name = "medical lime outline corner" + color = COLOR_PALE_GREEN_GRAY + +/obj/effect/floor_decal/industrial/outline_corner/medical/dark_green + name = "medical dark green outline corner" + color = COLOR_DARK_GREEN_GRAY + +/obj/effect/floor_decal/industrial/outline_corner/engineering + name = "engineering yellow outline corner" + color = COLOR_YELLOW_ENGI + +/obj/effect/floor_decal/industrial/outline_corner/service + name = "service green outline corner" + color = COLOR_GREEN_GRAY + +/obj/effect/floor_decal/industrial/outline_corner/research + name = "research mauve outline corner" + color = COLOR_PALE_PURPLE_GRAY + +/obj/effect/floor_decal/industrial/outline_corner/security + name = "security blue outline corner" + color = COLOR_BLUE_GRAY + +/obj/effect/floor_decal/industrial/outline_corner/emergency_closet + name = "emergency closet blue outline corner" + color = COLOR_BABY_BLUE + +/obj/effect/floor_decal/industrial/outline_corner/firefighting_closet + name = "firefighting red outline corner" + color = COLOR_RED_LIGHT + // ------------------------ outline straight /obj/effect/floor_decal/industrial/outline_straight name = "white outline" icon_state = "outline_straight" +/obj/effect/floor_decal/industrial/outline_straight/blue + name = "cyan outline" + color = "#b6efe1" + /obj/effect/floor_decal/industrial/outline_straight/yellow name = "yellow outline" color = COLOR_YELLOW_KHAKI @@ -176,12 +396,52 @@ name = "red outline" color = COLOR_CRIMSON +/obj/effect/floor_decal/industrial/outline_straight/custodial + name = "custodial purple outline" + color = COLOR_PURPLE_GRAY + +/obj/effect/floor_decal/industrial/outline_straight/medical + name = "medical lime outline" + color = COLOR_PALE_GREEN_GRAY + +/obj/effect/floor_decal/industrial/outline_straight/medical/dark_green + name = "medical dark green outline" + color = COLOR_DARK_GREEN_GRAY + +/obj/effect/floor_decal/industrial/outline_straight/engineering + name = "engineering yellow outline" + color = COLOR_YELLOW_ENGI + +/obj/effect/floor_decal/industrial/outline_straight/service + name = "service green outline" + color = COLOR_GREEN_GRAY + +/obj/effect/floor_decal/industrial/outline_straight/research + name = "research mauve outline" + color = COLOR_PALE_PURPLE_GRAY + +/obj/effect/floor_decal/industrial/outline_straight/security + name = "security blue outline" + color = COLOR_BLUE_GRAY + +/obj/effect/floor_decal/industrial/outline_straight/emergency_closet + name = "emergency closet blue outline" + color = COLOR_BABY_BLUE + +/obj/effect/floor_decal/industrial/outline_straight/firefighting_closet + name = "firefighting red outline" + color = COLOR_RED_LIGHT + // ------------------------ outline segment /obj/effect/floor_decal/industrial/outline_segment name = "white outline" icon_state = "outline_segment" +/obj/effect/floor_decal/industrial/outline_segment/blue + name = "cyan outline" + color = "#b6efe1" + /obj/effect/floor_decal/industrial/outline_segment/yellow name = "yellow outline" color = COLOR_YELLOW_KHAKI @@ -194,12 +454,53 @@ name = "red outline" color = COLOR_CRIMSON +/obj/effect/floor_decal/industrial/outline_segment/custodial + name = "custodial purple outline" + color = COLOR_PURPLE_GRAY + +/obj/effect/floor_decal/industrial/outline_segment/medical + name = "medical lime outline" + color = COLOR_PALE_GREEN_GRAY + +/obj/effect/floor_decal/industrial/outline_segment/medical/dark_green + name = "medical dark green outline" + color = COLOR_DARK_GREEN_GRAY + +/obj/effect/floor_decal/industrial/outline_segment/engineering + name = "engineering yellow outline" + color = COLOR_YELLOW_ENGI + +/obj/effect/floor_decal/industrial/outline_segment/service + name = "service green outline" + color = COLOR_GREEN_GRAY + +/obj/effect/floor_decal/industrial/outline_segment/research + name = "research mauve outline" + color = COLOR_PALE_PURPLE_GRAY + +/obj/effect/floor_decal/industrial/outline_segment/security + name = "security blue outline" + color = COLOR_BLUE_GRAY + +/obj/effect/floor_decal/industrial/outline_segment/emergency_closet + name = "emergency closet blue outline" + color = COLOR_BABY_BLUE + +/obj/effect/floor_decal/industrial/outline_segment/firefighting_closet + name = "firefighting red outline" + color = COLOR_RED_LIGHT + + // ------------------------ outline door /obj/effect/floor_decal/industrial/outline_door name = "white door outline" icon_state = "outline_door" +/obj/effect/floor_decal/industrial/outline_door/blue + name = "cyan door outline" + color = "#b6efe1" + /obj/effect/floor_decal/industrial/outline_door/yellow name = "yellow door outline" color = COLOR_YELLOW_KHAKI @@ -212,38 +513,157 @@ name = "red door outline" color = COLOR_CRIMSON +/obj/effect/floor_decal/industrial/outline_door/custodial + name = "custodial purple door outline" + color = COLOR_PURPLE_GRAY + +/obj/effect/floor_decal/industrial/outline_door/medical + name = "medical lime door outline" + color = COLOR_PALE_GREEN_GRAY + +/obj/effect/floor_decal/industrial/outline_door/medical/dark_green + name = "medical dark green door outline" + color = COLOR_DARK_GREEN_GRAY + +/obj/effect/floor_decal/industrial/outline_door/engineering + name = "engineering yellow door outline" + color = COLOR_YELLOW_ENGI + +/obj/effect/floor_decal/industrial/outline_door/service + name = "service green door outline" + color = COLOR_GREEN_GRAY + +/obj/effect/floor_decal/industrial/outline_door/research + name = "research mauve door outline" + color = COLOR_PALE_PURPLE_GRAY + +/obj/effect/floor_decal/industrial/outline_door/security + name = "security blue door outline" + color = COLOR_BLUE_GRAY + +/obj/effect/floor_decal/industrial/outline_door/emergency_closet + name = "emergency closet blue door outline" + color = COLOR_BABY_BLUE + +/obj/effect/floor_decal/industrial/outline_door/firefighting_closet + name = "firefighting red door outline" + color = COLOR_RED_LIGHT + // ------------------------ loading /obj/effect/floor_decal/industrial/loading name = "loading area" icon_state = "loadingarea" +/obj/effect/floor_decal/industrial/loading/blue + name = "cyan loading area" + color = "#b6efe1" + /obj/effect/floor_decal/industrial/loading/yellow + name = "yellow loading area" color = COLOR_YELLOW_KHAKI /obj/effect/floor_decal/industrial/loading/grey + name = "grey loading area" color = COLOR_GRAY +/obj/effect/floor_decal/industrial/loading/red + name = "red loading area" + color = COLOR_CRIMSON + +/obj/effect/floor_decal/industrial/loading/custodial + name = "custodial purple loading area" + color = COLOR_PURPLE_GRAY + +/obj/effect/floor_decal/industrial/loading/medical + name = "medical lime loading area" + color = COLOR_PALE_GREEN_GRAY + +/obj/effect/floor_decal/industrial/loading/medical/dark_green + name = "medical dark green loading area" + color = COLOR_DARK_GREEN_GRAY + +/obj/effect/floor_decal/industrial/loading/engineering + name = "engineering yellow loading area" + color = COLOR_YELLOW_ENGI + +/obj/effect/floor_decal/industrial/loading/service + name = "service green loading area" + color = COLOR_GREEN_GRAY + +/obj/effect/floor_decal/industrial/loading/research + name = "research mauve loading area" + color = COLOR_PALE_PURPLE_GRAY + /obj/effect/floor_decal/industrial/loading/security name = "security blue loading area" color = COLOR_BLUE_GRAY +/obj/effect/floor_decal/industrial/loading/emergency_closet + name = "emergency closet blue loading area" + color = COLOR_BABY_BLUE + +/obj/effect/floor_decal/industrial/loading/firefighting_closet + name = "firefighting red loading area" + color = COLOR_RED_LIGHT + // ------------------------ arrow /obj/effect/floor_decal/industrial/arrow name = "arrow" icon_state = "arrow" +/obj/effect/floor_decal/industrial/arrow/blue + name = "cyan arrow" + color = "#b6efe1" + /obj/effect/floor_decal/industrial/arrow/yellow + name = "yellow arrow" color = COLOR_YELLOW_KHAKI /obj/effect/floor_decal/industrial/arrow/grey + name = "grey arrow" color = COLOR_GRAY /obj/effect/floor_decal/industrial/arrow/red + name = "red arrow" color = COLOR_CRIMSON -/obj/effect/floor_decal/industrial/arrow/green +/obj/effect/floor_decal/industrial/arrow/custodial + name = "custodial purple arrow" + color = COLOR_PURPLE_GRAY + +/obj/effect/floor_decal/industrial/arrow/medical + name = "medical lime arrow" + color = COLOR_PALE_GREEN_GRAY + +/obj/effect/floor_decal/industrial/arrow/medical/dark_green + name = "medical dark green arrow" + color = COLOR_DARK_GREEN_GRAY + +/obj/effect/floor_decal/industrial/arrow/engineering + name = "engineering yellow arrow" + color = COLOR_YELLOW_ENGI + +/obj/effect/floor_decal/industrial/arrow/service + name = "service green arrow" color = COLOR_GREEN_GRAY +/obj/effect/floor_decal/industrial/arrow/research + name = "research mauve arrow" + color = COLOR_PALE_PURPLE_GRAY + +/obj/effect/floor_decal/industrial/arrow/security + name = "security blue arrow" + color = COLOR_BLUE_GRAY + +/obj/effect/floor_decal/industrial/arrow/emergency_closet + name = "emergency closet blue arrow" + color = COLOR_BABY_BLUE + +/obj/effect/floor_decal/industrial/arrow/firefighting_closet + name = "firefighting red arrow" + color = COLOR_RED_LIGHT + + // ------------------------ diff --git a/html/changelogs/CourierBravo - helpersmk2.yml b/html/changelogs/CourierBravo - helpersmk2.yml index 03793702b52..845ded47410 100644 --- a/html/changelogs/CourierBravo - helpersmk2.yml +++ b/html/changelogs/CourierBravo - helpersmk2.yml @@ -55,5 +55,8 @@ delete-after: True # Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. # Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. changes: - - rscadd: "Added the SCCV Artemis, SCCV Apollo & its two varients, and the SCCV Packrat to the helpers. A combat shuttle and two humanitarian shuttles for event use." + - rscadd: "Added several pre made shuttles to the helpers. The SCCV Artemis, SCCV Apollo & its two variants, the SCCV Packrat, and the SCCV Opossum. These are intended to be used for events." + - rscadd: "Added a long list of color variants of various floor decals " + - rscadd: "Added a new atmos helper, atmos_pipes." - bugfix: "Fixed the wonky lighting for various pre-fab helpers added previously." +