e286bd40f3
Merge remote-tracking branch 'upstream/master'
2024-08-27 15:43:55 -05:00
75d1a7d69c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-08-26 04:31:35 -03:00
106d5b3c1e
Merge remote-tracking branch 'upstream/master'
2024-08-25 12:48:45 -05:00
dc08550162
push
2024-08-25 04:38:03 -03:00
a1905591f7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-08-24 23:49:10 -03:00
c07e94be66
push
2024-08-24 21:28:55 -03:00
1e1fc329f8
Merge remote-tracking branch 'upstream/master' into upstream-merge
2024-04-13 14:12:39 -05:00
002a4c31c1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-04-12 22:06:15 -03:00
ca8ce67cd6
mail
2024-04-10 20:54:04 -03:00
b2e14a5393
Merge remote-tracking branch 'upstream/master' into upstream-merge
2024-03-24 17:02:38 -05:00
b76127c2d7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-03-15 19:21:39 -03:00
8516b07eee
please do not end your paths with /
2024-03-13 14:43:40 -03:00
676cb864b1
missed proc refs
2024-03-12 22:17:30 -03:00
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
d1b0e9ec9f
Merge remote-tracking branch 'upstream/master'
2024-03-01 21:15:28 -05:00
0b990039e3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-01-16 18:00:55 -03:00
c7a2565255
stop this nonsense
2024-01-05 00:28:56 -03:00
13cd269788
Merge remote-tracking branch 'upstream/master'
2023-12-25 14:28:51 -05:00
be37603291
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-12-23 13:28:41 -03:00
7b62dbe7bb
ai + mech
2023-12-17 23:15:59 -03:00
40f1d7401d
procs
2023-11-29 22:40:13 -03:00
d4ec25e748
all else
2023-08-08 14:01:18 +03:00
5116acad15
Merge remote-tracking branch 'upstream/master'
2023-05-06 18:31:55 -05:00
7038059ab5
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-05-06 10:47:06 -03:00
66aa1cb05c
Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits"
...
This reverts commit 48e713ff33efb2d19cb9
2023-05-01 00:16:20 -05:00
0cfe8e33eb
Merge remote-tracking branch 'upstream/master'
2023-02-12 21:42:34 -05:00
2b8a20bae2
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-02-12 22:59:51 -03:00
71d588f33d
Update bounty_console.dm
2023-01-14 04:00:48 +00:00
d063144713
Re-Adding Bounty Consoles
...
Civilian bounties are great, don't get me wrong. But they're civilian bounties and it feels like cargo lost their thing to do, namely putting annoying sheets of paper everywhere. Plus checklists make the brain go ding when you work through them arooga.
2023-01-14 02:01:12 +00:00
d743096f8a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-09 17:50:19 -03:00
ae347f3399
Revert "MODsuits"
2023-01-08 17:30:26 -07:00
82eff346c7
Merge Upstream
2023-01-07 22:52:22 -03:00
23327fa268
Merge pull request #15894 from JerryWester/modsuits
...
MODsuits
2023-01-07 14:07:28 -08:00
8034d9fb22
Merge remote-tracking branch 'upstream/master'
2022-12-31 14:31:12 -05:00
d337852c68
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-12-28 16:56:04 -03:00
3ea2c35832
mismatch
2022-12-23 02:25:26 -06:00
32a5d02434
Merge branch 'master' into modsuits
2022-12-13 19:18:24 -07:00
ee6823c69b
Merge remote-tracking branch 'upstream/master'
2022-12-13 12:14:11 -05:00
f4b7513f10
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-12-13 01:35:33 -03:00
7205781c47
Merge pull request #15892 from SandPoot/let's-sing-the-reference-clearing-song
...
Solves some harddels
2022-12-12 19:11:49 -07:00
f7ac3c7624
beeg commit
2022-12-11 20:32:35 -07:00
183b554ed3
modsuits part 1
2022-12-11 20:30:41 -07:00
8911fe5e0b
clear em
2022-12-11 17:58:45 -03:00
a949e5d08c
Merge remote-tracking branch 'upstream/master'
2022-10-28 16:43:28 -05:00
02e4551a27
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-10-25 22:52:45 -03:00
03c62f4359
Merge pull request #15876 from SandPoot/fix-deadchat_broadcast
...
Fixes deadchat_broadcast
2022-10-25 04:36:00 +00:00
24ee6077c7
push changes
2022-10-23 00:18:03 -03:00
79fa770ab3
Merge remote-tracking branch 'upstream/master'
2022-10-13 11:21:32 -05:00
5384cb9d4b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-10-12 22:25:25 -03:00
f7937e54e0
Merge pull request #15860 from shellspeed1/public-bounties
...
Port of public bounties and the sales tagger from tg.
2022-10-12 03:27:37 -07:00
Mosley