Commit Graph

29696 Commits

Author SHA1 Message Date
Aronai Sieyes
bf55685866 Merge pull request #10533 from VOREStation/Fixes/10465
Fixes #10465
2021-06-02 16:01:23 +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
3f783ab3e4 powder that makes you say yes 2021-06-02 02:29:44 -04:00
Nadyr
9de6566a58 yw instruments 2021-06-02 02:07:41 -04:00
Nadyr
e029537753 powder that makes you say yes 2021-06-01 23:30:52 -04:00
Nadyr
489ca1e154 Merge pull request #2106 from CHOMPStationBot/upstream-merge-10522
[MIRROR] Fix typo, indentation
2021-06-01 23:22:56 -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
274f62fbe6 powder that makes you say yes 2021-06-01 23:12:05 -04:00
Nadyr
22c99ad78f Merge branch 'master' into upstream-merge-10522 2021-06-01 23:11:34 -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
Chompstation Bot
eba28af38e Fix typo, indentation 2021-06-01 19:27:34 +00:00
Novacat
08180ba0f1 Merge pull request #10409 from TheDavestDave/master
explo vender stuff
2021-06-01 14:58:32 +00:00
Nadyr
151d317f5c Merge pull request #2099 from CHOMPStationBot/upstream-merge-10511
[MIRROR] Remove extra asterisks from rune audible messages
2021-05-31 22:28:31 -04:00
Nadyr
d02804affe powder that makes you say yes 2021-05-31 22:20:02 -04:00
Aronai Sieyes
227ca1a99e Merge pull request #10513 from VOREStation/Arokha/holofix
Fix holomaps
2021-05-31 18:42:31 +00: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
f959b644e9 Merge pull request #2097 from CHOMPStationBot/upstream-merge-10504
[MIRROR] Couple more runefixes
2021-05-31 03:46:36 -04: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
51b6b3a096 Merge branch 'master' into upstream-merge-10504 2021-05-31 03:27:44 -04:00
Nadyr
2c15103f44 Merge pull request #2096 from CHOMPStationBot/upstream-merge-10505
[MIRROR] Some misc runtime fixes
2021-05-31 03:17:57 -04:00
Nadyr
a5436ba0dd Merge pull request #2094 from CHOMPStationBot/upstream-merge-10500
[MIRROR] Makes mineral vars sensible
2021-05-31 03:16:14 -04:00
Nadyr
56bbf808bf Merge pull request #2092 from CHOMPStationBot/upstream-merge-10498
[MIRROR] Emote Delay Strikes Back
2021-05-31 03:14:00 -04:00
Nadyr
94242c2706 Merge pull request #2091 from CHOMPStationBot/upstream-merge-10458
[MIRROR] sounds/emotes for spider-type characters
2021-05-31 03:12:37 -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
3faf607528 powder that makes you say yes 2021-05-31 03:01:12 -04:00
Nadyr
cc7b980cc4 powder that makes you say yes 2021-05-31 03:00:09 -04:00
Nadyr
d784cfb938 powder that makes you say yes 2021-05-31 02:52:03 -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
3ceb13cd78 powder that makes you say yes 2021-05-31 02:45:52 -04:00
Nadyr
4eed681054 powder that makes you say yes 2021-05-31 02:44:39 -04:00
Nadyr
9429fab7f4 powder that makes you say yes 2021-05-31 02:40:25 -04:00
Nadyr
3c77d34afa Merge pull request #2085 from CHOMPStationBot/upstream-merge-10480
[MIRROR] Minor fennec treat spelling fixes
2021-05-31 02:31:51 -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
fe182dbde6 powder that makes you say yes 2021-05-31 02:06:16 -04:00
Nadyr
c103019263 powder that makes you say yes 2021-05-31 01:57:40 -04:00
Nadyr
c244c441f4 Merge pull request #2066 from Verkister/patch-13
double-earlyports unseen combat ai fix
2021-05-31 01:47:53 -04:00
Chompstation Bot
dd630bc529 Couple more runefixes 2021-05-31 03:57:40 +00:00
Aronai Sieyes
e89052c292 Merge pull request #10505 from VOREStation/Arokha/miscfix
Some misc runtime fixes
2021-05-31 03:57:35 +00:00
Aronai Sieyes
346acd12fd Merge pull request #10500 from VOREStation/Arokha/orz
Makes mineral vars sensible
2021-05-30 23:34:54 +00:00
Aronai Sieyes
af504ff33b Merge pull request #10498 from VOREStation/Arokha/emotedelay
Emote Delay Strikes Back
2021-05-30 23:09:17 +00:00
Aronai Sieyes
9cc5e3160a Merge pull request #10458 from quixoticstargazer/master
sounds/emotes for spider-type characters
2021-05-30 23:06:08 +00: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
dwinters99
3e0005dec5 Minor fennec treat spelling fixes (#10480)
* Update snacks_vr.dm

* Update snacks_vr.dm

* Update snacks_vr.dm

sublime light mode is REALLY bad for long-term text reading

* Update snacks_vr.dm

"read the rest of the sentence idiot" - me to myself

* webedit
2021-05-30 22:51:14 +00:00
Nadyr
1c3e965b5c Merge pull request #2079 from CHOMPStationBot/upstream-merge-10437
[MIRROR] Nerfs Storage Briefcases
2021-05-29 22:23:42 -04:00
Nadyr
8255b5137a Merge pull request #2072 from CHOMPStationBot/upstream-merge-10486
[MIRROR] [MIRROR] Autoinjectors are Autoinjectors
2021-05-29 22:20:34 -04:00