Tsurupeta
d4ec25e748
all else
2023-08-08 14:01:18 +03:00
BongaTheProto
ea324c5bc1
Merge remote-tracking branch 'upstream/master'
2023-07-28 20:43:43 -05:00
SandPoot
789534ac63
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-07-28 18:36:03 -03:00
SandPoot
11aa13e4e8
part 1 - 41928
2023-07-26 21:45:43 -03:00
BongaTheProto
54aec9bd98
Merge remote-tracking branch 'upstream/master'
2022-02-27 14:38:06 -05:00
SandPoot
fb7a24b333
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-27 14:17:53 -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
BongaTheProto
b437b03b48
Merge remote-tracking branch 'upstream/master'
2022-02-13 13:40:33 -05:00
SandPoot
5dc331c406
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-13 11:51:07 -03:00
keronshb
f1ca283318
Merge branch 'master' into familyport
2022-02-11 14:04:57 -05:00
BongaTheProto
20d0dd81e7
I have no idea if this works
...
lol
2022-02-06 22:41:14 -05:00
BongaTheProto
5638985734
Merge branch 'ambitions' into pr/176
2022-02-06 20:27:38 -05:00
BongaTheProto
9ce527e068
Merge remote-tracking branch 'upstream/master'
2022-01-26 00:20:29 -05:00
SandPoot
e8c8d2b0ef
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-01-25 11:38:07 -03:00
E
ff54af25b6
hate
2022-01-19 00:40:50 +01:00
E
a1a14dc012
khajitness embraced
2022-01-18 23:44:48 +01:00
keronshb
83a62ace04
Ambitioncheck
2021-12-23 21:15:31 -05:00
Crowbar764 and GitHub
251c015dc8
Merge branch 'master' into slaver-antag
2021-12-05 19:59:35 +00:00
James
9258b93f64
Modularises (most of) the code into EROS module folder
2021-12-05 19:39:24 +00:00
James
738e009078
Adds WIP shuttle / hideout. Adds teleport implant. More slave stuff.
2021-12-04 06:02:40 +00:00
James
f3726aba32
Added slave collars, slave console and modified comms console
2021-12-02 17:01:23 +00:00
E
d3667ecde7
a
2021-11-20 00:22:38 +01: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
SandPoot
3da59fc38c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-11-05 14:27:17 -03:00
keronshb
9153115566
Merge remote-tracking branch 'upstream/master' into familyport
2021-11-05 10:50:08 -04:00
SandPoot
f1f6ac0109
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-31 22:14:23 -03: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 and GitHub
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
keronshb
29a01f2d05
Antag Info and fixing the handshake finally
2021-10-14 20:43:41 -04:00
SandPoot
d55d628efe
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-08 21:34:03 -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
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
Enric Gabriel
4de9baf690
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
2020-09-21 14:10:28 -03: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
Tsurupeta