 BongaTheProto
|
6e6bce8772
|
Merge remote-tracking branch 'upstream/master' into hate-upstream
|
2023-10-18 22:02:48 -05:00 |
|
|
SandPoot
|
45a94856c1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-10-18 18:24:11 -03:00 |
|
|
SandPoot
|
297ee64977
|
push
|
2023-10-12 15:45:35 -03:00 |
|
|
BlueWildroseandGitHub
|
def4b38a46
|
Revert "[DNM] Updates firemanning, throwing stuff"
|
2023-10-11 13:52:03 -06:00 |
|
|
SandPoot
|
5a90dabd3c
|
stuff
|
2023-10-03 23:22:57 -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 |
|
|
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 |
|
|
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 |
|
|
SandPoot
|
ed06e686e1
|
pushies.
|
2023-01-31 16:40:17 -03:00 |
|
|
SandPoot
|
44913d5fff
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into new-decal-painter
|
2023-01-28 01:20:26 -03:00 |
|
|
SandPoot
|
a56247f828
|
oops?
|
2023-01-28 01:18:35 -03:00 |
|
|
SandPoot
|
c60f36a42b
|
files
|
2023-01-28 01:10:49 -03:00 |
|
|
BongaTheProto
|
368c3a8e16
|
Merge remote-tracking branch 'upstream/master'
|
2023-01-18 18:15:56 -05:00 |
|
|
SandPootandGitHub
|
d362dacfd0
|
Rebalances the equalizing atmos to be more like bee's (#287)
|
2023-01-18 08:13:27 -03:00 |
|
|
Jerry WesterandGitHub
|
ae347f3399
|
Revert "MODsuits"
|
2023-01-08 17:30:26 -07:00 |
|
|
Jerry Wester
|
d3c72669d9
|
clean up & remove longfall boots
|
2022-12-20 02:03:45 -07:00 |
|
|
Jerry Wester
|
13f8559190
|
add springlock module
|
2022-12-17 16:54:41 -07:00 |
|
|
Jerry Wester
|
f7ac3c7624
|
beeg commit
|
2022-12-11 20:32:35 -07:00 |
|
|
PeriodicChaosandJerry Wester
|
183b554ed3
|
modsuits part 1
|
2022-12-11 20:30:41 -07:00 |
|
|
BongaTheProto
|
79fa770ab3
|
Merge remote-tracking branch 'upstream/master'
|
2022-10-13 11:21:32 -05:00 |
|
|
siliconsandGitHub
|
f7937e54e0
|
Merge pull request #15860 from shellspeed1/public-bounties
Port of public bounties and the sales tagger from tg.
|
2022-10-12 03:27:37 -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 |
|
|
shellspeed1
|
b4f886d999
|
port of https://github.com/tgstation/tgstation/pull/49111 aka sales taggers, credit to ArcaneMusic
|
2022-09-18 20:55:22 -07:00 |
|
|
shellspeed1
|
bc13bdb177
|
sort of working fire selector, still need to get the safety stuff figured out and finish getting the selector working properly
|
2022-09-09 22:23:05 -07:00 |
|
|
shellspeed1
|
f2ed6a571c
|
this gets it to the point it compiles
|
2022-09-09 18:04:52 -07:00 |
|
|
ItsSelis
|
b45db075fe
|
Merge branch 'master' into tgui-input-framework
|
2022-09-03 23:59:32 +02:00 |
|
|
ItsSelis
|
33d9cfe733
|
TGUI Input Framework
|
2022-08-31 16:38:16 +02:00 |
|
|
Pin-alternative
|
9e377c644b
|
Merge remote-tracking branch 'upstream/master' into cursed
|
2022-08-23 07:41:40 +10:00 |
|
|
siliconsandGitHub
|
18b797d0f4
|
Merge pull request #15758 from LetterN/patch-12
fix pod not unlocking on code delta
|
2022-08-20 12:27:11 -07:00 |
|
|
Pin-alternative
|
9ba41fb085
|
Merge remote-tracking branch 'upstream/master' into cursed
|
2022-08-15 07:55:25 +10:00 |
|
|
Putnam3145
|
047c6a2a21
|
removes some duplicate signals
|
2022-08-07 18:00:53 -07:00 |
|
|
Putnam3145
|
b2d816b825
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits
|
2022-08-07 17:59:28 -07:00 |
|
|
Letter NandGitHub
|
29324f5e47
|
lazy implementation
|
2022-08-05 22:29:11 -07:00 |
|
|
Pin-alternative
|
5c44cad61e
|
Merge remote-tracking branch 'upstream/master' into cursed
|
2022-07-25 20:35:54 +10:00 |
|
|
SandPoot
|
329e160a1f
|
/BiologicalLife(delta_time...
|
2022-07-20 21:40:53 -03:00 |
|
|
Pin-alternative
|
2a8a23dd30
|
Merge remote-tracking branch 'upstream/master' into cursed
|
2022-06-24 20:10:06 +10:00 |
|
|
Pin-alternative
|
f59bb6032e
|
get this stuff done
|
2022-06-23 20:07:12 +10:00 |
|
|
deathride58
|
73ec43f997
|
bark queue signals
|
2022-06-13 17:42:57 -04:00 |
|
|
deathride58
|
17917ed564
|
bark followup - audio balance pass, bark intercepts, yelling nerf, falloff fix, etc!
|
2022-06-11 19:39:48 -04:00 |
|
|
deathride58andGitHub
|
134425634f
|
Merge branch 'master' into update-smooth-movement
|
2022-06-05 00:45:45 -04:00 |
|
|
SandPoot
|
8bb1c2b32a
|
Upload files
|
2022-05-30 01:31:54 -03:00 |
|