cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 18:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,289 Commits 55 Branches 0 Tags
acf06abed5cc10f8ab3ad173fbd4fc355ad64553
Commit Graph

2001 Commits

Author SHA1 Message Date
Putnam
a625d6562b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-07-08 22:02:03 -07: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
silicons
0c0bf46f7f Merge pull request #12696 from Chiirno/emichemmastertweak 
increased the amount of stuff the chem master can dispense from 10 to 20
 2020-07-06 17:34:50 -07:00
Cirno
45d97b2251 increased the amount of stuff the chem master can dispense from 10 to 20 2020-07-05 11:17:37 -03:00
silicons
e9c4ac8c3c Merge pull request #12658 from timothyteakettle/okay-its-bad 
slightly tweaks the cooking oil damage formula
 2020-07-04 00:11:09 -07:00
Artur
f0154f3f1c conflicts!!! 2020-07-03 15:45:11 +03:00
silicons
d85edbf8fb ok 2020-07-03 02:15:06 -07:00
Artur
6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00
Sonic121x
ea7fed0c8e givme that pilltype button 
Fix pill type button
 2020-07-02 22:30:28 +08:00
Ghom
ef60068f1c Merge pull request #12666 from timothyteakettle/more-blood-fixes 
More blood fixes
 2020-07-02 14:52:39 +02:00
silicons
e2975a44a1 Merge branch 'master' into policy 2020-07-02 01:23:19 -07:00
Timothy Teakettle
84d60a455e wow its still spelt wrong 2020-07-01 21:53:34 +01:00
Timothy Teakettle
1cb1b4d7e6 oh my god its not even defined right 2020-07-01 21:29:10 +01:00
Timothy Teakettle
311e149562 fix bloodpacks 2020-07-01 21:00:01 +01:00
Letter N
b35e3f2b93 fix: R&D Console, Vending, and chem master 2020-07-01 19:07:03 +08:00
timothyteakettle
0f0e0298e5 newline at end of file 2020-07-01 03:34:17 +01:00
timothyteakettle
d1f92da74a 20 is fine if we edit volume 2020-07-01 03:29:22 +01:00
timothyteakettle
4865831b6e alright this is a bad meme 2020-07-01 03:28:37 +01:00
Artur
20245f7319 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-30 02:30:29 +03:00
Artur
2797aefc3a Clockworkslab and ui resizing 2020-06-30 01:05:43 +03:00
Putnam3145
ee2fedd4af Merge pull request #12390 from Ghommie/Ghommie-cit800 
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
 2020-06-29 12:44:33 -07:00
Ghom
b280c0f550 Merge pull request #12622 from timothyteakettle/grammar-fixes 
big batch of spelling/grammar corrections
 2020-06-29 21:13:06 +02:00
silicons
1d4a54d880 log 2020-06-26 23:47:16 -07:00
silicons
0df5aa083b policies and code hooks 2020-06-26 23:41:44 -07:00
timothyteakettle
76b5557e1e bunch of grammar corrections 2020-06-27 02:12:44 +01:00
Timothy Teakettle
9c9868438c some fixes 2020-06-26 22:49:43 +01:00
Timothy Teakettle
334d55bef3 add support for custom blood colours 2020-06-26 20:29:40 +01:00
Artur
765ffdb1a1 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-26 14:03:27 +03:00
silicons
ac06f037e5 Merge pull request #12575 from dapnee/meme 
Wataur Bottle
 2020-06-24 08:44:08 -07:00
Linzolle
15be6217bd Merge branch 'master' of github.com:Citadel-Station-13/Citadel-Station-13 into chemmaster 2020-06-23 20:49:12 -05:00
Ghommie
ae053a9a08 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800 2020-06-23 03:12:49 +02:00
dapnee
e63f6aed42 Merge remote-tracking branch 'upstream/master' into meme 2020-06-22 15:15:28 -06:00
Artur
c41d2e78be Conflicts!!! 2020-06-22 17:39:24 +03:00
dapnee
0f15b0ce84 hey look, I'm finished with a single meme item 
hahaha
 2020-06-21 18:49:58 -06:00
dapnee
cfff6677b4 wataur 
hahaha, imagine if this worked
 2020-06-21 18:14:34 -06:00
silicons
99a7c49e52 Merge pull request #12561 from shellspeed1/Ports-kyro-chems 
Ports IV bags from TG
 2020-06-21 14:11:10 -07:00
Linzolle
b873f244c9 finally 2020-06-19 22:46:31 -05:00
Timothy Teakettle
0d197e82f8 Merge branch 'master' into cool-ipcs 2020-06-19 01:57:02 +01:00
shellspeed1
b490f02c78 Ports IV bags from TG 
Ports the iv bag portion of https://github.com/tgstation/tgstation/pull/44531/files from tg.
 2020-06-18 02:30:58 -07:00
kevinz000
118ac1a775 Merge pull request #12548 from timothyteakettle/more-events 
ports several tg events including fugitives
 2020-06-17 20:10:04 -07:00
Trilbyspaceclone
51da7dfa71 Merge branch 'master' into spike-loot-differentces 2020-06-17 02:36:52 -04:00
SmArtKar
170a38a3a7 Porting sutures and meshes from /TG/ (#12532) 
* Porting sutures and meshes from /TG/

* Recipes fix
 2020-06-16 16:22:56 -07:00
Artur
ceba739231 Cooonflicts 2020-06-16 01:23:42 +03:00
Timothy Teakettle
d7bce8aec0 ports some events 2020-06-15 20:22:40 +01:00
The0bserver
08be1292cd It's Mad Funny when everything breaks! 
And even funnier still when you have to start all over again!
 2020-06-11 15:02:17 -04:00
Ghom
8cb15f9279 Actually Balanced and Standardized Vendor Prices. (#12495) 2020-06-09 22:22:53 -07:00
Ghom
77a6511cc7 Fixing two issues. (#12481) 2020-06-09 03:26:19 -07:00