Commit Graph

213 Commits

Author SHA1 Message Date
SandPoot 68fa21d602 content 2024-04-05 17:57:54 -03:00
SandPoot 676cb864b1 missed proc refs 2024-03-12 22:17:30 -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
SandPoot 7eaef36e11 d k daunkey kaung 2024-01-03 22:42:03 -03:00
SandPoot de3c8435b5 thanks for saying it was a brain, you guys are the best 2023-12-17 23:43:54 -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
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03:00
SandPoot 11aa13e4e8 part 1 - 41928 2023-07-26 21:45:43 -03:00
keronshb 1415b9580f Last fixes 2022-02-25 22:29:09 -05:00
keronshb 3ea22f97a6 Merge remote-tracking branch 'upstream/master' into ambitioncheck 2022-02-22 17:10:25 -05:00
keronshb f1ca283318 Merge branch 'master' into familyport 2022-02-11 14:04:57 -05:00
keronshb 83a62ace04 Ambitioncheck 2021-12-23 21:15:31 -05:00
LetterN fa6946fae4 added the funny. Also adds balloon_alert to more stuff (primarily atmos) 2021-11-16 16:10:12 +08:00
LetterN 8b16653744 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-11-12 08:50:23 +08:00
keronshb 9153115566 Merge remote-tracking branch 'upstream/master' into familyport 2021-11-05 10:50:08 -04:00
silicons 186b552103 merge 2021-10-29 21:50:58 -07:00
LetterN a057139c33 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-10-30 11:54:20 +08:00
LetterN 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
keronshb 8978ee10fe Merge remote-tracking branch 'upstream/master' into familyport 2021-10-28 14:41:46 -04:00
Letter N bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
keronshb 29a01f2d05 Antag Info and fixing the handshake finally 2021-10-14 20:43:41 -04: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 5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
keronshb 792dc073b3 Final fixes? 2021-09-16 13:28:34 -04:00
Fabian 03bd073cb5 fixes compile errors 2021-03-05 21:59:00 +01:00
Fabian 8178b7073a It's done, atleast the code is 2021-03-05 21:50:29 +01:00
Fabian 2f1aba4f80 Revert "i can't believe kevin made me code"
This reverts commit 7f38564838.
2021-03-05 21:19:59 +01:00
Fabian a061f02b5b Revert "objectives"
This reverts commit dbabbb1062.
2021-03-05 21:19:56 +01:00
Fabian 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
Fabian 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
Fabian dbabbb1062 objectives
hrnrghghgh
2021-03-05 20:31:57 +01:00
Fabian 7f38564838 i can't believe kevin made me code
im taking severe offense to this
2021-03-05 19:55:53 +01:00
Artur 8d073bbce6 Merge remote-tracking branch 'upstream/master' into TGUI_Updoot 2020-09-02 19:05:18 +03:00
Artur 3bef4ba35e TGUI updates + statpanel 2020-09-02 17:52:47 +03:00
timothyteakettle a9ec2254ba hide your ckey 2020-08-31 01:47:49 +01:00
timothyteakettle e8fade4f7f changes 2020-07-18 02:29:12 +01:00
timothyteakettle 584e74590f port1 2020-07-17 02:01:33 +01:00
Timothy Teakettle 02f46322ad port examine 2020-07-09 18:32:45 +01:00
Ghommie 02a21081a6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit792 2020-06-15 02:21:21 +02:00
DeltaFire e2466f1e22 tiny bit of better performance 2020-06-08 21:29:29 +02:00
DeltaFire c29be22f9b no more gamer time 2020-06-08 19:06:41 +02:00
Ghommie 2f3fd48b84 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit792 2020-05-31 16:08:52 +02:00
Ghom 968426fd48 Combat mode component. (#12338)
* Combat mode component.

* Whoops.

* test.

* Oh

* refs begone, and documentation.
2020-05-27 18:00:32 -07:00
Ghommie d04d6ae9eb WIP 2020-05-25 15:06:31 +02:00
kevinz000 616d104c23 Merge pull request #12189 from Ghommie/Ghommie-cit735
Skill modifier datums.
2020-05-14 04:46:24 -07:00
Ghommie 300331ccb7 Skill modifiers datum WIP. 2020-05-10 02:11:48 +02:00
Ghommie 2858ddd90b Porting "Refactors language holder" 2020-05-08 22:44:02 +02:00
Ghommie 643ef48f0e Macros, generic skill implementations. 2020-05-05 04:42:34 +02:00
kevinz000 6c5d42b5f5 oh boy 2020-04-25 00:48:56 -07:00