necromanceranne
|
2368968c66
|
Ports #42721 which happened to resolve this already
|
2021-03-26 08:45:14 +11:00 |
|
kiwedespars
|
69d927e756
|
Merge branch 'master' into void-but-for-real
|
2021-03-12 23:10:19 -08:00 |
|
kiwedespars
|
3b92e33112
|
Merge branch 'master' into void-but-for-real
|
2021-03-09 12:29:50 -08:00 |
|
kiwedespars
|
3ce6459aef
|
void heretic and many other prs
|
2021-03-09 02:58:34 -08:00 |
|
Sneakyrat6
|
d5b0251cb5
|
Merge branch 'master' into matContainer
|
2021-03-09 05:42:47 -05:00 |
|
Sneakyrat6
|
0db08088c4
|
Fixes material insertion animations not working when there is no silo
|
2021-03-07 22:43:55 -05:00 |
|
Sneakyrat6
|
395bdaf5f9
|
removes code i commented out
|
2021-03-07 04:13:18 -05:00 |
|
Sneakyrat6
|
703567e591
|
other fixes
|
2021-03-07 04:09:36 -05:00 |
|
Sneakyrat6
|
f875218284
|
Fixes material component
|
2021-03-06 03:48:52 -05:00 |
|
Letter N
|
edfe7220c4
|
lintfix
|
2021-03-05 15:45:57 +08:00 |
|
Letter N
|
cb346a3847
|
a
|
2021-03-05 14:29:36 +08:00 |
|
Letter N
|
5304029dd9
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-02-23 11:01:42 +08:00 |
|
Letter N
|
037378eb7d
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-02-19 10:34:47 +08:00 |
|
SandPoot
|
69af7d35f8
|
Update remote_materials.dm
|
2021-02-18 15:16:40 -03: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
|
2e29f30fdf
|
Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing
|
2021-02-18 15:04:22 -03:00 |
|
SandPoot
|
cf2e70671a
|
upload files
|
2021-02-18 14:47:10 -03:00 |
|
Lin
|
3b9f1cb4ec
|
Merge pull request #14239 from Hatterhat/golem-gps-pass2
well that's what i get for trusting my own code - makes golem GPSes start off, but actually this time
|
2021-02-17 17:29:03 -06:00 |
|
silicons
|
e009b9ef5f
|
Merge pull request #14186 from SmArtKar/trading_card_game
[READY][PORT] Codename: Blue Eyes White Jumpsuit, the Citadel TCG. Part 1
|
2021-02-17 01:30:13 -07:00 |
|
Hatterhat
|
c5a9a8905a
|
actually makes golem gpses start off
|
2021-02-13 15:20:24 -06:00 |
|
Letter N
|
45d6a5f87f
|
it compiles, UNTESTED YET
|
2021-02-13 21:41:59 +08:00 |
|
Letter N
|
a2419f760a
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-02-12 13:18:09 +08:00 |
|
Letter N
|
f87aa0ac5b
|
toast. And DiscoFox™️
|
2021-02-08 18:46:05 +08:00 |
|
silicons
|
993a849700
|
Merge pull request #14155 from SmArtKar/tgui_observe
Port of TG's "Auto Observe"
|
2021-02-04 12:49:09 -07:00 |
|
SmArtKar
|
7b2e1ef44f
|
TCG!
|
2021-02-02 14:40:29 +03:00 |
|
Lin
|
0dd82df64b
|
Merge pull request #14113 from silicons/piggybacking
fixes piggybacking initial offsets. Also, adds the ability to carry around pAIs, because this totally won't result in more metaclique drama.
|
2021-01-31 23:33:59 -06:00 |
|
SmArtKar
|
a7bc066891
|
Auto-Observe!
|
2021-01-28 17:09:28 +03:00 |
|
silicons
|
6a2ae34ebe
|
Merge pull request #14111 from Arturlang/revenant_TK
[READY]Gives the revenant TK
|
2021-01-25 23:17:09 -07:00 |
|
silicons
|
efecc1804b
|
Merge pull request #14114 from Hatterhat/fgs
itt: i dont test my code again - free golem ship GPSes start disabled
|
2021-01-25 22:59:09 -07:00 |
|
Hatterhat
|
95db018de8
|
itt: i dont test my code again
|
2021-01-20 18:34:57 -06:00 |
|
silicons
|
e06f0bbc72
|
fixes
|
2021-01-20 16:01:09 -07:00 |
|
Artur
|
66979e2364
|
Merge branch 'master' into revenant_TK
|
2021-01-20 18:27:11 +02:00 |
|
Artur
|
16e0b85b44
|
More funshit
|
2021-01-20 18:23:28 +02:00 |
|
Artur
|
5aa710ffd7
|
spess
|
2021-01-20 16:05:20 +02:00 |
|
Artur
|
ef950400a4
|
Fixes the space tackling meme
|
2021-01-20 15:50:41 +02:00 |
|
silicons
|
dedb0cb62e
|
Merge remote-tracking branch 'citadel/master' into tgsync
|
2021-01-19 04:24:42 -07:00 |
|
silicons
|
b6cdde2f52
|
squeak fix
|
2021-01-16 06:12:34 -07:00 |
|
silicons
|
e96fec682e
|
fix
|
2021-01-16 04:59:07 -07:00 |
|
The0bserver
|
b91df1403e
|
The lack of recevier. It is the opposite of funny!
|
2021-01-14 01:31:58 -05:00 |
|
The0bserver
|
e01c57c832
|
Show me the opposite of funny!
|
2021-01-14 01:12:53 -05:00 |
|
The0bserver
|
1b469bdfda
|
The power of overwriting...
|
2021-01-14 01:03:48 -05:00 |
|
The0bserver
|
d957c1d105
|
another tweak
|
2021-01-14 00:02:32 -05:00 |
|
The0bserver
|
ffe401544c
|
First wave of fixing
|
2021-01-13 23:35:37 -05:00 |
|
The0bserver
|
55cd69746d
|
A change in tact, perhaps?
|
2021-01-13 23:08:05 -05:00 |
|
The0bserver
|
2b8b9086ec
|
Revert "Initial Commit:Goodbye rifle! You won't be missed!"
This reverts commit 1836d0106a.
|
2021-01-13 22:14:36 -05:00 |
|
The0bserver
|
1836d0106a
|
Initial Commit:Goodbye rifle! You won't be missed!
|
2021-01-13 21:42:08 -05:00 |
|
silicons
|
ea07ad6e48
|
Merge remote-tracking branch 'citadel/master' into tgsync
|
2021-01-13 15:41:28 -07:00 |
|
silicons
|
343ef7db2c
|
fixes
|
2021-01-13 14:23:35 -07:00 |
|
silicons
|
3fe2776a6a
|
fix
|
2021-01-13 13:44:46 -07:00 |
|