Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sprites and Structures #509

Merged
merged 5 commits into from
Jan 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 128 additions & 0 deletions code/game/turfs/flooring/flooring_decals.dm
Original file line number Diff line number Diff line change
Expand Up @@ -958,6 +958,134 @@ var/list/floor_decals = list()
icon_state = "delivery"
alpha = 229

/obj/effect/floor_decal/industrial/bot
name = "bot"
icon_state = "bot"

/obj/effect/floor_decal/industrial/bot/red
name = "bot red"
color = "#801000"

/obj/effect/floor_decal/industrial/bot/yellow
name = "bot yellow"
color = "#ffcd00"

/obj/effect/floor_decal/industrial/bot/right
name = "bot right"
icon_state = "bot_right"

/obj/effect/floor_decal/industrial/bot/right/red
name = "bot right red"
color = "#801000"

/obj/effect/floor_decal/industrial/bot/right/yellow
name = "bot right yellow"
color = "#ffcd00"

/obj/effect/floor_decal/industrial/bot/left
name = "bot left"
icon_state = "bot_left"

/obj/effect/floor_decal/industrial/bot/left/red
name = "bot left red"
color = "#801000"

/obj/effect/floor_decal/industrial/bot/left/yellow
name = "bot left yellow"
color = "#ffcd00"

/obj/effect/floor_decal/industrial/box_corners
name = "box corner"
icon_state = "box_corners"

/obj/effect/floor_decal/industrial/box_corners/red
name = "box corner red"
color = "#801000"

/obj/effect/floor_decal/industrial/box_corners/yellow
name = "box corner yellow"
color = "#ffcd00"

/obj/effect/floor_decal/industrial/box
name = "box"
icon_state = "box"

/obj/effect/floor_decal/industrial/box/red
name = "box red"
color = "#801000"

/obj/effect/floor_decal/industrial/box/yellow
name = "box yellow"
color = "#ffcd00"

/obj/effect/floor_decal/industrial/box/arrows
name = "arrow"
icon_state = "arrows"

/obj/effect/floor_decal/industrial/box/arrows/red
name = "arrow red"
color = "#801000"

/obj/effect/floor_decal/industrial/box/arrows/yellow
name = "arrow yellow"
color = "#ffcd00"

/obj/effect/floor_decal/industrial/numbers/zerotoone
name = "number marking"
icon_state = "number_0-1"

/obj/effect/floor_decal/industrial/numbers/twotonine
name = "number marking"
icon_state = "number_2-9"

/obj/effect/floor_decal/industrial/loadingarea_sharp
name = "loading area marker"
icon_state = "loadingarea_sharp"

/obj/effect/floor_decal/industrial/loadingarea_sharp/red
name = "red loading area marker"
color = "#801000"

/obj/effect/floor_decal/industrial/loadingarea_sharp/yellow
name = "yellow loading area marker"
color = "#ffcd00"

/obj/effect/floor_decal/industrial/delivery_sharp
name = "delivery area marker"
icon_state = "delivery_sharp"

/obj/effect/floor_decal/industrial/delivery_sharp/red
name = "red delivery area marker"
color = "#801000"

/obj/effect/floor_decal/industrial/delivery_sharp/yellow
name = " yellow delivery area marker"
color = "#ffcd00"

/obj/effect/floor_decal/industrial/caution
name = "caution marker"
icon_state = "caution"

/obj/effect/floor_decal/industrial/caution/red
name = "red caution marker"
color = "#801000"

/obj/effect/floor_decal/industrial/caution/yellow
name = "yellow caution marker"
color = "#ffcd00"

/obj/effect/floor_decal/industrial/stand_clear
name = "clearance marker"
icon_state = "stand_clear"

/obj/effect/floor_decal/industrial/stand_clear/red
name = "red clearance marker"
color = "#801000"

/obj/effect/floor_decal/industrial/stand_clear/yellow
name = "yellow clearance marker"
color = "#ffcd00"

/obj/effect/floor_decal/industrial/hatch/yellow
color = "#cfcf55"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
/obj/structure/particle_accelerator
name = "Particle Accelerator"
desc = "Part of a Particle Accelerator."
icon = 'icons/obj/machines/particle_accelerator2.dmi'
icon = 'icons/obj/machines/particle_accelerator3.dmi'
icon_state = "none"
anchored = FALSE
density = TRUE
Expand Down Expand Up @@ -231,7 +231,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
/obj/machinery/particle_accelerator
name = "Particle Accelerator"
desc = "Part of a Particle Accelerator."
icon = 'icons/obj/machines/particle_accelerator2.dmi'
icon = 'icons/obj/machines/particle_accelerator3.dmi'
icon_state = "none"
anchored = FALSE
density = TRUE
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/structure/particle_accelerator/fuel_chamber
name = "EM Acceleration Chamber"
desc_holder = "This is where the Alpha particles are accelerated to <b><i>radical speeds</i></b>."
icon = 'icons/obj/machines/particle_accelerator2.dmi'
icon = 'icons/obj/machines/particle_accelerator3.dmi'
icon_state = "fuel_chamber"
reference = "fuel_chamber"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/obj/machinery/particle_accelerator/control_box
name = "Particle Accelerator Control Computer"
desc = "This controls the density of the particles."
icon = 'icons/obj/machines/particle_accelerator2.dmi'
icon = 'icons/obj/machines/particle_accelerator3.dmi'
icon_state = "control_box"
reference = "control_box"
anchored = FALSE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/obj/structure/particle_accelerator/particle_emitter
name = "EM Containment Grid"
desc_holder = "This launchs the Alpha particles, might not want to stand near this end."
icon = 'icons/obj/machines/particle_accelerator2.dmi'
icon = 'icons/obj/machines/particle_accelerator3.dmi'
icon_state = "none"
var/fire_delay = 50
var/last_shot = 0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/structure/particle_accelerator/power_box
name = "Particle Focusing EM Lens"
desc_holder = "This uses electromagnetic waves to focus the Alpha-Particles."
icon = 'icons/obj/machines/particle_accelerator2.dmi'
icon = 'icons/obj/machines/particle_accelerator3.dmi'
icon_state = "power_box"
reference = "power_box"

Expand Down
Binary file modified icons/obj/closets/bases/closet.dmi
Binary file not shown.
Binary file modified icons/obj/janitor.dmi
Binary file not shown.
Binary file modified icons/obj/machines/mining_machines.dmi
Binary file not shown.
Binary file added icons/obj/machines/particle_accelerator3.dmi
Binary file not shown.
Binary file modified icons/obj/objects.dmi
Binary file not shown.
Binary file modified icons/turf/flooring/decals.dmi
Binary file not shown.
Loading