 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 |
|
|
SandPoot
|
e457f40328
|
maptext
|
2023-12-11 17:43:24 -03:00 |
|
|
SandPoot
|
36f3edaf4c
|
push
|
2023-12-10 15:16:51 -03:00 |
|
|
SandPoot
|
c36105ef88
|
holy hell
|
2023-12-07 23:08:17 -03:00 |
|
|
ariaworld
|
3805388363
|
Modularize, RAHHHH!
|
2023-11-19 03:03:30 +01:00 |
|
|
ariaworld
|
e98019e91e
|
Push, push, push.
|
2023-11-17 21:34:27 +01:00 |
|
|
ariaworld
|
23f141965e
|
First draft.
|
2023-10-31 14:03:34 +01:00 |
|
|
BlueWildroseandGitHub
|
def4b38a46
|
Revert "[DNM] Updates firemanning, throwing stuff"
|
2023-10-11 13:52:03 -06:00 |
|
|
BongaTheProto
|
cd026aaddb
|
Merge remote-tracking branch 'upstream/master'
|
2023-10-05 13:38:12 -05:00 |
|
|
SandPootandGitHub
|
c3735c05ac
|
Merge branch 'master' into throwing-updat
|
2023-10-04 15:15:15 -03:00 |
|
|
SandPoot
|
5a90dabd3c
|
stuff
|
2023-10-03 23:22:57 -03:00 |
|
|
SandPoot
|
da9d3f1ba0
|
Merge commit 'af33de25b4732bf6234304bb3cee88c81e65538a' of https://github.com/Citadel-Station-13/Citadel-Station-13 into pr/SmiLeYre/346
|
2023-10-03 18:57:44 -03:00 |
|
|
SandPoot
|
af33de25b4
|
the commit
|
2023-10-03 14:22:05 -03:00 |
|
|
SandPoot
|
cd12c202c4
|
updates, modularizing and generally making the code better
|
2023-10-02 22:53:21 -03:00 |
|
|
Марк
|
e8c0eaa1c1
|
Plushies.
|
2023-10-03 04:04:54 +05:00 |
|
|
BongaTheProto
|
085bb06e94
|
Merge remote-tracking branch 'upstream/master'
|
2023-09-16 14:32:38 -05:00 |
|
|
SandPoot
|
0b04af4b76
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-09-14 22:32:47 -03:00 |
|
|
SandPoot
|
3c7e79d384
|
do after update
|
2023-09-09 15:39:49 -03:00 |
|
|
Tsurupeta
|
d4ec25e748
|
all else
|
2023-08-08 14:01:18 +03:00 |
|
|
BongaTheProto
|
e87e828638
|
Merge remote-tracking branch 'upstream/master'
|
2023-07-25 22:47:02 -05:00 |
|
|
SandPoot
|
ef186347ca
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-07-23 18:56:20 -03:00 |
|
|
SandPoot
|
19ee7f8bd2
|
some hints
|
2023-07-19 20:51:25 -03:00 |
|
|
Satile1
|
61ef0f337e
|
Hotel Radio channel! Mapping fixes and flavour
|
2023-05-25 17:09:21 +01: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 |
|
|
Jerry WesterandKrissKr0ss
|
44c029176c
|
remove signals_atom_movable.dm, revert jetpack
|
2023-05-01 00:19:48 -05: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 |
|
|
KeplerWasTaken
|
1e71db0b70
|
removed distasteful symbols
|
2023-04-17 22:27:46 +02:00 |
|
|
BongaTheProto
|
57a7a516e6
|
Merge remote-tracking branch 'upstream/master'
|
2023-03-06 22:43:10 -05:00 |
|
|
SandPoot
|
d63c2ebdd8
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-03-05 12:35:35 -03:00 |
|
|
siliconsandGitHub
|
6efd3098d4
|
Merge pull request #15961 from zeroisthebiggay/sevakillmarktwo
Removes the SEVA suit, replacing it with the HEVA suit - an ash-storm proof alternative.
|
2023-03-04 23:36:36 -08:00 |
|
|
Darius
|
d48025140b
|
Merge branch 'master' into overhaul-quirk-dumb4cum
|
2023-02-23 00:37:04 -05:00 |
|
|
BongaTheProto
|
2151624f10
|
Merge remote-tracking branch 'upstream/master'
|
2023-02-22 19:14:08 -05:00 |
|
|
SandPootandSandPoot
|
2bdec078d7
|
Merge pull request #311 from Sandstorm-Station/duct-piping
Several duct pipe fixes/qol
|
2023-02-21 16:44:35 -03:00 |
|
|
SandPoot
|
c9055c4d65
|
minor issue
|
2023-02-21 16:34:10 -03:00 |
|
|
SandPoot
|
e0c8419cdd
|
deal with duct pipes
|
2023-02-21 16:09:35 -03:00 |
|
|
Darius
|
86b4f6c6ec
|
Merge branch 'master' into overhaul-quirk-dumb4cum
|
2023-02-19 20:23:16 -05:00 |
|
|
BongaTheProto
|
972df3f711
|
Merge remote-tracking branch 'upstream/master'
|
2023-02-16 16:30:59 -05:00 |
|
|
SandPoot
|
072087ec14
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-02-15 20:22:44 -03:00 |
|
|
SandPootandGitHub
|
2bf781580e
|
Merge branch 'master' into new-decal-painter
|
2023-02-15 20:06:29 -03:00 |
|
|
Timothy TeakettleandGitHub
|
71de9c13e3
|
Merge pull request #15962 from SandPoot/contextual-screentips
Contextual screentips -- Screentips now show you what items/objects can do
|
2023-02-15 23:04:54 +00:00 |
|
|
BongaTheProto
|
0cfe8e33eb
|
Merge remote-tracking branch 'upstream/master'
|
2023-02-12 21:42:34 -05:00 |
|
|
SandPoot
|
2b8a20bae2
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-02-12 22:59:51 -03:00 |
|
|
Timothy TeakettleandGitHub
|
5f6e204866
|
Merge pull request #15940 from squib-bot/fermichemwork
Re-Adding Bounty Consoles
|
2023-02-11 00:06:37 +00:00 |
|
|
SandPoot
|
78c28a40c7
|
sneaky hint about reskinning
|
2023-02-09 02:54:31 -03:00 |
|
|
SandPoot
|
4491abc2d7
|
updates to most recent version and puts intent hints!
|
2023-02-09 02:20:02 -03:00 |
|
|
Darius
|
bcf5904b6c
|
Merge branch 'master' into overhaul-quirk-dumb4cum
|
2023-02-08 21:49:37 -05:00 |
|