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

Floor Resprite - The Sequel [MDB IGNORE] #10276

Merged
merged 121 commits into from
Jan 15, 2024
Merged

Floor Resprite - The Sequel [MDB IGNORE] #10276

Show file tree
Hide file tree
Changes from 82 commits
Commits
Show all changes
121 commits
Select commit Hold shift + click to select a range
ec3f23f
basic - 1 10 23
DrDuckedGoose Oct 1, 2023
6341ea9
decal - 2 10 23
DrDuckedGoose Oct 1, 2023
d80cb5d
Update decals.dmi
DrDuckedGoose Oct 2, 2023
48fa978
Update floors.dmi
DrDuckedGoose Oct 2, 2023
d101faa
showroom & bathroom - 2 10 23
DrDuckedGoose Oct 2, 2023
f282af4
chapel - 2 10 23
DrDuckedGoose Oct 2, 2023
f77114c
cult - 3 10 23
DrDuckedGoose Oct 3, 2023
b739130
Merge branch 'BeeStation:master' into floor_two
DrDuckedGoose Oct 3, 2023
19854a5
Update floors.dmi
DrDuckedGoose Oct 4, 2023
92bc3d7
non slip - 4 10 23
DrDuckedGoose Oct 4, 2023
06ad30c
Merge remote-tracking branch 'upstream/master' into floor_two
DrDuckedGoose Oct 10, 2023
b186c98
inital - 10 10 23
DrDuckedGoose Oct 10, 2023
6bca334
e
DrDuckedGoose Oct 10, 2023
1afcd2d
grass - 11 10 23
DrDuckedGoose Oct 10, 2023
76c1a95
maints - 11 10 23
DrDuckedGoose Oct 11, 2023
fd45244
Merge remote-tracking branch 'upstream/master' into floor_texture
DrDuckedGoose Oct 11, 2023
51e8503
Merge branch 'floor_two' into floor_texture
DrDuckedGoose Oct 11, 2023
0a87228
better blending - 11 10 23
DrDuckedGoose Oct 11, 2023
672c097
better blending - 11 10 23
DrDuckedGoose Oct 11, 2023
dffd20a
Better settings & textures - 12 10 23
DrDuckedGoose Oct 12, 2023
1777f47
Update areas.dm
DrDuckedGoose Oct 12, 2023
11e2e13
Procedural damage initial - 12 10 23
DrDuckedGoose Oct 12, 2023
bec9fa8
Merge branch 'floor_two' into floor_texture
DrDuckedGoose Oct 12, 2023
9dacde6
More implementation & helpers - 12 10 23
DrDuckedGoose Oct 12, 2023
5b8e931
Blocking implementation - 12 10 23
DrDuckedGoose Oct 12, 2023
e004a7b
Update turf_damage.dmi
DrDuckedGoose Oct 13, 2023
182df4c
better icon - 13 10 23
DrDuckedGoose Oct 13, 2023
6f5ca05
better icon, for real - 13 10 23
DrDuckedGoose Oct 13, 2023
d2805ae
plaque - 15 10 23
DrDuckedGoose Oct 15, 2023
8a57977
Merge branch 'floor_two' into floor_texture
DrDuckedGoose Oct 15, 2023
5dc859f
Update floors.dmi
DrDuckedGoose Oct 15, 2023
c3690df
Merge branch 'floor_two' into floor_texture
DrDuckedGoose Oct 15, 2023
e0b31ac
Update floors.dmi
DrDuckedGoose Oct 15, 2023
1748e5b
Floor variance - 15 10 23
DrDuckedGoose Oct 15, 2023
77b2a78
Better turf textures - 15 10 23
DrDuckedGoose Oct 15, 2023
9fb6b90
Update Space_Station_13_areas.dm
DrDuckedGoose Oct 15, 2023
68e6b3c
wood - 16 10 23
DrDuckedGoose Oct 16, 2023
a81814a
grass - 16 10 23
DrDuckedGoose Oct 16, 2023
77e8954
decals 1 - 17 10 23
DrDuckedGoose Oct 17, 2023
312461a
Decals 2- 17 10 23
DrDuckedGoose Oct 17, 2023
5175ad3
mapping - 18 10 23
DrDuckedGoose Oct 17, 2023
907dee9
Update decals.dmi
DrDuckedGoose Oct 18, 2023
71a46a5
Update decals.dmi
DrDuckedGoose Oct 19, 2023
c0ff789
Update decals.dmi
DrDuckedGoose Oct 19, 2023
222492d
decals again - 20 10 23
DrDuckedGoose Oct 20, 2023
7f5ed8d
Update decals.dmi
DrDuckedGoose Oct 22, 2023
2aed784
mo wood - 22 10 23
DrDuckedGoose Oct 22, 2023
0436081
bookmark - 25 11 23
DrDuckedGoose Nov 25, 2023
21cccac
Merge remote-tracking branch 'upstream/master' into floor_two
DrDuckedGoose Nov 25, 2023
e96f4bc
bookmark - 25 11 23
DrDuckedGoose Nov 25, 2023
f18fa91
better broken stuff - 4 12 23
DrDuckedGoose Dec 4, 2023
b45024a
even better - 4 12 23
DrDuckedGoose Dec 4, 2023
890a2ee
e
DrDuckedGoose Dec 4, 2023
0ff50ce
Grime texture tweaks - 5 12 23
DrDuckedGoose Dec 5, 2023
2c4bf9d
D:
DrDuckedGoose Dec 5, 2023
d8db9ae
Swap overlays to filters for goofs - 6 12 23
DrDuckedGoose Dec 6, 2023
6611c10
bookmark - 6 12 23
DrDuckedGoose Dec 6, 2023
d206f5c
Better floor damage icons - 6 12 23
DrDuckedGoose Dec 6, 2023
60f6e16
oops
DrDuckedGoose Dec 6, 2023
0cdac0b
better blacklisting - 6 12 23
DrDuckedGoose Dec 6, 2023
f1305b0
Cleaning - 6 12 23
DrDuckedGoose Dec 6, 2023
232d3da
Reorganize - 7 12 23
DrDuckedGoose Dec 7, 2023
a54b2a4
Remapping - 7 12 23
DrDuckedGoose Dec 7, 2023
365ed37
bruh
DrDuckedGoose Dec 7, 2023
6bfe4cb
Organize - 7 12 23
DrDuckedGoose Dec 7, 2023
32606ab
Fix cleaning - 7 12 23
DrDuckedGoose Dec 7, 2023
a738ab0
Update turf_texture.dm
DrDuckedGoose Dec 7, 2023
f7efb2c
Update turf_texture.dm
DrDuckedGoose Dec 7, 2023
179766b
Update turf.dm
DrDuckedGoose Dec 7, 2023
de3b38a
Mapping - 7 12 23
DrDuckedGoose Dec 7, 2023
4b8e448
Merge https://github.com/BeeStation/BeeStation-Hornet into floor_two
DrDuckedGoose Dec 7, 2023
bb4af37
Update MetaStation.dmm
DrDuckedGoose Dec 7, 2023
74437a6
Grimy - 9 12 23
DrDuckedGoose Dec 9, 2023
b845cf3
Floor variance - 9 12 23
DrDuckedGoose Dec 9, 2023
10d5b5b
Decals - 9 12 23
DrDuckedGoose Dec 9, 2023
a935a69
Merge https://github.com/BeeStation/BeeStation-Hornet into floor_two
DrDuckedGoose Dec 10, 2023
1b2cde5
Update beestation.dme
DrDuckedGoose Dec 10, 2023
650d63c
Improve damage states - 10 12 23
DrDuckedGoose Dec 10, 2023
f832daa
Steal grass from Paradise - 13 12 23
DrDuckedGoose Dec 13, 2023
56ff3d7
Better turf offsets - 14 12 23
DrDuckedGoose Dec 14, 2023
b5285c7
Merge branch 'master' into floor_two
DrDuckedGoose Dec 14, 2023
04b796e
Merge branch 'master' into floor_two
DrDuckedGoose Dec 15, 2023
6950be2
Grass - 16 12 23
DrDuckedGoose Dec 15, 2023
78a48bf
Port that stuff - 16 12 23
DrDuckedGoose Dec 16, 2023
d788f13
Merge https://github.com/BeeStation/BeeStation-Hornet into floor_two
DrDuckedGoose Dec 16, 2023
e844ddc
fugg
DrDuckedGoose Dec 16, 2023
81ccd11
Merge https://github.com/BeeStation/BeeStation-Hornet into floor_two
DrDuckedGoose Dec 18, 2023
e3bf2e7
Merge https://github.com/BeeStation/BeeStation-Hornet into floor_two
DrDuckedGoose Dec 19, 2023
d19a7b9
review - 20 12 23
DrDuckedGoose Dec 20, 2023
de38350
More opt - 20 12 23
DrDuckedGoose Dec 20, 2023
891520c
oops
DrDuckedGoose Dec 20, 2023
457a4c1
Merge https://github.com/BeeStation/BeeStation-Hornet into floor_two
DrDuckedGoose Dec 20, 2023
9e0547f
Fix broken states - 20 12 23
DrDuckedGoose Dec 20, 2023
ba26cce
oops - 20 12 23
DrDuckedGoose Dec 20, 2023
a55b489
update monotiles - 20 12 23
DrDuckedGoose Dec 20, 2023
b792a6f
Update turf_texture.dm
DrDuckedGoose Dec 20, 2023
db8bf84
Fix noslip - 22 12 23
DrDuckedGoose Dec 22, 2023
2f0b1c9
More globals - 22 12 23
DrDuckedGoose Dec 22, 2023
38a6905
Update decals.dmi
DrDuckedGoose Dec 22, 2023
40fb2ee
Update _open.dm
DrDuckedGoose Jan 5, 2024
81eadc0
rename procs - 7 1 24
DrDuckedGoose Jan 7, 2024
17258fb
Pigeon Requests - 9 1 24
DrDuckedGoose Jan 9, 2024
7daf8ea
Merge branch 'master' into floor_two
DrDuckedGoose Jan 9, 2024
c2644ca
Update misc_plating.dm
DrDuckedGoose Jan 9, 2024
009d199
Requests - 11 1 24
DrDuckedGoose Jan 11, 2024
bbeae42
Merge branch 'master' into floor_two
DrDuckedGoose Jan 11, 2024
ea14cc1
noslip - 11 1 24
DrDuckedGoose Jan 11, 2024
61fc7db
Merge branch 'floor_two' of https://github.com/DrDuckedGoose/BeeStati…
DrDuckedGoose Jan 11, 2024
95ec652
Update fancy_floor.dm
DrDuckedGoose Jan 11, 2024
d723970
Update turf.dm
DrDuckedGoose Jan 11, 2024
8de7fbd
Review - 11 1 124
DrDuckedGoose Jan 11, 2024
d6307d9
Merge https://github.com/BeeStation/BeeStation-Hornet into floor_two
DrDuckedGoose Jan 11, 2024
a9fe463
Merge https://github.com/BeeStation/BeeStation-Hornet into floor_two
DrDuckedGoose Jan 13, 2024
9864062
Update fancy_floor.dm
DrDuckedGoose Jan 14, 2024
6981313
Generic materials - 15 1 24
DrDuckedGoose Jan 15, 2024
7072106
Merge https://github.com/BeeStation/BeeStation-Hornet into floor_two
DrDuckedGoose Jan 15, 2024
19fcd8a
Update MetaStation.dmm
DrDuckedGoose Jan 15, 2024
f8b27ab
Update MetaStation.dmm
DrDuckedGoose Jan 15, 2024
0db696e
Update a tile icon - 15 1 24
DrDuckedGoose Jan 15, 2024
fb6a0f5
Update mapping_helpers.dmi
DrDuckedGoose Jan 15, 2024
7da346f
Update mapping_helpers.dmi
DrDuckedGoose Jan 15, 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
33 changes: 14 additions & 19 deletions _maps/RandomRooms/10x10/sk_rdm033_deltalibrary.dmm
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion _maps/RandomRooms/10x10/sk_rdm060_snakefighter.dmm
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions _maps/RandomRooms/10x10/sk_rdm070_pubbybar.dmm
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading