Fabian
|
7e50d878ca
|
Merge branch 'master' into the-fuck-am-i-doing
|
2021-03-15 14:09:30 +01:00 |
|
silicons
|
939a493334
|
Merge pull request #14306 from Putnam3145/supernova
Adds a supernova event, with tweaks to allow this
|
2021-03-10 01:32:52 -07:00 |
|
silicons
|
03fbb256e4
|
Merge pull request #14371 from Sneakyrat6/matContainer
Material container fixes
|
2021-03-10 01:31:51 -07:00 |
|
silicons
|
0db0612e56
|
Merge pull request #14383 from Literallynotpickles/no-more-triple-paramedic
Removes one paramedic slot
|
2021-03-09 23:26:53 -07:00 |
|
Lin
|
1216a6edc5
|
Merge pull request #14381 from LetterN/patch-5
fixes drone inventory deleting stuff
|
2021-03-09 22:45:02 -06:00 |
|
silicons
|
41b75c8eb9
|
Merge pull request #14379 from necromanceranne/too_many_limbs
Fixes being able to go over the defined limit of roundstart prosthetics
|
2021-03-09 21:39:41 -07:00 |
|
Sneakyrat6
|
d5b0251cb5
|
Merge branch 'master' into matContainer
|
2021-03-09 05:42:47 -05:00 |
|
silicons
|
3693eb1f16
|
Merge pull request #14374 from SandPoot/don't-litter-please
Makes it so you don't drop cans upon crushing them
|
2021-03-09 00:20:43 -07:00 |
|
silicons
|
34c4887b69
|
Merge pull request #14351 from Putnam3145/teg-uncap
Uncaps TEG output
|
2021-03-09 00:17:47 -07:00 |
|
Suicidalpickles
|
6496b418d4
|
Update paramedic.dm
|
2021-03-08 18:31:34 -08:00 |
|
Letter N
|
3fa43b7f61
|
oops forgot this reg
|
2021-03-09 10:09:02 +08:00 |
|
necromanceranne
|
bdcd2904e6
|
Fixes going over the defined limit of roundstart prosthetics
|
2021-03-09 03:56:51 +11:00 |
|
Letter N
|
de6f1401bb
|
final fix
|
2021-03-08 13:24:28 +08:00 |
|
SandPoot
|
80cb870311
|
upload drinks.dm
|
2021-03-07 21:39:10 -03:00 |
|
Sneakyrat6
|
703567e591
|
other fixes
|
2021-03-07 04:09:36 -05:00 |
|
Letter N
|
8c3c259850
|
pepegasort
|
2021-03-07 14:11:09 +08:00 |
|
Letter N
|
22b33d1a6e
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-03-07 13:04:36 +08:00 |
|
silicons
|
87c7487344
|
Merge pull request #14361 from Putnam3145/hyper-nob-easier
Makes hyper-nob, nitryl easier to make
|
2021-03-06 17:00:24 -07:00 |
|
silicons
|
06f6a7eb46
|
Merge pull request #14360 from Hatterhat/pipegun
pipe shotgun reskins
|
2021-03-06 17:00:15 -07:00 |
|
silicons
|
4fdaf10049
|
Merge pull request #14359 from Hatterhat/traumannounce
funny trauma announce
|
2021-03-06 17:00:10 -07:00 |
|
silicons
|
21905f45f3
|
Merge pull request #14353 from dzahlus/small-big-iron-on-his-hip-in-his-pocket
MWS-01 Changes
|
2021-03-06 16:59:46 -07:00 |
|
Letter N
|
4482453067
|
dihydrogen
|
2021-03-06 19:56:19 +08:00 |
|
Letter N
|
4463fd9513
|
paperwork mini update, also ASS_BLAST_USA
|
2021-03-06 19:28:29 +08:00 |
|
Letter N
|
709aaa5006
|
NEW() moment
|
2021-03-06 13:28:57 +08:00 |
|
Letter N
|
e84257e624
|
fix surgery cb, linter
|
2021-03-06 11:22:01 +08:00 |
|
Fabian
|
8178b7073a
|
It's done, atleast the code is
|
2021-03-05 21:50:29 +01:00 |
|
Fabian
|
2f1aba4f80
|
Revert "i can't believe kevin made me code"
This reverts commit 7f38564838.
|
2021-03-05 21:19:59 +01:00 |
|
Fabian
|
a061f02b5b
|
Revert "objectives"
This reverts commit dbabbb1062.
|
2021-03-05 21:19:56 +01:00 |
|
Fabian
|
b99b9f65d6
|
Revert "god why am i doing it this way instead of just looking at end changes"
This reverts commit aa6402427b.
|
2021-03-05 21:19:53 +01:00 |
|
Fabian
|
aa6402427b
|
god why am i doing it this way instead of just looking at end changes
im going through every single commit im retarded
|
2021-03-05 21:11:09 +01:00 |
|
Fabian
|
dbabbb1062
|
objectives
hrnrghghgh
|
2021-03-05 20:31:57 +01:00 |
|
Fabian
|
7f38564838
|
i can't believe kevin made me code
im taking severe offense to this
|
2021-03-05 19:55:53 +01:00 |
|
Letter N
|
a43309a097
|
shuttle pog
|
2021-03-05 22:26:55 +08:00 |
|
Letter N
|
34697acf74
|
missing icon fix & stop throwing out parts
|
2021-03-05 19:29:52 +08:00 |
|
Letter N
|
4f8d6c7c11
|
bruh
|
2021-03-05 17:21:22 +08:00 |
|
Letter N
|
e967590dfa
|
fix verb
|
2021-03-05 17:17:30 +08:00 |
|
Letter N
|
cb346a3847
|
a
|
2021-03-05 14:29:36 +08:00 |
|
Letter N
|
f2f97f5855
|
ae
|
2021-03-04 22:01:46 +08:00 |
|
Letter N
|
5897cfd97b
|
when tgui
subscript text
|
2021-03-04 16:39:44 +08:00 |
|
Letter N
|
7e427aa8e6
|
HOTFIX AEIOU
|
2021-03-04 16:20:44 +08:00 |
|
Putnam
|
5b771d57ed
|
also makes nitryl not generate oxygen/nitrogen
|
2021-03-03 17:43:18 -08:00 |
|
Putnam
|
414e42093c
|
Reaction rebalancing
|
2021-03-03 17:37:00 -08:00 |
|
Letter N
|
a87e4533e5
|
support for tgs4 noconfigs needed***
|
2021-03-03 17:33:14 +08:00 |
|
Letter N
|
754c24748e
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-03-03 17:09:01 +08:00 |
|
silicons
|
8989394742
|
Merge pull request #14270 from LetterN/rustsql
Removes bsql 2
|
2021-03-03 00:53:46 -07:00 |
|
Letter N
|
889802a376
|
a
|
2021-03-03 14:16:36 +08:00 |
|
Letter N
|
4b62633fd8
|
a
|
2021-03-03 14:11:38 +08:00 |
|
Hatterhat
|
fcdebd7d63
|
lets get it
|
2021-03-02 23:19:45 -06:00 |
|
Hatterhat
|
c02cf7d551
|
funny trauma announce
|
2021-03-02 22:35:08 -06:00 |
|
dzahlus
|
594aa9b3c0
|
sorry no funny taser
|
2021-03-03 01:34:19 +01:00 |
|