 Mosley
|
106d5b3c1e
|
Merge remote-tracking branch 'upstream/master'
|
2024-08-25 12:48:45 -05:00 |
|
|
SandPoot
|
a1905591f7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-08-24 23:49:10 -03:00 |
|
|
SandPoot
|
c07e94be66
|
push
|
2024-08-24 21:28:55 -03:00 |
|
|
BongaTheProto
|
353e81e8ce
|
Merge remote-tracking branch 'upstream/master'
|
2024-05-29 17:56:50 -05:00 |
|
|
SandPoot
|
62f858a154
|
this one too
|
2024-05-29 18:49:16 -03:00 |
|
|
SandPoot
|
5023ba4fc8
|
just so it appears in the right spot
|
2024-05-29 18:48:07 -03:00 |
|
|
BongaTheProto
|
652a380d02
|
Merge remote-tracking branch 'upstream/master'
|
2024-05-20 18:15:04 -05:00 |
|
|
SandPoot
|
e31747dc08
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-05-20 18:55:33 -03:00 |
|
|
SandPoot
|
7832dbdba4
|
push
|
2024-05-20 18:25:24 -03:00 |
|
|
BongaTheProto
|
dc057a41ad
|
Merge branch 'master' into upstream-merge
|
2024-04-06 18:51:51 -05:00 |
|
|
Elizabeth Lavenza
|
77058b4a6b
|
Remove duplicated cyborg premium KA code
|
2024-04-01 16:05:35 -04:00 |
|
|
BongaTheProto
|
b2e14a5393
|
Merge remote-tracking branch 'upstream/master' into upstream-merge
|
2024-03-24 17:02:38 -05:00 |
|
|
SandPoot
|
b76127c2d7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-03-15 19:21:39 -03:00 |
|
|
SandPoot
|
a65f323734
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit
|
2024-03-08 19:10:22 -03:00 |
|
|
BongaTheProto
|
d1b0e9ec9f
|
Merge remote-tracking branch 'upstream/master'
|
2024-03-01 21:15:28 -05:00 |
|
|
BongaTheProtoandGitHub
|
dc0b83c256
|
Merge pull request #1077 from ariaworld/remove-extools
[CODEBASE-IMPROVEMENT-PORT] Removes Extools for reference tracking, modernizes Borg code to GC correctly & more clean fixes and optimizations.
|
2024-02-28 01:37:35 -05:00 |
|
|
BongaTheProtoandGitHub
|
d439eeef0e
|
Merge pull request #800 from CloverIsLucky/patch-2
Minerborg minor buff: Add a few things to carry with its gripper than just shelter capsules.
|
2024-02-17 14:40:46 -05:00 |
|
|
nickstershovel
|
1a0a313225
|
Fix borgs, fix ssd_mob_list removal
|
2024-02-10 21:42:20 +01:00 |
|
|
SandPoot
|
0b990039e3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-01-16 18:00:55 -03:00 |
|
|
SandPoot
|
c7a2565255
|
stop this nonsense
|
2024-01-05 00:28:56 -03:00 |
|
|
SandPoot
|
7eaef36e11
|
d k daunkey kaung
|
2024-01-03 22:42:03 -03:00 |
|
|
BongaTheProto
|
13cd269788
|
Merge remote-tracking branch 'upstream/master'
|
2023-12-25 14:28:51 -05:00 |
|
|
SandPoot
|
be37603291
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-12-23 13:28:41 -03:00 |
|
|
SandPoot
|
653b767f32
|
remove antags for borging...
|
2023-12-17 23:35:51 -03:00 |
|
|
SandPoot
|
7b62dbe7bb
|
ai + mech
|
2023-12-17 23:15:59 -03:00 |
|
|
BongaTheProto
|
c1c9fef224
|
Merge remote-tracking branch 'upstream/master'
|
2023-12-15 18:12:47 -05:00 |
|
|
SandPoot
|
8cdb82a23f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-12-12 22:06:13 -03:00 |
|
|
SandPoot
|
c36105ef88
|
holy hell
|
2023-12-07 23:08:17 -03:00 |
|
|
SandPoot
|
40f1d7401d
|
procs
|
2023-11-29 22:40:13 -03:00 |
|
|
CloverIsLuckyandGitHub
|
d188f93eb6
|
I'm silly, forgot to add the comas.
|
2023-03-31 07:41:33 -06:00 |
|
|
CloverIsLuckyandGitHub
|
1bc1ad954b
|
Minor grammar edit on desc.
|
2023-03-31 07:33:42 -06:00 |
|
|
CloverIsLuckyandGitHub
|
48522e8e41
|
"I need healing"
|
2023-03-31 07:09:43 -06:00 |
|
|
BongaTheProto
|
57a7a516e6
|
Merge remote-tracking branch 'upstream/master'
|
2023-03-06 22:43:10 -05:00 |
|
|
SandPoot
|
d63c2ebdd8
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-03-05 12:35:35 -03:00 |
|
|
zerothebigboy
|
091d9ec00f
|
good
|
2023-01-30 00:01:22 -05:00 |
|
|
BongaTheProto
|
79fa770ab3
|
Merge remote-tracking branch 'upstream/master'
|
2022-10-13 11:21:32 -05:00 |
|
|
SandPoot
|
5384cb9d4b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-10-12 22:25:25 -03:00 |
|
|
BongaTheProto
|
e1cb9c8346
|
Merge remote-tracking branch 'upstream/master'
|
2022-09-27 23:19:10 -05:00 |
|
|
SandPoot
|
f039efca97
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-09-27 01:19:55 -03:00 |
|
|
shellspeed1
|
2d90e0ab33
|
readds the premium ka but for borgs
|
2022-09-17 19:03:03 -07:00 |
|
|
BongaTheProto
|
6ada3f7c94
|
Merge remote-tracking branch 'upstream/master' into its-wasnt-gonna-happen
|
2022-04-18 21:36:14 -05:00 |
|
|
SandPoot
|
05349c27e9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-04-15 23:43:43 -03:00 |
|
|
SandPoot
|
586a035132
|
Update files
|
2022-04-06 18:41:31 -03:00 |
|
|
Ludox
|
92ca115ec4
|
adv plasm cutter is now correctly classified
thank me later :D
|
2022-02-24 07:22:32 +01:00 |
|
|
SandPoot
|
f1f6ac0109
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2021-10-31 22:14:23 -03:00 |
|
|
Letter NandGitHub
|
bcdf96f274
|
Revert "TGUI alerts, lists, inputs"
|
2021-10-28 12:17:29 +08:00 |
|
|
SandPoot
|
32a6e63698
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2021-10-27 23:11:54 -03:00 |
|
|
SandPoot
|
437b3105d1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not
|
2021-10-08 21:05:41 -03:00 |
|
|
SandPoot
|
2c4fcaba81
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2021-10-06 15:04:36 -03:00 |
|
|
Chayse RamsayandGitHub
|
76fa85e683
|
Cyborg module sorting fixed (#15241)
|
2021-10-06 17:16:10 +02:00 |
|