Skip to content

Commit

Permalink
Hybrisa Alpha 0.58
Browse files Browse the repository at this point in the history
  • Loading branch information
Zenith authored and Zenith committed Apr 30, 2024
1 parent b3ebb2e commit 271e299
Show file tree
Hide file tree
Showing 7 changed files with 2,287 additions and 2,224 deletions.
193 changes: 193 additions & 0 deletions code/game/objects/effects/decals/hybrisa_decals.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,193 @@
/// Hybrisa Decals

/obj/effect/hybrisa
icon = 'icons/effects/64x64hybrisa_decals.dmi'
icon_state = "weylandyutanilogo1"
layer = TURF_LAYER
plane = FLOOR_PLANE

//Roadlines

/obj/effect/hybrisa/decal/road
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "Z_W1"
/obj/effect/hybrisa/decal/road/lines1
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "Z_W1"
/obj/effect/hybrisa/decal/road/lines2
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "Z_N2"
/obj/effect/hybrisa/decal/road/lines3
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "Z_S3"
/obj/effect/hybrisa/decal/road/lines4
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "Z_E4"
/obj/effect/hybrisa/decal/road/lines5
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "Z_M1"
/obj/effect/hybrisa/decal/road/lines6
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "Z_M2"
/obj/effect/hybrisa/decal/road/corner
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "Z_corner"
/obj/effect/hybrisa/decal/road/roadmiddle
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "roadlinesmiddle"


// Dam Roadlines smaller
/obj/effect/hybrisa/decal/road/road_edge
name = "road"
icon_state = "road_edge_decal1"
/obj/effect/hybrisa/decal/road/road_stop
name = "road"
icon_state = "stop_decal1"

// Double Roadlines
/obj/effect/hybrisa/decal/doubleroad
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "ZD_W1"
/obj/effect/hybrisa/decal/doubleroad/lines1
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "ZD_W1"
/obj/effect/hybrisa/decal/doubleroad/lines2
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "ZD_N2"
/obj/effect/hybrisa/decal/doubleroad/lines3
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "ZD_S3"
/obj/effect/hybrisa/decal/doubleroad/lines4
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "ZD_E4"
/obj/effect/hybrisa/decal/doubleroad/lines5
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "ZD_M1"
/obj/effect/hybrisa/decal/doubleroad/lines6
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "ZD_M2"

//Gold lines
/obj/effect/hybrisa/decal/gold
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "Z_S"
/obj/effect/hybrisa/decal/gold/line1
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "Z_S"
/obj/effect/hybrisa/decal/gold/line2
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "Z_E"
/obj/effect/hybrisa/decal/gold/line3
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "Z_N"
/obj/effect/hybrisa/decal/gold/line4
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "Z_W"

// Red & White Warning Stripes

/obj/effect/hybrisa/decal/warning/redandwhite_SEcorner
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "red_SE-out"
/obj/effect/hybrisa/decal/warning/redandwhite_S
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "red_S"
/obj/effect/hybrisa/decal/warning/redandwhite_SWcorner
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "red_SW-out"
/obj/effect/hybrisa/decal/warning/redandwhite_E
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "red_E"
/obj/effect/hybrisa/decal/warning/redandwhite_W
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "red_W"
/obj/effect/hybrisa/decal/warning/redandwhite_NEcorner
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "red_NE-out"
/obj/effect/hybrisa/decal/warning/redandwhite_N
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "red_N"
/obj/effect/hybrisa/decal/warning/redandwhite_NWcorner
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "red_NW-out"

// Angled Warning-Stripes
/obj/effect/hybrisa/decal/warningstripes_angled
name = "warning stripes"
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "warningstripes_angled"
/obj/effect/hybrisa/decal/warningstripes_angled_corner
name = "warning stripes"
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "warningstripes_angled_corner"

// Grate

/obj/effect/hybrisa/decal/grate
name = "solid metal grate"
desc = "A metal grate."
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "zhalfgrate1"

// 64x64 Decals

/obj/effect/hybrisa/decal/WY/WY1
icon = 'icons/effects/64x64hybrisa_decals.dmi'
icon_state = "weylandyutanilogo1"

/obj/effect/hybrisa/decal/WY/WYworn
icon = 'icons/effects/64x64hybrisa_decals.dmi'
icon_state = "weylandyutanilogo2"

/obj/effect/hybrisa/decal/roadcross
icon = 'icons/effects/64x64hybrisa_decals.dmi'
icon_state = "roadcross"
/obj/effect/hybrisa/decal/checkpoint_decal
icon = 'icons/effects/64x64hybrisa_decals.dmi'
icon_state = "checkpoint_decal"
/obj/effect/hybrisa/decal/workers_decal
icon = 'icons/effects/64x64hybrisa_decals.dmi'
icon_state = "workers_decal"

// 64x128 Decals
/obj/effect/hybrisa/decal/meridianlogo
icon = 'icons/effects/meridianlogo.dmi'
icon_state = "meridian_left"
/obj/effect/hybrisa/decal/meridianlogo/meridianlogo_left
icon_state = "meridian_left"
/obj/effect/hybrisa/decal/meridianlogo/meridianlogo_right
icon_state = "meridian_right"

/// Dirt & Grime

/obj/effect/hybrisa/decal/dirt
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "dirt"

/obj/effect/hybrisa/decal/dirt_2
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "dirt_2"

/obj/effect/hybrisa/decal/bloodtrail
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "bloodtrail"

/obj/effect/hybrisa/decal/tiretrack
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "tiremarks"

/obj/effect/hybrisa/decal/trash
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "trash_1"

/// Engineer_ship
/obj/effect/hybrisa/decal/engineership_corners
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "engPlatform_corners"

/obj/effect/hybrisa/decal/egg_base
name = "strange tentacle?"
desc = "Strange tentacle looking things?"
icon = 'icons/obj/structures/props/zenithrandomprops.dmi'
icon_state = "egg_base"
197 changes: 0 additions & 197 deletions code/game/objects/effects/decals/warning_stripes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -113,200 +113,3 @@
/obj/effect/decal/siding/wood_siding
name = "wood siding"
icon_state = "wood_siding1"




/// Hybrisa Decals

/obj/effect/hybrisa
icon = 'icons/effects/64x64hybrisa_decals.dmi'
icon_state = "weylandyutanilogo1"
layer = TURF_LAYER
plane = FLOOR_PLANE

//Roadlines

/obj/effect/hybrisa/decal/road
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "Z_W1"
/obj/effect/hybrisa/decal/road/lines1
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "Z_W1"
/obj/effect/hybrisa/decal/road/lines2
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "Z_N2"
/obj/effect/hybrisa/decal/road/lines3
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "Z_S3"
/obj/effect/hybrisa/decal/road/lines4
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "Z_E4"
/obj/effect/hybrisa/decal/road/lines5
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "Z_M1"
/obj/effect/hybrisa/decal/road/lines6
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "Z_M2"
/obj/effect/hybrisa/decal/road/corner
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "Z_corner"
/obj/effect/hybrisa/decal/road/roadmiddle
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "roadlinesmiddle"


// Dam Roadlines smaller
/obj/effect/hybrisa/decal/road/road_edge
name = "road"
icon_state = "road_edge_decal1"
/obj/effect/hybrisa/decal/road/road_stop
name = "road"
icon_state = "stop_decal1"

// Double Roadlines
/obj/effect/hybrisa/decal/doubleroad
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "ZD_W1"
/obj/effect/hybrisa/decal/doubleroad/lines1
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "ZD_W1"
/obj/effect/hybrisa/decal/doubleroad/lines2
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "ZD_N2"
/obj/effect/hybrisa/decal/doubleroad/lines3
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "ZD_S3"
/obj/effect/hybrisa/decal/doubleroad/lines4
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "ZD_E4"
/obj/effect/hybrisa/decal/doubleroad/lines5
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "ZD_M1"
/obj/effect/hybrisa/decal/doubleroad/lines6
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "ZD_M2"

//Gold lines
/obj/effect/hybrisa/decal/gold
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "Z_S"
/obj/effect/hybrisa/decal/gold/line1
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "Z_S"
/obj/effect/hybrisa/decal/gold/line2
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "Z_E"
/obj/effect/hybrisa/decal/gold/line3
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "Z_N"
/obj/effect/hybrisa/decal/gold/line4
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "Z_W"

// Red & White Warning Stripes

/obj/effect/hybrisa/decal/warning/redandwhite_SEcorner
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "red_SE-out"
/obj/effect/hybrisa/decal/warning/redandwhite_S
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "red_S"
/obj/effect/hybrisa/decal/warning/redandwhite_SWcorner
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "red_SW-out"
/obj/effect/hybrisa/decal/warning/redandwhite_E
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "red_E"
/obj/effect/hybrisa/decal/warning/redandwhite_W
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "red_W"
/obj/effect/hybrisa/decal/warning/redandwhite_NEcorner
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "red_NE-out"
/obj/effect/hybrisa/decal/warning/redandwhite_N
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "red_N"
/obj/effect/hybrisa/decal/warning/redandwhite_NWcorner
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "red_NW-out"

// Angled Warning-Stripes
/obj/effect/hybrisa/decal/warningstripes_angled
name = "warning stripes"
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "warningstripes_angled"
/obj/effect/hybrisa/decal/warningstripes_angled_corner
name = "warning stripes"
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "warningstripes_angled_corner"

// Grate

/obj/effect/hybrisa/decal/grate
name = "solid metal grate"
desc = "A metal grate."
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "zhalfgrate1"

// 64x64 Decals

/obj/effect/hybrisa/decal/WY/WY1
icon = 'icons/effects/64x64hybrisa_decals.dmi'
icon_state = "weylandyutanilogo1"

/obj/effect/hybrisa/decal/WY/WYworn
icon = 'icons/effects/64x64hybrisa_decals.dmi'
icon_state = "weylandyutanilogo2"

/obj/effect/hybrisa/decal/roadcross
icon = 'icons/effects/64x64hybrisa_decals.dmi'
icon_state = "roadcross"
/obj/effect/hybrisa/decal/checkpoint_decal
icon = 'icons/effects/64x64hybrisa_decals.dmi'
icon_state = "checkpoint_decal"
/obj/effect/hybrisa/decal/workers_decal
icon = 'icons/effects/64x64hybrisa_decals.dmi'
icon_state = "workers_decal"

// 64x128 Decals
/obj/effect/hybrisa/decal/meridianlogo
icon = 'icons/effects/meridianlogo.dmi'
icon_state = "meridian_left"
/obj/effect/hybrisa/decal/meridianlogo/meridianlogo_left
icon_state = "meridian_left"
/obj/effect/hybrisa/decal/meridianlogo/meridianlogo_right
icon_state = "meridian_right"

/// Dirt & Grime

/obj/effect/hybrisa/decal/dirt
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "dirt"

/obj/effect/hybrisa/decal/dirt_2
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "dirt_2"

/obj/effect/hybrisa/decal/bloodtrail
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "bloodtrail"

/obj/effect/hybrisa/decal/tiretrack
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "tiremarks"

/obj/effect/hybrisa/decal/trash
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "trash_1"

/// Engineer_ship
/obj/effect/hybrisa/decal/engineership_corners
icon = 'icons/effects/hybrisa_decals.dmi'
icon_state = "engPlatform_corners"

/obj/effect/hybrisa/decal/egg_base
name = "strange tentacle?"
desc = "Strange tentacle looking things?"
icon = 'icons/obj/structures/props/zenithrandomprops.dmi'
icon_state = "egg_base"
Loading

0 comments on commit 271e299

Please sign in to comment.