 silicons
|
3070f178e0
|
Merge remote-tracking branch 'citadel/master' into combat_patches_1
|
2021-07-18 15:12:52 -07:00 |
|
|
Putnam3145
|
f3b590f5f0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into remove-sleeps
|
2021-06-30 02:19:02 -07:00 |
|
|
silicons
|
5e1cb8da38
|
more
|
2021-06-28 14:27:38 -07:00 |
|
|
silicons
|
805b931fb8
|
config reorganize start
|
2021-06-28 13:35:52 -07:00 |
|
|
silicons
|
7c87f6c7b7
|
sigh
|
2021-06-28 13:17:55 -07:00 |
|
|
silicons
|
0069f12c6f
|
errors
|
2021-06-28 13:17:14 -07:00 |
|
|
silicons
|
a5a476f457
|
cyborg shovies
|
2021-06-28 13:10:40 -07:00 |
|
|
silicons
|
5204f5a6d9
|
Merge pull request #13991 from Putnam3145/auxtools-atmos
Replaces extools with auxtools; atmos overhaul
|
2021-06-27 11:01:32 -07:00 |
|
|
silicons
|
0dd8c03286
|
Update examine.dm
|
2021-06-21 17:43:05 -07:00 |
|
|
Putnam3145
|
fbbae70527
|
i need to go to bed and this is a LOT
|
2021-06-21 10:14:50 -07:00 |
|
|
Putnam
|
833d34ba8e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
|
2021-06-11 16:28:12 -07:00 |
|
|
Putnam
|
3b25f3e199
|
Started expanding auxgm a bit
|
2021-06-10 04:40:23 -07:00 |
|
|
SandPoot
|
b0940456f5
|
upload files
|
2021-06-08 13:13:22 -03:00 |
|
|
SandPoot
|
9cf04467a7
|
upload files
|
2021-05-05 17:55:30 -03:00 |
|
|
LetterN
|
292f67e098
|
Merge remote-tracking branch 'origin/master' into perlin-genny
|
2021-03-20 20:36:56 +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
|
59a725c25a
|
icon(s) fixes and fixes boards
|
2021-03-10 11:26:33 +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 |
|
|
Letter N
|
501d33cddd
|
agony
|
2021-02-19 10:32:24 +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
|
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 |
|
|
Letter N
|
3f40e353aa
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-02-16 19:41:53 +08:00 |
|
|
silicons
|
3cac44b2f0
|
a
|
2021-02-15 19:35:16 -07:00 |
|
|
silicons
|
2ef33c5c88
|
sprint updates
|
2021-02-13 20:24:26 -07:00 |
|
|
Letter N
|
45d6a5f87f
|
it compiles, UNTESTED YET
|
2021-02-13 21:41:59 +08:00 |
|
|
Letter N
|
5db87b9065
|
more updates!
|
2021-02-12 17:52:59 +08:00 |
|
|
SandPoot
|
a0c92f0646
|
upload files
|
2021-02-11 13:22:37 -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 |
|
|
MrJWhit
|
8603a9fc77
|
Update ai.dm
|
2021-01-22 19:26:42 -05:00 |
|
|
MrJWhit
|
01d6d40d8e
|
Port'n
|
2021-01-22 19:04:37 -05:00 |
|
|
silicons
|
34473c2ac7
|
fix
|
2021-01-20 16:55:19 -07:00 |
|
|
shellspeed1
|
81e37b6e33
|
Update robot_modules.dm
|
2021-01-19 21:40:47 -08:00 |
|
|
silicons
|
dedb0cb62e
|
Merge remote-tracking branch 'citadel/master' into tgsync
|
2021-01-19 04:24:42 -07:00 |
|
|
silicons
|
ea07ad6e48
|
Merge remote-tracking branch 'citadel/master' into tgsync
|
2021-01-13 15:41:28 -07:00 |
|
|
silicons
|
33ca6c34a1
|
Update pai.dm
|
2021-01-13 14:48:59 -07:00 |
|
|
DeltaFire
|
bc29b80c94
|
:lazy:
|
2021-01-09 22:46:40 +01:00 |
|
|
silicons
|
ddad368d6a
|
Merge remote-tracking branch 'citadel/master' into tgsync
|
2021-01-08 00:33:57 -08:00 |
|
|
Timothy Teakettle
|
5bc7c5a448
|
revert
|
2020-12-30 02:21:30 +00:00 |
|
|
Letter N
|
56fb81d02c
|
Immursive Audio 2
|
2020-12-24 11:06:49 +08:00 |
|
|
Timothy Teakettle
|
016d3d39fc
|
emote over holopad
|
2020-12-13 22:18:54 +00:00 |
|
|
Timothy Teakettle
|
76fe9c7f4c
|
swap cooldown and cooldown check lines
|
2020-12-13 02:34:52 +00:00 |
|
|
Timothy Teakettle
|
866220aefb
|
better cooldown
|
2020-12-13 02:33:57 +00:00 |
|
|
timothyteakettle
|
76b291c0b5
|
action
|
2020-12-13 01:16:25 +00:00 |
|
|
timothyteakettle
|
3a017d1173
|
it works
|
2020-12-12 01:49:50 +00:00 |
|
|
Timothy Teakettle
|
99f50addc7
|
wip
|
2020-12-11 20:35:37 +00:00 |
|
|
silicons
|
f8d43b7544
|
Merge pull request #13679 from DeltaFire15/system-corruption
[TESTMERGE ONLY] System Corruption for robotic species
|
2020-11-18 22:54:51 -07:00 |
|
|
DeltaFire
|
922129abd2
|
proc override stuff
|
2020-11-15 21:12:01 +01:00 |
|