cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-21 20:28:14 +01:00
Code Issues Packages Projects Releases Wiki Activity
38,600 Commits 8 Branches 0 Tags
machine-changes
Commit Graph
549 Commits
Author SHA1 Message Date
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
lolman360 0f1aa3c0ca 'lolman? did you test your code?' 
no i did not ms. kevinz
 2020-07-22 10:49:56 +10: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
Enric Gabriel beec77b17d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-11 20:04:30 -03:00
Timothy Teakettle c1592ad162 more rewards 2020-07-11 23:27:29 +01:00
HeroWithYay bed6f4ac91 Adds "Telecrystal Dust" a useless, red waste of syndicate resources that can be obtained by grinding raw telecrystals in a blender. 
Also makes it so you can sell raw telecrystals at cargo 1000 points each which is also a considerable waste of TC.
 2020-07-09 16:32:14 +12:00
silicons 6cbab55ef8 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-07 21:07:58 -07:00
silicons 6ee63f66aa whew 2020-07-07 20:48:54 -07:00
Artur 280d3de6c3 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-07 18:37:45 +03:00
Enric Gabriel 83522c8571 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-04 17:18:13 -03:00
GhomandGitHub 17ee8c5960 Merge pull request #12660 from YakumoChen/master 
Reverts improv small arms, makes guncrafting easier and faster
 2020-07-04 18:35:22 +02:00
siliconsandGitHub c10350f10e Merge pull request #12677 from Ghommie/Ghommie-cit830 
Fixes items' skills list keys missing associated traits and improves modulability a little.
 2020-07-04 00:12:37 -07:00
siliconsandGitHub 103b8b7600 Merge pull request #12662 from kappa-sama/patch-29 
makes bows and arrows more feasible improv weapons
 2020-07-04 00:11:45 -07:00
Ghommie f5ffd7d2a9 Easing fine tuning of the system. 2020-07-03 03:00:33 +02:00
Artur 6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00
Enric Gabriel 37a3baed9c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-01 18:30:26 -03:00
kappa-samaandGitHub 406af65d93 you need 5 of these 2020-07-01 08:12:35 -04:00
kappa-samaandGitHub 9cc6f5aa91 durathread->string 2020-07-01 08:09:43 -04:00
kappa-samaandGitHub 0b0d9ff1a6 this 2020-07-01 07:56:55 -04:00
kappa-samaandGitHub cfc14a04f1 Merge branch 'master' into patch-28 2020-07-01 07:48:46 -04:00
kappa-sama 1f38c3029c yeah ok 2020-07-01 07:40:43 -04:00
YakumoChenandGitHub ed017cc22a Update sheet_types.dm 2020-07-01 08:53:08 +00:00
Enric Gabriel f5bd261e38 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-30 22:01:51 -03:00
Ghommie cd1c5511a4 Fixing two handed items and etcetera. 2020-06-30 16:24:04 +02:00
Artur 20245f7319 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-30 02:30:29 +03:00
Ghommie 0779dd560e More and more fixes. 2020-06-29 18:52:37 +02:00
Enric Gabriel d505bf0716 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-28 13:33:22 -03:00