Commit Graph

9898 Commits

Author SHA1 Message Date
Nadyr
b90a37b854 Merge pull request #2490 from CHOMPStationBot/upstream-merge-10995
[MIRROR] Properly Adds Bio-Regenerator to Surgery Bag
2021-07-10 01:47:51 -04:00
Nadyr
60fa095962 Merge pull request #2488 from CHOMPStationBot/upstream-merge-10993
[MIRROR] Stack Examine Improvements, Log Examine Fix
2021-07-10 01:47:29 -04:00
Nadyr
48c609ddca Merge pull request #2487 from CHOMPStationBot/upstream-merge-10988
[MIRROR] Fixes #10885
2021-07-10 01:38:31 -04:00
Nadyr
c229da42a6 Merge pull request #2486 from CHOMPStationBot/upstream-merge-10989
[MIRROR] Fixes pocky having no sprite.
2021-07-10 01:36:36 -04:00
Nadyr
49866902a7 Merge pull request #2479 from CHOMPStationBot/upstream-merge-10980
[MIRROR] Expands do_after/do_mob exclusive var to affect target
2021-07-10 01:30:52 -04:00
Nadyr
d9dd108539 Merge pull request #2466 from CHOMPStationBot/upstream-merge-10963
[MIRROR] Byond will never stop with this huh
2021-07-10 00:45:05 -04:00
Nadyr
2cad763c26 Merge pull request #2447 from CHOMPStationBot/upstream-merge-10852
[MIRROR] Use material defines more
2021-07-09 23:22:03 -04:00
Novacat
29b5b3bf05 Merge pull request #10995 from Enzo-Leon/medical_tools
Properly Adds Bio-Regenerator to Surgery Bag
2021-07-09 18:24:29 +00:00
Aronai Sieyes
205ef740bd Merge pull request #10993 from MarinaGryphon/issue/logpile
Stack Examine Improvements, Log Examine Fix
2021-07-09 16:19:16 +00:00
Aronai Sieyes
c495e183a8 Merge pull request #10988 from MarinaGryphon/issue/10885
Fixes #10885
2021-07-09 16:18:08 +00:00
Aronai Sieyes
e4692d0b94 Merge pull request #10989 from MarinaGryphon/issue/pocky
Fixes pocky having no sprite.
2021-07-09 16:18:00 +00:00
Aronai Sieyes
f835374f26 Merge pull request #10980 from MarinaGryphon/issue/8289
Expands do_after/do_mob exclusive var to affect target
2021-07-09 16:14:12 +00:00
Aronai Sieyes
22e6adb253 Merge pull request #10963 from VOREStation/Arokha/artREALLY
Byond will never stop with this huh
2021-07-08 04:54:26 +00:00
Nadyr
7438d0f486 Merge pull request #2453 from CHOMPStationBot/upstream-merge-10948
[MIRROR] Adds a weretiger.
2021-07-08 00:15:00 -04:00
Nadyr
2c1005a60f Merge pull request #2448 from CHOMPStationBot/upstream-merge-10937
[MIRROR] Some plane tweaks.
2021-07-08 00:14:47 -04:00
Nadyr
70fcf38987 powder that makes you say yes 2021-07-07 23:58:56 -04:00
Nadyr
8b67f6b69d Merge pull request #2451 from CHOMPStationBot/upstream-merge-10949
[MIRROR] More painting tweaks
2021-07-07 23:56:53 -04:00
Nadyr
21aa0be248 Merge pull request #2444 from CHOMPStationBot/upstream-merge-10938
[MIRROR] Art removal tweaks
2021-07-07 23:52:59 -04:00
Chompstation Bot
28c2ee46d3 Adds a weretiger. 2021-07-07 21:08:45 +00:00
Aronai Sieyes
a0b482e956 Merge pull request #10949 from VOREStation/Arokha/persistcross
More painting tweaks
2021-07-07 21:07:31 +00:00
Chompstation Bot
ef79e49ee2 Some plane tweaks. 2021-07-07 19:03:14 +00:00
Chompstation Bot
287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00
Aronai Sieyes
7c93723da5 Merge pull request #10938 from VOREStation/Arokha/paint
Art removal tweaks
2021-07-07 18:41:21 +00:00
Aronai Sieyes
1deccaed87 Merge pull request #10931 from Very-Soft/ghostlyanimals
Makes ghosts able to play as some mobs sometimes
2021-07-07 18:37:53 +00:00
Nadyr
a2c1ee213a Merge pull request #2433 from CHOMPStationBot/upstream-merge-10927
[MIRROR] Add pouches!
2021-07-05 23:32:49 -04:00
Chompstation Bot
b99adcaca4 Add pouches! 2021-07-06 01:00:11 +00:00
Aronai Sieyes
78eb4608d2 Merge pull request #10923 from VOREStation/Arokha/mult
Fix multitool runtime
2021-07-05 23:57:53 +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
Chompstation Bot
14129d60cf Converts visible_message notice spans to look more like emotes 2021-07-05 20:30:12 +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
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
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
Chompstation Bot
70167dde60 Add painting tools for more ART 2021-07-05 16:40:36 +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
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
Aronai Sieyes
9ed85ecb72 Merge pull request #10888 from VOREStation/Fixes/invweird
Revert items.dm change
2021-07-05 06:32:37 +00:00
Nadyr
138e9b65a2 Merge pull request #2406 from CHOMPStationBot/upstream-merge-10867
[MIRROR] Fix excessive table merge, convert climbers lazy
2021-07-04 19:15:07 -04:00
Aronai Sieyes
c30f4c2dbc Merge pull request #10867 from VOREStation/Fixes/10787
Fix excessive table merge, convert climbers lazy
2021-07-04 22:48:12 +00:00
Aronai Sieyes
964e37a020 Merge pull request #10878 from VOREStation/Fixes/10876
Fix canvas sprites
2021-07-04 22:46:31 +00:00
Nadyr
70f951b691 Merge pull request #2398 from CHOMPStationBot/upstream-merge-10862
[MIRROR] More decorations, fancy suit dispenser, angry generator
2021-07-04 16:10:02 -04:00
Aronai Sieyes
fdf4e56451 Merge pull request #10862 from VOREStation/Icons/moredeco
More decorations, fancy suit dispenser, angry generator
2021-07-04 04:29:52 +00:00
Aronai Sieyes
d87b3c84e5 Merge pull request #10859 from VOREStation/Arokha/iconfixes
Random item missing sprites
2021-07-04 03:17:27 +00:00
Chompstation Bot
275458f14a Port in-game painting from /tg/ 2021-07-03 22:31:15 -04:00
Nadyr
c21ee657fe Merge pull request #2385 from CHOMPStationBot/upstream-merge-10794
[MIRROR] Port various backpacks
2021-07-03 21:40:25 -04:00
Nadyr
23a4648f87 Merge pull request #2382 from CHOMPStationBot/upstream-merge-10854
[MIRROR] Fix indentation
2021-07-03 21:22:19 -04:00
Nadyr
9ac6347212 Merge pull request #2381 from CHOMPStationBot/upstream-merge-10846
[MIRROR] Make smol holders use vis_contents
2021-07-03 21:19:12 -04:00
Nadyr
24fd91203f Merge pull request #2388 from CHOMPStationBot/upstream-merge-10780
[MIRROR] Port Eris grenade sprites
2021-07-03 21:18:06 -04:00
Nadyr
6660a70e82 Merge pull request #2387 from CHOMPStationBot/upstream-merge-10782
[MIRROR] Port Eris Trashbag of Holding
2021-07-03 21:17:31 -04:00
Nadyr
55b85e0ccf Merge pull request #2386 from CHOMPStationBot/upstream-merge-10789
[MIRROR] Port Bay microwave, utensil/kitchen knife sprites
2021-07-03 21:16:45 -04:00