 Enric Gabriel
|
d2257abe86
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-19 13:21:18 -03:00 |
|
|
DeltaFire
|
f892309903
|
fixes
|
2020-09-15 17:35:58 +02:00 |
|
|
Enric Gabriel
|
ef96fd6389
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-11 18:51:33 -03:00 |
|
|
The0bserver
|
cddd46fce3
|
Maybe this will work. Maybe it won't.
|
2020-09-05 18:52:20 -04:00 |
|
|
Enric Gabriel
|
20b25372e1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-05 13:09:14 -03:00 |
|
|
lolman360
|
55c8250324
|
AAAAAAAAAAAAAAAAA
|
2020-08-28 12:44:59 +10:00 |
|
|
lolman360
|
daeaf81ab6
|
e
|
2020-08-24 01:25:26 +10:00 |
|
|
lolman360
|
0f9f1e240c
|
w
|
2020-08-24 00:51:13 +10:00 |
|
|
lolman360
|
4b2b4afc64
|
e
|
2020-08-24 00:49:31 +10:00 |
|
|
lolman360
|
6463d0b785
|
Merge branch 'AnPrimAssistants' of https://github.com/lolman360/Citadel-Station-13 into AnPrimAssistants
|
2020-08-24 00:27:29 +10:00 |
|
|
lolman360
|
b74c5ba22d
|
ee
|
2020-08-24 00:27:22 +10:00 |
|
|
lolman360andGitHub
|
460c92de74
|
3
|
2020-08-24 00:20:04 +10:00 |
|
|
lolman360andGitHub
|
05250939c6
|
e
|
2020-08-23 23:58:04 +10:00 |
|
|
lolman360
|
bc14155632
|
Merge remote-tracking branch 'upstream/master' into AnPrimAssistants
|
2020-08-23 17:01:45 +10:00 |
|
|
Enric Gabriel
|
b0662f5e39
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-21 02:19:20 -03:00 |
|
|
siliconsandGitHub
|
120bcfc00c
|
Merge pull request #13178 from lolman360/plumb
[READY] ports plumbing (no more waiting for tgui4)
|
2020-08-20 21:32:26 -07:00 |
|
|
lolman360andGitHub
|
bda2c740ba
|
Merge branch 'master' into AnPrimAssistants
|
2020-08-21 11:08:13 +10:00 |
|
|
lolman360andGitHub
|
4e23559065
|
Update sheet_types.dm
|
2020-08-18 18:15:24 +10:00 |
|
|
lolman360
|
8085ab01d9
|
culst!
|
2020-08-18 15:38:59 +10:00 |
|
|
lolman360
|
8f5078a15a
|
Update mineral.dm
|
2020-08-18 14:47:47 +10:00 |
|
|
lolman360
|
bb86003510
|
w e w
|
2020-08-18 10:04:52 +10:00 |
|
|
Enric Gabriel
|
7898f1fe3e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-16 23:24:11 -03:00 |
|
|
LinandGitHub
|
d287f44d9a
|
Merge pull request #13045 from silicons/coggers
ports bronze (fake clockwork) airlocks and windows
|
2020-08-16 20:20:03 -05:00 |
|
|
lolman360
|
7ca4fa2f55
|
compilies/??
|
2020-08-15 17:09:12 +10:00 |
|
|
lolman360andGitHub
|
6f7badda41
|
Merge branch 'master' into plumb
|
2020-08-12 09:03:11 +10:00 |
|
|
Enric Gabriel
|
7929924d4a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-11 13:04:34 -03:00 |
|
|
lolman360
|
49948e77a4
|
SELLYOULOSE
|
2020-08-11 18:08:40 +10:00 |
|
|
Enric Gabriel
|
bae8c236f6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-09 18:34:33 -03:00 |
|
|
chrisbbbbbbb
|
758d540c9e
|
Suture/Mesh Crafting
|
2020-08-09 20:33:40 +02:00 |
|
|
lolman360andGitHub
|
308d77da7c
|
Merge branch 'master' into plumb
|
2020-08-09 22:48:18 +10:00 |
|
|
Hatterhat
|
a7d1a0ea48
|
gauze! stacksizes! shit.
|
2020-08-07 18:40:46 -05:00 |
|
|
silicons
|
2a0f2a38a7
|
Fix
|
2020-08-05 21:42:05 -07:00 |
|
|
silicons
|
815ddd1866
|
oh boy
|
2020-08-05 21:34:26 -07:00 |
|
|
Enric Gabriel
|
e4f7092490
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-05 22:52:22 -03:00 |
|
|
LinandGitHub
|
c310b1a70e
|
Merge pull request #12997 from silicons/lavastaff
fixes medsprays, sutures/regenmesh, and lavastaves not respecting clickdelay (rip instant chemdump heal on self)
|
2020-08-05 19:43:38 -05:00 |
|
|
Enric Gabriel
|
8558cc8747
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-04 01:48:59 -03:00 |
|
|
silicons
|
20dea7e41f
|
fix
|
2020-08-01 20:45:49 -07:00 |
|
|
Enric GabrielandGitHub
|
12c21496b6
|
Some useful stuff (#34)
|
2020-07-29 22:13:57 -03:00 |
|
|
Timothy TeakettleandGitHub
|
9721025582
|
Merge branch 'master' into wounds-part-2
|
2020-07-29 15:47:44 +01:00 |
|
|
Enric Gabriel
|
935901593b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-07-29 09:52:32 -03:00 |
|
|
LinandGitHub
|
447a0b24bf
|
Merge pull request #12944 from timothyteakettle/fixes-crates
fixes some crafted crates containing items
|
2020-07-28 22:11:30 -05:00 |
|
|
LinandGitHub
|
81a7542aa6
|
Merge pull request #12834 from silicons/clickcd_experimental
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
|
2020-07-28 21:51:10 -05:00 |
|
|
Timothy Teakettle
|
dc14c02570
|
fix crates
|
2020-07-27 21:55:51 +01:00 |
|
|
Enric Gabriel
|
48f8a998d5
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2020-07-27 10:33:25 -03:00 |
|
|
siliconsandGitHub
|
e240453044
|
Merge pull request #12884 from timothyteakettle/fix-a-bad-bug/exploit
fixes a dumb bug to do with material crafting
|
2020-07-26 22:52:30 -07:00 |
|
|
Enric Gabriel
|
c23b75ea39
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2020-07-26 20:18:40 -03:00 |
|
|
Hatterhat
|
14fba6a056
|
funny parry sticks
|
2020-07-24 21:19:01 -05:00 |
|
|
Timothy Teakettle
|
7fb55a02a5
|
section one
|
2020-07-24 22:34:22 +01:00 |
|
|
timothyteakettle
|
5064c584cc
|
woops typo
|
2020-07-24 03:01:40 +01:00 |
|
|
timothyteakettle
|
869474f4ec
|
drop location is not suitable for structures
|
2020-07-24 03:01:12 +01:00 |
|