silicons
|
08f251a88c
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-06-27 10:44:51 -07:00 |
|
silicons
|
4768b23398
|
Merge pull request #14860 from Arturlang/nanite_updates
Updates our nanite stuff to TG's, mostly
|
2021-06-18 20:01:05 -07:00 |
|
silicons
|
a8b7c07f00
|
Update open.dm
|
2021-06-17 07:07:49 -07:00 |
|
silicons
|
c1928c9446
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-06-16 19:04:16 -07:00 |
|
Artur
|
724b34f55d
|
https://github.com/tgstation/tgstation/pull/54710
|
2021-06-16 00:44:32 +03:00 |
|
silicons
|
b04a580e1d
|
it works
|
2021-06-13 22:19:06 -07:00 |
|
silicons
|
e7f5f80fb1
|
yelling
|
2021-06-13 15:34:47 -07:00 |
|
silicons
|
b6bb20842f
|
Yelling works
|
2021-06-13 00:50:00 -07:00 |
|
silicons
|
8feb473e65
|
fixes
|
2021-06-12 04:49:23 -07:00 |
|
silicons
|
40f2c06f2e
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-06-07 16:47:11 -07:00 |
|
silicons
|
5601badbff
|
deterministic explosion system (#13392)
* wae explosions
* okay
* changes
* fixes
* fix
* ok
* ok
* kills more dead code
* okay
* fix
* ok
* tiles
* ok
* okay
* woops
* ok
* fix
* okay
* mob damage
* fixes
* insanity
* more
* more
* fixes
* more
* woot
* don't commit that
* YES
* fix
|
2021-05-12 05:44:53 -05:00 |
|
silicons
|
a415453540
|
ripping off my own code
|
2021-04-26 23:29:37 -07:00 |
|
LetterN
|
a478555dbd
|
mapfix
|
2021-03-15 21:02:50 +08:00 |
|
Letter N
|
935e46b492
|
The Mapping Update
Cleans up the map (again)
Makes mining code more better
|
2021-03-12 12:11:35 +08:00 |
|
Letter N
|
5304029dd9
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-02-23 11:01:42 +08:00 |
|
SandPoot
|
123de14009
|
upload files
|
2021-02-18 15:05:39 -03:00 |
|
SandPoot
|
f738023097
|
Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
|
2021-02-18 15:04:46 -03:00 |
|
SandPoot
|
cf2e70671a
|
upload files
|
2021-02-18 14:47:10 -03:00 |
|
Letter N
|
f87aa0ac5b
|
toast. And DiscoFox™️
|
2021-02-08 18:46:05 +08:00 |
|
Letter N
|
02ca168df3
|
why are we building windows facing nothing but rock infront of it?
|
2021-01-20 11:37:44 +08:00 |
|
silicons
|
ea07ad6e48
|
Merge remote-tracking branch 'citadel/master' into tgsync
|
2021-01-13 15:41:28 -07:00 |
|
DeltaFire
|
05f7991981
|
snap
|
2021-01-09 20:37:24 +01:00 |
|
silicons
|
ddad368d6a
|
Merge remote-tracking branch 'citadel/master' into tgsync
|
2021-01-08 00:33:57 -08:00 |
|
Letter N
|
51143f89e5
|
Merge remote-tracking branch 'origin/master' into semi-sync
|
2020-12-29 10:37:06 +08:00 |
|
DeltaFire
|
46a0c65e46
|
Merge branch 'master' into debris
|
2020-12-28 19:04:22 +01:00 |
|
silicons
|
5e269c327a
|
Update space.dm
|
2020-12-27 10:53:11 -07:00 |
|
silicons
|
a6ae0fe5c2
|
ok
|
2020-12-26 20:56:48 -08:00 |
|
silicons
|
bfb3d087c3
|
ok
|
2020-12-26 20:50:28 -08:00 |
|
silicons
|
d3414a4d23
|
ok
|
2020-12-26 20:47:50 -08:00 |
|
silicons
|
dafc6bf89f
|
fix
|
2020-12-26 20:41:21 -08:00 |
|
silicons
|
6044086de0
|
changes
|
2020-12-26 20:29:52 -08:00 |
|
Letter N
|
a808f805d4
|
ASYNC EVERYTHING!
|
2020-12-21 16:24:51 +08:00 |
|
silicons
|
0c3020d4b8
|
Merge pull request #13349 from LetterN/git-updates
Updates git, travis, and build tests
|
2020-10-11 01:24:09 -07:00 |
|
silicons
|
19f1e99a8c
|
mass ports like 15 tg prs + counting (#13386)
* changes
* ok
* changes
* sigh
* fixes
* changes
* fix
* fix
* alright
* fixes
git pus
* fix
* fix
* fix
* test
* ok
* Update code/modules/paperwork/ticketmachine.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
* ok
* compile and other stuff
* ok
* fix
* fix
* Fix
* Update menu.dm
* Update view.dm
* Update preferences.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
|
2020-10-10 12:20:33 +02:00 |
|
silicons
|
832f51d165
|
fix
|
2020-10-05 10:20:27 -07:00 |
|
Detective Google
|
98703e6ad6
|
Merge remote-tracking branch 'upstream/master' into arcade-carpets
|
2020-10-01 13:41:10 -05:00 |
|
Detective Google
|
643421bc23
|
adds arcade carpets
yay
|
2020-09-28 14:43:03 -05:00 |
|
ItzGabby
|
b97b595f6f
|
Three new wooden floor types
|
2020-09-26 18:29:46 -04:00 |
|
Putnam
|
e89e7adda4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into cache-locality-experiments
|
2020-09-21 03:31:35 -07:00 |
|
silicons
|
700c129c21
|
Update walls.dm
|
2020-09-10 11:51:34 -07:00 |
|
Putnam
|
373f6a1068
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into cache-locality-experiments
|
2020-09-10 04:57:43 -07:00 |
|
Putnam
|
fb17f0cc75
|
Somehow made monstermos over 100x as fast
|
2020-09-10 04:48:55 -07:00 |
|
Putnam
|
febd4a47c1
|
I can probably afford to have these higher, really.
|
2020-09-04 08:23:53 -07:00 |
|
Putnam
|
d6ee54c77d
|
Makes superconducting work for the first time ever.
|
2020-09-04 08:22:54 -07:00 |
|
silicons
|
120bcfc00c
|
Merge pull request #13178 from lolman360/plumb
[READY] ports plumbing (no more waiting for tgui4)
|
2020-08-20 21:32:26 -07:00 |
|
Detective Google
|
b13048f636
|
makes glass floors actually deconstructable
|
2020-08-17 12:15:09 -05:00 |
|
silicons
|
f611945b34
|
Merge pull request #13180 from Detective-Google/glass-floors
ports multiz glass floors (tgstation/tgstation#50831)
|
2020-08-17 03:14:15 -07:00 |
|
silicons
|
8dedcbcf76
|
Merge branch '13113'
|
2020-08-16 18:53:35 -07:00 |
|
silicons
|
83e72b4f96
|
Merge branch '13164'
|
2020-08-16 18:51:36 -07:00 |
|
Lin
|
d287f44d9a
|
Merge pull request #13045 from silicons/coggers
ports bronze (fake clockwork) airlocks and windows
|
2020-08-16 20:20:03 -05:00 |
|