Commit Graph

18816 Commits

Author SHA1 Message Date
Nadyr
03761337c1 Merge pull request #2121 from CHOMPStationBot/upstream-merge-10535
[MIRROR] Chessboard Holodeck TG-Style.
2021-06-03 05:17:08 -04:00
Nadyr
2166af37bd Merge pull request #2118 from CHOMPStationBot/upstream-merge-10528
[MIRROR] Allow ghosts to partake in music
2021-06-03 05:14:54 -04:00
Aronai Sieyes
07cb7850ce Merge pull request #10535 from SpaceVampire/Chess
Chessboard Holodeck TG-Style.
2021-06-02 16:03:06 +00:00
Aronai Sieyes
50c69ffd77 Merge pull request #10528 from VOREStation/Arokha/ghostmusic
Allow ghosts to partake in music
2021-06-02 16:01:48 +00:00
Aronai Sieyes
958558168b Merge pull request #10529 from VOREStation/Fixes/10526
Fixes #10526
2021-06-02 16:00:10 +00:00
Nadyr
4e39cb8cfc Merge pull request #2110 from CHOMPStationBot/upstream-merge-10521
[MIRROR] Media tracks subsystem, jukebox UI genres
2021-06-02 02:55:34 -04:00
Nadyr
752123834b Merge pull request #2107 from CHOMPStationBot/upstream-merge-10518
[MIRROR] Ports musical instruments from /tg/
2021-06-02 02:54:38 -04:00
Nadyr
59fd206160 powder that makes you say yes 2021-06-02 00:34:43 -04:00
Nadyr
4fba3e19fb delete yw file conflicting with upstream music changes 2021-06-02 00:21:18 -04:00
Nadyr
4a9f44dd94 powder that makes you say yes 2021-06-02 00:00:18 -04:00
Nadyr
9b16a6cd41 powder that makes you say yes 2021-06-01 23:36:59 -04:00
Nadyr
095156f9e4 powder that makes you say yes 2021-06-01 23:35:20 -04:00
Nadyr
4f1f85f5bb powder that makes you say yes 2021-06-01 23:28:41 -04:00
Nadyr
164131661b Merge pull request #2101 from CHOMPStationBot/upstream-merge-10510
[MIRROR] Make req_[one_]access lazy
2021-06-01 23:22:44 -04:00
Nadyr
6042b29b89 Merge pull request #2105 from CHOMPStationBot/upstream-merge-10409
[MIRROR] explo vender stuff
2021-06-01 23:09:30 -04:00
Nadyr
56a9548e2d powder that makes you say yes 2021-06-01 23:07:12 -04:00
Nadyr
6222827155 powder that makes you say yes 2021-06-01 23:05:16 -04:00
Nadyr
bcc4890a8c powder that makes you say yes 2021-06-01 23:03:21 -04:00
Chompstation Bot
701ddb7bc7 Media tracks subsystem, jukebox UI genres 2021-06-01 20:53:39 +00:00
Chompstation Bot
eb03a53185 Ports musical instruments from /tg/ 2021-06-01 20:29:51 +00:00
Novacat
08180ba0f1 Merge pull request #10409 from TheDavestDave/master
explo vender stuff
2021-06-01 14:58:32 +00:00
Verkister
cc4b02ee77 Fixes belly inits for maintpreds/morphs
Maintpreds and morphs now spawn with their provided vorgans without getting the vorepanel to replace it with an incomplete set of the char slot vorgans.
2021-06-01 11:10:25 +03:00
Chompstation Bot
cb5671c638 Make req_[one_]access lazy 2021-05-31 17:30:12 +00:00
Chompstation Bot
78acd45edc Remove extra asterisks from rune audible messages 2021-05-31 17:26:54 +00:00
Nadyr
b08be80408 Merge pull request #2088 from CHOMPStationBot/upstream-merge-10412
[MIRROR] Adds gender TF chemicals + Spontaneous TF pref
2021-05-31 03:45:32 -04:00
Nadyr
366fd4f97b Merge pull request #2086 from CHOMPStationBot/upstream-merge-10479
[MIRROR] Ports Runechat
2021-05-31 03:11:13 -04:00
Nadyr
a3f4c8247a Merge pull request #2087 from CHOMPStationBot/upstream-merge-10450
[MIRROR] Allow multiple SStranscore databases
2021-05-31 02:49:34 -04:00
Nadyr
04f0cb750e Merge pull request #2075 from CHOMPStationBot/upstream-merge-10487
[MIRROR] [MIRROR] Voidsuit Balance Overhaul
2021-05-31 02:15:36 -04:00
Nadyr
51e7be7fca powder that makes you say yes 2021-05-31 01:50:23 -04:00
Nadyr
e6ab787398 Merge pull request #2071 from CHOMPStationBot/upstream-merge-10488
[MIRROR] [MIRROR] Make figurines small instead of normal sized
2021-05-30 21:40:18 -04:00
Chompstation Bot
a0e3679020 Adds gender TF chemicals + Spontaneous TF pref 2021-05-30 23:00:43 +00:00
Aronai Sieyes
9134933442 Allow multiple SStranscore databases (#10450)
* Allow multiple SStranscore databases

* Add key to backup implanter too

* Key passing tweak

* Fix issue Leshana spotted

* Add optimization Leshana spotted

* Fixxy more multitranscore bugs
2021-05-30 22:53:28 +00:00
Chompstation Bot
4476e4104d Ports Runechat 2021-05-30 22:51:20 +00:00
Nadyr
24c35497ff powder that makes you say yes 2021-05-29 22:20:06 -04:00
Chompstation Bot
92c2ebed60 [MIRROR] Voidsuit Balance Overhaul 2021-05-29 19:32:08 +00:00
Novacat
bc43cc2c67 Merge pull request #10489 from VOREStation/upstream-merge-8109
[MIRROR] Misc Bits
2021-05-29 19:10:43 +00:00
Chompstation Bot
501f383da4 [MIRROR] Make figurines small instead of normal sized 2021-05-29 18:55:11 +00:00
Aronai Sieyes
a0da2dffaf Merge pull request #10470 from VOREStation/Arokha/atmoslint
Touch up linter atmos alarm changes
2021-05-28 16:16:36 +00:00
Nadyr
92e1743b5c Merge branch 'master' into upstream-merge-10401 2021-05-27 22:40:15 -04:00
Nadyr
d20b48d2a3 powder that makes you say yes 2021-05-27 22:00:18 -04:00
Nadyr
0f6f622cd9 Merge pull request #2056 from CHOMPStationBot/upstream-merge-10316
[MIRROR] [MIRROR] Ports Nebula's Discord Webhook Integration
2021-05-27 21:36:38 -04: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
Nadyr
ecfaa8f6f6 powder that makes you say yes 2021-05-27 21:02:41 -04:00
Nadyr
78819f72fc Merge branch 'master' into upstream-merge-10446 2021-05-27 20:59:01 -04:00
Nadyr
9bf9a05302 powder that makes you say yes 2021-05-27 19:25:13 -04:00
Nadyr
1477b99f52 Merge pull request #2044 from CHOMPStationBot/upstream-merge-10422
[MIRROR] Adds a fake sun object for mapper usage
2021-05-27 18:14:46 -04:00
Nadyr
34409e5081 powder that makes you say yes 2021-05-27 18:01:33 -04:00
Nadyr
9c0eb5290b Merge pull request #2045 from CHOMPStationBot/upstream-merge-10411
[MIRROR] Aro shipself v3
2021-05-27 17:55:07 -04:00
Nadyr
9512628b99 powder that makes you say yes 2021-05-27 17:33:44 -04:00
Chompstation Bot
d76e756e5f [MIRROR] Reverts recipe changes from Industrial Expansion 2021-05-27 17:17:01 +00:00