Skip to content

Commit

Permalink
window colors and put unused icons into an unused folder
Browse files Browse the repository at this point in the history
  • Loading branch information
@CannibalHunter
CannibalHunter committed Sep 16, 2024
1 parent e30b6d0 commit f95b7ca
Show file tree
Hide file tree
Showing 17 changed files with 21 additions and 21 deletions.
40 changes: 20 additions & 20 deletions monkestation/code/modules/aesthetics/airlock/airlock.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,59 +333,59 @@
glass = TRUE

/obj/machinery/door/airlock/captain
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/cap.dmi'
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/command.dmi'

/obj/machinery/door/airlock/hop
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/hop.dmi'
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/command.dmi'

/obj/machinery/door/airlock/hos
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/hos.dmi'
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/command.dmi'

/obj/machinery/door/airlock/hos/glass
opacity = FALSE
glass = TRUE
normal_integrity = 400

/obj/machinery/door/airlock/ce
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/ce.dmi'
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/command.dmi'

/obj/machinery/door/airlock/ce/glass
opacity = FALSE
glass = TRUE
normal_integrity = 400

/obj/machinery/door/airlock/rd
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/rd.dmi'
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/command.dmi'

/obj/machinery/door/airlock/rd/glass
opacity = FALSE
glass = TRUE
normal_integrity = 400

/obj/machinery/door/airlock/qm
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/qm.dmi'
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/command.dmi'

/obj/machinery/door/airlock/qm/glass
opacity = FALSE
glass = TRUE
normal_integrity = 400

/obj/machinery/door/airlock/cmo
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/cmo.dmi'
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/command.dmi'

/obj/machinery/door/airlock/cmo/glass
opacity = FALSE
glass = TRUE
normal_integrity = 400

/obj/machinery/door/airlock/psych
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/psych.dmi'
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/neutral.dmi'

/obj/machinery/door/airlock/asylum
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/asylum.dmi'
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/neutral.dmi'

/obj/machinery/door/airlock/bathroom
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/bathroom.dmi'
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/neutral.dmi'

//STATION MINERAL AIRLOCKS
/obj/machinery/door/airlock/gold
Expand Down Expand Up @@ -563,57 +563,57 @@

/obj/structure/door_assembly/door_assembly_captain
name = "captain airlock assembly"
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/cap.dmi'
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/neutral.dmi'
glass_type = /obj/machinery/door/airlock/command/glass
airlock_type = /obj/machinery/door/airlock/captain

/obj/structure/door_assembly/door_assembly_hop
name = "head of personnel airlock assembly"
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/hop.dmi'
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/neutral.dmi'
glass_type = /obj/machinery/door/airlock/command/glass
airlock_type = /obj/machinery/door/airlock/hop

/obj/structure/door_assembly/hos
name = "head of security airlock assembly"
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/hos.dmi'
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/neutral.dmi'
glass_type = /obj/machinery/door/airlock/hos/glass
airlock_type = /obj/machinery/door/airlock/hos

/obj/structure/door_assembly/door_assembly_cmo
name = "chief medical officer airlock assembly"
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/cmo.dmi'
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/neutral.dmi'
glass_type = /obj/machinery/door/airlock/cmo/glass
airlock_type = /obj/machinery/door/airlock/cmo

/obj/structure/door_assembly/door_assembly_ce
name = "chief engineer airlock assembly"
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/ce.dmi'
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/neutral.dmi'
glass_type = /obj/machinery/door/airlock/ce/glass
airlock_type = /obj/machinery/door/airlock/ce

/obj/structure/door_assembly/door_assembly_rd
name = "research director airlock assembly"
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/rd.dmi'
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/neutral.dmi'
glass_type = /obj/machinery/door/airlock/rd/glass
airlock_type = /obj/machinery/door/airlock/rd

/obj/structure/door_assembly/door_assembly_qm
name = "quartermaster airlock assembly"
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/qm.dmi'
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/neutral.dmi'
glass_type = /obj/machinery/door/airlock/qm/glass
airlock_type = /obj/machinery/door/airlock/qm

/obj/structure/door_assembly/door_assembly_psych
name = "psychologist airlock assembly"
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/psych.dmi'
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/neutral.dmi'
glass_type = /obj/machinery/door/airlock/medical/glass
airlock_type = /obj/machinery/door/airlock/psych

/obj/structure/door_assembly/door_assembly_asylum
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/asylum.dmi'
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/neutral.dmi'

/obj/structure/door_assembly/door_assembly_bathroom
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/bathroom.dmi'
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/neutral.dmi'

/obj/machinery/door/airlock/hydroponics
icon = 'monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/botany.dmi'
Expand Down
0 ...thetics/airlock/icons/airlocks/asylum.dmi → .../airlock/icons/airlocks/unused/asylum.dmi
View file
File renamed without changes.
0 ...etics/airlock/icons/airlocks/bathroom.dmi → ...irlock/icons/airlocks/unused/bathroom.dmi
View file
File renamed without changes.
0 ...aesthetics/airlock/icons/airlocks/cap.dmi → ...ics/airlock/icons/airlocks/unused/cap.dmi
View file
File renamed without changes.
0 .../aesthetics/airlock/icons/airlocks/ce.dmi → ...tics/airlock/icons/airlocks/unused/ce.dmi
View file
File renamed without changes.
0 ...aesthetics/airlock/icons/airlocks/cmo.dmi → ...ics/airlock/icons/airlocks/unused/cmo.dmi
View file
File renamed without changes.
0 ...etics/airlock/icons/airlocks/firelock.dmi → ...irlock/icons/airlocks/unused/firelock.dmi
View file
File renamed without changes.
0 ...aesthetics/airlock/icons/airlocks/hop.dmi → ...ics/airlock/icons/airlocks/unused/hop.dmi
View file
File renamed without changes.
0 ...aesthetics/airlock/icons/airlocks/hos.dmi → ...ics/airlock/icons/airlocks/unused/hos.dmi
View file
File renamed without changes.
0 .../icons/airlocks/multi_tile/multi_tile.dmi → ...airlocks/unused/multi_tile/multi_tile.dmi
View file
File renamed without changes.
0 ...ck/icons/airlocks/multi_tile/overlays.dmi → ...s/airlocks/unused/multi_tile/overlays.dmi
View file
File renamed without changes.
0 ...icons/airlocks/multi_tile2/multi_tile.dmi → ...irlocks/unused/multi_tile2/multi_tile.dmi
View file
File renamed without changes.
0 ...k/icons/airlocks/multi_tile2/overlays.dmi → .../airlocks/unused/multi_tile2/overlays.dmi
View file
File renamed without changes.
0 ...sthetics/airlock/icons/airlocks/psych.dmi → ...s/airlock/icons/airlocks/unused/psych.dmi
View file
File renamed without changes.
0 .../aesthetics/airlock/icons/airlocks/qm.dmi → ...tics/airlock/icons/airlocks/unused/qm.dmi
View file
File renamed without changes.
0 .../aesthetics/airlock/icons/airlocks/rd.dmi → ...tics/airlock/icons/airlocks/unused/rd.dmi
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion monkestation/code/modules/aesthetics/subsystem/coloring.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ SUBSYSTEM_DEF(station_coloring)
wall.change_trim_color(color)

/datum/controller/subsystem/station_coloring/proc/get_default_color()
var/static/default_color = pick(list("#1a356e", "#305a6d", "#164f41"))
var/static/default_color = pick(list("#1a356e", "#305a6d", "#3a75d9"))

return default_color

Expand Down

0 comments on commit f95b7ca

Please sign in to comment.