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.

Sign up for GitHub

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

[Wall Resprite] Wall-9000 #2315

Draft
wants to merge 16 commits into
base: master
Choose a base branch
from
Draft

[Wall Resprite] Wall-9000 #2315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1f41f4f
the start
CannibalHunter Jun 9, 2024
82cdce0
window structures
CannibalHunter Jun 17, 2024
b2f2c7a
grille. wall-4
CannibalHunter Jun 17, 2024
f152b37
tinted window dm icon change
CannibalHunter Jun 17, 2024
b3dde46
Merge branch 'Monkestation:master' into wall-man-9000-real
CannibalHunter Aug 2, 2024
00a9473
Merge branch 'master' into wall-man-9000-real
CannibalHunter Sep 16, 2024
aad91fa
airlocks-station-folder
CannibalHunter Sep 16, 2024
e30b6d0
station2 and external
CannibalHunter Sep 16, 2024
f95b7ca
window colors and put unused icons into an unused folder
CannibalHunter Sep 16, 2024
e10d6d8
door overlays glass fix
CannibalHunter Sep 16, 2024
bc3aff0
hatch
CannibalHunter Sep 16, 2024
2796616
Merge branch 'Monkestation:master' into wall-man-9000-real
CannibalHunter Sep 23, 2024
4414655
shuttle and tram walls
CannibalHunter Oct 1, 2024
5732cbb
uranium walls
CannibalHunter Oct 1, 2024
1cf89cd
diamond wall
CannibalHunter Oct 19, 2024
e978fc3
Merge branch 'master' into wall-man-9000-real
CannibalHunter Nov 5, 2024
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,3 +244,5 @@ config/dbconfig.txt

# Running OpenDream locally
tgstation.json
_maps/map_files/debug/wallsanddoorstest.dmm
_maps/wallsanddoorstest.json
40 changes: 20 additions & 20 deletions monkestation/code/modules/aesthetics/airlock/airlock.dm
View file
Open in desktop
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
Binary file modified monkestation/code/modules/aesthetics/airlock/icons/airlocks/external/external.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/code/modules/aesthetics/airlock/icons/airlocks/external/overlays.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/code/modules/aesthetics/airlock/icons/airlocks/hatch/centcom.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/code/modules/aesthetics/airlock/icons/airlocks/hatch/maintenance.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/code/modules/aesthetics/airlock/icons/airlocks/hatch/overlays.dmi
View file
Open in desktop
Binary file not shown.
Binary file added monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/_base.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/atmos.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/bananium.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/botany.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/command.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/corporate.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/diamond.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/engineering.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/freezer.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/gold.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/maintenance.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/maintenanceexternal.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/medical.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/mining.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/neutral.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/overlays.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/plasma.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/public.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/research.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/sandstone.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/science.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/security.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/security2.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/securitysoul.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/service.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/silver.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/uranium.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/virology.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/code/modules/aesthetics/airlock/icons/airlocks/station/wood.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/code/modules/aesthetics/airlock/icons/airlocks/station2/glass.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/code/modules/aesthetics/airlock/icons/airlocks/station2/overlays.dmi
View file
Open in desktop
Binary file not shown.
0 ...thetics/airlock/icons/airlocks/asylum.dmi → .../airlock/icons/airlocks/unused/asylum.dmi
View file
Open in desktop
File renamed without changes.
0 ...etics/airlock/icons/airlocks/bathroom.dmi → ...irlock/icons/airlocks/unused/bathroom.dmi
View file
Open in desktop
File renamed without changes.
0 ...aesthetics/airlock/icons/airlocks/cap.dmi → ...ics/airlock/icons/airlocks/unused/cap.dmi
View file
Open in desktop
File renamed without changes.
0 .../aesthetics/airlock/icons/airlocks/ce.dmi → ...tics/airlock/icons/airlocks/unused/ce.dmi
View file
Open in desktop
File renamed without changes.
0 ...aesthetics/airlock/icons/airlocks/cmo.dmi → ...ics/airlock/icons/airlocks/unused/cmo.dmi
View file
Open in desktop
File renamed without changes.
0 ...etics/airlock/icons/airlocks/firelock.dmi → ...irlock/icons/airlocks/unused/firelock.dmi
View file
Open in desktop
File renamed without changes.
0 ...aesthetics/airlock/icons/airlocks/hop.dmi → ...ics/airlock/icons/airlocks/unused/hop.dmi
View file
Open in desktop
File renamed without changes.
0 ...aesthetics/airlock/icons/airlocks/hos.dmi → ...ics/airlock/icons/airlocks/unused/hos.dmi
View file
Open in desktop
File renamed without changes.
0 .../icons/airlocks/multi_tile/multi_tile.dmi → ...airlocks/unused/multi_tile/multi_tile.dmi
View file
Open in desktop
File renamed without changes.
0 ...ck/icons/airlocks/multi_tile/overlays.dmi → ...s/airlocks/unused/multi_tile/overlays.dmi
View file
Open in desktop
File renamed without changes.
0 ...icons/airlocks/multi_tile2/multi_tile.dmi → ...irlocks/unused/multi_tile2/multi_tile.dmi
View file
Open in desktop
File renamed without changes.
0 ...k/icons/airlocks/multi_tile2/overlays.dmi → .../airlocks/unused/multi_tile2/overlays.dmi
View file
Open in desktop
File renamed without changes.
0 ...sthetics/airlock/icons/airlocks/psych.dmi → ...s/airlock/icons/airlocks/unused/psych.dmi
View file
Open in desktop
File renamed without changes.
0 .../aesthetics/airlock/icons/airlocks/qm.dmi → ...tics/airlock/icons/airlocks/unused/qm.dmi
View file
Open in desktop
File renamed without changes.
0 .../aesthetics/airlock/icons/airlocks/rd.dmi → ...tics/airlock/icons/airlocks/unused/rd.dmi
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion monkestation/code/modules/aesthetics/subsystem/coloring.dm
View file
Open in desktop
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
2 changes: 2 additions & 0 deletions monkestation/code/modules/aesthetics/walls/_closed.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/turf/closed/indestructible/riveted/uranium
icon = 'monkestation/icons/turf/walls/uranium_wall.dmi'
8 changes: 8 additions & 0 deletions monkestation/code/modules/aesthetics/walls/false_walls.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/obj/structure/falsewall/titanium
icon = 'monkestation/icons/turf/walls/shuttle_wall.dmi'

/obj/structure/falsewall/uranium
icon = 'monkestation/icons/turf/walls/uranium_wall.dmi'

/obj/structure/falsewall/diamond
icon = 'monkestation/icons/turf/walls/diamond_wall.dmi'
11 changes: 11 additions & 0 deletions monkestation/code/modules/aesthetics/walls/mineral_walls.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/turf/closed/wall/mineral/titanium
icon = 'monkestation/icons/turf/walls/shuttle_wall.dmi'

/turf/closed/wall/mineral/titanium/nodiagonal
icon = 'monkestation/icons/turf/walls/shuttle_wall.dmi'

/turf/closed/wall/mineral/uranium
icon = 'monkestation/icons/turf/walls/uranium_wall.dmi'

/turf/closed/wall/mineral/diamond
icon = 'monkestation/icons/turf/walls/diamond_wall.dmi'
6 changes: 6 additions & 0 deletions monkestation/code/modules/aesthetics/walls/tram_walls.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/obj/structure/tramwall/titanium
icon = 'monkestation/icons/turf/walls/tram_wall.dmi'


/obj/structure/tramwall/uranium
icon = 'monkestation/icons/turf/walls/uranium_wall.dmi'
Binary file modified monkestation/icons/obj/structures/window/adapters.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/icons/obj/structures/window/grille.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/icons/obj/structures/window/plasma_window.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/icons/obj/structures/window/reinforced_window.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/icons/obj/structures/window/rplasma_window.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/icons/obj/structures/window/tinted_window.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/icons/obj/structures/window/window.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/icons/obj/structures/window/window_sill.dmi
View file
Open in desktop
Binary file not shown.
Binary file added monkestation/icons/turf/walls/diamond_wall.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/icons/turf/walls/reinforced_wall.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/icons/turf/walls/reinforced_wall_trim.dmi
View file
Open in desktop
Binary file not shown.
Binary file added monkestation/icons/turf/walls/shuttle_wall.dmi
View file
Open in desktop
Binary file not shown.
Binary file added monkestation/icons/turf/walls/tram_wall.dmi
View file
Open in desktop
Binary file not shown.
Binary file added monkestation/icons/turf/walls/uranium_wall.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/icons/turf/walls/wall.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified monkestation/icons/turf/walls/wall_trim.dmi
View file
Open in desktop
Binary file not shown.
4 changes: 4 additions & 0 deletions tgstation.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6054,7 +6054,11 @@
#include "monkestation\code\modules\aesthetics\objects\window_sill.dm"
#include "monkestation\code\modules\aesthetics\objects\windows.dm"
#include "monkestation\code\modules\aesthetics\subsystem\coloring.dm"
#include "monkestation\code\modules\aesthetics\walls\_closed.dm"
#include "monkestation\code\modules\aesthetics\walls\false_walls.dm"
#include "monkestation\code\modules\aesthetics\walls\iron.dm"
#include "monkestation\code\modules\aesthetics\walls\mineral_walls.dm"
#include "monkestation\code\modules\aesthetics\walls\tram_walls.dm"
#include "monkestation\code\modules\and_roll_credits\_credits.dm"
#include "monkestation\code\modules\and_roll_credits\credits_subsystem.dm"
#include "monkestation\code\modules\and_roll_credits\episode_names.dm"
Expand Down
Loading