izac112
87ce13b27c
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-2
2024-12-04 15:17:00 +01:00
izac112
058f219cb9
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
2024-11-30 23:30:26 +01:00
Kashargul
49d89c0059
usr to user up to player effects
2024-11-12 00:10:20 +01:00
Kashargul
a2c673ab7a
refactors most spans
2024-10-02 21:10:31 +02:00
Guti
409aaba802
Remove
2024-09-09 02:36:53 +02:00
Kashargul and GitHub
cc737be0a0
bunch of to_chat failures
2024-09-01 04:10:55 +02:00
izac112
42b345b3cc
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
2024-08-28 20:22:38 +02:00
Killian
388736f98d
techmaint tile fixes
2024-08-03 18:28:13 +01:00
Drathek and GitHub
7c8bb85de3
Whitespace Standardization [MDB IGNORE] ( #15748 )
...
* Update settings
* Whitespace changes
* Comment out merger hooks in gitattributes
Corrupt maps would have to be resolved in repo before hooks could be updated
* Revert "Whitespace changes"
This reverts commit afbdd1d8442973f5d570c30920d9d865b5acd479.
* Whitespace again minus example
* Gitignore example changelog
* Restore changelog merge setting
* Keep older dmi hook attribute until hooks can be updated
* update vscode settings too
* Renormalize remaining
* Revert "Gitignore example changelog"
This reverts commit de22ad375d3ee4d5930c550da2fd23a29a86e616.
* Attempt to normalize example.yml (and another file I guess)
* Try again
2024-02-20 11:28:51 +01:00
Repede
734ead1be6
Ready to review version
2024-01-18 18:37:54 -05:00
Repede
29fd7df39f
Draft
2024-01-18 00:47:56 -05:00
izac112
a17d96cb92
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-10-30 11:24:00 +01:00
Heroman
9a94306585
Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one
2023-10-01 09:34:43 +10:00
izac112
4088f40cc9
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-08-24 18:27:07 +02:00
Heroman
63e9a069be
Compatibility fixes
2023-07-07 17:17:49 +10:00
Heroman3003 and GitHub
6c136a427e
Update tile_types.dm
2023-07-07 16:52:55 +10:00
Varlaisvea and VirgoBot
1ae49ef905
the little construction pr
2023-03-08 23:24:56 -05:00
izac112
f61e9a6a39
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-01-29 21:52:44 +01:00
Heroman
d2e2bf9d66
Makes all carpet types orderable and gives them tile icons
2023-01-13 17:15:44 +10:00
izac112
1a7326e546
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-10-16 23:13:42 +02:00
Killian
33efd08ddb
talon, vb, and typhon fixes
2022-10-12 13:25:58 +01:00
izac112
8f96195fdb
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-07-23 13:40:54 +02:00
Heroman
69cbc2e62b
Fixes conflicts with casino PR
2022-07-12 16:12:00 +10:00
izac112
4e5f16920f
compile errors
2022-07-09 11:20:03 +02:00
izac112
71d069887c
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-07-08 15:49:48 +02:00
klaasjared
e410047ff8
Conflict Fix
2022-06-30 19:45:03 -04:00
Heroman
8e1b2e6ea1
Adds Happy carpet
2022-06-19 11:53:23 +10:00
Casey and GitHub
0f7ef0cce1
Merge pull request #12800 from VOREStation/upstream-merge-8556
...
[MIRROR] Adds Some More Decorative Flooring Types
2022-06-18 20:44:13 -04:00
VerySoft
f7f9d4f5f0
Fixy
2022-06-18 20:31:11 -04:00
izac112
891967a990
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-06-06 15:26:15 +02:00
Foopwo
74c2b0e62a
Fixes plating v3b grass. Removes unused sif tile items.
2022-05-22 13:52:31 -07:00
Sypsoti and VirgoBot
4cbe9a028e
Adds Some More Decorative Flooring Types
2022-04-19 12:12:56 -04:00
izac112
7a68ddf07d
Update tile_types_yw.dm
2021-07-30 10:56:06 +02:00
izac112
d00fa0a727
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-07-30 10:55:58 +02:00
Aronai Sieyes
3075ca8b01
Add arcadey carpets
2021-07-29 14:31:40 -04:00
izac112
dd8893112f
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-07-08 09:40:23 +02:00
Aronai Sieyes
b71c7e7271
Use material defines more
2021-07-03 18:18:05 -04:00
izac112
054b1f0f8a
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
2021-03-01 17:25:41 +01:00
MistakeNot4892 and Unknown
3e804dc799
Sideports a couple of init unit tests from Neb.
2021-02-27 13:05:16 -05:00
izac112
5b49bbe887
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-02-02 21:56:58 +01:00
Nadyr and VirgoBot
4989c4423a
Fixes sif forest grass, adds overgrowth tiles ( #7841 )
2021-01-27 14:21:17 -05:00
izac112
5d64303087
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-11-17 16:26:30 +01:00
Atermonera and VirgoBot
125ef651c8
Adds sifgrass floor tiles. Grass tiles spawn greengrass ( #7714 )
2020-10-17 02:05:55 -04:00
izac112
4b051c23fc
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-09-13 15:05:53 +02:00
Rykka
d2fb9a7691
Rebase onto Master for Volume Control Panel, Squash Commits
2020-08-27 19:47:38 -04:00
Izac Joof Forsgren and GitHub
cf891ce999
Update code/game/objects/items/stacks/tiles/tile_types.dm
2020-07-04 08:26:15 +02:00
Luke Vale
8221cbc4ad
Adds in the files because I'm a dummy
2020-07-04 01:25:23 -05:00
Luke Vale
2098a55ae7
Adds in the other carpet types as a buyable crate.
2020-07-04 01:18:26 -05:00
BillyBangles and VirgoBot
75901775a0
Adds marble floor tiles and crafting recipe ( #7264 )
...
* Adds marble floor tiles and crafting recipe
* swaps screwdriver removal for crowbar
* changelog fix
i'm a silly goose and forgot to edit out the screwdriver bit
2020-06-06 14:36:25 -04:00
Atermonera and VirgoBot
8d2b41ad2c
Big Bastard Incidental Sound Port
2020-03-15 14:39:19 -04:00
izac112