Commit Graph

3494 Commits

Author SHA1 Message Date
Archie
6d58efc6b9 Fixes null gases and air runtimes that plague layenia 2021-04-30 00:32:10 -03:00
Dahlular
16fc2658b8 Merge pull request #1091 from Dahlular/cumcom
Layenia Station
2021-04-29 17:49:23 -06:00
Dahlular
4150636fa4 Revert "Revert "Merge branch 'master' into cumcom""
This reverts commit c2cc5c49c6.
2021-04-29 17:46:09 -06:00
Dahlular
c2cc5c49c6 Revert "Merge branch 'master' into cumcom"
This reverts commit 05c4645c35, reversing
changes made to d3867f491b.
2021-04-29 17:44:13 -06:00
Dahlular
05c4645c35 Merge branch 'master' into cumcom 2021-04-29 17:43:57 -06:00
Dahlular
d3867f491b conflict fixies 2021-04-29 17:37:37 -06:00
Dahlular
3cefcf6eb1 Merge remote-tracking branch 'upstream/master' 2021-04-29 17:24:55 -06:00
Dahlular
ad59e6913f alright, cannot be assed 2021-04-29 16:59:21 -06:00
ToonClyde
6eb17d3ecf missed one little thing 2021-04-29 14:51:26 -07:00
ToonClyde
a741e22937 last minute detail work 2021-04-29 14:49:15 -07:00
QuoteFox
f16f461913 reward fix 2021-04-29 21:02:46 +01:00
Dahlular
b4f1dc9baf more touches 2021-04-29 04:20:13 -06:00
Dahlular
4f7d4698bb Map finishing touches 2021-04-29 03:34:16 -06:00
Dahlular
1016341d9c CLYDE I LOVE YOU BUT YOU ARE NOT A TECHNICAL MAN 2021-04-28 23:42:30 -06:00
Dahlular
2723507a0f potential atmos fixes 2021-04-28 23:01:54 -06:00
Dahlular
3ebbde3ef9 Railings 2021-04-28 20:36:55 -06:00
Dahlular
6afb3bf902 mapping updates 2021-04-28 19:06:23 -06:00
Dahlular
f886367ea2 Weather 1 and atmos fixes 2021-04-28 18:50:42 -06:00
Dahlular
3daacedb98 weather continued 2021-04-28 16:49:23 -06:00
QuoteFox
3611ad8610 Patreon rewards relquen 2021-04-28 16:13:40 +01:00
QuoteFox
6aeab240b9 donator stuff, madness and python 2021-04-28 15:22:20 +01:00
ToonClyde
fc4f167e29 redesign engineering and added the vault 2021-04-28 02:26:46 -07:00
ToonClyde
489bf2f629 some maintenance tunnels behind security 2021-04-27 18:07:09 -07:00
QuoteFox
803a881da9 bug fix
now gibbed people still cause trauma
2021-04-27 20:33:15 +01:00
QuoteFox
5af77b4482 death causes mood debuffs and possible jitterness
watching some die is trumatic, and shouldnt be taken lightly. doesnt stack, 20min cool down.
2021-04-27 19:53:18 +01:00
QuoteFox
18a82a905a Merge pull request #1090 from Chemlight/Kristopher-Uniform-Patreon
TouchinFuzzy Patreon uniform reward
2021-04-27 19:28:22 +01:00
QuoteFox
ec796b47c2 Merge branch 'master' into Kristopher-Uniform-Patreon 2021-04-27 19:28:13 +01:00
QuoteFox
fca2da81e4 Trait fix 2021-04-27 17:22:36 +01:00
QuoteFox
be9520c07e virile is free 2021-04-27 16:56:52 +01:00
QuoteFox
68120e2583 Virile and Macro, Micro traits. Impregnation Chance
More lewd code.
2021-04-27 16:55:22 +01:00
QuoteFox
69af075ab7 Portal Fleshlight Anonymity
Doesnt tell you who your partner is now. lewd.
2021-04-27 13:09:55 +01:00
QuoteFox
941214d85a No coma inducing honey cum. 2021-04-27 00:53:02 +01:00
QuoteFox
b6b71a5b0f H.O.N.K mech, admin spawn only. 2021-04-27 00:40:38 +01:00
QuoteFox
649f99cbe3 Hyperbot - Fix end of round report
no longer shows dead players, and format improvements
2021-04-26 21:31:04 +01:00
QuoteFox
78d154ec77 Portal Fleshlights Avian Sleeve 2021-04-26 21:15:20 +01:00
Chemlight
b6ecf59798 TouchinFuzzy Patreon uniform reward
As it says in the title, patreon reward for a high donator
2021-04-26 08:01:17 -07:00
QuoteFox
a1d2ca576f Hyperbot End of Round Reports 2021-04-26 10:25:48 +01:00
QuoteFox
8468dfb5a9 Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2021-04-26 04:44:37 +01:00
QuoteFox
48412e449e examine text name fix. 2021-04-26 04:44:34 +01:00
QuoteFox
09a51e20be Merge pull request #1089 from DragonTrance/xenobio-console
i swear to god
2021-04-26 04:35:24 +01:00
DragonTrance
91f8a8eb8a i swear to god 2021-04-25 11:17:04 -07:00
QuoteFox
55dc9201c4 scratch that, buggy. 2021-04-25 13:47:02 +01:00
QuoteFox
90114133ab bug fix mood. 2021-04-25 13:16:03 +01:00
QuoteFox
0d3f1039bb Mood warnings 2021-04-25 12:56:16 +01:00
QuoteFox
17b49ab022 Arousal menu update, Impreg chance 2021-04-25 12:41:15 +01:00
QuoteFox
b6eb1f6f77 window fix. 2021-04-23 19:46:26 +01:00
QuoteFox
a22d7ab97f modular external airlocks
ported from baystation
2021-04-23 19:41:47 +01:00
QuoteFox
9a18a36245 bug fix airlock. 2021-04-23 19:10:24 +01:00
QuoteFox
98ecc34a47 airlocks rotate with windows too. 2021-04-23 18:36:32 +01:00
QuoteFox
d7cf4568f8 Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2021-04-23 18:23:39 +01:00