cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-30 16:56:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
37,558 Commits 8 Branches 0 Tags
bluespace-locker
Commit Graph
523 Commits
Author SHA1 Message Date
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
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
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
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
Enric Gabriel e0fdf3dce9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 / merge conflicts 2020-07-23 19:14:58 -03:00
silicons ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
Enric Gabriel f0904c6b10 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-21 01:19:25 -03:00
Timothy TeakettleandGitHub 75a2035774 Merge branch 'master' into wound-port 2020-07-21 01:10:51 +01:00
siliconsandGitHub 3d2995b4e8 Merge pull request #12787 from CameronWoof/advanced-sutures-and-mesh 
Ports Medicated Sutures and Advanced Regenerative Mesh from TG
 2020-07-20 17:01:32 -07:00
silicons 98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
Enric Gabriel 7a1d5acd9c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 - may FUCK 2020-07-19 18:58:33 -03:00
Timothy TeakettleandGitHub 1a5008fee7 Merge branch 'master' into wound-port 2020-07-18 23:06:49 +01:00
Timothy Teakettle 3b78ac58bd make it clearer 2020-07-18 22:46:07 +01:00
Timothy Teakettle f290050a78 Merge branch 'wound-port' of https://github.com/timothyteakettle/Citadel-Station-13 into wound-port 2020-07-18 22:02:24 +01:00
Timothy Teakettle de83bbee0b woops 2020-07-18 22:02:07 +01:00
Timothy TeakettleandGitHub 974b80a2fd Merge branch 'master' into wound-port 2020-07-18 21:45:24 +01:00
timothyteakettle e8fade4f7f changes 2020-07-18 02:29:12 +01:00
CameronWoof 431c52b7e2 Merge remote-tracking branch 'upstream/master' into advanced-sutures-and-mesh 2020-07-17 17:22:43 -07:00
Timothy Teakettle 0bc16c7a37 Merge branch 'wound-port' of https://github.com/timothyteakettle/Citadel-Station-13 into wound-port 2020-07-17 22:39:03 +01:00
Timothy Teakettle a4478b0cda it continues 2020-07-17 22:38:28 +01:00
silicons 993b4ec222 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-16 19:39:46 -07:00
Enric Gabriel 05593f84a0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-16 22:13:13 -03:00
timothyteakettle 584e74590f port1 2020-07-17 02:01:33 +01:00
Artur af65b626e3 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-16 15:56:08 +03:00
CameronWoof a493ecdc4a suture and mesh additions 2020-07-15 16:44:24 -07:00
Enric Gabriel 90f2e58f47 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-15 17:13:32 -03:00
siliconsandGitHub 6121cbd091 Merge pull request #12738 from timothyteakettle/travelling-traders 
the travelling trader midround event
 2020-07-15 08:50:20 -07:00
Artur 5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
timothyteakettle cff2e3d680 never set max amount to 0 2020-07-12 00:58:34 +01:00