Aronai Sieyes
1974a32d1e
Merge pull request #10918 from VOREStation/Arokha/smartdrinksfix
...
Remove unneeded update_icon() override
2021-07-05 23:58:11 +00:00
Nadyr
0f1745dd3f
Merge pull request #2423 from CHOMPStationBot/upstream-merge-10908
...
[MIRROR] Converts visible_message notice spans to look more like emotes
2021-07-05 18:43:53 -04:00
Nadyr
f2fe7aa004
powder that makes you say yes
2021-07-05 18:28:35 -04:00
Nadyr
ef70de4342
powder that makes you say yes
2021-07-05 18:22:18 -04:00
Nadyr
f7f0b143d5
Merge pull request #2424 from Shadowfire117/Casinocaretaking
...
Jukeboxes repaired and 350 new songs
2021-07-05 18:18:54 -04:00
Nadyr
e6ecc51b5c
Merge pull request #2422 from CHOMPStationBot/upstream-merge-10898
...
[MIRROR] Makes incorporeal things properly immune to bonfires and lava (and tram and elevator...)
2021-07-05 18:17:31 -04:00
Shadowfire
b1186e0f25
Actual all jukebox fixing
...
Turns out all jukeboxes were broken and fixed the issues with enabling config path and ensuring the old songs were merged into new system, as well as making a sorting system to ensure casino and non-casino tracks aren't mixed together.
2021-07-05 23:44:03 +02:00
Chompstation Bot
14129d60cf
Converts visible_message notice spans to look more like emotes
2021-07-05 20:30:12 +00:00
Chompstation Bot
d8363139ae
Makes incorporeal things properly immune to bonfires and lava (and tram and elevator...)
2021-07-05 20:26:01 +00:00
Aronai Sieyes
e9cb44d9ca
Merge pull request #10898 from Heroman3003/incorporeal-fires
...
Makes incorporeal things properly immune to bonfires and lava (and tram and elevator...)
2021-07-05 20:26:01 +00:00
Nadyr
b40f14fc6b
Merge pull request #2419 from CHOMPStationBot/upstream-merge-10905
...
[MIRROR] Fixes #10904
2021-07-05 16:19:36 -04:00
Nadyr
78698322b8
Merge pull request #2417 from CHOMPStationBot/upstream-merge-10907
...
[MIRROR] Fixes #10896
2021-07-05 16:19:18 -04:00
Nadyr
1a95ae8d0b
Merge pull request #2418 from CHOMPStationBot/upstream-merge-10906
...
[MIRROR] Fix unused var warning
2021-07-05 16:08:07 -04:00
Nadyr
e2ce9a6fbf
Merge pull request #2402 from Cyrelius/Cyrelius-patch-1
...
Darksight improvement.
2021-07-05 16:06:43 -04:00
Nadyr
568906d03c
Merge pull request #2421 from CHOMPStationBot/upstream-merge-10911
...
[MIRROR] Add painting tools for more ART
2021-07-05 16:05:43 -04:00
Nadyr
6bac30f494
Merge pull request #2420 from CHOMPStationBot/upstream-merge-10912
...
[MIRROR] Move south-facing mirrors one pixel left
2021-07-05 16:05:02 -04:00
Nadyr
221dffa8b9
Merge branch 'master' into upstream-merge-10905
2021-07-05 16:04:30 -04:00
Nadyr
4f5730fd8a
powder that makes you say yes
2021-07-05 16:03:57 -04:00
Nadyr
5280baea21
powder that makes you say yes
2021-07-05 16:03:02 -04:00
Nadyr
51c62c4ce0
Merge branch 'master' into upstream-merge-10906
2021-07-05 15:59:26 -04:00
Nadyr
81be69c813
powder that makes you say yes
2021-07-05 15:58:21 -04:00
Nadyr
f9d4c77fe1
Merge pull request #2416 from CHOMPStationBot/upstream-merge-10909
...
[MIRROR] Fixes a few issues with brackets being escaped when they shouldn't be.
2021-07-05 15:56:53 -04:00
Nadyr
9f7068ac6b
Merge pull request #2415 from CHOMPStationBot/upstream-merge-10894
...
[MIRROR] Add 3 more things banned from openspace
2021-07-05 15:56:20 -04:00
Nadyr
80cc3023ec
Merge pull request #2414 from CHOMPStationBot/upstream-merge-10891
...
[MIRROR] Split jumptomob() into do_jumptomob()
2021-07-05 15:55:50 -04:00
Nadyr
2274c1a218
Merge pull request #2413 from CHOMPStationBot/upstream-merge-10892
...
[MIRROR] Fix observer message lies
2021-07-05 15:55:13 -04:00
Nadyr
1454928858
Merge pull request #2412 from CHOMPStationBot/upstream-merge-10888
...
[MIRROR] Revert items.dm change
2021-07-05 15:54:34 -04:00
Nadyr
28a67f6999
Merge pull request #2411 from CHOMPStationBot/upstream-merge-10890
...
[MIRROR] Fixes #10884
2021-07-05 15:53:54 -04:00
Nadyr
30791fc840
Merge pull request #2410 from CHOMPStationBot/upstream-merge-10887
...
[MIRROR] Fixes (hopefully) duffle sprites
2021-07-05 15:52:54 -04:00
Shadowfire
590e4ff041
Casino jukebox update
...
temporary commit to save work
2021-07-05 19:05:10 +02:00
Chompstation Bot
70167dde60
Add painting tools for more ART
2021-07-05 16:40:36 +00:00
Chompstation Bot
e68586144e
Move south-facing mirrors one pixel left
2021-07-05 16:21:12 +00:00
Aronai Sieyes
d97ecf31fb
Merge pull request #10912 from VOREStation/Arokha/mirroricon
...
Move south-facing mirrors one pixel left
2021-07-05 16:21:12 +00:00
Chompstation Bot
7ef11b40bf
Fixes #10904
2021-07-05 16:20:05 +00:00
Chompstation Bot
e531aba8c1
Fix unused var warning
2021-07-05 16:19:57 +00:00
Chompstation Bot
6b6a138221
Fixes #10896
2021-07-05 16:19:51 +00:00
Chompstation Bot
baed73b8bb
Fixes a few issues with brackets being escaped when they shouldn't be.
2021-07-05 16:17:42 +00:00
Aronai Sieyes
bcc80d1bbb
Merge pull request #10909 from MarinaGryphon/bracketfixes
...
Fixes a few issues with brackets being escaped when they shouldn't be.
2021-07-05 16:17:41 +00:00
Chompstation Bot
5585b68ece
Add 3 more things banned from openspace
2021-07-05 06:40:07 +00:00
Aronai Sieyes
1fa01995cf
Merge pull request #10894 from VOREStation/Arokha/3more
...
Add 3 more things banned from openspace
2021-07-05 06:40:07 +00:00
Chompstation Bot
e39bb95435
Split jumptomob() into do_jumptomob()
2021-07-05 06:36:55 +00:00
Aronai Sieyes
9d12c462b3
Merge pull request #10891 from VOREStation/Arokha/fixadminjump
...
Split jumptomob() into do_jumptomob()
2021-07-05 06:36:55 +00:00
Chompstation Bot
f95380ed71
Fix observer message lies
2021-07-05 06:36:48 +00:00
Aronai Sieyes
e2ae927930
Merge pull request #10892 from VOREStation/Arokha/obsmessage
...
Fix observer message lies
2021-07-05 06:36:48 +00:00
Chompstation Bot
6dedd8ffeb
Revert items.dm change
2021-07-05 06:32:37 +00:00
Aronai Sieyes
9ed85ecb72
Merge pull request #10888 from VOREStation/Fixes/invweird
...
Revert items.dm change
2021-07-05 06:32:37 +00:00
Chompstation Bot
97a6601d44
Fixes #10884
2021-07-05 06:32:31 +00:00
Aronai Sieyes
90768085c8
Merge pull request #10890 from VOREStation/Arokha/hairfix
...
Fixes #10884
2021-07-05 06:32:31 +00:00
Chompstation Bot
7e2821f0c4
Fixes (hopefully) duffle sprites
2021-07-05 05:58:52 +00:00
Aronai Sieyes
4898ba979d
Merge pull request #10887 from SplinterGP/fixicon
...
Fixes (hopefully) duffle sprites
2021-07-05 05:58:52 +00:00
Nadyr
c194014d3f
Merge pull request #2408 from CHOMPStationBot/upstream-merge-10880
...
[MIRROR] Fix courier/messenger bag state names
2021-07-04 19:16:01 -04:00
