Commit Graph
179 Commits
Author SHA1 Message Date
Tsurupeta d4ec25e748 all else 2023-08-08 14:01:18 +03:00
Satile1 61ef0f337e Hotel Radio channel! Mapping fixes and flavour 2023-05-25 17:09:21 +01:00
BongaTheProto f0b7bd40a6 follow-up
because some stuff got ported
2022-09-27 23:39:10 -05: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
BongaTheProto 3341812b44 Merge remote-tracking branch 'upstream/master' 2022-08-20 17:16:19 -05:00
SandPoot 550db1b6ee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-20 17:27:19 -03:00
Putnam3145 d08a570c5f Makes binary translator not show a wrong description 2022-08-18 21:51:39 -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
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
SandPoot 5029af901b Upload files 2022-02-25 16:58:09 -03:00
Anonymous e962df9df5 Modularization 2022-01-23 01:34:39 +03:00
Anonymous a17bce4c53 Ports old skyrat handling of borg radio 2022-01-22 22:59:31 +03: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
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
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
silicons bac7bc3fb6 fix 2021-10-03 11:29:32 -07:00
SandPoot 4b1df1bfb3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-13 10:18:55 -03:00
zerothebigboy 3c23a09b56 bannedforbeingcringeist 2021-09-07 21:10:24 -04:00
SandPoot 98e11d88a9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-02-21 23:29:09 -03:00
SandPoot 123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
2021-02-18 15:04:46 -03:00
SandPoot cf2e70671a upload files 2021-02-18 14:47:10 -03:00
SandPoot 3aa7554135 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-02-06 20:36:07 -03:00
TyrianTyrellandGitHub 4f5f0eec07 Update radio.dm 2021-01-31 14:19:04 -05:00
TyrianTyrellandGitHub cfa169293c Update radio.dm 2021-01-31 14:17:53 -05:00
TyrianTyrellandGitHub 318f34be78 Update headset.dm 2021-01-31 14:15:40 -05:00
SandPoot 3eb9dfdede Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-24 22:23:53 -03:00
MrJWhit 3e157c3aa8 Update headset.dm 2021-01-22 19:18:28 -05:00
SandPootandGitHub 13834c4bef Morrowinventory Port (#75) 2020-09-24 20:14:53 -03:00
Letter N fe17bee28e reverts thing kev said about 2020-08-29 14:36:41 +08:00
Letter N f2f6416105 fixes - radio, broken - crewmanifest, gastank controler 2020-08-05 20:34:09 +08:00
Letter N b376a6b6c4 Merge remote-tracking branch 'origin/master' into TGUI-4 2020-07-30 14:43:52 +08:00
Letter N 8e177bf01e another batch - MAJOR: teleportaiton, displaycase (ico port needed), 2020-07-24 19:58:48 +08:00
silicons 98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
silicons 993b4ec222 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-16 19:39:46 -07:00
silicons 6ee63f66aa whew 2020-07-07 20:48:54 -07:00
Artur 20245f7319 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-30 02:30:29 +03:00
Ghommie 8f6b31c26e Solving several issues. 2020-06-26 18:40:20 +02:00
Artur 19f215477e Merge remote-tracking branch 'upstream/master' into TGUI-3.0 2020-05-30 18:52:02 +03:00
GhomandGitHub ce1f1bdf5e Turning a few components into elements. (#12325)
* Turning a few components into elements.

* eh
2020-05-24 13:06:27 -07:00