Commit Graph

430 Commits

Author SHA1 Message Date
Casey
b1152c170e Merge pull request #13683 from TheGreatKitsune/dexterity-fix
Fixes bug regarding feral xenochimera and treating others/being treated
2022-09-10 20:37:05 +00:00
Casey
8a0aef53f8 Merge pull request #13658 from Heroman3003/stackruntime
fixes runtime with stack dna transfer
2022-09-04 21:50:22 +00:00
Casey
ac204e7749 Replaces some old code w/ IsAdvancedToolUser and fixes twohanded weapons for simple_mobs 2022-07-29 20:48:29 +00:00
Casey
8d83d4d3fd Adds roulette balls 2022-07-15 22:31:00 +00:00
Nadyr
047f5d60d2 powder that makes you say yes 2022-07-13 19:02:34 -04:00
Nadyr
f6ad66e76f powder that makes you say yes 2022-07-13 19:02:22 -04:00
Casey
dda05e9aa7 Lucky 7 Casino and Restaurant 2022-07-12 06:03:43 +00:00
Nadyr
1b30469c6b Merge pull request #4383 from CHOMPStation2/upstream-merge-13114
[MIRROR] Adds Happy carpet
2022-06-22 22:33:37 -04:00
Darlantan
1cea8be6b4 powder that makes you say yes 2022-06-22 22:16:04 -04:00
Nadyr
e81e1f4faf Merge branch 'master' into upstream-merge-13112 2022-06-22 21:58:12 -04:00
Nadyr
5b75024c2f Merge branch 'master' into upstream-merge-13114 2022-06-22 21:47:19 -04:00
Nadyr
5096058348 powder that makes you say yes 2022-06-22 20:30:30 -04:00
Nadyr
c80dcd3976 powder that makes you say yes 2022-06-22 20:30:26 -04:00
Nadyr
c1bfb4b032 powder that makes you say yes 2022-06-22 20:10:07 -04:00
Casey
928a321b5f TGUI Input Conversions 2022-06-19 03:59:14 +00:00
Casey
d4f8e75cd6 Adds Happy carpet 2022-06-19 03:59:10 +00:00
Casey
54279fa4de [MIRROR] Adds Some More Decorative Flooring Types 2022-06-19 00:44:42 +00:00
Casey
5591cddadd Merge pull request #12861 from FartMaster69420/stack-patch
Fixing Stack Deletion
2022-05-01 03:10:03 +00:00
Casey
05653f2feb Merge pull request #12727 from FartMaster69420/sheet-storage-fixes
Stack Stacking: Restacked
2022-04-17 09:15:33 +00:00
Casey
582397d342 Merge pull request #12680 from FartMaster69420/stack-stacking
Stack Stacking
2022-04-07 03:23:07 +00:00
BlackMajor
6189bb4dd5 Update tile_types_ch.dm 2022-03-16 19:58:00 +13:00
Casey
780499fff6 Merge pull request #12295 from Very-Soft/stackpersist
Item Bank - Do not store things crafted from material stacks
2022-02-20 01:36:58 +00:00
Test Turtle
3c06b4dc19 Update to Sheet Materials
While this doesn't revert all the changes upstream to the mining materials, it does replace most of them with sprites from other servers, which I feel are more appropriate here.
2022-02-07 17:20:45 -08:00
Nadyr
d1efe83113 Merge branch 'master' into upstream-merge-11508 2021-08-26 21:00:44 -04:00
Chompstation Bot
4cd79beb29 Fix annoying runtime with exosuit fab 2021-08-27 00:11:54 +00:00
Chompstation Bot
af0d7a0f6b Make stack amount var private 2021-08-26 15:39:04 +00:00
Novacat
b291d87e18 Merge pull request #11387 from Heroman3003/dupefix
Fixes infinite material duplication in R&D
2021-08-11 02:51:43 +00:00
Nadyr
9152417438 powder that makes you say yes 2021-07-29 18:58:35 -04:00
Chompstation Bot
ae737fe4a1 Add arcadey carpets 2021-07-29 20:10:19 +00:00
Chompstation Bot
15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00: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
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
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
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
Chompstation Bot
287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00
Chompstation Bot
14129d60cf Converts visible_message notice spans to look more like emotes 2021-07-05 20:30:12 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Chompstation Bot
a94e471add Material Container Component & Autolathe QoL 2021-06-13 03:18:30 +00:00
Nadyr
ce20d09e0c Merge pull request #2054 from CHOMPStationBot/upstream-merge-10433
[MIRROR] [MIRROR] Linter Introduction + Cleanup
2021-05-27 21:35:05 -04:00
Chompstation Bot
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Chompstation Bot
d52c1e61e8 Aro shipself v3 2021-05-27 01:10:08 +00:00
Chompstation Bot
fd5b2f094f [MIRROR] Moves material stacks to modules/materials 2021-04-28 16:38:58 +00:00
Chompstation Bot
0001021815 [MIRROR] Tanning Tweaks 2021-03-30 20:55:26 +00:00
Razgriz
6e171d3182 Merge pull request #1536 from CHOMPStationBot/upstream-merge-9396
[MIRROR] [MIRROR] Matter Matters
2021-03-16 22:22:28 -07:00
Chompstation Bot
b85e9fc4d9 [MIRROR] Industrial Expansion 2021-03-09 21:53:03 +00:00
Chompstation Bot
9270659dbb [MIRROR] Matter Matters 2021-03-09 20:42:39 +00:00
cadyn
14c7647f5f Update tile_types.dm 2021-02-27 14:53:42 -08:00
Chompstation Bot
ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
Razgriz
f97d065119 Update tile_types.dm 2021-01-27 18:13:46 -07:00