izac112
9c883d8013
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-12-11 23:36:28 +01:00
Heroman
ad1e439e49
Limits painting name length to 250 characters
2021-12-11 20:59:33 +10:00
izac112
537a4fac8b
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-12-08 13:59:15 +01:00
Casey and GitHub
492c12d9ad
Merge pull request #11975 from KillianKirilenko/kk-knockknock
...
Door Interact Tweaks
2021-12-06 05:57:21 -05:00
Killian
290529c202
door interact tweaks
2021-12-05 11:25:20 +00:00
Heroman
796aae194c
Allows simplemobs climb ladders + trash pile interaction fix
2021-12-05 09:36:39 +10:00
izac112
f9c441dc6d
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-12-03 16:30:19 +01:00
VerySoft
2bf704a741
Is it the final one???
2021-12-02 04:05:53 -05:00
VerySoft
d2e0ebe9d6
One more for awooing
2021-12-01 11:10:44 -05:00
Casey and GitHub
947ad6862e
Merge pull request #11894 from Heroman3003/framefix
...
Fixes some janky frame issues
2021-11-22 23:35:22 -05:00
Heroman
6b168ae5f0
Fixes some janky frame issues
2021-11-22 06:52:33 +10:00
Heroman
f3cbaa4413
Adds leather gloves to (xeno)botanist lockers
2021-11-21 13:50:36 +10:00
Killian
dca7626ac7
Merge remote-tracking branch 'upstream/master' into kk-talon
2021-11-17 20:43:35 +00:00
Killian
cdf61f9b24
Update walllocker.dm
...
adds light sources and kicks CI again
2021-11-17 20:25:17 +00:00
izac112
d1f4fac198
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-11-16 19:02:28 +01:00
MistakeNot4892 and VirgoBot
3f9af78f3a
/atom New() => Initialize() [MDB IGNORE]
2021-11-14 03:09:51 -05:00
Casey and GitHub
b8217fb7a8
Merge pull request #11819 from PastelPrinceDan/berets
...
department berets (mostly heads tbh)
2021-11-12 05:27:08 -05:00
PastelPrinceDan
fe20fabd8f
woo yeah woo berets yeaaaah woo!!!!
2021-11-12 09:16:55 +00:00
VerySoft
e9f220f408
Adds catslug to maintpred options
2021-11-11 05:48:28 -05:00
izac112
261609b060
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-11-07 12:32:36 +01:00
Heroman
1ce9880aeb
Fixes infinite glass from low walls
2021-11-05 15:54:53 +10:00
Killian
fcfa8a56bd
Talon Improvements
2021-11-03 10:58:07 +00:00
izac112
99243b1ce0
Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore ; branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-11-02 11:47:33 +01:00
Aronai Sieyes and GitHub
b4ce0442cd
Merge pull request #11722 from KillianKirilenko/kk-misc
...
Hardwood Material Port
2021-10-30 17:25:23 -04:00
izac112
b84b992c75
Update cargo.dm
2021-10-28 21:42:54 +02:00
izac112
a274077bfa
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-10-28 21:04:37 +02:00
Killian
70b88ad181
hardwood material port
2021-10-28 10:21:38 +01:00
VerySoft
a4cdc80f8c
Stellar delight map files
...
Files for the stellar delight to work probably
there are also some edits to tether and other misc files for the purpose of making things work with multiple maps
CREMATORIUM NO GET TAG
2021-10-27 19:52:39 -04:00
Casey and GitHub
5d3de0b351
Merge pull request #11653 from VOREStation/upstream-merge-8313
...
[MIRROR] Fixes displaced steel displaced
2021-10-27 11:28:03 -04:00
Aronai Sieyes and GitHub
6a46891e93
Merge pull request #11544 from VOREStation/upstream-merge-8230
...
[MIRROR] Separates Swimsuit and Athletic Lockers, Adds Wetsuits
2021-10-22 14:23:22 -04:00
Ghost Actual and GitHub
60e1abe927
Misc additions I made while sleep deprived ( #11535 )
...
* Base Commit
* Small Fix
* Small Fix
* Small Fix
2021-10-22 13:49:13 -04:00
MistakeNot4892 and VirgoBot
3a1583802f
Merge pull request #8313 from Verkister/patch-78
...
Fixes displaced steel displaced
2021-10-04 00:15:37 -04:00
izac112
84b075457b
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-09-29 23:09:10 +02:00
Killian
8a1c6d1e85
my god jc, belts!
2021-09-27 20:09:59 +01:00
Ghost Actual and GitHub
0085a5bd10
Adds more clothing from Polaris and various sources ( #11546 )
...
* Base Commit
* Secondary Commit
* Small Addition
* Small Fix
* Yet another Commit
* small fix
* Small Fix
* Small Addition
* More Commit
* I don't know how to stop
* ushanka
* Small Fix
* *aaaaaaa*
* another add-on
* Small Fix
* Revert "Small Fix"
This reverts commit e674b81a0ddee893c6aa2dcdb92040040677351a.
* Conflict Fixes
* Revert "Conflict Fixes"
This reverts commit 1af644bdcab78018aa73525125b32e522d08db41.
* Conflict Fix 2
2021-09-27 14:31:10 -04:00
Killian
1233dd7966
Merge remote-tracking branch 'upstream/master' into kk-knockknock
2021-09-26 15:58:59 +01:00
izac112
baf5a6a16f
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-09-24 12:10:50 +02:00
Killian
9703b1d444
sounds & safety
...
- adds a click cooldown so you can't spam tons of noise
- doesn't flick the deny animation unless the door is closed and powered
- alt-clicking on an unpowered door knocks rather than buzzing
- adds a knocking sound for wood (from freesound)
2021-09-17 23:40:58 +01:00
Killian
97b5cb426b
KNOCK KNOCK. WHO'S THERE?
...
ME! *KRAAAAK!*
2021-09-14 07:01:24 +01:00
MistakeNot4892 and VirgoBot
af1aefca47
Separates Swimsuit and Athletic Lockers, Adds Wetsuits
2021-08-31 22:18:06 -04:00
izac112
f3c88225ce
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-08-29 10:22:30 +02:00
Sym
13cc171842
DO'H
...
I don't know why I thought that was a good idea.
2021-08-28 17:57:33 -04:00
Sym
0e45d5ddea
Overhauls Resin ability, deletes unused xeno sprites, fixes few things.
2021-08-28 17:31:01 -04:00
Aronai Sieyes and GitHub
fd751928e5
Merge pull request #11499 from VOREStation/upstream-merge-8233
...
[MIRROR] Ports sliding things along tables
2021-08-26 16:17:18 -04:00
Aronai Sieyes
8557966aee
Adapt for virgo code
2021-08-26 13:57:19 -04:00
Aronai Sieyes and GitHub
794fae8235
Merge pull request #11493 from VOREStation/upstream-merge-8241
...
[MIRROR] Sleep Tight Disky
2021-08-26 12:52:54 -04:00
Aronai Sieyes
7994cd6eb3
Bad fix WIP
2021-08-26 12:07:53 -04:00
Ghost Actual and GitHub
4bb386e166
Expanding Clothing Options ( #11466 )
...
* Base Commit
* Second Commit
* Third Commit
* Fourth Commit
* Fifth Commit
* Sixth Commit
* Seventh Commit
* Final (?) Commit
* Small Fix
* Small Fix
* Merge Fix
* Small Fix
* Additional Goods
* Small Fix
2021-08-26 11:43:44 -04:00
Aronai Sieyes and GitHub
e5c108269d
Merge pull request #11454 from VOREStation/Arokha/stacks
...
Make stack amount var private
2021-08-26 11:38:33 -04:00
MistakeNot4892 and VirgoBot
2ad341babf
Merge pull request #8241 from Cerebulon/disky
...
Sleep Tight Disky
2021-08-25 21:44:52 -04:00