2d87780147
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2025-02-13 18:06:56 -03:00
56d972eb0b
all sorts of fixes and updates, may break stuff
2025-02-09 02:09:28 -03:00
c2df4281b9
Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13 ; branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-04-05 23:31:50 -03:00
68fa21d602
content
2024-04-05 17:57:54 -03:00
b76127c2d7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-03-15 19:21:39 -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
0b990039e3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-01-16 18:00:55 -03:00
7eaef36e11
d k daunkey kaung
2024-01-03 22:42:03 -03:00
be37603291
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-12-23 13:28:41 -03:00
de3c8435b5
thanks for saying it was a brain, you guys are the best
2023-12-17 23:43:54 -03:00
653b767f32
remove antags for borging...
2023-12-17 23:35:51 -03:00
7b62dbe7bb
ai + mech
2023-12-17 23:15:59 -03:00
40f1d7401d
procs
2023-11-29 22:40:13 -03:00
789534ac63
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-07-28 18:36:03 -03:00
11aa13e4e8
part 1 - 41928
2023-07-26 21:45:43 -03:00
fb7a24b333
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-27 14:17:53 -03:00
1415b9580f
Last fixes
2022-02-25 22:29:09 -05:00
3ea22f97a6
Merge remote-tracking branch 'upstream/master' into ambitioncheck
2022-02-22 17:10:25 -05:00
5dc331c406
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-13 11:51:07 -03:00
f1ca283318
Merge branch 'master' into familyport
2022-02-11 14:04:57 -05:00
e8c8d2b0ef
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-01-25 11:38:07 -03:00
83a62ace04
Ambitioncheck
2021-12-23 21:15:31 -05:00
fa6946fae4
added the funny. Also adds balloon_alert to more stuff (primarily atmos)
2021-11-16 16:10:12 +08:00
8b16653744
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-11-12 08:50:23 +08:00
3da59fc38c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-11-05 14:27:17 -03:00
9153115566
Merge remote-tracking branch 'upstream/master' into familyport
2021-11-05 10:50:08 -04:00
f1f6ac0109
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-31 22:14:23 -03:00
186b552103
merge
2021-10-29 21:50:58 -07:00
a057139c33
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-10-30 11:54:20 +08:00
99019166e4
i think it works
...
MAJOR antag backend update
- you cannot bruteforce the pen anymore
- uplink now uses bitflag to lock purchases
- poplock is handled entirely by the buyable uplink items
- tgui antag intro (for selected ones)
2021-10-30 11:45:50 +08:00
8978ee10fe
Merge remote-tracking branch 'upstream/master' into familyport
2021-10-28 14:41:46 -04:00
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08:00
32a6e63698
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-27 23:11:54 -03:00
29a01f2d05
Antag Info and fixing the handshake finally
2021-10-14 20:43:41 -04:00
d55d628efe
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-08 21:34:03 -03:00
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
5aa12b4716
There's a bounty for this right? i spent nearly two full days at this
2021-10-05 18:10:32 -03:00
792dc073b3
Final fixes?
2021-09-16 13:28:34 -04:00
03bd073cb5
fixes compile errors
2021-03-05 21:59:00 +01:00
8178b7073a
It's done, atleast the code is
2021-03-05 21:50:29 +01:00
2f1aba4f80
Revert "i can't believe kevin made me code"
...
This reverts commit 7f38564838
2021-03-05 21:19:59 +01:00
a061f02b5b
Revert "objectives"
...
This reverts commit dbabbb1062
2021-03-05 21:19:56 +01:00
b99b9f65d6
Revert "god why am i doing it this way instead of just looking at end changes"
...
This reverts commit aa6402427b
2021-03-05 21:19:53 +01:00
aa6402427b
god why am i doing it this way instead of just looking at end changes
...
im going through every single commit im retarded
2021-03-05 21:11:09 +01:00
dbabbb1062
objectives
...
hrnrghghgh
2021-03-05 20:31:57 +01:00
7f38564838
i can't believe kevin made me code
...
im taking severe offense to this
2021-03-05 19:55:53 +01:00
4de9baf690
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
2020-09-21 14:10:28 -03:00
8d073bbce6
Merge remote-tracking branch 'upstream/master' into TGUI_Updoot
2020-09-02 19:05:18 +03:00
3bef4ba35e
TGUI updates + statpanel
2020-09-02 17:52:47 +03:00
SandPoot