Commit Graph

19516 Commits

Author SHA1 Message Date
Casey f58a3c742b Merge pull request #11881 from Heroman3003/grenadefix2
Fixes infinite detonators being attachable to grenades
2021-12-10 06:14:38 +00:00
Nadyr 680cffa88a Merge pull request #3211 from CHOMPStation2/upstream-merge-11928
[MIRROR] Offmap Tweaks
2021-12-05 14:04:20 -05:00
Nadyr 46c47164ce powder that makes you say yes 2021-12-05 13:47:04 -05:00
Nadyr fb378c4668 Merge pull request #3205 from Verkister/patch-65
Fixes dirt vulnerability
2021-12-05 13:41:02 -05:00
Nadyr db3ef9440e Merge pull request #3217 from CHOMPStation2/upstream-merge-11921
[MIRROR] Snakes are Sweet
2021-12-05 13:28:39 -05:00
Nadyr 4efe4d49ef powder that makes you say yes 2021-12-05 12:53:32 -05:00
Nadyr 1dc06fd9e6 Merge branch 'master' into upstream-merge-11928 2021-12-05 12:50:21 -05:00
Nadyr 1d43637079 Merge pull request #3236 from CHOMPStation2/upstream-merge-11906
[MIRROR] Fixes another active edge trigger potential
2021-12-05 12:15:52 -05:00
Nadyr d1a3c9057b Merge pull request #3237 from CHOMPStation2/upstream-merge-11905
[MIRROR] Makes stomach organs printable in bioprinter and prosfab
2021-12-05 12:07:07 -05:00
Nadyr ef0e4ab070 Merge pull request #3238 from CHOMPStation2/upstream-merge-11904
[MIRROR] Fixes Claw Machine arcade
2021-12-05 12:02:56 -05:00
Nadyr f9a407ba4b powder that makes you say yes 2021-12-05 12:00:39 -05:00
Nadyr d40865183a powder that makes you say yes 2021-12-05 11:53:43 -05:00
Nadyr 6960aefdc1 powder that makes you say yes 2021-12-05 11:44:40 -05:00
Nadyr 72cdc6e878 Merge pull request #3244 from CHOMPStation2/upstream-merge-11894
[MIRROR] Fixes some janky frame issues
2021-12-05 11:04:47 -05:00
Nadyr cc9fa9282c powder that makes you say yes 2021-12-05 10:53:54 -05:00
Nadyr 46e29ec6b6 powder that makes you say yes 2021-12-05 10:52:16 -05:00
Nadyr c393493c45 powder that makes you say yes 2021-12-05 10:50:54 -05:00
Nadyr a8490c5623 powder that makes you say yes 2021-12-05 09:27:14 -05:00
Casey a1fabbfaa1 Snakes are Sweet 2021-12-03 07:15:09 +00:00
Casey fe8c4753eb Offmap Tweaks 2021-12-03 07:14:17 +00:00
Verkister 0ff148ef5f Fixes dirt vulnerability
Fixes dirt vulnerability trait being completely bonkers broken and causing slips on every single step regardless of whether the floors were even clean or not and also makes it not affect walk intent.
2021-11-27 01:11:46 +02:00
BlackMajor d0c7ac859c Merge branch 'master' into vorespawn-pred 2021-11-25 19:53:29 +13:00
BlackMajor 876276f817 reverse vorespawn 2021-11-25 19:49:28 +13:00
Verkister d27b612fd3 Adds a pref toggle for autotransferability
Adds a pref toggle to enable/disable autotransfer mechanics moving you. Default is enabled.
2021-11-24 17:34:43 +02:00
BlackMajor 55e8bfa69d Simulated you dingus 2021-11-15 12:18:42 +13:00
BlackMajor 44d8d3245e quick mapping tool pr 2021-11-15 12:16:05 +13:00
Nadyr f945ee3a4f Merge pull request #3174 from CHOMPStationBot/upstream-merge-11734
[MIRROR] Takes Stellar Delight apart
2021-11-02 18:45:20 -04:00
Casey c83f30924e Merge pull request #11746 from Very-Soft/holodeck!!!
Holodeck update and map tweaks
2021-11-01 22:03:46 +00:00
Chompstation Bot 0851b4f14c Takes Stellar Delight apart 2021-11-01 21:58:31 +00:00
Nadyr 19246dbed1 Merge pull request #3165 from CHOMPStationBot/upstream-merge-11722
[MIRROR] Hardwood Material Port
2021-10-30 23:30:40 -04:00
Chompstation Bot da9e3383a8 Hardwood Material Port 2021-10-30 21:25:32 +00:00
Chompstation Bot 60de9a473c Stellar Delight! 2021-10-30 13:34:04 +00:00
Nadyr 2e77d7b617 Merge pull request #3154 from CHOMPStationBot/upstream-merge-11665
[MIRROR] the part printing buff nobody asked for
2021-10-27 21:18:25 -04:00
Nadyr 4f36828e4c Merge pull request #3156 from CHOMPStationBot/upstream-merge-11615
[MIRROR] [MIRROR] Remove suicide act
2021-10-27 21:05:48 -04:00
Chompstation Bot 3caad465fa the part printing buff nobody asked for 2021-10-27 21:05:26 -04:00
Aronai Sieyes 0f2f5cb482 Merge pull request #11615 from VOREStation/upstream-merge-8311
[MIRROR] Remove suicide act
2021-10-28 00:49:05 +00:00
Nadyr 589b2d4024 Merge pull request #3152 from CHOMPStationBot/upstream-merge-11663
[MIRROR] [WIP] Atmospheric Retention Fields
2021-10-27 20:42:28 -04:00
Nadyr 2b394a1bf0 Merge pull request #3141 from CHOMPStationBot/upstream-merge-11705
[MIRROR] Brainfood
2021-10-27 20:17:28 -04:00
Nadyr 616d079be5 Merge pull request #3147 from CHOMPStationBot/upstream-merge-11702
[MIRROR] Brings back character age restrictions for certain roles
2021-10-27 19:29:48 -04:00
Nadyr b181831c8c Merge pull request #3146 from CHOMPStationBot/upstream-merge-11704
[MIRROR] A followup fix to borg whitelisting PR
2021-10-27 19:28:57 -04:00
Nadyr 1664d87d43 Merge pull request #3143 from CHOMPStationBot/upstream-merge-11708
[MIRROR] wacky haphazardly barely thought through standing drill buffs
2021-10-27 19:26:22 -04:00
Nadyr 3928831eac Merge pull request #3133 from CHOMPStationBot/upstream-merge-11679
[MIRROR] Restricts candle boxes to only hold candles
2021-10-27 19:23:21 -04:00
Nadyr 921664149f Merge pull request #3131 from CHOMPStationBot/upstream-merge-11677
[MIRROR] Adds Artist alt-title for entertainer
2021-10-27 19:15:26 -04:00
Nadyr 0a973e2ddd Merge pull request #3138 from CHOMPStationBot/upstream-merge-11698
[MIRROR] Tool Time (Fixed)
2021-10-27 19:14:36 -04:00
Nadyr 5975a9346a Merge pull request #3134 from CHOMPStationBot/upstream-merge-11678
[MIRROR] Stops literally everything in the world from being recyclable
2021-10-27 19:10:03 -04:00
Nadyr 033a33f739 powder that makes you say yes 2021-10-27 19:07:24 -04:00
Nadyr fbf762d448 powder that makes you say yes 2021-10-27 19:04:56 -04:00
Nadyr 69eb94cf95 powder that makes you say yes 2021-10-27 19:04:19 -04:00
Nadyr 9e5f5d5f10 Merge pull request #3128 from CHOMPStationBot/upstream-merge-11667
[MIRROR] Centcom Walls
2021-10-27 19:00:08 -04:00
Chompstation Bot 536a6cb6e7 [WIP] Atmospheric Retention Fields 2021-10-27 18:39:20 +00:00