 keronshb
|
f1ca283318
|
Merge branch 'master' into familyport
|
2022-02-11 14:04:57 -05:00 |
|
|
BongaTheProto
|
2ad86e15c4
|
Merge remote-tracking branch 'upstream/master'
|
2022-01-22 16:33:08 -05:00 |
|
|
SandPoot
|
28cc02d653
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-01-22 17:18:15 -03:00 |
|
|
siliconsandGitHub
|
2b726d7670
|
Merge pull request #15324 from Trilbyspaceclone/ashtree
Ashen tree!
|
2022-01-22 04:34:28 -08:00 |
|
|
BongaTheProto
|
6b6194fe24
|
Merge remote-tracking branch 'upstream/master'
|
2022-01-10 18:15:30 -05:00 |
|
|
SandPoot
|
086e3bc704
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-01-09 23:40:45 -03:00 |
|
|
|
0077f682fd
|
crusher gauntlets - resonator hitsound, sharpness to SHARP_NONE (#15458)
* boo womp
* wrongsonator
Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
|
2022-01-09 18:46:48 +01:00 |
|
|
Cognition
|
c1a41394da
|
flight fixes, pick all wing types if second wing potion chugged, a fucking slime species fix
|
2021-12-29 22:20:27 -07:00 |
|
|
BongaTheProtoandGitHub
|
399271c505
|
Merge branch 'Sandstorm-Station:master' into master
|
2021-12-11 15:21:25 -05:00 |
|
|
SandPoot
|
72db0e8ef2
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2021-12-11 17:20:05 -03:00 |
|
|
BlueWildroseandGitHub
|
0e3d30e59f
|
Merge branch 'Citadel-Station-13:master' into wingport
|
2021-12-11 12:53:03 -07:00 |
|
|
DeltaFire
|
50be57f107
|
grrrr
|
2021-12-08 18:33:06 +01:00 |
|
|
Cognition
|
318240bdc6
|
TG wing port - Now YOU TOO, can be an "angel"
|
2021-12-07 18:59:07 -07:00 |
|
|
E
|
fd2626e6f3
|
for reals reals
|
2021-11-29 16:16:05 +01:00 |
|
|
E
|
1924387f2f
|
minors get sepsis
|
2021-11-29 15:41:40 +01:00 |
|
|
E
|
47e7d71822
|
patches saitama crusher
|
2021-11-29 15:11:08 +01:00 |
|
|
SandPoot
|
ed053988d8
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2021-11-24 22:11:23 -03:00 |
|
|
LinandGitHub
|
d5c17f0d84
|
Merge pull request #15376 from SandPoot/double
Double beds
|
2021-11-24 17:38:10 +00:00 |
|
|
LinandGitHub
|
e3a5391250
|
Merge pull request #14868 from Arturlang/admin_mapsave
buildmode mapgen tool save [ready]
|
2021-11-24 17:32:48 +00:00 |
|
|
Artur
|
99dedb54ed
|
Merge remote-tracking branch 'upstream/master' into admin_mapsave
|
2021-11-20 00:16:56 +02:00 |
|
|
SandPoot
|
34900425aa
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2021-11-17 13:48:32 -03:00 |
|
|
SandPoot
|
5b85c260a7
|
Upload files
|
2021-11-15 01:34:30 -03:00 |
|
|
DeltaFire
|
6aa906395c
|
not a gaius reference
hhhh let me just replace all the ex_acts missing some args and adjust them
|
2021-11-14 21:34:59 +01:00 |
|
|
Trilbyspaceclone
|
41b3643631
|
tested and all working
|
2021-11-09 23:41:57 -05:00 |
|
|
keronshb
|
9153115566
|
Merge remote-tracking branch 'upstream/master' into familyport
|
2021-11-05 10:50:08 -04:00 |
|
|
Trilbyspaceclone
|
c7fb7dd90f
|
lower honey + metadata
|
2021-11-03 14:16:36 -04:00 |
|
|
TrilbyspacecloneandGitHub
|
2a4968489d
|
10-30
|
2021-11-02 09:31:54 -04:00 |
|
|
Trilbyspaceclone
|
7816417c32
|
tree fix and balance honey
|
2021-11-02 06:31:15 -04:00 |
|
|
TrilbyspacecloneandGitHub
|
e10397777c
|
Update ash_tree.dm
|
2021-11-02 06:06:23 -04:00 |
|
|
TrilbyspacecloneandGitHub
|
087e00be1c
|
New line linnet thing
|
2021-11-01 11:40:01 -04:00 |
|
|
Trilbyspaceclone
|
5bd9b440a9
|
Ashen tree!
|
2021-11-01 11:27:42 -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 |
|
|
keronshb
|
8978ee10fe
|
Merge remote-tracking branch 'upstream/master' into familyport
|
2021-10-28 14:41:46 -04:00 |
|
|
keronshb
|
c80d65df73
|
Merge branch 'master' into familyport
|
2021-10-28 14:34:20 -04: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 |
|
|
siliconsandGitHub
|
a14549d07b
|
Merge pull request #15299 from Hatterhat/cgau
funny hands gaming - adds proto-kinetic gauntlets
|
2021-10-27 13:36:08 -07:00 |
|
|
SandPoot
|
13d7a166fe
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not
|
2021-10-27 13:54:49 -03:00 |
|
|
Artur
|
bfcdf83e55
|
buildmode mapgen tool save
|
2021-10-26 16:31:36 +03:00 |
|
|
SandPoot
|
0afe5a098b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2021-10-24 12:27:46 -03:00 |
|
|
Hatterhat
|
5dbadffe6b
|
wait a fucking second
|
2021-10-23 18:15:20 -05:00 |
|
|
Hatterhat
|
21f88e9711
|
sounb
|
2021-10-23 17:47:31 -05:00 |
|
|
Hatterhat
|
73bbe4f694
|
igons
|
2021-10-23 17:47:06 -05:00 |
|
|
Hatterhat
|
4559b680fd
|
whoops
|
2021-10-22 22:07:10 -05:00 |
|
|
Hatterhat
|
7fb3666f43
|
funny hands gaming
|
2021-10-22 22:05:18 -05:00 |
|
|
Emily
|
57950045a7
|
Fixes the sprites for wielding.
|
2021-10-20 10:06:14 +02:00 |
|
|
keronshb
|
0bae06adcd
|
Original Port
|
2021-10-11 22:00:54 -04: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 |
|
|
SandPoot
|
be2a85d9d0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2021-10-03 15:41:30 -03:00 |
|
|
WanderingFox95andGitHub
|
fe8a652689
|
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
|
2021-09-19 21:32:03 +02:00 |
|