 BongaTheProto
|
2d1d665e41
|
Revert "Merge remote-tracking branch 'upstream/master'"
This reverts commit c1c9fef224, reversing
changes made to 6767f48e82.
|
2023-12-16 10:48:35 -05:00 |
|
|
BongaTheProto
|
c1c9fef224
|
Merge remote-tracking branch 'upstream/master'
|
2023-12-15 18:12:47 -05:00 |
|
|
SandPoot
|
8cdb82a23f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-12-12 22:06:13 -03:00 |
|
|
deathride58andGitHub
|
3e45c18ab4
|
Merge pull request #16038 from SandPoot/fix-lava+borgs
Deals with lava plus a lot of borg stuff
|
2023-12-12 19:25:13 -05:00 |
|
|
deathride58andGitHub
|
e729badcd2
|
Merge pull request #16039 from SandPoot/maptexts-(verb)-maptexts-(variable)
Maptext()s the maptexts
|
2023-12-12 19:21:17 -05:00 |
|
|
SandPoot
|
e457f40328
|
maptext
|
2023-12-11 17:43:24 -03:00 |
|
|
BongaTheProto
|
700fd57efb
|
Merge remote-tracking branch 'upstream/master'
|
2023-12-08 20:22:05 -05:00 |
|
|
SandPoot
|
c1ec13b1bf
|
maybe final
|
2023-12-07 23:55:44 -03:00 |
|
|
SandPoot
|
42fdd30ba4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-12-05 17:47:58 -03:00 |
|
|
SandPoot
|
b290efc434
|
push
|
2023-11-22 14:11:17 -03:00 |
|
|
SandPoot
|
d4ea14c4ef
|
push
|
2023-10-09 16:15:49 -03:00 |
|
|
BongaTheProtoandGitHub
|
a33dd4d5b5
|
Merge branch 'Sandstorm-Station:master' into master
|
2023-08-18 16:11:50 -05:00 |
|
|
SandPoot
|
41ece8c6ea
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-08-16 16:55:53 -03:00 |
|
|
SandPoot
|
21f2735db9
|
yeah baby that's what i've been waiting for
|
2023-08-16 13:55:58 -03:00 |
|
|
Tsurupeta
|
d4ec25e748
|
all else
|
2023-08-08 14:01:18 +03:00 |
|
|
BongaTheProto
|
2b718295d3
|
Merge remote-tracking branch 'upstream/master'
|
2023-07-23 13:41:11 -05:00 |
|
|
SandPoot
|
8b66a57665
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-07-21 00:23:16 -03:00 |
|
|
LinandGitHub
|
77df8655e0
|
Merge pull request #15990 from SandPoot/lobby-collapse
Collapsible lobby buttons
|
2023-07-20 11:55:29 -05:00 |
|
|
SandPoot
|
6ab934f6a1
|
pushies
|
2023-07-19 15:06:23 -03:00 |
|
|
BongaTheProto
|
5116acad15
|
Merge remote-tracking branch 'upstream/master'
|
2023-05-06 18:31:55 -05:00 |
|
|
SandPoot
|
7038059ab5
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-05-06 10:47:06 -03:00 |
|
|
KrissKr0ss
|
66aa1cb05c
|
Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits"
This reverts commit 48e713ff33, reversing
changes made to efb2d19cb9.
|
2023-05-01 00:16:20 -05:00 |
|
|
BongaTheProto
|
4b547a3208
|
Merge remote-tracking branch 'upstream/master'
|
2023-04-08 15:49:43 -05:00 |
|
|
SandPoot
|
7cc1ecfa1e
|
(i'm being shot by those red arrows help)
|
2023-04-06 18:49:21 -03:00 |
|
|
BongaTheProto
|
acf6b87535
|
Merge remote-tracking branch 'upstream/master'
|
2023-02-24 01:39:26 -05:00 |
|
|
SandPoot
|
f0dcf824a7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-02-24 01:59:45 -03:00 |
|
|
SandPoot
|
b2f7fc5a9e
|
over action buttons also very cool you guy that hates my fancy hints, hope you know how to do everything
|
2023-02-24 01:07:27 -03:00 |
|
|
BongaTheProto
|
972df3f711
|
Merge remote-tracking branch 'upstream/master'
|
2023-02-16 16:30:59 -05:00 |
|
|
SandPoot
|
04eb7226e6
|
general better handling of code + interaction screen tip
|
2023-02-15 23:26:59 -03:00 |
|
|
SandPoot
|
072087ec14
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-02-15 20:22:44 -03:00 |
|
|
BongaTheProto
|
3f376c1bb3
|
Merge remote-tracking branch 'upstream/master'
|
2023-02-13 19:36:05 -05:00 |
|
|
SandPootandGitHub
|
4a01b9f5e2
|
Re-UI-ing (just steals old skyrat) (#302)
* send it
* redefining counts as error, so goodbye
|
2023-02-13 00:22:01 -03:00 |
|
|
SandPoot
|
ed06e686e1
|
pushies.
|
2023-01-31 16:40:17 -03:00 |
|
|
BongaTheProto
|
86a005b590
|
Merge remote-tracking branch 'upstream/master'
|
2023-01-11 12:51:40 -05:00 |
|
|
SandPoot
|
03304ba2c8
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-01-10 22:50:16 -03:00 |
|
|
Timothy TeakettleandGitHub
|
c8fc27fc9c
|
Merge pull request #15930 from SandPoot/reskinning
Update to reskinning
|
2023-01-11 01:00:35 +00:00 |
|
|
SandPoot
|
3b8d102fac
|
puts pda in the system to remove shitcode
|
2023-01-10 20:02:12 -03:00 |
|
|
SandPoot
|
d743096f8a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-01-09 17:50:19 -03:00 |
|
|
Jerry WesterandGitHub
|
ae347f3399
|
Revert "MODsuits"
|
2023-01-08 17:30:26 -07:00 |
|
|
SandPoot
|
82eff346c7
|
Merge Upstream
|
2023-01-07 22:52:22 -03:00 |
|
|
PeriodicChaosandJerry Wester
|
183b554ed3
|
modsuits part 1
|
2022-12-11 20:30:41 -07: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 |
|
|
siliconsandGitHub
|
a8ef986ce5
|
Merge pull request #15848 from shellspeed1/full-auto-port-from-tg-Credit-to-Fikou
Port of a bunch of stuff to update guns at this point because we have a bunch of stuff we are missing.
|
2022-09-23 16:27:03 -07:00 |
|
|
siliconsandGitHub
|
a1fc1e0377
|
Merge pull request #15855 from shellspeed1/borg-pda-addition
Ports borg pdas from hyper. Credit to haha26315 for the orginal PR and BongaTheProto for their port to splurt.
|
2022-09-23 16:16:03 -07:00 |
|
|
BongaTheProtoandGitHub
|
9025f54d7a
|
Merge pull request #464 from ItsSelis/tgui-input-framework
TGUI Input Framework
|
2022-09-20 10:27:32 -05:00 |
|
|
BongaTheProto
|
9cdaffc417
|
Merge remote-tracking branch 'upstream/master'
|
2022-09-18 23:40:20 -05:00 |
|
|
BongaTheProtoandGitHub
|
0d5f2ab542
|
Merge pull request #492 from Zirok-BYOND/miscfixes
Miscfixes
|
2022-09-18 14:59:01 -05:00 |
|
|
SandPoot
|
cc9c36bd13
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-09-17 22:48:51 -03:00 |
|
|
|
1f0ad3e68c
|
its a lil janky but we take those (#15834)
Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
|
2022-09-17 13:47:24 -07:00 |
|